172 files changed, 109952 insertions, 108884 deletions

diff --git a/mesalib/common.py b/mesalib/common.py
index 0a3dcdcf5..089a4ee02 100644
--- a/mesalib/common.py
+++ b/mesalib/common.py
@@ -1,92 +1,92 @@
-#######################################################################
-# Common SCons code
-
-import os
-import os.path
-import re
-import subprocess
-import sys
-import platform as _platform
-
-import SCons.Script.SConscript
-
-
-#######################################################################
-# Defaults
-
-host_platform = _platform.system().lower()
-if host_platform.startswith('cygwin'):
-    host_platform = 'cygwin'
-
-# Search sys.argv[] for a "platform=foo" argument since we don't have
-# an 'env' variable at this point.
-if 'platform' in SCons.Script.ARGUMENTS:
-    target_platform = SCons.Script.ARGUMENTS['platform']
-else:
-    target_platform = host_platform
-
-_machine_map = {
-	'x86': 'x86',
-	'i386': 'x86',
-	'i486': 'x86',
-	'i586': 'x86',
-	'i686': 'x86',
-	'ppc' : 'ppc',
-	'AMD64': 'x86_64',
-	'x86_64': 'x86_64',
-}
-
-
-# find host_machine value
-if 'PROCESSOR_ARCHITECTURE' in os.environ:
-	host_machine = os.environ['PROCESSOR_ARCHITECTURE']
-else:
-	host_machine = _platform.machine()
-host_machine = _machine_map.get(host_machine, 'generic')
-
-default_machine = host_machine
-default_toolchain = 'default'
-
-if target_platform == 'windows' and host_platform != 'windows':
-    default_machine = 'x86'
-    default_toolchain = 'crossmingw'
-
-
-# find default_llvm value
-if 'LLVM' in os.environ:
-    default_llvm = 'yes'
-else:
-    default_llvm = 'no'
-    try:
-        if target_platform != 'windows' and \
-           subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
-            default_llvm = 'yes'
-    except:
-        pass
-
-
-#######################################################################
-# Common options
-
-def AddOptions(opts):
-	try:
-		from SCons.Variables.BoolVariable import BoolVariable as BoolOption
-	except ImportError:
-		from SCons.Options.BoolOption import BoolOption
-	try:
-		from SCons.Variables.EnumVariable import EnumVariable as EnumOption
-	except ImportError:
-		from SCons.Options.EnumOption import EnumOption
-	opts.Add(EnumOption('build', 'build type', 'debug',
-	                  allowed_values=('debug', 'checked', 'profile', 'release')))
-	opts.Add(BoolOption('quiet', 'quiet command lines', 'yes'))
-	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
-											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
-	opts.Add(EnumOption('platform', 'target platform', host_platform,
-											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded', 'cygwin', 'sunos', 'freebsd8')))
-	opts.Add('toolchain', 'compiler toolchain', default_toolchain)
-	opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))
-	opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
-	opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
-	opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
-	opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
+#######################################################################

+# Common SCons code

+

+import os

+import os.path

+import re

+import subprocess

+import sys

+import platform as _platform

+

+import SCons.Script.SConscript

+

+

+#######################################################################

+# Defaults

+

+host_platform = _platform.system().lower()

+if host_platform.startswith('cygwin'):

+    host_platform = 'cygwin'

+

+# Search sys.argv[] for a "platform=foo" argument since we don't have

+# an 'env' variable at this point.

+if 'platform' in SCons.Script.ARGUMENTS:

+    target_platform = SCons.Script.ARGUMENTS['platform']

+else:

+    target_platform = host_platform

+

+_machine_map = {

+	'x86': 'x86',

+	'i386': 'x86',

+	'i486': 'x86',

+	'i586': 'x86',

+	'i686': 'x86',

+	'ppc' : 'ppc',

+	'AMD64': 'x86_64',

+	'x86_64': 'x86_64',

+}

+

+

+# find host_machine value

+if 'PROCESSOR_ARCHITECTURE' in os.environ:

+	host_machine = os.environ['PROCESSOR_ARCHITECTURE']

+else:

+	host_machine = _platform.machine()

+host_machine = _machine_map.get(host_machine, 'generic')

+

+default_machine = host_machine

+default_toolchain = 'default'

+

+if target_platform == 'windows' and host_platform != 'windows':

+    default_machine = 'x86'

+    default_toolchain = 'crossmingw'

+

+

+# find default_llvm value

+if 'LLVM' in os.environ:

+    default_llvm = 'yes'

+else:

+    default_llvm = 'no'

+    try:

+        if target_platform != 'windows' and \

+           subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:

+            default_llvm = 'yes'

+    except:

+        pass

+

+

+#######################################################################

+# Common options

+

+def AddOptions(opts):

+	try:

+		from SCons.Variables.BoolVariable import BoolVariable as BoolOption

+	except ImportError:

+		from SCons.Options.BoolOption import BoolOption

+	try:

+		from SCons.Variables.EnumVariable import EnumVariable as EnumOption

+	except ImportError:

+		from SCons.Options.EnumOption import EnumOption

+	opts.Add(EnumOption('build', 'build type', 'debug',

+	                  allowed_values=('debug', 'checked', 'profile', 'release')))

+	opts.Add(BoolOption('quiet', 'quiet command lines', 'yes'))

+	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,

+											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))

+	opts.Add(EnumOption('platform', 'target platform', host_platform,

+											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded', 'cygwin', 'sunos', 'freebsd8')))

+	opts.Add('toolchain', 'compiler toolchain', default_toolchain)

+	opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))

+	opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))

+	opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))

+	opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))

+	opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))

diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in
index 4e931a3a9..56843037d 100644
--- a/mesalib/configs/autoconf.in
+++ b/mesalib/configs/autoconf.in
@@ -1,219 +1,219 @@
-# 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@
-OPT_FLAGS = @OPT_FLAGS@
-ARCH_FLAGS = @ARCH_FLAGS@
-ASM_FLAGS = @ASM_FLAGS@
-PIC_FLAGS = @PIC_FLAGS@
-DEFINES = @DEFINES@
-API_DEFINES = @API_DEFINES@
-SHARED_GLAPI = @SHARED_GLAPI@
-CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \
-	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
-CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \
-	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@
-CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@
-LDFLAGS = @LDFLAGS@
-EXTRA_LIB_PATH = @EXTRA_LIB_PATH@
-RADEON_CFLAGS = @RADEON_CFLAGS@
-RADEON_LDFLAGS = @RADEON_LDFLAGS@
-INTEL_LIBS = @INTEL_LIBS@
-INTEL_CFLAGS = @INTEL_CFLAGS@
-X11_LIBS = @X11_LIBS@
-X11_CFLAGS = @X11_CFLAGS@
-LLVM_CFLAGS = @LLVM_CFLAGS@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
-GLW_CFLAGS = @GLW_CFLAGS@
-GLUT_CFLAGS = @GLUT_CFLAGS@
-GLX_TLS = @GLX_TLS@
-DRI_CFLAGS = @DRI_CFLAGS@
-DRI_CXXFLAGS = @DRI_CXXFLAGS@
-
-# dlopen
-DLOPEN_LIBS = @DLOPEN_LIBS@
-
-# Source selection
-MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
-GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@
-
-# Misc tools and flags
-MAKE = @MAKE@
-SHELL = @SHELL@
-MKLIB_OPTIONS = @MKLIB_OPTIONS@
-MKDEP = @MKDEP@
-MKDEP_OPTIONS = @MKDEP_OPTIONS@
-INSTALL = @INSTALL@
-
-# Python and flags (generally only needed by the developers)
-PYTHON2 = @PYTHON2@
-PYTHON_FLAGS = -t -O -O
-
-# Library names (base name)
-GL_LIB = GL
-GLU_LIB = GLU
-GLUT_LIB = glut
-GLW_LIB = GLw
-OSMESA_LIB = @OSMESA_LIB@
-GLESv1_CM_LIB = GLESv1_CM
-GLESv2_LIB = GLESv2
-VG_LIB = OpenVG
-GLAPI_LIB = glapi
-WAYLAND_EGL_LIB = wayland-egl
-
-# Library names (actual file names)
-GL_LIB_NAME = @GL_LIB_NAME@
-GLU_LIB_NAME = @GLU_LIB_NAME@
-GLUT_LIB_NAME = @GLUT_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@
-WAYLAND_EGL_LIB_NAME = @WAYLAND_EGL_LIB_NAME@
-
-# Globs used to install the lib and all symlinks
-GL_LIB_GLOB = @GL_LIB_GLOB@
-GLU_LIB_GLOB = @GLU_LIB_GLOB@
-GLUT_LIB_GLOB = @GLUT_LIB_GLOB@
-GLW_LIB_GLOB = @GLW_LIB_GLOB@
-OSMESA_LIB_GLOB = @OSMESA_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@
-WAYLAND_EGL_LIB_GLOB = @WAYLAND_EGL_LIB_GLOB@
-
-# Directories to build
-LIB_DIR = @LIB_DIR@
-SRC_DIRS = @SRC_DIRS@
-GLU_DIRS = @GLU_DIRS@
-DRIVER_DIRS = @DRIVER_DIRS@
-EGL_DRIVERS_DIRS = @EGL_DRIVERS_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@
-DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@
-DRICORE_LIBS = @DRICORE_LIBS@
-DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@
-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 = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@
-OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \
-	$(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@
-EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @EGL_LIB_DEPS@
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \
-	$(EXTRA_LIB_PATH) @GLU_LIB_DEPS@
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \
-	$(EXTRA_LIB_PATH) @GLUT_LIB_DEPS@
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
-	$(EXTRA_LIB_PATH) @GLW_LIB_DEPS@
-APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@
-GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv1_CM_LIB_DEPS@
-GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv2_LIB_DEPS@
-VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@
-GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) @GLAPI_LIB_DEPS@
-WAYLAND_EGL_LIB_DEPS = $(EXTRA_LIBPATH) @WAYLAND_EGL_LIB_DEPS@
-
-# DRI dependencies
-MESA_MODULES = @MESA_MODULES@
-DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@
-LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
-LIBDRM_LIB = @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@
-
-# Xorg driver install directory (for xorg state-tracker)
-XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@
-
-# 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@
-GLUT_PC_REQ_PRIV = @GLUT_PC_REQ_PRIV@
-GLUT_PC_LIB_PRIV = @GLUT_PC_LIB_PRIV@
-GLUT_PC_CFLAGS = @GLUT_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@
-WAYLAND_EGL_PC_REQ_PRIV = @WAYLAND_EGL_PC_REQ_PRIV@
-WAYLAND_EGL_PC_LIB_PRIV = @WAYLAND_EGL_PC_LIB_PRIV@
-WAYLAND_EGL_PC_CFLAGS = @WAYLAND_EGL_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@
-ifneq ($(LLVM_VERSION),)
-  HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))
-  DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)
-endif
-
-HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@
+# 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@

+OPT_FLAGS = @OPT_FLAGS@

+ARCH_FLAGS = @ARCH_FLAGS@

+ASM_FLAGS = @ASM_FLAGS@

+PIC_FLAGS = @PIC_FLAGS@

+DEFINES = @DEFINES@

+API_DEFINES = @API_DEFINES@

+SHARED_GLAPI = @SHARED_GLAPI@

+CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \

+	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)

+CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \

+	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

+CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@

+CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@

+LDFLAGS = @LDFLAGS@

+EXTRA_LIB_PATH = @EXTRA_LIB_PATH@

+RADEON_CFLAGS = @RADEON_CFLAGS@

+RADEON_LDFLAGS = @RADEON_LDFLAGS@

+INTEL_LIBS = @INTEL_LIBS@

+INTEL_CFLAGS = @INTEL_CFLAGS@

+X11_LIBS = @X11_LIBS@

+X11_CFLAGS = @X11_CFLAGS@

+LLVM_CFLAGS = @LLVM_CFLAGS@

+LLVM_LDFLAGS = @LLVM_LDFLAGS@

+LLVM_LIBS = @LLVM_LIBS@

+GLW_CFLAGS = @GLW_CFLAGS@

+GLUT_CFLAGS = @GLUT_CFLAGS@

+GLX_TLS = @GLX_TLS@

+DRI_CFLAGS = @DRI_CFLAGS@

+DRI_CXXFLAGS = @DRI_CXXFLAGS@

+

+# dlopen

+DLOPEN_LIBS = @DLOPEN_LIBS@

+

+# Source selection

+MESA_ASM_SOURCES = @MESA_ASM_SOURCES@

+GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@

+

+# Misc tools and flags

+MAKE = @MAKE@

+SHELL = @SHELL@

+MKLIB_OPTIONS = @MKLIB_OPTIONS@

+MKDEP = @MKDEP@

+MKDEP_OPTIONS = @MKDEP_OPTIONS@

+INSTALL = @INSTALL@

+

+# Python and flags (generally only needed by the developers)

+PYTHON2 = @PYTHON2@

+PYTHON_FLAGS = -t -O -O

+

+# Library names (base name)

+GL_LIB = GL

+GLU_LIB = GLU

+GLUT_LIB = glut

+GLW_LIB = GLw

+OSMESA_LIB = @OSMESA_LIB@

+GLESv1_CM_LIB = GLESv1_CM

+GLESv2_LIB = GLESv2

+VG_LIB = OpenVG

+GLAPI_LIB = glapi

+WAYLAND_EGL_LIB = wayland-egl

+

+# Library names (actual file names)

+GL_LIB_NAME = @GL_LIB_NAME@

+GLU_LIB_NAME = @GLU_LIB_NAME@

+GLUT_LIB_NAME = @GLUT_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@

+WAYLAND_EGL_LIB_NAME = @WAYLAND_EGL_LIB_NAME@

+

+# Globs used to install the lib and all symlinks

+GL_LIB_GLOB = @GL_LIB_GLOB@

+GLU_LIB_GLOB = @GLU_LIB_GLOB@

+GLUT_LIB_GLOB = @GLUT_LIB_GLOB@

+GLW_LIB_GLOB = @GLW_LIB_GLOB@

+OSMESA_LIB_GLOB = @OSMESA_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@

+WAYLAND_EGL_LIB_GLOB = @WAYLAND_EGL_LIB_GLOB@

+

+# Directories to build

+LIB_DIR = @LIB_DIR@

+SRC_DIRS = @SRC_DIRS@

+GLU_DIRS = @GLU_DIRS@

+DRIVER_DIRS = @DRIVER_DIRS@

+EGL_DRIVERS_DIRS = @EGL_DRIVERS_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@

+DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@

+DRICORE_LIBS = @DRICORE_LIBS@

+DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@

+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 = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@

+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \

+	$(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@

+EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @EGL_LIB_DEPS@

+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \

+	$(EXTRA_LIB_PATH) @GLU_LIB_DEPS@

+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \

+	$(EXTRA_LIB_PATH) @GLUT_LIB_DEPS@

+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \

+	$(EXTRA_LIB_PATH) @GLW_LIB_DEPS@

+APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@

+GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv1_CM_LIB_DEPS@

+GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv2_LIB_DEPS@

+VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@

+GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) @GLAPI_LIB_DEPS@

+WAYLAND_EGL_LIB_DEPS = $(EXTRA_LIBPATH) @WAYLAND_EGL_LIB_DEPS@

+

+# DRI dependencies

+MESA_MODULES = @MESA_MODULES@

+DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@

+LIBDRM_CFLAGS = @LIBDRM_CFLAGS@

+LIBDRM_LIB = @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@

+

+# Xorg driver install directory (for xorg state-tracker)

+XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@

+

+# 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@

+GLUT_PC_REQ_PRIV = @GLUT_PC_REQ_PRIV@

+GLUT_PC_LIB_PRIV = @GLUT_PC_LIB_PRIV@

+GLUT_PC_CFLAGS = @GLUT_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@

+WAYLAND_EGL_PC_REQ_PRIV = @WAYLAND_EGL_PC_REQ_PRIV@

+WAYLAND_EGL_PC_LIB_PRIV = @WAYLAND_EGL_PC_LIB_PRIV@

+WAYLAND_EGL_PC_CFLAGS = @WAYLAND_EGL_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@

+ifneq ($(LLVM_VERSION),)

+  HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))

+  DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)

+endif

+

+HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@

diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index c704699f0..6d65c7952 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -1,119 +1,119 @@
-
-Status of OpenGL 3.x features in Mesa
-
-
-Note: when an item is marked as "DONE" it means all the core Mesa
-infrastructure is complete but it may be the case that few (if any) drivers
-implement the features.
-
-
-Feature                                               Status
------------------------------------------------------ ------------------------
-
-GL 3.0:
-
-GLSL changes (GL_EXT_gpu_shader4, etc)                not started
-Conditional rendering (GL_NV_conditional_render)      DONE (swrast & softpipe)
-Map buffer subranges (GL_ARB_map_buffer_range)        DONE
-Clamping controls (GL_ARB_color_buffer_float)         DONE
-Float textures, renderbuffers (GL_ARB_texture_float)  BRANCH ~mareko/mesa floating2
-GL_EXT_packed_float                                   not started
-GL_EXT_texture_shared_exponent                        not started
-Float depth buffers (GL_ARB_depth_buffer_float)       not started
-Framebuffer objects (GL_EXT_framebuffer_object)       DONE
-Half-float                                            DONE
-Multisample blit                                      DONE
-Non-normalized Integer texture/framebuffer formats    ~50% done
-1D/2D Texture arrays                                  core Mesa, swrast done
-Packed depth/stencil formats                          DONE
-Per-buffer blend and masks (GL_EXT_draw_buffers2)     DONE
-GL_EXT_texture_compression_rgtc                       DONE (swrast, gallium r600)
-Red and red/green texture formats                     DONE (swrast, i965, gallium)
-Transform feedback (GL_EXT_transform_feedback)        ~50% done
-   glBindFragDataLocation, glGetFragDataLocation,
-   glBindBufferRange, glBindBufferBase commands
-Vertex array objects (GL_APPLE_vertex_array_object)   DONE
-sRGB framebuffer format (GL_EXT_framebuffer_sRGB)     core GL done (i965, gallium), GLX todo
-glClearBuffer commands                                DONE
-glGetStringi command                                  DONE
-glTexParameterI, glGetTexParameterI commands          DONE
-glVertexAttribI commands                              DONE (but converts int
-                                                            values to floats)
-Depth format cube textures                            0% done
-
-
-
-GL 3.1:
-
-GLSL 1.30 and 1.40                                    not started
-Instanced drawing (GL_ARB_draw_instanced)             DONE (gallium, swrast)
-Buffer copying (GL_ARB_copy_buffer)                   DONE
-Primitive restart (GL_NV_primitive_restart)           DONE (gallium)
-16 vertex texture image units                         not started
-Texture buffer objs (GL_ARB_texture_buffer_object)    not started
-Rectangular textures (GL_ARB_texture_rectangle)       DONE
-Uniform buffer objs (GL_ARB_uniform_buffer_object)    not started
-Signed normalized textures (GL_EXT_texture_snorm)     DONE (gallium)
-
-
-GL 3.2:
-
-Core/compatibility profiles                           not started
-GLSL 1.50                                             not started
-Geometry shaders (GL_ARB_geometry_shader4)            partially done (Zack)
-BGRA vertex order (GL_ARB_vertex_array_bgra)          DONE
-Base vertex offset(GL_ARB_draw_elements_base_vertex)  DONE
-Frag shader coord (GL_ARB_fragment_coord_conventions) DONE (swrast, gallium)
-Provoking vertex (GL_ARB_provoking_vertex)            DONE
-Seamless cubemaps (GL_ARB_seamless_cube_map)          DONE, mostly?
-Multisample textures (GL_ARB_texture_multisample)     not started
-Frag depth clamp (GL_ARB_depth_clamp)                 DONE
-Fence objects (GL_ARB_sync)                           DONE
-
-
-GL 3.3:
-
-GLSL 3.30                                             not started
-GL_ARB_blend_func_extended                            not started
-GL_ARB_explicit_attrib_location                       DONE (swrast, i915, i965)
-GL_ARB_occlusion_query2                               DONE (swrast, gallium)
-GL_ARB_sampler_objects                                not started
-GL_ARB_texture_rgb10_a2ui                             not started
-GL_ARB_texture_swizzle                                DONE (same as EXT version)
-GL_ARB_timer_query                                    DONE (only Xlib sw driver)
-GL_ARB_instanced_arrays                               DONE (gallium)
-GL_ARB_vertex_type_2_10_10_10_rev                     not started
-
-
-GL 4.0:
-
-GLSL 4.0                                             not started
-GL_ARB_texture_query_lod                             not started
-GL_ARB_draw_buffers_blend                            DONE (gallium softpipe)
-GL_ARB_draw_indirect                                 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                   not started
-GL_ARB_texture_cube_map_array                        not started
-GL_ARB_texture_gather                                not started
-GL_ARB_transform_feedback2                           not started
-GL_ARB_transform_feedback3                           not started
-
-
-GL 4.1:
-
-GLSL 4.1                                             not started
-GL_ARB_ES2_compatibility                             not started
-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
-GL_ARB_viewport_array                                not started
-
-
-
-
-More info about these features and the work involved can be found at
-http://dri.freedesktop.org/wiki/MissingFunctionality
+

+Status of OpenGL 3.x features in Mesa

+

+

+Note: when an item is marked as "DONE" it means all the core Mesa

+infrastructure is complete but it may be the case that few (if any) drivers

+implement the features.

+

+

+Feature                                               Status

+----------------------------------------------------- ------------------------

+

+GL 3.0:

+

+GLSL changes (GL_EXT_gpu_shader4, etc)                not started

+Conditional rendering (GL_NV_conditional_render)      DONE (swrast & softpipe)

+Map buffer subranges (GL_ARB_map_buffer_range)        DONE

+Clamping controls (GL_ARB_color_buffer_float)         DONE

+Float textures, renderbuffers (GL_ARB_texture_float)  BRANCH ~mareko/mesa floating2

+GL_EXT_packed_float                                   not started

+GL_EXT_texture_shared_exponent                        not started

+Float depth buffers (GL_ARB_depth_buffer_float)       not started

+Framebuffer objects (GL_EXT_framebuffer_object)       DONE

+Half-float                                            DONE

+Multisample blit                                      DONE

+Non-normalized Integer texture/framebuffer formats    ~50% done

+1D/2D Texture arrays                                  core Mesa, swrast done

+Packed depth/stencil formats                          DONE

+Per-buffer blend and masks (GL_EXT_draw_buffers2)     DONE

+GL_EXT_texture_compression_rgtc                       DONE (swrast, gallium r600)

+Red and red/green texture formats                     DONE (swrast, i965, gallium)

+Transform feedback (GL_EXT_transform_feedback)        ~50% done

+   glBindFragDataLocation, glGetFragDataLocation,

+   glBindBufferRange, glBindBufferBase commands

+Vertex array objects (GL_APPLE_vertex_array_object)   DONE

+sRGB framebuffer format (GL_EXT_framebuffer_sRGB)     core GL done (i965, gallium), GLX todo

+glClearBuffer commands                                DONE

+glGetStringi command                                  DONE

+glTexParameterI, glGetTexParameterI commands          DONE

+glVertexAttribI commands                              DONE (but converts int

+                                                            values to floats)

+Depth format cube textures                            0% done

+

+

+

+GL 3.1:

+

+GLSL 1.30 and 1.40                                    not started

+Instanced drawing (GL_ARB_draw_instanced)             DONE (gallium, swrast)

+Buffer copying (GL_ARB_copy_buffer)                   DONE

+Primitive restart (GL_NV_primitive_restart)           DONE (gallium)

+16 vertex texture image units                         not started

+Texture buffer objs (GL_ARB_texture_buffer_object)    not started

+Rectangular textures (GL_ARB_texture_rectangle)       DONE

+Uniform buffer objs (GL_ARB_uniform_buffer_object)    not started

+Signed normalized textures (GL_EXT_texture_snorm)     DONE (gallium)

+

+

+GL 3.2:

+

+Core/compatibility profiles                           not started

+GLSL 1.50                                             not started

+Geometry shaders (GL_ARB_geometry_shader4)            partially done (Zack)

+BGRA vertex order (GL_ARB_vertex_array_bgra)          DONE

+Base vertex offset(GL_ARB_draw_elements_base_vertex)  DONE

+Frag shader coord (GL_ARB_fragment_coord_conventions) DONE (swrast, gallium)

+Provoking vertex (GL_ARB_provoking_vertex)            DONE

+Seamless cubemaps (GL_ARB_seamless_cube_map)          DONE, mostly?

+Multisample textures (GL_ARB_texture_multisample)     not started

+Frag depth clamp (GL_ARB_depth_clamp)                 DONE

+Fence objects (GL_ARB_sync)                           DONE

+

+

+GL 3.3:

+

+GLSL 3.30                                             not started

+GL_ARB_blend_func_extended                            not started

+GL_ARB_explicit_attrib_location                       DONE (swrast, i915, i965)

+GL_ARB_occlusion_query2                               DONE (swrast, gallium)

+GL_ARB_sampler_objects                                not started

+GL_ARB_texture_rgb10_a2ui                             not started

+GL_ARB_texture_swizzle                                DONE (same as EXT version)

+GL_ARB_timer_query                                    DONE (only Xlib sw driver)

+GL_ARB_instanced_arrays                               DONE (gallium)

+GL_ARB_vertex_type_2_10_10_10_rev                     not started

+

+

+GL 4.0:

+

+GLSL 4.0                                             not started

+GL_ARB_texture_query_lod                             not started

+GL_ARB_draw_buffers_blend                            DONE (gallium softpipe)

+GL_ARB_draw_indirect                                 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                   not started

+GL_ARB_texture_cube_map_array                        not started

+GL_ARB_texture_gather                                not started

+GL_ARB_transform_feedback2                           not started

+GL_ARB_transform_feedback3                           not started

+

+

+GL 4.1:

+

+GLSL 4.1                                             not started

+GL_ARB_ES2_compatibility                             not started

+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

+GL_ARB_viewport_array                                not started

+

+

+

+

+More info about these features and the work involved can be found at

+http://dri.freedesktop.org/wiki/MissingFunctionality

diff --git a/mesalib/docs/download.html b/mesalib/docs/download.html
index 03fa60b4d..2174bf0d9 100644
--- a/mesalib/docs/download.html
+++ b/mesalib/docs/download.html
@@ -1,103 +1,103 @@
-<HTML>
-
-<TITLE>Getting Mesa</TITLE>
-
-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<H1>Downloading</H1>
-
-<p>
-Primary Mesa download site:
-<a href="ftp://ftp.freedesktop.org/pub/mesa/"
-target="_parent">freedesktop.org</a> (FTP)
-</p>
-
-<p>
-When a new release is coming, release candidates (betas) may be found
-<a href="ftp://ftp.freedesktop.org/pub/mesa/beta/" target="_parent">here</a>.
-</p>
-
-
-<p>
-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>
-<p>
-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>
-
-
-<H1>Unpacking</H1>
-
-<p>
-To unpack .tar.gz files:
-</p>
-<pre>
-	tar zxf MesaLib-x.y.z.tar.gz
-</pre>
-or
-<pre>
-	gzcat MesaLib-x.y.z.tar.gz | tar xf -
-</pre>
-or
-<pre>
-	gunzip MesaLib-x.y.z.tar.gz ; tar xf MesaLib-x.y.z.tar
-</pre>
-<p>
-To unpack .tar.bz2 files:
-</p>
-<pre>
-	bunzip2 -c MesaLib-x.y.z.tar.gz | tar xf -
-</pre>
-<p>
-To unpack .zip files:
-</p>
-<pre>
-	unzip MesaLib-x.y.z.zip
-</pre>
-
-
-<h1>Contents</h1>
-
-<p>
-After unpacking you'll have these files and directories (among others):
-</p>
-<pre>
-Makefile	- top-level Makefile for most systems
-configs/	- makefile parameter files for various systems
-include/	- GL header (include) files
-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 MesaGLUT.x.y.z package:
-<pre>
-src/glut	- GLUT library source code
-</pre>
-
-<p>
-Proceed to the <a href="install.html">compilation and installation
-instructions</a>.
-</p>
-
-
-</BODY>
-</HTML>
+<HTML>

+

+<TITLE>Getting Mesa</TITLE>

+

+<link rel="stylesheet" type="text/css" href="mesa.css"></head>

+

+<BODY>

+

+<H1>Downloading</H1>

+

+<p>

+Primary Mesa download site:

+<a href="ftp://ftp.freedesktop.org/pub/mesa/"

+target="_parent">freedesktop.org</a> (FTP)

+</p>

+

+<p>

+When a new release is coming, release candidates (betas) may be found

+<a href="ftp://ftp.freedesktop.org/pub/mesa/beta/" target="_parent">here</a>.

+</p>

+

+

+<p>

+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>

+<p>

+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>

+

+

+<H1>Unpacking</H1>

+

+<p>

+To unpack .tar.gz files:

+</p>

+<pre>

+	tar zxf MesaLib-x.y.z.tar.gz

+</pre>

+or

+<pre>

+	gzcat MesaLib-x.y.z.tar.gz | tar xf -

+</pre>

+or

+<pre>

+	gunzip MesaLib-x.y.z.tar.gz ; tar xf MesaLib-x.y.z.tar

+</pre>

+<p>

+To unpack .tar.bz2 files:

+</p>

+<pre>

+	bunzip2 -c MesaLib-x.y.z.tar.gz | tar xf -

+</pre>

+<p>

+To unpack .zip files:

+</p>

+<pre>

+	unzip MesaLib-x.y.z.zip

+</pre>

+

+

+<h1>Contents</h1>

+

+<p>

+After unpacking you'll have these files and directories (among others):

+</p>

+<pre>

+Makefile	- top-level Makefile for most systems

+configs/	- makefile parameter files for various systems

+include/	- GL header (include) files

+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 MesaGLUT.x.y.z package:

+<pre>

+src/glut	- GLUT library source code

+</pre>

+

+<p>

+Proceed to the <a href="install.html">compilation and installation

+instructions</a>.

+</p>

+

+

+</BODY>

+</HTML>

diff --git a/mesalib/docs/envvars.html b/mesalib/docs/envvars.html
index 986d2f8eb..c710bca51 100644
--- a/mesalib/docs/envvars.html
+++ b/mesalib/docs/envvars.html
@@ -1,164 +1,164 @@
-<HTML>
-
-<TITLE>Environment Variables</TITLE>
-
-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<H1>Environment Variables</H1>
-
-<p>
-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.  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_TEX_PROG - if set, implement conventional texture env modes with
-fragment programs (intended for developers only)
-<li>MESA_TNL_PROG - if set, implement conventional vertex transformation
-operations with vertex programs (intended for developers only).
-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_EXTENSION_MAX_YEAR - The GL_EXTENSIONS string returned by Mesa is sorted
-by extension year.
-If this variable is set to year X, only extensions defined on or before year
-X will be reported.
-This is to work-around a bug in some games where the extension string is
-copied into a fixed-size buffer without truncating.
-If the extension string is too long, the buffer overrun can cause the game
-to crash.
-This is a work-around for that.
-<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 Mesa Xlib software driver.
-See the <A HREF="xlibdriver.html">Xlib software driver page</A> for details.
-</p>
-<ul>
-<li>MESA_RGB_VISUAL - specifies the X visual and depth for RGB mode
-<li>MESA_CI_VISUAL - specifies the X visual and depth for CI mode
-<li>MESA_BACK_BUFFER - specifies how to implement the back color buffer,
-    either "pixmap" or "ximage"
-<li>MESA_GAMMA - gamma correction coefficients for red, green, blue channels
-<li>MESA_XSYNC - enable synchronous X behavior (for debugging only)
-<li>MESA_GLX_FORCE_CI - if set, force GLX to treat 8bpp visuals as CI visuals
-<li>MESA_GLX_FX - set to either "fullscreen" for full-screen rendering,
-  "window" to render into a window, or "disable" to disable the Glide driver.
-<li>MESA_GLX_FORCE_ALPHA - if set, forces RGB windows to have an alpha channel.
-<li>MESA_GLX_DEPTH_BITS - specifies default number of bits for depth buffer.
-<li>MESA_GLX_ALPHA_BITS - specifies default number of bits for alpha channel.
-</ul>
-
-
-<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.
-<li>INTEL_NO_BLIT - if set, disable hardware-accelerated glBitmap,
-    glCopyPixels, glDrawPixels.
-</ul>
-
-
-<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>
+<HTML>

+

+<TITLE>Environment Variables</TITLE>

+

+<link rel="stylesheet" type="text/css" href="mesa.css"></head>

+

+<BODY>

+

+<H1>Environment Variables</H1>

+

+<p>

+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.  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_TEX_PROG - if set, implement conventional texture env modes with

+fragment programs (intended for developers only)

+<li>MESA_TNL_PROG - if set, implement conventional vertex transformation

+operations with vertex programs (intended for developers only).

+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_EXTENSION_MAX_YEAR - The GL_EXTENSIONS string returned by Mesa is sorted

+by extension year.

+If this variable is set to year X, only extensions defined on or before year

+X will be reported.

+This is to work-around a bug in some games where the extension string is

+copied into a fixed-size buffer without truncating.

+If the extension string is too long, the buffer overrun can cause the game

+to crash.

+This is a work-around for that.

+<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 Mesa Xlib software driver.

+See the <A HREF="xlibdriver.html">Xlib software driver page</A> for details.

+</p>

+<ul>

+<li>MESA_RGB_VISUAL - specifies the X visual and depth for RGB mode

+<li>MESA_CI_VISUAL - specifies the X visual and depth for CI mode

+<li>MESA_BACK_BUFFER - specifies how to implement the back color buffer,

+    either "pixmap" or "ximage"

+<li>MESA_GAMMA - gamma correction coefficients for red, green, blue channels

+<li>MESA_XSYNC - enable synchronous X behavior (for debugging only)

+<li>MESA_GLX_FORCE_CI - if set, force GLX to treat 8bpp visuals as CI visuals

+<li>MESA_GLX_FX - set to either "fullscreen" for full-screen rendering,

+  "window" to render into a window, or "disable" to disable the Glide driver.

+<li>MESA_GLX_FORCE_ALPHA - if set, forces RGB windows to have an alpha channel.

+<li>MESA_GLX_DEPTH_BITS - specifies default number of bits for depth buffer.

+<li>MESA_GLX_ALPHA_BITS - specifies default number of bits for alpha channel.

+</ul>

+

+

+<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.

+<li>INTEL_NO_BLIT - if set, disable hardware-accelerated glBitmap,

+    glCopyPixels, glDrawPixels.

+</ul>

+

+

+<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>

diff --git a/mesalib/docs/install.html b/mesalib/docs/install.html
index bfa3bb8f8..0634c7a20 100644
--- a/mesalib/docs/install.html
+++ b/mesalib/docs/install.html
@@ -1,346 +1,346 @@
-<HTML>
-
-<TITLE>Compiling and Installing</TITLE>
-
-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-
-<H1>Compiling and Installing</H1>
-
-<ol>
-<li><a href="#unix-x11">Unix / X11</a>
-  <ul>
-  <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="#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">Building with SCons</a>
-<li><a href="#other">Other</a>
-</ol>
-<br>
-
-
-<a name="unix-x11">
-<H2>1. Unix/X11 Compilation and Installation</H1>
-
-
-<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:
-</p>
-
-<ul>
-<li><a href="http://xorg.freedesktop.org/releases/individual/proto/">dri2proto</a> version 1.99.3 or later
-<li>Linux 2.6.28
-<li><a href="http://dri.freedesktop.org/libdrm/" target="_parent">libDRM</a>
-version 2.4.15 or later
-<li>Xorg server version 1.5 or later
-</ul>
-</p>
-
-
-<a name="autoconf">
-<h3>1.3 Building with Autoconf</h3>
-
-<p>
-Mesa may be <a href="autoconf.html">built using autoconf</a>.
-This should work well on most GNU-based systems.
-If that fails the traditional Mesa build system is available.
-
-
-
-<a name="traditional">
-<h3>1.4 Building with traditional Makefiles</h3>
-
-<p>
-The traditional Mesa build system is based on a collection of pre-defined
-system configurations.
-</p>
-<p>
-To see the list of configurations, just type <code>make</code>.
-Then choose a configuration from the list and type <code>make</code>
-<em>configname</em>.
-</p>
-
-<p>
-Mesa may be built in several different ways using the predefined configurations:
-</p>
-<ul>
-<li><b><em>Stand-alone/Xlib mode</em></b> - Mesa will be compiled as
-a software renderer using Xlib to do all rendering.
-The libGL.so library will be a self-contained rendering library that will
-allow you to run OpenGL/GLX applications on any X server (regardless of
-whether it supports the GLX X server extension).
-You will <em>not</em> be able to use hardware 3D acceleration.
-<p>
-To compile stand-alone Mesa type <code>make</code> in the top-level directory.
-You'll see a list of supported system configurations.
-Choose one from the list (such as linux-x86), and type:
-</p>
-<pre>
-    make linux-x86
-</pre>
-<p>This will produce libGL.so and several other libraries</p>
-</li>
-
-<li><b><em>DRI/accelerated</em></b> - The DRI hardware drivers for
-accelerated OpenGL rendering (for ATI, Intel, Matrox, etc) will be built.
-The libGL.so library will support the GLX extension and will load/use
-the DRI hardware drivers.
-
-
-<p>
-Build Mesa and the DRI hardware drivers by running
-</p>
-<pre>
-   make linux-dri
-</pre>
-<p>
-There are also <code>linux-dri-x86</code>, <code>linux-dri-x86-64</code>, 
-and <code>linux-ppc</code> configurations which are optimized for those
-architectures.
-</p>
-<p>
-Make sure you have the prerequisite versions of DRM and Xserver mentioned
-above.
-</p>
-
-</li>
-
-</ul>
-
-
-<p>
-Later, if you want to rebuild for a different configuration run
-<code>make realclean</code> before rebuilding.
-</p>
-
-
-<a name="libs">
-<h3>1.5 The libraries</h3>
-
-<p>
-When compilation has finished, look in the top-level <code>lib/</code>
-(or <code>lib64/</code>) directory.
-You'll see a set of library files similar to this:
-</p>
-<pre>
-lrwxrwxrwx    1 brian    users          10 Mar 26 07:53 libGL.so -> libGL.so.1*
-lrwxrwxrwx    1 brian    users          19 Mar 26 07:53 libGL.so.1 -> libGL.so.1.5.060100*
--rwxr-xr-x    1 brian    users     3375861 Mar 26 07:53 libGL.so.1.5.060100*
-lrwxrwxrwx    1 brian    users          11 Mar 26 07:53 libGLU.so -> libGLU.so.1*
-lrwxrwxrwx    1 brian    users          20 Mar 26 07:53 libGLU.so.1 -> libGLU.so.1.3.060100*
--rwxr-xr-x    1 brian    users      549269 Mar 26 07:53 libGLU.so.1.3.060100*
-lrwxrwxrwx    1 brian    users          12 Mar 26 07:53 libglut.so -> libglut.so.3*
-lrwxrwxrwx    1 brian    users          16 Mar 26 07:53 libglut.so.3 -> libglut.so.3.7.1*
--rwxr-xr-x    1 brian    users      597754 Mar 26 07:53 libglut.so.3.7.1*
-lrwxrwxrwx    1 brian    users          11 Mar 26 08:04 libGLw.so -> libGLw.so.1*
-lrwxrwxrwx    1 brian    users          15 Mar 26 08:04 libGLw.so.1 -> libGLw.so.1.0.0*
--rwxr-xr-x    1 brian    users       20750 Mar 26 08:04 libGLw.so.1.0.0*
-lrwxrwxrwx    1 brian    users          14 Mar 26 07:53 libOSMesa.so -> libOSMesa.so.6*
-lrwxrwxrwx    1 brian    users          23 Mar 26 07:53 libOSMesa.so.6 -> libOSMesa.so.6.1.060100*
--rwxr-xr-x    1 brian    users       23871 Mar 26 07:53 libOSMesa.so.6.1.060100*
-</pre>
-
-<p>
-<b>libGL</b> is the main OpenGL library (i.e. Mesa).
-<br>
-<b>libGLU</b> is the OpenGL Utility library.
-<br>
-<b>libglut</b> is the GLUT library.
-<br>
-<b>libGLw</b> is the Xt/Motif OpenGL drawing area widget library.
-<br>
-<b>libOSMesa</b> is the OSMesa (Off-Screen) interface library.
-</p>
-
-<p>
-If you built the DRI hardware drivers, you'll also see the DRI drivers:
-</p>
-<pre>
--rwxr-xr-x   1 brian users 15607851 Jul 21 12:11 ffb_dri.so
--rwxr-xr-x   1 brian users 15148747 Jul 21 12:11 i810_dri.so
--rwxr-xr-x   1 brian users 14497814 Jul 21 12:11 i830_dri.so
--rwxr-xr-x   1 brian users 16895413 Jul 21 12:11 i915_dri.so
--rwxr-xr-x   1 brian users 11320803 Jul 21 12:11 mach64_dri.so
--rwxr-xr-x   1 brian users 11418014 Jul 21 12:12 mga_dri.so
--rwxr-xr-x   1 brian users 11064426 Jul 21 12:12 r128_dri.so
--rwxr-xr-x   1 brian users 11849858 Jul 21 12:12 r200_dri.so
--rwxr-xr-x   1 brian users 16050488 Jul 21 12:11 r300_dri.so
--rwxr-xr-x   1 brian users 11757388 Jul 21 12:12 radeon_dri.so
--rwxr-xr-x   1 brian users 11232304 Jul 21 12:13 s3v_dri.so
--rwxr-xr-x   1 brian users 11062970 Jul 21 12:13 savage_dri.so
--rwxr-xr-x   1 brian users 11214212 Jul 21 12:13 sis_dri.so
--rwxr-xr-x   1 brian users 11368736 Jul 21 12:13 tdfx_dri.so
--rwxr-xr-x   1 brian users 10598868 Jul 21 12:13 trident_dri.so
--rwxr-xr-x   1 brian users 10997120 Jul 21 12:13 unichrome_dri.so
-</pre>
-
-<p>
-If you built with Gallium support, look in lib/gallium/ for Gallium-based
-versions of libGL and device drivers.
-</p>
-
-
-
-<a name="install">
-<H3>1.6 Installing the header and library files</H3>
-
-<p>
-The standard location for the OpenGL header files on Unix-type systems is
-in <code>/usr/include/GL/</code>.
-The standard location for the libraries is <code>/usr/lib/</code>.
-For more information see, the
-<a href="http://oss.sgi.com/projects/ogl-sample/ABI/" target="_parent">
-Linux/OpenGL ABI specification</a>.
-</p>
-
-<p>
-If you'd like Mesa to co-exist with another implementation of OpenGL that's
-already installed, you'll have to choose different directories, like
-<code>/usr/local/include/GL/</code> and <code>/usr/local/lib/</code>.
-</p>
-
-<p>
-To install Mesa's headers and libraries, run <code>make install</code>.
-But first, check the Mesa/configs/default file and examine the values
-of the <b>INSTALL_DIR</b> and <b>DRI_DRIVER_INSTALL_DIR</b> variables.
-Change them if needed, then run <code>make install</code>.
-</p>
-
-<p>
-The variable
-<b>DESTDIR</b> may also be used to install the contents to a temporary
-staging directory.
-This can be useful for package management.
-For example: <code>make install DESTDIR=/somepath/</code>
-</p>
-
-<p>
-Note: at runtime you can use the LD_LIBRARY_PATH environment variable
-(on Linux at least) to switch
-between the Mesa libraries and other vendor's libraries whenever you want.
-This is a handy way to compare multiple OpenGL implementations.
-</p>
-
-
-<a name="pkg-config">
-<H3>1.7 Building OpenGL programs with pkg-config</H3>
-
-<p>
-Running <code>make install</code> will install package configuration files
-for the pkg-config utility.
-</p>
-
-<p>
-When compiling your OpenGL application you can use pkg-config to determine
-the proper compiler and linker flags.
-</p>
-
-<p>
-For example, compiling and linking a GLUT application can be done with:
-</p>
-<pre>
-   gcc `pkg-config --cflags --libs glut` mydemo.c -o mydemo
-</pre>
-
-<br>
-
-<a name="windows">
-<H2>2. Windows Compilation and Installation</H1>
-
-<p>
-Please see the <a href="#scons">instructions on building with SCons</a>.
-Alternatively see <a href="README.WIN32">README.WIN32</a> file.
-</p>
-
-
-
-<a name="scons">
-<H2>3. Building with SCons</H1>
-
-<p>
-To build Mesa with SCons on Linux or Windows do
-</p>
-<pre>
-    scons
-</pre>
-<p>
-The build output will be placed in
-build/<i>platform</i>-<i>machine</i>-<i>debug</i>/..., where <i>platform</i> is for
-example linux or windows, <i>machine</i> is x86 or x86_64, optionally followed
-by -debug for debug builds.
-</p>
-
-<p>
-To build Mesa with SCons for Windows on Linux using the MinGW crosscompiler toolchain do
-</p>
-<pre>
-    scons platform=windows toolchain=crossmingw machine=x86 statetrackers=mesa drivers=softpipe,trace winsys=gdi
-</pre>
-<p>
-This will create:
-</p>
-<ul>
-<li>build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll &mdash; Mesa + Gallium + softpipe, binary compatible with Windows's opengl32.dll 
-<li>build/windows-x86-debug/glut/glx/glut32.dll
-<li>progs/build/windows-x86-debug/wgl/wglinfo.exe
-<li>progs/build/windows-x86-debug/trivial/tri.exe
-<li>and many other samples in progs/build/windows-x86-debug/...
-</ul>
-<p>
-Put them all in the same directory to test them.
-</p>
-
-
-<a name="other">
-<H2>4. Other systems</H1>
-
-<p>
-Documentation for other environments (some may be very out of date):
-</p>
-
-<UL>
-<li><A HREF="README.VMS">README.VMS</A> - VMS
-<LI><A HREF="README.GGI">README.GGI</A> - GGI
-<LI><A HREF="README.3DFX">README.3DFX</A> - 3Dfx/Glide driver
-<LI><A HREF="README.AMIWIN">README.AMIWIN</A> - Amiga Amiwin
-<LI><A HREF="README.BEOS">README.BEOS</A> - BeOS
-<LI><A HREF="README.D3D">README.D3D</A> - Direct3D driver
-<LI><A HREF="README.DJ">README.DJ</A> - DJGPP
-<LI><A HREF="README.LYNXOS">README.LYNXOS</A> - LynxOS
-<LI><A HREF="README.MINGW32">README.MINGW32</A> - Mingw32
-<LI><A HREF="README.NeXT">README.NeXT</A> - NeXT
-<LI><A HREF="README.OpenStep">README.OpenStep</A> - OpenStep
-<LI><A HREF="README.OS2">README.OS2</A> - OS/2
-<LI><A HREF="README.WINDML">README.WINDML</A> - WindML
-</UL>
-
-
-
-
-</body>
-</html>
+<HTML>

+

+<TITLE>Compiling and Installing</TITLE>

+

+<link rel="stylesheet" type="text/css" href="mesa.css"></head>

+

+<BODY>

+

+

+<H1>Compiling and Installing</H1>

+

+<ol>

+<li><a href="#unix-x11">Unix / X11</a>

+  <ul>

+  <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="#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">Building with SCons</a>

+<li><a href="#other">Other</a>

+</ol>

+<br>

+

+

+<a name="unix-x11">

+<H2>1. Unix/X11 Compilation and Installation</H1>

+

+

+<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:

+</p>

+

+<ul>

+<li><a href="http://xorg.freedesktop.org/releases/individual/proto/">dri2proto</a> version 1.99.3 or later

+<li>Linux 2.6.28

+<li><a href="http://dri.freedesktop.org/libdrm/" target="_parent">libDRM</a>

+version 2.4.15 or later

+<li>Xorg server version 1.5 or later

+</ul>

+</p>

+

+

+<a name="autoconf">

+<h3>1.3 Building with Autoconf</h3>

+

+<p>

+Mesa may be <a href="autoconf.html">built using autoconf</a>.

+This should work well on most GNU-based systems.

+If that fails the traditional Mesa build system is available.

+

+

+

+<a name="traditional">

+<h3>1.4 Building with traditional Makefiles</h3>

+

+<p>

+The traditional Mesa build system is based on a collection of pre-defined

+system configurations.

+</p>

+<p>

+To see the list of configurations, just type <code>make</code>.

+Then choose a configuration from the list and type <code>make</code>

+<em>configname</em>.

+</p>

+

+<p>

+Mesa may be built in several different ways using the predefined configurations:

+</p>

+<ul>

+<li><b><em>Stand-alone/Xlib mode</em></b> - Mesa will be compiled as

+a software renderer using Xlib to do all rendering.

+The libGL.so library will be a self-contained rendering library that will

+allow you to run OpenGL/GLX applications on any X server (regardless of

+whether it supports the GLX X server extension).

+You will <em>not</em> be able to use hardware 3D acceleration.

+<p>

+To compile stand-alone Mesa type <code>make</code> in the top-level directory.

+You'll see a list of supported system configurations.

+Choose one from the list (such as linux-x86), and type:

+</p>

+<pre>

+    make linux-x86

+</pre>

+<p>This will produce libGL.so and several other libraries</p>

+</li>

+

+<li><b><em>DRI/accelerated</em></b> - The DRI hardware drivers for

+accelerated OpenGL rendering (for ATI, Intel, Matrox, etc) will be built.

+The libGL.so library will support the GLX extension and will load/use

+the DRI hardware drivers.

+

+

+<p>

+Build Mesa and the DRI hardware drivers by running

+</p>

+<pre>

+   make linux-dri

+</pre>

+<p>

+There are also <code>linux-dri-x86</code>, <code>linux-dri-x86-64</code>, 

+and <code>linux-ppc</code> configurations which are optimized for those

+architectures.

+</p>

+<p>

+Make sure you have the prerequisite versions of DRM and Xserver mentioned

+above.

+</p>

+

+</li>

+

+</ul>

+

+

+<p>

+Later, if you want to rebuild for a different configuration run

+<code>make realclean</code> before rebuilding.

+</p>

+

+

+<a name="libs">

+<h3>1.5 The libraries</h3>

+

+<p>

+When compilation has finished, look in the top-level <code>lib/</code>

+(or <code>lib64/</code>) directory.

+You'll see a set of library files similar to this:

+</p>

+<pre>

+lrwxrwxrwx    1 brian    users          10 Mar 26 07:53 libGL.so -> libGL.so.1*

+lrwxrwxrwx    1 brian    users          19 Mar 26 07:53 libGL.so.1 -> libGL.so.1.5.060100*

+-rwxr-xr-x    1 brian    users     3375861 Mar 26 07:53 libGL.so.1.5.060100*

+lrwxrwxrwx    1 brian    users          11 Mar 26 07:53 libGLU.so -> libGLU.so.1*

+lrwxrwxrwx    1 brian    users          20 Mar 26 07:53 libGLU.so.1 -> libGLU.so.1.3.060100*

+-rwxr-xr-x    1 brian    users      549269 Mar 26 07:53 libGLU.so.1.3.060100*

+lrwxrwxrwx    1 brian    users          12 Mar 26 07:53 libglut.so -> libglut.so.3*

+lrwxrwxrwx    1 brian    users          16 Mar 26 07:53 libglut.so.3 -> libglut.so.3.7.1*

+-rwxr-xr-x    1 brian    users      597754 Mar 26 07:53 libglut.so.3.7.1*

+lrwxrwxrwx    1 brian    users          11 Mar 26 08:04 libGLw.so -> libGLw.so.1*

+lrwxrwxrwx    1 brian    users          15 Mar 26 08:04 libGLw.so.1 -> libGLw.so.1.0.0*

+-rwxr-xr-x    1 brian    users       20750 Mar 26 08:04 libGLw.so.1.0.0*

+lrwxrwxrwx    1 brian    users          14 Mar 26 07:53 libOSMesa.so -> libOSMesa.so.6*

+lrwxrwxrwx    1 brian    users          23 Mar 26 07:53 libOSMesa.so.6 -> libOSMesa.so.6.1.060100*

+-rwxr-xr-x    1 brian    users       23871 Mar 26 07:53 libOSMesa.so.6.1.060100*

+</pre>

+

+<p>

+<b>libGL</b> is the main OpenGL library (i.e. Mesa).

+<br>

+<b>libGLU</b> is the OpenGL Utility library.

+<br>

+<b>libglut</b> is the GLUT library.

+<br>

+<b>libGLw</b> is the Xt/Motif OpenGL drawing area widget library.

+<br>

+<b>libOSMesa</b> is the OSMesa (Off-Screen) interface library.

+</p>

+

+<p>

+If you built the DRI hardware drivers, you'll also see the DRI drivers:

+</p>

+<pre>

+-rwxr-xr-x   1 brian users 15607851 Jul 21 12:11 ffb_dri.so

+-rwxr-xr-x   1 brian users 15148747 Jul 21 12:11 i810_dri.so

+-rwxr-xr-x   1 brian users 14497814 Jul 21 12:11 i830_dri.so

+-rwxr-xr-x   1 brian users 16895413 Jul 21 12:11 i915_dri.so

+-rwxr-xr-x   1 brian users 11320803 Jul 21 12:11 mach64_dri.so

+-rwxr-xr-x   1 brian users 11418014 Jul 21 12:12 mga_dri.so

+-rwxr-xr-x   1 brian users 11064426 Jul 21 12:12 r128_dri.so

+-rwxr-xr-x   1 brian users 11849858 Jul 21 12:12 r200_dri.so

+-rwxr-xr-x   1 brian users 16050488 Jul 21 12:11 r300_dri.so

+-rwxr-xr-x   1 brian users 11757388 Jul 21 12:12 radeon_dri.so

+-rwxr-xr-x   1 brian users 11232304 Jul 21 12:13 s3v_dri.so

+-rwxr-xr-x   1 brian users 11062970 Jul 21 12:13 savage_dri.so

+-rwxr-xr-x   1 brian users 11214212 Jul 21 12:13 sis_dri.so

+-rwxr-xr-x   1 brian users 11368736 Jul 21 12:13 tdfx_dri.so

+-rwxr-xr-x   1 brian users 10598868 Jul 21 12:13 trident_dri.so

+-rwxr-xr-x   1 brian users 10997120 Jul 21 12:13 unichrome_dri.so

+</pre>

+

+<p>

+If you built with Gallium support, look in lib/gallium/ for Gallium-based

+versions of libGL and device drivers.

+</p>

+

+

+

+<a name="install">

+<H3>1.6 Installing the header and library files</H3>

+

+<p>

+The standard location for the OpenGL header files on Unix-type systems is

+in <code>/usr/include/GL/</code>.

+The standard location for the libraries is <code>/usr/lib/</code>.

+For more information see, the

+<a href="http://oss.sgi.com/projects/ogl-sample/ABI/" target="_parent">

+Linux/OpenGL ABI specification</a>.

+</p>

+

+<p>

+If you'd like Mesa to co-exist with another implementation of OpenGL that's

+already installed, you'll have to choose different directories, like

+<code>/usr/local/include/GL/</code> and <code>/usr/local/lib/</code>.

+</p>

+

+<p>

+To install Mesa's headers and libraries, run <code>make install</code>.

+But first, check the Mesa/configs/default file and examine the values

+of the <b>INSTALL_DIR</b> and <b>DRI_DRIVER_INSTALL_DIR</b> variables.

+Change them if needed, then run <code>make install</code>.

+</p>

+

+<p>

+The variable

+<b>DESTDIR</b> may also be used to install the contents to a temporary

+staging directory.

+This can be useful for package management.

+For example: <code>make install DESTDIR=/somepath/</code>

+</p>

+

+<p>

+Note: at runtime you can use the LD_LIBRARY_PATH environment variable

+(on Linux at least) to switch

+between the Mesa libraries and other vendor's libraries whenever you want.

+This is a handy way to compare multiple OpenGL implementations.

+</p>

+

+

+<a name="pkg-config">

+<H3>1.7 Building OpenGL programs with pkg-config</H3>

+

+<p>

+Running <code>make install</code> will install package configuration files

+for the pkg-config utility.

+</p>

+

+<p>

+When compiling your OpenGL application you can use pkg-config to determine

+the proper compiler and linker flags.

+</p>

+

+<p>

+For example, compiling and linking a GLUT application can be done with:

+</p>

+<pre>

+   gcc `pkg-config --cflags --libs glut` mydemo.c -o mydemo

+</pre>

+

+<br>

+

+<a name="windows">

+<H2>2. Windows Compilation and Installation</H1>

+

+<p>

+Please see the <a href="#scons">instructions on building with SCons</a>.

+Alternatively see <a href="README.WIN32">README.WIN32</a> file.

+</p>

+

+

+

+<a name="scons">

+<H2>3. Building with SCons</H1>

+

+<p>

+To build Mesa with SCons on Linux or Windows do

+</p>

+<pre>

+    scons

+</pre>

+<p>

+The build output will be placed in

+build/<i>platform</i>-<i>machine</i>-<i>debug</i>/..., where <i>platform</i> is for

+example linux or windows, <i>machine</i> is x86 or x86_64, optionally followed

+by -debug for debug builds.

+</p>

+

+<p>

+To build Mesa with SCons for Windows on Linux using the MinGW crosscompiler toolchain do

+</p>

+<pre>

+    scons platform=windows toolchain=crossmingw machine=x86 statetrackers=mesa drivers=softpipe,trace winsys=gdi

+</pre>

+<p>

+This will create:

+</p>

+<ul>

+<li>build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll &mdash; Mesa + Gallium + softpipe, binary compatible with Windows's opengl32.dll 

+<li>build/windows-x86-debug/glut/glx/glut32.dll

+<li>progs/build/windows-x86-debug/wgl/wglinfo.exe

+<li>progs/build/windows-x86-debug/trivial/tri.exe

+<li>and many other samples in progs/build/windows-x86-debug/...

+</ul>

+<p>

+Put them all in the same directory to test them.

+</p>

+

+

+<a name="other">

+<H2>4. Other systems</H1>

+

+<p>

+Documentation for other environments (some may be very out of date):

+</p>

+

+<UL>

+<li><A HREF="README.VMS">README.VMS</A> - VMS

+<LI><A HREF="README.GGI">README.GGI</A> - GGI

+<LI><A HREF="README.3DFX">README.3DFX</A> - 3Dfx/Glide driver

+<LI><A HREF="README.AMIWIN">README.AMIWIN</A> - Amiga Amiwin

+<LI><A HREF="README.BEOS">README.BEOS</A> - BeOS

+<LI><A HREF="README.D3D">README.D3D</A> - Direct3D driver

+<LI><A HREF="README.DJ">README.DJ</A> - DJGPP

+<LI><A HREF="README.LYNXOS">README.LYNXOS</A> - LynxOS

+<LI><A HREF="README.MINGW32">README.MINGW32</A> - Mingw32

+<LI><A HREF="README.NeXT">README.NeXT</A> - NeXT

+<LI><A HREF="README.OpenStep">README.OpenStep</A> - OpenStep

+<LI><A HREF="README.OS2">README.OS2</A> - OS/2

+<LI><A HREF="README.WINDML">README.WINDML</A> - WindML

+</UL>

+

+

+

+

+</body>

+</html>

diff --git a/mesalib/docs/news.html b/mesalib/docs/news.html
index 6a706ab3c..8185e14a9 100644
--- a/mesalib/docs/news.html
+++ b/mesalib/docs/news.html
@@ -1,1319 +1,1319 @@
-<HTML>
-
-<TITLE>Mesa News</TITLE>
-
-<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<body bgcolor="#eeeeee">
-
-<H1>News</H1>
-
-
-<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
-stable releases containing bug fixes since the 7.9.1 and 7.10 releases.
-</p>
-
-
-<h2>October 4, 2010</h2>
-
-<p>
-<a href="relnotes-7.9.html">Mesa 7.9</a> (final) is released.  This is a new
-development release.
-</p>
-
-
-<h2>September 27, 2010</h2>
-
-<p>
-<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>
-
-
-<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
-release collecting fixes since the 7.8.1 release.
-</p>
-
-
-<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
-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
-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
-development release.
-</p>
-
-
-
-<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
-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
-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
-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.
-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.
-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.
-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>
-
-
-<h2>June 23, 2009</h2>
-<p>
-<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>
-
-
-<h2>June 19, 2009</h2>
-<p>
-<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.
-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.
-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.
-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.
-This is a new development release.
-Mesa 7.4 will follow and will have bug fixes relative to 7.3.
-</p>
-
-
-<h2>September 20, 2008</h2>
-<p>
-<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.
-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
-previous stable release).
-</p>
-
-
-<h2>August 16, 2008</h2>
-<p>
-<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.
-This is a bug-fix release.
-</p>
-
-
-<h2>January 24, 2008</h2>
-
-<p>
-Added a new page describing the <a href="cell.html">Mesa Cell driver</a>.
-</p>
-
-
-
-<h2>November 13, 2007</h2>
-
-<p>
-Gallium3D is the codename for the new Mesa device driver architecture
-which is currently under development.
-</p>
-<p>
-Gallium3D development is taking place on the <em>gallium-0.1</em> branch
-of the git repository.
-Currently, there's only a software-only driver and an Intel i915/945 driver
-but other drivers will be coming...
-</p>
-
-
-<h2>November 10, 2007</h2>
-<p>
-<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.
-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.
-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.
-This is a development release which will lead up to the Mesa 7.0 release
-(which will advertise OpenGL 2.1 API support).
-</p>
-
-
-<h2>March 26, 2007</h2>
-<p>
-The new Shading Language compiler branch has been merged into the git
-master branch.  This is a step toward hardware support for the OpenGL
-2.0 Shading Language and will be included in the next Mesa release.
-In conjunction, <a href="http://glean.sf.net" target="_parent">Glean
-</a> has been updated with a new test that does over 130 tests of the
-shading language and built-in functions.
-</p>
-
-<h2>April 2007</h2>
-<p>
-Thomas Hellstr&ouml;m of Tungsten Graphics has written a whitepaper
-describing the new DRI memory management system</a>.
-</p>
-
-<h2>December 5, 2006</h2>
-<p>
-Mesa is now using git as its source code management system.
-The previous CVS repository should no longer be used.
-See the <a href="repository.html">repository page</a> for more information.
-</p>
-
-<h2>December 2, 2006</h2>
-<p>
-<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.
-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.
-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.
-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.
-This is stable, bug-fix release.
-</p>
-
-
-
-<h2>October 24, 2005</h2>
-<p>
-<a href="relnotes-6.4.html">Mesa 6.4</a> has been released.
-This is stable, bug-fix release.
-</p>
-
-
-<h2>August 19, 2005</h2>
-<p>
-Mesa 6.3.2 has been released.
-Note: there was no public release of version 6.3.1.
-</p>
-<a href="versions.html#6.3.2">Changes in version 6.3.1</a>
-<p>
-The MD5 checksums are:
-</p>
-<pre>
-98192e45ed8d69113688f89f90869346  MesaLib-6.3.2.tar.gz
-0df27701df0924d17ddf41185efa8ce1  MesaLib-6.3.2.tar.bz2
-ccb2423aab77fc7e81ce628734586140  MesaLib-6.3.2.zip
-9d0fca0a7d051c34a0b485423fb3e85d  MesaDemos-6.3.2.tar.gz
-96708868450c188205e42229b5d813c4  MesaDemos-6.3.2.tar.bz2
-c5102501e609aa8996d832fafacb8ab9  MesaDemos-6.3.2.zip
-</pre>
-
-
-<h2>July 20, 2005</h2>
-<p>
-Mesa 6.3 has been released.
-This is a development release with new features, changes and bug fixes.
-</p>
-<pre>
-    New:
-	- GL_EXT_framebuffer_object extension
-	- GL_ARB_draw_buffers extension
-	- GL_ARB_pixel_buffer_object extension
-	- GL_OES_read_format extension (Ian Romanick)
-	- DirectFB driver (Claudio Ciccani)
-	- x86_64 vertex transformation code (Mikko T.)
-    Changes:
-	- added -stereo option for glxgears demo (Jacek Rosik)
-	- updated the PBuffer demo code in xdemos/ directory
-	- glDeleteTextures/Programs/Buffers() now makes the object ID
-	  available for immediate re-use
-	- assorted 64-bit clean-ups fixes (x86_64 and Win64)
-	- lots of internal changes for GL_EXT_framebuffer_object
-    Bug fixes:
-	- some functions didn't support PBO functionality
-	- glGetTexImage didn't convert color index images to RGBA as required
-	- fragment program texcoords were sometimes wrong for points and lines
-	- fixed problem with negative dot product in arbfplight, fplight demos
-	- fixed bug in perspective correction of antialiased, textured lines
-	- querying GL_POST_CONVOLUTION_ALPHA_BIAS_EXT returned wrong value
-	- fixed a couple per-pixel fog bugs (Soju Matsumoto)
-	- glGetBooleanv(GL_FRAGMENT_PROGRAM_BINDING_NV) was broken
-	- fixed float parsing bug in ARB frag/vert programs (bug 2520)
-	- XMesaGetDepthBuffer() returned incorrect value for bytesPerValue
-	- GL_COLOR_MATERIAL with glColor3 didn't properly set diffuse alpha
-	- glXChooseFBConfig() crashed if attribList pointer was NULL
-	- program state.light[n].spot.direction.w was wrong value (bug 3083)
-	- fragment program fog option required glEnable(GL_FOG) - wrong.
-	- glColorTable() could produce a Mesa implementation error (bug 3135)
-	- RasterPos could get corrupted by color index rendering path
-	- Removed bad XTranslateCoordinates call when rendering to Pixmaps
-	- glPopAttrib() didn't properly restore GL_TEXTURE_GEN enable state
-	- fixed a few Darwin compilation problems
-</pre>
-<p>
-The MD5 checksums are:
-</p>
-<pre>
-0236f552d37514776945d5a013e5bb7b  MesaLib-6.3.tar.gz
-60e1a8f78c4a8c7750a1e95753190986  MesaLib-6.3.tar.bz2
-ca7c950fbace68c70caa822322db7223  MesaLib-6.3.zip
-25ea801645b376c014051804fe4974b2  MesaDemos-6.3.tar.gz
-9248e74872ea88c57ec25c900c295057  MesaDemos-6.3.tar.bz2
-8537dfa734ef258dcc7272097558d434  MesaDemos-6.3.zip
-</pre>
-
-
-<h2>December 9, 2004</h2>
-<p>
-Mesa 6.2.1 has been released.
-This is a stable release which just fixes bugs since the 6.2 release.
-</p>
-<pre>
-    Bug fixes:
-	- don't apply regular fog or color sum when using a fragment program
-	- glProgramEnvParameter4fARB always generated an error on
-	  GL_FRAGMENT_PROGRAM_ARB (fdo bug 1645)
-	- glVertexAttrib3svNV and glVertexAttrib3svARB were broken
-	- fixed width/height mix-up in glSeparableFilter2D()
-	- fixed regression in glCopyPixels + convolution
-	- glReadPixels from a clipped front color buffer didn't always work
-	- glTexImage didn't accept GL_RED/GREEN/BLUE as the format
-	- Attempting queries/accesses of VBO 0 weren't detected as errors
-	- paletted textures failed if the palette had fewer than 256 entries
-    Changes:
-	- fixed a bunch of compiler warnings found with gcc 3.4
-	- bug reports should to go bugzilla.freedesktop.org
-</pre>
-<p>
-The MD5 checksums are:
-</p>
-<pre>
-80008a92f6e055d3bfdde2cf331ec3fa  MesaLib-6.2.1.tar.gz
-f43228cd2bf70f583ef3275c1c545421  MesaLib-6.2.1.tar.bz2
-dec26cfd40116ad021020fea2d94f652  MesaLib-6.2.1.zip
-2c7af3c986a7571c8713c8bfee7e49e3  MesaDemos-6.2.1.tar.gz
-3cac74667b50bcbd4f67f594fb4224a2  MesaDemos-6.2.1.tar.bz2
-75b3edd12eb2b370caf05f29b99e508a  MesaDemos-6.2.1.zip
-</pre>
-
-
-<h2>October 2, 2004</h2>
-<p>
-Mesa 6.2 has been released.
-This is a stable release which just fixes bugs since the 6.1 release.
-</p>
-<pre>
-    New:
-	- enabled GL_ARB_texture_rectangle (same as GL_NV_texture_rectangle)
-	- updated Doxygen support (Jose Fonseca)
-    Changes:
-	- some GGI driver updates (Christoph Egger, bug 1025977)
-    Bug fixes:
-	- Omit GL_ARB_texture_non_power_of_two from list of OpenGL 1.5 features
-	- fixed a few compilation issues on IRIX
-	- fixed a matrix classification bug (reported by Wes Bethel)
-	- we weren't reseting the vertex/fragment program error state
-	  before parsing (Dave Reveman)
-	- adjust texcoords for sampling texture rectangles (Dave Reveman)
-	- glGet*(GL_MAX_VERTEX_ATTRIBS_ARB) wasn't implemented
-	- repeated calls to glDeleteTexture(t) could lead to a crash
-	- fixed potential ref count bugs in VBOs and vertex/fragment programs
-	- spriteblast demo didn't handle window size changes correctly
-	- glTexSubImage didn't handle pixels=NULL correctly for PBOs
-	- fixed color index mode glDrawPixels bug (Karl Schultz)
-</pre>
-<p>
-The MD5 checksums are:
-</p>
-<pre>
-9e8f34b059272dbb8e1f2c968b33bbf0  MesaLib-6.2.tar.gz
-3d6a6362390b6a37d3cb2e615f3ac7db  MesaLib-6.2.tar.bz2
-6cfd7895d28e695c0dbbed9469564091  MesaLib-6.2.zip
-3e06e33b0809f09855cb60883b8bdfef  MesaDemos-6.2.tar.gz
-9d160009c3dfdb35fe7e4088c9ba8f85  MesaDemos-6.2.tar.bz2
-856f7ec947122eb3c8985ebc2f654dcd  MesaDemos-6.2.zip
-</pre>
-
-
-<h2>August 18, 2004</h2>
-<p>
-Mesa 6.1 has been released.
-This is a new development release (version 6.2 will be a stabilization
-release).
-</p>
-<pre>
-    New:
-	- Revamped Makefile system
-	- glXUseRotatedXFont() utility (see xdemos/xuserotfont.c)
-	- internal driver interface changes related to texture object
-	  allocation, vertex/fragment programs, BlendEquationSeparate, etc.
-	- option to walk triangle edges with double-precision floats
-	  (Justin Novosad of Discreet) (see config.h file)
-	- support for AUX buffers in software GLX driver
-	- updated glext.h to version 24 and glxext.h to version 6
-	- new MESA_GLX_FORCE_ALPHA and MESA_GLX_DEPTH_BITS env vars
-	- updated BeOS support (Philippe Houdoin)
-    Changes:
-	- fragment fog interpolation is perspective corrected now
-	- new glTexImage code, much cleaner, may be a bit faster
-    Bug fixes:
-	- glArrayElement in display lists didn't handle generic vertex attribs
-	- glFogCoord didn't always work properly
-	- ARB_fragment_program fog options didn't work
-	- frag prog TEX instruction no longer incorrectly divides s,t,r by q
-	- ARB frag prog TEX and TEXP instructions now use LOD=0
-	- glTexEnviv in display lists didn't work
-	- glRasterPos didn't do texgen or apply texture matrix
-	- GL_DOUBLE-valued vertex arrays were broken in some cases
-	- fixed texture rectangle edge/border sampling bugs
-	- sampling an incomplete texture in a fragment program would segfault
-	- glTexImage was missing a few error checks
-	- fixed some minor glGetTexParameter glitches
-	- GL_INTENSITY was mistakenly accepted as a <format> to glTexImage
-	- fragment program writes to RC/HC register were broken
-	- fixed a few glitches in GL_HP_occlusion_test extension
-	- glBeginQueryARB and glEndQueryARB didn't work inside display lists
-	- vertex program state references were broken
-	- fixed triangle color interpolation bug on AIX (Shane Blackett)
-	- fixed a number of minor memory leaks (bug #1002030)
-</pre>
-The MD5 checksums are:
-</p>
-<pre>
-c9284d295ebcd2e0486cc3cd54e5863c  MesaLib-6.1.tar.gz
-5de1f53ec0709f60fc68fdfed57351f3  MesaLib-6.1.tar.bz2
-483e77cac4789a5d36c42f3c0136d6d8  MesaLib-6.1.zip
-8c46cfa6f9732acc6f6c25724aad0246  MesaDemos-6.1.tar.gz
-89bfe0f6c69b39fd0ebd9fff481a4e9b  MesaDemos-6.1.tar.bz2
-161268531fcc6f0c5a056430ee97e0c1  MesaDemos-6.1.zip
-</pre>
-
-
-
-<h2>April 2, 2004</h2>
-
-<p>
-Mesa 6.0.1 has been released.
-This release basically just fixes bugs since the 6.0. release.
-</p>
-<pre>
-    New:
-	- upgraded glext.h to version 22
-	- new build targets (Dan Schikore)
-	- new linux-x86-opteron build target (Heath Feather)
-    Bug fixes:
-	- glBindProgramARB didn't update all necessary state
-	- fixed build problems on OpenBSD
-	- omit CVS directories from tarballs
-	- glGetTexImage(GL_COLOR_INDEX) was broken
-	- fixed an infinite loop in t&l module
-	- silenced some valgrind warnings about using unitialized memory
-	- fixed some compilation/link glitches on IRIX (Mike Stephens)
-	- glBindProgram wasn't getting compiled into display lists
-	- GLX_FBCONFIG_ID wasn't recognized in glXChooseFBConfig() (bug 888079)
-	- two-sided lighting and vertex program didn't work (bug 887330)
-	- stores to program parameter registers in vertex state programs
-	  didn't work.
-	- fixed glOrtho bug found with gcc 3.2.2 (RH9)
-	- glXCreateWindow() wasn't fully implemented (bug 890894)
-	- generic vertex attribute arrays didn't work in display lists
-	- vertex buffer objects' default usage and access fields were wrong
-	- glDrawArrays with start!=0 was broken
-	- fragment program PK2H, UP2H, UP4B and UP4UB instructions were broken
-	- linux-osmesa16-static config didn't work
-	- fixed a few color index rendering problems (bug 910687)
-	- glInterleavedArrays didn't respect GL_CLIENT_ACTIVE_TEXTURE
-	- OSMesa RGB and BGR modes were broken
-	- glProgramStringARB mistakenly required a null-terminated string
-	- fragment program XPD instruction was incorrect
-	- glGetMaterial() didn't work reliably
-</pre>
-The MD5 checksums are:
-</p>
-<pre>
-011be0e79666c7a6eb9693fbf9348653  MesaLib-6.0.1.tar.gz
-b7f14088c5c2f14490d2739a91102112  MesaLib-6.0.1.tar.bz2
-bf0510cf0a2b87d64cdd317eca3f1db1  MesaLib-6.0.1.zip
-b7b648599e0aaee1c4ffc554a2a9139e  MesaDemos-6.0.1.tar.gz
-dd6aadfd9ca8e1cfa90c6ee492bc6f43  MesaDemos-6.0.1.tar.bz2
-eff71d59c211825e949199852f5a2316  MesaDemos-6.0.1.zip
-</pre>
-
-
-
-<h2>January 16, 2004</h2>
-
-<p>
-Mesa 6.0 has been released.  This is a stabilization of the 5.1 release
-and primarily just incorporates bug fixes.
-</p>
-<pre>
-    New:
-	- full OpenGL 1.5 support
-	- updated GL/glext.h file to version 21
-    Changes:
-	- changed max framebuffer size to 4Kx4K (MAX_WIDTH/HEIGHT in config.h)
-    Bug fixes:
-	- fixed bug in UNCLAMPED_FLOAT_TO_UBYTE macro; solves a color
-	  clamping issue
-	- updated suno5-gcc configs
-	- glColor3 functions sometimes resulted in undefined alpha values
-	- fixed FP divide by zero error seen on VMS with xlockmore, others
-	- fixed vertex/fragment program debug problem (bug 873011)
-	- building on AIX with gcc works now
-	- glDeleteProgramsARB failed for ARB fragment programs (bug 876160)
-	- glDrawRangeElements tried to modify potentially read-only storage
-	- updated files for building on Windows
-</pre>
-
-
-
-<h2>December 28, 2003</h2>
-
-<p>
-The Mesa CVS server has been moved to <a href="http://www.freedesktop.org"
-target="_parent">
-freedesktop.org</a> because of problems with SourceForge's anonymous
-CVS service.
-</p>
-
-<p>Please see the <a href="cvs_access.html">CVS access page</a> for details.
-</p>
-
-
-<h2>December 17, 2003</h2>
-
-<p>
-Mesa 5.1 has been released.  This is a new development release.
-Mesa 6.0 will be the next stable release and will support all
-OpenGL 1.5 features.
-</p>
-<pre>
-    New features:
-	- reorganized directory tree
-	- GL_ARB_vertex/fragment_program extensions (Michal Krol & Karl Rasche)
-	- GL_ATI_texture_env_combine3 extension (Ian Romanick)
-	- GL_SGI_texture_color_table extension (Eric Plante)
-	- GL_NV_fragment_program extension
-	- GL_NV_light_max_exponent extension
-	- GL_EXT_texture_rectangle (identical to GL_NV_texture_rectangle)
-	- GL_ARB_occlusion_query extension
-	- GL_ARB_point_sprite extension
-	- GL_ARB_texture_non_power_of_two extension
-	- GL_IBM_multimode_draw_arrays extension
-	- GL_EXT_texture_mirror_clamp extension (Ian Romanick)
-	- GL_ARB_vertex_buffer_object extension
-	- new X86 feature detection code (Petr Sebor)
-	- less memory used for display lists and vertex buffers
-	- 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)
-    Bug fixes:
-	- really enable OpenGL 1.4 features in DOS driver.
-	- fixed issues in glDrawPixels and glCopyPixels for very wide images
-	- glPixelMapf/ui/usv()'s size parameter is GLsizei, not GLint
-	- fixed some texgen bugs reported by Daniel Borca
-	- fixed wglMakeCurrent(NULL, NULL) bug (#835861)
-	- fixed glTexSubImage3D z-offset bug (Cedric Gautier)
-	- fixed RGBA blend enable bug (Ville Syrjala)
-	- glAccum is supposed to be a no-op in selection/feedback mode
-	- fixed texgen bug #597589 (John Popplewell)
-    Changes:
-	- dropped API trace feature (src/Trace/)
-	- documentation overhaul.  merged with website content.  more html.
-	- glxgears.c demo updated to use GLX swap rate extensions
-	- glTexImage1/2/3D now allows width/height/depth = 0
-	- disable SPARC asm code on Linux (bug 852204)
-</pre>
-
-The MD5 checksums are:
-</p>
-<pre>
-78f452f6c55478471a744f07147612b5  MesaLib-5.1.tar.gz
-67b3b8d3f7f4c8c44904551b851d01af  MesaLib-5.1.tar.bz2
-6dd19ffa750ec7f634e370a987505c9d  MesaLib-5.1.zip
-e0214d4ebb22409dfa9262f2b52fd828  MesaDemos-5.1.tar.gz
-066c9aff4fd924405de1ae9bad5ec9a7  MesaDemos-5.1.tar.bz2
-d2b5ba32b53e0ad0576c637a4cc1fb41  MesaDemos-5.1.zip
-</pre>
-
-
-<H2>November 12, 2003</H2>
-
-<p>
-New Mesa 5.0.2 tarballs have been uploaded to SourceForge which fix a
-number of automake/libtool problems.
-</p>
-<p>
-The new MD5 checksums are:
-</p>
-<pre>
-a9dcf3ff9ad1b7d6ce73a0df7cff8b5b  MesaLib-5.0.2.tar.gz
-7b4bf9261657c2fca03796d4955e6f50  MesaLib-5.0.2.tar.bz2
-79c141bddcbad557647535d02194f346  MesaLib-5.0.2.zip
-952d9dc823dd818981d1a648d7b2668a  MesaDemos-5.0.2.tar.gz
-b81fafff90995025d2f25ea02b786642  MesaDemos-5.0.2.tar.bz2
-a21be975589e8a2d1871b6bb7874fffa  MesaDemos-5.0.2.zip
-</pre>
-
-
-
-<h2>September 5, 2003</h2>
-
-<p>
-Mesa 5.0.2 has been released.  This is a stable, bug-fix release.
-</p>
-<pre>
-    Bug fixes:
-	- fixed texgen problem causing texcoord's Q to be zero (stex3d)
-	- default GL_TEXTURE_COMPARE_MODE_ARB was wrong
-	- GL_CURRENT_MATRIX_NV query was wrong
-	- GL_CURRENT_MATRIX_STACK_DEPTH_NV query was off by one
-	- GL_LIST_MODE query wasn't correct
-	- GL_FOG_COORDINATE_SOURCE_EXT query wasn't supported
-	- GL_SECONDARY_COLOR_ARRAY_SIZE_EXT query returned wrong value
-	- blended, wide lines didn't always work correctly (bug 711595)
-	- glVertexAttrib4svNV w component was always 1
-	- fixed bug in GL_IBM_rasterpos_clip (missing return)
-	- GL_DEPTH_TEXTURE_MODE = GL_ALPHA didn't work correctly
-	- a few Solaris compilation fixes
-	- fixed glClear() problem for DRI drivers (non-existant stencil, etc)
-	- fixed int/REAL mixup in GLU NURBS curve evaluator (Eric Cazeaux)
-	- fixed delete [] bug in SI GLU (bug 721765) (Diego Santa Cruz)
-	- glFog() didn't clamp fog colors
-	- fixed bad float/int conversion for GL_TEXTURE_PRIORITY in the
-	  gl[Get]TexParameteri[v] functions
-	- fixed invalid memory references in glTexGen functions (bug 781602)
-	- integer-valued color arrays weren't handled correctly
-	- glDrawPixels(GL_DEPTH_COMPONENT) with glPixelZoom didn't work
-	- GL_EXT_texture_lod_bias is part of 1.4, overlooked in 5.0.1
-    Changes:
-	- build GLUT with -fexceptions so C++ apps propogate exceptions
-</pre>
-
-
-
-<h2>June 2003</h2>
-
-<p>
-Mesa's directory tree has been overhauled.
-Things are better organized now with some thought toward future needs.
-</p>
-<p>
-In CVS, the latest Mesa 5.1 development code is now rooted under the
-<b>Mesa-newtree/</b> directory.  The old top-level <b>Mesa/</b> directory
-holds the Mesa 5.0.x code which will be abandoned at some point.
-</p>
-
-
-
-<h2>March 30, 2003</h2>
-
-<p>
-Mesa 5.0.1 has been released.  This is a stable, bug-fix release.
-</p>
-<pre>
-    New:
-	- DOS driver updates from Daniel Borca
-	- updated GL/gl_mangle.h file (Bill Hoffman)
-    Bug fixes:
-	- auto mipmap generation for cube maps was broken (bug 641363)
-	- writing/clearing software alpha channels was unreliable
-	- minor compilation fixes for OS/2 (Evgeny Kotsuba)
-	- fixed some bad assertions found with shadowtex demo
-	- fixed error checking bug in glCopyTexSubImage2D (bug 659020)
-	- glRotate(angle, -x, 0, 0) was incorrect (bug 659677)
-	- fixed potential segfault in texture object validation (bug 659012)
-	- fixed some bogus code in _mesa_test_os_sse_exception_support (Linus)
-	- fix fog stride bug in tnl code for h/w drivers (Michel Danzer)
-	- fixed glActiveTexture / glMatrixMode(GL_TEXTURE) bug (#669080)
-	- glGet(GL_CURRENT_SECONDARY_COLOR) should return 4 values, not 3
-	- fixed compilation problem on Solaris7/x86 (bug 536406)
-	- fixed prefetch bug in 3DNow! code (Felix Kuhling)
-	- fixed NeXT build problem (FABSF macro)
-	- glDrawPixels Z values when glPixelZoom!=1 were invalid (bug 687811)
-	- zoomed glDraw/CopyPixels with clipping sometimes failed (bug 689964)
-	- AA line and triangle Z values are now rounded, not truncated
-	- fixed color interpolation bug when GLchan==GLfloat (bug 694461)
-	- glArePrograms/TexturesResident() wasn't 100% correct (Jose Fonseca)
-	- fixed a minor GL_COLOR_MATERIAL bug
-	- NV vertex program EXP instruction was broken
-	- glColorMask misbehaved with X window / pixmap rendering
-	- fix autoconf/libtool GLU C++ linker problem on Linux (a total hack)
-	- attempt to fix GGI compilation problem when MesaDemos not present
-	- NV vertex program ARL-relative fetches didn't work
-    Changes:
-	- use glPolygonOffset in gloss demo to avoid z-fighting artifacts
-	- updated winpos and pointblast demos to use ARB extensions
-	- disable SPARC normal transformation code (bug 673938)
-	- GLU fixes for OS/2 (Evgeny Kotsuba)
-</pre>
-<p>
-MD5 checksums follow:
-</p>
-<pre>
-b80f8b5d53a3e9f19b9fde5af0c542f0  MesaLib-5.0.1.tar.gz
-513b4bbd7d38951f05027179063d876b  MesaLib-5.0.1.tar.bz2
-eebd395678f4520d33b267e5d5c22651  MesaLib-5.0.1.zip
-49d7feaec6dc1d2091d7c3cc72a9b320  MesaDemos-5.0.1.tar.gz
-37190374a98c3c892f0698be9ca3acf0  MesaDemos-5.0.1.tar.bz2
-becd8bf17f5791361b4a54ba2a78e5c9  MesaDemos-5.0.1.zip
-</pre>
-
-
-
-<h2>March 7, 2003</h2>
-<p>
-Website and documentation overhaul.
-</p>
-<p>
-The website content and Mesa documentation (from the doc/ directory) have
-been merged together.
-All the documentation files have been entered into the CVS repository.
-Many of the old plain-text files have been converted to html and modernized.
-</p>
-
-
-<h2>November 13, 2002</h2>
-<p>Mesa 5.0 has been released.  This is a stable release which
-implements the OpenGL 1.4 specification.
-</p><pre>New:
-    - OpenGL 1.4 support (glGetString(GL_VERSION) returns "1.4")
-    - removed some overlooked debugging code
-    - glxinfo updated to support GLX_ARB_multisample
-    - GLUT now support GLX_ARB_multisample
-    - updated DOS driver (Daniel Borca)
-Bug fixes:
-    - GL_POINT and GL_LINE-mode polygons didn't obey cull state
-    - fixed potential bug in _mesa_align_malloc/calloc()
-    - fixed missing triangle bug when running vertex programs
-    - fixed a few HPUX compilation problems
-    - FX (Glide) driver didn't compile
-    - setting GL_TEXTURE_BORDER_COLOR with glTexParameteriv() didn't work
-    - a few EXT functions, like glGenTexturesEXT, were no-ops
-    - a few OpenGL 1.4 functions like glFogCoord*, glBlendFuncSeparate,
-      glMultiDrawArrays and glMultiDrawElements were missing
-    - glGet*(GL_ACTIVE_STENCIL_FACE_EXT) was broken
-    - Pentium 4 Mobile was mistakenly identified as having 3DNow!
-    - fixed one-bit error in point/line fragment Z calculation
-    - fixed potential segfault in fakeglx code
-    - fixed color overflow problem in DOT3 texture env mode
-</pre>
-
-
-<h2>October 29, 2002</h2>
-<p>Mesa 4.1 has been released.  This is a new development release.
-For a stable release, get 4.0.4.
-</p><pre>New:
-    - GL_NV_vertex_program extension
-    - GL_NV_vertex_program1_1 extension
-    - GL_ARB_window_pos extension
-    - GL_ARB_depth_texture extension
-    - GL_ARB_shadow extension
-    - GL_ARB_shadow_ambient extension
-    - GL_EXT_shadow_funcs extension
-    - GL_ARB_point_parameters extension
-    - GL_ARB_texture_env_crossbar
-    - GL_NV_point_sprite extension
-    - GL_NV_texture_rectangle extension
-    - GL_EXT_multi_draw_arrays extension
-    - GL_EXT_stencil_two_side extension
-    - GLX_SGIX_fbconfig and GLX_SGIX_pbuffer extensions
-    - GL_ATI_texture_mirror_once extension (Ian Romanick)
-    - massive overhaul/simplification of software rasterizer module,
-      many contributions from Klaus Niederkrueger
-    - faster software texturing in some cases (i.e. trilinear filtering)
-    - new OSMesaGetProcAddress() function
-    - more blend modes implemented with MMX code (Jose Fonseca)
-    - added glutGetProcAddress() to GLUT
-    - added GLUT_FPS env var to compute frames/second in glutSwapBuffers()
-    - pbinfo and pbdemo PBuffer programs
-    - glxinfo -v prints transprent pixel info (Gerd Sussner)
-Bug fixes:
-    - better mipmap LOD computation (prevents excessive blurriness)
-    - OSMesaMakeCurrent() didn't recognize buffer size changes
-    - assorted conformance fixes for 16-bit/channel rendering
-    - texcombine alpha subtraction mode was broken
-    - fixed some blend problems when GLchan==GLfloat (Gerk Huisma)
-    - clamp colors to [0,1] in OSMesa if GLchan==GLfloat (Gerk Huisma)
-    - fixed divide by zero error in NURBS tessellator (Jon Perry)
-    - fixed GL_LINEAR fog bug by adding clamping
-    - fixed FP exceptions found using Alpha CPU
-    - 3dfx/glide driver render-to-window feature was broken
-    - added missing GLX_TRANSPARENT_RGB token to glx.h
-    - fixed error checking related to paletted textures
-    - fixed reference count error in glDeleteTextures (Randy Fayan)
-Changes:
-    - New spec file and Python code to generate some GL dispatch files
-    - Glide driver defaults to "no" with autoconf/automake
-    - floating point color channels now clamped to [0,inf)
-    - updated demos/stex3d with new options
-</pre>
-
-
-<h2>October 4, 2002</h2>
-<p>
-The <a href="http://mesa3d.sourceforge.net/docs/MesaFAQ.html">Mesa FAQ</a> has been rewritten.
-</p>
-
-<h2>October 3, 2002</h2>
-<p>Mesa 4.0.4 has been released.  This is a stable bug-fix release.
-</p><pre>    New:
-	- GL_NV_texture_rectangle extension
-	- updated glext.h header (version 17)
-	- updated DOS driver (Daniel Borca)
-	- updated BeOS R5 driver (Philippe Houdoin)
-	- added GL_IBM_texture_mirror_repeat
-	- glxinfo now takes -l option to print interesting OpenGL limits info
-	- GL_MESA_ycbcr_texture extension
-	- GL_APPLE_client_storage extension (for some DRI drivers only)
-	- GL_MESA_pack_invert extension
-    Bug fixes:
-	- fixed GL_LINEAR fog bug by adding clamping
-	- fixed FP exceptions found using Alpha CPU
-	- 3dfx MESA_GLX_FX=window (render to window) didn't work
-	- fixed memory leak in wglCreateContest (Karl Schultz)
-	- define GLAPIENTRY and GLAPI if undefined in glu.h
-	- wglGetProcAddress didn't handle all API functions
-	- when testing for OpenGL 1.2 vs 1.3, check for GL_ARB_texture_cube_map
-	- removed GL_MAX_CONVOLUTION_WIDTH/HEIGHT from glGetInteger/Float/etc()
-	- error checking in compressed tex image functions had some glitches
-	- fixed AIX compile problem in src/config.c
-	- glGetTexImage was using pixel unpacking instead of packing params
-	- auto-mipmap generation for cube maps was incorrect
-    Changes:
-	- max texture units reduced to six to accomodate texture rectangles
-	- removed unfinished GL_MESA_sprite_point extension code
-</pre>
-
-<h2>June 25, 2002</h2>
-<p>Mesa 4.0.3 has been released.  This is a stable bug-fix release.
-</p><pre>    New:
-    - updated GL/glext.h file (version 15)
-    - corrected MMX blend code (Jose Fonseca)
-    - support for software-based alpha planes in Windows driver
-    - updated GGI driver (Filip Spacek)
-    Bug fixes:
-    - glext.h had wrong values for GL_DOT3_RGB[A]_EXT tokens
-    - OSMesaMakeCurrent() didn't recognize buffer size changes
-    - assorted conformance fixes for 16-bit/channel rendering
-    - texcombine alpha subtraction mode was broken
-    - fixed lighting bug with non-uniform scaling and display lists
-    - fixed bug when deleting shared display lists
-    - disabled SPARC cliptest assembly code (Mesa bug 544665)
-    - fixed a couple Solaris compilation/link problems
-    - blending clipped glDrawPixels didn't always work
-    - glGetTexImage() didn't accept packed pixel types
-    - glPixelMapu[is]v() could explode given too large of pixelmap
-    - glGetTexParameter[if]v() didn't accept GL_TEXTURE_MAX_ANISOTROPY_EXT
-    - glXCopyContext() could lead to segfaults
-    - glCullFace(GL_FRONT_AND_BACK) didn't work (bug 572665)
-    Changes:
-    - lots of C++ (g++) code clean-ups
-    - lots of T&amp;L updates for the Radeon DRI driver
-    Known bugs:
-    - mipmap LOD computation (fixed for Mesa 4.1)
-</pre>
-
-<h2>April 2, 2002</h2>
-<p>Mesa 4.0.2 has been released.  This is a stable bug-fix release.
-</p><pre>    New:
-      - New DOS (DJGPP) driver written by Daniel Borca
-      - New driver interface functions for TCL drivers (such as Radeon DRI)
-      - GL_RENDERER string returns "Mesa Offscreen16" or "Mesa Offscreen32"
-        if using deep color channels
-      - latest GL/glext.h and GL/glxext.h headers from SGI
-    Bug fixes:
-      - GL_BLEND with non-black texture env color wasn't always correct
-      - GL_REPLACE with GL_RGB texture format wasn't always correct (alpha)
-      - glTexEnviv( pname != GL_TEXTURE_ENV_COLOR ) was broken
-      - glReadPixels was sometimes mistakenly clipped by the scissor box
-      - glDraw/ReadPixels didn't catch all the errors that they should have
-      - Fixed 24bpp rendering problem in Windows driver (Karl Schultz)
-      - 16-bit GLchan mode fixes (m_trans_tmp.h, s_triangle.c)
-      - Fixed 1-bit float-&gt;int conversion bug in glDrawPixels(GL_DEPTH_COMP)
-      - glColorMask as sometimes effecting glXSwapBuffers()
-      - fixed a potential bug in XMesaGarbageCollect()
-      - N threads rendering into one window didn't work reliably
-      - glCopyPixels didn't work for deep color channels
-      - improved 8 -&gt; 16bit/channel texture image conversion (Gerk Huisma)
-      - glPopAttrib() didn't correctly restore user clip planes
-      - user clip planes failed for some perspective projections (Chromium)
-</pre>
-
-<h2>December 17, 2001</h2>
-<p>Mesa 4.0.1 has been released.  This is a stable bug-fix release.
-</p><pre>    New:
-      - better sub-pixel sample positions for AA triangles (Ray Tice)
-      - slightly faster blending for (GL_ZERO, GL_ONE) and (GL_ONE, GL_ZERO)
-    Bug fixes:
-      - added missing break statements in glGet*() for multisample cases
-      - fixed uninitialized hash table mutex bug (display lists / texobjs)
-      - fixed bad teximage error check conditional (bug 476846)
-      - fixed demos readtex.c compilation problem on Windows (Karl Schultz)
-      - added missing glGet() query for GL_MAX_TEXTURE_LOD_BIAS_EXT
-      - silence some compiler warnings (gcc 2.96)
-      - enable the #define GL_VERSION_1_3 in GL/gl.h
-      - added GL 1.3 and GLX 1.4 entries to gl_mangle.h and glx_mangle.h
-      - fixed glu.h typedef problem found with MSDev 6.0
-      - build libGL.so with -Bsymbolic (fixes bug found with Chromium)
-      - added missing 'const' to glXGetContextIDEXT() in glxext.h
-      - fixed a few glXGetProcAddress() errors (texture compression, etc)
-      - fixed start index bug in compiled vertex arrays (Keith)
-      - fixed compilation problems in src/SPARC/glapi_sparc.S
-      - fixed triangle strip "parity" bug found in VTK medical1 demo (Keith)
-      - use glXGetProcAddressARB in GLUT to avoid extension linking problems
-      - provoking vertex of flat-shaded, color-index triangles was wrong
-      - fixed a few display list bugs (GLUT walker, molecule, etc) (Keith)
-      - glTexParameter didn't flush the vertex buffer (Ray Tice)
-      - feedback attributes for glDraw/CopyPixels and glBitmap were wrong
-      - fixed bug in normal length caching (ParaView lighting bug)
-</pre>
-
-<h2>October 22, 2001</h2>
-<p>Mesa 4.0 has been released.  This is a stable release.
-</p><pre>    New:
-      - Mesa 4.0 implements the OpenGL 1.3 specification
-      - GL_IBM_rasterpos_clip extension
-      - GL_EXT_texture_edge_clamp extension (aka GL_SGIS_texture_edge_clamp)
-      - GL_ARB_texture_mirrored_repeat extension
-      - WindML UGL driver (Stephane Raimbault)
-      - added OSMESA_MAX_WIDTH/HEIGHT queries
-      - attempted compiliation fixes for Solaris 5, 7 and 8
-      - updated glext.h and glxext.h files
-      - updated Windows driver (Karl Schultz)
-    Bug fixes:
-      - added some missing GLX 1.3 tokens to include/GL/glx.h
-      - GL_COLOR_MATRIX changes weren't recognized by teximage functions
-      - glCopyPixels with scale and bias was broken
-      - glRasterPos with lighting could segfault
-      - glDeleteTextures could leave a dangling pointer
-      - Proxy textures for cube maps didn't work
-      - fixed a number of 16-bit color channel bugs
-      - fixed a few minor memory leaks
-      - GLX context sharing was broken in 3.5
-      - fixed state-update bugs in glPopClientAttrib()
-      - fixed glDrawRangeElements() bug
-      - fixed a glPush/PopAttrib() bug related to texture binding
-      - flat-shaded, textured lines were broken
-      - fixed a dangling pointer problem in the XMesa code (Chris Burghart)
-      - lighting didn't always produce the correct alpha value
-      - fixed 3DNow! code to not read past end of arrays (Andrew Lewycky)
-</pre>
-
-
-<h2>June 21, 2001</h2>
-<p>Mesa 3.5 has been released.  This is a new development release.
-</p><pre>    New:
-	- internals of Mesa divided into modular pieces (Keith Whitwell)
-	- 100% OpenGL 1.2 conformance (passes all conformance tests)
-	- new AA line algorithm
-	- GL_EXT_convolution extension
-        - GL_ARB_imaging subset
-        - OSMesaCreateContextExt() function
-        - GL_ARB_texture_env_add extension (same as GL_EXT_texture_env_add)
-        - GL_MAX_TEXTURE_UNITS_ARB now defaults to eight
-        - GL_EXT_fog_coord extension (Keith Whitwell)
-        - GL_EXT_secondary_color extension (Keith Whitwell)
-        - GL_ARB_texture_env_add extension (same as GL_EXT_texture_env_add)
-        - GL_SGIX_depth_texture extension
-        - GL_SGIX_shadow and GL_SGIX_shadow_ambient extensions
-        - demos/shadowtex.c demo of GL_SGIX_depth_texture and GL_SGIX_shadow
-        - GL_ARB_texture_env_combine extension
-        - GL_ARB_texture_env_dot3 extension
-        - GL_ARB_texture_border_clamp (aka GL_SGIS_texture_border_clamp)
-        - OSMesaCreateContextExt() function
-        - libOSMesa.so library, contains the OSMesa driver interface
-        - GL/glxext.h header file for GLX extensions
-        - somewhat faster software texturing, fogging, depth testing
-        - all color-index conformance tests now pass (only 8bpp tested)
-        - SPARC assembly language TCL optimizations (David Miller)
-        - GL_SGIS_generate_mipmap extension
-    Bug Fixes:
-        - fbiRev and tmuRev were unitialized when using Glide3
-        - fixed a few color index mode conformance failures; all pass now
-        - now appling antialiasing coverage to alpha after texturing
-        - colors weren't getting clamped to [0,1] before color table lookup
-        - fixed RISC alignment errors caused by COPY_4UBV macro
-        - drawing wide, flat-shaded lines could cause a segfault
-        - vertices now snapped to 1/16 pixel to fix rendering of tiny triangles
-    Changes:
-        - SGI's Sample Implementation (SI) 1.3 GLU library replaces Mesa GLU
-        - new libOSMesa.so library, contains the OSMesa driver interface
-</pre>
-
-
-<h2>May 17, 2001</h2>
-<p>Mesa 3.4.2 has been released.  This is basically just a bug-fix release.
-Here's what's new:</p>
-<pre>    Bug fixes:
-        - deleting the currently bound texture could cause bad problems
-        - using fog could result in random vertex alpha values
-         - AA triangle rendering could touch pixels outside right window bound
-        - fixed byteswapping problem in clear_32bit_ximage() function
-        - fixed bugs in wglUseFontBitmapsA(), by Frank Warmerdam
-        - fixed memory leak in glXUseXFont()
-        - fragment sampling in AA triangle function was off by 1/2 pixel
-        - Windows: reading pixels from framebuffer didn't always work
-        - glConvolutionFilter2D could segfault or cause FP exception
-        - fixed segfaults in FX and X drivers when using tex unit 1 but not 0
-        - GL_NAND logicop didn't work right in RGBA mode
-        - fixed a memory corruption bug in vertex buffer reset code
-        - clearing the softwara alpha buffer with scissoring was broken
-        - fixed a few color index mode fog bugs
-        - fixed some bad assertions in color index mode
-        - fixed FX line 'stipple' bug #420091
-    Changes:
-        - optimized writing mono-colored pixel spans to X pixmaps
-        - increased max viewport size to 2048 x 2048
-</pre>
-
-
-<h2>April 29, 2001</h2>
-<p>New Mesa website</p>
-<p>Mark Manning produced the new website.<br>Thanks, Mark!</p>
-
-
-<h2>February 14, 2001</h2>
-<p>Mesa 3.4.1 has been released.  Here's what's new:</p>
-<pre>    New:
-        - fixed some Linux build problems
-        - fixed some Windows build problems
-        - GL_EXT_texture_env_dot3 extension (Gareth Hughes)
-    Bug fixes:
-        - added RENDER_START/RENDER_FINISH macros for glCopyTexImage in DRI
-        - various state-update code changes needed for DRI bugs
-        - disabled pixel transfer ops in glColorTable commands, not needed
-        - fixed bugs in glCopyConvolutionFilter1D/2D, glGetConvolutionFilter
-        - updated sources and fixed compile problems in widgets-mesa/
-        - GLX_PBUFFER enum value was wrong in glx.h
-        - fixed a glColorMaterial lighting bug
-        - fixed bad args to Read/WriteStencilSpan in h/w stencil clear function
-        - glXCopySubBufferMESA() Y position was off by one
-        - Error checking of glTexSubImage3D() was broken (bug 128775)
-        - glPopAttrib() didn't restore all derived Mesa state correctly
-        - Better glReadPixels accuracy for 16bpp color - fixes lots of OpenGL
-          conformance problems at 16bpp.
-        - clearing depth buffer with scissoring was broken, would segfault
-        - OSMesaGetDepthBuffer() returned bad bytesPerValue value
-        - fixed a line clipping bug (reported by Craig McDaniel)
-        - fixed RGB color over/underflow bug for very tiny triangles
-    Known problems:
-        - NURBS or evaluator surfaces inside display lists don't always work
-</pre>
-<p>
-</p><h2>November 3, 2000</h2>
-<p>Mesa 3.4 has been released. Here's what's new since the 3.3 release:</p>
-<pre>    New:
-    - optimized glDrawPixels for glPixelZoom(1,-1)
-    Bug Fixes:
-    - widgets-mesa/src/*.c files were missing from 3.3 distro
-    - include/GL/mesa_wgl.h file was missing from 3.3 distro
-    - fixed some Win32 compile problems
-    - texture object priorities weren't getting initialized to 1.0
-    - glAreTexturesResident return value was wrong when using hardware
-    - glXUseXFont segfaulted when using 3dfx driver (via MESA_GLX_FX)
-    - glReadPixels with GLushort packed types was broken
-    - fixed a few bugs in the GL_EXT_texture_env_combine texture code
-    - glPush/PopAttrib(GL_ENABLE_BIT) mishandled multi-texture enables
-    - fixed some typos/bugs in the VB code
-    - glDrawPixels(GL_COLOR_INDEX) to RGB window didn't work
-    - optimized glDrawPixels paths weren't being used
-    - per-fragment fog calculation didn't work without a Z buffer
-    - improved blending accuracy, fixes Glean  blendFunc test failures
-    - glPixelStore(GL_PACK/UNPACK_SKIP_IMAGES) wasn't handled correctly
-    - glXGetProcAddressARB() didn't always return the right address
-    - gluBuild[12]DMipmaps() didn't grok the GL_BGR pixel format
-    - texture matrix changes weren't always detected (GLUT projtex demo)
-    - fixed random color problem in vertex fog code
-    - fixed Glide-related bug that let Quake get a 24-bit Z buffer
-    Changes:
-    - finished internal support for compressed textures for DRI
-</pre>
-<p>
-</p><h2>April 24, 2000</h2>
-<p>Mesa 3.2 has been released. Here's what's new since the beta release:</p>
-<pre>    Bug fixes:
-    - fixed memcpy bugs in span.c
-    - fixed missing glEnd problem in demos/tessdemo.c
-    - fixed bug when clearing 24bpp Ximages
-    - fixed clipping problem found in Unreal Tournament
-    - fixed Loki's "ice bug" and "crazy triangles" seen in Heretic2
-    - fixed Loki's 3dfx RGB vs BGR bug
-    - fixed Loki's 3dfx smooth/flat shading bug in SoF
-    Changes:
-    - updated docs/README file
-    - use bcopy() optimizations on FreeBSD
-    - re-enabled the optimized persp_textured_triangle() function
-</pre>
-<p>
-</p><h2>March 23, 2000</h2>
-<p>I've just upload the Mesa 3.2 beta 1 files to SourceForge at <a href="http://sourceforge.net/project/showfiles.php?group_id=3" target="_parent">http://sourceforge.net/project/filelist.php?group_id=3</a><a href="http://sourceforge.net/project/showfiles.php?group_id=3"></a></p>
-<p>3.2 (note even number) is a stabilization release of Mesa 3.1 meaning it's mainly
-just bug fixes.</p>
-<p>Here's what's changed:
-
-</p><ul>
-	Bug fixes:
-	<ul>
-		- mixed drawing of lines and bitmaps sometimes had wrong colors<br>
-		- added missing glHintPGI() function<br>
-		- fixed a polygon culling bug<br>
-		- fixed bugs in gluPartialDisk()<br>
-		- Z values in selection mode were wrong<br>
-		- added missing tokens:
-		<ul>
-			GL_SMOOTH_POINT_SIZE_RANGE<br>
-			GL_SMOOTH_POINT_SIZE_GRANULARITY<br>
-			GL_SMOOTH_LINE_WIDTH_RANGE<br>
-			GL_SMOOTH_LINE_WIDTH_GRANULARITY<br>
-			GL_ALIASED_POINT_SIZE_RANGE<br>
-			GL_ALIASED_LINE_WIDTH_RANGE
-		</ul>
-		- fixed glCopyPixels when copying from back to front buffer<br>
-		- GL_EXT_compiled_vertex_array tokens had _SGI suffix instead of _EXT<br>
-		- glDrawRangeElements(GL_LINES, 0, 1, 2, type, indices) was broken<br>
-		- glDeleteTextures() didn't decrement reference count correctly<br>
-		- GL_SRCA_ALPHA_SATURATE blend mode didn't work correctly<br>
-		- Actual depth of transformation matrix stacks was off by one<br>
-		- 24bpp visuals didn't address pixels correctly<br>
-		- mipmap level of detail (lambda) calculation simplified, more accurate<br>
-		- 101691 - Polygon clipping and GL_LINE<br>
-		- 101928 - Polygon clipping and GL_LINE (same fix as above)<br>
-		- 101808 - Non-glVertexArrays tristrip bug<br>
-		- 101971 - find_last_3f on Dec OSF (worked around)<br>
-		- 102369 - segv on dec osf (possibly a duplicate of the above)<br>
-		- 102893 - orientations of modelview cause segfault
-	</ul>
-	New:
-	<ul>
-		- updated SVGA Linux driver<br>
-		- added the MESA_FX_NO_SIGNALS env var, see docs/README.3DFX<br>
-		- build libGLw.a (Xt/OpenGL drawing area widget) library by default<br>
-		- changed -O2 to -O3 for a number of gcc configs
-	</ul>
-	Changes:
-	<ul>
-		- glXCopyContext's mask parameter is now unsigned long, per GLX spec
-	</ul>
-</ul>
-
-<p>Please report any problems with this release ASAP. Bugs should be filed on the
-Mesa3D website at sourceforge.<br>
-After 3.2 is wrapped up I hope to release 3.3 beta 1 soon afterward.</p>
-<p>-- Brian</p>
-<p>
-</p><h2>December 17, 1999</h2>
-<p>A Slashdot interview with Brian about Mesa (questions submitted by Slashdot readers)
-can be found at <a href="http://slashdot.org/interviews/99/12/17/0927212.shtml" target="_parent">http://slashdot.org/interviews/99/12/17/0927212.shtml</a>.</p>
-<p>
-</p><h2>December 14, 1999</h2>
-<p>Mesa 3.1 is released!</p>
-<p>
-</p><h2>September 21, 1999</h2>
-<p>There appear to be two new files on the ftp site, <a href="ftp://ftp.mesa3d.org/mesa/beta/MesaLib-3.1beta3.tar.gz">MesaLib-3.1beta3.tar.gz</a>
-and <a href="ftp://ftp.mesa3d.org/mesa/beta/MesaDemos-3.1beta3.tar.gz">MesaDemos-3.1beta3.tar.gz</a>,
-that seem to be... yes, I've just received confirmation from the beta center, they
-are indeed the <b>THIRD</b> beta release of Mesa 3.1! Happy Days. Happy Days. Thanks
-Keith Whitwell for preparing these for us during Brian's absence.</p>
-<p>
-</p><h2>August 30, 1999</h2>
-<p>I'm pleased to announce that I've accepted a position with Precision Insight,
-Inc. effective October, 1999. I'll be leaving Avid Technology in September.</p>
-<p>I've been working on Mesa in my spare time for over five years. With Precision
-Insight I now have the opportunity to devote my full attention to advancing Mesa
-and OpenGL on Linux.</p>
-<p>While I'll be focused on Linux, the X Window System, and hardware acceleration,
-my work will continue to be open sourced and available to any other programmers who
-may want to contribute to it, or use it for other projects or platforms</p>
-<p>PS: I'm going to be traveling until Sep 6 and won't be reading email until then.</p>
-<p>
-</p><h2>August 23, 1999</h2>
-<p>Anonymous CVS access is back online so suck up all the bandwidth you can afford.
-Note that this is a new archive, so you will need to re-checkout the archive. That
-means don't <i>cvs update</i> from a previous download.</p>
-<p>
-</p><h2>August 17, 1999</h2>
-<p>A report from the SIGGRAPH '99 Linux/OpenGL
-BOF meeting is now available.</p>
-<p>-Brian</p>
-<p>
-</p><h2>August 14, 1999</h2>
-<p>www.mesa3d.org is having technical problems due to hardware failures at VA Linux
-systems. The Mac pages, ftp, and CVS services aren't fully restored yet. Please be
-patient.</p>
-<p>-Brian</p>
-<p>
-</p><h2>June 7, 1999</h2>
-<p>RPMS of the nVidia RIVA server can be found at <a href="ftp://ftp.mesa3d.org/mesa/misc/nVidia/">ftp://ftp.mesa3d.org/mesa/misc/nVidia/</a>.</p>
-<p>
-</p><h2>June 2, 1999</h2>
-<p><a href="http://www.nvidia.com/">nVidia</a> has released some Linux binaries for
-xfree86 3.3.3.1, along with the <b>full source</b>, which includes GLX acceleration
-based on Mesa 3.0. They can be downloaded from <a href="http://www.nvidia.com/Products.nsf/htmlmedia/software_drivers.html">http://www.nvidia.com/Products.nsf/htmlmedia/software_drivers.html</a>.</p>
-<p>
-</p><h2>May 24, 1999</h2>
-<p>Beta 2 of Mesa 3.1 has been make available at <a href="ftp://ftp.mesa3d.org/mesa/beta/">ftp://ftp.mesa3d.org/mesa/beta/</a>.
-If you are into the quake scene, you may want to try this out, as it contains some
-optimizations specifically in the Q3A rendering path.
-<p>
-</p><h2>May 13, 1999</h2>
-<p>For those interested in the integration of Mesa into XFree86 4.0, Precision Insight
-has posted their lowlevel design documents at http://www.precisioninsight.com.</p>
-<p>
-</p><h2>May 13, 1999</h2>
-<pre>May 1999 - John Carmack of id Software, Inc. has made a donation of
-US$10,000 to the Mesa project to support its continuing development.
-Mesa is a free implementation of the OpenGL 3D graphics library and id's
-newest game, Quake 3 Arena, will use Mesa as the 3D renderer on Linux.
-
-The donation will go to Keith Whitwell, who has been optimizing Mesa to
-improve performance on 3d hardware.  Thanks to Keith's work, many
-applications using Mesa 3.1 will see a dramatic performance increase
-over Mesa 3.0.  The donation will allow Keith to continue working on
-Mesa full time for some time to come.
-
-For more information about Mesa see www.mesa3d.org.  For more
-information about id Software, Inc. see www.idsoftware.com.
-
---------------------------------
-
-This donation from John/id is very generous.  Keith and I are very
-grateful.
-
-</pre>
-<p>
-</p><h2>May 1, 1999</h2>
-<p>John Carmack made an interesting .plan update yesterday:
-
-</p><ul>
-	<i>"I put together a document on optimizing OpenGL drivers for Q3 that
-	should be helpful to the various Linux 3D teams. <br>
-	</i>http://www.quake3arena.com/news/glopt.html</i>"
-</ul>
-
-<p>
-</p><h2>April 7, 1999</h2>
-<p>Updated the Mesa contributors section and added links to RPM Mesa packages.</p>
-<p>
-</p><h2>March 18, 1999</h2>
-<p>The new webpages are now online. Enjoy, and let me know if you find any errors.
-<p>
-</p><h2>February 16, 1999</h2>
-<p><a href="http://www.sgi.com/">SGI</a> releases its <a href="http://www.sgi.com/software/opensource/glx/">GLX
-source code</a>.</p>
-<p>
-</p><h2>January 22, 1999</h2>
-<p>www.mesa3d.org established</p>
-
-
-</p>
-
-
-<hr>
-</body>
-</html>
+<HTML>

+

+<TITLE>Mesa News</TITLE>

+

+<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>

+

+<BODY>

+

+<body bgcolor="#eeeeee">

+

+<H1>News</H1>

+

+

+<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

+stable releases containing bug fixes since the 7.9.1 and 7.10 releases.

+</p>

+

+

+<h2>October 4, 2010</h2>

+

+<p>

+<a href="relnotes-7.9.html">Mesa 7.9</a> (final) is released.  This is a new

+development release.

+</p>

+

+

+<h2>September 27, 2010</h2>

+

+<p>

+<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>

+

+

+<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

+release collecting fixes since the 7.8.1 release.

+</p>

+

+

+<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

+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

+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

+development release.

+</p>

+

+

+

+<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

+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

+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

+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.

+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.

+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.

+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>

+

+

+<h2>June 23, 2009</h2>

+<p>

+<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>

+

+

+<h2>June 19, 2009</h2>

+<p>

+<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.

+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.

+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.

+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.

+This is a new development release.

+Mesa 7.4 will follow and will have bug fixes relative to 7.3.

+</p>

+

+

+<h2>September 20, 2008</h2>

+<p>

+<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.

+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

+previous stable release).

+</p>

+

+

+<h2>August 16, 2008</h2>

+<p>

+<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.

+This is a bug-fix release.

+</p>

+

+

+<h2>January 24, 2008</h2>

+

+<p>

+Added a new page describing the <a href="cell.html">Mesa Cell driver</a>.

+</p>

+

+

+

+<h2>November 13, 2007</h2>

+

+<p>

+Gallium3D is the codename for the new Mesa device driver architecture

+which is currently under development.

+</p>

+<p>

+Gallium3D development is taking place on the <em>gallium-0.1</em> branch

+of the git repository.

+Currently, there's only a software-only driver and an Intel i915/945 driver

+but other drivers will be coming...

+</p>

+

+

+<h2>November 10, 2007</h2>

+<p>

+<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.

+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.

+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.

+This is a development release which will lead up to the Mesa 7.0 release

+(which will advertise OpenGL 2.1 API support).

+</p>

+

+

+<h2>March 26, 2007</h2>

+<p>

+The new Shading Language compiler branch has been merged into the git

+master branch.  This is a step toward hardware support for the OpenGL

+2.0 Shading Language and will be included in the next Mesa release.

+In conjunction, <a href="http://glean.sf.net" target="_parent">Glean

+</a> has been updated with a new test that does over 130 tests of the

+shading language and built-in functions.

+</p>

+

+<h2>April 2007</h2>

+<p>

+Thomas Hellstr&ouml;m of Tungsten Graphics has written a whitepaper

+describing the new DRI memory management system</a>.

+</p>

+

+<h2>December 5, 2006</h2>

+<p>

+Mesa is now using git as its source code management system.

+The previous CVS repository should no longer be used.

+See the <a href="repository.html">repository page</a> for more information.

+</p>

+

+<h2>December 2, 2006</h2>

+<p>

+<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.

+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.

+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.

+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.

+This is stable, bug-fix release.

+</p>

+

+

+

+<h2>October 24, 2005</h2>

+<p>

+<a href="relnotes-6.4.html">Mesa 6.4</a> has been released.

+This is stable, bug-fix release.

+</p>

+

+

+<h2>August 19, 2005</h2>

+<p>

+Mesa 6.3.2 has been released.

+Note: there was no public release of version 6.3.1.

+</p>

+<a href="versions.html#6.3.2">Changes in version 6.3.1</a>

+<p>

+The MD5 checksums are:

+</p>

+<pre>

+98192e45ed8d69113688f89f90869346  MesaLib-6.3.2.tar.gz

+0df27701df0924d17ddf41185efa8ce1  MesaLib-6.3.2.tar.bz2

+ccb2423aab77fc7e81ce628734586140  MesaLib-6.3.2.zip

+9d0fca0a7d051c34a0b485423fb3e85d  MesaDemos-6.3.2.tar.gz

+96708868450c188205e42229b5d813c4  MesaDemos-6.3.2.tar.bz2

+c5102501e609aa8996d832fafacb8ab9  MesaDemos-6.3.2.zip

+</pre>

+

+

+<h2>July 20, 2005</h2>

+<p>

+Mesa 6.3 has been released.

+This is a development release with new features, changes and bug fixes.

+</p>

+<pre>

+    New:

+	- GL_EXT_framebuffer_object extension

+	- GL_ARB_draw_buffers extension

+	- GL_ARB_pixel_buffer_object extension

+	- GL_OES_read_format extension (Ian Romanick)

+	- DirectFB driver (Claudio Ciccani)

+	- x86_64 vertex transformation code (Mikko T.)

+    Changes:

+	- added -stereo option for glxgears demo (Jacek Rosik)

+	- updated the PBuffer demo code in xdemos/ directory

+	- glDeleteTextures/Programs/Buffers() now makes the object ID

+	  available for immediate re-use

+	- assorted 64-bit clean-ups fixes (x86_64 and Win64)

+	- lots of internal changes for GL_EXT_framebuffer_object

+    Bug fixes:

+	- some functions didn't support PBO functionality

+	- glGetTexImage didn't convert color index images to RGBA as required

+	- fragment program texcoords were sometimes wrong for points and lines

+	- fixed problem with negative dot product in arbfplight, fplight demos

+	- fixed bug in perspective correction of antialiased, textured lines

+	- querying GL_POST_CONVOLUTION_ALPHA_BIAS_EXT returned wrong value

+	- fixed a couple per-pixel fog bugs (Soju Matsumoto)

+	- glGetBooleanv(GL_FRAGMENT_PROGRAM_BINDING_NV) was broken

+	- fixed float parsing bug in ARB frag/vert programs (bug 2520)

+	- XMesaGetDepthBuffer() returned incorrect value for bytesPerValue

+	- GL_COLOR_MATERIAL with glColor3 didn't properly set diffuse alpha

+	- glXChooseFBConfig() crashed if attribList pointer was NULL

+	- program state.light[n].spot.direction.w was wrong value (bug 3083)

+	- fragment program fog option required glEnable(GL_FOG) - wrong.

+	- glColorTable() could produce a Mesa implementation error (bug 3135)

+	- RasterPos could get corrupted by color index rendering path

+	- Removed bad XTranslateCoordinates call when rendering to Pixmaps

+	- glPopAttrib() didn't properly restore GL_TEXTURE_GEN enable state

+	- fixed a few Darwin compilation problems

+</pre>

+<p>

+The MD5 checksums are:

+</p>

+<pre>

+0236f552d37514776945d5a013e5bb7b  MesaLib-6.3.tar.gz

+60e1a8f78c4a8c7750a1e95753190986  MesaLib-6.3.tar.bz2

+ca7c950fbace68c70caa822322db7223  MesaLib-6.3.zip

+25ea801645b376c014051804fe4974b2  MesaDemos-6.3.tar.gz

+9248e74872ea88c57ec25c900c295057  MesaDemos-6.3.tar.bz2

+8537dfa734ef258dcc7272097558d434  MesaDemos-6.3.zip

+</pre>

+

+

+<h2>December 9, 2004</h2>

+<p>

+Mesa 6.2.1 has been released.

+This is a stable release which just fixes bugs since the 6.2 release.

+</p>

+<pre>

+    Bug fixes:

+	- don't apply regular fog or color sum when using a fragment program

+	- glProgramEnvParameter4fARB always generated an error on

+	  GL_FRAGMENT_PROGRAM_ARB (fdo bug 1645)

+	- glVertexAttrib3svNV and glVertexAttrib3svARB were broken

+	- fixed width/height mix-up in glSeparableFilter2D()

+	- fixed regression in glCopyPixels + convolution

+	- glReadPixels from a clipped front color buffer didn't always work

+	- glTexImage didn't accept GL_RED/GREEN/BLUE as the format

+	- Attempting queries/accesses of VBO 0 weren't detected as errors

+	- paletted textures failed if the palette had fewer than 256 entries

+    Changes:

+	- fixed a bunch of compiler warnings found with gcc 3.4

+	- bug reports should to go bugzilla.freedesktop.org

+</pre>

+<p>

+The MD5 checksums are:

+</p>

+<pre>

+80008a92f6e055d3bfdde2cf331ec3fa  MesaLib-6.2.1.tar.gz

+f43228cd2bf70f583ef3275c1c545421  MesaLib-6.2.1.tar.bz2

+dec26cfd40116ad021020fea2d94f652  MesaLib-6.2.1.zip

+2c7af3c986a7571c8713c8bfee7e49e3  MesaDemos-6.2.1.tar.gz

+3cac74667b50bcbd4f67f594fb4224a2  MesaDemos-6.2.1.tar.bz2

+75b3edd12eb2b370caf05f29b99e508a  MesaDemos-6.2.1.zip

+</pre>

+

+

+<h2>October 2, 2004</h2>

+<p>

+Mesa 6.2 has been released.

+This is a stable release which just fixes bugs since the 6.1 release.

+</p>

+<pre>

+    New:

+	- enabled GL_ARB_texture_rectangle (same as GL_NV_texture_rectangle)

+	- updated Doxygen support (Jose Fonseca)

+    Changes:

+	- some GGI driver updates (Christoph Egger, bug 1025977)

+    Bug fixes:

+	- Omit GL_ARB_texture_non_power_of_two from list of OpenGL 1.5 features

+	- fixed a few compilation issues on IRIX

+	- fixed a matrix classification bug (reported by Wes Bethel)

+	- we weren't reseting the vertex/fragment program error state

+	  before parsing (Dave Reveman)

+	- adjust texcoords for sampling texture rectangles (Dave Reveman)

+	- glGet*(GL_MAX_VERTEX_ATTRIBS_ARB) wasn't implemented

+	- repeated calls to glDeleteTexture(t) could lead to a crash

+	- fixed potential ref count bugs in VBOs and vertex/fragment programs

+	- spriteblast demo didn't handle window size changes correctly

+	- glTexSubImage didn't handle pixels=NULL correctly for PBOs

+	- fixed color index mode glDrawPixels bug (Karl Schultz)

+</pre>

+<p>

+The MD5 checksums are:

+</p>

+<pre>

+9e8f34b059272dbb8e1f2c968b33bbf0  MesaLib-6.2.tar.gz

+3d6a6362390b6a37d3cb2e615f3ac7db  MesaLib-6.2.tar.bz2

+6cfd7895d28e695c0dbbed9469564091  MesaLib-6.2.zip

+3e06e33b0809f09855cb60883b8bdfef  MesaDemos-6.2.tar.gz

+9d160009c3dfdb35fe7e4088c9ba8f85  MesaDemos-6.2.tar.bz2

+856f7ec947122eb3c8985ebc2f654dcd  MesaDemos-6.2.zip

+</pre>

+

+

+<h2>August 18, 2004</h2>

+<p>

+Mesa 6.1 has been released.

+This is a new development release (version 6.2 will be a stabilization

+release).

+</p>

+<pre>

+    New:

+	- Revamped Makefile system

+	- glXUseRotatedXFont() utility (see xdemos/xuserotfont.c)

+	- internal driver interface changes related to texture object

+	  allocation, vertex/fragment programs, BlendEquationSeparate, etc.

+	- option to walk triangle edges with double-precision floats

+	  (Justin Novosad of Discreet) (see config.h file)

+	- support for AUX buffers in software GLX driver

+	- updated glext.h to version 24 and glxext.h to version 6

+	- new MESA_GLX_FORCE_ALPHA and MESA_GLX_DEPTH_BITS env vars

+	- updated BeOS support (Philippe Houdoin)

+    Changes:

+	- fragment fog interpolation is perspective corrected now

+	- new glTexImage code, much cleaner, may be a bit faster

+    Bug fixes:

+	- glArrayElement in display lists didn't handle generic vertex attribs

+	- glFogCoord didn't always work properly

+	- ARB_fragment_program fog options didn't work

+	- frag prog TEX instruction no longer incorrectly divides s,t,r by q

+	- ARB frag prog TEX and TEXP instructions now use LOD=0

+	- glTexEnviv in display lists didn't work

+	- glRasterPos didn't do texgen or apply texture matrix

+	- GL_DOUBLE-valued vertex arrays were broken in some cases

+	- fixed texture rectangle edge/border sampling bugs

+	- sampling an incomplete texture in a fragment program would segfault

+	- glTexImage was missing a few error checks

+	- fixed some minor glGetTexParameter glitches

+	- GL_INTENSITY was mistakenly accepted as a <format> to glTexImage

+	- fragment program writes to RC/HC register were broken

+	- fixed a few glitches in GL_HP_occlusion_test extension

+	- glBeginQueryARB and glEndQueryARB didn't work inside display lists

+	- vertex program state references were broken

+	- fixed triangle color interpolation bug on AIX (Shane Blackett)

+	- fixed a number of minor memory leaks (bug #1002030)

+</pre>

+The MD5 checksums are:

+</p>

+<pre>

+c9284d295ebcd2e0486cc3cd54e5863c  MesaLib-6.1.tar.gz

+5de1f53ec0709f60fc68fdfed57351f3  MesaLib-6.1.tar.bz2

+483e77cac4789a5d36c42f3c0136d6d8  MesaLib-6.1.zip

+8c46cfa6f9732acc6f6c25724aad0246  MesaDemos-6.1.tar.gz

+89bfe0f6c69b39fd0ebd9fff481a4e9b  MesaDemos-6.1.tar.bz2

+161268531fcc6f0c5a056430ee97e0c1  MesaDemos-6.1.zip

+</pre>

+

+

+

+<h2>April 2, 2004</h2>

+

+<p>

+Mesa 6.0.1 has been released.

+This release basically just fixes bugs since the 6.0. release.

+</p>

+<pre>

+    New:

+	- upgraded glext.h to version 22

+	- new build targets (Dan Schikore)

+	- new linux-x86-opteron build target (Heath Feather)

+    Bug fixes:

+	- glBindProgramARB didn't update all necessary state

+	- fixed build problems on OpenBSD

+	- omit CVS directories from tarballs

+	- glGetTexImage(GL_COLOR_INDEX) was broken

+	- fixed an infinite loop in t&l module

+	- silenced some valgrind warnings about using unitialized memory

+	- fixed some compilation/link glitches on IRIX (Mike Stephens)

+	- glBindProgram wasn't getting compiled into display lists

+	- GLX_FBCONFIG_ID wasn't recognized in glXChooseFBConfig() (bug 888079)

+	- two-sided lighting and vertex program didn't work (bug 887330)

+	- stores to program parameter registers in vertex state programs

+	  didn't work.

+	- fixed glOrtho bug found with gcc 3.2.2 (RH9)

+	- glXCreateWindow() wasn't fully implemented (bug 890894)

+	- generic vertex attribute arrays didn't work in display lists

+	- vertex buffer objects' default usage and access fields were wrong

+	- glDrawArrays with start!=0 was broken

+	- fragment program PK2H, UP2H, UP4B and UP4UB instructions were broken

+	- linux-osmesa16-static config didn't work

+	- fixed a few color index rendering problems (bug 910687)

+	- glInterleavedArrays didn't respect GL_CLIENT_ACTIVE_TEXTURE

+	- OSMesa RGB and BGR modes were broken

+	- glProgramStringARB mistakenly required a null-terminated string

+	- fragment program XPD instruction was incorrect

+	- glGetMaterial() didn't work reliably

+</pre>

+The MD5 checksums are:

+</p>

+<pre>

+011be0e79666c7a6eb9693fbf9348653  MesaLib-6.0.1.tar.gz

+b7f14088c5c2f14490d2739a91102112  MesaLib-6.0.1.tar.bz2

+bf0510cf0a2b87d64cdd317eca3f1db1  MesaLib-6.0.1.zip

+b7b648599e0aaee1c4ffc554a2a9139e  MesaDemos-6.0.1.tar.gz

+dd6aadfd9ca8e1cfa90c6ee492bc6f43  MesaDemos-6.0.1.tar.bz2

+eff71d59c211825e949199852f5a2316  MesaDemos-6.0.1.zip

+</pre>

+

+

+

+<h2>January 16, 2004</h2>

+

+<p>

+Mesa 6.0 has been released.  This is a stabilization of the 5.1 release

+and primarily just incorporates bug fixes.

+</p>

+<pre>

+    New:

+	- full OpenGL 1.5 support

+	- updated GL/glext.h file to version 21

+    Changes:

+	- changed max framebuffer size to 4Kx4K (MAX_WIDTH/HEIGHT in config.h)

+    Bug fixes:

+	- fixed bug in UNCLAMPED_FLOAT_TO_UBYTE macro; solves a color

+	  clamping issue

+	- updated suno5-gcc configs

+	- glColor3 functions sometimes resulted in undefined alpha values

+	- fixed FP divide by zero error seen on VMS with xlockmore, others

+	- fixed vertex/fragment program debug problem (bug 873011)

+	- building on AIX with gcc works now

+	- glDeleteProgramsARB failed for ARB fragment programs (bug 876160)

+	- glDrawRangeElements tried to modify potentially read-only storage

+	- updated files for building on Windows

+</pre>

+

+

+

+<h2>December 28, 2003</h2>

+

+<p>

+The Mesa CVS server has been moved to <a href="http://www.freedesktop.org"

+target="_parent">

+freedesktop.org</a> because of problems with SourceForge's anonymous

+CVS service.

+</p>

+

+<p>Please see the <a href="cvs_access.html">CVS access page</a> for details.

+</p>

+

+

+<h2>December 17, 2003</h2>

+

+<p>

+Mesa 5.1 has been released.  This is a new development release.

+Mesa 6.0 will be the next stable release and will support all

+OpenGL 1.5 features.

+</p>

+<pre>

+    New features:

+	- reorganized directory tree

+	- GL_ARB_vertex/fragment_program extensions (Michal Krol & Karl Rasche)

+	- GL_ATI_texture_env_combine3 extension (Ian Romanick)

+	- GL_SGI_texture_color_table extension (Eric Plante)

+	- GL_NV_fragment_program extension

+	- GL_NV_light_max_exponent extension

+	- GL_EXT_texture_rectangle (identical to GL_NV_texture_rectangle)

+	- GL_ARB_occlusion_query extension

+	- GL_ARB_point_sprite extension

+	- GL_ARB_texture_non_power_of_two extension

+	- GL_IBM_multimode_draw_arrays extension

+	- GL_EXT_texture_mirror_clamp extension (Ian Romanick)

+	- GL_ARB_vertex_buffer_object extension

+	- new X86 feature detection code (Petr Sebor)

+	- less memory used for display lists and vertex buffers

+	- 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)

+    Bug fixes:

+	- really enable OpenGL 1.4 features in DOS driver.

+	- fixed issues in glDrawPixels and glCopyPixels for very wide images

+	- glPixelMapf/ui/usv()'s size parameter is GLsizei, not GLint

+	- fixed some texgen bugs reported by Daniel Borca

+	- fixed wglMakeCurrent(NULL, NULL) bug (#835861)

+	- fixed glTexSubImage3D z-offset bug (Cedric Gautier)

+	- fixed RGBA blend enable bug (Ville Syrjala)

+	- glAccum is supposed to be a no-op in selection/feedback mode

+	- fixed texgen bug #597589 (John Popplewell)

+    Changes:

+	- dropped API trace feature (src/Trace/)

+	- documentation overhaul.  merged with website content.  more html.

+	- glxgears.c demo updated to use GLX swap rate extensions

+	- glTexImage1/2/3D now allows width/height/depth = 0

+	- disable SPARC asm code on Linux (bug 852204)

+</pre>

+

+The MD5 checksums are:

+</p>

+<pre>

+78f452f6c55478471a744f07147612b5  MesaLib-5.1.tar.gz

+67b3b8d3f7f4c8c44904551b851d01af  MesaLib-5.1.tar.bz2

+6dd19ffa750ec7f634e370a987505c9d  MesaLib-5.1.zip

+e0214d4ebb22409dfa9262f2b52fd828  MesaDemos-5.1.tar.gz

+066c9aff4fd924405de1ae9bad5ec9a7  MesaDemos-5.1.tar.bz2

+d2b5ba32b53e0ad0576c637a4cc1fb41  MesaDemos-5.1.zip

+</pre>

+

+

+<H2>November 12, 2003</H2>

+

+<p>

+New Mesa 5.0.2 tarballs have been uploaded to SourceForge which fix a

+number of automake/libtool problems.

+</p>

+<p>

+The new MD5 checksums are:

+</p>

+<pre>

+a9dcf3ff9ad1b7d6ce73a0df7cff8b5b  MesaLib-5.0.2.tar.gz

+7b4bf9261657c2fca03796d4955e6f50  MesaLib-5.0.2.tar.bz2

+79c141bddcbad557647535d02194f346  MesaLib-5.0.2.zip

+952d9dc823dd818981d1a648d7b2668a  MesaDemos-5.0.2.tar.gz

+b81fafff90995025d2f25ea02b786642  MesaDemos-5.0.2.tar.bz2

+a21be975589e8a2d1871b6bb7874fffa  MesaDemos-5.0.2.zip

+</pre>

+

+

+

+<h2>September 5, 2003</h2>

+

+<p>

+Mesa 5.0.2 has been released.  This is a stable, bug-fix release.

+</p>

+<pre>

+    Bug fixes:

+	- fixed texgen problem causing texcoord's Q to be zero (stex3d)

+	- default GL_TEXTURE_COMPARE_MODE_ARB was wrong

+	- GL_CURRENT_MATRIX_NV query was wrong

+	- GL_CURRENT_MATRIX_STACK_DEPTH_NV query was off by one

+	- GL_LIST_MODE query wasn't correct

+	- GL_FOG_COORDINATE_SOURCE_EXT query wasn't supported

+	- GL_SECONDARY_COLOR_ARRAY_SIZE_EXT query returned wrong value

+	- blended, wide lines didn't always work correctly (bug 711595)

+	- glVertexAttrib4svNV w component was always 1

+	- fixed bug in GL_IBM_rasterpos_clip (missing return)

+	- GL_DEPTH_TEXTURE_MODE = GL_ALPHA didn't work correctly

+	- a few Solaris compilation fixes

+	- fixed glClear() problem for DRI drivers (non-existant stencil, etc)

+	- fixed int/REAL mixup in GLU NURBS curve evaluator (Eric Cazeaux)

+	- fixed delete [] bug in SI GLU (bug 721765) (Diego Santa Cruz)

+	- glFog() didn't clamp fog colors

+	- fixed bad float/int conversion for GL_TEXTURE_PRIORITY in the

+	  gl[Get]TexParameteri[v] functions

+	- fixed invalid memory references in glTexGen functions (bug 781602)

+	- integer-valued color arrays weren't handled correctly

+	- glDrawPixels(GL_DEPTH_COMPONENT) with glPixelZoom didn't work

+	- GL_EXT_texture_lod_bias is part of 1.4, overlooked in 5.0.1

+    Changes:

+	- build GLUT with -fexceptions so C++ apps propogate exceptions

+</pre>

+

+

+

+<h2>June 2003</h2>

+

+<p>

+Mesa's directory tree has been overhauled.

+Things are better organized now with some thought toward future needs.

+</p>

+<p>

+In CVS, the latest Mesa 5.1 development code is now rooted under the

+<b>Mesa-newtree/</b> directory.  The old top-level <b>Mesa/</b> directory

+holds the Mesa 5.0.x code which will be abandoned at some point.

+</p>

+

+

+

+<h2>March 30, 2003</h2>

+

+<p>

+Mesa 5.0.1 has been released.  This is a stable, bug-fix release.

+</p>

+<pre>

+    New:

+	- DOS driver updates from Daniel Borca

+	- updated GL/gl_mangle.h file (Bill Hoffman)

+    Bug fixes:

+	- auto mipmap generation for cube maps was broken (bug 641363)

+	- writing/clearing software alpha channels was unreliable

+	- minor compilation fixes for OS/2 (Evgeny Kotsuba)

+	- fixed some bad assertions found with shadowtex demo

+	- fixed error checking bug in glCopyTexSubImage2D (bug 659020)

+	- glRotate(angle, -x, 0, 0) was incorrect (bug 659677)

+	- fixed potential segfault in texture object validation (bug 659012)

+	- fixed some bogus code in _mesa_test_os_sse_exception_support (Linus)

+	- fix fog stride bug in tnl code for h/w drivers (Michel Danzer)

+	- fixed glActiveTexture / glMatrixMode(GL_TEXTURE) bug (#669080)

+	- glGet(GL_CURRENT_SECONDARY_COLOR) should return 4 values, not 3

+	- fixed compilation problem on Solaris7/x86 (bug 536406)

+	- fixed prefetch bug in 3DNow! code (Felix Kuhling)

+	- fixed NeXT build problem (FABSF macro)

+	- glDrawPixels Z values when glPixelZoom!=1 were invalid (bug 687811)

+	- zoomed glDraw/CopyPixels with clipping sometimes failed (bug 689964)

+	- AA line and triangle Z values are now rounded, not truncated

+	- fixed color interpolation bug when GLchan==GLfloat (bug 694461)

+	- glArePrograms/TexturesResident() wasn't 100% correct (Jose Fonseca)

+	- fixed a minor GL_COLOR_MATERIAL bug

+	- NV vertex program EXP instruction was broken

+	- glColorMask misbehaved with X window / pixmap rendering

+	- fix autoconf/libtool GLU C++ linker problem on Linux (a total hack)

+	- attempt to fix GGI compilation problem when MesaDemos not present

+	- NV vertex program ARL-relative fetches didn't work

+    Changes:

+	- use glPolygonOffset in gloss demo to avoid z-fighting artifacts

+	- updated winpos and pointblast demos to use ARB extensions

+	- disable SPARC normal transformation code (bug 673938)

+	- GLU fixes for OS/2 (Evgeny Kotsuba)

+</pre>

+<p>

+MD5 checksums follow:

+</p>

+<pre>

+b80f8b5d53a3e9f19b9fde5af0c542f0  MesaLib-5.0.1.tar.gz

+513b4bbd7d38951f05027179063d876b  MesaLib-5.0.1.tar.bz2

+eebd395678f4520d33b267e5d5c22651  MesaLib-5.0.1.zip

+49d7feaec6dc1d2091d7c3cc72a9b320  MesaDemos-5.0.1.tar.gz

+37190374a98c3c892f0698be9ca3acf0  MesaDemos-5.0.1.tar.bz2

+becd8bf17f5791361b4a54ba2a78e5c9  MesaDemos-5.0.1.zip

+</pre>

+

+

+

+<h2>March 7, 2003</h2>

+<p>

+Website and documentation overhaul.

+</p>

+<p>

+The website content and Mesa documentation (from the doc/ directory) have

+been merged together.

+All the documentation files have been entered into the CVS repository.

+Many of the old plain-text files have been converted to html and modernized.

+</p>

+

+

+<h2>November 13, 2002</h2>

+<p>Mesa 5.0 has been released.  This is a stable release which

+implements the OpenGL 1.4 specification.

+</p><pre>New:

+    - OpenGL 1.4 support (glGetString(GL_VERSION) returns "1.4")

+    - removed some overlooked debugging code

+    - glxinfo updated to support GLX_ARB_multisample

+    - GLUT now support GLX_ARB_multisample

+    - updated DOS driver (Daniel Borca)

+Bug fixes:

+    - GL_POINT and GL_LINE-mode polygons didn't obey cull state

+    - fixed potential bug in _mesa_align_malloc/calloc()

+    - fixed missing triangle bug when running vertex programs

+    - fixed a few HPUX compilation problems

+    - FX (Glide) driver didn't compile

+    - setting GL_TEXTURE_BORDER_COLOR with glTexParameteriv() didn't work

+    - a few EXT functions, like glGenTexturesEXT, were no-ops

+    - a few OpenGL 1.4 functions like glFogCoord*, glBlendFuncSeparate,

+      glMultiDrawArrays and glMultiDrawElements were missing

+    - glGet*(GL_ACTIVE_STENCIL_FACE_EXT) was broken

+    - Pentium 4 Mobile was mistakenly identified as having 3DNow!

+    - fixed one-bit error in point/line fragment Z calculation

+    - fixed potential segfault in fakeglx code

+    - fixed color overflow problem in DOT3 texture env mode

+</pre>

+

+

+<h2>October 29, 2002</h2>

+<p>Mesa 4.1 has been released.  This is a new development release.

+For a stable release, get 4.0.4.

+</p><pre>New:

+    - GL_NV_vertex_program extension

+    - GL_NV_vertex_program1_1 extension

+    - GL_ARB_window_pos extension

+    - GL_ARB_depth_texture extension

+    - GL_ARB_shadow extension

+    - GL_ARB_shadow_ambient extension

+    - GL_EXT_shadow_funcs extension

+    - GL_ARB_point_parameters extension

+    - GL_ARB_texture_env_crossbar

+    - GL_NV_point_sprite extension

+    - GL_NV_texture_rectangle extension

+    - GL_EXT_multi_draw_arrays extension

+    - GL_EXT_stencil_two_side extension

+    - GLX_SGIX_fbconfig and GLX_SGIX_pbuffer extensions

+    - GL_ATI_texture_mirror_once extension (Ian Romanick)

+    - massive overhaul/simplification of software rasterizer module,

+      many contributions from Klaus Niederkrueger

+    - faster software texturing in some cases (i.e. trilinear filtering)

+    - new OSMesaGetProcAddress() function

+    - more blend modes implemented with MMX code (Jose Fonseca)

+    - added glutGetProcAddress() to GLUT

+    - added GLUT_FPS env var to compute frames/second in glutSwapBuffers()

+    - pbinfo and pbdemo PBuffer programs

+    - glxinfo -v prints transprent pixel info (Gerd Sussner)

+Bug fixes:

+    - better mipmap LOD computation (prevents excessive blurriness)

+    - OSMesaMakeCurrent() didn't recognize buffer size changes

+    - assorted conformance fixes for 16-bit/channel rendering

+    - texcombine alpha subtraction mode was broken

+    - fixed some blend problems when GLchan==GLfloat (Gerk Huisma)

+    - clamp colors to [0,1] in OSMesa if GLchan==GLfloat (Gerk Huisma)

+    - fixed divide by zero error in NURBS tessellator (Jon Perry)

+    - fixed GL_LINEAR fog bug by adding clamping

+    - fixed FP exceptions found using Alpha CPU

+    - 3dfx/glide driver render-to-window feature was broken

+    - added missing GLX_TRANSPARENT_RGB token to glx.h

+    - fixed error checking related to paletted textures

+    - fixed reference count error in glDeleteTextures (Randy Fayan)

+Changes:

+    - New spec file and Python code to generate some GL dispatch files

+    - Glide driver defaults to "no" with autoconf/automake

+    - floating point color channels now clamped to [0,inf)

+    - updated demos/stex3d with new options

+</pre>

+

+

+<h2>October 4, 2002</h2>

+<p>

+The <a href="http://mesa3d.sourceforge.net/docs/MesaFAQ.html">Mesa FAQ</a> has been rewritten.

+</p>

+

+<h2>October 3, 2002</h2>

+<p>Mesa 4.0.4 has been released.  This is a stable bug-fix release.

+</p><pre>    New:

+	- GL_NV_texture_rectangle extension

+	- updated glext.h header (version 17)

+	- updated DOS driver (Daniel Borca)

+	- updated BeOS R5 driver (Philippe Houdoin)

+	- added GL_IBM_texture_mirror_repeat

+	- glxinfo now takes -l option to print interesting OpenGL limits info

+	- GL_MESA_ycbcr_texture extension

+	- GL_APPLE_client_storage extension (for some DRI drivers only)

+	- GL_MESA_pack_invert extension

+    Bug fixes:

+	- fixed GL_LINEAR fog bug by adding clamping

+	- fixed FP exceptions found using Alpha CPU

+	- 3dfx MESA_GLX_FX=window (render to window) didn't work

+	- fixed memory leak in wglCreateContest (Karl Schultz)

+	- define GLAPIENTRY and GLAPI if undefined in glu.h

+	- wglGetProcAddress didn't handle all API functions

+	- when testing for OpenGL 1.2 vs 1.3, check for GL_ARB_texture_cube_map

+	- removed GL_MAX_CONVOLUTION_WIDTH/HEIGHT from glGetInteger/Float/etc()

+	- error checking in compressed tex image functions had some glitches

+	- fixed AIX compile problem in src/config.c

+	- glGetTexImage was using pixel unpacking instead of packing params

+	- auto-mipmap generation for cube maps was incorrect

+    Changes:

+	- max texture units reduced to six to accomodate texture rectangles

+	- removed unfinished GL_MESA_sprite_point extension code

+</pre>

+

+<h2>June 25, 2002</h2>

+<p>Mesa 4.0.3 has been released.  This is a stable bug-fix release.

+</p><pre>    New:

+    - updated GL/glext.h file (version 15)

+    - corrected MMX blend code (Jose Fonseca)

+    - support for software-based alpha planes in Windows driver

+    - updated GGI driver (Filip Spacek)

+    Bug fixes:

+    - glext.h had wrong values for GL_DOT3_RGB[A]_EXT tokens

+    - OSMesaMakeCurrent() didn't recognize buffer size changes

+    - assorted conformance fixes for 16-bit/channel rendering

+    - texcombine alpha subtraction mode was broken

+    - fixed lighting bug with non-uniform scaling and display lists

+    - fixed bug when deleting shared display lists

+    - disabled SPARC cliptest assembly code (Mesa bug 544665)

+    - fixed a couple Solaris compilation/link problems

+    - blending clipped glDrawPixels didn't always work

+    - glGetTexImage() didn't accept packed pixel types

+    - glPixelMapu[is]v() could explode given too large of pixelmap

+    - glGetTexParameter[if]v() didn't accept GL_TEXTURE_MAX_ANISOTROPY_EXT

+    - glXCopyContext() could lead to segfaults

+    - glCullFace(GL_FRONT_AND_BACK) didn't work (bug 572665)

+    Changes:

+    - lots of C++ (g++) code clean-ups

+    - lots of T&amp;L updates for the Radeon DRI driver

+    Known bugs:

+    - mipmap LOD computation (fixed for Mesa 4.1)

+</pre>

+

+<h2>April 2, 2002</h2>

+<p>Mesa 4.0.2 has been released.  This is a stable bug-fix release.

+</p><pre>    New:

+      - New DOS (DJGPP) driver written by Daniel Borca

+      - New driver interface functions for TCL drivers (such as Radeon DRI)

+      - GL_RENDERER string returns "Mesa Offscreen16" or "Mesa Offscreen32"

+        if using deep color channels

+      - latest GL/glext.h and GL/glxext.h headers from SGI

+    Bug fixes:

+      - GL_BLEND with non-black texture env color wasn't always correct

+      - GL_REPLACE with GL_RGB texture format wasn't always correct (alpha)

+      - glTexEnviv( pname != GL_TEXTURE_ENV_COLOR ) was broken

+      - glReadPixels was sometimes mistakenly clipped by the scissor box

+      - glDraw/ReadPixels didn't catch all the errors that they should have

+      - Fixed 24bpp rendering problem in Windows driver (Karl Schultz)

+      - 16-bit GLchan mode fixes (m_trans_tmp.h, s_triangle.c)

+      - Fixed 1-bit float-&gt;int conversion bug in glDrawPixels(GL_DEPTH_COMP)

+      - glColorMask as sometimes effecting glXSwapBuffers()

+      - fixed a potential bug in XMesaGarbageCollect()

+      - N threads rendering into one window didn't work reliably

+      - glCopyPixels didn't work for deep color channels

+      - improved 8 -&gt; 16bit/channel texture image conversion (Gerk Huisma)

+      - glPopAttrib() didn't correctly restore user clip planes

+      - user clip planes failed for some perspective projections (Chromium)

+</pre>

+

+<h2>December 17, 2001</h2>

+<p>Mesa 4.0.1 has been released.  This is a stable bug-fix release.

+</p><pre>    New:

+      - better sub-pixel sample positions for AA triangles (Ray Tice)

+      - slightly faster blending for (GL_ZERO, GL_ONE) and (GL_ONE, GL_ZERO)

+    Bug fixes:

+      - added missing break statements in glGet*() for multisample cases

+      - fixed uninitialized hash table mutex bug (display lists / texobjs)

+      - fixed bad teximage error check conditional (bug 476846)

+      - fixed demos readtex.c compilation problem on Windows (Karl Schultz)

+      - added missing glGet() query for GL_MAX_TEXTURE_LOD_BIAS_EXT

+      - silence some compiler warnings (gcc 2.96)

+      - enable the #define GL_VERSION_1_3 in GL/gl.h

+      - added GL 1.3 and GLX 1.4 entries to gl_mangle.h and glx_mangle.h

+      - fixed glu.h typedef problem found with MSDev 6.0

+      - build libGL.so with -Bsymbolic (fixes bug found with Chromium)

+      - added missing 'const' to glXGetContextIDEXT() in glxext.h

+      - fixed a few glXGetProcAddress() errors (texture compression, etc)

+      - fixed start index bug in compiled vertex arrays (Keith)

+      - fixed compilation problems in src/SPARC/glapi_sparc.S

+      - fixed triangle strip "parity" bug found in VTK medical1 demo (Keith)

+      - use glXGetProcAddressARB in GLUT to avoid extension linking problems

+      - provoking vertex of flat-shaded, color-index triangles was wrong

+      - fixed a few display list bugs (GLUT walker, molecule, etc) (Keith)

+      - glTexParameter didn't flush the vertex buffer (Ray Tice)

+      - feedback attributes for glDraw/CopyPixels and glBitmap were wrong

+      - fixed bug in normal length caching (ParaView lighting bug)

+</pre>

+

+<h2>October 22, 2001</h2>

+<p>Mesa 4.0 has been released.  This is a stable release.

+</p><pre>    New:

+      - Mesa 4.0 implements the OpenGL 1.3 specification

+      - GL_IBM_rasterpos_clip extension

+      - GL_EXT_texture_edge_clamp extension (aka GL_SGIS_texture_edge_clamp)

+      - GL_ARB_texture_mirrored_repeat extension

+      - WindML UGL driver (Stephane Raimbault)

+      - added OSMESA_MAX_WIDTH/HEIGHT queries

+      - attempted compiliation fixes for Solaris 5, 7 and 8

+      - updated glext.h and glxext.h files

+      - updated Windows driver (Karl Schultz)

+    Bug fixes:

+      - added some missing GLX 1.3 tokens to include/GL/glx.h

+      - GL_COLOR_MATRIX changes weren't recognized by teximage functions

+      - glCopyPixels with scale and bias was broken

+      - glRasterPos with lighting could segfault

+      - glDeleteTextures could leave a dangling pointer

+      - Proxy textures for cube maps didn't work

+      - fixed a number of 16-bit color channel bugs

+      - fixed a few minor memory leaks

+      - GLX context sharing was broken in 3.5

+      - fixed state-update bugs in glPopClientAttrib()

+      - fixed glDrawRangeElements() bug

+      - fixed a glPush/PopAttrib() bug related to texture binding

+      - flat-shaded, textured lines were broken

+      - fixed a dangling pointer problem in the XMesa code (Chris Burghart)

+      - lighting didn't always produce the correct alpha value

+      - fixed 3DNow! code to not read past end of arrays (Andrew Lewycky)

+</pre>

+

+

+<h2>June 21, 2001</h2>

+<p>Mesa 3.5 has been released.  This is a new development release.

+</p><pre>    New:

+	- internals of Mesa divided into modular pieces (Keith Whitwell)

+	- 100% OpenGL 1.2 conformance (passes all conformance tests)

+	- new AA line algorithm

+	- GL_EXT_convolution extension

+        - GL_ARB_imaging subset

+        - OSMesaCreateContextExt() function

+        - GL_ARB_texture_env_add extension (same as GL_EXT_texture_env_add)

+        - GL_MAX_TEXTURE_UNITS_ARB now defaults to eight

+        - GL_EXT_fog_coord extension (Keith Whitwell)

+        - GL_EXT_secondary_color extension (Keith Whitwell)

+        - GL_ARB_texture_env_add extension (same as GL_EXT_texture_env_add)

+        - GL_SGIX_depth_texture extension

+        - GL_SGIX_shadow and GL_SGIX_shadow_ambient extensions

+        - demos/shadowtex.c demo of GL_SGIX_depth_texture and GL_SGIX_shadow

+        - GL_ARB_texture_env_combine extension

+        - GL_ARB_texture_env_dot3 extension

+        - GL_ARB_texture_border_clamp (aka GL_SGIS_texture_border_clamp)

+        - OSMesaCreateContextExt() function

+        - libOSMesa.so library, contains the OSMesa driver interface

+        - GL/glxext.h header file for GLX extensions

+        - somewhat faster software texturing, fogging, depth testing

+        - all color-index conformance tests now pass (only 8bpp tested)

+        - SPARC assembly language TCL optimizations (David Miller)

+        - GL_SGIS_generate_mipmap extension

+    Bug Fixes:

+        - fbiRev and tmuRev were unitialized when using Glide3

+        - fixed a few color index mode conformance failures; all pass now

+        - now appling antialiasing coverage to alpha after texturing

+        - colors weren't getting clamped to [0,1] before color table lookup

+        - fixed RISC alignment errors caused by COPY_4UBV macro

+        - drawing wide, flat-shaded lines could cause a segfault

+        - vertices now snapped to 1/16 pixel to fix rendering of tiny triangles

+    Changes:

+        - SGI's Sample Implementation (SI) 1.3 GLU library replaces Mesa GLU

+        - new libOSMesa.so library, contains the OSMesa driver interface

+</pre>

+

+

+<h2>May 17, 2001</h2>

+<p>Mesa 3.4.2 has been released.  This is basically just a bug-fix release.

+Here's what's new:</p>

+<pre>    Bug fixes:

+        - deleting the currently bound texture could cause bad problems

+        - using fog could result in random vertex alpha values

+         - AA triangle rendering could touch pixels outside right window bound

+        - fixed byteswapping problem in clear_32bit_ximage() function

+        - fixed bugs in wglUseFontBitmapsA(), by Frank Warmerdam

+        - fixed memory leak in glXUseXFont()

+        - fragment sampling in AA triangle function was off by 1/2 pixel

+        - Windows: reading pixels from framebuffer didn't always work

+        - glConvolutionFilter2D could segfault or cause FP exception

+        - fixed segfaults in FX and X drivers when using tex unit 1 but not 0

+        - GL_NAND logicop didn't work right in RGBA mode

+        - fixed a memory corruption bug in vertex buffer reset code

+        - clearing the softwara alpha buffer with scissoring was broken

+        - fixed a few color index mode fog bugs

+        - fixed some bad assertions in color index mode

+        - fixed FX line 'stipple' bug #420091

+    Changes:

+        - optimized writing mono-colored pixel spans to X pixmaps

+        - increased max viewport size to 2048 x 2048

+</pre>

+

+

+<h2>April 29, 2001</h2>

+<p>New Mesa website</p>

+<p>Mark Manning produced the new website.<br>Thanks, Mark!</p>

+

+

+<h2>February 14, 2001</h2>

+<p>Mesa 3.4.1 has been released.  Here's what's new:</p>

+<pre>    New:

+        - fixed some Linux build problems

+        - fixed some Windows build problems

+        - GL_EXT_texture_env_dot3 extension (Gareth Hughes)

+    Bug fixes:

+        - added RENDER_START/RENDER_FINISH macros for glCopyTexImage in DRI

+        - various state-update code changes needed for DRI bugs

+        - disabled pixel transfer ops in glColorTable commands, not needed

+        - fixed bugs in glCopyConvolutionFilter1D/2D, glGetConvolutionFilter

+        - updated sources and fixed compile problems in widgets-mesa/

+        - GLX_PBUFFER enum value was wrong in glx.h

+        - fixed a glColorMaterial lighting bug

+        - fixed bad args to Read/WriteStencilSpan in h/w stencil clear function

+        - glXCopySubBufferMESA() Y position was off by one

+        - Error checking of glTexSubImage3D() was broken (bug 128775)

+        - glPopAttrib() didn't restore all derived Mesa state correctly

+        - Better glReadPixels accuracy for 16bpp color - fixes lots of OpenGL

+          conformance problems at 16bpp.

+        - clearing depth buffer with scissoring was broken, would segfault

+        - OSMesaGetDepthBuffer() returned bad bytesPerValue value

+        - fixed a line clipping bug (reported by Craig McDaniel)

+        - fixed RGB color over/underflow bug for very tiny triangles

+    Known problems:

+        - NURBS or evaluator surfaces inside display lists don't always work

+</pre>

+<p>

+</p><h2>November 3, 2000</h2>

+<p>Mesa 3.4 has been released. Here's what's new since the 3.3 release:</p>

+<pre>    New:

+    - optimized glDrawPixels for glPixelZoom(1,-1)

+    Bug Fixes:

+    - widgets-mesa/src/*.c files were missing from 3.3 distro

+    - include/GL/mesa_wgl.h file was missing from 3.3 distro

+    - fixed some Win32 compile problems

+    - texture object priorities weren't getting initialized to 1.0

+    - glAreTexturesResident return value was wrong when using hardware

+    - glXUseXFont segfaulted when using 3dfx driver (via MESA_GLX_FX)

+    - glReadPixels with GLushort packed types was broken

+    - fixed a few bugs in the GL_EXT_texture_env_combine texture code

+    - glPush/PopAttrib(GL_ENABLE_BIT) mishandled multi-texture enables

+    - fixed some typos/bugs in the VB code

+    - glDrawPixels(GL_COLOR_INDEX) to RGB window didn't work

+    - optimized glDrawPixels paths weren't being used

+    - per-fragment fog calculation didn't work without a Z buffer

+    - improved blending accuracy, fixes Glean  blendFunc test failures

+    - glPixelStore(GL_PACK/UNPACK_SKIP_IMAGES) wasn't handled correctly

+    - glXGetProcAddressARB() didn't always return the right address

+    - gluBuild[12]DMipmaps() didn't grok the GL_BGR pixel format

+    - texture matrix changes weren't always detected (GLUT projtex demo)

+    - fixed random color problem in vertex fog code

+    - fixed Glide-related bug that let Quake get a 24-bit Z buffer

+    Changes:

+    - finished internal support for compressed textures for DRI

+</pre>

+<p>

+</p><h2>April 24, 2000</h2>

+<p>Mesa 3.2 has been released. Here's what's new since the beta release:</p>

+<pre>    Bug fixes:

+    - fixed memcpy bugs in span.c

+    - fixed missing glEnd problem in demos/tessdemo.c

+    - fixed bug when clearing 24bpp Ximages

+    - fixed clipping problem found in Unreal Tournament

+    - fixed Loki's "ice bug" and "crazy triangles" seen in Heretic2

+    - fixed Loki's 3dfx RGB vs BGR bug

+    - fixed Loki's 3dfx smooth/flat shading bug in SoF

+    Changes:

+    - updated docs/README file

+    - use bcopy() optimizations on FreeBSD

+    - re-enabled the optimized persp_textured_triangle() function

+</pre>

+<p>

+</p><h2>March 23, 2000</h2>

+<p>I've just upload the Mesa 3.2 beta 1 files to SourceForge at <a href="http://sourceforge.net/project/showfiles.php?group_id=3" target="_parent">http://sourceforge.net/project/filelist.php?group_id=3</a><a href="http://sourceforge.net/project/showfiles.php?group_id=3"></a></p>

+<p>3.2 (note even number) is a stabilization release of Mesa 3.1 meaning it's mainly

+just bug fixes.</p>

+<p>Here's what's changed:

+

+</p><ul>

+	Bug fixes:

+	<ul>

+		- mixed drawing of lines and bitmaps sometimes had wrong colors<br>

+		- added missing glHintPGI() function<br>

+		- fixed a polygon culling bug<br>

+		- fixed bugs in gluPartialDisk()<br>

+		- Z values in selection mode were wrong<br>

+		- added missing tokens:

+		<ul>

+			GL_SMOOTH_POINT_SIZE_RANGE<br>

+			GL_SMOOTH_POINT_SIZE_GRANULARITY<br>

+			GL_SMOOTH_LINE_WIDTH_RANGE<br>

+			GL_SMOOTH_LINE_WIDTH_GRANULARITY<br>

+			GL_ALIASED_POINT_SIZE_RANGE<br>

+			GL_ALIASED_LINE_WIDTH_RANGE

+		</ul>

+		- fixed glCopyPixels when copying from back to front buffer<br>

+		- GL_EXT_compiled_vertex_array tokens had _SGI suffix instead of _EXT<br>

+		- glDrawRangeElements(GL_LINES, 0, 1, 2, type, indices) was broken<br>

+		- glDeleteTextures() didn't decrement reference count correctly<br>

+		- GL_SRCA_ALPHA_SATURATE blend mode didn't work correctly<br>

+		- Actual depth of transformation matrix stacks was off by one<br>

+		- 24bpp visuals didn't address pixels correctly<br>

+		- mipmap level of detail (lambda) calculation simplified, more accurate<br>

+		- 101691 - Polygon clipping and GL_LINE<br>

+		- 101928 - Polygon clipping and GL_LINE (same fix as above)<br>

+		- 101808 - Non-glVertexArrays tristrip bug<br>

+		- 101971 - find_last_3f on Dec OSF (worked around)<br>

+		- 102369 - segv on dec osf (possibly a duplicate of the above)<br>

+		- 102893 - orientations of modelview cause segfault

+	</ul>

+	New:

+	<ul>

+		- updated SVGA Linux driver<br>

+		- added the MESA_FX_NO_SIGNALS env var, see docs/README.3DFX<br>

+		- build libGLw.a (Xt/OpenGL drawing area widget) library by default<br>

+		- changed -O2 to -O3 for a number of gcc configs

+	</ul>

+	Changes:

+	<ul>

+		- glXCopyContext's mask parameter is now unsigned long, per GLX spec

+	</ul>

+</ul>

+

+<p>Please report any problems with this release ASAP. Bugs should be filed on the

+Mesa3D website at sourceforge.<br>

+After 3.2 is wrapped up I hope to release 3.3 beta 1 soon afterward.</p>

+<p>-- Brian</p>

+<p>

+</p><h2>December 17, 1999</h2>

+<p>A Slashdot interview with Brian about Mesa (questions submitted by Slashdot readers)

+can be found at <a href="http://slashdot.org/interviews/99/12/17/0927212.shtml" target="_parent">http://slashdot.org/interviews/99/12/17/0927212.shtml</a>.</p>

+<p>

+</p><h2>December 14, 1999</h2>

+<p>Mesa 3.1 is released!</p>

+<p>

+</p><h2>September 21, 1999</h2>

+<p>There appear to be two new files on the ftp site, <a href="ftp://ftp.mesa3d.org/mesa/beta/MesaLib-3.1beta3.tar.gz">MesaLib-3.1beta3.tar.gz</a>

+and <a href="ftp://ftp.mesa3d.org/mesa/beta/MesaDemos-3.1beta3.tar.gz">MesaDemos-3.1beta3.tar.gz</a>,

+that seem to be... yes, I've just received confirmation from the beta center, they

+are indeed the <b>THIRD</b> beta release of Mesa 3.1! Happy Days. Happy Days. Thanks

+Keith Whitwell for preparing these for us during Brian's absence.</p>

+<p>

+</p><h2>August 30, 1999</h2>

+<p>I'm pleased to announce that I've accepted a position with Precision Insight,

+Inc. effective October, 1999. I'll be leaving Avid Technology in September.</p>

+<p>I've been working on Mesa in my spare time for over five years. With Precision

+Insight I now have the opportunity to devote my full attention to advancing Mesa

+and OpenGL on Linux.</p>

+<p>While I'll be focused on Linux, the X Window System, and hardware acceleration,

+my work will continue to be open sourced and available to any other programmers who

+may want to contribute to it, or use it for other projects or platforms</p>

+<p>PS: I'm going to be traveling until Sep 6 and won't be reading email until then.</p>

+<p>

+</p><h2>August 23, 1999</h2>

+<p>Anonymous CVS access is back online so suck up all the bandwidth you can afford.

+Note that this is a new archive, so you will need to re-checkout the archive. That

+means don't <i>cvs update</i> from a previous download.</p>

+<p>

+</p><h2>August 17, 1999</h2>

+<p>A report from the SIGGRAPH '99 Linux/OpenGL

+BOF meeting is now available.</p>

+<p>-Brian</p>

+<p>

+</p><h2>August 14, 1999</h2>

+<p>www.mesa3d.org is having technical problems due to hardware failures at VA Linux

+systems. The Mac pages, ftp, and CVS services aren't fully restored yet. Please be

+patient.</p>

+<p>-Brian</p>

+<p>

+</p><h2>June 7, 1999</h2>

+<p>RPMS of the nVidia RIVA server can be found at <a href="ftp://ftp.mesa3d.org/mesa/misc/nVidia/">ftp://ftp.mesa3d.org/mesa/misc/nVidia/</a>.</p>

+<p>

+</p><h2>June 2, 1999</h2>

+<p><a href="http://www.nvidia.com/">nVidia</a> has released some Linux binaries for

+xfree86 3.3.3.1, along with the <b>full source</b>, which includes GLX acceleration

+based on Mesa 3.0. They can be downloaded from <a href="http://www.nvidia.com/Products.nsf/htmlmedia/software_drivers.html">http://www.nvidia.com/Products.nsf/htmlmedia/software_drivers.html</a>.</p>

+<p>

+</p><h2>May 24, 1999</h2>

+<p>Beta 2 of Mesa 3.1 has been make available at <a href="ftp://ftp.mesa3d.org/mesa/beta/">ftp://ftp.mesa3d.org/mesa/beta/</a>.

+If you are into the quake scene, you may want to try this out, as it contains some

+optimizations specifically in the Q3A rendering path.

+<p>

+</p><h2>May 13, 1999</h2>

+<p>For those interested in the integration of Mesa into XFree86 4.0, Precision Insight

+has posted their lowlevel design documents at http://www.precisioninsight.com.</p>

+<p>

+</p><h2>May 13, 1999</h2>

+<pre>May 1999 - John Carmack of id Software, Inc. has made a donation of

+US$10,000 to the Mesa project to support its continuing development.

+Mesa is a free implementation of the OpenGL 3D graphics library and id's

+newest game, Quake 3 Arena, will use Mesa as the 3D renderer on Linux.

+

+The donation will go to Keith Whitwell, who has been optimizing Mesa to

+improve performance on 3d hardware.  Thanks to Keith's work, many

+applications using Mesa 3.1 will see a dramatic performance increase

+over Mesa 3.0.  The donation will allow Keith to continue working on

+Mesa full time for some time to come.

+

+For more information about Mesa see www.mesa3d.org.  For more

+information about id Software, Inc. see www.idsoftware.com.

+

+--------------------------------

+

+This donation from John/id is very generous.  Keith and I are very

+grateful.

+

+</pre>

+<p>

+</p><h2>May 1, 1999</h2>

+<p>John Carmack made an interesting .plan update yesterday:

+

+</p><ul>

+	<i>"I put together a document on optimizing OpenGL drivers for Q3 that

+	should be helpful to the various Linux 3D teams. <br>

+	</i>http://www.quake3arena.com/news/glopt.html</i>"

+</ul>

+

+<p>

+</p><h2>April 7, 1999</h2>

+<p>Updated the Mesa contributors section and added links to RPM Mesa packages.</p>

+<p>

+</p><h2>March 18, 1999</h2>

+<p>The new webpages are now online. Enjoy, and let me know if you find any errors.

+<p>

+</p><h2>February 16, 1999</h2>

+<p><a href="http://www.sgi.com/">SGI</a> releases its <a href="http://www.sgi.com/software/opensource/glx/">GLX

+source code</a>.</p>

+<p>

+</p><h2>January 22, 1999</h2>

+<p>www.mesa3d.org established</p>

+

+

+</p>

+

+

+<hr>

+</body>

+</html>

diff --git a/mesalib/docs/relnotes-7.11.html b/mesalib/docs/relnotes-7.11.html
index 277339bc4..9c34775c2 100644
--- a/mesalib/docs/relnotes-7.11.html
+++ b/mesalib/docs/relnotes-7.11.html
@@ -1,62 +1,62 @@
-<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.11 Release Notes / (release date TBD)</H1>
-
-<p>
-Mesa 7.11 is a new development release.
-People who are concerned with stability and reliability should stick
-with a previous release or wait for Mesa 7.11.1.
-</p>
-<p>
-Mesa 7.11 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>
-<ul>
-<li>GL_ARB_draw_instanced extension (gallium drivers, swrast)
-<li>GL_ARB_instanced_arrays extension (gallium drivers)
-<li>GL_ARB_texture_compression_rgtc (gallium r600, swrast)
-<li>GL_ARB_draw_buffers_blend (gallium)
-<li>GL_EXT_texture_sRGB_decode (gallium drivers, swrast, i965)
-</ul>
-
-
-<h2>Bug fixes</h2>
-<ul>
-</ul>
-
-
-<h2>Changes</h2>
-<ul>
-<li>The Windows MSVC project files have been removed.  They haven't been maintained
-in quite a while.  Building with SCons is an alterantive.
-<li>Removed GL_SGI_texture_color_table support from swrast driver - the only
-driver that implemented it.
-</ul>
-
-
-</body>
-</html>
+<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.11 Release Notes / (release date TBD)</H1>

+

+<p>

+Mesa 7.11 is a new development release.

+People who are concerned with stability and reliability should stick

+with a previous release or wait for Mesa 7.11.1.

+</p>

+<p>

+Mesa 7.11 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>

+<ul>

+<li>GL_ARB_draw_instanced extension (gallium drivers, swrast)

+<li>GL_ARB_instanced_arrays extension (gallium drivers)

+<li>GL_ARB_texture_compression_rgtc (gallium r600, swrast)

+<li>GL_ARB_draw_buffers_blend (gallium)

+<li>GL_EXT_texture_sRGB_decode (gallium drivers, swrast, i965)

+</ul>

+

+

+<h2>Bug fixes</h2>

+<ul>

+</ul>

+

+

+<h2>Changes</h2>

+<ul>

+<li>The Windows MSVC project files have been removed.  They haven't been maintained

+in quite a while.  Building with SCons is an alterantive.

+<li>Removed GL_SGI_texture_color_table support from swrast driver - the only

+driver that implemented it.

+</ul>

+

+

+</body>

+</html>

diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html
index b0ca3ef43..9bbf768fb 100644
--- a/mesalib/docs/relnotes.html
+++ b/mesalib/docs/relnotes.html
@@ -1,88 +1,88 @@
-<HTML>
-
-<TITLE>Mesa Release Notes</TITLE>
-
-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<H1>Release Notes</H1>
-
-<p>
-The release notes summarize what's new or changed in each Mesa release.
-</p>
-
-<UL>
-<LI><A HREF="relnotes-7.11.html">7.11 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>
-<LI><A HREF="relnotes-7.8.1.html">7.8.1 release notes</A>
-<LI><A HREF="relnotes-7.8.html">7.8 release notes</A>
-<LI><A HREF="relnotes-7.7.1.html">7.7.1 release notes</A>
-<LI><A HREF="relnotes-7.7.html">7.7 release notes</A>
-<LI><A HREF="relnotes-7.6.1.html">7.6.1 release notes</A>
-<LI><A HREF="relnotes-7.6.html">7.6 release notes</A>
-<LI><A HREF="relnotes-7.5.2.html">7.5.2 release notes</A>
-<LI><A HREF="relnotes-7.5.1.html">7.5.1 release notes</A>
-<LI><A HREF="relnotes-7.5.html">7.5 release notes</A>
-<LI><A HREF="relnotes-7.4.4.html">7.4.4 release notes</A>
-<LI><A HREF="relnotes-7.4.3.html">7.4.3 release notes</A>
-<LI><A HREF="relnotes-7.4.2.html">7.4.2 release notes</A>
-<LI><A HREF="relnotes-7.4.1.html">7.4.1 release notes</A>
-<LI><A HREF="relnotes-7.4.html">7.4 release notes</A>
-<LI><A HREF="relnotes-7.3.html">7.3 release notes</A>
-<LI><A HREF="relnotes-7.2.html">7.2 release notes</A>
-<LI><A HREF="relnotes-7.1.html">7.1 release notes</A>
-<LI><A HREF="relnotes-7.0.4.html">7.0.4 release notes</A>
-<LI><A HREF="relnotes-7.0.3.html">7.0.3 release notes</A>
-<LI><A HREF="relnotes-7.0.2.html">7.0.2 release notes</A>
-<LI><A HREF="relnotes-7.0.1.html">7.0.1 release notes</A>
-<LI><A HREF="relnotes-7.0.html">7.0 release notes</A>
-<LI><A HREF="relnotes-6.5.3.html">6.5.3 release notes</A>
-<LI><A HREF="relnotes-6.5.2.html">6.5.2 release notes</A>
-<LI><A HREF="relnotes-6.5.1.html">6.5.1 release notes</A>
-<LI><A HREF="relnotes-6.5.html">6.5 release notes</A>
-<LI><A HREF="relnotes-6.4.2.html">6.4.2 release notes</A>
-<LI><A HREF="relnotes-6.4.1.html">6.4.1 release notes</A>
-<LI><A HREF="relnotes-6.4.html">6.4 release notes</A>
-</UL
-
-<p>
-Versions of Mesa prior to 6.4 are summarized in the
-<a href="versions.html">versions file</a> and the following release notes.
-</p>
-
-<UL>
-<LI><A HREF="RELNOTES-6.3.2">RELNOTES-6.3.2</A>
-<LI><A HREF="RELNOTES-6.3">RELNOTES-6.3</A>
-<LI><A HREF="RELNOTES-6.2.1">RELNOTES-6.2.1</A>
-<LI><A HREF="RELNOTES-6.2">RELNOTES-6.2</A>
-<LI><A HREF="RELNOTES-6.1">RELNOTES-6.1</A>
-<LI><A HREF="RELNOTES-6.0">RELNOTES-6.0</A>
-<LI><A HREF="RELNOTES-5.1">RELNOTES-5.1</A>
-<LI><A HREF="RELNOTES-5.0.2">RELNOTES-5.0.2</A>
-<LI><A HREF="RELNOTES-5.0.1">RELNOTES-5.0.1</A>
-<LI><A HREF="RELNOTES-5.0">RELNOTES-5.0</A>
-<LI><A HREF="RELNOTES-4.1">RELNOTES-4.1</A>
-<LI><A HREF="RELNOTES-4.0.3">RELNOTES-4.0.3</A>
-<LI><A HREF="RELNOTES-4.0.2">RELNOTES-4.0.2</A>
-<LI><A HREF="RELNOTES-4.0.1">RELNOTES-4.0.1</A>
-<LI><A HREF="RELNOTES-4.0">RELNOTES-4.0</A>
-<LI><A HREF="RELNOTES-3.5">RELNOTES-3.5</A>
-<LI><A HREF="RELNOTES-3.4.2">RELNOTES-3.4.2</A>
-<LI><A HREF="RELNOTES-3.4.1">RELNOTES-3.4.1</A>
-<LI><A HREF="RELNOTES-3.4">RELNOTES-3.4</A>
-<LI><A HREF="RELNOTES-3.3">RELNOTES-3.3</A>
-<LI><A HREF="RELNOTES-3.2.1">RELNOTES-3.2.1</A>
-<LI><A HREF="RELNOTES-3.2">RELNOTES-3.2</A>
-<LI><A HREF="RELNOTES-3.1">RELNOTES-3.1</A>
-</UL>
-
-
-</BODY>
-</HTML>
+<HTML>

+

+<TITLE>Mesa Release Notes</TITLE>

+

+<link rel="stylesheet" type="text/css" href="mesa.css"></head>

+

+<BODY>

+

+<H1>Release Notes</H1>

+

+<p>

+The release notes summarize what's new or changed in each Mesa release.

+</p>

+

+<UL>

+<LI><A HREF="relnotes-7.11.html">7.11 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>

+<LI><A HREF="relnotes-7.8.1.html">7.8.1 release notes</A>

+<LI><A HREF="relnotes-7.8.html">7.8 release notes</A>

+<LI><A HREF="relnotes-7.7.1.html">7.7.1 release notes</A>

+<LI><A HREF="relnotes-7.7.html">7.7 release notes</A>

+<LI><A HREF="relnotes-7.6.1.html">7.6.1 release notes</A>

+<LI><A HREF="relnotes-7.6.html">7.6 release notes</A>

+<LI><A HREF="relnotes-7.5.2.html">7.5.2 release notes</A>

+<LI><A HREF="relnotes-7.5.1.html">7.5.1 release notes</A>

+<LI><A HREF="relnotes-7.5.html">7.5 release notes</A>

+<LI><A HREF="relnotes-7.4.4.html">7.4.4 release notes</A>

+<LI><A HREF="relnotes-7.4.3.html">7.4.3 release notes</A>

+<LI><A HREF="relnotes-7.4.2.html">7.4.2 release notes</A>

+<LI><A HREF="relnotes-7.4.1.html">7.4.1 release notes</A>

+<LI><A HREF="relnotes-7.4.html">7.4 release notes</A>

+<LI><A HREF="relnotes-7.3.html">7.3 release notes</A>

+<LI><A HREF="relnotes-7.2.html">7.2 release notes</A>

+<LI><A HREF="relnotes-7.1.html">7.1 release notes</A>

+<LI><A HREF="relnotes-7.0.4.html">7.0.4 release notes</A>

+<LI><A HREF="relnotes-7.0.3.html">7.0.3 release notes</A>

+<LI><A HREF="relnotes-7.0.2.html">7.0.2 release notes</A>

+<LI><A HREF="relnotes-7.0.1.html">7.0.1 release notes</A>

+<LI><A HREF="relnotes-7.0.html">7.0 release notes</A>

+<LI><A HREF="relnotes-6.5.3.html">6.5.3 release notes</A>

+<LI><A HREF="relnotes-6.5.2.html">6.5.2 release notes</A>

+<LI><A HREF="relnotes-6.5.1.html">6.5.1 release notes</A>

+<LI><A HREF="relnotes-6.5.html">6.5 release notes</A>

+<LI><A HREF="relnotes-6.4.2.html">6.4.2 release notes</A>

+<LI><A HREF="relnotes-6.4.1.html">6.4.1 release notes</A>

+<LI><A HREF="relnotes-6.4.html">6.4 release notes</A>

+</UL

+

+<p>

+Versions of Mesa prior to 6.4 are summarized in the

+<a href="versions.html">versions file</a> and the following release notes.

+</p>

+

+<UL>

+<LI><A HREF="RELNOTES-6.3.2">RELNOTES-6.3.2</A>

+<LI><A HREF="RELNOTES-6.3">RELNOTES-6.3</A>

+<LI><A HREF="RELNOTES-6.2.1">RELNOTES-6.2.1</A>

+<LI><A HREF="RELNOTES-6.2">RELNOTES-6.2</A>

+<LI><A HREF="RELNOTES-6.1">RELNOTES-6.1</A>

+<LI><A HREF="RELNOTES-6.0">RELNOTES-6.0</A>

+<LI><A HREF="RELNOTES-5.1">RELNOTES-5.1</A>

+<LI><A HREF="RELNOTES-5.0.2">RELNOTES-5.0.2</A>

+<LI><A HREF="RELNOTES-5.0.1">RELNOTES-5.0.1</A>

+<LI><A HREF="RELNOTES-5.0">RELNOTES-5.0</A>

+<LI><A HREF="RELNOTES-4.1">RELNOTES-4.1</A>

+<LI><A HREF="RELNOTES-4.0.3">RELNOTES-4.0.3</A>

+<LI><A HREF="RELNOTES-4.0.2">RELNOTES-4.0.2</A>

+<LI><A HREF="RELNOTES-4.0.1">RELNOTES-4.0.1</A>

+<LI><A HREF="RELNOTES-4.0">RELNOTES-4.0</A>

+<LI><A HREF="RELNOTES-3.5">RELNOTES-3.5</A>

+<LI><A HREF="RELNOTES-3.4.2">RELNOTES-3.4.2</A>

+<LI><A HREF="RELNOTES-3.4.1">RELNOTES-3.4.1</A>

+<LI><A HREF="RELNOTES-3.4">RELNOTES-3.4</A>

+<LI><A HREF="RELNOTES-3.3">RELNOTES-3.3</A>

+<LI><A HREF="RELNOTES-3.2.1">RELNOTES-3.2.1</A>

+<LI><A HREF="RELNOTES-3.2">RELNOTES-3.2</A>

+<LI><A HREF="RELNOTES-3.1">RELNOTES-3.1</A>

+</UL>

+

+

+</BODY>

+</HTML>

diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h
index 2fb729afc..8098a2eb9 100644
--- a/mesalib/include/GL/internal/dri_interface.h
+++ b/mesalib/include/GL/internal/dri_interface.h
@@ -1,887 +1,889 @@
-/*
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2007-2008 Red Hat, Inc.
- * (C) Copyright IBM Corporation 2004
- * All Rights Reserved.
- *
- * 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
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, 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 (including the next
- * paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS 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.
- */
-
-/**
- * \file dri_interface.h
- *
- * This file contains all the types and functions that define the interface
- * between a DRI driver and driver loader.  Currently, the most common driver
- * loader is the XFree86 libGL.so.  However, other loaders do exist, and in
- * the future the server-side libglx.a will also be a loader.
- * 
- * \author Kevin E. Martin <kevin@precisioninsight.com>
- * \author Ian Romanick <idr@us.ibm.com>
- * \author Kristian Høgsberg <krh@redhat.com>
- */
-
-#ifndef DRI_INTERFACE_H
-#define DRI_INTERFACE_H
-
-/* For archs with no drm.h */
-#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__)
-#ifndef __NOT_HAVE_DRM_H
-#define __NOT_HAVE_DRM_H
-#endif
-#endif
-
-#ifndef __NOT_HAVE_DRM_H
-#include <drm.h>
-#else
-typedef unsigned int drm_context_t;
-typedef unsigned int drm_drawable_t;
-typedef struct drm_clip_rect drm_clip_rect_t;
-#endif
-
-/**
- * \name DRI interface structures
- *
- * The following structures define the interface between the GLX client
- * side library and the DRI (direct rendering infrastructure).
- */
-/*@{*/
-typedef struct __DRIdisplayRec		__DRIdisplay;
-typedef struct __DRIscreenRec		__DRIscreen;
-typedef struct __DRIcontextRec		__DRIcontext;
-typedef struct __DRIdrawableRec		__DRIdrawable;
-typedef struct __DRIconfigRec		__DRIconfig;
-typedef struct __DRIframebufferRec	__DRIframebuffer;
-typedef struct __DRIversionRec		__DRIversion;
-
-typedef struct __DRIcoreExtensionRec		__DRIcoreExtension;
-typedef struct __DRIextensionRec		__DRIextension;
-typedef struct __DRIcopySubBufferExtensionRec	__DRIcopySubBufferExtension;
-typedef struct __DRIswapControlExtensionRec	__DRIswapControlExtension;
-typedef struct __DRIframeTrackingExtensionRec	__DRIframeTrackingExtension;
-typedef struct __DRImediaStreamCounterExtensionRec	__DRImediaStreamCounterExtension;
-typedef struct __DRItexOffsetExtensionRec	__DRItexOffsetExtension;
-typedef struct __DRItexBufferExtensionRec	__DRItexBufferExtension;
-typedef struct __DRIlegacyExtensionRec		__DRIlegacyExtension;
-typedef struct __DRIswrastExtensionRec		__DRIswrastExtension;
-typedef struct __DRIbufferRec			__DRIbuffer;
-typedef struct __DRIdri2ExtensionRec		__DRIdri2Extension;
-typedef struct __DRIdri2LoaderExtensionRec	__DRIdri2LoaderExtension;
-typedef struct __DRI2flushExtensionRec	__DRI2flushExtension;
-
-/*@}*/
-
-
-/**
- * Extension struct.  Drivers 'inherit' from this struct by embedding
- * it as the first element in the extension struct.
- *
- * We never break API in for a DRI extension.  If we need to change
- * the way things work in a non-backwards compatible manner, we
- * introduce a new extension.  During a transition period, we can
- * leave both the old and the new extension in the driver, which
- * allows us to move to the new interface without having to update the
- * loader(s) in lock step.
- *
- * However, we can add entry points to an extension over time as long
- * as we don't break the old ones.  As we add entry points to an
- * extension, we increase the version number.  The corresponding
- * #define can be used to guard code that accesses the new entry
- * points at compile time and the version field in the extension
- * struct can be used at run-time to determine how to use the
- * extension.
- */
-struct __DRIextensionRec {
-    const char *name;
-    int version;
-};
-
-/**
- * The first set of extension are the screen extensions, returned by
- * __DRIcore::getExtensions().  This entry point will return a list of
- * extensions and the loader can use the ones it knows about by
- * casting them to more specific extensions and advertising any GLX
- * extensions the DRI extensions enables.
- */
-
-/**
- * Used by drivers to indicate support for setting the read drawable.
- */
-#define __DRI_READ_DRAWABLE "DRI_ReadDrawable"
-#define __DRI_READ_DRAWABLE_VERSION 1
-
-/**
- * Used by drivers that implement the GLX_MESA_copy_sub_buffer extension.
- */
-#define __DRI_COPY_SUB_BUFFER "DRI_CopySubBuffer"
-#define __DRI_COPY_SUB_BUFFER_VERSION 1
-struct __DRIcopySubBufferExtensionRec {
-    __DRIextension base;
-    void (*copySubBuffer)(__DRIdrawable *drawable, int x, int y, int w, int h);
-};
-
-/**
- * Used by drivers that implement the GLX_SGI_swap_control or
- * GLX_MESA_swap_control extension.
- */
-#define __DRI_SWAP_CONTROL "DRI_SwapControl"
-#define __DRI_SWAP_CONTROL_VERSION 1
-struct __DRIswapControlExtensionRec {
-    __DRIextension base;
-    void (*setSwapInterval)(__DRIdrawable *drawable, unsigned int inteval);
-    unsigned int (*getSwapInterval)(__DRIdrawable *drawable);
-};
-
-/**
- * Used by drivers that implement the GLX_MESA_swap_frame_usage extension.
- */
-#define __DRI_FRAME_TRACKING "DRI_FrameTracking"
-#define __DRI_FRAME_TRACKING_VERSION 1
-struct __DRIframeTrackingExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Enable or disable frame usage tracking.
-     * 
-     * \since Internal API version 20030317.
-     */
-    int (*frameTracking)(__DRIdrawable *drawable, GLboolean enable);
-
-    /**
-     * Retrieve frame usage information.
-     * 
-     * \since Internal API version 20030317.
-     */
-    int (*queryFrameTracking)(__DRIdrawable *drawable,
-			      int64_t * sbc, int64_t * missedFrames,
-			      float * lastMissedUsage, float * usage);
-};
-
-
-/**
- * Used by drivers that implement the GLX_SGI_video_sync extension.
- */
-#define __DRI_MEDIA_STREAM_COUNTER "DRI_MediaStreamCounter"
-#define __DRI_MEDIA_STREAM_COUNTER_VERSION 1
-struct __DRImediaStreamCounterExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Wait for the MSC to equal target_msc, or, if that has already passed,
-     * the next time (MSC % divisor) is equal to remainder.  If divisor is
-     * zero, the function will return as soon as MSC is greater than or equal
-     * to target_msc.
-     */
-    int (*waitForMSC)(__DRIdrawable *drawable,
-		      int64_t target_msc, int64_t divisor, int64_t remainder,
-		      int64_t * msc, int64_t * sbc);
-
-    /**
-     * Get the number of vertical refreshes since some point in time before
-     * this function was first called (i.e., system start up).
-     */
-    int (*getDrawableMSC)(__DRIscreen *screen, __DRIdrawable *drawable,
-			  int64_t *msc);
-};
-
-
-#define __DRI_TEX_OFFSET "DRI_TexOffset"
-#define __DRI_TEX_OFFSET_VERSION 1
-struct __DRItexOffsetExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Method to override base texture image with a driver specific 'offset'.
-     * The depth passed in allows e.g. to ignore the alpha channel of texture
-     * images where the non-alpha components don't occupy a whole texel.
-     *
-     * For GLX_EXT_texture_from_pixmap with AIGLX.
-     */
-    void (*setTexOffset)(__DRIcontext *pDRICtx, GLint texname,
-			 unsigned long long offset, GLint depth, GLuint pitch);
-};
-
-
-/* Valid values for format in the setTexBuffer2 function below.  These
- * values match the GLX tokens for compatibility reasons, but we
- * define them here since the DRI interface can't depend on GLX. */
-#define __DRI_TEXTURE_FORMAT_NONE        0x20D8
-#define __DRI_TEXTURE_FORMAT_RGB         0x20D9
-#define __DRI_TEXTURE_FORMAT_RGBA        0x20DA
-
-#define __DRI_TEX_BUFFER "DRI_TexBuffer"
-#define __DRI_TEX_BUFFER_VERSION 2
-struct __DRItexBufferExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Method to override base texture image with the contents of a
-     * __DRIdrawable. 
-     *
-     * For GLX_EXT_texture_from_pixmap with AIGLX.  Deprecated in favor of
-     * setTexBuffer2 in version 2 of this interface
-     */
-    void (*setTexBuffer)(__DRIcontext *pDRICtx,
-			 GLint target,
-			 __DRIdrawable *pDraw);
-
-    /**
-     * Method to override base texture image with the contents of a
-     * __DRIdrawable, including the required texture format attribute.
-     *
-     * For GLX_EXT_texture_from_pixmap with AIGLX.
-     */
-    void (*setTexBuffer2)(__DRIcontext *pDRICtx,
-			  GLint target,
-			  GLint format,
-			  __DRIdrawable *pDraw);
-    /**
-     * Method to release texture buffer in case some special platform
-     * need this.
-     *
-     * For GLX_EXT_texture_from_pixmap with AIGLX.
-     */
-    void (*releaseTexBuffer)(__DRIcontext *pDRICtx,
-			GLint target,
-			__DRIdrawable *pDraw);
-};
-
-/**
- * Used by drivers that implement DRI2
- */
-#define __DRI2_FLUSH "DRI2_Flush"
-#define __DRI2_FLUSH_VERSION 3
-struct __DRI2flushExtensionRec {
-    __DRIextension base;
-    void (*flush)(__DRIdrawable *drawable);
-
-    /**
-     * Ask the driver to call getBuffers/getBuffersWithFormat before
-     * it starts rendering again.
-     *
-     * \param drawable the drawable to invalidate
-     *
-     * \since 3
-     */
-    void (*invalidate)(__DRIdrawable *drawable);
-};
-
-
-/**
- * XML document describing the configuration options supported by the
- * driver.
- */
-extern const char __driConfigOptions[];
-
-/*@}*/
-
-/**
- * The following extensions describe loader features that the DRI
- * driver can make use of.  Some of these are mandatory, such as the
- * getDrawableInfo extension for DRI and the DRI Loader extensions for
- * DRI2, while others are optional, and if present allow the driver to
- * expose certain features.  The loader pass in a NULL terminated
- * array of these extensions to the driver in the createNewScreen
- * constructor.
- */
-
-typedef struct __DRIgetDrawableInfoExtensionRec __DRIgetDrawableInfoExtension;
-typedef struct __DRIsystemTimeExtensionRec __DRIsystemTimeExtension;
-typedef struct __DRIdamageExtensionRec __DRIdamageExtension;
-typedef struct __DRIloaderExtensionRec __DRIloaderExtension;
-typedef struct __DRIswrastLoaderExtensionRec __DRIswrastLoaderExtension;
-
-
-/**
- * Callback to getDrawableInfo protocol
- */
-#define __DRI_GET_DRAWABLE_INFO "DRI_GetDrawableInfo"
-#define __DRI_GET_DRAWABLE_INFO_VERSION 1
-struct __DRIgetDrawableInfoExtensionRec {
-    __DRIextension base;
-
-    /**
-     * This function is used to get information about the position, size, and
-     * clip rects of a drawable.
-     */
-    GLboolean (* getDrawableInfo) ( __DRIdrawable *drawable,
-	unsigned int * index, unsigned int * stamp,
-        int * x, int * y, int * width, int * height,
-        int * numClipRects, drm_clip_rect_t ** pClipRects,
-        int * backX, int * backY,
-	int * numBackClipRects, drm_clip_rect_t ** pBackClipRects,
-	void *loaderPrivate);
-};
-
-/**
- * Callback to get system time for media stream counter extensions.
- */
-#define __DRI_SYSTEM_TIME "DRI_SystemTime"
-#define __DRI_SYSTEM_TIME_VERSION 1
-struct __DRIsystemTimeExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Get the 64-bit unadjusted system time (UST).
-     */
-    int (*getUST)(int64_t * ust);
-
-    /**
-     * Get the media stream counter (MSC) rate.
-     * 
-     * Matching the definition in GLX_OML_sync_control, this function returns
-     * the rate of the "media stream counter".  In practical terms, this is
-     * the frame refresh rate of the display.
-     */
-    GLboolean (*getMSCRate)(__DRIdrawable *draw,
-			    int32_t * numerator, int32_t * denominator,
-			    void *loaderPrivate);
-};
-
-/**
- * Damage reporting
- */
-#define __DRI_DAMAGE "DRI_Damage"
-#define __DRI_DAMAGE_VERSION 1
-struct __DRIdamageExtensionRec {
-    __DRIextension base;
-
-    /**
-     * Reports areas of the given drawable which have been modified by the
-     * driver.
-     *
-     * \param drawable which the drawing was done to.
-     * \param rects rectangles affected, with the drawable origin as the
-     *	      origin.
-     * \param x X offset of the drawable within the screen (used in the
-     *	      front_buffer case)
-     * \param y Y offset of the drawable within the screen.
-     * \param front_buffer boolean flag for whether the drawing to the
-     * 	      drawable was actually done directly to the front buffer (instead
-     *	      of backing storage, for example)
-     * \param loaderPrivate the data passed in at createNewDrawable time
-     */
-    void (*reportDamage)(__DRIdrawable *draw,
-			 int x, int y,
-			 drm_clip_rect_t *rects, int num_rects,
-			 GLboolean front_buffer,
-			 void *loaderPrivate);
-};
-
-#define __DRI_SWRAST_IMAGE_OP_DRAW	1
-#define __DRI_SWRAST_IMAGE_OP_CLEAR	2
-#define __DRI_SWRAST_IMAGE_OP_SWAP	3
-
-/**
- * SWRast Loader extension.
- */
-#define __DRI_SWRAST_LOADER "DRI_SWRastLoader"
-#define __DRI_SWRAST_LOADER_VERSION 1
-struct __DRIswrastLoaderExtensionRec {
-    __DRIextension base;
-
-    /*
-     * Drawable position and size
-     */
-    void (*getDrawableInfo)(__DRIdrawable *drawable,
-			    int *x, int *y, int *width, int *height,
-			    void *loaderPrivate);
-
-    /**
-     * Put image to drawable
-     */
-    void (*putImage)(__DRIdrawable *drawable, int op,
-		     int x, int y, int width, int height,
-		     char *data, void *loaderPrivate);
-
-    /**
-     * Get image from readable
-     */
-    void (*getImage)(__DRIdrawable *readable,
-		     int x, int y, int width, int height,
-		     char *data, void *loaderPrivate);
-};
-
-/**
- * Invalidate loader extension.  The presence of this extension
- * indicates to the DRI driver that the loader will call invalidate in
- * the __DRI2_FLUSH extension, whenever the needs to query for new
- * buffers.  This means that the DRI driver can drop the polling in
- * glViewport().
- *
- * The extension doesn't provide any functionality, it's only use to
- * indicate to the driver that it can use the new semantics.  A DRI
- * driver can use this to switch between the different semantics or
- * just refuse to initialize if this extension isn't present.
- */
-#define __DRI_USE_INVALIDATE "DRI_UseInvalidate"
-#define __DRI_USE_INVALIDATE_VERSION 1
-
-typedef struct __DRIuseInvalidateExtensionRec __DRIuseInvalidateExtension;
-struct __DRIuseInvalidateExtensionRec {
-   __DRIextension base;
-};
-
-/**
- * The remaining extensions describe driver extensions, immediately
- * available interfaces provided by the driver.  To start using the
- * driver, dlsym() for the __DRI_DRIVER_EXTENSIONS symbol and look for
- * the extension you need in the array.
- */
-#define __DRI_DRIVER_EXTENSIONS "__driDriverExtensions"
-
-/**
- * Tokens for __DRIconfig attribs.  A number of attributes defined by
- * GLX or EGL standards are not in the table, as they must be provided
- * by the loader.  For example, FBConfig ID or visual ID, drawable type.
- */
-
-#define __DRI_ATTRIB_BUFFER_SIZE		 1
-#define __DRI_ATTRIB_LEVEL			 2
-#define __DRI_ATTRIB_RED_SIZE			 3
-#define __DRI_ATTRIB_GREEN_SIZE			 4
-#define __DRI_ATTRIB_BLUE_SIZE			 5
-#define __DRI_ATTRIB_LUMINANCE_SIZE		 6
-#define __DRI_ATTRIB_ALPHA_SIZE			 7
-#define __DRI_ATTRIB_ALPHA_MASK_SIZE		 8
-#define __DRI_ATTRIB_DEPTH_SIZE			 9
-#define __DRI_ATTRIB_STENCIL_SIZE		10
-#define __DRI_ATTRIB_ACCUM_RED_SIZE		11
-#define __DRI_ATTRIB_ACCUM_GREEN_SIZE		12
-#define __DRI_ATTRIB_ACCUM_BLUE_SIZE		13
-#define __DRI_ATTRIB_ACCUM_ALPHA_SIZE		14
-#define __DRI_ATTRIB_SAMPLE_BUFFERS		15
-#define __DRI_ATTRIB_SAMPLES			16
-#define __DRI_ATTRIB_RENDER_TYPE		17
-#define __DRI_ATTRIB_CONFIG_CAVEAT		18
-#define __DRI_ATTRIB_CONFORMANT			19
-#define __DRI_ATTRIB_DOUBLE_BUFFER		20
-#define __DRI_ATTRIB_STEREO			21
-#define __DRI_ATTRIB_AUX_BUFFERS		22
-#define __DRI_ATTRIB_TRANSPARENT_TYPE		23
-#define __DRI_ATTRIB_TRANSPARENT_INDEX_VALUE	24
-#define __DRI_ATTRIB_TRANSPARENT_RED_VALUE	25
-#define __DRI_ATTRIB_TRANSPARENT_GREEN_VALUE	26
-#define __DRI_ATTRIB_TRANSPARENT_BLUE_VALUE	27
-#define __DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE	28
-#define __DRI_ATTRIB_FLOAT_MODE			29
-#define __DRI_ATTRIB_RED_MASK			30
-#define __DRI_ATTRIB_GREEN_MASK			31
-#define __DRI_ATTRIB_BLUE_MASK			32
-#define __DRI_ATTRIB_ALPHA_MASK			33
-#define __DRI_ATTRIB_MAX_PBUFFER_WIDTH		34
-#define __DRI_ATTRIB_MAX_PBUFFER_HEIGHT		35
-#define __DRI_ATTRIB_MAX_PBUFFER_PIXELS		36
-#define __DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH	37
-#define __DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT	38
-#define __DRI_ATTRIB_VISUAL_SELECT_GROUP	39
-#define __DRI_ATTRIB_SWAP_METHOD		40
-#define __DRI_ATTRIB_MAX_SWAP_INTERVAL		41
-#define __DRI_ATTRIB_MIN_SWAP_INTERVAL		42
-#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGB	43
-#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGBA	44
-#define __DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE	45
-#define __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS	46
-#define __DRI_ATTRIB_YINVERTED			47
-#define __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE	48
-
-/* __DRI_ATTRIB_RENDER_TYPE */
-#define __DRI_ATTRIB_RGBA_BIT			0x01	
-#define __DRI_ATTRIB_COLOR_INDEX_BIT		0x02
-#define __DRI_ATTRIB_LUMINANCE_BIT		0x04
-
-/* __DRI_ATTRIB_CONFIG_CAVEAT */
-#define __DRI_ATTRIB_SLOW_BIT			0x01
-#define __DRI_ATTRIB_NON_CONFORMANT_CONFIG	0x02
-
-/* __DRI_ATTRIB_TRANSPARENT_TYPE */
-#define __DRI_ATTRIB_TRANSPARENT_RGB		0x00
-#define __DRI_ATTRIB_TRANSPARENT_INDEX		0x01
-
-/* __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS	 */
-#define __DRI_ATTRIB_TEXTURE_1D_BIT		0x01
-#define __DRI_ATTRIB_TEXTURE_2D_BIT		0x02
-#define __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT	0x04
-
-/**
- * This extension defines the core DRI functionality.
- */
-#define __DRI_CORE "DRI_Core"
-#define __DRI_CORE_VERSION 1
-
-struct __DRIcoreExtensionRec {
-    __DRIextension base;
-
-    __DRIscreen *(*createNewScreen)(int screen, int fd,
-				    unsigned int sarea_handle,
-				    const __DRIextension **extensions,
-				    const __DRIconfig ***driverConfigs,
-				    void *loaderPrivate);
-
-    void (*destroyScreen)(__DRIscreen *screen);
-
-    const __DRIextension **(*getExtensions)(__DRIscreen *screen);
-
-    int (*getConfigAttrib)(const __DRIconfig *config,
-			   unsigned int attrib,
-			   unsigned int *value);
-
-    int (*indexConfigAttrib)(const __DRIconfig *config, int index,
-			     unsigned int *attrib, unsigned int *value);
-
-    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
-					const __DRIconfig *config,
-					unsigned int drawable_id,
-					unsigned int head,
-					void *loaderPrivate);
-
-    void (*destroyDrawable)(__DRIdrawable *drawable);
-
-    void (*swapBuffers)(__DRIdrawable *drawable);
-
-    __DRIcontext *(*createNewContext)(__DRIscreen *screen,
-				      const __DRIconfig *config,
-				      __DRIcontext *shared,
-				      void *loaderPrivate);
-
-    int (*copyContext)(__DRIcontext *dest,
-		       __DRIcontext *src,
-		       unsigned long mask);
-
-    void (*destroyContext)(__DRIcontext *context);
-
-    int (*bindContext)(__DRIcontext *ctx,
-		       __DRIdrawable *pdraw,
-		       __DRIdrawable *pread);
-
-    int (*unbindContext)(__DRIcontext *ctx);
-};
-
-/**
- * Stored version of some component (i.e., server-side DRI module, kernel-side
- * DRM, etc.).
- * 
- * \todo
- * There are several data structures that explicitly store a major version,
- * minor version, and patch level.  These structures should be modified to
- * have a \c __DRIversionRec instead.
- */
-struct __DRIversionRec {
-    int    major;        /**< Major version number. */
-    int    minor;        /**< Minor version number. */
-    int    patch;        /**< Patch-level. */
-};
-
-/**
- * Framebuffer information record.  Used by libGL to communicate information
- * about the framebuffer to the driver's \c __driCreateNewScreen function.
- * 
- * In XFree86, most of this information is derrived from data returned by
- * calling \c XF86DRIGetDeviceInfo.
- *
- * \sa XF86DRIGetDeviceInfo __DRIdisplayRec::createNewScreen
- *     __driUtilCreateNewScreen CallCreateNewScreen
- *
- * \bug This structure could be better named.
- */
-struct __DRIframebufferRec {
-    unsigned char *base;    /**< Framebuffer base address in the CPU's
-			     * address space.  This value is calculated by
-			     * calling \c drmMap on the framebuffer handle
-			     * returned by \c XF86DRIGetDeviceInfo (or a
-			     * similar function).
-			     */
-    int size;               /**< Framebuffer size, in bytes. */
-    int stride;             /**< Number of bytes from one line to the next. */
-    int width;              /**< Pixel width of the framebuffer. */
-    int height;             /**< Pixel height of the framebuffer. */
-    int dev_priv_size;      /**< Size of the driver's dev-priv structure. */
-    void *dev_priv;         /**< Pointer to the driver's dev-priv structure. */
-};
-
-
-/**
- * This extension provides alternative screen, drawable and context
- * constructors for legacy DRI functionality.  This is used in
- * conjunction with the core extension.
- */
-#define __DRI_LEGACY "DRI_Legacy"
-#define __DRI_LEGACY_VERSION 1
-
-struct __DRIlegacyExtensionRec {
-    __DRIextension base;
-
-    __DRIscreen *(*createNewScreen)(int screen,
-				    const __DRIversion *ddx_version,
-				    const __DRIversion *dri_version,
-				    const __DRIversion *drm_version,
-				    const __DRIframebuffer *frame_buffer,
-				    void *pSAREA, int fd, 
-				    const __DRIextension **extensions,
-				    const __DRIconfig ***driver_configs,
-				    void *loaderPrivate);
-
-    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
-					const __DRIconfig *config,
-					drm_drawable_t hwDrawable,
-					int renderType, const int *attrs,
-					void *loaderPrivate);
-
-    __DRIcontext *(*createNewContext)(__DRIscreen *screen,
-				      const __DRIconfig *config,
-				      int render_type,
-				      __DRIcontext *shared,
-				      drm_context_t hwContext,
-				      void *loaderPrivate);
-};
-
-/**
- * This extension provides alternative screen, drawable and context
- * constructors for swrast DRI functionality.  This is used in
- * conjunction with the core extension.
- */
-#define __DRI_SWRAST "DRI_SWRast"
-#define __DRI_SWRAST_VERSION 2
-
-struct __DRIswrastExtensionRec {
-    __DRIextension base;
-
-    __DRIscreen *(*createNewScreen)(int screen,
-				    const __DRIextension **extensions,
-				    const __DRIconfig ***driver_configs,
-				    void *loaderPrivate);
-
-    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
-					const __DRIconfig *config,
-					void *loaderPrivate);
-
-   /* Since version 2 */
-   __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,
-                                           int api,
-                                           const __DRIconfig *config,
-                                           __DRIcontext *shared,
-                                           void *data);
-};
-
-/**
- * DRI2 Loader extension.
- */
-#define __DRI_BUFFER_FRONT_LEFT		0
-#define __DRI_BUFFER_BACK_LEFT		1
-#define __DRI_BUFFER_FRONT_RIGHT	2
-#define __DRI_BUFFER_BACK_RIGHT		3
-#define __DRI_BUFFER_DEPTH		4
-#define __DRI_BUFFER_STENCIL		5
-#define __DRI_BUFFER_ACCUM		6
-#define __DRI_BUFFER_FAKE_FRONT_LEFT	7
-#define __DRI_BUFFER_FAKE_FRONT_RIGHT	8
-#define __DRI_BUFFER_DEPTH_STENCIL	9  /**< Only available with DRI2 1.1 */
-
-struct __DRIbufferRec {
-    unsigned int attachment;
-    unsigned int name;
-    unsigned int pitch;
-    unsigned int cpp;
-    unsigned int flags;
-};
-
-#define __DRI_DRI2_LOADER "DRI_DRI2Loader"
-#define __DRI_DRI2_LOADER_VERSION 3
-struct __DRIdri2LoaderExtensionRec {
-    __DRIextension base;
-
-    __DRIbuffer *(*getBuffers)(__DRIdrawable *driDrawable,
-			       int *width, int *height,
-			       unsigned int *attachments, int count,
-			       int *out_count, void *loaderPrivate);
-
-    /**
-     * Flush pending front-buffer rendering
-     *
-     * Any rendering that has been performed to the
-     * \c __DRI_BUFFER_FAKE_FRONT_LEFT will be flushed to the
-     * \c __DRI_BUFFER_FRONT_LEFT.
-     *
-     * \param driDrawable    Drawable whose front-buffer is to be flushed
-     * \param loaderPrivate  Loader's private data that was previously passed
-     *                       into __DRIdri2ExtensionRec::createNewDrawable
-     */
-    void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate);
-
-
-    /**
-     * Get list of buffers from the server
-     *
-     * Gets a list of buffer for the specified set of attachments.  Unlike
-     * \c ::getBuffers, this function takes a list of attachments paired with
-     * opaque \c unsigned \c int value describing the format of the buffer.
-     * It is the responsibility of the caller to know what the service that
-     * allocates the buffers will expect to receive for the format.
-     *
-     * \param driDrawable    Drawable whose buffers are being queried.
-     * \param width          Output where the width of the buffers is stored.
-     * \param height         Output where the height of the buffers is stored.
-     * \param attachments    List of pairs of attachment ID and opaque format
-     *                       requested for the drawable.
-     * \param count          Number of attachment / format pairs stored in
-     *                       \c attachments.
-     * \param loaderPrivate  Loader's private data that was previously passed
-     *                       into __DRIdri2ExtensionRec::createNewDrawable.
-     */
-    __DRIbuffer *(*getBuffersWithFormat)(__DRIdrawable *driDrawable,
-					 int *width, int *height,
-					 unsigned int *attachments, int count,
-					 int *out_count, void *loaderPrivate);
-};
-
-/**
- * This extension provides alternative screen, drawable and context
- * constructors for DRI2.
- */
-#define __DRI_DRI2 "DRI_DRI2"
-#define __DRI_DRI2_VERSION 2
-
-#define __DRI_API_OPENGL	0
-#define __DRI_API_GLES		1
-#define __DRI_API_GLES2		2
-
-struct __DRIdri2ExtensionRec {
-    __DRIextension base;
-
-    __DRIscreen *(*createNewScreen)(int screen, int fd,
-				    const __DRIextension **extensions,
-				    const __DRIconfig ***driver_configs,
-				    void *loaderPrivate);
-
-    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
-					const __DRIconfig *config,
-					void *loaderPrivate);
-
-    __DRIcontext *(*createNewContext)(__DRIscreen *screen,
-				      const __DRIconfig *config,
-				      __DRIcontext *shared,
-				      void *loaderPrivate);
-
-   /* Since version 2 */
-   unsigned int (*getAPIMask)(__DRIscreen *screen);
-
-   __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,
-					   int api,
-					   const __DRIconfig *config,
-					   __DRIcontext *shared,
-					   void *data);
-
-   __DRIbuffer *(*allocateBuffer)(__DRIscreen *screen,
-				  unsigned int attachment,
-				  unsigned int format,
-				  int width,
-				  int height);
-   void (*releaseBuffer)(__DRIscreen *screen,
-			 __DRIbuffer *buffer);
-};
-
-
-/**
- * This extension provides functionality to enable various EGLImage
- * extensions.
- */
-#define __DRI_IMAGE "DRI_IMAGE"
-#define __DRI_IMAGE_VERSION 1
-
-/**
- * These formats correspond to the similarly named MESA_FORMAT_*
- * tokens, except in the native endian of the CPU.  For example, on
- * little endian __DRI_IMAGE_FORMAT_XRGB8888 corresponds to
- * MESA_FORMAT_XRGB8888, but MESA_FORMAT_XRGB8888_REV on big endian.
- */
-#define __DRI_IMAGE_FORMAT_RGB565       0x1001
-#define __DRI_IMAGE_FORMAT_XRGB8888     0x1002
-#define __DRI_IMAGE_FORMAT_ARGB8888     0x1003
-
-#define __DRI_IMAGE_USE_SHARE		0x0001
-#define __DRI_IMAGE_USE_SCANOUT		0x0002
-
-/**
- * queryImage attributes
- */
-
-#define __DRI_IMAGE_ATTRIB_STRIDE	0x2000
-#define __DRI_IMAGE_ATTRIB_HANDLE	0x2001
-#define __DRI_IMAGE_ATTRIB_NAME		0x2002
-
-typedef struct __DRIimageRec          __DRIimage;
-typedef struct __DRIimageExtensionRec __DRIimageExtension;
-struct __DRIimageExtensionRec {
-    __DRIextension base;
-
-    __DRIimage *(*createImageFromName)(__DRIscreen *screen,
-				       int width, int height, int format,
-				       int name, int pitch,
-				       void *loaderPrivate);
-
-    __DRIimage *(*createImageFromRenderbuffer)(__DRIcontext *context,
-					       int renderbuffer,
-					       void *loaderPrivate);
-
-    void (*destroyImage)(__DRIimage *image);
-
-    __DRIimage *(*createImage)(__DRIscreen *screen,
-			       int width, int height, int format,
-			       unsigned int use,
-			       void *loaderPrivate);
-
-   GLboolean (*queryImage)(__DRIimage *image, int attrib, int *value);
-};
-
-
-/**
- * This extension must be implemented by the loader and passed to the
- * driver at screen creation time.  The EGLImage entry points in the
- * various client APIs take opaque EGLImage handles and use this
- * extension to map them to a __DRIimage.  At version 1, this
- * extensions allows mapping EGLImage pointers to __DRIimage pointers,
- * but future versions could support other EGLImage-like, opaque types
- * with new lookup functions.
- */
-#define __DRI_IMAGE_LOOKUP "DRI_IMAGE_LOOKUP"
-#define __DRI_IMAGE_LOOKUP_VERSION 1
-
-typedef struct __DRIimageLookupExtensionRec __DRIimageLookupExtension;
-struct __DRIimageLookupExtensionRec {
-    __DRIextension base;
-
-    __DRIimage *(*lookupEGLImage)(__DRIscreen *screen, void *image,
-				  void *loaderPrivate);
-};
-
-/**
- * This extension allows for common DRI2 options
- */
-#define __DRI2_CONFIG_QUERY "DRI_CONFIG_QUERY"
-#define __DRI2_CONFIG_QUERY_VERSION 1
-
-typedef struct __DRI2configQueryExtensionRec __DRI2configQueryExtension;
-struct __DRI2configQueryExtensionRec {
-   __DRIextension base;
-
-   int (*configQueryb)(__DRIscreen *screen, const char *var, GLboolean *val);
-   int (*configQueryi)(__DRIscreen *screen, const char *var, GLint *val);
-   int (*configQueryf)(__DRIscreen *screen, const char *var, GLfloat *val);
-};
-#endif
+/*

+ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

+ * Copyright 2007-2008 Red Hat, Inc.

+ * (C) Copyright IBM Corporation 2004

+ * All Rights Reserved.

+ *

+ * 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

+ * on the rights to use, copy, modify, merge, publish, distribute, sub

+ * license, 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 (including the next

+ * paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL

+ * THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS 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.

+ */

+

+/**

+ * \file dri_interface.h

+ *

+ * This file contains all the types and functions that define the interface

+ * between a DRI driver and driver loader.  Currently, the most common driver

+ * loader is the XFree86 libGL.so.  However, other loaders do exist, and in

+ * the future the server-side libglx.a will also be a loader.

+ * 

+ * \author Kevin E. Martin <kevin@precisioninsight.com>

+ * \author Ian Romanick <idr@us.ibm.com>

+ * \author Kristian Høgsberg <krh@redhat.com>

+ */

+

+#ifndef DRI_INTERFACE_H

+#define DRI_INTERFACE_H

+

+/* For archs with no drm.h */

+#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) || defined(_MSC_VER)

+#ifndef __NOT_HAVE_DRM_H

+#define __NOT_HAVE_DRM_H

+#endif

+#endif

+

+#ifndef __NOT_HAVE_DRM_H

+#include <drm.h>

+#else

+typedef unsigned int drm_context_t;

+typedef unsigned int drm_drawable_t;

+typedef struct drm_clip_rect drm_clip_rect_t;

+#endif

+

+/**

+ * \name DRI interface structures

+ *

+ * The following structures define the interface between the GLX client

+ * side library and the DRI (direct rendering infrastructure).

+ */

+/*@{*/

+typedef struct __DRIdisplayRec		__DRIdisplay;

+typedef struct __DRIscreenRec		__DRIscreen;

+typedef struct __DRIcontextRec		__DRIcontext;

+typedef struct __DRIdrawableRec		__DRIdrawable;

+typedef struct __DRIconfigRec		__DRIconfig;

+typedef struct __DRIframebufferRec	__DRIframebuffer;

+typedef struct __DRIversionRec		__DRIversion;

+

+typedef struct __DRIcoreExtensionRec		__DRIcoreExtension;

+typedef struct __DRIextensionRec		__DRIextension;

+typedef struct __DRIcopySubBufferExtensionRec	__DRIcopySubBufferExtension;

+typedef struct __DRIswapControlExtensionRec	__DRIswapControlExtension;

+typedef struct __DRIframeTrackingExtensionRec	__DRIframeTrackingExtension;

+typedef struct __DRImediaStreamCounterExtensionRec	__DRImediaStreamCounterExtension;

+typedef struct __DRItexOffsetExtensionRec	__DRItexOffsetExtension;

+typedef struct __DRItexBufferExtensionRec	__DRItexBufferExtension;

+typedef struct __DRIlegacyExtensionRec		__DRIlegacyExtension;

+typedef struct __DRIswrastExtensionRec		__DRIswrastExtension;

+typedef struct __DRIbufferRec			__DRIbuffer;

+typedef struct __DRIdri2ExtensionRec		__DRIdri2Extension;

+typedef struct __DRIdri2LoaderExtensionRec	__DRIdri2LoaderExtension;

+typedef struct __DRI2flushExtensionRec	__DRI2flushExtension;

+

+/*@}*/

+

+

+/**

+ * Extension struct.  Drivers 'inherit' from this struct by embedding

+ * it as the first element in the extension struct.

+ *

+ * We never break API in for a DRI extension.  If we need to change

+ * the way things work in a non-backwards compatible manner, we

+ * introduce a new extension.  During a transition period, we can

+ * leave both the old and the new extension in the driver, which

+ * allows us to move to the new interface without having to update the

+ * loader(s) in lock step.

+ *

+ * However, we can add entry points to an extension over time as long

+ * as we don't break the old ones.  As we add entry points to an

+ * extension, we increase the version number.  The corresponding

+ * #define can be used to guard code that accesses the new entry

+ * points at compile time and the version field in the extension

+ * struct can be used at run-time to determine how to use the

+ * extension.

+ */

+struct __DRIextensionRec {

+    const char *name;

+    int version;

+};

+

+/**

+ * The first set of extension are the screen extensions, returned by

+ * __DRIcore::getExtensions().  This entry point will return a list of

+ * extensions and the loader can use the ones it knows about by

+ * casting them to more specific extensions and advertising any GLX

+ * extensions the DRI extensions enables.

+ */

+

+/**

+ * Used by drivers to indicate support for setting the read drawable.

+ */

+#define __DRI_READ_DRAWABLE "DRI_ReadDrawable"

+#define __DRI_READ_DRAWABLE_VERSION 1

+

+/**

+ * Used by drivers that implement the GLX_MESA_copy_sub_buffer extension.

+ */

+#define __DRI_COPY_SUB_BUFFER "DRI_CopySubBuffer"

+#define __DRI_COPY_SUB_BUFFER_VERSION 1

+struct __DRIcopySubBufferExtensionRec {

+    __DRIextension base;

+    void (*copySubBuffer)(__DRIdrawable *drawable, int x, int y, int w, int h);

+};

+

+/**

+ * Used by drivers that implement the GLX_SGI_swap_control or

+ * GLX_MESA_swap_control extension.

+ */

+#define __DRI_SWAP_CONTROL "DRI_SwapControl"

+#define __DRI_SWAP_CONTROL_VERSION 1

+struct __DRIswapControlExtensionRec {

+    __DRIextension base;

+    void (*setSwapInterval)(__DRIdrawable *drawable, unsigned int inteval);

+    unsigned int (*getSwapInterval)(__DRIdrawable *drawable);

+};

+

+/**

+ * Used by drivers that implement the GLX_MESA_swap_frame_usage extension.

+ */

+#define __DRI_FRAME_TRACKING "DRI_FrameTracking"

+#define __DRI_FRAME_TRACKING_VERSION 1

+struct __DRIframeTrackingExtensionRec {

+    __DRIextension base;

+

+    /**

+     * Enable or disable frame usage tracking.

+     * 

+     * \since Internal API version 20030317.

+     */

+    int (*frameTracking)(__DRIdrawable *drawable, GLboolean enable);

+

+    /**

+     * Retrieve frame usage information.

+     * 

+     * \since Internal API version 20030317.

+     */

+    int (*queryFrameTracking)(__DRIdrawable *drawable,

+			      int64_t * sbc, int64_t * missedFrames,

+			      float * lastMissedUsage, float * usage);

+};

+

+

+/**

+ * Used by drivers that implement the GLX_SGI_video_sync extension.

+ */

+#define __DRI_MEDIA_STREAM_COUNTER "DRI_MediaStreamCounter"

+#define __DRI_MEDIA_STREAM_COUNTER_VERSION 1

+struct __DRImediaStreamCounterExtensionRec {

+    __DRIextension base;

+

+    /**

+     * Wait for the MSC to equal target_msc, or, if that has already passed,

+     * the next time (MSC % divisor) is equal to remainder.  If divisor is

+     * zero, the function will return as soon as MSC is greater than or equal

+     * to target_msc.

+     */

+    int (*waitForMSC)(__DRIdrawable *drawable,

+		      int64_t target_msc, int64_t divisor, int64_t remainder,

+		      int64_t * msc, int64_t * sbc);

+

+    /**

+     * Get the number of vertical refreshes since some point in time before

+     * this function was first called (i.e., system start up).

+     */

+    int (*getDrawableMSC)(__DRIscreen *screen, __DRIdrawable *drawable,

+			  int64_t *msc);

+};

+

+

+#define __DRI_TEX_OFFSET "DRI_TexOffset"

+#define __DRI_TEX_OFFSET_VERSION 1

+struct __DRItexOffsetExtensionRec {

+    __DRIextension base;

+

+    /**

+     * Method to override base texture image with a driver specific 'offset'.

+     * The depth passed in allows e.g. to ignore the alpha channel of texture

+     * images where the non-alpha components don't occupy a whole texel.

+     *

+     * For GLX_EXT_texture_from_pixmap with AIGLX.

+     */

+    void (*setTexOffset)(__DRIcontext *pDRICtx, GLint texname,

+			 unsigned long long offset, GLint depth, GLuint pitch);

+};

+

+

+/* Valid values for format in the setTexBuffer2 function below.  These

+ * values match the GLX tokens for compatibility reasons, but we

+ * define them here since the DRI interface can't depend on GLX. */

+#define __DRI_TEXTURE_FORMAT_NONE        0x20D8

+#define __DRI_TEXTURE_FORMAT_RGB         0x20D9

+#define __DRI_TEXTURE_FORMAT_RGBA        0x20DA

+

+#define __DRI_TEX_BUFFER "DRI_TexBuffer"

+#define __DRI_TEX_BUFFER_VERSION 2

+struct __DRItexBufferExtensionRec {

+    __DRIextension base;

+

+    /**

+     * Method to override base texture image with the contents of a

+     * __DRIdrawable. 

+     *

+     * For GLX_EXT_texture_from_pixmap with AIGLX.  Deprecated in favor of

+     * setTexBuffer2 in version 2 of this interface

+     */

+    void (*setTexBuffer)(__DRIcontext *pDRICtx,

+			 GLint target,

+			 __DRIdrawable *pDraw);

+

+    /**

+     * Method to override base texture image with the contents of a

+     * __DRIdrawable, including the required texture format attribute.

+     *

+     * For GLX_EXT_texture_from_pixmap with AIGLX.

+     */

+    void (*setTexBuffer2)(__DRIcontext *pDRICtx,

+			  GLint target,

+			  GLint format,

+			  __DRIdrawable *pDraw);

+    /**

+     * Method to release texture buffer in case some special platform

+     * need this.

+     *

+     * For GLX_EXT_texture_from_pixmap with AIGLX.

+     */

+    void (*releaseTexBuffer)(__DRIcontext *pDRICtx,

+			GLint target,

+			__DRIdrawable *pDraw);

+};

+

+/**

+ * Used by drivers that implement DRI2

+ */

+#define __DRI2_FLUSH "DRI2_Flush"

+#define __DRI2_FLUSH_VERSION 3

+struct __DRI2flushExtensionRec {

+    __DRIextension base;

+    void (*flush)(__DRIdrawable *drawable);

+

+    /**

+     * Ask the driver to call getBuffers/getBuffersWithFormat before

+     * it starts rendering again.

+     *

+     * \param drawable the drawable to invalidate

+     *

+     * \since 3

+     */

+    void (*invalidate)(__DRIdrawable *drawable);

+};

+

+

+/**

+ * XML document describing the configuration options supported by the

+ * driver.

+ */

+extern const char __driConfigOptions[];

+

+/*@}*/

+

+/**

+ * The following extensions describe loader features that the DRI

+ * driver can make use of.  Some of these are mandatory, such as the

+ * getDrawableInfo extension for DRI and the DRI Loader extensions for

+ * DRI2, while others are optional, and if present allow the driver to

+ * expose certain features.  The loader pass in a NULL terminated

+ * array of these extensions to the driver in the createNewScreen

+ * constructor.

+ */

+

+typedef struct __DRIgetDrawableInfoExtensionRec __DRIgetDrawableInfoExtension;

+typedef struct __DRIsystemTimeExtensionRec __DRIsystemTimeExtension;

+typedef struct __DRIdamageExtensionRec __DRIdamageExtension;

+typedef struct __DRIloaderExtensionRec __DRIloaderExtension;

+typedef struct __DRIswrastLoaderExtensionRec __DRIswrastLoaderExtension;

+

+

+/**

+ * Callback to getDrawableInfo protocol

+ */

+#define __DRI_GET_DRAWABLE_INFO "DRI_GetDrawableInfo"

+#define __DRI_GET_DRAWABLE_INFO_VERSION 1

+struct __DRIgetDrawableInfoExtensionRec {

+    __DRIextension base;

+

+    /**

+     * This function is used to get information about the position, size, and

+     * clip rects of a drawable.

+     */

+    GLboolean (* getDrawableInfo) ( __DRIdrawable *drawable,

+	unsigned int * index, unsigned int * stamp,

+        int * x, int * y, int * width, int * height,

+        int * numClipRects, drm_clip_rect_t ** pClipRects,

+        int * backX, int * backY,

+	int * numBackClipRects, drm_clip_rect_t ** pBackClipRects,

+	void *loaderPrivate);

+};

+

+typedef int int32_t;

+

+/**

+ * Callback to get system time for media stream counter extensions.

+ */

+#define __DRI_SYSTEM_TIME "DRI_SystemTime"

+#define __DRI_SYSTEM_TIME_VERSION 1

+struct __DRIsystemTimeExtensionRec {

+    __DRIextension base;

+

+    /**

+     * Get the 64-bit unadjusted system time (UST).

+     */

+    int (*getUST)(int64_t * ust);

+

+    /**

+     * Get the media stream counter (MSC) rate.

+     * 

+     * Matching the definition in GLX_OML_sync_control, this function returns

+     * the rate of the "media stream counter".  In practical terms, this is

+     * the frame refresh rate of the display.

+     */

+    GLboolean (*getMSCRate)(__DRIdrawable *draw,

+			    int32_t * numerator, int32_t * denominator,

+			    void *loaderPrivate);

+};

+

+/**

+ * Damage reporting

+ */

+#define __DRI_DAMAGE "DRI_Damage"

+#define __DRI_DAMAGE_VERSION 1

+struct __DRIdamageExtensionRec {

+    __DRIextension base;

+

+    /**

+     * Reports areas of the given drawable which have been modified by the

+     * driver.

+     *

+     * \param drawable which the drawing was done to.

+     * \param rects rectangles affected, with the drawable origin as the

+     *	      origin.

+     * \param x X offset of the drawable within the screen (used in the

+     *	      front_buffer case)

+     * \param y Y offset of the drawable within the screen.

+     * \param front_buffer boolean flag for whether the drawing to the

+     * 	      drawable was actually done directly to the front buffer (instead

+     *	      of backing storage, for example)

+     * \param loaderPrivate the data passed in at createNewDrawable time

+     */

+    void (*reportDamage)(__DRIdrawable *draw,

+			 int x, int y,

+			 drm_clip_rect_t *rects, int num_rects,

+			 GLboolean front_buffer,

+			 void *loaderPrivate);

+};

+

+#define __DRI_SWRAST_IMAGE_OP_DRAW	1

+#define __DRI_SWRAST_IMAGE_OP_CLEAR	2

+#define __DRI_SWRAST_IMAGE_OP_SWAP	3

+

+/**

+ * SWRast Loader extension.

+ */

+#define __DRI_SWRAST_LOADER "DRI_SWRastLoader"

+#define __DRI_SWRAST_LOADER_VERSION 1

+struct __DRIswrastLoaderExtensionRec {

+    __DRIextension base;

+

+    /*

+     * Drawable position and size

+     */

+    void (*getDrawableInfo)(__DRIdrawable *drawable,

+			    int *x, int *y, int *width, int *height,

+			    void *loaderPrivate);

+

+    /**

+     * Put image to drawable

+     */

+    void (*putImage)(__DRIdrawable *drawable, int op,

+		     int x, int y, int width, int height,

+		     char *data, void *loaderPrivate);

+

+    /**

+     * Get image from readable

+     */

+    void (*getImage)(__DRIdrawable *readable,

+		     int x, int y, int width, int height,

+		     char *data, void *loaderPrivate);

+};

+

+/**

+ * Invalidate loader extension.  The presence of this extension

+ * indicates to the DRI driver that the loader will call invalidate in

+ * the __DRI2_FLUSH extension, whenever the needs to query for new

+ * buffers.  This means that the DRI driver can drop the polling in

+ * glViewport().

+ *

+ * The extension doesn't provide any functionality, it's only use to

+ * indicate to the driver that it can use the new semantics.  A DRI

+ * driver can use this to switch between the different semantics or

+ * just refuse to initialize if this extension isn't present.

+ */

+#define __DRI_USE_INVALIDATE "DRI_UseInvalidate"

+#define __DRI_USE_INVALIDATE_VERSION 1

+

+typedef struct __DRIuseInvalidateExtensionRec __DRIuseInvalidateExtension;

+struct __DRIuseInvalidateExtensionRec {

+   __DRIextension base;

+};

+

+/**

+ * The remaining extensions describe driver extensions, immediately

+ * available interfaces provided by the driver.  To start using the

+ * driver, dlsym() for the __DRI_DRIVER_EXTENSIONS symbol and look for

+ * the extension you need in the array.

+ */

+#define __DRI_DRIVER_EXTENSIONS "__driDriverExtensions"

+

+/**

+ * Tokens for __DRIconfig attribs.  A number of attributes defined by

+ * GLX or EGL standards are not in the table, as they must be provided

+ * by the loader.  For example, FBConfig ID or visual ID, drawable type.

+ */

+

+#define __DRI_ATTRIB_BUFFER_SIZE		 1

+#define __DRI_ATTRIB_LEVEL			 2

+#define __DRI_ATTRIB_RED_SIZE			 3

+#define __DRI_ATTRIB_GREEN_SIZE			 4

+#define __DRI_ATTRIB_BLUE_SIZE			 5

+#define __DRI_ATTRIB_LUMINANCE_SIZE		 6

+#define __DRI_ATTRIB_ALPHA_SIZE			 7

+#define __DRI_ATTRIB_ALPHA_MASK_SIZE		 8

+#define __DRI_ATTRIB_DEPTH_SIZE			 9

+#define __DRI_ATTRIB_STENCIL_SIZE		10

+#define __DRI_ATTRIB_ACCUM_RED_SIZE		11

+#define __DRI_ATTRIB_ACCUM_GREEN_SIZE		12

+#define __DRI_ATTRIB_ACCUM_BLUE_SIZE		13

+#define __DRI_ATTRIB_ACCUM_ALPHA_SIZE		14

+#define __DRI_ATTRIB_SAMPLE_BUFFERS		15

+#define __DRI_ATTRIB_SAMPLES			16

+#define __DRI_ATTRIB_RENDER_TYPE		17

+#define __DRI_ATTRIB_CONFIG_CAVEAT		18

+#define __DRI_ATTRIB_CONFORMANT			19

+#define __DRI_ATTRIB_DOUBLE_BUFFER		20

+#define __DRI_ATTRIB_STEREO			21

+#define __DRI_ATTRIB_AUX_BUFFERS		22

+#define __DRI_ATTRIB_TRANSPARENT_TYPE		23

+#define __DRI_ATTRIB_TRANSPARENT_INDEX_VALUE	24

+#define __DRI_ATTRIB_TRANSPARENT_RED_VALUE	25

+#define __DRI_ATTRIB_TRANSPARENT_GREEN_VALUE	26

+#define __DRI_ATTRIB_TRANSPARENT_BLUE_VALUE	27

+#define __DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE	28

+#define __DRI_ATTRIB_FLOAT_MODE			29

+#define __DRI_ATTRIB_RED_MASK			30

+#define __DRI_ATTRIB_GREEN_MASK			31

+#define __DRI_ATTRIB_BLUE_MASK			32

+#define __DRI_ATTRIB_ALPHA_MASK			33

+#define __DRI_ATTRIB_MAX_PBUFFER_WIDTH		34

+#define __DRI_ATTRIB_MAX_PBUFFER_HEIGHT		35

+#define __DRI_ATTRIB_MAX_PBUFFER_PIXELS		36

+#define __DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH	37

+#define __DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT	38

+#define __DRI_ATTRIB_VISUAL_SELECT_GROUP	39

+#define __DRI_ATTRIB_SWAP_METHOD		40

+#define __DRI_ATTRIB_MAX_SWAP_INTERVAL		41

+#define __DRI_ATTRIB_MIN_SWAP_INTERVAL		42

+#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGB	43

+#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGBA	44

+#define __DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE	45

+#define __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS	46

+#define __DRI_ATTRIB_YINVERTED			47

+#define __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE	48

+

+/* __DRI_ATTRIB_RENDER_TYPE */

+#define __DRI_ATTRIB_RGBA_BIT			0x01	

+#define __DRI_ATTRIB_COLOR_INDEX_BIT		0x02

+#define __DRI_ATTRIB_LUMINANCE_BIT		0x04

+

+/* __DRI_ATTRIB_CONFIG_CAVEAT */

+#define __DRI_ATTRIB_SLOW_BIT			0x01

+#define __DRI_ATTRIB_NON_CONFORMANT_CONFIG	0x02

+

+/* __DRI_ATTRIB_TRANSPARENT_TYPE */

+#define __DRI_ATTRIB_TRANSPARENT_RGB		0x00

+#define __DRI_ATTRIB_TRANSPARENT_INDEX		0x01

+

+/* __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS	 */

+#define __DRI_ATTRIB_TEXTURE_1D_BIT		0x01

+#define __DRI_ATTRIB_TEXTURE_2D_BIT		0x02

+#define __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT	0x04

+

+/**

+ * This extension defines the core DRI functionality.

+ */

+#define __DRI_CORE "DRI_Core"

+#define __DRI_CORE_VERSION 1

+

+struct __DRIcoreExtensionRec {

+    __DRIextension base;

+

+    __DRIscreen *(*createNewScreen)(int screen, int fd,

+				    unsigned int sarea_handle,

+				    const __DRIextension **extensions,

+				    const __DRIconfig ***driverConfigs,

+				    void *loaderPrivate);

+

+    void (*destroyScreen)(__DRIscreen *screen);

+

+    const __DRIextension **(*getExtensions)(__DRIscreen *screen);

+

+    int (*getConfigAttrib)(const __DRIconfig *config,

+			   unsigned int attrib,

+			   unsigned int *value);

+

+    int (*indexConfigAttrib)(const __DRIconfig *config, int index,

+			     unsigned int *attrib, unsigned int *value);

+

+    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,

+					const __DRIconfig *config,

+					unsigned int drawable_id,

+					unsigned int head,

+					void *loaderPrivate);

+

+    void (*destroyDrawable)(__DRIdrawable *drawable);

+

+    void (*swapBuffers)(__DRIdrawable *drawable);

+

+    __DRIcontext *(*createNewContext)(__DRIscreen *screen,

+				      const __DRIconfig *config,

+				      __DRIcontext *shared,

+				      void *loaderPrivate);

+

+    int (*copyContext)(__DRIcontext *dest,

+		       __DRIcontext *src,

+		       unsigned long mask);

+

+    void (*destroyContext)(__DRIcontext *context);

+

+    int (*bindContext)(__DRIcontext *ctx,

+		       __DRIdrawable *pdraw,

+		       __DRIdrawable *pread);

+

+    int (*unbindContext)(__DRIcontext *ctx);

+};

+

+/**

+ * Stored version of some component (i.e., server-side DRI module, kernel-side

+ * DRM, etc.).

+ * 

+ * \todo

+ * There are several data structures that explicitly store a major version,

+ * minor version, and patch level.  These structures should be modified to

+ * have a \c __DRIversionRec instead.

+ */

+struct __DRIversionRec {

+    int    major;        /**< Major version number. */

+    int    minor;        /**< Minor version number. */

+    int    patch;        /**< Patch-level. */

+};

+

+/**

+ * Framebuffer information record.  Used by libGL to communicate information

+ * about the framebuffer to the driver's \c __driCreateNewScreen function.

+ * 

+ * In XFree86, most of this information is derrived from data returned by

+ * calling \c XF86DRIGetDeviceInfo.

+ *

+ * \sa XF86DRIGetDeviceInfo __DRIdisplayRec::createNewScreen

+ *     __driUtilCreateNewScreen CallCreateNewScreen

+ *

+ * \bug This structure could be better named.

+ */

+struct __DRIframebufferRec {

+    unsigned char *base;    /**< Framebuffer base address in the CPU's

+			     * address space.  This value is calculated by

+			     * calling \c drmMap on the framebuffer handle

+			     * returned by \c XF86DRIGetDeviceInfo (or a

+			     * similar function).

+			     */

+    int size;               /**< Framebuffer size, in bytes. */

+    int stride;             /**< Number of bytes from one line to the next. */

+    int width;              /**< Pixel width of the framebuffer. */

+    int height;             /**< Pixel height of the framebuffer. */

+    int dev_priv_size;      /**< Size of the driver's dev-priv structure. */

+    void *dev_priv;         /**< Pointer to the driver's dev-priv structure. */

+};

+

+

+/**

+ * This extension provides alternative screen, drawable and context

+ * constructors for legacy DRI functionality.  This is used in

+ * conjunction with the core extension.

+ */

+#define __DRI_LEGACY "DRI_Legacy"

+#define __DRI_LEGACY_VERSION 1

+

+struct __DRIlegacyExtensionRec {

+    __DRIextension base;

+

+    __DRIscreen *(*createNewScreen)(int screen,

+				    const __DRIversion *ddx_version,

+				    const __DRIversion *dri_version,

+				    const __DRIversion *drm_version,

+				    const __DRIframebuffer *frame_buffer,

+				    void *pSAREA, int fd, 

+				    const __DRIextension **extensions,

+				    const __DRIconfig ***driver_configs,

+				    void *loaderPrivate);

+

+    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,

+					const __DRIconfig *config,

+					drm_drawable_t hwDrawable,

+					int renderType, const int *attrs,

+					void *loaderPrivate);

+

+    __DRIcontext *(*createNewContext)(__DRIscreen *screen,

+				      const __DRIconfig *config,

+				      int render_type,

+				      __DRIcontext *shared,

+				      drm_context_t hwContext,

+				      void *loaderPrivate);

+};

+

+/**

+ * This extension provides alternative screen, drawable and context

+ * constructors for swrast DRI functionality.  This is used in

+ * conjunction with the core extension.

+ */

+#define __DRI_SWRAST "DRI_SWRast"

+#define __DRI_SWRAST_VERSION 2

+

+struct __DRIswrastExtensionRec {

+    __DRIextension base;

+

+    __DRIscreen *(*createNewScreen)(int screen,

+				    const __DRIextension **extensions,

+				    const __DRIconfig ***driver_configs,

+				    void *loaderPrivate);

+

+    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,

+					const __DRIconfig *config,

+					void *loaderPrivate);

+

+   /* Since version 2 */

+   __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,

+                                           int api,

+                                           const __DRIconfig *config,

+                                           __DRIcontext *shared,

+                                           void *data);

+};

+

+/**

+ * DRI2 Loader extension.

+ */

+#define __DRI_BUFFER_FRONT_LEFT		0

+#define __DRI_BUFFER_BACK_LEFT		1

+#define __DRI_BUFFER_FRONT_RIGHT	2

+#define __DRI_BUFFER_BACK_RIGHT		3

+#define __DRI_BUFFER_DEPTH		4

+#define __DRI_BUFFER_STENCIL		5

+#define __DRI_BUFFER_ACCUM		6

+#define __DRI_BUFFER_FAKE_FRONT_LEFT	7

+#define __DRI_BUFFER_FAKE_FRONT_RIGHT	8

+#define __DRI_BUFFER_DEPTH_STENCIL	9  /**< Only available with DRI2 1.1 */

+

+struct __DRIbufferRec {

+    unsigned int attachment;

+    unsigned int name;

+    unsigned int pitch;

+    unsigned int cpp;

+    unsigned int flags;

+};

+

+#define __DRI_DRI2_LOADER "DRI_DRI2Loader"

+#define __DRI_DRI2_LOADER_VERSION 3

+struct __DRIdri2LoaderExtensionRec {

+    __DRIextension base;

+

+    __DRIbuffer *(*getBuffers)(__DRIdrawable *driDrawable,

+			       int *width, int *height,

+			       unsigned int *attachments, int count,

+			       int *out_count, void *loaderPrivate);

+

+    /**

+     * Flush pending front-buffer rendering

+     *

+     * Any rendering that has been performed to the

+     * \c __DRI_BUFFER_FAKE_FRONT_LEFT will be flushed to the

+     * \c __DRI_BUFFER_FRONT_LEFT.

+     *

+     * \param driDrawable    Drawable whose front-buffer is to be flushed

+     * \param loaderPrivate  Loader's private data that was previously passed

+     *                       into __DRIdri2ExtensionRec::createNewDrawable

+     */

+    void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate);

+

+

+    /**

+     * Get list of buffers from the server

+     *

+     * Gets a list of buffer for the specified set of attachments.  Unlike

+     * \c ::getBuffers, this function takes a list of attachments paired with

+     * opaque \c unsigned \c int value describing the format of the buffer.

+     * It is the responsibility of the caller to know what the service that

+     * allocates the buffers will expect to receive for the format.

+     *

+     * \param driDrawable    Drawable whose buffers are being queried.

+     * \param width          Output where the width of the buffers is stored.

+     * \param height         Output where the height of the buffers is stored.

+     * \param attachments    List of pairs of attachment ID and opaque format

+     *                       requested for the drawable.

+     * \param count          Number of attachment / format pairs stored in

+     *                       \c attachments.

+     * \param loaderPrivate  Loader's private data that was previously passed

+     *                       into __DRIdri2ExtensionRec::createNewDrawable.

+     */

+    __DRIbuffer *(*getBuffersWithFormat)(__DRIdrawable *driDrawable,

+					 int *width, int *height,

+					 unsigned int *attachments, int count,

+					 int *out_count, void *loaderPrivate);

+};

+

+/**

+ * This extension provides alternative screen, drawable and context

+ * constructors for DRI2.

+ */

+#define __DRI_DRI2 "DRI_DRI2"

+#define __DRI_DRI2_VERSION 2

+

+#define __DRI_API_OPENGL	0

+#define __DRI_API_GLES		1

+#define __DRI_API_GLES2		2

+

+struct __DRIdri2ExtensionRec {

+    __DRIextension base;

+

+    __DRIscreen *(*createNewScreen)(int screen, int fd,

+				    const __DRIextension **extensions,

+				    const __DRIconfig ***driver_configs,

+				    void *loaderPrivate);

+

+    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,

+					const __DRIconfig *config,

+					void *loaderPrivate);

+

+    __DRIcontext *(*createNewContext)(__DRIscreen *screen,

+				      const __DRIconfig *config,

+				      __DRIcontext *shared,

+				      void *loaderPrivate);

+

+   /* Since version 2 */

+   unsigned int (*getAPIMask)(__DRIscreen *screen);

+

+   __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,

+					   int api,

+					   const __DRIconfig *config,

+					   __DRIcontext *shared,

+					   void *data);

+

+   __DRIbuffer *(*allocateBuffer)(__DRIscreen *screen,

+				  unsigned int attachment,

+				  unsigned int format,

+				  int width,

+				  int height);

+   void (*releaseBuffer)(__DRIscreen *screen,

+			 __DRIbuffer *buffer);

+};

+

+

+/**

+ * This extension provides functionality to enable various EGLImage

+ * extensions.

+ */

+#define __DRI_IMAGE "DRI_IMAGE"

+#define __DRI_IMAGE_VERSION 1

+

+/**

+ * These formats correspond to the similarly named MESA_FORMAT_*

+ * tokens, except in the native endian of the CPU.  For example, on

+ * little endian __DRI_IMAGE_FORMAT_XRGB8888 corresponds to

+ * MESA_FORMAT_XRGB8888, but MESA_FORMAT_XRGB8888_REV on big endian.

+ */

+#define __DRI_IMAGE_FORMAT_RGB565       0x1001

+#define __DRI_IMAGE_FORMAT_XRGB8888     0x1002

+#define __DRI_IMAGE_FORMAT_ARGB8888     0x1003

+

+#define __DRI_IMAGE_USE_SHARE		0x0001

+#define __DRI_IMAGE_USE_SCANOUT		0x0002

+

+/**

+ * queryImage attributes

+ */

+

+#define __DRI_IMAGE_ATTRIB_STRIDE	0x2000

+#define __DRI_IMAGE_ATTRIB_HANDLE	0x2001

+#define __DRI_IMAGE_ATTRIB_NAME		0x2002

+

+typedef struct __DRIimageRec          __DRIimage;

+typedef struct __DRIimageExtensionRec __DRIimageExtension;

+struct __DRIimageExtensionRec {

+    __DRIextension base;

+

+    __DRIimage *(*createImageFromName)(__DRIscreen *screen,

+				       int width, int height, int format,

+				       int name, int pitch,

+				       void *loaderPrivate);

+

+    __DRIimage *(*createImageFromRenderbuffer)(__DRIcontext *context,

+					       int renderbuffer,

+					       void *loaderPrivate);

+

+    void (*destroyImage)(__DRIimage *image);

+

+    __DRIimage *(*createImage)(__DRIscreen *screen,

+			       int width, int height, int format,

+			       unsigned int use,

+			       void *loaderPrivate);

+

+   GLboolean (*queryImage)(__DRIimage *image, int attrib, int *value);

+};

+

+

+/**

+ * This extension must be implemented by the loader and passed to the

+ * driver at screen creation time.  The EGLImage entry points in the

+ * various client APIs take opaque EGLImage handles and use this

+ * extension to map them to a __DRIimage.  At version 1, this

+ * extensions allows mapping EGLImage pointers to __DRIimage pointers,

+ * but future versions could support other EGLImage-like, opaque types

+ * with new lookup functions.

+ */

+#define __DRI_IMAGE_LOOKUP "DRI_IMAGE_LOOKUP"

+#define __DRI_IMAGE_LOOKUP_VERSION 1

+

+typedef struct __DRIimageLookupExtensionRec __DRIimageLookupExtension;

+struct __DRIimageLookupExtensionRec {

+    __DRIextension base;

+

+    __DRIimage *(*lookupEGLImage)(__DRIscreen *screen, void *image,

+				  void *loaderPrivate);

+};

+

+/**

+ * This extension allows for common DRI2 options

+ */

+#define __DRI2_CONFIG_QUERY "DRI_CONFIG_QUERY"

+#define __DRI2_CONFIG_QUERY_VERSION 1

+

+typedef struct __DRI2configQueryExtensionRec __DRI2configQueryExtension;

+struct __DRI2configQueryExtensionRec {

+   __DRIextension base;

+

+   int (*configQueryb)(__DRIscreen *screen, const char *var, GLboolean *val);

+   int (*configQueryi)(__DRIscreen *screen, const char *var, GLint *val);

+   int (*configQueryf)(__DRIscreen *screen, const char *var, GLfloat *val);

+};

+#endif

diff --git a/mesalib/include/getopt.h b/mesalib/include/getopt.h
new file mode 100644
index 000000000..695f89061
--- /dev/null
+++ b/mesalib/include/getopt.h
@@ -0,0 +1,128 @@
+/* Declarations for getopt.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#ifndef _GETOPT_H
+#define _GETOPT_H 1
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns EOF, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+  /* Set to an option character which was unrecognized.  */
+  
+  extern int optopt;
+  
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of `struct option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument 	(or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
+
+struct option
+{
+#if	__STDC__
+  const char *name;
+#else
+  char *name;
+#endif
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'.  */
+
+#define       no_argument     0
+#define required_argument     1
+#define optional_argument     2
+
+#if __STDC__
+#if defined(__GNU_LIBRARY__)
+/* Many other libraries have conflicting prototypes for getopt, with
+   differences in the consts, in stdlib.h.  To avoid compilation
+   errors, only prototype getopt for the GNU C library.  */
+extern int getopt (int argc, char *const *argv, const char *shortopts);
+#else /* not __GNU_LIBRARY__ */
+extern int getopt ();
+#endif /* not __GNU_LIBRARY__ */
+extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+		        const struct option *longopts, int *longind);
+extern int getopt_long_only (int argc, char *const *argv,
+			     const char *shortopts,
+		             const struct option *longopts, int *longind);
+
+/* Internal only.  Users should not call this directly.  */
+extern int _getopt_internal (int argc, char *const *argv,
+			     const char *shortopts,
+		             const struct option *longopts, int *longind,
+			     int long_only);
+#else /* not __STDC__ */
+extern int getopt ();
+extern int getopt_long ();
+extern int getopt_long_only ();
+
+extern int _getopt_internal ();
+#endif /* not __STDC__ */
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* _GETOPT_H */
diff --git a/mesalib/scons/custom.py b/mesalib/scons/custom.py
index 7c59fe985..1aaac8285 100644
--- a/mesalib/scons/custom.py
+++ b/mesalib/scons/custom.py
@@ -1,171 +1,171 @@
-"""custom
-
-Custom builders and methods.
-
-"""
-
-#
-# Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
-# All Rights Reserved.
-#
-# 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, sub license, 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 (including the
-# next paragraph) 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 NON-INFRINGEMENT.
-# IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
-#
-
-
-import os
-import os.path
-import re
-
-import SCons.Action
-import SCons.Builder
-import SCons.Scanner
-
-import fixes
-
-
-def quietCommandLines(env):
-    # Quiet command lines
-    # See also http://www.scons.org/wiki/HidingCommandLinesInOutput
-    env['ASCOMSTR'] = "  Assembling $SOURCE ..."
-    env['ASPPCOMSTR'] = "  Assembling $SOURCE ..."
-    env['CCCOMSTR'] = "  Compiling $SOURCE ..."
-    env['SHCCCOMSTR'] = "  Compiling $SOURCE ..."
-    env['CXXCOMSTR'] = "  Compiling $SOURCE ..."
-    env['SHCXXCOMSTR'] = "  Compiling $SOURCE ..."
-    env['ARCOMSTR'] = "  Archiving $TARGET ..."
-    env['RANLIBCOMSTR'] = "  Indexing $TARGET ..."
-    env['LINKCOMSTR'] = "  Linking $TARGET ..."
-    env['SHLINKCOMSTR'] = "  Linking $TARGET ..."
-    env['LDMODULECOMSTR'] = "  Linking $TARGET ..."
-    env['SWIGCOMSTR'] = "  Generating $TARGET ..."
-    env['LEXCOMSTR'] = "  Generating $TARGET ..."
-    env['YACCCOMSTR'] = "  Generating $TARGET ..."
-    env['CODEGENCOMSTR'] = "  Generating $TARGET ..."
-
-
-def createConvenienceLibBuilder(env):
-    """This is a utility function that creates the ConvenienceLibrary
-    Builder in an Environment if it is not there already.
-
-    If it is already there, we return the existing one.
-
-    Based on the stock StaticLibrary and SharedLibrary builders.
-    """
-
-    try:
-        convenience_lib = env['BUILDERS']['ConvenienceLibrary']
-    except KeyError:
-        action_list = [ SCons.Action.Action("$ARCOM", "$ARCOMSTR") ]
-        if env.Detect('ranlib'):
-            ranlib_action = SCons.Action.Action("$RANLIBCOM", "$RANLIBCOMSTR")
-            action_list.append(ranlib_action)
-
-        convenience_lib = SCons.Builder.Builder(action = action_list,
-                                  emitter = '$LIBEMITTER',
-                                  prefix = '$LIBPREFIX',
-                                  suffix = '$LIBSUFFIX',
-                                  src_suffix = '$SHOBJSUFFIX',
-                                  src_builder = 'SharedObject')
-        env['BUILDERS']['ConvenienceLibrary'] = convenience_lib
-
-    return convenience_lib
-
-
-# TODO: handle import statements with multiple modules
-# TODO: handle from import statements
-import_re = re.compile(r'^import\s+(\S+)$', re.M)
-
-def python_scan(node, env, path):
-    # http://www.scons.org/doc/0.98.5/HTML/scons-user/c2781.html#AEN2789
-    contents = node.get_contents()
-    source_dir = node.get_dir()
-    imports = import_re.findall(contents)
-    results = []
-    for imp in imports:
-        for dir in path:
-            file = os.path.join(str(dir), imp.replace('.', os.sep) + '.py')
-            if os.path.exists(file):
-                results.append(env.File(file))
-                break
-            file = os.path.join(str(dir), imp.replace('.', os.sep), '__init__.py')
-            if os.path.exists(file):
-                results.append(env.File(file))
-                break
-    return results
-
-python_scanner = SCons.Scanner.Scanner(function = python_scan, skeys = ['.py'])
-
-
-def code_generate(env, script, target, source, command):
-    """Method to simplify code generation via python scripts.
-
-    http://www.scons.org/wiki/UsingCodeGenerators
-    http://www.scons.org/doc/0.98.5/HTML/scons-user/c2768.html
-    """
-
-    # We're generating code using Python scripts, so we have to be
-    # careful with our scons elements.  This entry represents
-    # the generator file *in the source directory*.
-    script_src = env.File(script).srcnode()
-
-    # This command creates generated code *in the build directory*.
-    command = command.replace('$SCRIPT', script_src.path)
-    action = SCons.Action.Action(command, "$CODEGENCOMSTR")
-    code = env.Command(target, source, action)
-
-    # Explicitly mark that the generated code depends on the generator,
-    # and on implicitly imported python modules
-    path = (script_src.get_dir(),)
-    deps = [script_src]
-    deps += script_src.get_implicit_deps(env, python_scanner, path)
-    env.Depends(code, deps)
-
-    # Running the Python script causes .pyc files to be generated in the
-    # source directory.  When we clean up, they should go too. So add side
-    # effects for .pyc files
-    for dep in deps:
-        pyc = env.File(str(dep) + 'c')
-        env.SideEffect(pyc, code)
-
-    return code
-
-
-def createCodeGenerateMethod(env):
-    env.Append(SCANNERS = python_scanner)
-    env.AddMethod(code_generate, 'CodeGenerate')
-
-
-def generate(env):
-    """Common environment generation code"""
-
-    if env.get('quiet', True):
-        quietCommandLines(env)
-
-    # Custom builders and methods
-    createConvenienceLibBuilder(env)
-    createCodeGenerateMethod(env)
-
-    # for debugging
-    #print env.Dump()
-
-
-def exists(env):
-    return 1
+"""custom

+

+Custom builders and methods.

+

+"""

+

+#

+# Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.

+# All Rights Reserved.

+#

+# 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, sub license, 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 (including the

+# next paragraph) 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 NON-INFRINGEMENT.

+# IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+#

+

+

+import os

+import os.path

+import re

+

+import SCons.Action

+import SCons.Builder

+import SCons.Scanner

+

+import fixes

+

+

+def quietCommandLines(env):

+    # Quiet command lines

+    # See also http://www.scons.org/wiki/HidingCommandLinesInOutput

+    env['ASCOMSTR'] = "  Assembling $SOURCE ..."

+    env['ASPPCOMSTR'] = "  Assembling $SOURCE ..."

+    env['CCCOMSTR'] = "  Compiling $SOURCE ..."

+    env['SHCCCOMSTR'] = "  Compiling $SOURCE ..."

+    env['CXXCOMSTR'] = "  Compiling $SOURCE ..."

+    env['SHCXXCOMSTR'] = "  Compiling $SOURCE ..."

+    env['ARCOMSTR'] = "  Archiving $TARGET ..."

+    env['RANLIBCOMSTR'] = "  Indexing $TARGET ..."

+    env['LINKCOMSTR'] = "  Linking $TARGET ..."

+    env['SHLINKCOMSTR'] = "  Linking $TARGET ..."

+    env['LDMODULECOMSTR'] = "  Linking $TARGET ..."

+    env['SWIGCOMSTR'] = "  Generating $TARGET ..."

+    env['LEXCOMSTR'] = "  Generating $TARGET ..."

+    env['YACCCOMSTR'] = "  Generating $TARGET ..."

+    env['CODEGENCOMSTR'] = "  Generating $TARGET ..."

+

+

+def createConvenienceLibBuilder(env):

+    """This is a utility function that creates the ConvenienceLibrary

+    Builder in an Environment if it is not there already.

+

+    If it is already there, we return the existing one.

+

+    Based on the stock StaticLibrary and SharedLibrary builders.

+    """

+

+    try:

+        convenience_lib = env['BUILDERS']['ConvenienceLibrary']

+    except KeyError:

+        action_list = [ SCons.Action.Action("$ARCOM", "$ARCOMSTR") ]

+        if env.Detect('ranlib'):

+            ranlib_action = SCons.Action.Action("$RANLIBCOM", "$RANLIBCOMSTR")

+            action_list.append(ranlib_action)

+

+        convenience_lib = SCons.Builder.Builder(action = action_list,

+                                  emitter = '$LIBEMITTER',

+                                  prefix = '$LIBPREFIX',

+                                  suffix = '$LIBSUFFIX',

+                                  src_suffix = '$SHOBJSUFFIX',

+                                  src_builder = 'SharedObject')

+        env['BUILDERS']['ConvenienceLibrary'] = convenience_lib

+

+    return convenience_lib

+

+

+# TODO: handle import statements with multiple modules

+# TODO: handle from import statements

+import_re = re.compile(r'^import\s+(\S+)$', re.M)

+

+def python_scan(node, env, path):

+    # http://www.scons.org/doc/0.98.5/HTML/scons-user/c2781.html#AEN2789

+    contents = node.get_contents()

+    source_dir = node.get_dir()

+    imports = import_re.findall(contents)

+    results = []

+    for imp in imports:

+        for dir in path:

+            file = os.path.join(str(dir), imp.replace('.', os.sep) + '.py')

+            if os.path.exists(file):

+                results.append(env.File(file))

+                break

+            file = os.path.join(str(dir), imp.replace('.', os.sep), '__init__.py')

+            if os.path.exists(file):

+                results.append(env.File(file))

+                break

+    return results

+

+python_scanner = SCons.Scanner.Scanner(function = python_scan, skeys = ['.py'])

+

+

+def code_generate(env, script, target, source, command):

+    """Method to simplify code generation via python scripts.

+

+    http://www.scons.org/wiki/UsingCodeGenerators

+    http://www.scons.org/doc/0.98.5/HTML/scons-user/c2768.html

+    """

+

+    # We're generating code using Python scripts, so we have to be

+    # careful with our scons elements.  This entry represents

+    # the generator file *in the source directory*.

+    script_src = env.File(script).srcnode()

+

+    # This command creates generated code *in the build directory*.

+    command = command.replace('$SCRIPT', script_src.path)

+    action = SCons.Action.Action(command, "$CODEGENCOMSTR")

+    code = env.Command(target, source, action)

+

+    # Explicitly mark that the generated code depends on the generator,

+    # and on implicitly imported python modules

+    path = (script_src.get_dir(),)

+    deps = [script_src]

+    deps += script_src.get_implicit_deps(env, python_scanner, path)

+    env.Depends(code, deps)

+

+    # Running the Python script causes .pyc files to be generated in the

+    # source directory.  When we clean up, they should go too. So add side

+    # effects for .pyc files

+    for dep in deps:

+        pyc = env.File(str(dep) + 'c')

+        env.SideEffect(pyc, code)

+

+    return code

+

+

+def createCodeGenerateMethod(env):

+    env.Append(SCANNERS = python_scanner)

+    env.AddMethod(code_generate, 'CodeGenerate')

+

+

+def generate(env):

+    """Common environment generation code"""

+

+    if env.get('quiet', True):

+        quietCommandLines(env)

+

+    # Custom builders and methods

+    createConvenienceLibBuilder(env)

+    createCodeGenerateMethod(env)

+

+    # for debugging

+    #print env.Dump()

+

+

+def exists(env):

+    return 1

diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile
index e4b992dbc..b63307f53 100644
--- a/mesalib/src/glsl/Makefile
+++ b/mesalib/src/glsl/Makefile
@@ -1,213 +1,213 @@
-
-#src/glsl/pp/Makefile
-
-TOP = ../..
-
-include $(TOP)/configs/current
-
-LIBNAME = glsl
-
-LIBGLCPP_SOURCES = \
-	glcpp/glcpp-lex.c \
-	glcpp/glcpp-parse.c \
-	glcpp/pp.c
-
-GLCPP_SOURCES = \
-	$(LIBGLCPP_SOURCES) \
-	ralloc.c \
-	glcpp/glcpp.c
-
-C_SOURCES = \
-	strtod.c \
-	ralloc.c \
-	$(LIBGLCPP_SOURCES)
-
-CXX_SOURCES = \
-	ast_expr.cpp \
-	ast_function.cpp \
-	ast_to_hir.cpp \
-	ast_type.cpp \
-	glsl_lexer.cpp \
-	glsl_parser.cpp \
-	glsl_parser_extras.cpp \
-	glsl_types.cpp \
-	glsl_symbol_table.cpp \
-	hir_field_selection.cpp \
-	ir_basic_block.cpp \
-	ir_clone.cpp \
-	ir_constant_expression.cpp \
-	ir.cpp \
-	ir_expression_flattening.cpp \
-	ir_function_can_inline.cpp \
-	ir_function.cpp \
-	ir_hierarchical_visitor.cpp \
-	ir_hv_accept.cpp \
-	ir_import_prototypes.cpp \
-	ir_print_visitor.cpp \
-	ir_reader.cpp \
-	ir_rvalue_visitor.cpp \
-	ir_set_program_inouts.cpp \
-	ir_validate.cpp \
-	ir_variable.cpp \
-	ir_variable_refcount.cpp \
-	linker.cpp \
-	link_functions.cpp \
-	loop_analysis.cpp \
-	loop_controls.cpp \
-	loop_unroll.cpp \
-	lower_discard.cpp \
-	lower_if_to_cond_assign.cpp \
-	lower_instructions.cpp \
-	lower_jumps.cpp \
-	lower_mat_op_to_vec.cpp \
-	lower_noise.cpp \
-	lower_texture_projection.cpp \
-	lower_variable_index_to_cond_assign.cpp \
-	lower_vec_index_to_cond_assign.cpp \
-	lower_vec_index_to_swizzle.cpp \
-	lower_vector.cpp \
-	opt_algebraic.cpp \
-	opt_constant_folding.cpp \
-	opt_constant_propagation.cpp \
-	opt_constant_variable.cpp \
-	opt_copy_propagation.cpp \
-	opt_copy_propagation_elements.cpp \
-	opt_dead_code.cpp \
-	opt_dead_code_local.cpp \
-	opt_dead_functions.cpp \
-	opt_discard_simplification.cpp \
-	opt_function_inlining.cpp \
-	opt_if_simplification.cpp \
-	opt_noop_swizzle.cpp \
-	opt_redundant_jumps.cpp \
-	opt_structure_splitting.cpp \
-	opt_swizzle_swizzle.cpp \
-	opt_tree_grafting.cpp \
-	s_expression.cpp
-
-LIBS = \
-	$(TOP)/src/glsl/libglsl.a
-
-APPS = glsl_compiler glcpp/glcpp
-
-GLSL2_C_SOURCES = \
-	../mesa/program/hash_table.c \
-	../mesa/program/symbol_table.c
-GLSL2_CXX_SOURCES = \
-	main.cpp
-
-GLSL2_OBJECTS = \
-	$(GLSL2_C_SOURCES:.c=.o) \
-	$(GLSL2_CXX_SOURCES:.cpp=.o)
-
-### Basic defines ###
-
-DEFINES += \
-	$(LIBRARY_DEFINES) \
-	$(API_DEFINES)
-
-GLCPP_OBJECTS = \
-	$(GLCPP_SOURCES:.c=.o) \
-	../mesa/program/hash_table.o
-
-OBJECTS = \
-	$(C_SOURCES:.c=.o) \
-	$(CXX_SOURCES:.cpp=.o)
-
-DRICORE_OBJ_DIR = obj-visible
-OBJECTS_DRICORE = $(addprefix $(DRICORE_OBJ_DIR)/,$(OBJECTS))
-
-INCLUDES = \
-	-I. \
-	-I../mesa \
-	-I../mapi \
-	-I../../include \
-	$(LIBRARY_INCLUDES)
-
-ALL_SOURCES = \
-	$(C_SOURCES) \
-	$(CXX_SOURCES) \
-	$(GLSL2_CXX_SOURCES) \
-	$(GLSL2_C_SOURCES)
-
-##### TARGETS #####
-
-default: depend lib$(LIBNAME).a $(APPS) $(DRICORE_GLSL_LIBS)
-
-$(TOP)/$(LIB_DIR)/libglsl.so: $(OBJECTS_DRICORE) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template
-	$(MKLIB) -o $@ -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
-		-cplusplus -noprefix \
-		-install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/$@.dylib \
-		$(OBJECTS_DRICORE) builtin_function.o
-
-lib$(LIBNAME).a: $(OBJECTS) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template
-	$(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS) builtin_function.o
-
-depend: $(ALL_SOURCES) Makefile
-	rm -f depend
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(ALL_SOURCES) 2> /dev/null
-
-# Remove .o and backup files
-clean: clean-dricore
-	rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak builtin_function.cpp builtin_function.o builtin_stubs.o builtin_compiler
-	-rm -f $(APPS)
-
-clean-dricore:
-	-rm -f $(DRICORE_OBJ_DIR) $(TOP)/$(LIB_DIR)/libglsl.so libglsl.so
-
-ifneq (,$(DRICORE_GLSL_LIBS))
-DRICORE_INSTALL_TARGET = install-dricore
-endif
-
-# Dummy target
-install: $(DRICORE_INSTALL_TARGET)
-	@echo -n ""
-
-install-dricore: default
-	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-	$(INSTALL) -m 755 $(DRICORE_GLSL_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-
-##### RULES #####
-
-glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o
-	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@
-
-glcpp: glcpp/glcpp
-glcpp/glcpp: $(GLCPP_OBJECTS)
-	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) -o $@
-
-.cpp.o:
-	$(CXX) -c $(INCLUDES) $(CXXFLAGS) $(DEFINES) $< -o $@
-
-.c.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-$(DRICORE_OBJ_DIR)/%.o : %.cpp
-	@mkdir -p $(dir $@)
-	$(CXX) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DEFINES) $< -o $@
-
-$(DRICORE_OBJ_DIR)/%.o : %.c
-	@mkdir -p $(dir $@)
-	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DEFINES) $< -o $@
-
-glsl_lexer.cpp: glsl_lexer.ll
-	flex --nounistd -o$@  $<
-
-glsl_parser.cpp: glsl_parser.yy
-	bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
-
-glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
-	flex --nounistd -o$@  $<
-
-glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
-	bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<
-
-builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
-	$(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@
-
-builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler
-	@echo Regenerating builtin_function.cpp...
-	$(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp
-
--include depend
+

+#src/glsl/pp/Makefile

+

+TOP = ../..

+

+include $(TOP)/configs/current

+

+LIBNAME = glsl

+

+LIBGLCPP_SOURCES = \

+	glcpp/glcpp-lex.c \

+	glcpp/glcpp-parse.c \

+	glcpp/pp.c

+

+GLCPP_SOURCES = \

+	$(LIBGLCPP_SOURCES) \

+	ralloc.c \

+	glcpp/glcpp.c

+

+C_SOURCES = \

+	strtod.c \

+	ralloc.c \

+	$(LIBGLCPP_SOURCES)

+

+CXX_SOURCES = \

+	ast_expr.cpp \

+	ast_function.cpp \

+	ast_to_hir.cpp \

+	ast_type.cpp \

+	glsl_lexer.cpp \

+	glsl_parser.cpp \

+	glsl_parser_extras.cpp \

+	glsl_types.cpp \

+	glsl_symbol_table.cpp \

+	hir_field_selection.cpp \

+	ir_basic_block.cpp \

+	ir_clone.cpp \

+	ir_constant_expression.cpp \

+	ir.cpp \

+	ir_expression_flattening.cpp \

+	ir_function_can_inline.cpp \

+	ir_function.cpp \

+	ir_hierarchical_visitor.cpp \

+	ir_hv_accept.cpp \

+	ir_import_prototypes.cpp \

+	ir_print_visitor.cpp \

+	ir_reader.cpp \

+	ir_rvalue_visitor.cpp \

+	ir_set_program_inouts.cpp \

+	ir_validate.cpp \

+	ir_variable.cpp \

+	ir_variable_refcount.cpp \

+	linker.cpp \

+	link_functions.cpp \

+	loop_analysis.cpp \

+	loop_controls.cpp \

+	loop_unroll.cpp \

+	lower_discard.cpp \

+	lower_if_to_cond_assign.cpp \

+	lower_instructions.cpp \

+	lower_jumps.cpp \

+	lower_mat_op_to_vec.cpp \

+	lower_noise.cpp \

+	lower_texture_projection.cpp \

+	lower_variable_index_to_cond_assign.cpp \

+	lower_vec_index_to_cond_assign.cpp \

+	lower_vec_index_to_swizzle.cpp \

+	lower_vector.cpp \

+	opt_algebraic.cpp \

+	opt_constant_folding.cpp \

+	opt_constant_propagation.cpp \

+	opt_constant_variable.cpp \

+	opt_copy_propagation.cpp \

+	opt_copy_propagation_elements.cpp \

+	opt_dead_code.cpp \

+	opt_dead_code_local.cpp \

+	opt_dead_functions.cpp \

+	opt_discard_simplification.cpp \

+	opt_function_inlining.cpp \

+	opt_if_simplification.cpp \

+	opt_noop_swizzle.cpp \

+	opt_redundant_jumps.cpp \

+	opt_structure_splitting.cpp \

+	opt_swizzle_swizzle.cpp \

+	opt_tree_grafting.cpp \

+	s_expression.cpp

+

+LIBS = \

+	$(TOP)/src/glsl/libglsl.a

+

+APPS = glsl_compiler glcpp/glcpp

+

+GLSL2_C_SOURCES = \

+	../mesa/program/hash_table.c \

+	../mesa/program/symbol_table.c

+GLSL2_CXX_SOURCES = \

+	main.cpp

+

+GLSL2_OBJECTS = \

+	$(GLSL2_C_SOURCES:.c=.o) \

+	$(GLSL2_CXX_SOURCES:.cpp=.o)

+

+### Basic defines ###

+

+DEFINES += \

+	$(LIBRARY_DEFINES) \

+	$(API_DEFINES)

+

+GLCPP_OBJECTS = \

+	$(GLCPP_SOURCES:.c=.o) \

+	../mesa/program/hash_table.o

+

+OBJECTS = \

+	$(C_SOURCES:.c=.o) \

+	$(CXX_SOURCES:.cpp=.o)

+

+DRICORE_OBJ_DIR = obj-visible

+OBJECTS_DRICORE = $(addprefix $(DRICORE_OBJ_DIR)/,$(OBJECTS))

+

+INCLUDES = \

+	-I. \

+	-I../mesa \

+	-I../mapi \

+	-I../../include \

+	$(LIBRARY_INCLUDES)

+

+ALL_SOURCES = \

+	$(C_SOURCES) \

+	$(CXX_SOURCES) \

+	$(GLSL2_CXX_SOURCES) \

+	$(GLSL2_C_SOURCES)

+

+##### TARGETS #####

+

+default: depend lib$(LIBNAME).a $(APPS) $(DRICORE_GLSL_LIBS)

+

+$(TOP)/$(LIB_DIR)/libglsl.so: $(OBJECTS_DRICORE) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template

+	$(MKLIB) -o $@ -linker '$(CXX)' -ldflags '$(LDFLAGS)' \

+		-cplusplus -noprefix \

+		-install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/$@.dylib \

+		$(OBJECTS_DRICORE) builtin_function.o

+

+lib$(LIBNAME).a: $(OBJECTS) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template

+	$(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS) builtin_function.o

+

+depend: $(ALL_SOURCES) Makefile

+	rm -f depend

+	touch depend

+	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(ALL_SOURCES) 2> /dev/null

+

+# Remove .o and backup files

+clean: clean-dricore

+	rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak builtin_function.cpp builtin_function.o builtin_stubs.o builtin_compiler

+	-rm -f $(APPS)

+

+clean-dricore:

+	-rm -f $(DRICORE_OBJ_DIR) $(TOP)/$(LIB_DIR)/libglsl.so libglsl.so

+

+ifneq (,$(DRICORE_GLSL_LIBS))

+DRICORE_INSTALL_TARGET = install-dricore

+endif

+

+# Dummy target

+install: $(DRICORE_INSTALL_TARGET)

+	@echo -n ""

+

+install-dricore: default

+	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

+	$(INSTALL) -m 755 $(DRICORE_GLSL_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

+

+##### RULES #####

+

+glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o

+	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@

+

+glcpp: glcpp/glcpp

+glcpp/glcpp: $(GLCPP_OBJECTS)

+	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) -o $@

+

+.cpp.o:

+	$(CXX) -c $(INCLUDES) $(CXXFLAGS) $(DEFINES) $< -o $@

+

+.c.o:

+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@

+

+$(DRICORE_OBJ_DIR)/%.o : %.cpp

+	@mkdir -p $(dir $@)

+	$(CXX) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DEFINES) $< -o $@

+

+$(DRICORE_OBJ_DIR)/%.o : %.c

+	@mkdir -p $(dir $@)

+	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DEFINES) $< -o $@

+

+glsl_lexer.cpp: glsl_lexer.ll

+	flex --nounistd -o$@  $<

+

+glsl_parser.cpp: glsl_parser.yy

+	bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<

+

+glcpp/glcpp-lex.c: glcpp/glcpp-lex.l

+	flex --nounistd -o$@  $<

+

+glcpp/glcpp-parse.c: glcpp/glcpp-parse.y

+	bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<

+

+builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o

+	$(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@

+

+builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler

+	@echo Regenerating builtin_function.cpp...

+	$(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp

+

+-include depend

diff --git a/mesalib/src/glsl/ast.h b/mesalib/src/glsl/ast.h
index 878f48b20..6963b83af 100644
--- a/mesalib/src/glsl/ast.h
+++ b/mesalib/src/glsl/ast.h
@@ -63,6 +63,10 @@ public:
 
    /* If the user *does* call delete, that's OK, we will just
     * ralloc_free in that case. */
+   static void operator delete(void *table, void *ctx)
+   {
+      ralloc_free(table);
+   }
    static void operator delete(void *table)
    {
       ralloc_free(table);
diff --git a/mesalib/src/glsl/ast_expr.cpp b/mesalib/src/glsl/ast_expr.cpp
index e624d11cf..e8812e7a1 100644
--- a/mesalib/src/glsl/ast_expr.cpp
+++ b/mesalib/src/glsl/ast_expr.cpp
@@ -1,95 +1,95 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-#include <assert.h>
-#include "ast.h"
-
-const char *
-ast_expression::operator_string(enum ast_operators op)
-{
-   static const char *const operators[] = {
-      "=",
-      "+",
-      "-",
-      "+",
-      "-",
-      "*",
-      "/",
-      "%",
-      "<<",
-      ">>",
-      "<",
-      ">",
-      "<=",
-      ">=",
-      "==",
-      "!=",
-      "&",
-      "^",
-      "|",
-      "~",
-      "&&",
-      "^^",
-      "||",
-      "!",
-
-      "*=",
-      "/=",
-      "%=",
-      "+=",
-      "-=",
-      "<<=",
-      ">>=",
-      "&=",
-      "^=",
-      "|=",
-
-      "?:",
-
-      "++",
-      "--",
-      "++",
-      "--",
-      ".",
-   };
-
-   assert((unsigned int)op < sizeof(operators) / sizeof(operators[0]));
-
-   return operators[op];
-}
-
-
-ast_expression_bin::ast_expression_bin(int oper, ast_expression *ex0,
-				       ast_expression *ex1) :
-   ast_expression(oper, ex0, ex1, NULL)
-{
-   assert((oper >= ast_plus) && (oper <= ast_logic_not));
-}
-
-
-void
-ast_expression_bin::print(void) const
-{
-   subexpressions[0]->print();
-   printf("%s ", operator_string(oper));
-   subexpressions[1]->print();
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+#include <assert.h>

+#include "ast.h"

+

+const char *

+ast_expression::operator_string(enum ast_operators op)

+{

+   static const char *const operators[] = {

+      "=",

+      "+",

+      "-",

+      "+",

+      "-",

+      "*",

+      "/",

+      "%",

+      "<<",

+      ">>",

+      "<",

+      ">",

+      "<=",

+      ">=",

+      "==",

+      "!=",

+      "&",

+      "^",

+      "|",

+      "~",

+      "&&",

+      "^^",

+      "||",

+      "!",

+

+      "*=",

+      "/=",

+      "%=",

+      "+=",

+      "-=",

+      "<<=",

+      ">>=",

+      "&=",

+      "^=",

+      "|=",

+

+      "?:",

+

+      "++",

+      "--",

+      "++",

+      "--",

+      ".",

+   };

+

+   assert((unsigned int)op < sizeof(operators) / sizeof(operators[0]));

+

+   return operators[op];

+}

+

+

+ast_expression_bin::ast_expression_bin(int oper, ast_expression *ex0,

+				       ast_expression *ex1) :

+   ast_expression(oper, ex0, ex1, NULL)

+{

+   assert((oper >= ast_plus) && (oper <= ast_logic_not));

+}

+

+

+void

+ast_expression_bin::print(void) const

+{

+   subexpressions[0]->print();

+   printf("%s ", operator_string(oper));

+   subexpressions[1]->print();

+}

diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index 9538aa62b..5e1851c11 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -1,3509 +1,3509 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file ast_to_hir.c
- * Convert abstract syntax to to high-level intermediate reprensentation (HIR).
- *
- * During the conversion to HIR, the majority of the symantic checking is
- * preformed on the program.  This includes:
- *
- *    * Symbol table management
- *    * Type checking
- *    * Function binding
- *
- * The majority of this work could be done during parsing, and the parser could
- * probably generate HIR directly.  However, this results in frequent changes
- * to the parser code.  Since we do not assume that every system this complier
- * is built on will have Flex and Bison installed, we have to store the code
- * generated by these tools in our version control system.  In other parts of
- * the system we've seen problems where a parser was changed but the generated
- * code was not committed, merge conflicts where created because two developers
- * had slightly different versions of Bison installed, etc.
- *
- * I have also noticed that running Bison generated parsers in GDB is very
- * irritating.  When you get a segfault on '$$ = $1->foo', you can't very
- * well 'print $1' in GDB.
- *
- * As a result, my preference is to put as little C code as possible in the
- * parser (and lexer) sources.
- */
-
-#include "main/core.h" /* for struct gl_extensions */
-#include "glsl_symbol_table.h"
-#include "glsl_parser_extras.h"
-#include "ast.h"
-#include "glsl_types.h"
-#include "ir.h"
-
-void
-_mesa_ast_to_hir(exec_list *instructions, struct _mesa_glsl_parse_state *state)
-{
-   _mesa_glsl_initialize_variables(instructions, state);
-   _mesa_glsl_initialize_functions(state);
-
-   state->symbols->language_version = state->language_version;
-
-   state->current_function = NULL;
-
-   /* Section 4.2 of the GLSL 1.20 specification states:
-    * "The built-in functions are scoped in a scope outside the global scope
-    *  users declare global variables in.  That is, a shader's global scope,
-    *  available for user-defined functions and global variables, is nested
-    *  inside the scope containing the built-in functions."
-    *
-    * Since built-in functions like ftransform() access built-in variables,
-    * it follows that those must be in the outer scope as well.
-    *
-    * We push scope here to create this nesting effect...but don't pop.
-    * This way, a shader's globals are still in the symbol table for use
-    * by the linker.
-    */
-   state->symbols->push_scope();
-
-   foreach_list_typed (ast_node, ast, link, & state->translation_unit)
-      ast->hir(instructions, state);
-}
-
-
-/**
- * If a conversion is available, convert one operand to a different type
- *
- * The \c from \c ir_rvalue is converted "in place".
- *
- * \param to     Type that the operand it to be converted to
- * \param from   Operand that is being converted
- * \param state  GLSL compiler state
- *
- * \return
- * If a conversion is possible (or unnecessary), \c true is returned.
- * Otherwise \c false is returned.
- */
-bool
-apply_implicit_conversion(const glsl_type *to, ir_rvalue * &from,
-			  struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   if (to->base_type == from->type->base_type)
-      return true;
-
-   /* This conversion was added in GLSL 1.20.  If the compilation mode is
-    * GLSL 1.10, the conversion is skipped.
-    */
-   if (state->language_version < 120)
-      return false;
-
-   /* From page 27 (page 33 of the PDF) of the GLSL 1.50 spec:
-    *
-    *    "There are no implicit array or structure conversions. For
-    *    example, an array of int cannot be implicitly converted to an
-    *    array of float. There are no implicit conversions between
-    *    signed and unsigned integers."
-    */
-   /* FINISHME: The above comment is partially a lie.  There is int/uint
-    * FINISHME: conversion for immediate constants.
-    */
-   if (!to->is_float() || !from->type->is_numeric())
-      return false;
-
-   /* Convert to a floating point type with the same number of components
-    * as the original type - i.e. int to float, not int to vec4.
-    */
-   to = glsl_type::get_instance(GLSL_TYPE_FLOAT, from->type->vector_elements,
-			        from->type->matrix_columns);
-
-   switch (from->type->base_type) {
-   case GLSL_TYPE_INT:
-      from = new(ctx) ir_expression(ir_unop_i2f, to, from, NULL);
-      break;
-   case GLSL_TYPE_UINT:
-      from = new(ctx) ir_expression(ir_unop_u2f, to, from, NULL);
-      break;
-   case GLSL_TYPE_BOOL:
-      from = new(ctx) ir_expression(ir_unop_b2f, to, from, NULL);
-      break;
-   default:
-      assert(0);
-   }
-
-   return true;
-}
-
-
-static const struct glsl_type *
-arithmetic_result_type(ir_rvalue * &value_a, ir_rvalue * &value_b,
-		       bool multiply,
-		       struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-   const glsl_type *type_a = value_a->type;
-   const glsl_type *type_b = value_b->type;
-
-   /* From GLSL 1.50 spec, page 56:
-    *
-    *    "The arithmetic binary operators add (+), subtract (-),
-    *    multiply (*), and divide (/) operate on integer and
-    *    floating-point scalars, vectors, and matrices."
-    */
-   if (!type_a->is_numeric() || !type_b->is_numeric()) {
-      _mesa_glsl_error(loc, state,
-		       "Operands to arithmetic operators must be numeric");
-      return glsl_type::error_type;
-   }
-
-
-   /*    "If one operand is floating-point based and the other is
-    *    not, then the conversions from Section 4.1.10 "Implicit
-    *    Conversions" are applied to the non-floating-point-based operand."
-    */
-   if (!apply_implicit_conversion(type_a, value_b, state)
-       && !apply_implicit_conversion(type_b, value_a, state)) {
-      _mesa_glsl_error(loc, state,
-		       "Could not implicitly convert operands to "
-		       "arithmetic operator");
-      return glsl_type::error_type;
-   }
-   type_a = value_a->type;
-   type_b = value_b->type;
-
-   /*    "If the operands are integer types, they must both be signed or
-    *    both be unsigned."
-    *
-    * From this rule and the preceeding conversion it can be inferred that
-    * both types must be GLSL_TYPE_FLOAT, or GLSL_TYPE_UINT, or GLSL_TYPE_INT.
-    * The is_numeric check above already filtered out the case where either
-    * type is not one of these, so now the base types need only be tested for
-    * equality.
-    */
-   if (type_a->base_type != type_b->base_type) {
-      _mesa_glsl_error(loc, state,
-		       "base type mismatch for arithmetic operator");
-      return glsl_type::error_type;
-   }
-
-   /*    "All arithmetic binary operators result in the same fundamental type
-    *    (signed integer, unsigned integer, or floating-point) as the
-    *    operands they operate on, after operand type conversion. After
-    *    conversion, the following cases are valid
-    *
-    *    * The two operands are scalars. In this case the operation is
-    *      applied, resulting in a scalar."
-    */
-   if (type_a->is_scalar() && type_b->is_scalar())
-      return type_a;
-
-   /*   "* One operand is a scalar, and the other is a vector or matrix.
-    *      In this case, the scalar operation is applied independently to each
-    *      component of the vector or matrix, resulting in the same size
-    *      vector or matrix."
-    */
-   if (type_a->is_scalar()) {
-      if (!type_b->is_scalar())
-	 return type_b;
-   } else if (type_b->is_scalar()) {
-      return type_a;
-   }
-
-   /* All of the combinations of <scalar, scalar>, <vector, scalar>,
-    * <scalar, vector>, <scalar, matrix>, and <matrix, scalar> have been
-    * handled.
-    */
-   assert(!type_a->is_scalar());
-   assert(!type_b->is_scalar());
-
-   /*   "* The two operands are vectors of the same size. In this case, the
-    *      operation is done component-wise resulting in the same size
-    *      vector."
-    */
-   if (type_a->is_vector() && type_b->is_vector()) {
-      if (type_a == type_b) {
-	 return type_a;
-      } else {
-	 _mesa_glsl_error(loc, state,
-			  "vector size mismatch for arithmetic operator");
-	 return glsl_type::error_type;
-      }
-   }
-
-   /* All of the combinations of <scalar, scalar>, <vector, scalar>,
-    * <scalar, vector>, <scalar, matrix>, <matrix, scalar>, and
-    * <vector, vector> have been handled.  At least one of the operands must
-    * be matrix.  Further, since there are no integer matrix types, the base
-    * type of both operands must be float.
-    */
-   assert(type_a->is_matrix() || type_b->is_matrix());
-   assert(type_a->base_type == GLSL_TYPE_FLOAT);
-   assert(type_b->base_type == GLSL_TYPE_FLOAT);
-
-   /*   "* The operator is add (+), subtract (-), or divide (/), and the
-    *      operands are matrices with the same number of rows and the same
-    *      number of columns. In this case, the operation is done component-
-    *      wise resulting in the same size matrix."
-    *    * The operator is multiply (*), where both operands are matrices or
-    *      one operand is a vector and the other a matrix. A right vector
-    *      operand is treated as a column vector and a left vector operand as a
-    *      row vector. In all these cases, it is required that the number of
-    *      columns of the left operand is equal to the number of rows of the
-    *      right operand. Then, the multiply (*) operation does a linear
-    *      algebraic multiply, yielding an object that has the same number of
-    *      rows as the left operand and the same number of columns as the right
-    *      operand. Section 5.10 "Vector and Matrix Operations" explains in
-    *      more detail how vectors and matrices are operated on."
-    */
-   if (! multiply) {
-      if (type_a == type_b)
-	 return type_a;
-   } else {
-      if (type_a->is_matrix() && type_b->is_matrix()) {
-	 /* Matrix multiply.  The columns of A must match the rows of B.  Given
-	  * the other previously tested constraints, this means the vector type
-	  * of a row from A must be the same as the vector type of a column from
-	  * B.
-	  */
-	 if (type_a->row_type() == type_b->column_type()) {
-	    /* The resulting matrix has the number of columns of matrix B and
-	     * the number of rows of matrix A.  We get the row count of A by
-	     * looking at the size of a vector that makes up a column.  The
-	     * transpose (size of a row) is done for B.
-	     */
-	    const glsl_type *const type =
-	       glsl_type::get_instance(type_a->base_type,
-				       type_a->column_type()->vector_elements,
-				       type_b->row_type()->vector_elements);
-	    assert(type != glsl_type::error_type);
-
-	    return type;
-	 }
-      } else if (type_a->is_matrix()) {
-	 /* A is a matrix and B is a column vector.  Columns of A must match
-	  * rows of B.  Given the other previously tested constraints, this
-	  * means the vector type of a row from A must be the same as the
-	  * vector the type of B.
-	  */
-	 if (type_a->row_type() == type_b) {
-	    /* The resulting vector has a number of elements equal to
-	     * the number of rows of matrix A. */
-	    const glsl_type *const type =
-	       glsl_type::get_instance(type_a->base_type,
-				       type_a->column_type()->vector_elements,
-				       1);
-	    assert(type != glsl_type::error_type);
-
-	    return type;
-	 }
-      } else {
-	 assert(type_b->is_matrix());
-
-	 /* A is a row vector and B is a matrix.  Columns of A must match rows
-	  * of B.  Given the other previously tested constraints, this means
-	  * the type of A must be the same as the vector type of a column from
-	  * B.
-	  */
-	 if (type_a == type_b->column_type()) {
-	    /* The resulting vector has a number of elements equal to
-	     * the number of columns of matrix B. */
-	    const glsl_type *const type =
-	       glsl_type::get_instance(type_a->base_type,
-				       type_b->row_type()->vector_elements,
-				       1);
-	    assert(type != glsl_type::error_type);
-
-	    return type;
-	 }
-      }
-
-      _mesa_glsl_error(loc, state, "size mismatch for matrix multiplication");
-      return glsl_type::error_type;
-   }
-
-
-   /*    "All other cases are illegal."
-    */
-   _mesa_glsl_error(loc, state, "type mismatch");
-   return glsl_type::error_type;
-}
-
-
-static const struct glsl_type *
-unary_arithmetic_result_type(const struct glsl_type *type,
-			     struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-   /* From GLSL 1.50 spec, page 57:
-    *
-    *    "The arithmetic unary operators negate (-), post- and pre-increment
-    *     and decrement (-- and ++) operate on integer or floating-point
-    *     values (including vectors and matrices). All unary operators work
-    *     component-wise on their operands. These result with the same type
-    *     they operated on."
-    */
-   if (!type->is_numeric()) {
-      _mesa_glsl_error(loc, state,
-		       "Operands to arithmetic operators must be numeric");
-      return glsl_type::error_type;
-   }
-
-   return type;
-}
-
-/**
- * \brief Return the result type of a bit-logic operation.
- *
- * If the given types to the bit-logic operator are invalid, return
- * glsl_type::error_type.
- *
- * \param type_a Type of LHS of bit-logic op
- * \param type_b Type of RHS of bit-logic op
- */
-static const struct glsl_type *
-bit_logic_result_type(const struct glsl_type *type_a,
-                      const struct glsl_type *type_b,
-                      ast_operators op,
-                      struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-    if (state->language_version < 130) {
-       _mesa_glsl_error(loc, state, "bit operations require GLSL 1.30");
-       return glsl_type::error_type;
-    }
-
-    /* From page 50 (page 56 of PDF) of GLSL 1.30 spec:
-     *
-     *     "The bitwise operators and (&), exclusive-or (^), and inclusive-or
-     *     (|). The operands must be of type signed or unsigned integers or
-     *     integer vectors."
-     */
-    if (!type_a->is_integer()) {
-       _mesa_glsl_error(loc, state, "LHS of `%s' must be an integer",
-                         ast_expression::operator_string(op));
-       return glsl_type::error_type;
-    }
-    if (!type_b->is_integer()) {
-       _mesa_glsl_error(loc, state, "RHS of `%s' must be an integer",
-                        ast_expression::operator_string(op));
-       return glsl_type::error_type;
-    }
-
-    /*     "The fundamental types of the operands (signed or unsigned) must
-     *     match,"
-     */
-    if (type_a->base_type != type_b->base_type) {
-       _mesa_glsl_error(loc, state, "operands of `%s' must have the same "
-                        "base type", ast_expression::operator_string(op));
-       return glsl_type::error_type;
-    }
-
-    /*     "The operands cannot be vectors of differing size." */
-    if (type_a->is_vector() &&
-        type_b->is_vector() &&
-        type_a->vector_elements != type_b->vector_elements) {
-       _mesa_glsl_error(loc, state, "operands of `%s' cannot be vectors of "
-                        "different sizes", ast_expression::operator_string(op));
-       return glsl_type::error_type;
-    }
-
-    /*     "If one operand is a scalar and the other a vector, the scalar is
-     *     applied component-wise to the vector, resulting in the same type as
-     *     the vector. The fundamental types of the operands [...] will be the
-     *     resulting fundamental type."
-     */
-    if (type_a->is_scalar())
-        return type_b;
-    else
-        return type_a;
-}
-
-static const struct glsl_type *
-modulus_result_type(const struct glsl_type *type_a,
-		    const struct glsl_type *type_b,
-		    struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-   if (state->language_version < 130) {
-      _mesa_glsl_error(loc, state,
-                       "operator '%%' is reserved in %s",
-                       state->version_string);
-      return glsl_type::error_type;
-   }
-
-   /* From GLSL 1.50 spec, page 56:
-    *    "The operator modulus (%) operates on signed or unsigned integers or
-    *    integer vectors. The operand types must both be signed or both be
-    *    unsigned."
-    */
-   if (!type_a->is_integer() || !type_b->is_integer()
-       || (type_a->base_type != type_b->base_type)) {
-      _mesa_glsl_error(loc, state, "type mismatch");
-      return glsl_type::error_type;
-   }
-
-   /*    "The operands cannot be vectors of differing size. If one operand is
-    *    a scalar and the other vector, then the scalar is applied component-
-    *    wise to the vector, resulting in the same type as the vector. If both
-    *    are vectors of the same size, the result is computed component-wise."
-    */
-   if (type_a->is_vector()) {
-      if (!type_b->is_vector()
-	  || (type_a->vector_elements == type_b->vector_elements))
-	 return type_a;
-   } else
-      return type_b;
-
-   /*    "The operator modulus (%) is not defined for any other data types
-    *    (non-integer types)."
-    */
-   _mesa_glsl_error(loc, state, "type mismatch");
-   return glsl_type::error_type;
-}
-
-
-static const struct glsl_type *
-relational_result_type(ir_rvalue * &value_a, ir_rvalue * &value_b,
-		       struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-   const glsl_type *type_a = value_a->type;
-   const glsl_type *type_b = value_b->type;
-
-   /* From GLSL 1.50 spec, page 56:
-    *    "The relational operators greater than (>), less than (<), greater
-    *    than or equal (>=), and less than or equal (<=) operate only on
-    *    scalar integer and scalar floating-point expressions."
-    */
-   if (!type_a->is_numeric()
-       || !type_b->is_numeric()
-       || !type_a->is_scalar()
-       || !type_b->is_scalar()) {
-      _mesa_glsl_error(loc, state,
-		       "Operands to relational operators must be scalar and "
-		       "numeric");
-      return glsl_type::error_type;
-   }
-
-   /*    "Either the operands' types must match, or the conversions from
-    *    Section 4.1.10 "Implicit Conversions" will be applied to the integer
-    *    operand, after which the types must match."
-    */
-   if (!apply_implicit_conversion(type_a, value_b, state)
-       && !apply_implicit_conversion(type_b, value_a, state)) {
-      _mesa_glsl_error(loc, state,
-		       "Could not implicitly convert operands to "
-		       "relational operator");
-      return glsl_type::error_type;
-   }
-   type_a = value_a->type;
-   type_b = value_b->type;
-
-   if (type_a->base_type != type_b->base_type) {
-      _mesa_glsl_error(loc, state, "base type mismatch");
-      return glsl_type::error_type;
-   }
-
-   /*    "The result is scalar Boolean."
-    */
-   return glsl_type::bool_type;
-}
-
-/**
- * \brief Return the result type of a bit-shift operation.
- *
- * If the given types to the bit-shift operator are invalid, return
- * glsl_type::error_type.
- *
- * \param type_a Type of LHS of bit-shift op
- * \param type_b Type of RHS of bit-shift op
- */
-static const struct glsl_type *
-shift_result_type(const struct glsl_type *type_a,
-                  const struct glsl_type *type_b,
-                  ast_operators op,
-                  struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-   if (state->language_version < 130) {
-      _mesa_glsl_error(loc, state, "bit operations require GLSL 1.30");
-      return glsl_type::error_type;
-   }
-
-   /* From page 50 (page 56 of the PDF) of the GLSL 1.30 spec:
-    *
-    *     "The shift operators (<<) and (>>). For both operators, the operands
-    *     must be signed or unsigned integers or integer vectors. One operand
-    *     can be signed while the other is unsigned."
-    */
-   if (!type_a->is_integer()) {
-      _mesa_glsl_error(loc, state, "LHS of operator %s must be an integer or "
-              "integer vector", ast_expression::operator_string(op));
-     return glsl_type::error_type;
-
-   }
-   if (!type_b->is_integer()) {
-      _mesa_glsl_error(loc, state, "RHS of operator %s must be an integer or "
-              "integer vector", ast_expression::operator_string(op));
-     return glsl_type::error_type;
-   }
-
-   /*     "If the first operand is a scalar, the second operand has to be
-    *     a scalar as well."
-    */
-   if (type_a->is_scalar() && !type_b->is_scalar()) {
-      _mesa_glsl_error(loc, state, "If the first operand of %s is scalar, the "
-              "second must be scalar as well",
-              ast_expression::operator_string(op));
-     return glsl_type::error_type;
-   }
-
-   /* If both operands are vectors, check that they have same number of
-    * elements.
-    */
-   if (type_a->is_vector() &&
-      type_b->is_vector() &&
-      type_a->vector_elements != type_b->vector_elements) {
-      _mesa_glsl_error(loc, state, "Vector operands to operator %s must "
-              "have same number of elements",
-              ast_expression::operator_string(op));
-     return glsl_type::error_type;
-   }
-
-   /*     "In all cases, the resulting type will be the same type as the left
-    *     operand."
-    */
-   return type_a;
-}
-
-/**
- * Validates that a value can be assigned to a location with a specified type
- *
- * Validates that \c rhs can be assigned to some location.  If the types are
- * not an exact match but an automatic conversion is possible, \c rhs will be
- * converted.
- *
- * \return
- * \c NULL if \c rhs cannot be assigned to a location with type \c lhs_type.
- * Otherwise the actual RHS to be assigned will be returned.  This may be
- * \c rhs, or it may be \c rhs after some type conversion.
- *
- * \note
- * In addition to being used for assignments, this function is used to
- * type-check return values.
- */
-ir_rvalue *
-validate_assignment(struct _mesa_glsl_parse_state *state,
-		    const glsl_type *lhs_type, ir_rvalue *rhs,
-		    bool is_initializer)
-{
-   /* If there is already some error in the RHS, just return it.  Anything
-    * else will lead to an avalanche of error message back to the user.
-    */
-   if (rhs->type->is_error())
-      return rhs;
-
-   /* If the types are identical, the assignment can trivially proceed.
-    */
-   if (rhs->type == lhs_type)
-      return rhs;
-
-   /* If the array element types are the same and the size of the LHS is zero,
-    * the assignment is okay for initializers embedded in variable
-    * declarations.
-    *
-    * Note: Whole-array assignments are not permitted in GLSL 1.10, but this
-    * is handled by ir_dereference::is_lvalue.
-    */
-   if (is_initializer && lhs_type->is_array() && rhs->type->is_array()
-       && (lhs_type->element_type() == rhs->type->element_type())
-       && (lhs_type->array_size() == 0)) {
-      return rhs;
-   }
-
-   /* Check for implicit conversion in GLSL 1.20 */
-   if (apply_implicit_conversion(lhs_type, rhs, state)) {
-      if (rhs->type == lhs_type)
-	 return rhs;
-   }
-
-   return NULL;
-}
-
-ir_rvalue *
-do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
-	      ir_rvalue *lhs, ir_rvalue *rhs, bool is_initializer,
-	      YYLTYPE lhs_loc)
-{
-   void *ctx = state;
-   bool error_emitted = (lhs->type->is_error() || rhs->type->is_error());
-
-   if (!error_emitted) {
-      if (lhs->variable_referenced() != NULL
-          && lhs->variable_referenced()->read_only) {
-         _mesa_glsl_error(&lhs_loc, state,
-                          "assignment to read-only variable '%s'",
-                          lhs->variable_referenced()->name);
-         error_emitted = true;
-
-      } else if (!lhs->is_lvalue()) {
-	 _mesa_glsl_error(& lhs_loc, state, "non-lvalue in assignment");
-	 error_emitted = true;
-      }
-
-      if (state->es_shader && lhs->type->is_array()) {
-	 _mesa_glsl_error(&lhs_loc, state, "whole array assignment is not "
-			  "allowed in GLSL ES 1.00.");
-	 error_emitted = true;
-      }
-   }
-
-   ir_rvalue *new_rhs =
-      validate_assignment(state, lhs->type, rhs, is_initializer);
-   if (new_rhs == NULL) {
-      _mesa_glsl_error(& lhs_loc, state, "type mismatch");
-   } else {
-      rhs = new_rhs;
-
-      /* If the LHS array was not declared with a size, it takes it size from
-       * the RHS.  If the LHS is an l-value and a whole array, it must be a
-       * dereference of a variable.  Any other case would require that the LHS
-       * is either not an l-value or not a whole array.
-       */
-      if (lhs->type->array_size() == 0) {
-	 ir_dereference *const d = lhs->as_dereference();
-
-	 assert(d != NULL);
-
-	 ir_variable *const var = d->variable_referenced();
-
-	 assert(var != NULL);
-
-	 if (var->max_array_access >= unsigned(rhs->type->array_size())) {
-	    /* FINISHME: This should actually log the location of the RHS. */
-	    _mesa_glsl_error(& lhs_loc, state, "array size must be > %u due to "
-			     "previous access",
-			     var->max_array_access);
-	 }
-
-	 var->type = glsl_type::get_array_instance(lhs->type->element_type(),
-						   rhs->type->array_size());
-	 d->type = var->type;
-      }
-   }
-
-   /* Most callers of do_assignment (assign, add_assign, pre_inc/dec,
-    * but not post_inc) need the converted assigned value as an rvalue
-    * to handle things like:
-    *
-    * i = j += 1;
-    *
-    * So we always just store the computed value being assigned to a
-    * temporary and return a deref of that temporary.  If the rvalue
-    * ends up not being used, the temp will get copy-propagated out.
-    */
-   ir_variable *var = new(ctx) ir_variable(rhs->type, "assignment_tmp",
-					   ir_var_temporary);
-   ir_dereference_variable *deref_var = new(ctx) ir_dereference_variable(var);
-   instructions->push_tail(var);
-   instructions->push_tail(new(ctx) ir_assignment(deref_var,
-						  rhs,
-						  NULL));
-   deref_var = new(ctx) ir_dereference_variable(var);
-
-   if (!error_emitted)
-      instructions->push_tail(new(ctx) ir_assignment(lhs, deref_var, NULL));
-
-   return new(ctx) ir_dereference_variable(var);
-}
-
-static ir_rvalue *
-get_lvalue_copy(exec_list *instructions, ir_rvalue *lvalue)
-{
-   void *ctx = ralloc_parent(lvalue);
-   ir_variable *var;
-
-   var = new(ctx) ir_variable(lvalue->type, "_post_incdec_tmp",
-			      ir_var_temporary);
-   instructions->push_tail(var);
-   var->mode = ir_var_auto;
-
-   instructions->push_tail(new(ctx) ir_assignment(new(ctx) ir_dereference_variable(var),
-						  lvalue, NULL));
-
-   /* Once we've created this temporary, mark it read only so it's no
-    * longer considered an lvalue.
-    */
-   var->read_only = true;
-
-   return new(ctx) ir_dereference_variable(var);
-}
-
-
-ir_rvalue *
-ast_node::hir(exec_list *instructions,
-	      struct _mesa_glsl_parse_state *state)
-{
-   (void) instructions;
-   (void) state;
-
-   return NULL;
-}
-
-static void
-mark_whole_array_access(ir_rvalue *access)
-{
-   ir_dereference_variable *deref = access->as_dereference_variable();
-
-   if (deref) {
-      deref->var->max_array_access = deref->type->length - 1;
-   }
-}
-
-static ir_rvalue *
-do_comparison(void *mem_ctx, int operation, ir_rvalue *op0, ir_rvalue *op1)
-{
-   int join_op;
-   ir_rvalue *cmp = NULL;
-
-   if (operation == ir_binop_all_equal)
-      join_op = ir_binop_logic_and;
-   else
-      join_op = ir_binop_logic_or;
-
-   switch (op0->type->base_type) {
-   case GLSL_TYPE_FLOAT:
-   case GLSL_TYPE_UINT:
-   case GLSL_TYPE_INT:
-   case GLSL_TYPE_BOOL:
-      return new(mem_ctx) ir_expression(operation, op0, op1);
-
-   case GLSL_TYPE_ARRAY: {
-      for (unsigned int i = 0; i < op0->type->length; i++) {
-	 ir_rvalue *e0, *e1, *result;
-
-	 e0 = new(mem_ctx) ir_dereference_array(op0->clone(mem_ctx, NULL),
-						new(mem_ctx) ir_constant(i));
-	 e1 = new(mem_ctx) ir_dereference_array(op1->clone(mem_ctx, NULL),
-						new(mem_ctx) ir_constant(i));
-	 result = do_comparison(mem_ctx, operation, e0, e1);
-
-	 if (cmp) {
-	    cmp = new(mem_ctx) ir_expression(join_op, cmp, result);
-	 } else {
-	    cmp = result;
-	 }
-      }
-
-      mark_whole_array_access(op0);
-      mark_whole_array_access(op1);
-      break;
-   }
-
-   case GLSL_TYPE_STRUCT: {
-      for (unsigned int i = 0; i < op0->type->length; i++) {
-	 ir_rvalue *e0, *e1, *result;
-	 const char *field_name = op0->type->fields.structure[i].name;
-
-	 e0 = new(mem_ctx) ir_dereference_record(op0->clone(mem_ctx, NULL),
-						 field_name);
-	 e1 = new(mem_ctx) ir_dereference_record(op1->clone(mem_ctx, NULL),
-						 field_name);
-	 result = do_comparison(mem_ctx, operation, e0, e1);
-
-	 if (cmp) {
-	    cmp = new(mem_ctx) ir_expression(join_op, cmp, result);
-	 } else {
-	    cmp = result;
-	 }
-      }
-      break;
-   }
-
-   case GLSL_TYPE_ERROR:
-   case GLSL_TYPE_VOID:
-   case GLSL_TYPE_SAMPLER:
-      /* I assume a comparison of a struct containing a sampler just
-       * ignores the sampler present in the type.
-       */
-      break;
-
-   default:
-      assert(!"Should not get here.");
-      break;
-   }
-
-   if (cmp == NULL)
-      cmp = new(mem_ctx) ir_constant(true);
-
-   return cmp;
-}
-
-ir_rvalue *
-ast_expression::hir(exec_list *instructions,
-		    struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   static const int operations[AST_NUM_OPERATORS] = {
-      -1,               /* ast_assign doesn't convert to ir_expression. */
-      -1,               /* ast_plus doesn't convert to ir_expression. */
-      ir_unop_neg,
-      ir_binop_add,
-      ir_binop_sub,
-      ir_binop_mul,
-      ir_binop_div,
-      ir_binop_mod,
-      ir_binop_lshift,
-      ir_binop_rshift,
-      ir_binop_less,
-      ir_binop_greater,
-      ir_binop_lequal,
-      ir_binop_gequal,
-      ir_binop_all_equal,
-      ir_binop_any_nequal,
-      ir_binop_bit_and,
-      ir_binop_bit_xor,
-      ir_binop_bit_or,
-      ir_unop_bit_not,
-      ir_binop_logic_and,
-      ir_binop_logic_xor,
-      ir_binop_logic_or,
-      ir_unop_logic_not,
-
-      /* Note: The following block of expression types actually convert
-       * to multiple IR instructions.
-       */
-      ir_binop_mul,     /* ast_mul_assign */
-      ir_binop_div,     /* ast_div_assign */
-      ir_binop_mod,     /* ast_mod_assign */
-      ir_binop_add,     /* ast_add_assign */
-      ir_binop_sub,     /* ast_sub_assign */
-      ir_binop_lshift,  /* ast_ls_assign */
-      ir_binop_rshift,  /* ast_rs_assign */
-      ir_binop_bit_and, /* ast_and_assign */
-      ir_binop_bit_xor, /* ast_xor_assign */
-      ir_binop_bit_or,  /* ast_or_assign */
-
-      -1,               /* ast_conditional doesn't convert to ir_expression. */
-      ir_binop_add,     /* ast_pre_inc. */
-      ir_binop_sub,     /* ast_pre_dec. */
-      ir_binop_add,     /* ast_post_inc. */
-      ir_binop_sub,     /* ast_post_dec. */
-      -1,               /* ast_field_selection doesn't conv to ir_expression. */
-      -1,               /* ast_array_index doesn't convert to ir_expression. */
-      -1,               /* ast_function_call doesn't conv to ir_expression. */
-      -1,               /* ast_identifier doesn't convert to ir_expression. */
-      -1,               /* ast_int_constant doesn't convert to ir_expression. */
-      -1,               /* ast_uint_constant doesn't conv to ir_expression. */
-      -1,               /* ast_float_constant doesn't conv to ir_expression. */
-      -1,               /* ast_bool_constant doesn't conv to ir_expression. */
-      -1,               /* ast_sequence doesn't convert to ir_expression. */
-   };
-   ir_rvalue *result = NULL;
-   ir_rvalue *op[3];
-   const struct glsl_type *type = glsl_type::error_type;
-   bool error_emitted = false;
-   YYLTYPE loc;
-
-   loc = this->get_location();
-
-   switch (this->oper) {
-   case ast_assign: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      result = do_assignment(instructions, state, op[0], op[1], false,
-			     this->subexpressions[0]->get_location());
-      error_emitted = result->type->is_error();
-      type = result->type;
-      break;
-   }
-
-   case ast_plus:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      type = unary_arithmetic_result_type(op[0]->type, state, & loc);
-
-      error_emitted = type->is_error();
-
-      result = op[0];
-      break;
-
-   case ast_neg:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      type = unary_arithmetic_result_type(op[0]->type, state, & loc);
-
-      error_emitted = type->is_error();
-
-      result = new(ctx) ir_expression(operations[this->oper], type,
-				      op[0], NULL);
-      break;
-
-   case ast_add:
-   case ast_sub:
-   case ast_mul:
-   case ast_div:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      type = arithmetic_result_type(op[0], op[1],
-				    (this->oper == ast_mul),
-				    state, & loc);
-      error_emitted = type->is_error();
-
-      result = new(ctx) ir_expression(operations[this->oper], type,
-				      op[0], op[1]);
-      break;
-
-   case ast_mod:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      type = modulus_result_type(op[0]->type, op[1]->type, state, & loc);
-
-      assert(operations[this->oper] == ir_binop_mod);
-
-      result = new(ctx) ir_expression(operations[this->oper], type,
-				      op[0], op[1]);
-      error_emitted = type->is_error();
-      break;
-
-   case ast_lshift:
-   case ast_rshift:
-       if (state->language_version < 130) {
-          _mesa_glsl_error(&loc, state, "operator %s requires GLSL 1.30",
-              operator_string(this->oper));
-          error_emitted = true;
-       }
-
-       op[0] = this->subexpressions[0]->hir(instructions, state);
-       op[1] = this->subexpressions[1]->hir(instructions, state);
-       type = shift_result_type(op[0]->type, op[1]->type, this->oper, state,
-                                &loc);
-       result = new(ctx) ir_expression(operations[this->oper], type,
-                                       op[0], op[1]);
-       error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-       break;
-
-   case ast_less:
-   case ast_greater:
-   case ast_lequal:
-   case ast_gequal:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      type = relational_result_type(op[0], op[1], state, & loc);
-
-      /* The relational operators must either generate an error or result
-       * in a scalar boolean.  See page 57 of the GLSL 1.50 spec.
-       */
-      assert(type->is_error()
-	     || ((type->base_type == GLSL_TYPE_BOOL)
-		 && type->is_scalar()));
-
-      result = new(ctx) ir_expression(operations[this->oper], type,
-				      op[0], op[1]);
-      error_emitted = type->is_error();
-      break;
-
-   case ast_nequal:
-   case ast_equal:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      /* From page 58 (page 64 of the PDF) of the GLSL 1.50 spec:
-       *
-       *    "The equality operators equal (==), and not equal (!=)
-       *    operate on all types. They result in a scalar Boolean. If
-       *    the operand types do not match, then there must be a
-       *    conversion from Section 4.1.10 "Implicit Conversions"
-       *    applied to one operand that can make them match, in which
-       *    case this conversion is done."
-       */
-      if ((!apply_implicit_conversion(op[0]->type, op[1], state)
-	   && !apply_implicit_conversion(op[1]->type, op[0], state))
-	  || (op[0]->type != op[1]->type)) {
-	 _mesa_glsl_error(& loc, state, "operands of `%s' must have the same "
-			  "type", (this->oper == ast_equal) ? "==" : "!=");
-	 error_emitted = true;
-      } else if ((state->language_version <= 110)
-		 && (op[0]->type->is_array() || op[1]->type->is_array())) {
-	 _mesa_glsl_error(& loc, state, "array comparisons forbidden in "
-			  "GLSL 1.10");
-	 error_emitted = true;
-      }
-
-      result = do_comparison(ctx, operations[this->oper], op[0], op[1]);
-      type = glsl_type::bool_type;
-
-      assert(error_emitted || (result->type == glsl_type::bool_type));
-      break;
-
-   case ast_bit_and:
-   case ast_bit_xor:
-   case ast_bit_or:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-      type = bit_logic_result_type(op[0]->type, op[1]->type, this->oper,
-                                   state, &loc);
-      result = new(ctx) ir_expression(operations[this->oper], type,
-				      op[0], op[1]);
-      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-      break;
-
-   case ast_bit_not:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      if (state->language_version < 130) {
-	 _mesa_glsl_error(&loc, state, "bit-wise operations require GLSL 1.30");
-	 error_emitted = true;
-      }
-
-      if (!op[0]->type->is_integer()) {
-	 _mesa_glsl_error(&loc, state, "operand of `~' must be an integer");
-	 error_emitted = true;
-      }
-
-      type = op[0]->type;
-      result = new(ctx) ir_expression(ir_unop_bit_not, type, op[0], NULL);
-      break;
-
-   case ast_logic_and: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {
-	 YYLTYPE loc = this->subexpressions[0]->get_location();
-
-	 _mesa_glsl_error(& loc, state, "LHS of `%s' must be scalar boolean",
-			  operator_string(this->oper));
-	 error_emitted = true;
-      }
-
-      ir_constant *op0_const = op[0]->constant_expression_value();
-      if (op0_const) {
-	 if (op0_const->value.b[0]) {
-	    op[1] = this->subexpressions[1]->hir(instructions, state);
-
-	    if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {
-	       YYLTYPE loc = this->subexpressions[1]->get_location();
-
-	       _mesa_glsl_error(& loc, state,
-				"RHS of `%s' must be scalar boolean",
-				operator_string(this->oper));
-	       error_emitted = true;
-	    }
-	    result = op[1];
-	 } else {
-	    result = op0_const;
-	 }
-	 type = glsl_type::bool_type;
-      } else {
-	 ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,
-						       "and_tmp",
-						       ir_var_temporary);
-	 instructions->push_tail(tmp);
-
-	 ir_if *const stmt = new(ctx) ir_if(op[0]);
-	 instructions->push_tail(stmt);
-
-	 op[1] = this->subexpressions[1]->hir(&stmt->then_instructions, state);
-
-	 if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {
-	    YYLTYPE loc = this->subexpressions[1]->get_location();
-
-	    _mesa_glsl_error(& loc, state,
-			     "RHS of `%s' must be scalar boolean",
-			     operator_string(this->oper));
-	    error_emitted = true;
-	 }
-
-	 ir_dereference *const then_deref = new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const then_assign =
-	    new(ctx) ir_assignment(then_deref, op[1], NULL);
-	 stmt->then_instructions.push_tail(then_assign);
-
-	 ir_dereference *const else_deref = new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const else_assign =
-	    new(ctx) ir_assignment(else_deref, new(ctx) ir_constant(false), NULL);
-	 stmt->else_instructions.push_tail(else_assign);
-
-	 result = new(ctx) ir_dereference_variable(tmp);
-	 type = tmp->type;
-      }
-      break;
-   }
-
-   case ast_logic_or: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {
-	 YYLTYPE loc = this->subexpressions[0]->get_location();
-
-	 _mesa_glsl_error(& loc, state, "LHS of `%s' must be scalar boolean",
-			  operator_string(this->oper));
-	 error_emitted = true;
-      }
-
-      ir_constant *op0_const = op[0]->constant_expression_value();
-      if (op0_const) {
-	 if (op0_const->value.b[0]) {
-	    result = op0_const;
-	 } else {
-	    op[1] = this->subexpressions[1]->hir(instructions, state);
-
-	    if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {
-	       YYLTYPE loc = this->subexpressions[1]->get_location();
-
-	       _mesa_glsl_error(& loc, state,
-				"RHS of `%s' must be scalar boolean",
-				operator_string(this->oper));
-	       error_emitted = true;
-	    }
-	    result = op[1];
-	 }
-	 type = glsl_type::bool_type;
-      } else {
-	 ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,
-						       "or_tmp",
-						       ir_var_temporary);
-	 instructions->push_tail(tmp);
-
-	 ir_if *const stmt = new(ctx) ir_if(op[0]);
-	 instructions->push_tail(stmt);
-
-	 op[1] = this->subexpressions[1]->hir(&stmt->else_instructions, state);
-
-	 if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {
-	    YYLTYPE loc = this->subexpressions[1]->get_location();
-
-	    _mesa_glsl_error(& loc, state, "RHS of `%s' must be scalar boolean",
-			     operator_string(this->oper));
-	    error_emitted = true;
-	 }
-
-	 ir_dereference *const then_deref = new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const then_assign =
-	    new(ctx) ir_assignment(then_deref, new(ctx) ir_constant(true), NULL);
-	 stmt->then_instructions.push_tail(then_assign);
-
-	 ir_dereference *const else_deref = new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const else_assign =
-	    new(ctx) ir_assignment(else_deref, op[1], NULL);
-	 stmt->else_instructions.push_tail(else_assign);
-
-	 result = new(ctx) ir_dereference_variable(tmp);
-	 type = tmp->type;
-      }
-      break;
-   }
-
-   case ast_logic_xor:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-
-      result = new(ctx) ir_expression(operations[this->oper], glsl_type::bool_type,
-				      op[0], op[1]);
-      type = glsl_type::bool_type;
-      break;
-
-   case ast_logic_not:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {
-	 YYLTYPE loc = this->subexpressions[0]->get_location();
-
-	 _mesa_glsl_error(& loc, state,
-			  "operand of `!' must be scalar boolean");
-	 error_emitted = true;
-      }
-
-      result = new(ctx) ir_expression(operations[this->oper], glsl_type::bool_type,
-				      op[0], NULL);
-      type = glsl_type::bool_type;
-      break;
-
-   case ast_mul_assign:
-   case ast_div_assign:
-   case ast_add_assign:
-   case ast_sub_assign: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      type = arithmetic_result_type(op[0], op[1],
-				    (this->oper == ast_mul_assign),
-				    state, & loc);
-
-      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper], type,
-						   op[0], op[1]);
-
-      result = do_assignment(instructions, state,
-			     op[0]->clone(ctx, NULL), temp_rhs, false,
-			     this->subexpressions[0]->get_location());
-      type = result->type;
-      error_emitted = (op[0]->type->is_error());
-
-      /* GLSL 1.10 does not allow array assignment.  However, we don't have to
-       * explicitly test for this because none of the binary expression
-       * operators allow array operands either.
-       */
-
-      break;
-   }
-
-   case ast_mod_assign: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      type = modulus_result_type(op[0]->type, op[1]->type, state, & loc);
-
-      assert(operations[this->oper] == ir_binop_mod);
-
-      ir_rvalue *temp_rhs;
-      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,
-					op[0], op[1]);
-
-      result = do_assignment(instructions, state,
-			     op[0]->clone(ctx, NULL), temp_rhs, false,
-			     this->subexpressions[0]->get_location());
-      type = result->type;
-      error_emitted = type->is_error();
-      break;
-   }
-
-   case ast_ls_assign:
-   case ast_rs_assign: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-      type = shift_result_type(op[0]->type, op[1]->type, this->oper, state,
-                               &loc);
-      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],
-                                                   type, op[0], op[1]);
-      result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),
-                             temp_rhs, false,
-                             this->subexpressions[0]->get_location());
-      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-      break;
-   }
-
-   case ast_and_assign:
-   case ast_xor_assign:
-   case ast_or_assign: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-      type = bit_logic_result_type(op[0]->type, op[1]->type, this->oper,
-                                   state, &loc);
-      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],
-                                                   type, op[0], op[1]);
-      result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),
-                             temp_rhs, false,
-                             this->subexpressions[0]->get_location());
-      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-      break;
-   }
-
-   case ast_conditional: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      /* From page 59 (page 65 of the PDF) of the GLSL 1.50 spec:
-       *
-       *    "The ternary selection operator (?:). It operates on three
-       *    expressions (exp1 ? exp2 : exp3). This operator evaluates the
-       *    first expression, which must result in a scalar Boolean."
-       */
-      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {
-	 YYLTYPE loc = this->subexpressions[0]->get_location();
-
-	 _mesa_glsl_error(& loc, state, "?: condition must be scalar boolean");
-	 error_emitted = true;
-      }
-
-      /* The :? operator is implemented by generating an anonymous temporary
-       * followed by an if-statement.  The last instruction in each branch of
-       * the if-statement assigns a value to the anonymous temporary.  This
-       * temporary is the r-value of the expression.
-       */
-      exec_list then_instructions;
-      exec_list else_instructions;
-
-      op[1] = this->subexpressions[1]->hir(&then_instructions, state);
-      op[2] = this->subexpressions[2]->hir(&else_instructions, state);
-
-      /* From page 59 (page 65 of the PDF) of the GLSL 1.50 spec:
-       *
-       *     "The second and third expressions can be any type, as
-       *     long their types match, or there is a conversion in
-       *     Section 4.1.10 "Implicit Conversions" that can be applied
-       *     to one of the expressions to make their types match. This
-       *     resulting matching type is the type of the entire
-       *     expression."
-       */
-      if ((!apply_implicit_conversion(op[1]->type, op[2], state)
-	   && !apply_implicit_conversion(op[2]->type, op[1], state))
-	  || (op[1]->type != op[2]->type)) {
-	 YYLTYPE loc = this->subexpressions[1]->get_location();
-
-	 _mesa_glsl_error(& loc, state, "Second and third operands of ?: "
-			  "operator must have matching types.");
-	 error_emitted = true;
-	 type = glsl_type::error_type;
-      } else {
-	 type = op[1]->type;
-      }
-
-      /* From page 33 (page 39 of the PDF) of the GLSL 1.10 spec:
-       *
-       *    "The second and third expressions must be the same type, but can
-       *    be of any type other than an array."
-       */
-      if ((state->language_version <= 110) && type->is_array()) {
-	 _mesa_glsl_error(& loc, state, "Second and third operands of ?: "
-			  "operator must not be arrays.");
-	 error_emitted = true;
-      }
-
-      ir_constant *cond_val = op[0]->constant_expression_value();
-      ir_constant *then_val = op[1]->constant_expression_value();
-      ir_constant *else_val = op[2]->constant_expression_value();
-
-      if (then_instructions.is_empty()
-	  && else_instructions.is_empty()
-	  && (cond_val != NULL) && (then_val != NULL) && (else_val != NULL)) {
-	 result = (cond_val->value.b[0]) ? then_val : else_val;
-      } else {
-	 ir_variable *const tmp =
-	    new(ctx) ir_variable(type, "conditional_tmp", ir_var_temporary);
-	 instructions->push_tail(tmp);
-
-	 ir_if *const stmt = new(ctx) ir_if(op[0]);
-	 instructions->push_tail(stmt);
-
-	 then_instructions.move_nodes_to(& stmt->then_instructions);
-	 ir_dereference *const then_deref =
-	    new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const then_assign =
-	    new(ctx) ir_assignment(then_deref, op[1], NULL);
-	 stmt->then_instructions.push_tail(then_assign);
-
-	 else_instructions.move_nodes_to(& stmt->else_instructions);
-	 ir_dereference *const else_deref =
-	    new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const else_assign =
-	    new(ctx) ir_assignment(else_deref, op[2], NULL);
-	 stmt->else_instructions.push_tail(else_assign);
-
-	 result = new(ctx) ir_dereference_variable(tmp);
-      }
-      break;
-   }
-
-   case ast_pre_inc:
-   case ast_pre_dec: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      if (op[0]->type->base_type == GLSL_TYPE_FLOAT)
-	 op[1] = new(ctx) ir_constant(1.0f);
-      else
-	 op[1] = new(ctx) ir_constant(1);
-
-      type = arithmetic_result_type(op[0], op[1], false, state, & loc);
-
-      ir_rvalue *temp_rhs;
-      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,
-					op[0], op[1]);
-
-      result = do_assignment(instructions, state,
-			     op[0]->clone(ctx, NULL), temp_rhs, false,
-			     this->subexpressions[0]->get_location());
-      type = result->type;
-      error_emitted = op[0]->type->is_error();
-      break;
-   }
-
-   case ast_post_inc:
-   case ast_post_dec: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      if (op[0]->type->base_type == GLSL_TYPE_FLOAT)
-	 op[1] = new(ctx) ir_constant(1.0f);
-      else
-	 op[1] = new(ctx) ir_constant(1);
-
-      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-
-      type = arithmetic_result_type(op[0], op[1], false, state, & loc);
-
-      ir_rvalue *temp_rhs;
-      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,
-					op[0], op[1]);
-
-      /* Get a temporary of a copy of the lvalue before it's modified.
-       * This may get thrown away later.
-       */
-      result = get_lvalue_copy(instructions, op[0]->clone(ctx, NULL));
-
-      (void)do_assignment(instructions, state,
-			  op[0]->clone(ctx, NULL), temp_rhs, false,
-			  this->subexpressions[0]->get_location());
-
-      type = result->type;
-      error_emitted = op[0]->type->is_error();
-      break;
-   }
-
-   case ast_field_selection:
-      result = _mesa_ast_field_selection_to_hir(this, instructions, state);
-      type = result->type;
-      break;
-
-   case ast_array_index: {
-      YYLTYPE index_loc = subexpressions[1]->get_location();
-
-      op[0] = subexpressions[0]->hir(instructions, state);
-      op[1] = subexpressions[1]->hir(instructions, state);
-
-      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-
-      ir_rvalue *const array = op[0];
-
-      result = new(ctx) ir_dereference_array(op[0], op[1]);
-
-      /* Do not use op[0] after this point.  Use array.
-       */
-      op[0] = NULL;
-
-
-      if (error_emitted)
-	 break;
-
-      if (!array->type->is_array()
-	  && !array->type->is_matrix()
-	  && !array->type->is_vector()) {
-	 _mesa_glsl_error(& index_loc, state,
-			  "cannot dereference non-array / non-matrix / "
-			  "non-vector");
-	 error_emitted = true;
-      }
-
-      if (!op[1]->type->is_integer()) {
-	 _mesa_glsl_error(& index_loc, state,
-			  "array index must be integer type");
-	 error_emitted = true;
-      } else if (!op[1]->type->is_scalar()) {
-	 _mesa_glsl_error(& index_loc, state,
-			  "array index must be scalar");
-	 error_emitted = true;
-      }
-
-      /* If the array index is a constant expression and the array has a
-       * declared size, ensure that the access is in-bounds.  If the array
-       * index is not a constant expression, ensure that the array has a
-       * declared size.
-       */
-      ir_constant *const const_index = op[1]->constant_expression_value();
-      if (const_index != NULL) {
-	 const int idx = const_index->value.i[0];
-	 const char *type_name;
-	 unsigned bound = 0;
-
-	 if (array->type->is_matrix()) {
-	    type_name = "matrix";
-	 } else if (array->type->is_vector()) {
-	    type_name = "vector";
-	 } else {
-	    type_name = "array";
-	 }
-
-	 /* From page 24 (page 30 of the PDF) of the GLSL 1.50 spec:
-	  *
-	  *    "It is illegal to declare an array with a size, and then
-	  *    later (in the same shader) index the same array with an
-	  *    integral constant expression greater than or equal to the
-	  *    declared size. It is also illegal to index an array with a
-	  *    negative constant expression."
-	  */
-	 if (array->type->is_matrix()) {
-	    if (array->type->row_type()->vector_elements <= idx) {
-	       bound = array->type->row_type()->vector_elements;
-	    }
-	 } else if (array->type->is_vector()) {
-	    if (array->type->vector_elements <= idx) {
-	       bound = array->type->vector_elements;
-	    }
-	 } else {
-	    if ((array->type->array_size() > 0)
-		&& (array->type->array_size() <= idx)) {
-	       bound = array->type->array_size();
-	    }
-	 }
-
-	 if (bound > 0) {
-	    _mesa_glsl_error(& loc, state, "%s index must be < %u",
-			     type_name, bound);
-	    error_emitted = true;
-	 } else if (idx < 0) {
-	    _mesa_glsl_error(& loc, state, "%s index must be >= 0",
-			     type_name);
-	    error_emitted = true;
-	 }
-
-	 if (array->type->is_array()) {
-	    /* If the array is a variable dereference, it dereferences the
-	     * whole array, by definition.  Use this to get the variable.
-	     *
-	     * FINISHME: Should some methods for getting / setting / testing
-	     * FINISHME: array access limits be added to ir_dereference?
-	     */
-	    ir_variable *const v = array->whole_variable_referenced();
-	    if ((v != NULL) && (unsigned(idx) > v->max_array_access))
-	       v->max_array_access = idx;
-	 }
-      } else if (array->type->array_size() == 0) {
-	 _mesa_glsl_error(&loc, state, "unsized array index must be constant");
-      } else {
-	 if (array->type->is_array()) {
-	    /* whole_variable_referenced can return NULL if the array is a
-	     * member of a structure.  In this case it is safe to not update
-	     * the max_array_access field because it is never used for fields
-	     * of structures.
-	     */
-	    ir_variable *v = array->whole_variable_referenced();
-	    if (v != NULL)
-	       v->max_array_access = array->type->array_size() - 1;
-	 }
-      }
-
-      /* From page 23 (29 of the PDF) of the GLSL 1.30 spec:
-       *
-       *    "Samplers aggregated into arrays within a shader (using square
-       *    brackets [ ]) can only be indexed with integral constant
-       *    expressions [...]."
-       *
-       * This restriction was added in GLSL 1.30.  Shaders using earlier version
-       * of the language should not be rejected by the compiler front-end for
-       * using this construct.  This allows useful things such as using a loop
-       * counter as the index to an array of samplers.  If the loop in unrolled,
-       * the code should compile correctly.  Instead, emit a warning.
-       */
-      if (array->type->is_array() &&
-          array->type->element_type()->is_sampler() &&
-          const_index == NULL) {
-
-	 if (state->language_version == 100) {
-	    _mesa_glsl_warning(&loc, state,
-			       "sampler arrays indexed with non-constant "
-			       "expressions is optional in GLSL ES 1.00");
-	 } else if (state->language_version < 130) {
-	    _mesa_glsl_warning(&loc, state,
-			       "sampler arrays indexed with non-constant "
-			       "expressions is forbidden in GLSL 1.30 and "
-			       "later");
-	 } else {
-	    _mesa_glsl_error(&loc, state,
-			     "sampler arrays indexed with non-constant "
-			     "expressions is forbidden in GLSL 1.30 and "
-			     "later");
-	    error_emitted = true;
-	 }
-      }
-
-      if (error_emitted)
-	 result->type = glsl_type::error_type;
-
-      type = result->type;
-      break;
-   }
-
-   case ast_function_call:
-      /* Should *NEVER* get here.  ast_function_call should always be handled
-       * by ast_function_expression::hir.
-       */
-      assert(0);
-      break;
-
-   case ast_identifier: {
-      /* ast_identifier can appear several places in a full abstract syntax
-       * tree.  This particular use must be at location specified in the grammar
-       * as 'variable_identifier'.
-       */
-      ir_variable *var = 
-	 state->symbols->get_variable(this->primary_expression.identifier);
-
-      result = new(ctx) ir_dereference_variable(var);
-
-      if (var != NULL) {
-	 var->used = true;
-	 type = result->type;
-      } else {
-	 _mesa_glsl_error(& loc, state, "`%s' undeclared",
-			  this->primary_expression.identifier);
-
-	 error_emitted = true;
-      }
-      break;
-   }
-
-   case ast_int_constant:
-      type = glsl_type::int_type;
-      result = new(ctx) ir_constant(this->primary_expression.int_constant);
-      break;
-
-   case ast_uint_constant:
-      type = glsl_type::uint_type;
-      result = new(ctx) ir_constant(this->primary_expression.uint_constant);
-      break;
-
-   case ast_float_constant:
-      type = glsl_type::float_type;
-      result = new(ctx) ir_constant(this->primary_expression.float_constant);
-      break;
-
-   case ast_bool_constant:
-      type = glsl_type::bool_type;
-      result = new(ctx) ir_constant(bool(this->primary_expression.bool_constant));
-      break;
-
-   case ast_sequence: {
-      /* It should not be possible to generate a sequence in the AST without
-       * any expressions in it.
-       */
-      assert(!this->expressions.is_empty());
-
-      /* The r-value of a sequence is the last expression in the sequence.  If
-       * the other expressions in the sequence do not have side-effects (and
-       * therefore add instructions to the instruction list), they get dropped
-       * on the floor.
-       */
-      foreach_list_typed (ast_node, ast, link, &this->expressions)
-	 result = ast->hir(instructions, state);
-
-      type = result->type;
-
-      /* Any errors should have already been emitted in the loop above.
-       */
-      error_emitted = true;
-      break;
-   }
-   }
-
-   if (type->is_error() && !error_emitted)
-      _mesa_glsl_error(& loc, state, "type mismatch");
-
-   return result;
-}
-
-
-ir_rvalue *
-ast_expression_statement::hir(exec_list *instructions,
-			      struct _mesa_glsl_parse_state *state)
-{
-   /* It is possible to have expression statements that don't have an
-    * expression.  This is the solitary semicolon:
-    *
-    * for (i = 0; i < 5; i++)
-    *     ;
-    *
-    * In this case the expression will be NULL.  Test for NULL and don't do
-    * anything in that case.
-    */
-   if (expression != NULL)
-      expression->hir(instructions, state);
-
-   /* Statements do not have r-values.
-    */
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_compound_statement::hir(exec_list *instructions,
-			    struct _mesa_glsl_parse_state *state)
-{
-   if (new_scope)
-      state->symbols->push_scope();
-
-   foreach_list_typed (ast_node, ast, link, &this->statements)
-      ast->hir(instructions, state);
-
-   if (new_scope)
-      state->symbols->pop_scope();
-
-   /* Compound statements do not have r-values.
-    */
-   return NULL;
-}
-
-
-static const glsl_type *
-process_array_type(YYLTYPE *loc, const glsl_type *base, ast_node *array_size,
-		   struct _mesa_glsl_parse_state *state)
-{
-   unsigned length = 0;
-
-   /* FINISHME: Reject delcarations of multidimensional arrays. */
-
-   if (array_size != NULL) {
-      exec_list dummy_instructions;
-      ir_rvalue *const ir = array_size->hir(& dummy_instructions, state);
-      YYLTYPE loc = array_size->get_location();
-
-      /* FINISHME: Verify that the grammar forbids side-effects in array
-       * FINISHME: sizes.   i.e., 'vec4 [x = 12] data'
-       */
-      assert(dummy_instructions.is_empty());
-
-      if (ir != NULL) {
-	 if (!ir->type->is_integer()) {
-	    _mesa_glsl_error(& loc, state, "array size must be integer type");
-	 } else if (!ir->type->is_scalar()) {
-	    _mesa_glsl_error(& loc, state, "array size must be scalar type");
-	 } else {
-	    ir_constant *const size = ir->constant_expression_value();
-
-	    if (size == NULL) {
-	       _mesa_glsl_error(& loc, state, "array size must be a "
-				"constant valued expression");
-	    } else if (size->value.i[0] <= 0) {
-	       _mesa_glsl_error(& loc, state, "array size must be > 0");
-	    } else {
-	       assert(size->type == ir->type);
-	       length = size->value.u[0];
-	    }
-	 }
-      }
-   } else if (state->es_shader) {
-      /* Section 10.17 of the GLSL ES 1.00 specification states that unsized
-       * array declarations have been removed from the language.
-       */
-      _mesa_glsl_error(loc, state, "unsized array declarations are not "
-		       "allowed in GLSL ES 1.00.");
-   }
-
-   return glsl_type::get_array_instance(base, length);
-}
-
-
-const glsl_type *
-ast_type_specifier::glsl_type(const char **name,
-			      struct _mesa_glsl_parse_state *state) const
-{
-   const struct glsl_type *type;
-
-   type = state->symbols->get_type(this->type_name);
-   *name = this->type_name;
-
-   if (this->is_array) {
-      YYLTYPE loc = this->get_location();
-      type = process_array_type(&loc, type, this->array_size, state);
-   }
-
-   return type;
-}
-
-
-static void
-apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
-				 ir_variable *var,
-				 struct _mesa_glsl_parse_state *state,
-				 YYLTYPE *loc)
-{
-   if (qual->flags.q.invariant) {
-      if (var->used) {
-	 _mesa_glsl_error(loc, state,
-			  "variable `%s' may not be redeclared "
-			  "`invariant' after being used",
-			  var->name);
-      } else {
-	 var->invariant = 1;
-      }
-   }
-
-   if (qual->flags.q.constant || qual->flags.q.attribute
-       || qual->flags.q.uniform
-       || (qual->flags.q.varying && (state->target == fragment_shader)))
-      var->read_only = 1;
-
-   if (qual->flags.q.centroid)
-      var->centroid = 1;
-
-   if (qual->flags.q.attribute && state->target != vertex_shader) {
-      var->type = glsl_type::error_type;
-      _mesa_glsl_error(loc, state,
-		       "`attribute' variables may not be declared in the "
-		       "%s shader",
-		       _mesa_glsl_shader_target_name(state->target));
-   }
-
-   /* From page 25 (page 31 of the PDF) of the GLSL 1.10 spec:
-    *
-    *     "The varying qualifier can be used only with the data types
-    *     float, vec2, vec3, vec4, mat2, mat3, and mat4, or arrays of
-    *     these."
-    */
-   if (qual->flags.q.varying) {
-      const glsl_type *non_array_type;
-
-      if (var->type && var->type->is_array())
-	 non_array_type = var->type->fields.array;
-      else
-	 non_array_type = var->type;
-
-      if (non_array_type && non_array_type->base_type != GLSL_TYPE_FLOAT) {
-	 var->type = glsl_type::error_type;
-	 _mesa_glsl_error(loc, state,
-			  "varying variables must be of base type float");
-      }
-   }
-
-   /* If there is no qualifier that changes the mode of the variable, leave
-    * the setting alone.
-    */
-   if (qual->flags.q.in && qual->flags.q.out)
-      var->mode = ir_var_inout;
-   else if (qual->flags.q.attribute || qual->flags.q.in
-	    || (qual->flags.q.varying && (state->target == fragment_shader)))
-      var->mode = ir_var_in;
-   else if (qual->flags.q.out
-	    || (qual->flags.q.varying && (state->target == vertex_shader)))
-      var->mode = ir_var_out;
-   else if (qual->flags.q.uniform)
-      var->mode = ir_var_uniform;
-
-   if (state->all_invariant && (state->current_function == NULL)) {
-      switch (state->target) {
-      case vertex_shader:
-	 if (var->mode == ir_var_out)
-	    var->invariant = true;
-	 break;
-      case geometry_shader:
-	 if ((var->mode == ir_var_in) || (var->mode == ir_var_out))
-	    var->invariant = true;
-	 break;
-      case fragment_shader:
-	 if (var->mode == ir_var_in)
-	    var->invariant = true;
-	 break;
-      }
-   }
-
-   if (qual->flags.q.flat)
-      var->interpolation = ir_var_flat;
-   else if (qual->flags.q.noperspective)
-      var->interpolation = ir_var_noperspective;
-   else
-      var->interpolation = ir_var_smooth;
-
-   var->pixel_center_integer = qual->flags.q.pixel_center_integer;
-   var->origin_upper_left = qual->flags.q.origin_upper_left;
-   if ((qual->flags.q.origin_upper_left || qual->flags.q.pixel_center_integer)
-       && (strcmp(var->name, "gl_FragCoord") != 0)) {
-      const char *const qual_string = (qual->flags.q.origin_upper_left)
-	 ? "origin_upper_left" : "pixel_center_integer";
-
-      _mesa_glsl_error(loc, state,
-		       "layout qualifier `%s' can only be applied to "
-		       "fragment shader input `gl_FragCoord'",
-		       qual_string);
-   }
-
-   if (qual->flags.q.explicit_location) {
-      const bool global_scope = (state->current_function == NULL);
-      bool fail = false;
-      const char *string = "";
-
-      /* In the vertex shader only shader inputs can be given explicit
-       * locations.
-       *
-       * In the fragment shader only shader outputs can be given explicit
-       * locations.
-       */
-      switch (state->target) {
-      case vertex_shader:
-	 if (!global_scope || (var->mode != ir_var_in)) {
-	    fail = true;
-	    string = "input";
-	 }
-	 break;
-
-      case geometry_shader:
-	 _mesa_glsl_error(loc, state,
-			  "geometry shader variables cannot be given "
-			  "explicit locations\n");
-	 break;
-
-      case fragment_shader:
-	 if (!global_scope || (var->mode != ir_var_in)) {
-	    fail = true;
-	    string = "output";
-	 }
-	 break;
-      };
-
-      if (fail) {
-	 _mesa_glsl_error(loc, state,
-			  "only %s shader %s variables can be given an "
-			  "explicit location\n",
-			  _mesa_glsl_shader_target_name(state->target),
-			  string);
-      } else {
-	 var->explicit_location = true;
-
-	 /* This bit of silliness is needed because invalid explicit locations
-	  * are supposed to be flagged during linking.  Small negative values
-	  * biased by VERT_ATTRIB_GENERIC0 or FRAG_RESULT_DATA0 could alias
-	  * built-in values (e.g., -16+VERT_ATTRIB_GENERIC0 = VERT_ATTRIB_POS).
-	  * The linker needs to be able to differentiate these cases.  This
-	  * ensures that negative values stay negative.
-	  */
-	 if (qual->location >= 0) {
-	    var->location = (state->target == vertex_shader)
-	       ? (qual->location + VERT_ATTRIB_GENERIC0)
-	       : (qual->location + FRAG_RESULT_DATA0);
-	 } else {
-	    var->location = qual->location;
-	 }
-      }
-   }
-
-   /* Does the declaration use the 'layout' keyword?
-    */
-   const bool uses_layout = qual->flags.q.pixel_center_integer
-      || qual->flags.q.origin_upper_left
-      || qual->flags.q.explicit_location;
-
-   /* Does the declaration use the deprecated 'attribute' or 'varying'
-    * keywords?
-    */
-   const bool uses_deprecated_qualifier = qual->flags.q.attribute
-      || qual->flags.q.varying;
-
-   /* Is the 'layout' keyword used with parameters that allow relaxed checking.
-    * Many implementations of GL_ARB_fragment_coord_conventions_enable and some
-    * implementations (only Mesa?) GL_ARB_explicit_attrib_location_enable
-    * allowed the layout qualifier to be used with 'varying' and 'attribute'.
-    * These extensions and all following extensions that add the 'layout'
-    * keyword have been modified to require the use of 'in' or 'out'.
-    *
-    * The following extension do not allow the deprecated keywords:
-    *
-    *    GL_AMD_conservative_depth
-    *    GL_ARB_gpu_shader5
-    *    GL_ARB_separate_shader_objects
-    *    GL_ARB_tesselation_shader
-    *    GL_ARB_transform_feedback3
-    *    GL_ARB_uniform_buffer_object
-    *
-    * It is unknown whether GL_EXT_shader_image_load_store or GL_NV_gpu_shader5
-    * allow layout with the deprecated keywords.
-    */
-   const bool relaxed_layout_qualifier_checking =
-      state->ARB_fragment_coord_conventions_enable;
-
-   if (uses_layout && uses_deprecated_qualifier) {
-      if (relaxed_layout_qualifier_checking) {
-	 _mesa_glsl_warning(loc, state,
-			    "`layout' qualifier may not be used with "
-			    "`attribute' or `varying'");
-      } else {
-	 _mesa_glsl_error(loc, state,
-			  "`layout' qualifier may not be used with "
-			  "`attribute' or `varying'");
-      }
-   }
-
-   /* Layout qualifiers for gl_FragDepth, which are enabled by extension
-    * AMD_conservative_depth.
-    */
-   int depth_layout_count = qual->flags.q.depth_any
-      + qual->flags.q.depth_greater
-      + qual->flags.q.depth_less
-      + qual->flags.q.depth_unchanged;
-   if (depth_layout_count > 0
-       && !state->AMD_conservative_depth_enable) {
-       _mesa_glsl_error(loc, state,
-                        "extension GL_AMD_conservative_depth must be enabled "
-			"to use depth layout qualifiers");
-   } else if (depth_layout_count > 0
-              && strcmp(var->name, "gl_FragDepth") != 0) {
-       _mesa_glsl_error(loc, state,
-                        "depth layout qualifiers can be applied only to "
-                        "gl_FragDepth");
-   } else if (depth_layout_count > 1
-              && strcmp(var->name, "gl_FragDepth") == 0) {
-      _mesa_glsl_error(loc, state,
-                       "at most one depth layout qualifier can be applied to "
-                       "gl_FragDepth");
-   }
-   if (qual->flags.q.depth_any)
-      var->depth_layout = ir_depth_layout_any;
-   else if (qual->flags.q.depth_greater)
-      var->depth_layout = ir_depth_layout_greater;
-   else if (qual->flags.q.depth_less)
-      var->depth_layout = ir_depth_layout_less;
-   else if (qual->flags.q.depth_unchanged)
-       var->depth_layout = ir_depth_layout_unchanged;
-   else
-       var->depth_layout = ir_depth_layout_none;
-
-   if (var->type->is_array() && state->language_version != 110) {
-      var->array_lvalue = true;
-   }
-}
-
-/**
- * Get the variable that is being redeclared by this declaration
- *
- * Semantic checks to verify the validity of the redeclaration are also
- * performed.  If semantic checks fail, compilation error will be emitted via
- * \c _mesa_glsl_error, but a non-\c NULL pointer will still be returned.
- *
- * \returns
- * A pointer to an existing variable in the current scope if the declaration
- * is a redeclaration, \c NULL otherwise.
- */
-ir_variable *
-get_variable_being_redeclared(ir_variable *var, ast_declaration *decl,
-			      struct _mesa_glsl_parse_state *state)
-{
-   /* Check if this declaration is actually a re-declaration, either to
-    * resize an array or add qualifiers to an existing variable.
-    *
-    * This is allowed for variables in the current scope, or when at
-    * global scope (for built-ins in the implicit outer scope).
-    */
-   ir_variable *earlier = state->symbols->get_variable(decl->identifier);
-   if (earlier == NULL ||
-       (state->current_function != NULL &&
-	!state->symbols->name_declared_this_scope(decl->identifier))) {
-      return NULL;
-   }
-
-
-   YYLTYPE loc = decl->get_location();
-
-   /* From page 24 (page 30 of the PDF) of the GLSL 1.50 spec,
-    *
-    * "It is legal to declare an array without a size and then
-    *  later re-declare the same name as an array of the same
-    *  type and specify a size."
-    */
-   if ((earlier->type->array_size() == 0)
-       && var->type->is_array()
-       && (var->type->element_type() == earlier->type->element_type())) {
-      /* FINISHME: This doesn't match the qualifiers on the two
-       * FINISHME: declarations.  It's not 100% clear whether this is
-       * FINISHME: required or not.
-       */
-
-      /* From page 54 (page 60 of the PDF) of the GLSL 1.20 spec:
-       *
-       *     "The size [of gl_TexCoord] can be at most
-       *     gl_MaxTextureCoords."
-       */
-      const unsigned size = unsigned(var->type->array_size());
-      if ((strcmp("gl_TexCoord", var->name) == 0)
-	  && (size > state->Const.MaxTextureCoords)) {
-	 _mesa_glsl_error(& loc, state, "`gl_TexCoord' array size cannot "
-			  "be larger than gl_MaxTextureCoords (%u)\n",
-			  state->Const.MaxTextureCoords);
-      } else if ((size > 0) && (size <= earlier->max_array_access)) {
-	 _mesa_glsl_error(& loc, state, "array size must be > %u due to "
-			  "previous access",
-			  earlier->max_array_access);
-      }
-
-      earlier->type = var->type;
-      delete var;
-      var = NULL;
-   } else if (state->ARB_fragment_coord_conventions_enable
-	      && strcmp(var->name, "gl_FragCoord") == 0
-	      && earlier->type == var->type
-	      && earlier->mode == var->mode) {
-      /* Allow redeclaration of gl_FragCoord for ARB_fcc layout
-       * qualifiers.
-       */
-      earlier->origin_upper_left = var->origin_upper_left;
-      earlier->pixel_center_integer = var->pixel_center_integer;
-
-      /* According to section 4.3.7 of the GLSL 1.30 spec,
-       * the following built-in varaibles can be redeclared with an
-       * interpolation qualifier:
-       *    * gl_FrontColor
-       *    * gl_BackColor
-       *    * gl_FrontSecondaryColor
-       *    * gl_BackSecondaryColor
-       *    * gl_Color
-       *    * gl_SecondaryColor
-       */
-   } else if (state->language_version >= 130
-	      && (strcmp(var->name, "gl_FrontColor") == 0
-		  || strcmp(var->name, "gl_BackColor") == 0
-		  || strcmp(var->name, "gl_FrontSecondaryColor") == 0
-		  || strcmp(var->name, "gl_BackSecondaryColor") == 0
-		  || strcmp(var->name, "gl_Color") == 0
-		  || strcmp(var->name, "gl_SecondaryColor") == 0)
-	      && earlier->type == var->type
-	      && earlier->mode == var->mode) {
-      earlier->interpolation = var->interpolation;
-
-      /* Layout qualifiers for gl_FragDepth. */
-   } else if (state->AMD_conservative_depth_enable
-	      && strcmp(var->name, "gl_FragDepth") == 0
-	      && earlier->type == var->type
-	      && earlier->mode == var->mode) {
-
-      /** From the AMD_conservative_depth spec:
-       *     Within any shader, the first redeclarations of gl_FragDepth
-       *     must appear before any use of gl_FragDepth.
-       */
-      if (earlier->used) {
-	 _mesa_glsl_error(&loc, state,
-			  "the first redeclaration of gl_FragDepth "
-			  "must appear before any use of gl_FragDepth");
-      }
-
-      /* Prevent inconsistent redeclaration of depth layout qualifier. */
-      if (earlier->depth_layout != ir_depth_layout_none
-	  && earlier->depth_layout != var->depth_layout) {
-	 _mesa_glsl_error(&loc, state,
-			  "gl_FragDepth: depth layout is declared here "
-			  "as '%s, but it was previously declared as "
-			  "'%s'",
-			  depth_layout_string(var->depth_layout),
-			  depth_layout_string(earlier->depth_layout));
-      }
-
-      earlier->depth_layout = var->depth_layout;
-
-   } else {
-      _mesa_glsl_error(&loc, state, "`%s' redeclared", decl->identifier);
-   }
-
-   return earlier;
-}
-
-/**
- * Generate the IR for an initializer in a variable declaration
- */
-ir_rvalue *
-process_initializer(ir_variable *var, ast_declaration *decl,
-		    ast_fully_specified_type *type,
-		    exec_list *initializer_instructions,
-		    struct _mesa_glsl_parse_state *state)
-{
-   ir_rvalue *result = NULL;
-
-   YYLTYPE initializer_loc = decl->initializer->get_location();
-
-   /* From page 24 (page 30 of the PDF) of the GLSL 1.10 spec:
-    *
-    *    "All uniform variables are read-only and are initialized either
-    *    directly by an application via API commands, or indirectly by
-    *    OpenGL."
-    */
-   if ((state->language_version <= 110)
-       && (var->mode == ir_var_uniform)) {
-      _mesa_glsl_error(& initializer_loc, state,
-		       "cannot initialize uniforms in GLSL 1.10");
-   }
-
-   if (var->type->is_sampler()) {
-      _mesa_glsl_error(& initializer_loc, state,
-		       "cannot initialize samplers");
-   }
-
-   if ((var->mode == ir_var_in) && (state->current_function == NULL)) {
-      _mesa_glsl_error(& initializer_loc, state,
-		       "cannot initialize %s shader input / %s",
-		       _mesa_glsl_shader_target_name(state->target),
-		       (state->target == vertex_shader)
-		       ? "attribute" : "varying");
-   }
-
-   ir_dereference *const lhs = new(state) ir_dereference_variable(var);
-   ir_rvalue *rhs = decl->initializer->hir(initializer_instructions,
-					   state);
-
-   /* Calculate the constant value if this is a const or uniform
-    * declaration.
-    */
-   if (type->qualifier.flags.q.constant
-       || type->qualifier.flags.q.uniform) {
-      ir_rvalue *new_rhs = validate_assignment(state, var->type, rhs, true);
-      if (new_rhs != NULL) {
-	 rhs = new_rhs;
-
-	 ir_constant *constant_value = rhs->constant_expression_value();
-	 if (!constant_value) {
-	    _mesa_glsl_error(& initializer_loc, state,
-			     "initializer of %s variable `%s' must be a "
-			     "constant expression",
-			     (type->qualifier.flags.q.constant)
-			     ? "const" : "uniform",
-			     decl->identifier);
-	    if (var->type->is_numeric()) {
-	       /* Reduce cascading errors. */
-	       var->constant_value = ir_constant::zero(state, var->type);
-	    }
-	 } else {
-	    rhs = constant_value;
-	    var->constant_value = constant_value;
-	 }
-      } else {
-	 _mesa_glsl_error(&initializer_loc, state,
-			  "initializer of type %s cannot be assigned to "
-			  "variable of type %s",
-			  rhs->type->name, var->type->name);
-	 if (var->type->is_numeric()) {
-	    /* Reduce cascading errors. */
-	    var->constant_value = ir_constant::zero(state, var->type);
-	 }
-      }
-   }
-
-   if (rhs && !rhs->type->is_error()) {
-      bool temp = var->read_only;
-      if (type->qualifier.flags.q.constant)
-	 var->read_only = false;
-
-      /* Never emit code to initialize a uniform.
-       */
-      const glsl_type *initializer_type;
-      if (!type->qualifier.flags.q.uniform) {
-	 result = do_assignment(initializer_instructions, state,
-				lhs, rhs, true,
-				type->get_location());
-	 initializer_type = result->type;
-      } else
-	 initializer_type = rhs->type;
-
-      /* If the declared variable is an unsized array, it must inherrit
-       * its full type from the initializer.  A declaration such as
-       *
-       *     uniform float a[] = float[](1.0, 2.0, 3.0, 3.0);
-       *
-       * becomes
-       *
-       *     uniform float a[4] = float[](1.0, 2.0, 3.0, 3.0);
-       *
-       * The assignment generated in the if-statement (below) will also
-       * automatically handle this case for non-uniforms.
-       *
-       * If the declared variable is not an array, the types must
-       * already match exactly.  As a result, the type assignment
-       * here can be done unconditionally.  For non-uniforms the call
-       * to do_assignment can change the type of the initializer (via
-       * the implicit conversion rules).  For uniforms the initializer
-       * must be a constant expression, and the type of that expression
-       * was validated above.
-       */
-      var->type = initializer_type;
-
-      var->read_only = temp;
-   }
-
-   return result;
-}
-
-ir_rvalue *
-ast_declarator_list::hir(exec_list *instructions,
-			 struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   const struct glsl_type *decl_type;
-   const char *type_name = NULL;
-   ir_rvalue *result = NULL;
-   YYLTYPE loc = this->get_location();
-
-   /* From page 46 (page 52 of the PDF) of the GLSL 1.50 spec:
-    *
-    *     "To ensure that a particular output variable is invariant, it is
-    *     necessary to use the invariant qualifier. It can either be used to
-    *     qualify a previously declared variable as being invariant
-    *
-    *         invariant gl_Position; // make existing gl_Position be invariant"
-    *
-    * In these cases the parser will set the 'invariant' flag in the declarator
-    * list, and the type will be NULL.
-    */
-   if (this->invariant) {
-      assert(this->type == NULL);
-
-      if (state->current_function != NULL) {
-	 _mesa_glsl_error(& loc, state,
-			  "All uses of `invariant' keyword must be at global "
-			  "scope\n");
-      }
-
-      foreach_list_typed (ast_declaration, decl, link, &this->declarations) {
-	 assert(!decl->is_array);
-	 assert(decl->array_size == NULL);
-	 assert(decl->initializer == NULL);
-
-	 ir_variable *const earlier =
-	    state->symbols->get_variable(decl->identifier);
-	 if (earlier == NULL) {
-	    _mesa_glsl_error(& loc, state,
-			     "Undeclared variable `%s' cannot be marked "
-			     "invariant\n", decl->identifier);
-	 } else if ((state->target == vertex_shader)
-	       && (earlier->mode != ir_var_out)) {
-	    _mesa_glsl_error(& loc, state,
-			     "`%s' cannot be marked invariant, vertex shader "
-			     "outputs only\n", decl->identifier);
-	 } else if ((state->target == fragment_shader)
-	       && (earlier->mode != ir_var_in)) {
-	    _mesa_glsl_error(& loc, state,
-			     "`%s' cannot be marked invariant, fragment shader "
-			     "inputs only\n", decl->identifier);
-	 } else if (earlier->used) {
-	    _mesa_glsl_error(& loc, state,
-			     "variable `%s' may not be redeclared "
-			     "`invariant' after being used",
-			     earlier->name);
-	 } else {
-	    earlier->invariant = true;
-	 }
-      }
-
-      /* Invariant redeclarations do not have r-values.
-       */
-      return NULL;
-   }
-
-   assert(this->type != NULL);
-   assert(!this->invariant);
-
-   /* The type specifier may contain a structure definition.  Process that
-    * before any of the variable declarations.
-    */
-   (void) this->type->specifier->hir(instructions, state);
-
-   decl_type = this->type->specifier->glsl_type(& type_name, state);
-   if (this->declarations.is_empty()) {
-      /* The only valid case where the declaration list can be empty is when
-       * the declaration is setting the default precision of a built-in type
-       * (e.g., 'precision highp vec4;').
-       */
-
-      if (decl_type != NULL) {
-      } else {
-	    _mesa_glsl_error(& loc, state, "incomplete declaration");
-      }
-   }
-
-   foreach_list_typed (ast_declaration, decl, link, &this->declarations) {
-      const struct glsl_type *var_type;
-      ir_variable *var;
-
-      /* FINISHME: Emit a warning if a variable declaration shadows a
-       * FINISHME: declaration at a higher scope.
-       */
-
-      if ((decl_type == NULL) || decl_type->is_void()) {
-	 if (type_name != NULL) {
-	    _mesa_glsl_error(& loc, state,
-			     "invalid type `%s' in declaration of `%s'",
-			     type_name, decl->identifier);
-	 } else {
-	    _mesa_glsl_error(& loc, state,
-			     "invalid type in declaration of `%s'",
-			     decl->identifier);
-	 }
-	 continue;
-      }
-
-      if (decl->is_array) {
-	 var_type = process_array_type(&loc, decl_type, decl->array_size,
-				       state);
-      } else {
-	 var_type = decl_type;
-      }
-
-      var = new(ctx) ir_variable(var_type, decl->identifier, ir_var_auto);
-
-      /* From page 22 (page 28 of the PDF) of the GLSL 1.10 specification;
-       *
-       *     "Global variables can only use the qualifiers const,
-       *     attribute, uni form, or varying. Only one may be
-       *     specified.
-       *
-       *     Local variables can only use the qualifier const."
-       *
-       * This is relaxed in GLSL 1.30.  It is also relaxed by any extension
-       * that adds the 'layout' keyword.
-       */
-      if ((state->language_version < 130)
-	  && !state->ARB_explicit_attrib_location_enable
-	  && !state->ARB_fragment_coord_conventions_enable) {
-	 if (this->type->qualifier.flags.q.out) {
-	    _mesa_glsl_error(& loc, state,
-			     "`out' qualifier in declaration of `%s' "
-			     "only valid for function parameters in %s.",
-			     decl->identifier, state->version_string);
-	 }
-	 if (this->type->qualifier.flags.q.in) {
-	    _mesa_glsl_error(& loc, state,
-			     "`in' qualifier in declaration of `%s' "
-			     "only valid for function parameters in %s.",
-			     decl->identifier, state->version_string);
-	 }
-	 /* FINISHME: Test for other invalid qualifiers. */
-      }
-
-      apply_type_qualifier_to_variable(& this->type->qualifier, var, state,
-				       & loc);
-
-      if (this->type->qualifier.flags.q.invariant) {
-	 if ((state->target == vertex_shader) && !(var->mode == ir_var_out ||
-						   var->mode == ir_var_inout)) {
-	    /* FINISHME: Note that this doesn't work for invariant on
-	     * a function signature outval
-	     */
-	    _mesa_glsl_error(& loc, state,
-			     "`%s' cannot be marked invariant, vertex shader "
-			     "outputs only\n", var->name);
-	 } else if ((state->target == fragment_shader) &&
-		    !(var->mode == ir_var_in || var->mode == ir_var_inout)) {
-	    /* FINISHME: Note that this doesn't work for invariant on
-	     * a function signature inval
-	     */
-	    _mesa_glsl_error(& loc, state,
-			     "`%s' cannot be marked invariant, fragment shader "
-			     "inputs only\n", var->name);
-	 }
-      }
-
-      if (state->current_function != NULL) {
-	 const char *mode = NULL;
-	 const char *extra = "";
-
-	 /* There is no need to check for 'inout' here because the parser will
-	  * only allow that in function parameter lists.
-	  */
-	 if (this->type->qualifier.flags.q.attribute) {
-	    mode = "attribute";
-	 } else if (this->type->qualifier.flags.q.uniform) {
-	    mode = "uniform";
-	 } else if (this->type->qualifier.flags.q.varying) {
-	    mode = "varying";
-	 } else if (this->type->qualifier.flags.q.in) {
-	    mode = "in";
-	    extra = " or in function parameter list";
-	 } else if (this->type->qualifier.flags.q.out) {
-	    mode = "out";
-	    extra = " or in function parameter list";
-	 }
-
-	 if (mode) {
-	    _mesa_glsl_error(& loc, state,
-			     "%s variable `%s' must be declared at "
-			     "global scope%s",
-			     mode, var->name, extra);
-	 }
-      } else if (var->mode == ir_var_in) {
-         var->read_only = true;
-
-	 if (state->target == vertex_shader) {
-	    bool error_emitted = false;
-
-	    /* From page 31 (page 37 of the PDF) of the GLSL 1.50 spec:
-	     *
-	     *    "Vertex shader inputs can only be float, floating-point
-	     *    vectors, matrices, signed and unsigned integers and integer
-	     *    vectors. Vertex shader inputs can also form arrays of these
-	     *    types, but not structures."
-	     *
-	     * From page 31 (page 27 of the PDF) of the GLSL 1.30 spec:
-	     *
-	     *    "Vertex shader inputs can only be float, floating-point
-	     *    vectors, matrices, signed and unsigned integers and integer
-	     *    vectors. They cannot be arrays or structures."
-	     *
-	     * From page 23 (page 29 of the PDF) of the GLSL 1.20 spec:
-	     *
-	     *    "The attribute qualifier can be used only with float,
-	     *    floating-point vectors, and matrices. Attribute variables
-	     *    cannot be declared as arrays or structures."
-	     */
-	    const glsl_type *check_type = var->type->is_array()
-	       ? var->type->fields.array : var->type;
-
-	    switch (check_type->base_type) {
-	    case GLSL_TYPE_FLOAT:
-	       break;
-	    case GLSL_TYPE_UINT:
-	    case GLSL_TYPE_INT:
-	       if (state->language_version > 120)
-		  break;
-	       /* FALLTHROUGH */
-	    default:
-	       _mesa_glsl_error(& loc, state,
-				"vertex shader input / attribute cannot have "
-				"type %s`%s'",
-				var->type->is_array() ? "array of " : "",
-				check_type->name);
-	       error_emitted = true;
-	    }
-
-	    if (!error_emitted && (state->language_version <= 130)
-		&& var->type->is_array()) {
-	       _mesa_glsl_error(& loc, state,
-				"vertex shader input / attribute cannot have "
-				"array type");
-	       error_emitted = true;
-	    }
-	 }
-      }
-
-      /* Integer vertex outputs must be qualified with 'flat'.
-       *
-       * From section 4.3.6 of the GLSL 1.30 spec:
-       *    "If a vertex output is a signed or unsigned integer or integer
-       *    vector, then it must be qualified with the interpolation qualifier
-       *    flat."
-       */
-      if (state->language_version >= 130
-          && state->target == vertex_shader
-          && state->current_function == NULL
-          && var->type->is_integer()
-          && var->mode == ir_var_out
-          && var->interpolation != ir_var_flat) {
-
-         _mesa_glsl_error(&loc, state, "If a vertex output is an integer, "
-                          "then it must be qualified with 'flat'");
-      }
-
-
-      /* Interpolation qualifiers cannot be applied to 'centroid' and
-       * 'centroid varying'.
-       *
-       * From page 29 (page 35 of the PDF) of the GLSL 1.30 spec:
-       *    "interpolation qualifiers may only precede the qualifiers in,
-       *    centroid in, out, or centroid out in a declaration. They do not apply
-       *    to the deprecated storage qualifiers varying or centroid varying."
-       */
-      if (state->language_version >= 130
-          && this->type->qualifier.has_interpolation()
-          && this->type->qualifier.flags.q.varying) {
-
-         const char *i = this->type->qualifier.interpolation_string();
-         assert(i != NULL);
-         const char *s;
-         if (this->type->qualifier.flags.q.centroid)
-            s = "centroid varying";
-         else
-            s = "varying";
-
-         _mesa_glsl_error(&loc, state,
-                          "qualifier '%s' cannot be applied to the "
-                          "deprecated storage qualifier '%s'", i, s);
-      }
-
-
-      /* Interpolation qualifiers can only apply to vertex shader outputs and
-       * fragment shader inputs.
-       *
-       * From page 29 (page 35 of the PDF) of the GLSL 1.30 spec:
-       *    "Outputs from a vertex shader (out) and inputs to a fragment
-       *    shader (in) can be further qualified with one or more of these
-       *    interpolation qualifiers"
-       */
-      if (state->language_version >= 130
-          && this->type->qualifier.has_interpolation()) {
-
-         const char *i = this->type->qualifier.interpolation_string();
-         assert(i != NULL);
-
-         switch (state->target) {
-         case vertex_shader:
-            if (this->type->qualifier.flags.q.in) {
-               _mesa_glsl_error(&loc, state,
-                                "qualifier '%s' cannot be applied to vertex "
-                                "shader inputs", i);
-            }
-            break;
-         case fragment_shader:
-            if (this->type->qualifier.flags.q.out) {
-               _mesa_glsl_error(&loc, state,
-                                "qualifier '%s' cannot be applied to fragment "
-                                "shader outputs", i);
-            }
-            break;
-         default:
-            assert(0);
-         }
-      }
-
-
-      /* From section 4.3.4 of the GLSL 1.30 spec:
-       *    "It is an error to use centroid in in a vertex shader."
-       */
-      if (state->language_version >= 130
-          && this->type->qualifier.flags.q.centroid
-          && this->type->qualifier.flags.q.in
-          && state->target == vertex_shader) {
-
-         _mesa_glsl_error(&loc, state,
-                          "'centroid in' cannot be used in a vertex shader");
-      }
-
-
-      /* Precision qualifiers exists only in GLSL versions 1.00 and >= 1.30.
-       */
-      if (this->type->specifier->precision != ast_precision_none
-          && state->language_version != 100
-          && state->language_version < 130) {
-
-         _mesa_glsl_error(&loc, state,
-                          "precision qualifiers are supported only in GLSL ES "
-                          "1.00, and GLSL 1.30 and later");
-      }
-
-
-      /* Precision qualifiers only apply to floating point and integer types.
-       *
-       * From section 4.5.2 of the GLSL 1.30 spec:
-       *    "Any floating point or any integer declaration can have the type
-       *    preceded by one of these precision qualifiers [...] Literal
-       *    constants do not have precision qualifiers. Neither do Boolean
-       *    variables.
-       *
-       * In GLSL ES, sampler types are also allowed.
-       *
-       * From page 87 of the GLSL ES spec:
-       *    "RESOLUTION: Allow sampler types to take a precision qualifier."
-       */
-      if (this->type->specifier->precision != ast_precision_none
-          && !var->type->is_float()
-          && !var->type->is_integer()
-          && !(var->type->is_sampler() && state->es_shader)
-          && !(var->type->is_array()
-               && (var->type->fields.array->is_float()
-                   || var->type->fields.array->is_integer()))) {
-
-         _mesa_glsl_error(&loc, state,
-                          "precision qualifiers apply only to floating point"
-                          "%s types", state->es_shader ? ", integer, and sampler"
-						       : "and integer");
-      }
-
-      /* Process the initializer and add its instructions to a temporary
-       * list.  This list will be added to the instruction stream (below) after
-       * the declaration is added.  This is done because in some cases (such as
-       * redeclarations) the declaration may not actually be added to the
-       * instruction stream.
-       */
-      exec_list initializer_instructions;
-      ir_variable *earlier = get_variable_being_redeclared(var, decl, state);
-
-      if (decl->initializer != NULL) {
-	 result = process_initializer((earlier == NULL) ? var : earlier,
-				      decl, this->type,
-				      &initializer_instructions, state);
-      }
-
-      /* From page 23 (page 29 of the PDF) of the GLSL 1.10 spec:
-       *
-       *     "It is an error to write to a const variable outside of
-       *      its declaration, so they must be initialized when
-       *      declared."
-       */
-      if (this->type->qualifier.flags.q.constant && decl->initializer == NULL) {
-	 _mesa_glsl_error(& loc, state,
-			  "const declaration of `%s' must be initialized",
-			  decl->identifier);
-      }
-
-      /* If the declaration is not a redeclaration, there are a few additional
-       * semantic checks that must be applied.  In addition, variable that was
-       * created for the declaration should be added to the IR stream.
-       */
-      if (earlier == NULL) {
-	 /* From page 15 (page 21 of the PDF) of the GLSL 1.10 spec,
-	  *
-	  *   "Identifiers starting with "gl_" are reserved for use by
-	  *   OpenGL, and may not be declared in a shader as either a
-	  *   variable or a function."
-	  */
-	 if (strncmp(decl->identifier, "gl_", 3) == 0)
-	    _mesa_glsl_error(& loc, state,
-			     "identifier `%s' uses reserved `gl_' prefix",
-			     decl->identifier);
-
-	 /* Add the variable to the symbol table.  Note that the initializer's
-	  * IR was already processed earlier (though it hasn't been emitted
-	  * yet), without the variable in scope.
-	  *
-	  * This differs from most C-like languages, but it follows the GLSL
-	  * specification.  From page 28 (page 34 of the PDF) of the GLSL 1.50
-	  * spec:
-	  *
-	  *     "Within a declaration, the scope of a name starts immediately
-	  *     after the initializer if present or immediately after the name
-	  *     being declared if not."
-	  */
-	 if (!state->symbols->add_variable(var)) {
-	    YYLTYPE loc = this->get_location();
-	    _mesa_glsl_error(&loc, state, "name `%s' already taken in the "
-			     "current scope", decl->identifier);
-	    continue;
-	 }
-
-	 /* Push the variable declaration to the top.  It means that all the
-	  * variable declarations will appear in a funny last-to-first order,
-	  * but otherwise we run into trouble if a function is prototyped, a
-	  * global var is decled, then the function is defined with usage of
-	  * the global var.  See glslparsertest's CorrectModule.frag.
-	  */
-	 instructions->push_head(var);
-      }
-
-      instructions->append_list(&initializer_instructions);
-   }
-
-
-   /* Generally, variable declarations do not have r-values.  However,
-    * one is used for the declaration in
-    *
-    * while (bool b = some_condition()) {
-    *   ...
-    * }
-    *
-    * so we return the rvalue from the last seen declaration here.
-    */
-   return result;
-}
-
-
-ir_rvalue *
-ast_parameter_declarator::hir(exec_list *instructions,
-			      struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   const struct glsl_type *type;
-   const char *name = NULL;
-   YYLTYPE loc = this->get_location();
-
-   type = this->type->specifier->glsl_type(& name, state);
-
-   if (type == NULL) {
-      if (name != NULL) {
-	 _mesa_glsl_error(& loc, state,
-			  "invalid type `%s' in declaration of `%s'",
-			  name, this->identifier);
-      } else {
-	 _mesa_glsl_error(& loc, state,
-			  "invalid type in declaration of `%s'",
-			  this->identifier);
-      }
-
-      type = glsl_type::error_type;
-   }
-
-   /* From page 62 (page 68 of the PDF) of the GLSL 1.50 spec:
-    *
-    *    "Functions that accept no input arguments need not use void in the
-    *    argument list because prototypes (or definitions) are required and
-    *    therefore there is no ambiguity when an empty argument list "( )" is
-    *    declared. The idiom "(void)" as a parameter list is provided for
-    *    convenience."
-    *
-    * Placing this check here prevents a void parameter being set up
-    * for a function, which avoids tripping up checks for main taking
-    * parameters and lookups of an unnamed symbol.
-    */
-   if (type->is_void()) {
-      if (this->identifier != NULL)
-	 _mesa_glsl_error(& loc, state,
-			  "named parameter cannot have type `void'");
-
-      is_void = true;
-      return NULL;
-   }
-
-   if (formal_parameter && (this->identifier == NULL)) {
-      _mesa_glsl_error(& loc, state, "formal parameter lacks a name");
-      return NULL;
-   }
-
-   /* This only handles "vec4 foo[..]".  The earlier specifier->glsl_type(...)
-    * call already handled the "vec4[..] foo" case.
-    */
-   if (this->is_array) {
-      type = process_array_type(&loc, type, this->array_size, state);
-   }
-
-   if (type->array_size() == 0) {
-      _mesa_glsl_error(&loc, state, "arrays passed as parameters must have "
-		       "a declared size.");
-      type = glsl_type::error_type;
-   }
-
-   is_void = false;
-   ir_variable *var = new(ctx) ir_variable(type, this->identifier, ir_var_in);
-
-   /* Apply any specified qualifiers to the parameter declaration.  Note that
-    * for function parameters the default mode is 'in'.
-    */
-   apply_type_qualifier_to_variable(& this->type->qualifier, var, state, & loc);
-
-   instructions->push_tail(var);
-
-   /* Parameter declarations do not have r-values.
-    */
-   return NULL;
-}
-
-
-void
-ast_parameter_declarator::parameters_to_hir(exec_list *ast_parameters,
-					    bool formal,
-					    exec_list *ir_parameters,
-					    _mesa_glsl_parse_state *state)
-{
-   ast_parameter_declarator *void_param = NULL;
-   unsigned count = 0;
-
-   foreach_list_typed (ast_parameter_declarator, param, link, ast_parameters) {
-      param->formal_parameter = formal;
-      param->hir(ir_parameters, state);
-
-      if (param->is_void)
-	 void_param = param;
-
-      count++;
-   }
-
-   if ((void_param != NULL) && (count > 1)) {
-      YYLTYPE loc = void_param->get_location();
-
-      _mesa_glsl_error(& loc, state,
-		       "`void' parameter must be only parameter");
-   }
-}
-
-
-void
-emit_function(_mesa_glsl_parse_state *state, exec_list *instructions,
-	      ir_function *f)
-{
-   /* Emit the new function header */
-   if (state->current_function == NULL) {
-      instructions->push_tail(f);
-   } else {
-      /* IR invariants disallow function declarations or definitions nested
-       * within other function definitions.  Insert the new ir_function
-       * block in the instruction sequence before the ir_function block
-       * containing the current ir_function_signature.
-       */
-      ir_function *const curr =
-	 const_cast<ir_function *>(state->current_function->function());
-
-      curr->insert_before(f);
-   }
-}
-
-
-ir_rvalue *
-ast_function::hir(exec_list *instructions,
-		  struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   ir_function *f = NULL;
-   ir_function_signature *sig = NULL;
-   exec_list hir_parameters;
-
-   const char *const name = identifier;
-
-   /* From page 21 (page 27 of the PDF) of the GLSL 1.20 spec,
-    *
-    *   "Function declarations (prototypes) cannot occur inside of functions;
-    *   they must be at global scope, or for the built-in functions, outside
-    *   the global scope."
-    *
-    * From page 27 (page 33 of the PDF) of the GLSL ES 1.00.16 spec,
-    *
-    *   "User defined functions may only be defined within the global scope."
-    *
-    * Note that this language does not appear in GLSL 1.10.
-    */
-   if ((state->current_function != NULL) && (state->language_version != 110)) {
-      YYLTYPE loc = this->get_location();
-      _mesa_glsl_error(&loc, state,
-		       "declaration of function `%s' not allowed within "
-		       "function body", name);
-   }
-
-   /* From page 15 (page 21 of the PDF) of the GLSL 1.10 spec,
-    *
-    *   "Identifiers starting with "gl_" are reserved for use by
-    *   OpenGL, and may not be declared in a shader as either a
-    *   variable or a function."
-    */
-   if (strncmp(name, "gl_", 3) == 0) {
-      YYLTYPE loc = this->get_location();
-      _mesa_glsl_error(&loc, state,
-		       "identifier `%s' uses reserved `gl_' prefix", name);
-   }
-
-   /* Convert the list of function parameters to HIR now so that they can be
-    * used below to compare this function's signature with previously seen
-    * signatures for functions with the same name.
-    */
-   ast_parameter_declarator::parameters_to_hir(& this->parameters,
-					       is_definition,
-					       & hir_parameters, state);
-
-   const char *return_type_name;
-   const glsl_type *return_type =
-      this->return_type->specifier->glsl_type(& return_type_name, state);
-
-   if (!return_type) {
-      YYLTYPE loc = this->get_location();
-      _mesa_glsl_error(&loc, state,
-		       "function `%s' has undeclared return type `%s'",
-		       name, return_type_name);
-      return_type = glsl_type::error_type;
-   }
-
-   /* From page 56 (page 62 of the PDF) of the GLSL 1.30 spec:
-    * "No qualifier is allowed on the return type of a function."
-    */
-   if (this->return_type->has_qualifiers()) {
-      YYLTYPE loc = this->get_location();
-      _mesa_glsl_error(& loc, state,
-		       "function `%s' return type has qualifiers", name);
-   }
-
-   /* Verify that this function's signature either doesn't match a previously
-    * seen signature for a function with the same name, or, if a match is found,
-    * that the previously seen signature does not have an associated definition.
-    */
-   f = state->symbols->get_function(name);
-   if (f != NULL && (state->es_shader || f->has_user_signature())) {
-      sig = f->exact_matching_signature(&hir_parameters);
-      if (sig != NULL) {
-	 const char *badvar = sig->qualifiers_match(&hir_parameters);
-	 if (badvar != NULL) {
-	    YYLTYPE loc = this->get_location();
-
-	    _mesa_glsl_error(&loc, state, "function `%s' parameter `%s' "
-			     "qualifiers don't match prototype", name, badvar);
-	 }
-
-	 if (sig->return_type != return_type) {
-	    YYLTYPE loc = this->get_location();
-
-	    _mesa_glsl_error(&loc, state, "function `%s' return type doesn't "
-			     "match prototype", name);
-	 }
-
-	 if (is_definition && sig->is_defined) {
-	    YYLTYPE loc = this->get_location();
-
-	    _mesa_glsl_error(& loc, state, "function `%s' redefined", name);
-	 }
-      }
-   } else {
-      f = new(ctx) ir_function(name);
-      if (!state->symbols->add_function(f)) {
-	 /* This function name shadows a non-function use of the same name. */
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(&loc, state, "function name `%s' conflicts with "
-			  "non-function", name);
-	 return NULL;
-      }
-
-      emit_function(state, instructions, f);
-   }
-
-   /* Verify the return type of main() */
-   if (strcmp(name, "main") == 0) {
-      if (! return_type->is_void()) {
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(& loc, state, "main() must return void");
-      }
-
-      if (!hir_parameters.is_empty()) {
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(& loc, state, "main() must not take any parameters");
-      }
-   }
-
-   /* Finish storing the information about this new function in its signature.
-    */
-   if (sig == NULL) {
-      sig = new(ctx) ir_function_signature(return_type);
-      f->add_signature(sig);
-   }
-
-   sig->replace_parameters(&hir_parameters);
-   signature = sig;
-
-   /* Function declarations (prototypes) do not have r-values.
-    */
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_function_definition::hir(exec_list *instructions,
-			     struct _mesa_glsl_parse_state *state)
-{
-   prototype->is_definition = true;
-   prototype->hir(instructions, state);
-
-   ir_function_signature *signature = prototype->signature;
-   if (signature == NULL)
-      return NULL;
-
-   assert(state->current_function == NULL);
-   state->current_function = signature;
-   state->found_return = false;
-
-   /* Duplicate parameters declared in the prototype as concrete variables.
-    * Add these to the symbol table.
-    */
-   state->symbols->push_scope();
-   foreach_iter(exec_list_iterator, iter, signature->parameters) {
-      ir_variable *const var = ((ir_instruction *) iter.get())->as_variable();
-
-      assert(var != NULL);
-
-      /* The only way a parameter would "exist" is if two parameters have
-       * the same name.
-       */
-      if (state->symbols->name_declared_this_scope(var->name)) {
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(& loc, state, "parameter `%s' redeclared", var->name);
-      } else {
-	 state->symbols->add_variable(var);
-      }
-   }
-
-   /* Convert the body of the function to HIR. */
-   this->body->hir(&signature->body, state);
-   signature->is_defined = true;
-
-   state->symbols->pop_scope();
-
-   assert(state->current_function == signature);
-   state->current_function = NULL;
-
-   if (!signature->return_type->is_void() && !state->found_return) {
-      YYLTYPE loc = this->get_location();
-      _mesa_glsl_error(& loc, state, "function `%s' has non-void return type "
-		       "%s, but no return statement",
-		       signature->function_name(),
-		       signature->return_type->name);
-   }
-
-   /* Function definitions do not have r-values.
-    */
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_jump_statement::hir(exec_list *instructions,
-			struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-
-   switch (mode) {
-   case ast_return: {
-      ir_return *inst;
-      assert(state->current_function);
-
-      if (opt_return_value) {
-	 ir_rvalue *const ret = opt_return_value->hir(instructions, state);
-
-	 /* The value of the return type can be NULL if the shader says
-	  * 'return foo();' and foo() is a function that returns void.
-	  *
-	  * NOTE: The GLSL spec doesn't say that this is an error.  The type
-	  * of the return value is void.  If the return type of the function is
-	  * also void, then this should compile without error.  Seriously.
-	  */
-	 const glsl_type *const ret_type =
-	    (ret == NULL) ? glsl_type::void_type : ret->type;
-
-	 /* Implicit conversions are not allowed for return values. */
-	 if (state->current_function->return_type != ret_type) {
-	    YYLTYPE loc = this->get_location();
-
-	    _mesa_glsl_error(& loc, state,
-			     "`return' with wrong type %s, in function `%s' "
-			     "returning %s",
-			     ret_type->name,
-			     state->current_function->function_name(),
-			     state->current_function->return_type->name);
-	 }
-
-	 inst = new(ctx) ir_return(ret);
-      } else {
-	 if (state->current_function->return_type->base_type !=
-	     GLSL_TYPE_VOID) {
-	    YYLTYPE loc = this->get_location();
-
-	    _mesa_glsl_error(& loc, state,
-			     "`return' with no value, in function %s returning "
-			     "non-void",
-			     state->current_function->function_name());
-	 }
-	 inst = new(ctx) ir_return;
-      }
-
-      state->found_return = true;
-      instructions->push_tail(inst);
-      break;
-   }
-
-   case ast_discard:
-      if (state->target != fragment_shader) {
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(& loc, state,
-			  "`discard' may only appear in a fragment shader");
-      }
-      instructions->push_tail(new(ctx) ir_discard);
-      break;
-
-   case ast_break:
-   case ast_continue:
-      /* FINISHME: Handle switch-statements.  They cannot contain 'continue',
-       * FINISHME: and they use a different IR instruction for 'break'.
-       */
-      /* FINISHME: Correctly handle the nesting.  If a switch-statement is
-       * FINISHME: inside a loop, a 'continue' is valid and will bind to the
-       * FINISHME: loop.
-       */
-      if (state->loop_or_switch_nesting == NULL) {
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(& loc, state,
-			  "`%s' may only appear in a loop",
-			  (mode == ast_break) ? "break" : "continue");
-      } else {
-	 ir_loop *const loop = state->loop_or_switch_nesting->as_loop();
-
-	 /* Inline the for loop expression again, since we don't know
-	  * where near the end of the loop body the normal copy of it
-	  * is going to be placed.
-	  */
-	 if (mode == ast_continue &&
-	     state->loop_or_switch_nesting_ast->rest_expression) {
-	    state->loop_or_switch_nesting_ast->rest_expression->hir(instructions,
-								    state);
-	 }
-
-	 if (loop != NULL) {
-	    ir_loop_jump *const jump =
-	       new(ctx) ir_loop_jump((mode == ast_break)
-				     ? ir_loop_jump::jump_break
-				     : ir_loop_jump::jump_continue);
-	    instructions->push_tail(jump);
-	 }
-      }
-
-      break;
-   }
-
-   /* Jump instructions do not have r-values.
-    */
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_selection_statement::hir(exec_list *instructions,
-			     struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-
-   ir_rvalue *const condition = this->condition->hir(instructions, state);
-
-   /* From page 66 (page 72 of the PDF) of the GLSL 1.50 spec:
-    *
-    *    "Any expression whose type evaluates to a Boolean can be used as the
-    *    conditional expression bool-expression. Vector types are not accepted
-    *    as the expression to if."
-    *
-    * The checks are separated so that higher quality diagnostics can be
-    * generated for cases where both rules are violated.
-    */
-   if (!condition->type->is_boolean() || !condition->type->is_scalar()) {
-      YYLTYPE loc = this->condition->get_location();
-
-      _mesa_glsl_error(& loc, state, "if-statement condition must be scalar "
-		       "boolean");
-   }
-
-   ir_if *const stmt = new(ctx) ir_if(condition);
-
-   if (then_statement != NULL) {
-      state->symbols->push_scope();
-      then_statement->hir(& stmt->then_instructions, state);
-      state->symbols->pop_scope();
-   }
-
-   if (else_statement != NULL) {
-      state->symbols->push_scope();
-      else_statement->hir(& stmt->else_instructions, state);
-      state->symbols->pop_scope();
-   }
-
-   instructions->push_tail(stmt);
-
-   /* if-statements do not have r-values.
-    */
-   return NULL;
-}
-
-
-void
-ast_iteration_statement::condition_to_hir(ir_loop *stmt,
-					  struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-
-   if (condition != NULL) {
-      ir_rvalue *const cond =
-	 condition->hir(& stmt->body_instructions, state);
-
-      if ((cond == NULL)
-	  || !cond->type->is_boolean() || !cond->type->is_scalar()) {
-	 YYLTYPE loc = condition->get_location();
-
-	 _mesa_glsl_error(& loc, state,
-			  "loop condition must be scalar boolean");
-      } else {
-	 /* As the first code in the loop body, generate a block that looks
-	  * like 'if (!condition) break;' as the loop termination condition.
-	  */
-	 ir_rvalue *const not_cond =
-	    new(ctx) ir_expression(ir_unop_logic_not, glsl_type::bool_type, cond,
-				   NULL);
-
-	 ir_if *const if_stmt = new(ctx) ir_if(not_cond);
-
-	 ir_jump *const break_stmt =
-	    new(ctx) ir_loop_jump(ir_loop_jump::jump_break);
-
-	 if_stmt->then_instructions.push_tail(break_stmt);
-	 stmt->body_instructions.push_tail(if_stmt);
-      }
-   }
-}
-
-
-ir_rvalue *
-ast_iteration_statement::hir(exec_list *instructions,
-			     struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-
-   /* For-loops and while-loops start a new scope, but do-while loops do not.
-    */
-   if (mode != ast_do_while)
-      state->symbols->push_scope();
-
-   if (init_statement != NULL)
-      init_statement->hir(instructions, state);
-
-   ir_loop *const stmt = new(ctx) ir_loop();
-   instructions->push_tail(stmt);
-
-   /* Track the current loop and / or switch-statement nesting.
-    */
-   ir_instruction *const nesting = state->loop_or_switch_nesting;
-   ast_iteration_statement *nesting_ast = state->loop_or_switch_nesting_ast;
-
-   state->loop_or_switch_nesting = stmt;
-   state->loop_or_switch_nesting_ast = this;
-
-   if (mode != ast_do_while)
-      condition_to_hir(stmt, state);
-
-   if (body != NULL)
-      body->hir(& stmt->body_instructions, state);
-
-   if (rest_expression != NULL)
-      rest_expression->hir(& stmt->body_instructions, state);
-
-   if (mode == ast_do_while)
-      condition_to_hir(stmt, state);
-
-   if (mode != ast_do_while)
-      state->symbols->pop_scope();
-
-   /* Restore previous nesting before returning.
-    */
-   state->loop_or_switch_nesting = nesting;
-   state->loop_or_switch_nesting_ast = nesting_ast;
-
-   /* Loops do not have r-values.
-    */
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_type_specifier::hir(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   if (!this->is_precision_statement && this->structure == NULL)
-      return NULL;
-
-   YYLTYPE loc = this->get_location();
-
-   if (this->precision != ast_precision_none
-       && state->language_version != 100
-       && state->language_version < 130) {
-      _mesa_glsl_error(&loc, state,
-                       "precision qualifiers exist only in "
-                       "GLSL ES 1.00, and GLSL 1.30 and later");
-      return NULL;
-   }
-   if (this->precision != ast_precision_none
-       && this->structure != NULL) {
-      _mesa_glsl_error(&loc, state,
-                       "precision qualifiers do not apply to structures");
-      return NULL;
-   }
-
-   /* If this is a precision statement, check that the type to which it is
-    * applied is either float or int.
-    *
-    * From section 4.5.3 of the GLSL 1.30 spec:
-    *    "The precision statement
-    *       precision precision-qualifier type;
-    *    can be used to establish a default precision qualifier. The type
-    *    field can be either int or float [...].  Any other types or
-    *    qualifiers will result in an error.
-    */
-   if (this->is_precision_statement) {
-      assert(this->precision != ast_precision_none);
-      assert(this->structure == NULL); /* The check for structures was
-                                        * performed above. */
-      if (this->is_array) {
-         _mesa_glsl_error(&loc, state,
-                          "default precision statements do not apply to "
-                          "arrays");
-         return NULL;
-      }
-      if (this->type_specifier != ast_float
-          && this->type_specifier != ast_int) {
-         _mesa_glsl_error(&loc, state,
-                          "default precision statements apply only to types "
-                          "float and int");
-         return NULL;
-      }
-
-      /* FINISHME: Translate precision statements into IR. */
-      return NULL;
-   }
-
-   if (this->structure != NULL)
-      return this->structure->hir(instructions, state);
-
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_struct_specifier::hir(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   unsigned decl_count = 0;
-
-   /* Make an initial pass over the list of structure fields to determine how
-    * many there are.  Each element in this list is an ast_declarator_list.
-    * This means that we actually need to count the number of elements in the
-    * 'declarations' list in each of the elements.
-    */
-   foreach_list_typed (ast_declarator_list, decl_list, link,
-		       &this->declarations) {
-      foreach_list_const (decl_ptr, & decl_list->declarations) {
-	 decl_count++;
-      }
-   }
-
-   /* Allocate storage for the structure fields and process the field
-    * declarations.  As the declarations are processed, try to also convert
-    * the types to HIR.  This ensures that structure definitions embedded in
-    * other structure definitions are processed.
-    */
-   glsl_struct_field *const fields = ralloc_array(state, glsl_struct_field,
-						  decl_count);
-
-   unsigned i = 0;
-   foreach_list_typed (ast_declarator_list, decl_list, link,
-		       &this->declarations) {
-      const char *type_name;
-
-      decl_list->type->specifier->hir(instructions, state);
-
-      /* Section 10.9 of the GLSL ES 1.00 specification states that
-       * embedded structure definitions have been removed from the language.
-       */
-      if (state->es_shader && decl_list->type->specifier->structure != NULL) {
-	 YYLTYPE loc = this->get_location();
-	 _mesa_glsl_error(&loc, state, "Embedded structure definitions are "
-			  "not allowed in GLSL ES 1.00.");
-      }
-
-      const glsl_type *decl_type =
-	 decl_list->type->specifier->glsl_type(& type_name, state);
-
-      foreach_list_typed (ast_declaration, decl, link,
-			  &decl_list->declarations) {
-	 const struct glsl_type *field_type = decl_type;
-	 if (decl->is_array) {
-	    YYLTYPE loc = decl->get_location();
-	    field_type = process_array_type(&loc, decl_type, decl->array_size,
-					    state);
-	 }
-	 fields[i].type = (field_type != NULL)
-	    ? field_type : glsl_type::error_type;
-	 fields[i].name = decl->identifier;
-	 i++;
-      }
-   }
-
-   assert(i == decl_count);
-
-   const glsl_type *t =
-      glsl_type::get_record_instance(fields, decl_count, this->name);
-
-   YYLTYPE loc = this->get_location();
-   if (!state->symbols->add_type(name, t)) {
-      _mesa_glsl_error(& loc, state, "struct `%s' previously defined", name);
-   } else {
-      const glsl_type **s = reralloc(state, state->user_structures,
-				     const glsl_type *,
-				     state->num_user_structures + 1);
-      if (s != NULL) {
-	 s[state->num_user_structures] = t;
-	 state->user_structures = s;
-	 state->num_user_structures++;
-      }
-   }
-
-   /* Structure type definitions do not have r-values.
-    */
-   return NULL;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file ast_to_hir.c

+ * Convert abstract syntax to to high-level intermediate reprensentation (HIR).

+ *

+ * During the conversion to HIR, the majority of the symantic checking is

+ * preformed on the program.  This includes:

+ *

+ *    * Symbol table management

+ *    * Type checking

+ *    * Function binding

+ *

+ * The majority of this work could be done during parsing, and the parser could

+ * probably generate HIR directly.  However, this results in frequent changes

+ * to the parser code.  Since we do not assume that every system this complier

+ * is built on will have Flex and Bison installed, we have to store the code

+ * generated by these tools in our version control system.  In other parts of

+ * the system we've seen problems where a parser was changed but the generated

+ * code was not committed, merge conflicts where created because two developers

+ * had slightly different versions of Bison installed, etc.

+ *

+ * I have also noticed that running Bison generated parsers in GDB is very

+ * irritating.  When you get a segfault on '$$ = $1->foo', you can't very

+ * well 'print $1' in GDB.

+ *

+ * As a result, my preference is to put as little C code as possible in the

+ * parser (and lexer) sources.

+ */

+

+#include "main/core.h" /* for struct gl_extensions */

+#include "glsl_symbol_table.h"

+#include "glsl_parser_extras.h"

+#include "ast.h"

+#include "glsl_types.h"

+#include "ir.h"

+

+void

+_mesa_ast_to_hir(exec_list *instructions, struct _mesa_glsl_parse_state *state)

+{

+   _mesa_glsl_initialize_variables(instructions, state);

+   _mesa_glsl_initialize_functions(state);

+

+   state->symbols->language_version = state->language_version;

+

+   state->current_function = NULL;

+

+   /* Section 4.2 of the GLSL 1.20 specification states:

+    * "The built-in functions are scoped in a scope outside the global scope

+    *  users declare global variables in.  That is, a shader's global scope,

+    *  available for user-defined functions and global variables, is nested

+    *  inside the scope containing the built-in functions."

+    *

+    * Since built-in functions like ftransform() access built-in variables,

+    * it follows that those must be in the outer scope as well.

+    *

+    * We push scope here to create this nesting effect...but don't pop.

+    * This way, a shader's globals are still in the symbol table for use

+    * by the linker.

+    */

+   state->symbols->push_scope();

+

+   foreach_list_typed (ast_node, ast, link, & state->translation_unit)

+      ast->hir(instructions, state);

+}

+

+

+/**

+ * If a conversion is available, convert one operand to a different type

+ *

+ * The \c from \c ir_rvalue is converted "in place".

+ *

+ * \param to     Type that the operand it to be converted to

+ * \param from   Operand that is being converted

+ * \param state  GLSL compiler state

+ *

+ * \return

+ * If a conversion is possible (or unnecessary), \c true is returned.

+ * Otherwise \c false is returned.

+ */

+bool

+apply_implicit_conversion(const glsl_type *to, ir_rvalue * &from,

+			  struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   if (to->base_type == from->type->base_type)

+      return true;

+

+   /* This conversion was added in GLSL 1.20.  If the compilation mode is

+    * GLSL 1.10, the conversion is skipped.

+    */

+   if (state->language_version < 120)

+      return false;

+

+   /* From page 27 (page 33 of the PDF) of the GLSL 1.50 spec:

+    *

+    *    "There are no implicit array or structure conversions. For

+    *    example, an array of int cannot be implicitly converted to an

+    *    array of float. There are no implicit conversions between

+    *    signed and unsigned integers."

+    */

+   /* FINISHME: The above comment is partially a lie.  There is int/uint

+    * FINISHME: conversion for immediate constants.

+    */

+   if (!to->is_float() || !from->type->is_numeric())

+      return false;

+

+   /* Convert to a floating point type with the same number of components

+    * as the original type - i.e. int to float, not int to vec4.

+    */

+   to = glsl_type::get_instance(GLSL_TYPE_FLOAT, from->type->vector_elements,

+			        from->type->matrix_columns);

+

+   switch (from->type->base_type) {

+   case GLSL_TYPE_INT:

+      from = new(ctx) ir_expression(ir_unop_i2f, to, from, NULL);

+      break;

+   case GLSL_TYPE_UINT:

+      from = new(ctx) ir_expression(ir_unop_u2f, to, from, NULL);

+      break;

+   case GLSL_TYPE_BOOL:

+      from = new(ctx) ir_expression(ir_unop_b2f, to, from, NULL);

+      break;

+   default:

+      assert(0);

+   }

+

+   return true;

+}

+

+

+static const struct glsl_type *

+arithmetic_result_type(ir_rvalue * &value_a, ir_rvalue * &value_b,

+		       bool multiply,

+		       struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+   const glsl_type *type_a = value_a->type;

+   const glsl_type *type_b = value_b->type;

+

+   /* From GLSL 1.50 spec, page 56:

+    *

+    *    "The arithmetic binary operators add (+), subtract (-),

+    *    multiply (*), and divide (/) operate on integer and

+    *    floating-point scalars, vectors, and matrices."

+    */

+   if (!type_a->is_numeric() || !type_b->is_numeric()) {

+      _mesa_glsl_error(loc, state,

+		       "Operands to arithmetic operators must be numeric");

+      return glsl_type::error_type;

+   }

+

+

+   /*    "If one operand is floating-point based and the other is

+    *    not, then the conversions from Section 4.1.10 "Implicit

+    *    Conversions" are applied to the non-floating-point-based operand."

+    */

+   if (!apply_implicit_conversion(type_a, value_b, state)

+       && !apply_implicit_conversion(type_b, value_a, state)) {

+      _mesa_glsl_error(loc, state,

+		       "Could not implicitly convert operands to "

+		       "arithmetic operator");

+      return glsl_type::error_type;

+   }

+   type_a = value_a->type;

+   type_b = value_b->type;

+

+   /*    "If the operands are integer types, they must both be signed or

+    *    both be unsigned."

+    *

+    * From this rule and the preceeding conversion it can be inferred that

+    * both types must be GLSL_TYPE_FLOAT, or GLSL_TYPE_UINT, or GLSL_TYPE_INT.

+    * The is_numeric check above already filtered out the case where either

+    * type is not one of these, so now the base types need only be tested for

+    * equality.

+    */

+   if (type_a->base_type != type_b->base_type) {

+      _mesa_glsl_error(loc, state,

+		       "base type mismatch for arithmetic operator");

+      return glsl_type::error_type;

+   }

+

+   /*    "All arithmetic binary operators result in the same fundamental type

+    *    (signed integer, unsigned integer, or floating-point) as the

+    *    operands they operate on, after operand type conversion. After

+    *    conversion, the following cases are valid

+    *

+    *    * The two operands are scalars. In this case the operation is

+    *      applied, resulting in a scalar."

+    */

+   if (type_a->is_scalar() && type_b->is_scalar())

+      return type_a;

+

+   /*   "* One operand is a scalar, and the other is a vector or matrix.

+    *      In this case, the scalar operation is applied independently to each

+    *      component of the vector or matrix, resulting in the same size

+    *      vector or matrix."

+    */

+   if (type_a->is_scalar()) {

+      if (!type_b->is_scalar())

+	 return type_b;

+   } else if (type_b->is_scalar()) {

+      return type_a;

+   }

+

+   /* All of the combinations of <scalar, scalar>, <vector, scalar>,

+    * <scalar, vector>, <scalar, matrix>, and <matrix, scalar> have been

+    * handled.

+    */

+   assert(!type_a->is_scalar());

+   assert(!type_b->is_scalar());

+

+   /*   "* The two operands are vectors of the same size. In this case, the

+    *      operation is done component-wise resulting in the same size

+    *      vector."

+    */

+   if (type_a->is_vector() && type_b->is_vector()) {

+      if (type_a == type_b) {

+	 return type_a;

+      } else {

+	 _mesa_glsl_error(loc, state,

+			  "vector size mismatch for arithmetic operator");

+	 return glsl_type::error_type;

+      }

+   }

+

+   /* All of the combinations of <scalar, scalar>, <vector, scalar>,

+    * <scalar, vector>, <scalar, matrix>, <matrix, scalar>, and

+    * <vector, vector> have been handled.  At least one of the operands must

+    * be matrix.  Further, since there are no integer matrix types, the base

+    * type of both operands must be float.

+    */

+   assert(type_a->is_matrix() || type_b->is_matrix());

+   assert(type_a->base_type == GLSL_TYPE_FLOAT);

+   assert(type_b->base_type == GLSL_TYPE_FLOAT);

+

+   /*   "* The operator is add (+), subtract (-), or divide (/), and the

+    *      operands are matrices with the same number of rows and the same

+    *      number of columns. In this case, the operation is done component-

+    *      wise resulting in the same size matrix."

+    *    * The operator is multiply (*), where both operands are matrices or

+    *      one operand is a vector and the other a matrix. A right vector

+    *      operand is treated as a column vector and a left vector operand as a

+    *      row vector. In all these cases, it is required that the number of

+    *      columns of the left operand is equal to the number of rows of the

+    *      right operand. Then, the multiply (*) operation does a linear

+    *      algebraic multiply, yielding an object that has the same number of

+    *      rows as the left operand and the same number of columns as the right

+    *      operand. Section 5.10 "Vector and Matrix Operations" explains in

+    *      more detail how vectors and matrices are operated on."

+    */

+   if (! multiply) {

+      if (type_a == type_b)

+	 return type_a;

+   } else {

+      if (type_a->is_matrix() && type_b->is_matrix()) {

+	 /* Matrix multiply.  The columns of A must match the rows of B.  Given

+	  * the other previously tested constraints, this means the vector type

+	  * of a row from A must be the same as the vector type of a column from

+	  * B.

+	  */

+	 if (type_a->row_type() == type_b->column_type()) {

+	    /* The resulting matrix has the number of columns of matrix B and

+	     * the number of rows of matrix A.  We get the row count of A by

+	     * looking at the size of a vector that makes up a column.  The

+	     * transpose (size of a row) is done for B.

+	     */

+	    const glsl_type *const type =

+	       glsl_type::get_instance(type_a->base_type,

+				       type_a->column_type()->vector_elements,

+				       type_b->row_type()->vector_elements);

+	    assert(type != glsl_type::error_type);

+

+	    return type;

+	 }

+      } else if (type_a->is_matrix()) {

+	 /* A is a matrix and B is a column vector.  Columns of A must match

+	  * rows of B.  Given the other previously tested constraints, this

+	  * means the vector type of a row from A must be the same as the

+	  * vector the type of B.

+	  */

+	 if (type_a->row_type() == type_b) {

+	    /* The resulting vector has a number of elements equal to

+	     * the number of rows of matrix A. */

+	    const glsl_type *const type =

+	       glsl_type::get_instance(type_a->base_type,

+				       type_a->column_type()->vector_elements,

+				       1);

+	    assert(type != glsl_type::error_type);

+

+	    return type;

+	 }

+      } else {

+	 assert(type_b->is_matrix());

+

+	 /* A is a row vector and B is a matrix.  Columns of A must match rows

+	  * of B.  Given the other previously tested constraints, this means

+	  * the type of A must be the same as the vector type of a column from

+	  * B.

+	  */

+	 if (type_a == type_b->column_type()) {

+	    /* The resulting vector has a number of elements equal to

+	     * the number of columns of matrix B. */

+	    const glsl_type *const type =

+	       glsl_type::get_instance(type_a->base_type,

+				       type_b->row_type()->vector_elements,

+				       1);

+	    assert(type != glsl_type::error_type);

+

+	    return type;

+	 }

+      }

+

+      _mesa_glsl_error(loc, state, "size mismatch for matrix multiplication");

+      return glsl_type::error_type;

+   }

+

+

+   /*    "All other cases are illegal."

+    */

+   _mesa_glsl_error(loc, state, "type mismatch");

+   return glsl_type::error_type;

+}

+

+

+static const struct glsl_type *

+unary_arithmetic_result_type(const struct glsl_type *type,

+			     struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+   /* From GLSL 1.50 spec, page 57:

+    *

+    *    "The arithmetic unary operators negate (-), post- and pre-increment

+    *     and decrement (-- and ++) operate on integer or floating-point

+    *     values (including vectors and matrices). All unary operators work

+    *     component-wise on their operands. These result with the same type

+    *     they operated on."

+    */

+   if (!type->is_numeric()) {

+      _mesa_glsl_error(loc, state,

+		       "Operands to arithmetic operators must be numeric");

+      return glsl_type::error_type;

+   }

+

+   return type;

+}

+

+/**

+ * \brief Return the result type of a bit-logic operation.

+ *

+ * If the given types to the bit-logic operator are invalid, return

+ * glsl_type::error_type.

+ *

+ * \param type_a Type of LHS of bit-logic op

+ * \param type_b Type of RHS of bit-logic op

+ */

+static const struct glsl_type *

+bit_logic_result_type(const struct glsl_type *type_a,

+                      const struct glsl_type *type_b,

+                      ast_operators op,

+                      struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+    if (state->language_version < 130) {

+       _mesa_glsl_error(loc, state, "bit operations require GLSL 1.30");

+       return glsl_type::error_type;

+    }

+

+    /* From page 50 (page 56 of PDF) of GLSL 1.30 spec:

+     *

+     *     "The bitwise operators and (&), exclusive-or (^), and inclusive-or

+     *     (|). The operands must be of type signed or unsigned integers or

+     *     integer vectors."

+     */

+    if (!type_a->is_integer()) {

+       _mesa_glsl_error(loc, state, "LHS of `%s' must be an integer",

+                         ast_expression::operator_string(op));

+       return glsl_type::error_type;

+    }

+    if (!type_b->is_integer()) {

+       _mesa_glsl_error(loc, state, "RHS of `%s' must be an integer",

+                        ast_expression::operator_string(op));

+       return glsl_type::error_type;

+    }

+

+    /*     "The fundamental types of the operands (signed or unsigned) must

+     *     match,"

+     */

+    if (type_a->base_type != type_b->base_type) {

+       _mesa_glsl_error(loc, state, "operands of `%s' must have the same "

+                        "base type", ast_expression::operator_string(op));

+       return glsl_type::error_type;

+    }

+

+    /*     "The operands cannot be vectors of differing size." */

+    if (type_a->is_vector() &&

+        type_b->is_vector() &&

+        type_a->vector_elements != type_b->vector_elements) {

+       _mesa_glsl_error(loc, state, "operands of `%s' cannot be vectors of "

+                        "different sizes", ast_expression::operator_string(op));

+       return glsl_type::error_type;

+    }

+

+    /*     "If one operand is a scalar and the other a vector, the scalar is

+     *     applied component-wise to the vector, resulting in the same type as

+     *     the vector. The fundamental types of the operands [...] will be the

+     *     resulting fundamental type."

+     */

+    if (type_a->is_scalar())

+        return type_b;

+    else

+        return type_a;

+}

+

+static const struct glsl_type *

+modulus_result_type(const struct glsl_type *type_a,

+		    const struct glsl_type *type_b,

+		    struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+   if (state->language_version < 130) {

+      _mesa_glsl_error(loc, state,

+                       "operator '%%' is reserved in %s",

+                       state->version_string);

+      return glsl_type::error_type;

+   }

+

+   /* From GLSL 1.50 spec, page 56:

+    *    "The operator modulus (%) operates on signed or unsigned integers or

+    *    integer vectors. The operand types must both be signed or both be

+    *    unsigned."

+    */

+   if (!type_a->is_integer() || !type_b->is_integer()

+       || (type_a->base_type != type_b->base_type)) {

+      _mesa_glsl_error(loc, state, "type mismatch");

+      return glsl_type::error_type;

+   }

+

+   /*    "The operands cannot be vectors of differing size. If one operand is

+    *    a scalar and the other vector, then the scalar is applied component-

+    *    wise to the vector, resulting in the same type as the vector. If both

+    *    are vectors of the same size, the result is computed component-wise."

+    */

+   if (type_a->is_vector()) {

+      if (!type_b->is_vector()

+	  || (type_a->vector_elements == type_b->vector_elements))

+	 return type_a;

+   } else

+      return type_b;

+

+   /*    "The operator modulus (%) is not defined for any other data types

+    *    (non-integer types)."

+    */

+   _mesa_glsl_error(loc, state, "type mismatch");

+   return glsl_type::error_type;

+}

+

+

+static const struct glsl_type *

+relational_result_type(ir_rvalue * &value_a, ir_rvalue * &value_b,

+		       struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+   const glsl_type *type_a = value_a->type;

+   const glsl_type *type_b = value_b->type;

+

+   /* From GLSL 1.50 spec, page 56:

+    *    "The relational operators greater than (>), less than (<), greater

+    *    than or equal (>=), and less than or equal (<=) operate only on

+    *    scalar integer and scalar floating-point expressions."

+    */

+   if (!type_a->is_numeric()

+       || !type_b->is_numeric()

+       || !type_a->is_scalar()

+       || !type_b->is_scalar()) {

+      _mesa_glsl_error(loc, state,

+		       "Operands to relational operators must be scalar and "

+		       "numeric");

+      return glsl_type::error_type;

+   }

+

+   /*    "Either the operands' types must match, or the conversions from

+    *    Section 4.1.10 "Implicit Conversions" will be applied to the integer

+    *    operand, after which the types must match."

+    */

+   if (!apply_implicit_conversion(type_a, value_b, state)

+       && !apply_implicit_conversion(type_b, value_a, state)) {

+      _mesa_glsl_error(loc, state,

+		       "Could not implicitly convert operands to "

+		       "relational operator");

+      return glsl_type::error_type;

+   }

+   type_a = value_a->type;

+   type_b = value_b->type;

+

+   if (type_a->base_type != type_b->base_type) {

+      _mesa_glsl_error(loc, state, "base type mismatch");

+      return glsl_type::error_type;

+   }

+

+   /*    "The result is scalar Boolean."

+    */

+   return glsl_type::bool_type;

+}

+

+/**

+ * \brief Return the result type of a bit-shift operation.

+ *

+ * If the given types to the bit-shift operator are invalid, return

+ * glsl_type::error_type.

+ *

+ * \param type_a Type of LHS of bit-shift op

+ * \param type_b Type of RHS of bit-shift op

+ */

+static const struct glsl_type *

+shift_result_type(const struct glsl_type *type_a,

+                  const struct glsl_type *type_b,

+                  ast_operators op,

+                  struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+   if (state->language_version < 130) {

+      _mesa_glsl_error(loc, state, "bit operations require GLSL 1.30");

+      return glsl_type::error_type;

+   }

+

+   /* From page 50 (page 56 of the PDF) of the GLSL 1.30 spec:

+    *

+    *     "The shift operators (<<) and (>>). For both operators, the operands

+    *     must be signed or unsigned integers or integer vectors. One operand

+    *     can be signed while the other is unsigned."

+    */

+   if (!type_a->is_integer()) {

+      _mesa_glsl_error(loc, state, "LHS of operator %s must be an integer or "

+              "integer vector", ast_expression::operator_string(op));

+     return glsl_type::error_type;

+

+   }

+   if (!type_b->is_integer()) {

+      _mesa_glsl_error(loc, state, "RHS of operator %s must be an integer or "

+              "integer vector", ast_expression::operator_string(op));

+     return glsl_type::error_type;

+   }

+

+   /*     "If the first operand is a scalar, the second operand has to be

+    *     a scalar as well."

+    */

+   if (type_a->is_scalar() && !type_b->is_scalar()) {

+      _mesa_glsl_error(loc, state, "If the first operand of %s is scalar, the "

+              "second must be scalar as well",

+              ast_expression::operator_string(op));

+     return glsl_type::error_type;

+   }

+

+   /* If both operands are vectors, check that they have same number of

+    * elements.

+    */

+   if (type_a->is_vector() &&

+      type_b->is_vector() &&

+      type_a->vector_elements != type_b->vector_elements) {

+      _mesa_glsl_error(loc, state, "Vector operands to operator %s must "

+              "have same number of elements",

+              ast_expression::operator_string(op));

+     return glsl_type::error_type;

+   }

+

+   /*     "In all cases, the resulting type will be the same type as the left

+    *     operand."

+    */

+   return type_a;

+}

+

+/**

+ * Validates that a value can be assigned to a location with a specified type

+ *

+ * Validates that \c rhs can be assigned to some location.  If the types are

+ * not an exact match but an automatic conversion is possible, \c rhs will be

+ * converted.

+ *

+ * \return

+ * \c NULL if \c rhs cannot be assigned to a location with type \c lhs_type.

+ * Otherwise the actual RHS to be assigned will be returned.  This may be

+ * \c rhs, or it may be \c rhs after some type conversion.

+ *

+ * \note

+ * In addition to being used for assignments, this function is used to

+ * type-check return values.

+ */

+ir_rvalue *

+validate_assignment(struct _mesa_glsl_parse_state *state,

+		    const glsl_type *lhs_type, ir_rvalue *rhs,

+		    bool is_initializer)

+{

+   /* If there is already some error in the RHS, just return it.  Anything

+    * else will lead to an avalanche of error message back to the user.

+    */

+   if (rhs->type->is_error())

+      return rhs;

+

+   /* If the types are identical, the assignment can trivially proceed.

+    */

+   if (rhs->type == lhs_type)

+      return rhs;

+

+   /* If the array element types are the same and the size of the LHS is zero,

+    * the assignment is okay for initializers embedded in variable

+    * declarations.

+    *

+    * Note: Whole-array assignments are not permitted in GLSL 1.10, but this

+    * is handled by ir_dereference::is_lvalue.

+    */

+   if (is_initializer && lhs_type->is_array() && rhs->type->is_array()

+       && (lhs_type->element_type() == rhs->type->element_type())

+       && (lhs_type->array_size() == 0)) {

+      return rhs;

+   }

+

+   /* Check for implicit conversion in GLSL 1.20 */

+   if (apply_implicit_conversion(lhs_type, rhs, state)) {

+      if (rhs->type == lhs_type)

+	 return rhs;

+   }

+

+   return NULL;

+}

+

+ir_rvalue *

+do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,

+	      ir_rvalue *lhs, ir_rvalue *rhs, bool is_initializer,

+	      YYLTYPE lhs_loc)

+{

+   void *ctx = state;

+   bool error_emitted = (lhs->type->is_error() || rhs->type->is_error());

+

+   if (!error_emitted) {

+      if (lhs->variable_referenced() != NULL

+          && lhs->variable_referenced()->read_only) {

+         _mesa_glsl_error(&lhs_loc, state,

+                          "assignment to read-only variable '%s'",

+                          lhs->variable_referenced()->name);

+         error_emitted = true;

+

+      } else if (!lhs->is_lvalue()) {

+	 _mesa_glsl_error(& lhs_loc, state, "non-lvalue in assignment");

+	 error_emitted = true;

+      }

+

+      if (state->es_shader && lhs->type->is_array()) {

+	 _mesa_glsl_error(&lhs_loc, state, "whole array assignment is not "

+			  "allowed in GLSL ES 1.00.");

+	 error_emitted = true;

+      }

+   }

+

+   ir_rvalue *new_rhs =

+      validate_assignment(state, lhs->type, rhs, is_initializer);

+   if (new_rhs == NULL) {

+      _mesa_glsl_error(& lhs_loc, state, "type mismatch");

+   } else {

+      rhs = new_rhs;

+

+      /* If the LHS array was not declared with a size, it takes it size from

+       * the RHS.  If the LHS is an l-value and a whole array, it must be a

+       * dereference of a variable.  Any other case would require that the LHS

+       * is either not an l-value or not a whole array.

+       */

+      if (lhs->type->array_size() == 0) {

+	 ir_dereference *const d = lhs->as_dereference();

+

+	 assert(d != NULL);

+

+	 ir_variable *const var = d->variable_referenced();

+

+	 assert(var != NULL);

+

+	 if (var->max_array_access >= unsigned(rhs->type->array_size())) {

+	    /* FINISHME: This should actually log the location of the RHS. */

+	    _mesa_glsl_error(& lhs_loc, state, "array size must be > %u due to "

+			     "previous access",

+			     var->max_array_access);

+	 }

+

+	 var->type = glsl_type::get_array_instance(lhs->type->element_type(),

+						   rhs->type->array_size());

+	 d->type = var->type;

+      }

+   }

+

+   /* Most callers of do_assignment (assign, add_assign, pre_inc/dec,

+    * but not post_inc) need the converted assigned value as an rvalue

+    * to handle things like:

+    *

+    * i = j += 1;

+    *

+    * So we always just store the computed value being assigned to a

+    * temporary and return a deref of that temporary.  If the rvalue

+    * ends up not being used, the temp will get copy-propagated out.

+    */

+   ir_variable *var = new(ctx) ir_variable(rhs->type, "assignment_tmp",

+					   ir_var_temporary);

+   ir_dereference_variable *deref_var = new(ctx) ir_dereference_variable(var);

+   instructions->push_tail(var);

+   instructions->push_tail(new(ctx) ir_assignment(deref_var,

+						  rhs,

+						  NULL));

+   deref_var = new(ctx) ir_dereference_variable(var);

+

+   if (!error_emitted)

+      instructions->push_tail(new(ctx) ir_assignment(lhs, deref_var, NULL));

+

+   return new(ctx) ir_dereference_variable(var);

+}

+

+static ir_rvalue *

+get_lvalue_copy(exec_list *instructions, ir_rvalue *lvalue)

+{

+   void *ctx = ralloc_parent(lvalue);

+   ir_variable *var;

+

+   var = new(ctx) ir_variable(lvalue->type, "_post_incdec_tmp",

+			      ir_var_temporary);

+   instructions->push_tail(var);

+   var->mode = ir_var_auto;

+

+   instructions->push_tail(new(ctx) ir_assignment(new(ctx) ir_dereference_variable(var),

+						  lvalue, NULL));

+

+   /* Once we've created this temporary, mark it read only so it's no

+    * longer considered an lvalue.

+    */

+   var->read_only = true;

+

+   return new(ctx) ir_dereference_variable(var);

+}

+

+

+ir_rvalue *

+ast_node::hir(exec_list *instructions,

+	      struct _mesa_glsl_parse_state *state)

+{

+   (void) instructions;

+   (void) state;

+

+   return NULL;

+}

+

+static void

+mark_whole_array_access(ir_rvalue *access)

+{

+   ir_dereference_variable *deref = access->as_dereference_variable();

+

+   if (deref) {

+      deref->var->max_array_access = deref->type->length - 1;

+   }

+}

+

+static ir_rvalue *

+do_comparison(void *mem_ctx, int operation, ir_rvalue *op0, ir_rvalue *op1)

+{

+   int join_op;

+   ir_rvalue *cmp = NULL;

+

+   if (operation == ir_binop_all_equal)

+      join_op = ir_binop_logic_and;

+   else

+      join_op = ir_binop_logic_or;

+

+   switch (op0->type->base_type) {

+   case GLSL_TYPE_FLOAT:

+   case GLSL_TYPE_UINT:

+   case GLSL_TYPE_INT:

+   case GLSL_TYPE_BOOL:

+      return new(mem_ctx) ir_expression(operation, op0, op1);

+

+   case GLSL_TYPE_ARRAY: {

+      for (unsigned int i = 0; i < op0->type->length; i++) {

+	 ir_rvalue *e0, *e1, *result;

+

+	 e0 = new(mem_ctx) ir_dereference_array(op0->clone(mem_ctx, NULL),

+						new(mem_ctx) ir_constant(i));

+	 e1 = new(mem_ctx) ir_dereference_array(op1->clone(mem_ctx, NULL),

+						new(mem_ctx) ir_constant(i));

+	 result = do_comparison(mem_ctx, operation, e0, e1);

+

+	 if (cmp) {

+	    cmp = new(mem_ctx) ir_expression(join_op, cmp, result);

+	 } else {

+	    cmp = result;

+	 }

+      }

+

+      mark_whole_array_access(op0);

+      mark_whole_array_access(op1);

+      break;

+   }

+

+   case GLSL_TYPE_STRUCT: {

+      for (unsigned int i = 0; i < op0->type->length; i++) {

+	 ir_rvalue *e0, *e1, *result;

+	 const char *field_name = op0->type->fields.structure[i].name;

+

+	 e0 = new(mem_ctx) ir_dereference_record(op0->clone(mem_ctx, NULL),

+						 field_name);

+	 e1 = new(mem_ctx) ir_dereference_record(op1->clone(mem_ctx, NULL),

+						 field_name);

+	 result = do_comparison(mem_ctx, operation, e0, e1);

+

+	 if (cmp) {

+	    cmp = new(mem_ctx) ir_expression(join_op, cmp, result);

+	 } else {

+	    cmp = result;

+	 }

+      }

+      break;

+   }

+

+   case GLSL_TYPE_ERROR:

+   case GLSL_TYPE_VOID:

+   case GLSL_TYPE_SAMPLER:

+      /* I assume a comparison of a struct containing a sampler just

+       * ignores the sampler present in the type.

+       */

+      break;

+

+   default:

+      assert(!"Should not get here.");

+      break;

+   }

+

+   if (cmp == NULL)

+      cmp = new(mem_ctx) ir_constant(true);

+

+   return cmp;

+}

+

+ir_rvalue *

+ast_expression::hir(exec_list *instructions,

+		    struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   static const int operations[AST_NUM_OPERATORS] = {

+      -1,               /* ast_assign doesn't convert to ir_expression. */

+      -1,               /* ast_plus doesn't convert to ir_expression. */

+      ir_unop_neg,

+      ir_binop_add,

+      ir_binop_sub,

+      ir_binop_mul,

+      ir_binop_div,

+      ir_binop_mod,

+      ir_binop_lshift,

+      ir_binop_rshift,

+      ir_binop_less,

+      ir_binop_greater,

+      ir_binop_lequal,

+      ir_binop_gequal,

+      ir_binop_all_equal,

+      ir_binop_any_nequal,

+      ir_binop_bit_and,

+      ir_binop_bit_xor,

+      ir_binop_bit_or,

+      ir_unop_bit_not,

+      ir_binop_logic_and,

+      ir_binop_logic_xor,

+      ir_binop_logic_or,

+      ir_unop_logic_not,

+

+      /* Note: The following block of expression types actually convert

+       * to multiple IR instructions.

+       */

+      ir_binop_mul,     /* ast_mul_assign */

+      ir_binop_div,     /* ast_div_assign */

+      ir_binop_mod,     /* ast_mod_assign */

+      ir_binop_add,     /* ast_add_assign */

+      ir_binop_sub,     /* ast_sub_assign */

+      ir_binop_lshift,  /* ast_ls_assign */

+      ir_binop_rshift,  /* ast_rs_assign */

+      ir_binop_bit_and, /* ast_and_assign */

+      ir_binop_bit_xor, /* ast_xor_assign */

+      ir_binop_bit_or,  /* ast_or_assign */

+

+      -1,               /* ast_conditional doesn't convert to ir_expression. */

+      ir_binop_add,     /* ast_pre_inc. */

+      ir_binop_sub,     /* ast_pre_dec. */

+      ir_binop_add,     /* ast_post_inc. */

+      ir_binop_sub,     /* ast_post_dec. */

+      -1,               /* ast_field_selection doesn't conv to ir_expression. */

+      -1,               /* ast_array_index doesn't convert to ir_expression. */

+      -1,               /* ast_function_call doesn't conv to ir_expression. */

+      -1,               /* ast_identifier doesn't convert to ir_expression. */

+      -1,               /* ast_int_constant doesn't convert to ir_expression. */

+      -1,               /* ast_uint_constant doesn't conv to ir_expression. */

+      -1,               /* ast_float_constant doesn't conv to ir_expression. */

+      -1,               /* ast_bool_constant doesn't conv to ir_expression. */

+      -1,               /* ast_sequence doesn't convert to ir_expression. */

+   };

+   ir_rvalue *result = NULL;

+   ir_rvalue *op[3];

+   const struct glsl_type *type = glsl_type::error_type;

+   bool error_emitted = false;

+   YYLTYPE loc;

+

+   loc = this->get_location();

+

+   switch (this->oper) {

+   case ast_assign: {

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      result = do_assignment(instructions, state, op[0], op[1], false,

+			     this->subexpressions[0]->get_location());

+      error_emitted = result->type->is_error();

+      type = result->type;

+      break;

+   }

+

+   case ast_plus:

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+

+      type = unary_arithmetic_result_type(op[0]->type, state, & loc);

+

+      error_emitted = type->is_error();

+

+      result = op[0];

+      break;

+

+   case ast_neg:

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+

+      type = unary_arithmetic_result_type(op[0]->type, state, & loc);

+

+      error_emitted = type->is_error();

+

+      result = new(ctx) ir_expression(operations[this->oper], type,

+				      op[0], NULL);

+      break;

+

+   case ast_add:

+   case ast_sub:

+   case ast_mul:

+   case ast_div:

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      type = arithmetic_result_type(op[0], op[1],

+				    (this->oper == ast_mul),

+				    state, & loc);

+      error_emitted = type->is_error();

+

+      result = new(ctx) ir_expression(operations[this->oper], type,

+				      op[0], op[1]);

+      break;

+

+   case ast_mod:

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      type = modulus_result_type(op[0]->type, op[1]->type, state, & loc);

+

+      assert(operations[this->oper] == ir_binop_mod);

+

+      result = new(ctx) ir_expression(operations[this->oper], type,

+				      op[0], op[1]);

+      error_emitted = type->is_error();

+      break;

+

+   case ast_lshift:

+   case ast_rshift:

+       if (state->language_version < 130) {

+          _mesa_glsl_error(&loc, state, "operator %s requires GLSL 1.30",

+              operator_string(this->oper));

+          error_emitted = true;

+       }

+

+       op[0] = this->subexpressions[0]->hir(instructions, state);

+       op[1] = this->subexpressions[1]->hir(instructions, state);

+       type = shift_result_type(op[0]->type, op[1]->type, this->oper, state,

+                                &loc);

+       result = new(ctx) ir_expression(operations[this->oper], type,

+                                       op[0], op[1]);

+       error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+       break;

+

+   case ast_less:

+   case ast_greater:

+   case ast_lequal:

+   case ast_gequal:

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      type = relational_result_type(op[0], op[1], state, & loc);

+

+      /* The relational operators must either generate an error or result

+       * in a scalar boolean.  See page 57 of the GLSL 1.50 spec.

+       */

+      assert(type->is_error()

+	     || ((type->base_type == GLSL_TYPE_BOOL)

+		 && type->is_scalar()));

+

+      result = new(ctx) ir_expression(operations[this->oper], type,

+				      op[0], op[1]);

+      error_emitted = type->is_error();

+      break;

+

+   case ast_nequal:

+   case ast_equal:

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      /* From page 58 (page 64 of the PDF) of the GLSL 1.50 spec:

+       *

+       *    "The equality operators equal (==), and not equal (!=)

+       *    operate on all types. They result in a scalar Boolean. If

+       *    the operand types do not match, then there must be a

+       *    conversion from Section 4.1.10 "Implicit Conversions"

+       *    applied to one operand that can make them match, in which

+       *    case this conversion is done."

+       */

+      if ((!apply_implicit_conversion(op[0]->type, op[1], state)

+	   && !apply_implicit_conversion(op[1]->type, op[0], state))

+	  || (op[0]->type != op[1]->type)) {

+	 _mesa_glsl_error(& loc, state, "operands of `%s' must have the same "

+			  "type", (this->oper == ast_equal) ? "==" : "!=");

+	 error_emitted = true;

+      } else if ((state->language_version <= 110)

+		 && (op[0]->type->is_array() || op[1]->type->is_array())) {

+	 _mesa_glsl_error(& loc, state, "array comparisons forbidden in "

+			  "GLSL 1.10");

+	 error_emitted = true;

+      }

+

+      result = do_comparison(ctx, operations[this->oper], op[0], op[1]);

+      type = glsl_type::bool_type;

+

+      assert(error_emitted || (result->type == glsl_type::bool_type));

+      break;

+

+   case ast_bit_and:

+   case ast_bit_xor:

+   case ast_bit_or:

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+      type = bit_logic_result_type(op[0]->type, op[1]->type, this->oper,

+                                   state, &loc);

+      result = new(ctx) ir_expression(operations[this->oper], type,

+				      op[0], op[1]);

+      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+      break;

+

+   case ast_bit_not:

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+

+      if (state->language_version < 130) {

+	 _mesa_glsl_error(&loc, state, "bit-wise operations require GLSL 1.30");

+	 error_emitted = true;

+      }

+

+      if (!op[0]->type->is_integer()) {

+	 _mesa_glsl_error(&loc, state, "operand of `~' must be an integer");

+	 error_emitted = true;

+      }

+

+      type = op[0]->type;

+      result = new(ctx) ir_expression(ir_unop_bit_not, type, op[0], NULL);

+      break;

+

+   case ast_logic_and: {

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+

+      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {

+	 YYLTYPE loc = this->subexpressions[0]->get_location();

+

+	 _mesa_glsl_error(& loc, state, "LHS of `%s' must be scalar boolean",

+			  operator_string(this->oper));

+	 error_emitted = true;

+      }

+

+      ir_constant *op0_const = op[0]->constant_expression_value();

+      if (op0_const) {

+	 if (op0_const->value.b[0]) {

+	    op[1] = this->subexpressions[1]->hir(instructions, state);

+

+	    if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {

+	       YYLTYPE loc = this->subexpressions[1]->get_location();

+

+	       _mesa_glsl_error(& loc, state,

+				"RHS of `%s' must be scalar boolean",

+				operator_string(this->oper));

+	       error_emitted = true;

+	    }

+	    result = op[1];

+	 } else {

+	    result = op0_const;

+	 }

+	 type = glsl_type::bool_type;

+      } else {

+	 ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,

+						       "and_tmp",

+						       ir_var_temporary);

+	 instructions->push_tail(tmp);

+

+	 ir_if *const stmt = new(ctx) ir_if(op[0]);

+	 instructions->push_tail(stmt);

+

+	 op[1] = this->subexpressions[1]->hir(&stmt->then_instructions, state);

+

+	 if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {

+	    YYLTYPE loc = this->subexpressions[1]->get_location();

+

+	    _mesa_glsl_error(& loc, state,

+			     "RHS of `%s' must be scalar boolean",

+			     operator_string(this->oper));

+	    error_emitted = true;

+	 }

+

+	 ir_dereference *const then_deref = new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const then_assign =

+	    new(ctx) ir_assignment(then_deref, op[1], NULL);

+	 stmt->then_instructions.push_tail(then_assign);

+

+	 ir_dereference *const else_deref = new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const else_assign =

+	    new(ctx) ir_assignment(else_deref, new(ctx) ir_constant(false), NULL);

+	 stmt->else_instructions.push_tail(else_assign);

+

+	 result = new(ctx) ir_dereference_variable(tmp);

+	 type = tmp->type;

+      }

+      break;

+   }

+

+   case ast_logic_or: {

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+

+      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {

+	 YYLTYPE loc = this->subexpressions[0]->get_location();

+

+	 _mesa_glsl_error(& loc, state, "LHS of `%s' must be scalar boolean",

+			  operator_string(this->oper));

+	 error_emitted = true;

+      }

+

+      ir_constant *op0_const = op[0]->constant_expression_value();

+      if (op0_const) {

+	 if (op0_const->value.b[0]) {

+	    result = op0_const;

+	 } else {

+	    op[1] = this->subexpressions[1]->hir(instructions, state);

+

+	    if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {

+	       YYLTYPE loc = this->subexpressions[1]->get_location();

+

+	       _mesa_glsl_error(& loc, state,

+				"RHS of `%s' must be scalar boolean",

+				operator_string(this->oper));

+	       error_emitted = true;

+	    }

+	    result = op[1];

+	 }

+	 type = glsl_type::bool_type;

+      } else {

+	 ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,

+						       "or_tmp",

+						       ir_var_temporary);

+	 instructions->push_tail(tmp);

+

+	 ir_if *const stmt = new(ctx) ir_if(op[0]);

+	 instructions->push_tail(stmt);

+

+	 op[1] = this->subexpressions[1]->hir(&stmt->else_instructions, state);

+

+	 if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {

+	    YYLTYPE loc = this->subexpressions[1]->get_location();

+

+	    _mesa_glsl_error(& loc, state, "RHS of `%s' must be scalar boolean",

+			     operator_string(this->oper));

+	    error_emitted = true;

+	 }

+

+	 ir_dereference *const then_deref = new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const then_assign =

+	    new(ctx) ir_assignment(then_deref, new(ctx) ir_constant(true), NULL);

+	 stmt->then_instructions.push_tail(then_assign);

+

+	 ir_dereference *const else_deref = new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const else_assign =

+	    new(ctx) ir_assignment(else_deref, op[1], NULL);

+	 stmt->else_instructions.push_tail(else_assign);

+

+	 result = new(ctx) ir_dereference_variable(tmp);

+	 type = tmp->type;

+      }

+      break;

+   }

+

+   case ast_logic_xor:

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+

+      result = new(ctx) ir_expression(operations[this->oper], glsl_type::bool_type,

+				      op[0], op[1]);

+      type = glsl_type::bool_type;

+      break;

+

+   case ast_logic_not:

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+

+      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {

+	 YYLTYPE loc = this->subexpressions[0]->get_location();

+

+	 _mesa_glsl_error(& loc, state,

+			  "operand of `!' must be scalar boolean");

+	 error_emitted = true;

+      }

+

+      result = new(ctx) ir_expression(operations[this->oper], glsl_type::bool_type,

+				      op[0], NULL);

+      type = glsl_type::bool_type;

+      break;

+

+   case ast_mul_assign:

+   case ast_div_assign:

+   case ast_add_assign:

+   case ast_sub_assign: {

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      type = arithmetic_result_type(op[0], op[1],

+				    (this->oper == ast_mul_assign),

+				    state, & loc);

+

+      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper], type,

+						   op[0], op[1]);

+

+      result = do_assignment(instructions, state,

+			     op[0]->clone(ctx, NULL), temp_rhs, false,

+			     this->subexpressions[0]->get_location());

+      type = result->type;

+      error_emitted = (op[0]->type->is_error());

+

+      /* GLSL 1.10 does not allow array assignment.  However, we don't have to

+       * explicitly test for this because none of the binary expression

+       * operators allow array operands either.

+       */

+

+      break;

+   }

+

+   case ast_mod_assign: {

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      type = modulus_result_type(op[0]->type, op[1]->type, state, & loc);

+

+      assert(operations[this->oper] == ir_binop_mod);

+

+      ir_rvalue *temp_rhs;

+      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,

+					op[0], op[1]);

+

+      result = do_assignment(instructions, state,

+			     op[0]->clone(ctx, NULL), temp_rhs, false,

+			     this->subexpressions[0]->get_location());

+      type = result->type;

+      error_emitted = type->is_error();

+      break;

+   }

+

+   case ast_ls_assign:

+   case ast_rs_assign: {

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+      type = shift_result_type(op[0]->type, op[1]->type, this->oper, state,

+                               &loc);

+      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],

+                                                   type, op[0], op[1]);

+      result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),

+                             temp_rhs, false,

+                             this->subexpressions[0]->get_location());

+      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+      break;

+   }

+

+   case ast_and_assign:

+   case ast_xor_assign:

+   case ast_or_assign: {

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+      type = bit_logic_result_type(op[0]->type, op[1]->type, this->oper,

+                                   state, &loc);

+      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],

+                                                   type, op[0], op[1]);

+      result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),

+                             temp_rhs, false,

+                             this->subexpressions[0]->get_location());

+      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+      break;

+   }

+

+   case ast_conditional: {

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+

+      /* From page 59 (page 65 of the PDF) of the GLSL 1.50 spec:

+       *

+       *    "The ternary selection operator (?:). It operates on three

+       *    expressions (exp1 ? exp2 : exp3). This operator evaluates the

+       *    first expression, which must result in a scalar Boolean."

+       */

+      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {

+	 YYLTYPE loc = this->subexpressions[0]->get_location();

+

+	 _mesa_glsl_error(& loc, state, "?: condition must be scalar boolean");

+	 error_emitted = true;

+      }

+

+      /* The :? operator is implemented by generating an anonymous temporary

+       * followed by an if-statement.  The last instruction in each branch of

+       * the if-statement assigns a value to the anonymous temporary.  This

+       * temporary is the r-value of the expression.

+       */

+      exec_list then_instructions;

+      exec_list else_instructions;

+

+      op[1] = this->subexpressions[1]->hir(&then_instructions, state);

+      op[2] = this->subexpressions[2]->hir(&else_instructions, state);

+

+      /* From page 59 (page 65 of the PDF) of the GLSL 1.50 spec:

+       *

+       *     "The second and third expressions can be any type, as

+       *     long their types match, or there is a conversion in

+       *     Section 4.1.10 "Implicit Conversions" that can be applied

+       *     to one of the expressions to make their types match. This

+       *     resulting matching type is the type of the entire

+       *     expression."

+       */

+      if ((!apply_implicit_conversion(op[1]->type, op[2], state)

+	   && !apply_implicit_conversion(op[2]->type, op[1], state))

+	  || (op[1]->type != op[2]->type)) {

+	 YYLTYPE loc = this->subexpressions[1]->get_location();

+

+	 _mesa_glsl_error(& loc, state, "Second and third operands of ?: "

+			  "operator must have matching types.");

+	 error_emitted = true;

+	 type = glsl_type::error_type;

+      } else {

+	 type = op[1]->type;

+      }

+

+      /* From page 33 (page 39 of the PDF) of the GLSL 1.10 spec:

+       *

+       *    "The second and third expressions must be the same type, but can

+       *    be of any type other than an array."

+       */

+      if ((state->language_version <= 110) && type->is_array()) {

+	 _mesa_glsl_error(& loc, state, "Second and third operands of ?: "

+			  "operator must not be arrays.");

+	 error_emitted = true;

+      }

+

+      ir_constant *cond_val = op[0]->constant_expression_value();

+      ir_constant *then_val = op[1]->constant_expression_value();

+      ir_constant *else_val = op[2]->constant_expression_value();

+

+      if (then_instructions.is_empty()

+	  && else_instructions.is_empty()

+	  && (cond_val != NULL) && (then_val != NULL) && (else_val != NULL)) {

+	 result = (cond_val->value.b[0]) ? then_val : else_val;

+      } else {

+	 ir_variable *const tmp =

+	    new(ctx) ir_variable(type, "conditional_tmp", ir_var_temporary);

+	 instructions->push_tail(tmp);

+

+	 ir_if *const stmt = new(ctx) ir_if(op[0]);

+	 instructions->push_tail(stmt);

+

+	 then_instructions.move_nodes_to(& stmt->then_instructions);

+	 ir_dereference *const then_deref =

+	    new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const then_assign =

+	    new(ctx) ir_assignment(then_deref, op[1], NULL);

+	 stmt->then_instructions.push_tail(then_assign);

+

+	 else_instructions.move_nodes_to(& stmt->else_instructions);

+	 ir_dereference *const else_deref =

+	    new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const else_assign =

+	    new(ctx) ir_assignment(else_deref, op[2], NULL);

+	 stmt->else_instructions.push_tail(else_assign);

+

+	 result = new(ctx) ir_dereference_variable(tmp);

+      }

+      break;

+   }

+

+   case ast_pre_inc:

+   case ast_pre_dec: {

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      if (op[0]->type->base_type == GLSL_TYPE_FLOAT)

+	 op[1] = new(ctx) ir_constant(1.0f);

+      else

+	 op[1] = new(ctx) ir_constant(1);

+

+      type = arithmetic_result_type(op[0], op[1], false, state, & loc);

+

+      ir_rvalue *temp_rhs;

+      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,

+					op[0], op[1]);

+

+      result = do_assignment(instructions, state,

+			     op[0]->clone(ctx, NULL), temp_rhs, false,

+			     this->subexpressions[0]->get_location());

+      type = result->type;

+      error_emitted = op[0]->type->is_error();

+      break;

+   }

+

+   case ast_post_inc:

+   case ast_post_dec: {

+      op[0] = this->subexpressions[0]->hir(instructions, state);

+      if (op[0]->type->base_type == GLSL_TYPE_FLOAT)

+	 op[1] = new(ctx) ir_constant(1.0f);

+      else

+	 op[1] = new(ctx) ir_constant(1);

+

+      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+

+      type = arithmetic_result_type(op[0], op[1], false, state, & loc);

+

+      ir_rvalue *temp_rhs;

+      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,

+					op[0], op[1]);

+

+      /* Get a temporary of a copy of the lvalue before it's modified.

+       * This may get thrown away later.

+       */

+      result = get_lvalue_copy(instructions, op[0]->clone(ctx, NULL));

+

+      (void)do_assignment(instructions, state,

+			  op[0]->clone(ctx, NULL), temp_rhs, false,

+			  this->subexpressions[0]->get_location());

+

+      type = result->type;

+      error_emitted = op[0]->type->is_error();

+      break;

+   }

+

+   case ast_field_selection:

+      result = _mesa_ast_field_selection_to_hir(this, instructions, state);

+      type = result->type;

+      break;

+

+   case ast_array_index: {

+      YYLTYPE index_loc = subexpressions[1]->get_location();

+

+      op[0] = subexpressions[0]->hir(instructions, state);

+      op[1] = subexpressions[1]->hir(instructions, state);

+

+      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+

+      ir_rvalue *const array = op[0];

+

+      result = new(ctx) ir_dereference_array(op[0], op[1]);

+

+      /* Do not use op[0] after this point.  Use array.

+       */

+      op[0] = NULL;

+

+

+      if (error_emitted)

+	 break;

+

+      if (!array->type->is_array()

+	  && !array->type->is_matrix()

+	  && !array->type->is_vector()) {

+	 _mesa_glsl_error(& index_loc, state,

+			  "cannot dereference non-array / non-matrix / "

+			  "non-vector");

+	 error_emitted = true;

+      }

+

+      if (!op[1]->type->is_integer()) {

+	 _mesa_glsl_error(& index_loc, state,

+			  "array index must be integer type");

+	 error_emitted = true;

+      } else if (!op[1]->type->is_scalar()) {

+	 _mesa_glsl_error(& index_loc, state,

+			  "array index must be scalar");

+	 error_emitted = true;

+      }

+

+      /* If the array index is a constant expression and the array has a

+       * declared size, ensure that the access is in-bounds.  If the array

+       * index is not a constant expression, ensure that the array has a

+       * declared size.

+       */

+      ir_constant *const const_index = op[1]->constant_expression_value();

+      if (const_index != NULL) {

+	 const int idx = const_index->value.i[0];

+	 const char *type_name;

+	 unsigned bound = 0;

+

+	 if (array->type->is_matrix()) {

+	    type_name = "matrix";

+	 } else if (array->type->is_vector()) {

+	    type_name = "vector";

+	 } else {

+	    type_name = "array";

+	 }

+

+	 /* From page 24 (page 30 of the PDF) of the GLSL 1.50 spec:

+	  *

+	  *    "It is illegal to declare an array with a size, and then

+	  *    later (in the same shader) index the same array with an

+	  *    integral constant expression greater than or equal to the

+	  *    declared size. It is also illegal to index an array with a

+	  *    negative constant expression."

+	  */

+	 if (array->type->is_matrix()) {

+	    if (array->type->row_type()->vector_elements <= idx) {

+	       bound = array->type->row_type()->vector_elements;

+	    }

+	 } else if (array->type->is_vector()) {

+	    if (array->type->vector_elements <= idx) {

+	       bound = array->type->vector_elements;

+	    }

+	 } else {

+	    if ((array->type->array_size() > 0)

+		&& (array->type->array_size() <= idx)) {

+	       bound = array->type->array_size();

+	    }

+	 }

+

+	 if (bound > 0) {

+	    _mesa_glsl_error(& loc, state, "%s index must be < %u",

+			     type_name, bound);

+	    error_emitted = true;

+	 } else if (idx < 0) {

+	    _mesa_glsl_error(& loc, state, "%s index must be >= 0",

+			     type_name);

+	    error_emitted = true;

+	 }

+

+	 if (array->type->is_array()) {

+	    /* If the array is a variable dereference, it dereferences the

+	     * whole array, by definition.  Use this to get the variable.

+	     *

+	     * FINISHME: Should some methods for getting / setting / testing

+	     * FINISHME: array access limits be added to ir_dereference?

+	     */

+	    ir_variable *const v = array->whole_variable_referenced();

+	    if ((v != NULL) && (unsigned(idx) > v->max_array_access))

+	       v->max_array_access = idx;

+	 }

+      } else if (array->type->array_size() == 0) {

+	 _mesa_glsl_error(&loc, state, "unsized array index must be constant");

+      } else {

+	 if (array->type->is_array()) {

+	    /* whole_variable_referenced can return NULL if the array is a

+	     * member of a structure.  In this case it is safe to not update

+	     * the max_array_access field because it is never used for fields

+	     * of structures.

+	     */

+	    ir_variable *v = array->whole_variable_referenced();

+	    if (v != NULL)

+	       v->max_array_access = array->type->array_size() - 1;

+	 }

+      }

+

+      /* From page 23 (29 of the PDF) of the GLSL 1.30 spec:

+       *

+       *    "Samplers aggregated into arrays within a shader (using square

+       *    brackets [ ]) can only be indexed with integral constant

+       *    expressions [...]."

+       *

+       * This restriction was added in GLSL 1.30.  Shaders using earlier version

+       * of the language should not be rejected by the compiler front-end for

+       * using this construct.  This allows useful things such as using a loop

+       * counter as the index to an array of samplers.  If the loop in unrolled,

+       * the code should compile correctly.  Instead, emit a warning.

+       */

+      if (array->type->is_array() &&

+          array->type->element_type()->is_sampler() &&

+          const_index == NULL) {

+

+	 if (state->language_version == 100) {

+	    _mesa_glsl_warning(&loc, state,

+			       "sampler arrays indexed with non-constant "

+			       "expressions is optional in GLSL ES 1.00");

+	 } else if (state->language_version < 130) {

+	    _mesa_glsl_warning(&loc, state,

+			       "sampler arrays indexed with non-constant "

+			       "expressions is forbidden in GLSL 1.30 and "

+			       "later");

+	 } else {

+	    _mesa_glsl_error(&loc, state,

+			     "sampler arrays indexed with non-constant "

+			     "expressions is forbidden in GLSL 1.30 and "

+			     "later");

+	    error_emitted = true;

+	 }

+      }

+

+      if (error_emitted)

+	 result->type = glsl_type::error_type;

+

+      type = result->type;

+      break;

+   }

+

+   case ast_function_call:

+      /* Should *NEVER* get here.  ast_function_call should always be handled

+       * by ast_function_expression::hir.

+       */

+      assert(0);

+      break;

+

+   case ast_identifier: {

+      /* ast_identifier can appear several places in a full abstract syntax

+       * tree.  This particular use must be at location specified in the grammar

+       * as 'variable_identifier'.

+       */

+      ir_variable *var = 

+	 state->symbols->get_variable(this->primary_expression.identifier);

+

+      result = new(ctx) ir_dereference_variable(var);

+

+      if (var != NULL) {

+	 var->used = true;

+	 type = result->type;

+      } else {

+	 _mesa_glsl_error(& loc, state, "`%s' undeclared",

+			  this->primary_expression.identifier);

+

+	 error_emitted = true;

+      }

+      break;

+   }

+

+   case ast_int_constant:

+      type = glsl_type::int_type;

+      result = new(ctx) ir_constant(this->primary_expression.int_constant);

+      break;

+

+   case ast_uint_constant:

+      type = glsl_type::uint_type;

+      result = new(ctx) ir_constant(this->primary_expression.uint_constant);

+      break;

+

+   case ast_float_constant:

+      type = glsl_type::float_type;

+      result = new(ctx) ir_constant(this->primary_expression.float_constant);

+      break;

+

+   case ast_bool_constant:

+      type = glsl_type::bool_type;

+      result = new(ctx) ir_constant(bool(this->primary_expression.bool_constant));

+      break;

+

+   case ast_sequence: {

+      /* It should not be possible to generate a sequence in the AST without

+       * any expressions in it.

+       */

+      assert(!this->expressions.is_empty());

+

+      /* The r-value of a sequence is the last expression in the sequence.  If

+       * the other expressions in the sequence do not have side-effects (and

+       * therefore add instructions to the instruction list), they get dropped

+       * on the floor.

+       */

+      foreach_list_typed (ast_node, ast, link, &this->expressions)

+	 result = ast->hir(instructions, state);

+

+      type = result->type;

+

+      /* Any errors should have already been emitted in the loop above.

+       */

+      error_emitted = true;

+      break;

+   }

+   }

+

+   if (type->is_error() && !error_emitted)

+      _mesa_glsl_error(& loc, state, "type mismatch");

+

+   return result;

+}

+

+

+ir_rvalue *

+ast_expression_statement::hir(exec_list *instructions,

+			      struct _mesa_glsl_parse_state *state)

+{

+   /* It is possible to have expression statements that don't have an

+    * expression.  This is the solitary semicolon:

+    *

+    * for (i = 0; i < 5; i++)

+    *     ;

+    *

+    * In this case the expression will be NULL.  Test for NULL and don't do

+    * anything in that case.

+    */

+   if (expression != NULL)

+      expression->hir(instructions, state);

+

+   /* Statements do not have r-values.

+    */

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_compound_statement::hir(exec_list *instructions,

+			    struct _mesa_glsl_parse_state *state)

+{

+   if (new_scope)

+      state->symbols->push_scope();

+

+   foreach_list_typed (ast_node, ast, link, &this->statements)

+      ast->hir(instructions, state);

+

+   if (new_scope)

+      state->symbols->pop_scope();

+

+   /* Compound statements do not have r-values.

+    */

+   return NULL;

+}

+

+

+static const glsl_type *

+process_array_type(YYLTYPE *loc, const glsl_type *base, ast_node *array_size,

+		   struct _mesa_glsl_parse_state *state)

+{

+   unsigned length = 0;

+

+   /* FINISHME: Reject delcarations of multidimensional arrays. */

+

+   if (array_size != NULL) {

+      exec_list dummy_instructions;

+      ir_rvalue *const ir = array_size->hir(& dummy_instructions, state);

+      YYLTYPE loc = array_size->get_location();

+

+      /* FINISHME: Verify that the grammar forbids side-effects in array

+       * FINISHME: sizes.   i.e., 'vec4 [x = 12] data'

+       */

+      assert(dummy_instructions.is_empty());

+

+      if (ir != NULL) {

+	 if (!ir->type->is_integer()) {

+	    _mesa_glsl_error(& loc, state, "array size must be integer type");

+	 } else if (!ir->type->is_scalar()) {

+	    _mesa_glsl_error(& loc, state, "array size must be scalar type");

+	 } else {

+	    ir_constant *const size = ir->constant_expression_value();

+

+	    if (size == NULL) {

+	       _mesa_glsl_error(& loc, state, "array size must be a "

+				"constant valued expression");

+	    } else if (size->value.i[0] <= 0) {

+	       _mesa_glsl_error(& loc, state, "array size must be > 0");

+	    } else {

+	       assert(size->type == ir->type);

+	       length = size->value.u[0];

+	    }

+	 }

+      }

+   } else if (state->es_shader) {

+      /* Section 10.17 of the GLSL ES 1.00 specification states that unsized

+       * array declarations have been removed from the language.

+       */

+      _mesa_glsl_error(loc, state, "unsized array declarations are not "

+		       "allowed in GLSL ES 1.00.");

+   }

+

+   return glsl_type::get_array_instance(base, length);

+}

+

+

+const glsl_type *

+ast_type_specifier::glsl_type(const char **name,

+			      struct _mesa_glsl_parse_state *state) const

+{

+   const struct glsl_type *type;

+

+   type = state->symbols->get_type(this->type_name);

+   *name = this->type_name;

+

+   if (this->is_array) {

+      YYLTYPE loc = this->get_location();

+      type = process_array_type(&loc, type, this->array_size, state);

+   }

+

+   return type;

+}

+

+

+static void

+apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,

+				 ir_variable *var,

+				 struct _mesa_glsl_parse_state *state,

+				 YYLTYPE *loc)

+{

+   if (qual->flags.q.invariant) {

+      if (var->used) {

+	 _mesa_glsl_error(loc, state,

+			  "variable `%s' may not be redeclared "

+			  "`invariant' after being used",

+			  var->name);

+      } else {

+	 var->invariant = 1;

+      }

+   }

+

+   if (qual->flags.q.constant || qual->flags.q.attribute

+       || qual->flags.q.uniform

+       || (qual->flags.q.varying && (state->target == fragment_shader)))

+      var->read_only = 1;

+

+   if (qual->flags.q.centroid)

+      var->centroid = 1;

+

+   if (qual->flags.q.attribute && state->target != vertex_shader) {

+      var->type = glsl_type::error_type;

+      _mesa_glsl_error(loc, state,

+		       "`attribute' variables may not be declared in the "

+		       "%s shader",

+		       _mesa_glsl_shader_target_name(state->target));

+   }

+

+   /* From page 25 (page 31 of the PDF) of the GLSL 1.10 spec:

+    *

+    *     "The varying qualifier can be used only with the data types

+    *     float, vec2, vec3, vec4, mat2, mat3, and mat4, or arrays of

+    *     these."

+    */

+   if (qual->flags.q.varying) {

+      const glsl_type *non_array_type;

+

+      if (var->type && var->type->is_array())

+	 non_array_type = var->type->fields.array;

+      else

+	 non_array_type = var->type;

+

+      if (non_array_type && non_array_type->base_type != GLSL_TYPE_FLOAT) {

+	 var->type = glsl_type::error_type;

+	 _mesa_glsl_error(loc, state,

+			  "varying variables must be of base type float");

+      }

+   }

+

+   /* If there is no qualifier that changes the mode of the variable, leave

+    * the setting alone.

+    */

+   if (qual->flags.q.in && qual->flags.q.out)

+      var->mode = ir_var_inout;

+   else if (qual->flags.q.attribute || qual->flags.q.in

+	    || (qual->flags.q.varying && (state->target == fragment_shader)))

+      var->mode = ir_var_in;

+   else if (qual->flags.q.out

+	    || (qual->flags.q.varying && (state->target == vertex_shader)))

+      var->mode = ir_var_out;

+   else if (qual->flags.q.uniform)

+      var->mode = ir_var_uniform;

+

+   if (state->all_invariant && (state->current_function == NULL)) {

+      switch (state->target) {

+      case vertex_shader:

+	 if (var->mode == ir_var_out)

+	    var->invariant = true;

+	 break;

+      case geometry_shader:

+	 if ((var->mode == ir_var_in) || (var->mode == ir_var_out))

+	    var->invariant = true;

+	 break;

+      case fragment_shader:

+	 if (var->mode == ir_var_in)

+	    var->invariant = true;

+	 break;

+      }

+   }

+

+   if (qual->flags.q.flat)

+      var->interpolation = ir_var_flat;

+   else if (qual->flags.q.noperspective)

+      var->interpolation = ir_var_noperspective;

+   else

+      var->interpolation = ir_var_smooth;

+

+   var->pixel_center_integer = qual->flags.q.pixel_center_integer;

+   var->origin_upper_left = qual->flags.q.origin_upper_left;

+   if ((qual->flags.q.origin_upper_left || qual->flags.q.pixel_center_integer)

+       && (strcmp(var->name, "gl_FragCoord") != 0)) {

+      const char *const qual_string = (qual->flags.q.origin_upper_left)

+	 ? "origin_upper_left" : "pixel_center_integer";

+

+      _mesa_glsl_error(loc, state,

+		       "layout qualifier `%s' can only be applied to "

+		       "fragment shader input `gl_FragCoord'",

+		       qual_string);

+   }

+

+   if (qual->flags.q.explicit_location) {

+      const bool global_scope = (state->current_function == NULL);

+      bool fail = false;

+      const char *string = "";

+

+      /* In the vertex shader only shader inputs can be given explicit

+       * locations.

+       *

+       * In the fragment shader only shader outputs can be given explicit

+       * locations.

+       */

+      switch (state->target) {

+      case vertex_shader:

+	 if (!global_scope || (var->mode != ir_var_in)) {

+	    fail = true;

+	    string = "input";

+	 }

+	 break;

+

+      case geometry_shader:

+	 _mesa_glsl_error(loc, state,

+			  "geometry shader variables cannot be given "

+			  "explicit locations\n");

+	 break;

+

+      case fragment_shader:

+	 if (!global_scope || (var->mode != ir_var_in)) {

+	    fail = true;

+	    string = "output";

+	 }

+	 break;

+      };

+

+      if (fail) {

+	 _mesa_glsl_error(loc, state,

+			  "only %s shader %s variables can be given an "

+			  "explicit location\n",

+			  _mesa_glsl_shader_target_name(state->target),

+			  string);

+      } else {

+	 var->explicit_location = true;

+

+	 /* This bit of silliness is needed because invalid explicit locations

+	  * are supposed to be flagged during linking.  Small negative values

+	  * biased by VERT_ATTRIB_GENERIC0 or FRAG_RESULT_DATA0 could alias

+	  * built-in values (e.g., -16+VERT_ATTRIB_GENERIC0 = VERT_ATTRIB_POS).

+	  * The linker needs to be able to differentiate these cases.  This

+	  * ensures that negative values stay negative.

+	  */

+	 if (qual->location >= 0) {

+	    var->location = (state->target == vertex_shader)

+	       ? (qual->location + VERT_ATTRIB_GENERIC0)

+	       : (qual->location + FRAG_RESULT_DATA0);

+	 } else {

+	    var->location = qual->location;

+	 }

+      }

+   }

+

+   /* Does the declaration use the 'layout' keyword?

+    */

+   const bool uses_layout = qual->flags.q.pixel_center_integer

+      || qual->flags.q.origin_upper_left

+      || qual->flags.q.explicit_location;

+

+   /* Does the declaration use the deprecated 'attribute' or 'varying'

+    * keywords?

+    */

+   const bool uses_deprecated_qualifier = qual->flags.q.attribute

+      || qual->flags.q.varying;

+

+   /* Is the 'layout' keyword used with parameters that allow relaxed checking.

+    * Many implementations of GL_ARB_fragment_coord_conventions_enable and some

+    * implementations (only Mesa?) GL_ARB_explicit_attrib_location_enable

+    * allowed the layout qualifier to be used with 'varying' and 'attribute'.

+    * These extensions and all following extensions that add the 'layout'

+    * keyword have been modified to require the use of 'in' or 'out'.

+    *

+    * The following extension do not allow the deprecated keywords:

+    *

+    *    GL_AMD_conservative_depth

+    *    GL_ARB_gpu_shader5

+    *    GL_ARB_separate_shader_objects

+    *    GL_ARB_tesselation_shader

+    *    GL_ARB_transform_feedback3

+    *    GL_ARB_uniform_buffer_object

+    *

+    * It is unknown whether GL_EXT_shader_image_load_store or GL_NV_gpu_shader5

+    * allow layout with the deprecated keywords.

+    */

+   const bool relaxed_layout_qualifier_checking =

+      state->ARB_fragment_coord_conventions_enable;

+

+   if (uses_layout && uses_deprecated_qualifier) {

+      if (relaxed_layout_qualifier_checking) {

+	 _mesa_glsl_warning(loc, state,

+			    "`layout' qualifier may not be used with "

+			    "`attribute' or `varying'");

+      } else {

+	 _mesa_glsl_error(loc, state,

+			  "`layout' qualifier may not be used with "

+			  "`attribute' or `varying'");

+      }

+   }

+

+   /* Layout qualifiers for gl_FragDepth, which are enabled by extension

+    * AMD_conservative_depth.

+    */

+   int depth_layout_count = qual->flags.q.depth_any

+      + qual->flags.q.depth_greater

+      + qual->flags.q.depth_less

+      + qual->flags.q.depth_unchanged;

+   if (depth_layout_count > 0

+       && !state->AMD_conservative_depth_enable) {

+       _mesa_glsl_error(loc, state,

+                        "extension GL_AMD_conservative_depth must be enabled "

+			"to use depth layout qualifiers");

+   } else if (depth_layout_count > 0

+              && strcmp(var->name, "gl_FragDepth") != 0) {

+       _mesa_glsl_error(loc, state,

+                        "depth layout qualifiers can be applied only to "

+                        "gl_FragDepth");

+   } else if (depth_layout_count > 1

+              && strcmp(var->name, "gl_FragDepth") == 0) {

+      _mesa_glsl_error(loc, state,

+                       "at most one depth layout qualifier can be applied to "

+                       "gl_FragDepth");

+   }

+   if (qual->flags.q.depth_any)

+      var->depth_layout = ir_depth_layout_any;

+   else if (qual->flags.q.depth_greater)

+      var->depth_layout = ir_depth_layout_greater;

+   else if (qual->flags.q.depth_less)

+      var->depth_layout = ir_depth_layout_less;

+   else if (qual->flags.q.depth_unchanged)

+       var->depth_layout = ir_depth_layout_unchanged;

+   else

+       var->depth_layout = ir_depth_layout_none;

+

+   if (var->type->is_array() && state->language_version != 110) {

+      var->array_lvalue = true;

+   }

+}

+

+/**

+ * Get the variable that is being redeclared by this declaration

+ *

+ * Semantic checks to verify the validity of the redeclaration are also

+ * performed.  If semantic checks fail, compilation error will be emitted via

+ * \c _mesa_glsl_error, but a non-\c NULL pointer will still be returned.

+ *

+ * \returns

+ * A pointer to an existing variable in the current scope if the declaration

+ * is a redeclaration, \c NULL otherwise.

+ */

+ir_variable *

+get_variable_being_redeclared(ir_variable *var, ast_declaration *decl,

+			      struct _mesa_glsl_parse_state *state)

+{

+   /* Check if this declaration is actually a re-declaration, either to

+    * resize an array or add qualifiers to an existing variable.

+    *

+    * This is allowed for variables in the current scope, or when at

+    * global scope (for built-ins in the implicit outer scope).

+    */

+   ir_variable *earlier = state->symbols->get_variable(decl->identifier);

+   if (earlier == NULL ||

+       (state->current_function != NULL &&

+	!state->symbols->name_declared_this_scope(decl->identifier))) {

+      return NULL;

+   }

+

+

+   YYLTYPE loc = decl->get_location();

+

+   /* From page 24 (page 30 of the PDF) of the GLSL 1.50 spec,

+    *

+    * "It is legal to declare an array without a size and then

+    *  later re-declare the same name as an array of the same

+    *  type and specify a size."

+    */

+   if ((earlier->type->array_size() == 0)

+       && var->type->is_array()

+       && (var->type->element_type() == earlier->type->element_type())) {

+      /* FINISHME: This doesn't match the qualifiers on the two

+       * FINISHME: declarations.  It's not 100% clear whether this is

+       * FINISHME: required or not.

+       */

+

+      /* From page 54 (page 60 of the PDF) of the GLSL 1.20 spec:

+       *

+       *     "The size [of gl_TexCoord] can be at most

+       *     gl_MaxTextureCoords."

+       */

+      const unsigned size = unsigned(var->type->array_size());

+      if ((strcmp("gl_TexCoord", var->name) == 0)

+	  && (size > state->Const.MaxTextureCoords)) {

+	 _mesa_glsl_error(& loc, state, "`gl_TexCoord' array size cannot "

+			  "be larger than gl_MaxTextureCoords (%u)\n",

+			  state->Const.MaxTextureCoords);

+      } else if ((size > 0) && (size <= earlier->max_array_access)) {

+	 _mesa_glsl_error(& loc, state, "array size must be > %u due to "

+			  "previous access",

+			  earlier->max_array_access);

+      }

+

+      earlier->type = var->type;

+      delete var;

+      var = NULL;

+   } else if (state->ARB_fragment_coord_conventions_enable

+	      && strcmp(var->name, "gl_FragCoord") == 0

+	      && earlier->type == var->type

+	      && earlier->mode == var->mode) {

+      /* Allow redeclaration of gl_FragCoord for ARB_fcc layout

+       * qualifiers.

+       */

+      earlier->origin_upper_left = var->origin_upper_left;

+      earlier->pixel_center_integer = var->pixel_center_integer;

+

+      /* According to section 4.3.7 of the GLSL 1.30 spec,

+       * the following built-in varaibles can be redeclared with an

+       * interpolation qualifier:

+       *    * gl_FrontColor

+       *    * gl_BackColor

+       *    * gl_FrontSecondaryColor

+       *    * gl_BackSecondaryColor

+       *    * gl_Color

+       *    * gl_SecondaryColor

+       */

+   } else if (state->language_version >= 130

+	      && (strcmp(var->name, "gl_FrontColor") == 0

+		  || strcmp(var->name, "gl_BackColor") == 0

+		  || strcmp(var->name, "gl_FrontSecondaryColor") == 0

+		  || strcmp(var->name, "gl_BackSecondaryColor") == 0

+		  || strcmp(var->name, "gl_Color") == 0

+		  || strcmp(var->name, "gl_SecondaryColor") == 0)

+	      && earlier->type == var->type

+	      && earlier->mode == var->mode) {

+      earlier->interpolation = var->interpolation;

+

+      /* Layout qualifiers for gl_FragDepth. */

+   } else if (state->AMD_conservative_depth_enable

+	      && strcmp(var->name, "gl_FragDepth") == 0

+	      && earlier->type == var->type

+	      && earlier->mode == var->mode) {

+

+      /** From the AMD_conservative_depth spec:

+       *     Within any shader, the first redeclarations of gl_FragDepth

+       *     must appear before any use of gl_FragDepth.

+       */

+      if (earlier->used) {

+	 _mesa_glsl_error(&loc, state,

+			  "the first redeclaration of gl_FragDepth "

+			  "must appear before any use of gl_FragDepth");

+      }

+

+      /* Prevent inconsistent redeclaration of depth layout qualifier. */

+      if (earlier->depth_layout != ir_depth_layout_none

+	  && earlier->depth_layout != var->depth_layout) {

+	 _mesa_glsl_error(&loc, state,

+			  "gl_FragDepth: depth layout is declared here "

+			  "as '%s, but it was previously declared as "

+			  "'%s'",

+			  depth_layout_string(var->depth_layout),

+			  depth_layout_string(earlier->depth_layout));

+      }

+

+      earlier->depth_layout = var->depth_layout;

+

+   } else {

+      _mesa_glsl_error(&loc, state, "`%s' redeclared", decl->identifier);

+   }

+

+   return earlier;

+}

+

+/**

+ * Generate the IR for an initializer in a variable declaration

+ */

+ir_rvalue *

+process_initializer(ir_variable *var, ast_declaration *decl,

+		    ast_fully_specified_type *type,

+		    exec_list *initializer_instructions,

+		    struct _mesa_glsl_parse_state *state)

+{

+   ir_rvalue *result = NULL;

+

+   YYLTYPE initializer_loc = decl->initializer->get_location();

+

+   /* From page 24 (page 30 of the PDF) of the GLSL 1.10 spec:

+    *

+    *    "All uniform variables are read-only and are initialized either

+    *    directly by an application via API commands, or indirectly by

+    *    OpenGL."

+    */

+   if ((state->language_version <= 110)

+       && (var->mode == ir_var_uniform)) {

+      _mesa_glsl_error(& initializer_loc, state,

+		       "cannot initialize uniforms in GLSL 1.10");

+   }

+

+   if (var->type->is_sampler()) {

+      _mesa_glsl_error(& initializer_loc, state,

+		       "cannot initialize samplers");

+   }

+

+   if ((var->mode == ir_var_in) && (state->current_function == NULL)) {

+      _mesa_glsl_error(& initializer_loc, state,

+		       "cannot initialize %s shader input / %s",

+		       _mesa_glsl_shader_target_name(state->target),

+		       (state->target == vertex_shader)

+		       ? "attribute" : "varying");

+   }

+

+   ir_dereference *const lhs = new(state) ir_dereference_variable(var);

+   ir_rvalue *rhs = decl->initializer->hir(initializer_instructions,

+					   state);

+

+   /* Calculate the constant value if this is a const or uniform

+    * declaration.

+    */

+   if (type->qualifier.flags.q.constant

+       || type->qualifier.flags.q.uniform) {

+      ir_rvalue *new_rhs = validate_assignment(state, var->type, rhs, true);

+      if (new_rhs != NULL) {

+	 rhs = new_rhs;

+

+	 ir_constant *constant_value = rhs->constant_expression_value();

+	 if (!constant_value) {

+	    _mesa_glsl_error(& initializer_loc, state,

+			     "initializer of %s variable `%s' must be a "

+			     "constant expression",

+			     (type->qualifier.flags.q.constant)

+			     ? "const" : "uniform",

+			     decl->identifier);

+	    if (var->type->is_numeric()) {

+	       /* Reduce cascading errors. */

+	       var->constant_value = ir_constant::zero(state, var->type);

+	    }

+	 } else {

+	    rhs = constant_value;

+	    var->constant_value = constant_value;

+	 }

+      } else {

+	 _mesa_glsl_error(&initializer_loc, state,

+			  "initializer of type %s cannot be assigned to "

+			  "variable of type %s",

+			  rhs->type->name, var->type->name);

+	 if (var->type->is_numeric()) {

+	    /* Reduce cascading errors. */

+	    var->constant_value = ir_constant::zero(state, var->type);

+	 }

+      }

+   }

+

+   if (rhs && !rhs->type->is_error()) {

+      bool temp = var->read_only;

+      if (type->qualifier.flags.q.constant)

+	 var->read_only = false;

+

+      /* Never emit code to initialize a uniform.

+       */

+      const glsl_type *initializer_type;

+      if (!type->qualifier.flags.q.uniform) {

+	 result = do_assignment(initializer_instructions, state,

+				lhs, rhs, true,

+				type->get_location());

+	 initializer_type = result->type;

+      } else

+	 initializer_type = rhs->type;

+

+      /* If the declared variable is an unsized array, it must inherrit

+       * its full type from the initializer.  A declaration such as

+       *

+       *     uniform float a[] = float[](1.0, 2.0, 3.0, 3.0);

+       *

+       * becomes

+       *

+       *     uniform float a[4] = float[](1.0, 2.0, 3.0, 3.0);

+       *

+       * The assignment generated in the if-statement (below) will also

+       * automatically handle this case for non-uniforms.

+       *

+       * If the declared variable is not an array, the types must

+       * already match exactly.  As a result, the type assignment

+       * here can be done unconditionally.  For non-uniforms the call

+       * to do_assignment can change the type of the initializer (via

+       * the implicit conversion rules).  For uniforms the initializer

+       * must be a constant expression, and the type of that expression

+       * was validated above.

+       */

+      var->type = initializer_type;

+

+      var->read_only = temp;

+   }

+

+   return result;

+}

+

+ir_rvalue *

+ast_declarator_list::hir(exec_list *instructions,

+			 struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   const struct glsl_type *decl_type;

+   const char *type_name = NULL;

+   ir_rvalue *result = NULL;

+   YYLTYPE loc = this->get_location();

+

+   /* From page 46 (page 52 of the PDF) of the GLSL 1.50 spec:

+    *

+    *     "To ensure that a particular output variable is invariant, it is

+    *     necessary to use the invariant qualifier. It can either be used to

+    *     qualify a previously declared variable as being invariant

+    *

+    *         invariant gl_Position; // make existing gl_Position be invariant"

+    *

+    * In these cases the parser will set the 'invariant' flag in the declarator

+    * list, and the type will be NULL.

+    */

+   if (this->invariant) {

+      assert(this->type == NULL);

+

+      if (state->current_function != NULL) {

+	 _mesa_glsl_error(& loc, state,

+			  "All uses of `invariant' keyword must be at global "

+			  "scope\n");

+      }

+

+      foreach_list_typed (ast_declaration, decl, link, &this->declarations) {

+	 assert(!decl->is_array);

+	 assert(decl->array_size == NULL);

+	 assert(decl->initializer == NULL);

+

+	 ir_variable *const earlier =

+	    state->symbols->get_variable(decl->identifier);

+	 if (earlier == NULL) {

+	    _mesa_glsl_error(& loc, state,

+			     "Undeclared variable `%s' cannot be marked "

+			     "invariant\n", decl->identifier);

+	 } else if ((state->target == vertex_shader)

+	       && (earlier->mode != ir_var_out)) {

+	    _mesa_glsl_error(& loc, state,

+			     "`%s' cannot be marked invariant, vertex shader "

+			     "outputs only\n", decl->identifier);

+	 } else if ((state->target == fragment_shader)

+	       && (earlier->mode != ir_var_in)) {

+	    _mesa_glsl_error(& loc, state,

+			     "`%s' cannot be marked invariant, fragment shader "

+			     "inputs only\n", decl->identifier);

+	 } else if (earlier->used) {

+	    _mesa_glsl_error(& loc, state,

+			     "variable `%s' may not be redeclared "

+			     "`invariant' after being used",

+			     earlier->name);

+	 } else {

+	    earlier->invariant = true;

+	 }

+      }

+

+      /* Invariant redeclarations do not have r-values.

+       */

+      return NULL;

+   }

+

+   assert(this->type != NULL);

+   assert(!this->invariant);

+

+   /* The type specifier may contain a structure definition.  Process that

+    * before any of the variable declarations.

+    */

+   (void) this->type->specifier->hir(instructions, state);

+

+   decl_type = this->type->specifier->glsl_type(& type_name, state);

+   if (this->declarations.is_empty()) {

+      /* The only valid case where the declaration list can be empty is when

+       * the declaration is setting the default precision of a built-in type

+       * (e.g., 'precision highp vec4;').

+       */

+

+      if (decl_type != NULL) {

+      } else {

+	    _mesa_glsl_error(& loc, state, "incomplete declaration");

+      }

+   }

+

+   foreach_list_typed (ast_declaration, decl, link, &this->declarations) {

+      const struct glsl_type *var_type;

+      ir_variable *var;

+

+      /* FINISHME: Emit a warning if a variable declaration shadows a

+       * FINISHME: declaration at a higher scope.

+       */

+

+      if ((decl_type == NULL) || decl_type->is_void()) {

+	 if (type_name != NULL) {

+	    _mesa_glsl_error(& loc, state,

+			     "invalid type `%s' in declaration of `%s'",

+			     type_name, decl->identifier);

+	 } else {

+	    _mesa_glsl_error(& loc, state,

+			     "invalid type in declaration of `%s'",

+			     decl->identifier);

+	 }

+	 continue;

+      }

+

+      if (decl->is_array) {

+	 var_type = process_array_type(&loc, decl_type, decl->array_size,

+				       state);

+      } else {

+	 var_type = decl_type;

+      }

+

+      var = new(ctx) ir_variable(var_type, decl->identifier, ir_var_auto);

+

+      /* From page 22 (page 28 of the PDF) of the GLSL 1.10 specification;

+       *

+       *     "Global variables can only use the qualifiers const,

+       *     attribute, uni form, or varying. Only one may be

+       *     specified.

+       *

+       *     Local variables can only use the qualifier const."

+       *

+       * This is relaxed in GLSL 1.30.  It is also relaxed by any extension

+       * that adds the 'layout' keyword.

+       */

+      if ((state->language_version < 130)

+	  && !state->ARB_explicit_attrib_location_enable

+	  && !state->ARB_fragment_coord_conventions_enable) {

+	 if (this->type->qualifier.flags.q.out) {

+	    _mesa_glsl_error(& loc, state,

+			     "`out' qualifier in declaration of `%s' "

+			     "only valid for function parameters in %s.",

+			     decl->identifier, state->version_string);

+	 }

+	 if (this->type->qualifier.flags.q.in) {

+	    _mesa_glsl_error(& loc, state,

+			     "`in' qualifier in declaration of `%s' "

+			     "only valid for function parameters in %s.",

+			     decl->identifier, state->version_string);

+	 }

+	 /* FINISHME: Test for other invalid qualifiers. */

+      }

+

+      apply_type_qualifier_to_variable(& this->type->qualifier, var, state,

+				       & loc);

+

+      if (this->type->qualifier.flags.q.invariant) {

+	 if ((state->target == vertex_shader) && !(var->mode == ir_var_out ||

+						   var->mode == ir_var_inout)) {

+	    /* FINISHME: Note that this doesn't work for invariant on

+	     * a function signature outval

+	     */

+	    _mesa_glsl_error(& loc, state,

+			     "`%s' cannot be marked invariant, vertex shader "

+			     "outputs only\n", var->name);

+	 } else if ((state->target == fragment_shader) &&

+		    !(var->mode == ir_var_in || var->mode == ir_var_inout)) {

+	    /* FINISHME: Note that this doesn't work for invariant on

+	     * a function signature inval

+	     */

+	    _mesa_glsl_error(& loc, state,

+			     "`%s' cannot be marked invariant, fragment shader "

+			     "inputs only\n", var->name);

+	 }

+      }

+

+      if (state->current_function != NULL) {

+	 const char *mode = NULL;

+	 const char *extra = "";

+

+	 /* There is no need to check for 'inout' here because the parser will

+	  * only allow that in function parameter lists.

+	  */

+	 if (this->type->qualifier.flags.q.attribute) {

+	    mode = "attribute";

+	 } else if (this->type->qualifier.flags.q.uniform) {

+	    mode = "uniform";

+	 } else if (this->type->qualifier.flags.q.varying) {

+	    mode = "varying";

+	 } else if (this->type->qualifier.flags.q.in) {

+	    mode = "in";

+	    extra = " or in function parameter list";

+	 } else if (this->type->qualifier.flags.q.out) {

+	    mode = "out";

+	    extra = " or in function parameter list";

+	 }

+

+	 if (mode) {

+	    _mesa_glsl_error(& loc, state,

+			     "%s variable `%s' must be declared at "

+			     "global scope%s",

+			     mode, var->name, extra);

+	 }

+      } else if (var->mode == ir_var_in) {

+         var->read_only = true;

+

+	 if (state->target == vertex_shader) {

+	    bool error_emitted = false;

+

+	    /* From page 31 (page 37 of the PDF) of the GLSL 1.50 spec:

+	     *

+	     *    "Vertex shader inputs can only be float, floating-point

+	     *    vectors, matrices, signed and unsigned integers and integer

+	     *    vectors. Vertex shader inputs can also form arrays of these

+	     *    types, but not structures."

+	     *

+	     * From page 31 (page 27 of the PDF) of the GLSL 1.30 spec:

+	     *

+	     *    "Vertex shader inputs can only be float, floating-point

+	     *    vectors, matrices, signed and unsigned integers and integer

+	     *    vectors. They cannot be arrays or structures."

+	     *

+	     * From page 23 (page 29 of the PDF) of the GLSL 1.20 spec:

+	     *

+	     *    "The attribute qualifier can be used only with float,

+	     *    floating-point vectors, and matrices. Attribute variables

+	     *    cannot be declared as arrays or structures."

+	     */

+	    const glsl_type *check_type = var->type->is_array()

+	       ? var->type->fields.array : var->type;

+

+	    switch (check_type->base_type) {

+	    case GLSL_TYPE_FLOAT:

+	       break;

+	    case GLSL_TYPE_UINT:

+	    case GLSL_TYPE_INT:

+	       if (state->language_version > 120)

+		  break;

+	       /* FALLTHROUGH */

+	    default:

+	       _mesa_glsl_error(& loc, state,

+				"vertex shader input / attribute cannot have "

+				"type %s`%s'",

+				var->type->is_array() ? "array of " : "",

+				check_type->name);

+	       error_emitted = true;

+	    }

+

+	    if (!error_emitted && (state->language_version <= 130)

+		&& var->type->is_array()) {

+	       _mesa_glsl_error(& loc, state,

+				"vertex shader input / attribute cannot have "

+				"array type");

+	       error_emitted = true;

+	    }

+	 }

+      }

+

+      /* Integer vertex outputs must be qualified with 'flat'.

+       *

+       * From section 4.3.6 of the GLSL 1.30 spec:

+       *    "If a vertex output is a signed or unsigned integer or integer

+       *    vector, then it must be qualified with the interpolation qualifier

+       *    flat."

+       */

+      if (state->language_version >= 130

+          && state->target == vertex_shader

+          && state->current_function == NULL

+          && var->type->is_integer()

+          && var->mode == ir_var_out

+          && var->interpolation != ir_var_flat) {

+

+         _mesa_glsl_error(&loc, state, "If a vertex output is an integer, "

+                          "then it must be qualified with 'flat'");

+      }

+

+

+      /* Interpolation qualifiers cannot be applied to 'centroid' and

+       * 'centroid varying'.

+       *

+       * From page 29 (page 35 of the PDF) of the GLSL 1.30 spec:

+       *    "interpolation qualifiers may only precede the qualifiers in,

+       *    centroid in, out, or centroid out in a declaration. They do not apply

+       *    to the deprecated storage qualifiers varying or centroid varying."

+       */

+      if (state->language_version >= 130

+          && this->type->qualifier.has_interpolation()

+          && this->type->qualifier.flags.q.varying) {

+

+         const char *i = this->type->qualifier.interpolation_string();

+         assert(i != NULL);

+         const char *s;

+         if (this->type->qualifier.flags.q.centroid)

+            s = "centroid varying";

+         else

+            s = "varying";

+

+         _mesa_glsl_error(&loc, state,

+                          "qualifier '%s' cannot be applied to the "

+                          "deprecated storage qualifier '%s'", i, s);

+      }

+

+

+      /* Interpolation qualifiers can only apply to vertex shader outputs and

+       * fragment shader inputs.

+       *

+       * From page 29 (page 35 of the PDF) of the GLSL 1.30 spec:

+       *    "Outputs from a vertex shader (out) and inputs to a fragment

+       *    shader (in) can be further qualified with one or more of these

+       *    interpolation qualifiers"

+       */

+      if (state->language_version >= 130

+          && this->type->qualifier.has_interpolation()) {

+

+         const char *i = this->type->qualifier.interpolation_string();

+         assert(i != NULL);

+

+         switch (state->target) {

+         case vertex_shader:

+            if (this->type->qualifier.flags.q.in) {

+               _mesa_glsl_error(&loc, state,

+                                "qualifier '%s' cannot be applied to vertex "

+                                "shader inputs", i);

+            }

+            break;

+         case fragment_shader:

+            if (this->type->qualifier.flags.q.out) {

+               _mesa_glsl_error(&loc, state,

+                                "qualifier '%s' cannot be applied to fragment "

+                                "shader outputs", i);

+            }

+            break;

+         default:

+            assert(0);

+         }

+      }

+

+

+      /* From section 4.3.4 of the GLSL 1.30 spec:

+       *    "It is an error to use centroid in in a vertex shader."

+       */

+      if (state->language_version >= 130

+          && this->type->qualifier.flags.q.centroid

+          && this->type->qualifier.flags.q.in

+          && state->target == vertex_shader) {

+

+         _mesa_glsl_error(&loc, state,

+                          "'centroid in' cannot be used in a vertex shader");

+      }

+

+

+      /* Precision qualifiers exists only in GLSL versions 1.00 and >= 1.30.

+       */

+      if (this->type->specifier->precision != ast_precision_none

+          && state->language_version != 100

+          && state->language_version < 130) {

+

+         _mesa_glsl_error(&loc, state,

+                          "precision qualifiers are supported only in GLSL ES "

+                          "1.00, and GLSL 1.30 and later");

+      }

+

+

+      /* Precision qualifiers only apply to floating point and integer types.

+       *

+       * From section 4.5.2 of the GLSL 1.30 spec:

+       *    "Any floating point or any integer declaration can have the type

+       *    preceded by one of these precision qualifiers [...] Literal

+       *    constants do not have precision qualifiers. Neither do Boolean

+       *    variables.

+       *

+       * In GLSL ES, sampler types are also allowed.

+       *

+       * From page 87 of the GLSL ES spec:

+       *    "RESOLUTION: Allow sampler types to take a precision qualifier."

+       */

+      if (this->type->specifier->precision != ast_precision_none

+          && !var->type->is_float()

+          && !var->type->is_integer()

+          && !(var->type->is_sampler() && state->es_shader)

+          && !(var->type->is_array()

+               && (var->type->fields.array->is_float()

+                   || var->type->fields.array->is_integer()))) {

+

+         _mesa_glsl_error(&loc, state,

+                          "precision qualifiers apply only to floating point"

+                          "%s types", state->es_shader ? ", integer, and sampler"

+						       : "and integer");

+      }

+

+      /* Process the initializer and add its instructions to a temporary

+       * list.  This list will be added to the instruction stream (below) after

+       * the declaration is added.  This is done because in some cases (such as

+       * redeclarations) the declaration may not actually be added to the

+       * instruction stream.

+       */

+      exec_list initializer_instructions;

+      ir_variable *earlier = get_variable_being_redeclared(var, decl, state);

+

+      if (decl->initializer != NULL) {

+	 result = process_initializer((earlier == NULL) ? var : earlier,

+				      decl, this->type,

+				      &initializer_instructions, state);

+      }

+

+      /* From page 23 (page 29 of the PDF) of the GLSL 1.10 spec:

+       *

+       *     "It is an error to write to a const variable outside of

+       *      its declaration, so they must be initialized when

+       *      declared."

+       */

+      if (this->type->qualifier.flags.q.constant && decl->initializer == NULL) {

+	 _mesa_glsl_error(& loc, state,

+			  "const declaration of `%s' must be initialized",

+			  decl->identifier);

+      }

+

+      /* If the declaration is not a redeclaration, there are a few additional

+       * semantic checks that must be applied.  In addition, variable that was

+       * created for the declaration should be added to the IR stream.

+       */

+      if (earlier == NULL) {

+	 /* From page 15 (page 21 of the PDF) of the GLSL 1.10 spec,

+	  *

+	  *   "Identifiers starting with "gl_" are reserved for use by

+	  *   OpenGL, and may not be declared in a shader as either a

+	  *   variable or a function."

+	  */

+	 if (strncmp(decl->identifier, "gl_", 3) == 0)

+	    _mesa_glsl_error(& loc, state,

+			     "identifier `%s' uses reserved `gl_' prefix",

+			     decl->identifier);

+

+	 /* Add the variable to the symbol table.  Note that the initializer's

+	  * IR was already processed earlier (though it hasn't been emitted

+	  * yet), without the variable in scope.

+	  *

+	  * This differs from most C-like languages, but it follows the GLSL

+	  * specification.  From page 28 (page 34 of the PDF) of the GLSL 1.50

+	  * spec:

+	  *

+	  *     "Within a declaration, the scope of a name starts immediately

+	  *     after the initializer if present or immediately after the name

+	  *     being declared if not."

+	  */

+	 if (!state->symbols->add_variable(var)) {

+	    YYLTYPE loc = this->get_location();

+	    _mesa_glsl_error(&loc, state, "name `%s' already taken in the "

+			     "current scope", decl->identifier);

+	    continue;

+	 }

+

+	 /* Push the variable declaration to the top.  It means that all the

+	  * variable declarations will appear in a funny last-to-first order,

+	  * but otherwise we run into trouble if a function is prototyped, a

+	  * global var is decled, then the function is defined with usage of

+	  * the global var.  See glslparsertest's CorrectModule.frag.

+	  */

+	 instructions->push_head(var);

+      }

+

+      instructions->append_list(&initializer_instructions);

+   }

+

+

+   /* Generally, variable declarations do not have r-values.  However,

+    * one is used for the declaration in

+    *

+    * while (bool b = some_condition()) {

+    *   ...

+    * }

+    *

+    * so we return the rvalue from the last seen declaration here.

+    */

+   return result;

+}

+

+

+ir_rvalue *

+ast_parameter_declarator::hir(exec_list *instructions,

+			      struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   const struct glsl_type *type;

+   const char *name = NULL;

+   YYLTYPE loc = this->get_location();

+

+   type = this->type->specifier->glsl_type(& name, state);

+

+   if (type == NULL) {

+      if (name != NULL) {

+	 _mesa_glsl_error(& loc, state,

+			  "invalid type `%s' in declaration of `%s'",

+			  name, this->identifier);

+      } else {

+	 _mesa_glsl_error(& loc, state,

+			  "invalid type in declaration of `%s'",

+			  this->identifier);

+      }

+

+      type = glsl_type::error_type;

+   }

+

+   /* From page 62 (page 68 of the PDF) of the GLSL 1.50 spec:

+    *

+    *    "Functions that accept no input arguments need not use void in the

+    *    argument list because prototypes (or definitions) are required and

+    *    therefore there is no ambiguity when an empty argument list "( )" is

+    *    declared. The idiom "(void)" as a parameter list is provided for

+    *    convenience."

+    *

+    * Placing this check here prevents a void parameter being set up

+    * for a function, which avoids tripping up checks for main taking

+    * parameters and lookups of an unnamed symbol.

+    */

+   if (type->is_void()) {

+      if (this->identifier != NULL)

+	 _mesa_glsl_error(& loc, state,

+			  "named parameter cannot have type `void'");

+

+      is_void = true;

+      return NULL;

+   }

+

+   if (formal_parameter && (this->identifier == NULL)) {

+      _mesa_glsl_error(& loc, state, "formal parameter lacks a name");

+      return NULL;

+   }

+

+   /* This only handles "vec4 foo[..]".  The earlier specifier->glsl_type(...)

+    * call already handled the "vec4[..] foo" case.

+    */

+   if (this->is_array) {

+      type = process_array_type(&loc, type, this->array_size, state);

+   }

+

+   if (type->array_size() == 0) {

+      _mesa_glsl_error(&loc, state, "arrays passed as parameters must have "

+		       "a declared size.");

+      type = glsl_type::error_type;

+   }

+

+   is_void = false;

+   ir_variable *var = new(ctx) ir_variable(type, this->identifier, ir_var_in);

+

+   /* Apply any specified qualifiers to the parameter declaration.  Note that

+    * for function parameters the default mode is 'in'.

+    */

+   apply_type_qualifier_to_variable(& this->type->qualifier, var, state, & loc);

+

+   instructions->push_tail(var);

+

+   /* Parameter declarations do not have r-values.

+    */

+   return NULL;

+}

+

+

+void

+ast_parameter_declarator::parameters_to_hir(exec_list *ast_parameters,

+					    bool formal,

+					    exec_list *ir_parameters,

+					    _mesa_glsl_parse_state *state)

+{

+   ast_parameter_declarator *void_param = NULL;

+   unsigned count = 0;

+

+   foreach_list_typed (ast_parameter_declarator, param, link, ast_parameters) {

+      param->formal_parameter = formal;

+      param->hir(ir_parameters, state);

+

+      if (param->is_void)

+	 void_param = param;

+

+      count++;

+   }

+

+   if ((void_param != NULL) && (count > 1)) {

+      YYLTYPE loc = void_param->get_location();

+

+      _mesa_glsl_error(& loc, state,

+		       "`void' parameter must be only parameter");

+   }

+}

+

+

+void

+emit_function(_mesa_glsl_parse_state *state, exec_list *instructions,

+	      ir_function *f)

+{

+   /* Emit the new function header */

+   if (state->current_function == NULL) {

+      instructions->push_tail(f);

+   } else {

+      /* IR invariants disallow function declarations or definitions nested

+       * within other function definitions.  Insert the new ir_function

+       * block in the instruction sequence before the ir_function block

+       * containing the current ir_function_signature.

+       */

+      ir_function *const curr =

+	 const_cast<ir_function *>(state->current_function->function());

+

+      curr->insert_before(f);

+   }

+}

+

+

+ir_rvalue *

+ast_function::hir(exec_list *instructions,

+		  struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   ir_function *f = NULL;

+   ir_function_signature *sig = NULL;

+   exec_list hir_parameters;

+

+   const char *const name = identifier;

+

+   /* From page 21 (page 27 of the PDF) of the GLSL 1.20 spec,

+    *

+    *   "Function declarations (prototypes) cannot occur inside of functions;

+    *   they must be at global scope, or for the built-in functions, outside

+    *   the global scope."

+    *

+    * From page 27 (page 33 of the PDF) of the GLSL ES 1.00.16 spec,

+    *

+    *   "User defined functions may only be defined within the global scope."

+    *

+    * Note that this language does not appear in GLSL 1.10.

+    */

+   if ((state->current_function != NULL) && (state->language_version != 110)) {

+      YYLTYPE loc = this->get_location();

+      _mesa_glsl_error(&loc, state,

+		       "declaration of function `%s' not allowed within "

+		       "function body", name);

+   }

+

+   /* From page 15 (page 21 of the PDF) of the GLSL 1.10 spec,

+    *

+    *   "Identifiers starting with "gl_" are reserved for use by

+    *   OpenGL, and may not be declared in a shader as either a

+    *   variable or a function."

+    */

+   if (strncmp(name, "gl_", 3) == 0) {

+      YYLTYPE loc = this->get_location();

+      _mesa_glsl_error(&loc, state,

+		       "identifier `%s' uses reserved `gl_' prefix", name);

+   }

+

+   /* Convert the list of function parameters to HIR now so that they can be

+    * used below to compare this function's signature with previously seen

+    * signatures for functions with the same name.

+    */

+   ast_parameter_declarator::parameters_to_hir(& this->parameters,

+					       is_definition,

+					       & hir_parameters, state);

+

+   const char *return_type_name;

+   const glsl_type *return_type =

+      this->return_type->specifier->glsl_type(& return_type_name, state);

+

+   if (!return_type) {

+      YYLTYPE loc = this->get_location();

+      _mesa_glsl_error(&loc, state,

+		       "function `%s' has undeclared return type `%s'",

+		       name, return_type_name);

+      return_type = glsl_type::error_type;

+   }

+

+   /* From page 56 (page 62 of the PDF) of the GLSL 1.30 spec:

+    * "No qualifier is allowed on the return type of a function."

+    */

+   if (this->return_type->has_qualifiers()) {

+      YYLTYPE loc = this->get_location();

+      _mesa_glsl_error(& loc, state,

+		       "function `%s' return type has qualifiers", name);

+   }

+

+   /* Verify that this function's signature either doesn't match a previously

+    * seen signature for a function with the same name, or, if a match is found,

+    * that the previously seen signature does not have an associated definition.

+    */

+   f = state->symbols->get_function(name);

+   if (f != NULL && (state->es_shader || f->has_user_signature())) {

+      sig = f->exact_matching_signature(&hir_parameters);

+      if (sig != NULL) {

+	 const char *badvar = sig->qualifiers_match(&hir_parameters);

+	 if (badvar != NULL) {

+	    YYLTYPE loc = this->get_location();

+

+	    _mesa_glsl_error(&loc, state, "function `%s' parameter `%s' "

+			     "qualifiers don't match prototype", name, badvar);

+	 }

+

+	 if (sig->return_type != return_type) {

+	    YYLTYPE loc = this->get_location();

+

+	    _mesa_glsl_error(&loc, state, "function `%s' return type doesn't "

+			     "match prototype", name);

+	 }

+

+	 if (is_definition && sig->is_defined) {

+	    YYLTYPE loc = this->get_location();

+

+	    _mesa_glsl_error(& loc, state, "function `%s' redefined", name);

+	 }

+      }

+   } else {

+      f = new(ctx) ir_function(name);

+      if (!state->symbols->add_function(f)) {

+	 /* This function name shadows a non-function use of the same name. */

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(&loc, state, "function name `%s' conflicts with "

+			  "non-function", name);

+	 return NULL;

+      }

+

+      emit_function(state, instructions, f);

+   }

+

+   /* Verify the return type of main() */

+   if (strcmp(name, "main") == 0) {

+      if (! return_type->is_void()) {

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(& loc, state, "main() must return void");

+      }

+

+      if (!hir_parameters.is_empty()) {

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(& loc, state, "main() must not take any parameters");

+      }

+   }

+

+   /* Finish storing the information about this new function in its signature.

+    */

+   if (sig == NULL) {

+      sig = new(ctx) ir_function_signature(return_type);

+      f->add_signature(sig);

+   }

+

+   sig->replace_parameters(&hir_parameters);

+   signature = sig;

+

+   /* Function declarations (prototypes) do not have r-values.

+    */

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_function_definition::hir(exec_list *instructions,

+			     struct _mesa_glsl_parse_state *state)

+{

+   prototype->is_definition = true;

+   prototype->hir(instructions, state);

+

+   ir_function_signature *signature = prototype->signature;

+   if (signature == NULL)

+      return NULL;

+

+   assert(state->current_function == NULL);

+   state->current_function = signature;

+   state->found_return = false;

+

+   /* Duplicate parameters declared in the prototype as concrete variables.

+    * Add these to the symbol table.

+    */

+   state->symbols->push_scope();

+   foreach_iter(exec_list_iterator, iter, signature->parameters) {

+      ir_variable *const var = ((ir_instruction *) iter.get())->as_variable();

+

+      assert(var != NULL);

+

+      /* The only way a parameter would "exist" is if two parameters have

+       * the same name.

+       */

+      if (state->symbols->name_declared_this_scope(var->name)) {

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(& loc, state, "parameter `%s' redeclared", var->name);

+      } else {

+	 state->symbols->add_variable(var);

+      }

+   }

+

+   /* Convert the body of the function to HIR. */

+   this->body->hir(&signature->body, state);

+   signature->is_defined = true;

+

+   state->symbols->pop_scope();

+

+   assert(state->current_function == signature);

+   state->current_function = NULL;

+

+   if (!signature->return_type->is_void() && !state->found_return) {

+      YYLTYPE loc = this->get_location();

+      _mesa_glsl_error(& loc, state, "function `%s' has non-void return type "

+		       "%s, but no return statement",

+		       signature->function_name(),

+		       signature->return_type->name);

+   }

+

+   /* Function definitions do not have r-values.

+    */

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_jump_statement::hir(exec_list *instructions,

+			struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+

+   switch (mode) {

+   case ast_return: {

+      ir_return *inst;

+      assert(state->current_function);

+

+      if (opt_return_value) {

+	 ir_rvalue *const ret = opt_return_value->hir(instructions, state);

+

+	 /* The value of the return type can be NULL if the shader says

+	  * 'return foo();' and foo() is a function that returns void.

+	  *

+	  * NOTE: The GLSL spec doesn't say that this is an error.  The type

+	  * of the return value is void.  If the return type of the function is

+	  * also void, then this should compile without error.  Seriously.

+	  */

+	 const glsl_type *const ret_type =

+	    (ret == NULL) ? glsl_type::void_type : ret->type;

+

+	 /* Implicit conversions are not allowed for return values. */

+	 if (state->current_function->return_type != ret_type) {

+	    YYLTYPE loc = this->get_location();

+

+	    _mesa_glsl_error(& loc, state,

+			     "`return' with wrong type %s, in function `%s' "

+			     "returning %s",

+			     ret_type->name,

+			     state->current_function->function_name(),

+			     state->current_function->return_type->name);

+	 }

+

+	 inst = new(ctx) ir_return(ret);

+      } else {

+	 if (state->current_function->return_type->base_type !=

+	     GLSL_TYPE_VOID) {

+	    YYLTYPE loc = this->get_location();

+

+	    _mesa_glsl_error(& loc, state,

+			     "`return' with no value, in function %s returning "

+			     "non-void",

+			     state->current_function->function_name());

+	 }

+	 inst = new(ctx) ir_return;

+      }

+

+      state->found_return = true;

+      instructions->push_tail(inst);

+      break;

+   }

+

+   case ast_discard:

+      if (state->target != fragment_shader) {

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(& loc, state,

+			  "`discard' may only appear in a fragment shader");

+      }

+      instructions->push_tail(new(ctx) ir_discard);

+      break;

+

+   case ast_break:

+   case ast_continue:

+      /* FINISHME: Handle switch-statements.  They cannot contain 'continue',

+       * FINISHME: and they use a different IR instruction for 'break'.

+       */

+      /* FINISHME: Correctly handle the nesting.  If a switch-statement is

+       * FINISHME: inside a loop, a 'continue' is valid and will bind to the

+       * FINISHME: loop.

+       */

+      if (state->loop_or_switch_nesting == NULL) {

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(& loc, state,

+			  "`%s' may only appear in a loop",

+			  (mode == ast_break) ? "break" : "continue");

+      } else {

+	 ir_loop *const loop = state->loop_or_switch_nesting->as_loop();

+

+	 /* Inline the for loop expression again, since we don't know

+	  * where near the end of the loop body the normal copy of it

+	  * is going to be placed.

+	  */

+	 if (mode == ast_continue &&

+	     state->loop_or_switch_nesting_ast->rest_expression) {

+	    state->loop_or_switch_nesting_ast->rest_expression->hir(instructions,

+								    state);

+	 }

+

+	 if (loop != NULL) {

+	    ir_loop_jump *const jump =

+	       new(ctx) ir_loop_jump((mode == ast_break)

+				     ? ir_loop_jump::jump_break

+				     : ir_loop_jump::jump_continue);

+	    instructions->push_tail(jump);

+	 }

+      }

+

+      break;

+   }

+

+   /* Jump instructions do not have r-values.

+    */

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_selection_statement::hir(exec_list *instructions,

+			     struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+

+   ir_rvalue *const condition = this->condition->hir(instructions, state);

+

+   /* From page 66 (page 72 of the PDF) of the GLSL 1.50 spec:

+    *

+    *    "Any expression whose type evaluates to a Boolean can be used as the

+    *    conditional expression bool-expression. Vector types are not accepted

+    *    as the expression to if."

+    *

+    * The checks are separated so that higher quality diagnostics can be

+    * generated for cases where both rules are violated.

+    */

+   if (!condition->type->is_boolean() || !condition->type->is_scalar()) {

+      YYLTYPE loc = this->condition->get_location();

+

+      _mesa_glsl_error(& loc, state, "if-statement condition must be scalar "

+		       "boolean");

+   }

+

+   ir_if *const stmt = new(ctx) ir_if(condition);

+

+   if (then_statement != NULL) {

+      state->symbols->push_scope();

+      then_statement->hir(& stmt->then_instructions, state);

+      state->symbols->pop_scope();

+   }

+

+   if (else_statement != NULL) {

+      state->symbols->push_scope();

+      else_statement->hir(& stmt->else_instructions, state);

+      state->symbols->pop_scope();

+   }

+

+   instructions->push_tail(stmt);

+

+   /* if-statements do not have r-values.

+    */

+   return NULL;

+}

+

+

+void

+ast_iteration_statement::condition_to_hir(ir_loop *stmt,

+					  struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+

+   if (condition != NULL) {

+      ir_rvalue *const cond =

+	 condition->hir(& stmt->body_instructions, state);

+

+      if ((cond == NULL)

+	  || !cond->type->is_boolean() || !cond->type->is_scalar()) {

+	 YYLTYPE loc = condition->get_location();

+

+	 _mesa_glsl_error(& loc, state,

+			  "loop condition must be scalar boolean");

+      } else {

+	 /* As the first code in the loop body, generate a block that looks

+	  * like 'if (!condition) break;' as the loop termination condition.

+	  */

+	 ir_rvalue *const not_cond =

+	    new(ctx) ir_expression(ir_unop_logic_not, glsl_type::bool_type, cond,

+				   NULL);

+

+	 ir_if *const if_stmt = new(ctx) ir_if(not_cond);

+

+	 ir_jump *const break_stmt =

+	    new(ctx) ir_loop_jump(ir_loop_jump::jump_break);

+

+	 if_stmt->then_instructions.push_tail(break_stmt);

+	 stmt->body_instructions.push_tail(if_stmt);

+      }

+   }

+}

+

+

+ir_rvalue *

+ast_iteration_statement::hir(exec_list *instructions,

+			     struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+

+   /* For-loops and while-loops start a new scope, but do-while loops do not.

+    */

+   if (mode != ast_do_while)

+      state->symbols->push_scope();

+

+   if (init_statement != NULL)

+      init_statement->hir(instructions, state);

+

+   ir_loop *const stmt = new(ctx) ir_loop();

+   instructions->push_tail(stmt);

+

+   /* Track the current loop and / or switch-statement nesting.

+    */

+   ir_instruction *const nesting = state->loop_or_switch_nesting;

+   ast_iteration_statement *nesting_ast = state->loop_or_switch_nesting_ast;

+

+   state->loop_or_switch_nesting = stmt;

+   state->loop_or_switch_nesting_ast = this;

+

+   if (mode != ast_do_while)

+      condition_to_hir(stmt, state);

+

+   if (body != NULL)

+      body->hir(& stmt->body_instructions, state);

+

+   if (rest_expression != NULL)

+      rest_expression->hir(& stmt->body_instructions, state);

+

+   if (mode == ast_do_while)

+      condition_to_hir(stmt, state);

+

+   if (mode != ast_do_while)

+      state->symbols->pop_scope();

+

+   /* Restore previous nesting before returning.

+    */

+   state->loop_or_switch_nesting = nesting;

+   state->loop_or_switch_nesting_ast = nesting_ast;

+

+   /* Loops do not have r-values.

+    */

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_type_specifier::hir(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   if (!this->is_precision_statement && this->structure == NULL)

+      return NULL;

+

+   YYLTYPE loc = this->get_location();

+

+   if (this->precision != ast_precision_none

+       && state->language_version != 100

+       && state->language_version < 130) {

+      _mesa_glsl_error(&loc, state,

+                       "precision qualifiers exist only in "

+                       "GLSL ES 1.00, and GLSL 1.30 and later");

+      return NULL;

+   }

+   if (this->precision != ast_precision_none

+       && this->structure != NULL) {

+      _mesa_glsl_error(&loc, state,

+                       "precision qualifiers do not apply to structures");

+      return NULL;

+   }

+

+   /* If this is a precision statement, check that the type to which it is

+    * applied is either float or int.

+    *

+    * From section 4.5.3 of the GLSL 1.30 spec:

+    *    "The precision statement

+    *       precision precision-qualifier type;

+    *    can be used to establish a default precision qualifier. The type

+    *    field can be either int or float [...].  Any other types or

+    *    qualifiers will result in an error.

+    */

+   if (this->is_precision_statement) {

+      assert(this->precision != ast_precision_none);

+      assert(this->structure == NULL); /* The check for structures was

+                                        * performed above. */

+      if (this->is_array) {

+         _mesa_glsl_error(&loc, state,

+                          "default precision statements do not apply to "

+                          "arrays");

+         return NULL;

+      }

+      if (this->type_specifier != ast_float

+          && this->type_specifier != ast_int) {

+         _mesa_glsl_error(&loc, state,

+                          "default precision statements apply only to types "

+                          "float and int");

+         return NULL;

+      }

+

+      /* FINISHME: Translate precision statements into IR. */

+      return NULL;

+   }

+

+   if (this->structure != NULL)

+      return this->structure->hir(instructions, state);

+

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_struct_specifier::hir(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   unsigned decl_count = 0;

+

+   /* Make an initial pass over the list of structure fields to determine how

+    * many there are.  Each element in this list is an ast_declarator_list.

+    * This means that we actually need to count the number of elements in the

+    * 'declarations' list in each of the elements.

+    */

+   foreach_list_typed (ast_declarator_list, decl_list, link,

+		       &this->declarations) {

+      foreach_list_const (decl_ptr, & decl_list->declarations) {

+	 decl_count++;

+      }

+   }

+

+   /* Allocate storage for the structure fields and process the field

+    * declarations.  As the declarations are processed, try to also convert

+    * the types to HIR.  This ensures that structure definitions embedded in

+    * other structure definitions are processed.

+    */

+   glsl_struct_field *const fields = ralloc_array(state, glsl_struct_field,

+						  decl_count);

+

+   unsigned i = 0;

+   foreach_list_typed (ast_declarator_list, decl_list, link,

+		       &this->declarations) {

+      const char *type_name;

+

+      decl_list->type->specifier->hir(instructions, state);

+

+      /* Section 10.9 of the GLSL ES 1.00 specification states that

+       * embedded structure definitions have been removed from the language.

+       */

+      if (state->es_shader && decl_list->type->specifier->structure != NULL) {

+	 YYLTYPE loc = this->get_location();

+	 _mesa_glsl_error(&loc, state, "Embedded structure definitions are "

+			  "not allowed in GLSL ES 1.00.");

+      }

+

+      const glsl_type *decl_type =

+	 decl_list->type->specifier->glsl_type(& type_name, state);

+

+      foreach_list_typed (ast_declaration, decl, link,

+			  &decl_list->declarations) {

+	 const struct glsl_type *field_type = decl_type;

+	 if (decl->is_array) {

+	    YYLTYPE loc = decl->get_location();

+	    field_type = process_array_type(&loc, decl_type, decl->array_size,

+					    state);

+	 }

+	 fields[i].type = (field_type != NULL)

+	    ? field_type : glsl_type::error_type;

+	 fields[i].name = decl->identifier;

+	 i++;

+      }

+   }

+

+   assert(i == decl_count);

+

+   const glsl_type *t =

+      glsl_type::get_record_instance(fields, decl_count, this->name);

+

+   YYLTYPE loc = this->get_location();

+   if (!state->symbols->add_type(name, t)) {

+      _mesa_glsl_error(& loc, state, "struct `%s' previously defined", name);

+   } else {

+      const glsl_type **s = reralloc(state, state->user_structures,

+				     const glsl_type *,

+				     state->num_user_structures + 1);

+      if (s != NULL) {

+	 s[state->num_user_structures] = t;

+	 state->user_structures = s;

+	 state->num_user_structures++;

+      }

+   }

+

+   /* Structure type definitions do not have r-values.

+    */

+   return NULL;

+}

diff --git a/mesalib/src/glsl/ast_type.cpp b/mesalib/src/glsl/ast_type.cpp
index c680ae5f6..8e49bef8a 100644
--- a/mesalib/src/glsl/ast_type.cpp
+++ b/mesalib/src/glsl/ast_type.cpp
@@ -1,138 +1,138 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#include "ast.h"
-extern "C" {
-#include "program/symbol_table.h"
-}
-
-void
-ast_type_specifier::print(void) const
-{
-   if (type_specifier == ast_struct) {
-      structure->print();
-   } else {
-      printf("%s ", type_name);
-   }
-
-   if (is_array) {
-      printf("[ ");
-
-      if (array_size) {
-	 array_size->print();
-      }
-
-      printf("] ");
-   }
-}
-
-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_none),
-	is_precision_statement(false)
-{
-   static const char *const names[] = {
-      "void",
-      "float",
-      "int",
-      "uint",
-      "bool",
-      "vec2",
-      "vec3",
-      "vec4",
-      "bvec2",
-      "bvec3",
-      "bvec4",
-      "ivec2",
-      "ivec3",
-      "ivec4",
-      "uvec2",
-      "uvec3",
-      "uvec4",
-      "mat2",
-      "mat2x3",
-      "mat2x4",
-      "mat3x2",
-      "mat3",
-      "mat3x4",
-      "mat4x2",
-      "mat4x3",
-      "mat4",
-      "sampler1D",
-      "sampler2D",
-      "sampler2DRect",
-      "sampler3D",
-      "samplerCube",
-      "sampler1DShadow",
-      "sampler2DShadow",
-      "sampler2DRectShadow",
-      "samplerCubeShadow",
-      "sampler1DArray",
-      "sampler2DArray",
-      "sampler1DArrayShadow",
-      "sampler2DArrayShadow",
-      "isampler1D",
-      "isampler2D",
-      "isampler3D",
-      "isamplerCube",
-      "isampler1DArray",
-      "isampler2DArray",
-      "usampler1D",
-      "usampler2D",
-      "usampler3D",
-      "usamplerCube",
-      "usampler1DArray",
-      "usampler2DArray",
-
-      NULL, /* ast_struct */
-      NULL  /* ast_type_name */
-   };
-
-   type_name = names[specifier];
-}
-
-bool
-ast_fully_specified_type::has_qualifiers() const
-{
-   return this->qualifier.flags.i != 0;
-}
-
-bool ast_type_qualifier::has_interpolation() const
-{
-   return this->flags.q.smooth
-          || this->flags.q.flat
-          || this->flags.q.noperspective;
-}
-
-const char*
-ast_type_qualifier::interpolation_string() const
-{
-   if (this->flags.q.smooth)
-      return "smooth";
-   else if (this->flags.q.flat)
-      return "flat";
-   else if (this->flags.q.noperspective)
-      return "noperspective";
-   else
-      return NULL;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#include "ast.h"

+extern "C" {

+#include "program/symbol_table.h"

+}

+

+void

+ast_type_specifier::print(void) const

+{

+   if (type_specifier == ast_struct) {

+      structure->print();

+   } else {

+      printf("%s ", type_name);

+   }

+

+   if (is_array) {

+      printf("[ ");

+

+      if (array_size) {

+	 array_size->print();

+      }

+

+      printf("] ");

+   }

+}

+

+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_none),

+	is_precision_statement(false)

+{

+   static const char *const names[] = {

+      "void",

+      "float",

+      "int",

+      "uint",

+      "bool",

+      "vec2",

+      "vec3",

+      "vec4",

+      "bvec2",

+      "bvec3",

+      "bvec4",

+      "ivec2",

+      "ivec3",

+      "ivec4",

+      "uvec2",

+      "uvec3",

+      "uvec4",

+      "mat2",

+      "mat2x3",

+      "mat2x4",

+      "mat3x2",

+      "mat3",

+      "mat3x4",

+      "mat4x2",

+      "mat4x3",

+      "mat4",

+      "sampler1D",

+      "sampler2D",

+      "sampler2DRect",

+      "sampler3D",

+      "samplerCube",

+      "sampler1DShadow",

+      "sampler2DShadow",

+      "sampler2DRectShadow",

+      "samplerCubeShadow",

+      "sampler1DArray",

+      "sampler2DArray",

+      "sampler1DArrayShadow",

+      "sampler2DArrayShadow",

+      "isampler1D",

+      "isampler2D",

+      "isampler3D",

+      "isamplerCube",

+      "isampler1DArray",

+      "isampler2DArray",

+      "usampler1D",

+      "usampler2D",

+      "usampler3D",

+      "usamplerCube",

+      "usampler1DArray",

+      "usampler2DArray",

+

+      NULL, /* ast_struct */

+      NULL  /* ast_type_name */

+   };

+

+   type_name = names[specifier];

+}

+

+bool

+ast_fully_specified_type::has_qualifiers() const

+{

+   return this->qualifier.flags.i != 0;

+}

+

+bool ast_type_qualifier::has_interpolation() const

+{

+   return this->flags.q.smooth

+          || this->flags.q.flat

+          || this->flags.q.noperspective;

+}

+

+const char*

+ast_type_qualifier::interpolation_string() const

+{

+   if (this->flags.q.smooth)

+      return "smooth";

+   else if (this->flags.q.flat)

+      return "flat";

+   else if (this->flags.q.noperspective)

+      return "noperspective";

+   else

+      return NULL;

+}

diff --git a/mesalib/src/glsl/builtin_types.h b/mesalib/src/glsl/builtin_types.h
index 58b9a8127..6b98419ae 100644
--- a/mesalib/src/glsl/builtin_types.h
+++ b/mesalib/src/glsl/builtin_types.h
@@ -1,302 +1,302 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-const glsl_type glsl_type::_error_type =
-   glsl_type(GL_INVALID_ENUM, GLSL_TYPE_ERROR, 0, 0, "");
-
-const glsl_type glsl_type::_void_type =
-   glsl_type(GL_INVALID_ENUM, GLSL_TYPE_VOID, 0, 0, "void");
-
-const glsl_type glsl_type::_sampler3D_type =
-   glsl_type(GL_SAMPLER_3D, GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_FLOAT,
-	     "sampler3D");
-
-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
- *
- * These types exist in all versions of GLSL.
- */
-/*@{*/
-
-const glsl_type glsl_type::builtin_core_types[] = {
-   glsl_type(GL_BOOL,         GLSL_TYPE_BOOL, 1, 1, "bool"),
-   glsl_type(GL_BOOL_VEC2,    GLSL_TYPE_BOOL, 2, 1, "bvec2"),
-   glsl_type(GL_BOOL_VEC3,    GLSL_TYPE_BOOL, 3, 1, "bvec3"),
-   glsl_type(GL_BOOL_VEC4,    GLSL_TYPE_BOOL, 4, 1, "bvec4"),
-   glsl_type(GL_INT,          GLSL_TYPE_INT, 1, 1, "int"),
-   glsl_type(GL_INT_VEC2,     GLSL_TYPE_INT, 2, 1, "ivec2"),
-   glsl_type(GL_INT_VEC3,     GLSL_TYPE_INT, 3, 1, "ivec3"),
-   glsl_type(GL_INT_VEC4,     GLSL_TYPE_INT, 4, 1, "ivec4"),
-   glsl_type(GL_FLOAT,        GLSL_TYPE_FLOAT, 1, 1, "float"),
-   glsl_type(GL_FLOAT_VEC2,   GLSL_TYPE_FLOAT, 2, 1, "vec2"),
-   glsl_type(GL_FLOAT_VEC3,   GLSL_TYPE_FLOAT, 3, 1, "vec3"),
-   glsl_type(GL_FLOAT_VEC4,   GLSL_TYPE_FLOAT, 4, 1, "vec4"),
-   glsl_type(GL_FLOAT_MAT2,   GLSL_TYPE_FLOAT, 2, 2, "mat2"),
-   glsl_type(GL_FLOAT_MAT3,   GLSL_TYPE_FLOAT, 3, 3, "mat3"),
-   glsl_type(GL_FLOAT_MAT4,   GLSL_TYPE_FLOAT, 4, 4, "mat4"),
-   glsl_type(GL_SAMPLER_2D,   GLSL_SAMPLER_DIM_2D, 0, 0, GLSL_TYPE_FLOAT,
-	     "sampler2D"),
-   glsl_type(GL_SAMPLER_CUBE, GLSL_SAMPLER_DIM_CUBE, 0, 0, GLSL_TYPE_FLOAT,
-	     "samplerCube"),
-};
-
-const glsl_type *const glsl_type::bool_type  = & builtin_core_types[0];
-const glsl_type *const glsl_type::int_type   = & builtin_core_types[4];
-const glsl_type *const glsl_type::ivec4_type = & builtin_core_types[7];
-const glsl_type *const glsl_type::float_type = & builtin_core_types[8];
-const glsl_type *const glsl_type::vec2_type = & builtin_core_types[9];
-const glsl_type *const glsl_type::vec3_type = & builtin_core_types[10];
-const glsl_type *const glsl_type::vec4_type = & builtin_core_types[11];
-const glsl_type *const glsl_type::mat2_type = & builtin_core_types[12];
-const glsl_type *const glsl_type::mat3_type = & builtin_core_types[13];
-const glsl_type *const glsl_type::mat4_type = & builtin_core_types[14];
-/*@}*/
-
-/** \name GLSL structures that have not been deprecated.
- */
-/*@{*/
-
-static const struct glsl_struct_field gl_DepthRangeParameters_fields[] = {
-   { glsl_type::float_type, "near" },
-   { glsl_type::float_type, "far" },
-   { glsl_type::float_type, "diff" },
-};
-
-const glsl_type glsl_type::builtin_structure_types[] = {
-   glsl_type(gl_DepthRangeParameters_fields,
-             Elements(gl_DepthRangeParameters_fields),
-             "gl_DepthRangeParameters"),
-};
-/*@}*/
-
-/** \name GLSL 1.00 / 1.10 structures that are deprecated in GLSL 1.30
- */
-/*@{*/
-
-static const struct glsl_struct_field gl_PointParameters_fields[] = {
-   { glsl_type::float_type, "size" },
-   { glsl_type::float_type, "sizeMin" },
-   { glsl_type::float_type, "sizeMax" },
-   { glsl_type::float_type, "fadeThresholdSize" },
-   { glsl_type::float_type, "distanceConstantAttenuation" },
-   { glsl_type::float_type, "distanceLinearAttenuation" },
-   { glsl_type::float_type, "distanceQuadraticAttenuation" },
-};
-
-static const struct glsl_struct_field gl_MaterialParameters_fields[] = {
-   { glsl_type::vec4_type, "emission" },
-   { glsl_type::vec4_type, "ambient" },
-   { glsl_type::vec4_type, "diffuse" },
-   { glsl_type::vec4_type, "specular" },
-   { glsl_type::float_type, "shininess" },
-};
-
-static const struct glsl_struct_field gl_LightSourceParameters_fields[] = {
-   { glsl_type::vec4_type, "ambient" },
-   { glsl_type::vec4_type, "diffuse" },
-   { glsl_type::vec4_type, "specular" },
-   { glsl_type::vec4_type, "position" },
-   { glsl_type::vec4_type, "halfVector" },
-   { glsl_type::vec3_type, "spotDirection" },
-   { glsl_type::float_type, "spotExponent" },
-   { glsl_type::float_type, "spotCutoff" },
-   { glsl_type::float_type, "spotCosCutoff" },
-   { glsl_type::float_type, "constantAttenuation" },
-   { glsl_type::float_type, "linearAttenuation" },
-   { glsl_type::float_type, "quadraticAttenuation" },
-};
-
-static const struct glsl_struct_field gl_LightModelParameters_fields[] = {
-   { glsl_type::vec4_type, "ambient" },
-};
-
-static const struct glsl_struct_field gl_LightModelProducts_fields[] = {
-   { glsl_type::vec4_type, "sceneColor" },
-};
-
-static const struct glsl_struct_field gl_LightProducts_fields[] = {
-   { glsl_type::vec4_type, "ambient" },
-   { glsl_type::vec4_type, "diffuse" },
-   { glsl_type::vec4_type, "specular" },
-};
-
-static const struct glsl_struct_field gl_FogParameters_fields[] = {
-   { glsl_type::vec4_type, "color" },
-   { glsl_type::float_type, "density" },
-   { glsl_type::float_type, "start" },
-   { glsl_type::float_type, "end" },
-   { glsl_type::float_type, "scale" },
-};
-
-const glsl_type glsl_type::builtin_110_deprecated_structure_types[] = {
-   glsl_type(gl_PointParameters_fields,
-             Elements(gl_PointParameters_fields),
-             "gl_PointParameters"),
-   glsl_type(gl_MaterialParameters_fields,
-             Elements(gl_MaterialParameters_fields),
-             "gl_MaterialParameters"),
-   glsl_type(gl_LightSourceParameters_fields,
-             Elements(gl_LightSourceParameters_fields),
-             "gl_LightSourceParameters"),
-   glsl_type(gl_LightModelParameters_fields,
-             Elements(gl_LightModelParameters_fields),
-             "gl_LightModelParameters"),
-   glsl_type(gl_LightModelProducts_fields,
-             Elements(gl_LightModelProducts_fields),
-             "gl_LightModelProducts"),
-   glsl_type(gl_LightProducts_fields,
-             Elements(gl_LightProducts_fields),
-             "gl_LightProducts"),
-   glsl_type(gl_FogParameters_fields,
-             Elements(gl_FogParameters_fields),
-             "gl_FogParameters"),
-};
-/*@}*/
-
-/** \name Types in GLSL 1.10 (but not GLSL ES 1.00)
- */
-/*@{*/
-const glsl_type glsl_type::builtin_110_types[] = {
-   glsl_type(GL_SAMPLER_1D,   GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_FLOAT,
-	     "sampler1D"),
-   glsl_type(GL_SAMPLER_1D_SHADOW, GLSL_SAMPLER_DIM_1D, 1, 0, GLSL_TYPE_FLOAT,
-	     "sampler1DShadow"),
-   glsl_type(GL_SAMPLER_2D_SHADOW, GLSL_SAMPLER_DIM_2D, 1, 0, GLSL_TYPE_FLOAT,
-	     "sampler2DShadow"),
-};
-/*@}*/
-
-/** \name Types added in GLSL 1.20
- */
-/*@{*/
-
-const glsl_type glsl_type::builtin_120_types[] = {
-   glsl_type(GL_FLOAT_MAT2x3, GLSL_TYPE_FLOAT, 3, 2, "mat2x3"),
-   glsl_type(GL_FLOAT_MAT2x4, GLSL_TYPE_FLOAT, 4, 2, "mat2x4"),
-   glsl_type(GL_FLOAT_MAT3x2, GLSL_TYPE_FLOAT, 2, 3, "mat3x2"),
-   glsl_type(GL_FLOAT_MAT3x4, GLSL_TYPE_FLOAT, 4, 3, "mat3x4"),
-   glsl_type(GL_FLOAT_MAT4x2, GLSL_TYPE_FLOAT, 2, 4, "mat4x2"),
-   glsl_type(GL_FLOAT_MAT4x3, GLSL_TYPE_FLOAT, 3, 4, "mat4x3"),
-};
-const glsl_type *const glsl_type::mat2x3_type = & builtin_120_types[0];
-const glsl_type *const glsl_type::mat2x4_type = & builtin_120_types[1];
-const glsl_type *const glsl_type::mat3x2_type = & builtin_120_types[2];
-const glsl_type *const glsl_type::mat3x4_type = & builtin_120_types[3];
-const glsl_type *const glsl_type::mat4x2_type = & builtin_120_types[4];
-const glsl_type *const glsl_type::mat4x3_type = & builtin_120_types[5];
-/*@}*/
-
-/** \name Types added in GLSL 1.30
- */
-/*@{*/
-
-const glsl_type glsl_type::builtin_130_types[] = {
-   glsl_type(GL_UNSIGNED_INT,      GLSL_TYPE_UINT, 1, 1, "uint"),
-   glsl_type(GL_UNSIGNED_INT_VEC2, GLSL_TYPE_UINT, 2, 1, "uvec2"),
-   glsl_type(GL_UNSIGNED_INT_VEC3, GLSL_TYPE_UINT, 3, 1, "uvec3"),
-   glsl_type(GL_UNSIGNED_INT_VEC4, GLSL_TYPE_UINT, 4, 1, "uvec4"),
-
-   /* 1D and 2D texture arrays - several of these are included only in
-    * builtin_EXT_texture_array_types.
-    */
-   glsl_type(GL_INT_SAMPLER_1D_ARRAY,
-	     GLSL_SAMPLER_DIM_1D, 0, 1,   GLSL_TYPE_INT, "isampler1DArray"),
-   glsl_type(GL_UNSIGNED_INT_SAMPLER_1D_ARRAY,
-	     GLSL_SAMPLER_DIM_1D, 0, 1,  GLSL_TYPE_UINT, "usampler1DArray"),
-   glsl_type(GL_INT_SAMPLER_2D_ARRAY,
-	     GLSL_SAMPLER_DIM_2D, 0, 1,   GLSL_TYPE_INT, "isampler2DArray"),
-   glsl_type(GL_UNSIGNED_INT_SAMPLER_2D_ARRAY,
-	     GLSL_SAMPLER_DIM_2D, 0, 1,  GLSL_TYPE_UINT, "usampler2DArray"),
-
-   /* cube shadow samplers */
-   glsl_type(GL_SAMPLER_CUBE_SHADOW,
-	     GLSL_SAMPLER_DIM_CUBE, 1, 0, GLSL_TYPE_FLOAT, "samplerCubeShadow"),
-
-   /* signed and unsigned integer samplers */
-   glsl_type(GL_INT_SAMPLER_1D,
-	     GLSL_SAMPLER_DIM_1D, 0, 0,   GLSL_TYPE_INT, "isampler1D"),
-   glsl_type(GL_UNSIGNED_INT_SAMPLER_1D,
-	     GLSL_SAMPLER_DIM_1D, 0, 0,  GLSL_TYPE_UINT, "usampler1D"),
-   glsl_type(GL_INT_SAMPLER_2D,
-	     GLSL_SAMPLER_DIM_2D, 0, 0,   GLSL_TYPE_INT, "isampler2D"),
-   glsl_type(GL_UNSIGNED_INT_SAMPLER_2D,
-	     GLSL_SAMPLER_DIM_2D, 0, 0,  GLSL_TYPE_UINT, "usampler2D"),
-   glsl_type(GL_INT_SAMPLER_3D,
-	     GLSL_SAMPLER_DIM_3D, 0, 0,   GLSL_TYPE_INT, "isampler3D"),
-   glsl_type(GL_UNSIGNED_INT_SAMPLER_3D,
-	     GLSL_SAMPLER_DIM_3D, 0, 0,  GLSL_TYPE_UINT, "usampler3D"),
-   glsl_type(GL_INT_SAMPLER_CUBE,
-	     GLSL_SAMPLER_DIM_CUBE, 0, 0,   GLSL_TYPE_INT, "isamplerCube"),
-   glsl_type(GL_INT_SAMPLER_CUBE,
-	     GLSL_SAMPLER_DIM_CUBE, 0, 0,  GLSL_TYPE_UINT, "usamplerCube"),
-};
-
-const glsl_type *const glsl_type::uint_type = & builtin_130_types[0];
-const glsl_type *const glsl_type::uvec2_type = & builtin_130_types[1];
-const glsl_type *const glsl_type::uvec3_type = & builtin_130_types[2];
-const glsl_type *const glsl_type::uvec4_type = & builtin_130_types[3];
-/*@}*/
-
-/** \name Sampler types added by GL_ARB_texture_rectangle
- */
-/*@{*/
-
-const glsl_type glsl_type::builtin_ARB_texture_rectangle_types[] = {
-   glsl_type(GL_SAMPLER_2D_RECT,
-	     GLSL_SAMPLER_DIM_RECT, 0, 0, GLSL_TYPE_FLOAT, "sampler2DRect"),
-   glsl_type(GL_SAMPLER_2D_RECT_SHADOW,
-	     GLSL_SAMPLER_DIM_RECT, 1, 0, GLSL_TYPE_FLOAT, "sampler2DRectShadow"),
-};
-/*@}*/
-
-/** \name Sampler types added by GL_EXT_texture_array
- */
-/*@{*/
-
-const glsl_type glsl_type::builtin_EXT_texture_array_types[] = {
-   glsl_type(GL_SAMPLER_1D_ARRAY,
-	     GLSL_SAMPLER_DIM_1D, 0, 1, GLSL_TYPE_FLOAT, "sampler1DArray"),
-   glsl_type(GL_SAMPLER_2D_ARRAY,
-	     GLSL_SAMPLER_DIM_2D, 0, 1, GLSL_TYPE_FLOAT, "sampler2DArray"),
-   glsl_type(GL_SAMPLER_1D_ARRAY_SHADOW,
-	     GLSL_SAMPLER_DIM_1D, 1, 1, GLSL_TYPE_FLOAT, "sampler1DArrayShadow"),
-   glsl_type(GL_SAMPLER_2D_ARRAY_SHADOW,
-	     GLSL_SAMPLER_DIM_2D, 1, 1, GLSL_TYPE_FLOAT, "sampler2DArrayShadow"),
-};
-/*@}*/
-
-/** \name Sampler types added by GL_EXT_texture_buffer_object
- */
-/*@{*/
-
-const glsl_type glsl_type::builtin_EXT_texture_buffer_object_types[] = {
-   glsl_type(GL_SAMPLER_BUFFER,
-	     GLSL_SAMPLER_DIM_BUF, 0, 0, GLSL_TYPE_FLOAT, "samplerBuffer"),
-   glsl_type(GL_INT_SAMPLER_BUFFER,
-	     GLSL_SAMPLER_DIM_BUF, 0, 0,   GLSL_TYPE_INT, "isamplerBuffer"),
-   glsl_type(GL_UNSIGNED_INT_SAMPLER_BUFFER,
-	     GLSL_SAMPLER_DIM_BUF, 0, 0,  GLSL_TYPE_UINT, "usamplerBuffer"),
-};
-/*@}*/
+/*

+ * Copyright © 2009 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+const glsl_type glsl_type::_error_type =

+   glsl_type(GL_INVALID_ENUM, GLSL_TYPE_ERROR, 0, 0, "");

+

+const glsl_type glsl_type::_void_type =

+   glsl_type(GL_INVALID_ENUM, GLSL_TYPE_VOID, 0, 0, "void");

+

+const glsl_type glsl_type::_sampler3D_type =

+   glsl_type(GL_SAMPLER_3D, GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_FLOAT,

+	     "sampler3D");

+

+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

+ *

+ * These types exist in all versions of GLSL.

+ */

+/*@{*/

+

+const glsl_type glsl_type::builtin_core_types[] = {

+   glsl_type(GL_BOOL,         GLSL_TYPE_BOOL, 1, 1, "bool"),

+   glsl_type(GL_BOOL_VEC2,    GLSL_TYPE_BOOL, 2, 1, "bvec2"),

+   glsl_type(GL_BOOL_VEC3,    GLSL_TYPE_BOOL, 3, 1, "bvec3"),

+   glsl_type(GL_BOOL_VEC4,    GLSL_TYPE_BOOL, 4, 1, "bvec4"),

+   glsl_type(GL_INT,          GLSL_TYPE_INT, 1, 1, "int"),

+   glsl_type(GL_INT_VEC2,     GLSL_TYPE_INT, 2, 1, "ivec2"),

+   glsl_type(GL_INT_VEC3,     GLSL_TYPE_INT, 3, 1, "ivec3"),

+   glsl_type(GL_INT_VEC4,     GLSL_TYPE_INT, 4, 1, "ivec4"),

+   glsl_type(GL_FLOAT,        GLSL_TYPE_FLOAT, 1, 1, "float"),

+   glsl_type(GL_FLOAT_VEC2,   GLSL_TYPE_FLOAT, 2, 1, "vec2"),

+   glsl_type(GL_FLOAT_VEC3,   GLSL_TYPE_FLOAT, 3, 1, "vec3"),

+   glsl_type(GL_FLOAT_VEC4,   GLSL_TYPE_FLOAT, 4, 1, "vec4"),

+   glsl_type(GL_FLOAT_MAT2,   GLSL_TYPE_FLOAT, 2, 2, "mat2"),

+   glsl_type(GL_FLOAT_MAT3,   GLSL_TYPE_FLOAT, 3, 3, "mat3"),

+   glsl_type(GL_FLOAT_MAT4,   GLSL_TYPE_FLOAT, 4, 4, "mat4"),

+   glsl_type(GL_SAMPLER_2D,   GLSL_SAMPLER_DIM_2D, 0, 0, GLSL_TYPE_FLOAT,

+	     "sampler2D"),

+   glsl_type(GL_SAMPLER_CUBE, GLSL_SAMPLER_DIM_CUBE, 0, 0, GLSL_TYPE_FLOAT,

+	     "samplerCube"),

+};

+

+const glsl_type *const glsl_type::bool_type  = & builtin_core_types[0];

+const glsl_type *const glsl_type::int_type   = & builtin_core_types[4];

+const glsl_type *const glsl_type::ivec4_type = & builtin_core_types[7];

+const glsl_type *const glsl_type::float_type = & builtin_core_types[8];

+const glsl_type *const glsl_type::vec2_type = & builtin_core_types[9];

+const glsl_type *const glsl_type::vec3_type = & builtin_core_types[10];

+const glsl_type *const glsl_type::vec4_type = & builtin_core_types[11];

+const glsl_type *const glsl_type::mat2_type = & builtin_core_types[12];

+const glsl_type *const glsl_type::mat3_type = & builtin_core_types[13];

+const glsl_type *const glsl_type::mat4_type = & builtin_core_types[14];

+/*@}*/

+

+/** \name GLSL structures that have not been deprecated.

+ */

+/*@{*/

+

+static const struct glsl_struct_field gl_DepthRangeParameters_fields[] = {

+   { glsl_type::float_type, "near" },

+   { glsl_type::float_type, "far" },

+   { glsl_type::float_type, "diff" },

+};

+

+const glsl_type glsl_type::builtin_structure_types[] = {

+   glsl_type(gl_DepthRangeParameters_fields,

+             Elements(gl_DepthRangeParameters_fields),

+             "gl_DepthRangeParameters"),

+};

+/*@}*/

+

+/** \name GLSL 1.00 / 1.10 structures that are deprecated in GLSL 1.30

+ */

+/*@{*/

+

+static const struct glsl_struct_field gl_PointParameters_fields[] = {

+   { glsl_type::float_type, "size" },

+   { glsl_type::float_type, "sizeMin" },

+   { glsl_type::float_type, "sizeMax" },

+   { glsl_type::float_type, "fadeThresholdSize" },

+   { glsl_type::float_type, "distanceConstantAttenuation" },

+   { glsl_type::float_type, "distanceLinearAttenuation" },

+   { glsl_type::float_type, "distanceQuadraticAttenuation" },

+};

+

+static const struct glsl_struct_field gl_MaterialParameters_fields[] = {

+   { glsl_type::vec4_type, "emission" },

+   { glsl_type::vec4_type, "ambient" },

+   { glsl_type::vec4_type, "diffuse" },

+   { glsl_type::vec4_type, "specular" },

+   { glsl_type::float_type, "shininess" },

+};

+

+static const struct glsl_struct_field gl_LightSourceParameters_fields[] = {

+   { glsl_type::vec4_type, "ambient" },

+   { glsl_type::vec4_type, "diffuse" },

+   { glsl_type::vec4_type, "specular" },

+   { glsl_type::vec4_type, "position" },

+   { glsl_type::vec4_type, "halfVector" },

+   { glsl_type::vec3_type, "spotDirection" },

+   { glsl_type::float_type, "spotExponent" },

+   { glsl_type::float_type, "spotCutoff" },

+   { glsl_type::float_type, "spotCosCutoff" },

+   { glsl_type::float_type, "constantAttenuation" },

+   { glsl_type::float_type, "linearAttenuation" },

+   { glsl_type::float_type, "quadraticAttenuation" },

+};

+

+static const struct glsl_struct_field gl_LightModelParameters_fields[] = {

+   { glsl_type::vec4_type, "ambient" },

+};

+

+static const struct glsl_struct_field gl_LightModelProducts_fields[] = {

+   { glsl_type::vec4_type, "sceneColor" },

+};

+

+static const struct glsl_struct_field gl_LightProducts_fields[] = {

+   { glsl_type::vec4_type, "ambient" },

+   { glsl_type::vec4_type, "diffuse" },

+   { glsl_type::vec4_type, "specular" },

+};

+

+static const struct glsl_struct_field gl_FogParameters_fields[] = {

+   { glsl_type::vec4_type, "color" },

+   { glsl_type::float_type, "density" },

+   { glsl_type::float_type, "start" },

+   { glsl_type::float_type, "end" },

+   { glsl_type::float_type, "scale" },

+};

+

+const glsl_type glsl_type::builtin_110_deprecated_structure_types[] = {

+   glsl_type(gl_PointParameters_fields,

+             Elements(gl_PointParameters_fields),

+             "gl_PointParameters"),

+   glsl_type(gl_MaterialParameters_fields,

+             Elements(gl_MaterialParameters_fields),

+             "gl_MaterialParameters"),

+   glsl_type(gl_LightSourceParameters_fields,

+             Elements(gl_LightSourceParameters_fields),

+             "gl_LightSourceParameters"),

+   glsl_type(gl_LightModelParameters_fields,

+             Elements(gl_LightModelParameters_fields),

+             "gl_LightModelParameters"),

+   glsl_type(gl_LightModelProducts_fields,

+             Elements(gl_LightModelProducts_fields),

+             "gl_LightModelProducts"),

+   glsl_type(gl_LightProducts_fields,

+             Elements(gl_LightProducts_fields),

+             "gl_LightProducts"),

+   glsl_type(gl_FogParameters_fields,

+             Elements(gl_FogParameters_fields),

+             "gl_FogParameters"),

+};

+/*@}*/

+

+/** \name Types in GLSL 1.10 (but not GLSL ES 1.00)

+ */

+/*@{*/

+const glsl_type glsl_type::builtin_110_types[] = {

+   glsl_type(GL_SAMPLER_1D,   GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_FLOAT,

+	     "sampler1D"),

+   glsl_type(GL_SAMPLER_1D_SHADOW, GLSL_SAMPLER_DIM_1D, 1, 0, GLSL_TYPE_FLOAT,

+	     "sampler1DShadow"),

+   glsl_type(GL_SAMPLER_2D_SHADOW, GLSL_SAMPLER_DIM_2D, 1, 0, GLSL_TYPE_FLOAT,

+	     "sampler2DShadow"),

+};

+/*@}*/

+

+/** \name Types added in GLSL 1.20

+ */

+/*@{*/

+

+const glsl_type glsl_type::builtin_120_types[] = {

+   glsl_type(GL_FLOAT_MAT2x3, GLSL_TYPE_FLOAT, 3, 2, "mat2x3"),

+   glsl_type(GL_FLOAT_MAT2x4, GLSL_TYPE_FLOAT, 4, 2, "mat2x4"),

+   glsl_type(GL_FLOAT_MAT3x2, GLSL_TYPE_FLOAT, 2, 3, "mat3x2"),

+   glsl_type(GL_FLOAT_MAT3x4, GLSL_TYPE_FLOAT, 4, 3, "mat3x4"),

+   glsl_type(GL_FLOAT_MAT4x2, GLSL_TYPE_FLOAT, 2, 4, "mat4x2"),

+   glsl_type(GL_FLOAT_MAT4x3, GLSL_TYPE_FLOAT, 3, 4, "mat4x3"),

+};

+const glsl_type *const glsl_type::mat2x3_type = & builtin_120_types[0];

+const glsl_type *const glsl_type::mat2x4_type = & builtin_120_types[1];

+const glsl_type *const glsl_type::mat3x2_type = & builtin_120_types[2];

+const glsl_type *const glsl_type::mat3x4_type = & builtin_120_types[3];

+const glsl_type *const glsl_type::mat4x2_type = & builtin_120_types[4];

+const glsl_type *const glsl_type::mat4x3_type = & builtin_120_types[5];

+/*@}*/

+

+/** \name Types added in GLSL 1.30

+ */

+/*@{*/

+

+const glsl_type glsl_type::builtin_130_types[] = {

+   glsl_type(GL_UNSIGNED_INT,      GLSL_TYPE_UINT, 1, 1, "uint"),

+   glsl_type(GL_UNSIGNED_INT_VEC2, GLSL_TYPE_UINT, 2, 1, "uvec2"),

+   glsl_type(GL_UNSIGNED_INT_VEC3, GLSL_TYPE_UINT, 3, 1, "uvec3"),

+   glsl_type(GL_UNSIGNED_INT_VEC4, GLSL_TYPE_UINT, 4, 1, "uvec4"),

+

+   /* 1D and 2D texture arrays - several of these are included only in

+    * builtin_EXT_texture_array_types.

+    */

+   glsl_type(GL_INT_SAMPLER_1D_ARRAY,

+	     GLSL_SAMPLER_DIM_1D, 0, 1,   GLSL_TYPE_INT, "isampler1DArray"),

+   glsl_type(GL_UNSIGNED_INT_SAMPLER_1D_ARRAY,

+	     GLSL_SAMPLER_DIM_1D, 0, 1,  GLSL_TYPE_UINT, "usampler1DArray"),

+   glsl_type(GL_INT_SAMPLER_2D_ARRAY,

+	     GLSL_SAMPLER_DIM_2D, 0, 1,   GLSL_TYPE_INT, "isampler2DArray"),

+   glsl_type(GL_UNSIGNED_INT_SAMPLER_2D_ARRAY,

+	     GLSL_SAMPLER_DIM_2D, 0, 1,  GLSL_TYPE_UINT, "usampler2DArray"),

+

+   /* cube shadow samplers */

+   glsl_type(GL_SAMPLER_CUBE_SHADOW,

+	     GLSL_SAMPLER_DIM_CUBE, 1, 0, GLSL_TYPE_FLOAT, "samplerCubeShadow"),

+

+   /* signed and unsigned integer samplers */

+   glsl_type(GL_INT_SAMPLER_1D,

+	     GLSL_SAMPLER_DIM_1D, 0, 0,   GLSL_TYPE_INT, "isampler1D"),

+   glsl_type(GL_UNSIGNED_INT_SAMPLER_1D,

+	     GLSL_SAMPLER_DIM_1D, 0, 0,  GLSL_TYPE_UINT, "usampler1D"),

+   glsl_type(GL_INT_SAMPLER_2D,

+	     GLSL_SAMPLER_DIM_2D, 0, 0,   GLSL_TYPE_INT, "isampler2D"),

+   glsl_type(GL_UNSIGNED_INT_SAMPLER_2D,

+	     GLSL_SAMPLER_DIM_2D, 0, 0,  GLSL_TYPE_UINT, "usampler2D"),

+   glsl_type(GL_INT_SAMPLER_3D,

+	     GLSL_SAMPLER_DIM_3D, 0, 0,   GLSL_TYPE_INT, "isampler3D"),

+   glsl_type(GL_UNSIGNED_INT_SAMPLER_3D,

+	     GLSL_SAMPLER_DIM_3D, 0, 0,  GLSL_TYPE_UINT, "usampler3D"),

+   glsl_type(GL_INT_SAMPLER_CUBE,

+	     GLSL_SAMPLER_DIM_CUBE, 0, 0,   GLSL_TYPE_INT, "isamplerCube"),

+   glsl_type(GL_INT_SAMPLER_CUBE,

+	     GLSL_SAMPLER_DIM_CUBE, 0, 0,  GLSL_TYPE_UINT, "usamplerCube"),

+};

+

+const glsl_type *const glsl_type::uint_type = & builtin_130_types[0];

+const glsl_type *const glsl_type::uvec2_type = & builtin_130_types[1];

+const glsl_type *const glsl_type::uvec3_type = & builtin_130_types[2];

+const glsl_type *const glsl_type::uvec4_type = & builtin_130_types[3];

+/*@}*/

+

+/** \name Sampler types added by GL_ARB_texture_rectangle

+ */

+/*@{*/

+

+const glsl_type glsl_type::builtin_ARB_texture_rectangle_types[] = {

+   glsl_type(GL_SAMPLER_2D_RECT,

+	     GLSL_SAMPLER_DIM_RECT, 0, 0, GLSL_TYPE_FLOAT, "sampler2DRect"),

+   glsl_type(GL_SAMPLER_2D_RECT_SHADOW,

+	     GLSL_SAMPLER_DIM_RECT, 1, 0, GLSL_TYPE_FLOAT, "sampler2DRectShadow"),

+};

+/*@}*/

+

+/** \name Sampler types added by GL_EXT_texture_array

+ */

+/*@{*/

+

+const glsl_type glsl_type::builtin_EXT_texture_array_types[] = {

+   glsl_type(GL_SAMPLER_1D_ARRAY,

+	     GLSL_SAMPLER_DIM_1D, 0, 1, GLSL_TYPE_FLOAT, "sampler1DArray"),

+   glsl_type(GL_SAMPLER_2D_ARRAY,

+	     GLSL_SAMPLER_DIM_2D, 0, 1, GLSL_TYPE_FLOAT, "sampler2DArray"),

+   glsl_type(GL_SAMPLER_1D_ARRAY_SHADOW,

+	     GLSL_SAMPLER_DIM_1D, 1, 1, GLSL_TYPE_FLOAT, "sampler1DArrayShadow"),

+   glsl_type(GL_SAMPLER_2D_ARRAY_SHADOW,

+	     GLSL_SAMPLER_DIM_2D, 1, 1, GLSL_TYPE_FLOAT, "sampler2DArrayShadow"),

+};

+/*@}*/

+

+/** \name Sampler types added by GL_EXT_texture_buffer_object

+ */

+/*@{*/

+

+const glsl_type glsl_type::builtin_EXT_texture_buffer_object_types[] = {

+   glsl_type(GL_SAMPLER_BUFFER,

+	     GLSL_SAMPLER_DIM_BUF, 0, 0, GLSL_TYPE_FLOAT, "samplerBuffer"),

+   glsl_type(GL_INT_SAMPLER_BUFFER,

+	     GLSL_SAMPLER_DIM_BUF, 0, 0,   GLSL_TYPE_INT, "isamplerBuffer"),

+   glsl_type(GL_UNSIGNED_INT_SAMPLER_BUFFER,

+	     GLSL_SAMPLER_DIM_BUF, 0, 0,  GLSL_TYPE_UINT, "usamplerBuffer"),

+};

+/*@}*/

diff --git a/mesalib/src/glsl/doflexbison.bat b/mesalib/src/glsl/doflexbison.bat
new file mode 100644
index 000000000..8a5e4f0a6
--- /dev/null
+++ b/mesalib/src/glsl/doflexbison.bat
@@ -0,0 +1,21 @@
+@echo off

+setlocal

+

+cd "%~dp0"

+

+set M4=..\..\..\tools\mhmake\m4.exe

+set BISON_PKGDATADIR=../../../tools/mhmake/src/bisondata

+

+set path=..\..\..\tools\mhmake;%path%

+

+..\..\..\tools\mhmake\bison.exe -v -o glsl_parser.cpp -p "_mesa_glsl_" --defines=glsl_parser.h glsl_parser.yy

+

+..\..\..\tools\mhmake\bison.exe -v -o glcpp/glcpp-parse.c --defines=glcpp/glcpp-parse.h glcpp/glcpp-parse.y

+

+copy "..\..\..\tools\mhmake\flex++.exe" flex.exe

+flex.exe --nounistd -oglsl_lexer.cpp glsl_lexer.ll

+flex.exe --nounistd -oglcpp/glcpp-lex.c glcpp/glcpp-lex.l

+del flex.exe

+

+endlocal

+

diff --git a/mesalib/src/glsl/getopt.cpp b/mesalib/src/glsl/getopt.cpp
new file mode 100644
index 000000000..ea5dd3927
--- /dev/null
+++ b/mesalib/src/glsl/getopt.cpp
@@ -0,0 +1,552 @@
+/*      $OpenBSD: getopt_long.c,v 1.20 2005/10/25 15:49:37 jmc Exp $    */
+/*      $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $      */
+// Adapted for Box Backup by Chris Wilson <chris+boxbackup@qwirx.com>
+
+/*
+ * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// #include "Box.h"
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#define __STDC__ 1
+
+#include "getopt.h"
+
+#if defined _MSC_VER || defined __MINGW32__
+#define REPLACE_GETOPT          /* use this getopt as the system getopt(3) */
+
+#ifdef REPLACE_GETOPT
+int     opterr = 1;             /* if error message should be printed */
+int     optind = 1;             /* index into parent argv vector */
+int     optopt = '?';           /* character checked for validity */
+int     optreset;               /* reset getopt */
+char    *optarg;                /* argument associated with option */
+#endif
+
+#define PRINT_ERROR     ((opterr) && (*options != ':'))
+
+#define FLAG_PERMUTE    0x01    /* permute non-options to the end of argv */
+#define FLAG_ALLARGS    0x02    /* treat non-options as args to option "-1" */
+#define FLAG_LONGONLY   0x04    /* operate as getopt_long_only */
+
+/* return values */
+#define BADCH           (int)'?'
+#define BADARG          ((*options == ':') ? (int)':' : (int)'?')
+#define INORDER         (int)1
+
+#define EMSG            ""
+
+static void warnx(const char* fmt, ...)
+{
+        va_list ap;
+        va_start(ap, fmt);
+        vfprintf(stderr, fmt, ap);
+        va_end(ap);
+	        fprintf(stderr, "\n");
+	}
+	
+	static int getopt_internal(int, char * const *, const char *,
+	                           const struct option *, int *, int);
+	static int parse_long_options(char * const *, const char *,
+	                              const struct option *, int *, int);
+	static int gcd(int, int);
+	static void permute_args(int, int, int, char * const *);
+	
+	static char *place = EMSG; /* option letter processing */
+	
+	/* XXX: set optreset to 1 rather than these two */
+	static int nonopt_start = -1; /* first non option argument (for permute) */
+	static int nonopt_end = -1;   /* first option after non options (for permute) */
+	
+	/* Error messages */
+	static const char recargchar[] = "option requires an argument -- %c";
+	static const char recargstring[] = "option requires an argument -- %s";
+	static const char ambig[] = "ambiguous option -- %.*s";
+	static const char noarg[] = "option doesn't take an argument -- %.*s";
+	static const char illoptchar[] = "unknown option -- %c";
+	static const char illoptstring[] = "unknown option -- %s";
+	
+	/*
+	 * Compute the greatest common divisor of a and b.
+	 */
+	static int
+	gcd(int a, int b)
+	{
+	        int c;
+	
+	        c = a % b;
+	        while (c != 0) {
+	                a = b;
+	                b = c;
+	                c = a % b;
+	        }
+	
+	        return (b);
+	}
+	
+	/*
+	 * Exchange the block from nonopt_start to nonopt_end with the block
+	 * from nonopt_end to opt_end (keeping the same order of arguments
+	 * in each block).
+	 */
+	static void
+	permute_args(int panonopt_start, int panonopt_end, int opt_end,
+	        char * const *nargv)
+	{
+	        int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
+	        char *swap;
+	
+	        /*
+	         * compute lengths of blocks and number and size of cycles
+	         */
+	        nnonopts = panonopt_end - panonopt_start;
+	        nopts = opt_end - panonopt_end;
+	        ncycle = gcd(nnonopts, nopts);
+	        cyclelen = (opt_end - panonopt_start) / ncycle;
+	
+	        for (i = 0; i < ncycle; i++) {
+	                cstart = panonopt_end+i;
+	                pos = cstart;
+	                for (j = 0; j < cyclelen; j++) {
+	                        if (pos >= panonopt_end)
+	                                pos -= nnonopts;
+	                        else
+	                                pos += nopts;
+	                        swap = nargv[pos];
+	                        /* LINTED const cast */
+	                        ((char **) nargv)[pos] = nargv[cstart];
+	                        /* LINTED const cast */
+	                        ((char **)nargv)[cstart] = swap;
+	                }
+	        }
+	}
+	
+	/*
+	 * parse_long_options --
+	 *      Parse long options in argc/argv argument vector.
+	 * Returns -1 if short_too is set and the option does not match long_options.
+	 */
+	static int
+	parse_long_options(char * const *nargv, const char *options,
+	        const struct option *long_options, int *idx, int short_too)
+	{
+	        char *current_argv, *has_equal;
+	        size_t current_argv_len;
+	        int i, match;
+	
+	        current_argv = place;
+	        match = -1;
+	
+	        optind++;
+	
+	        if ((has_equal = strchr(current_argv, '=')) != NULL) {
+	                /* argument found (--option=arg) */
+	                current_argv_len = has_equal - current_argv;
+	                has_equal++;
+	        } else
+	                current_argv_len = strlen(current_argv);
+	
+	        for (i = 0; long_options[i].name; i++) {
+	                /* find matching long option */
+	                if (strncmp(current_argv, long_options[i].name,
+	                    current_argv_len))
+	                        continue;
+	
+	                if (strlen(long_options[i].name) == current_argv_len) {
+	                        /* exact match */
+	                        match = i;
+	                        break;
+	                }
+	                /*
+	                 * If this is a known short option, don't allow
+	                 * a partial match of a single character.
+	                 */
+	                if (short_too && current_argv_len == 1)
+	                        continue;
+	
+	                if (match == -1)        /* partial match */
+	                        match = i;
+	                else {
+	                        /* ambiguous abbreviation */
+	                        if (PRINT_ERROR)
+	                                warnx(ambig, (int)current_argv_len,
+	                                     current_argv);
+	                        optopt = 0;
+	                        return (BADCH);
+	                }
+	        }
+	        if (match != -1) {              /* option found */
+	                if (long_options[match].has_arg == no_argument
+	                    && has_equal) {
+	                        if (PRINT_ERROR)
+	                                warnx(noarg, (int)current_argv_len,
+	                                     current_argv);
+	                        /*
+	                         * XXX: GNU sets optopt to val regardless of flag
+	                         */
+	                        if (long_options[match].flag == NULL)
+	                                optopt = long_options[match].val;
+	                        else
+	                                optopt = 0;
+	                        return (BADARG);
+	                }
+	                if (long_options[match].has_arg == required_argument ||
+	                    long_options[match].has_arg == optional_argument) {
+	                        if (has_equal)
+	                                optarg = has_equal;
+	                        else if (long_options[match].has_arg ==
+	                            required_argument) {
+	                                /*
+	                                 * optional argument doesn't use next nargv
+	                                 */
+	                                optarg = nargv[optind++];
+	                        }
+	                }
+	                if ((long_options[match].has_arg == required_argument)
+	                    && (optarg == NULL)) {
+	                        /*
+	                         * Missing argument; leading ':' indicates no error
+	                         * should be generated.
+	                         */
+	                        if (PRINT_ERROR)
+	                                warnx(recargstring,
+	                                    current_argv);
+	                        /*
+	                         * XXX: GNU sets optopt to val regardless of flag
+	                         */
+	                        if (long_options[match].flag == NULL)
+	                                optopt = long_options[match].val;
+	                        else
+	                                optopt = 0;
+	                        --optind;
+	                        return (BADARG);
+	                }
+	        } else {                        /* unknown option */
+	                if (short_too) {
+	                        --optind;
+	                        return (-1);
+	                }
+	                if (PRINT_ERROR)
+	                        warnx(illoptstring, current_argv);
+	                optopt = 0;
+	                return (BADCH);
+	        }
+	        if (idx)
+	                *idx = match;
+	        if (long_options[match].flag) {
+	                *long_options[match].flag = long_options[match].val;
+	                return (0);
+	        } else
+	                return (long_options[match].val);
+	}
+	
+	/*
+	 * getopt_internal --
+	 *      Parse argc/argv argument vector.  Called by user level routines.
+	 */
+	static int
+	getopt_internal(int nargc, char * const *nargv, const char *options,
+	        const struct option *long_options, int *idx, int flags)
+	{
+	        const char * oli; /* option letter list index */
+	        int optchar, short_too;
+	        static int posixly_correct = -1;
+	
+	        if (options == NULL)
+	                return (-1);
+	
+	        /*
+	         * Disable GNU extensions if POSIXLY_CORRECT is set or options
+	         * string begins with a '+'.
+	         */
+	        if (posixly_correct == -1)
+	                posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
+	        if (posixly_correct || *options == '+')
+	                flags &= ~FLAG_PERMUTE;
+	        else if (*options == '-')
+	                flags |= FLAG_ALLARGS;
+	        if (*options == '+' || *options == '-')
+	                options++;
+	
+	        /*
+	         * XXX Some GNU programs (like cvs) set optind to 0 instead of
+	         * XXX using optreset.  Work around this braindamage.
+	         */
+	        if (optind == 0)
+	                optind = optreset = 1;
+	
+	        optarg = NULL;
+	        if (optreset)
+	                nonopt_start = nonopt_end = -1;
+	start:
+	        if (optreset || !*place) {              /* update scanning pointer */
+	                optreset = 0;
+	                if (optind >= nargc) {          /* end of argument vector */
+	                        place = EMSG;
+	                        if (nonopt_end != -1) {
+	                                /* do permutation, if we have to */
+	                                permute_args(nonopt_start, nonopt_end,
+	                                    optind, nargv);
+	                                optind -= nonopt_end - nonopt_start;
+	                        }
+	                        else if (nonopt_start != -1) {
+	                                /*
+	                                 * If we skipped non-options, set optind
+	                                 * to the first of them.
+	                                 */
+	                                optind = nonopt_start;
+	                        }
+	                        nonopt_start = nonopt_end = -1;
+	                        return (-1);
+	                }
+	                if (*(place = nargv[optind]) != '-' ||
+	                    (place[1] == '\0' && strchr(options, '-') == NULL)) {
+	                        place = EMSG;           /* found non-option */
+	                        if (flags & FLAG_ALLARGS) {
+	                                /*
+	                                 * GNU extension:
+	                                 * return non-option as argument to option 1
+	                                 */
+	                                optarg = nargv[optind++];
+	                                return (INORDER);
+	                        }
+	                        if (!(flags & FLAG_PERMUTE)) {
+	                                /*
+	                                 * If no permutation wanted, stop parsing
+	                                 * at first non-option.
+	                                 */
+	                                return (-1);
+	                        }
+	                        /* do permutation */
+	                        if (nonopt_start == -1)
+	                                nonopt_start = optind;
+	                        else if (nonopt_end != -1) {
+	                                permute_args(nonopt_start, nonopt_end,
+	                                    optind, nargv);
+	                                nonopt_start = optind -
+	                                    (nonopt_end - nonopt_start);
+	                                nonopt_end = -1;
+	                        }
+	                        optind++;
+	                        /* process next argument */
+	                        goto start;
+	                }
+	                if (nonopt_start != -1 && nonopt_end == -1)
+	                        nonopt_end = optind;
+	
+	                /*
+	                 * If we have "-" do nothing, if "--" we are done.
+	                 */
+	                if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
+	                        optind++;
+	                        place = EMSG;
+	                        /*
+	                         * We found an option (--), so if we skipped
+	                         * non-options, we have to permute.
+	                         */
+	                        if (nonopt_end != -1) {
+	                                permute_args(nonopt_start, nonopt_end,
+	                                    optind, nargv);
+	                                optind -= nonopt_end - nonopt_start;
+	                        }
+	                        nonopt_start = nonopt_end = -1;
+	                        return (-1);
+	                }
+	        }
+	
+	        /*
+	         * Check long options if:
+	         *  1) we were passed some
+	         *  2) the arg is not just "-"
+	         *  3) either the arg starts with -- we are getopt_long_only()
+	         */
+	        if (long_options != NULL && place != nargv[optind] &&
+	            (*place == '-' || (flags & FLAG_LONGONLY))) {
+	                short_too = 0;
+	                if (*place == '-')
+	                        place++;                /* --foo long option */
+	                else if (*place != ':' && strchr(options, *place) != NULL)
+	                        short_too = 1;          /* could be short option too */
+	
+	                optchar = parse_long_options(nargv, options, long_options,
+	                    idx, short_too);
+	                if (optchar != -1) {
+	                        place = EMSG;
+	                        return (optchar);
+	                }
+	        }
+	
+	        if ((optchar = (int)*place++) == (int)':' ||
+	            optchar == (int)'-' && *place != '\0' ||
+	            (oli = strchr(options, optchar)) == NULL) {
+	                /*
+	                 * If the user specified "-" and  '-' isn't listed in
+	                 * options, return -1 (non-option) as per POSIX.
+	                 * Otherwise, it is an unknown option character (or ':').
+	                 */
+	                if (optchar == (int)'-' && *place == '\0')
+	                        return (-1);
+	                if (!*place)
+	                        ++optind;
+	                if (PRINT_ERROR)
+	                        warnx(illoptchar, optchar);
+	                optopt = optchar;
+	                return (BADCH);
+	        }
+	        if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
+	                /* -W long-option */
+	                if (*place)                     /* no space */
+	                        /* NOTHING */;
+	                else if (++optind >= nargc) {   /* no arg */
+	                        place = EMSG;
+	                        if (PRINT_ERROR)
+	                                warnx(recargchar, optchar);
+	                        optopt = optchar;
+	                        return (BADARG);
+	                } else                          /* white space */
+	                        place = nargv[optind];
+	                optchar = parse_long_options(nargv, options, long_options,
+	                    idx, 0);
+	                place = EMSG;
+	                return (optchar);
+	        }
+	        if (*++oli != ':') {                    /* doesn't take argument */
+	                if (!*place)
+	                        ++optind;
+	        } else {                                /* takes (optional) argument */
+	                optarg = NULL;
+	                if (*place)                     /* no white space */
+	                        optarg = place;
+	                /* XXX: disable test for :: if PC? (GNU doesn't) */
+	                else if (oli[1] != ':') {       /* arg not optional */
+	                        if (++optind >= nargc) {        /* no arg */
+	                                place = EMSG;
+	                                if (PRINT_ERROR)
+	                                        warnx(recargchar, optchar);
+	                                optopt = optchar;
+	                                return (BADARG);
+	                        } else
+	                                optarg = nargv[optind];
+	                } else if (!(flags & FLAG_PERMUTE)) {
+	                        /*
+	                         * If permutation is disabled, we can accept an
+	                         * optional arg separated by whitespace so long
+	                         * as it does not start with a dash (-).
+	                         */
+	                        if (optind + 1 < nargc && *nargv[optind + 1] != '-')
+	                                optarg = nargv[++optind];
+	                }
+	                place = EMSG;
+	                ++optind;
+	        }
+	        /* dump back option letter */
+	        return (optchar);
+	}
+	
+	#ifdef REPLACE_GETOPT
+	/*
+	 * getopt --
+	 *      Parse argc/argv argument vector.
+	 *
+	 * [eventually this will replace the BSD getopt]
+	 */
+	int
+	getopt(int nargc, char * const *nargv, const char *options)
+	{
+	
+	        /*
+	         * We don't pass FLAG_PERMUTE to getopt_internal() since
+	         * the BSD getopt(3) (unlike GNU) has never done this.
+	         *
+	         * Furthermore, since many privileged programs call getopt()
+	         * before dropping privileges it makes sense to keep things
+	         * as simple (and bug-free) as possible.
+	         */
+	        return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
+	}
+	#endif /* REPLACE_GETOPT */
+	
+	/*
+	 * getopt_long --
+	 *      Parse argc/argv argument vector.
+	 */
+	int
+	getopt_long(int nargc, char * const *nargv, const char *options,
+	    const struct option *long_options, int *idx)
+	{
+	
+	        return (getopt_internal(nargc, nargv, options, long_options, idx,
+	            FLAG_PERMUTE));
+	}
+	
+	/*
+	 * getopt_long_only --
+	 *      Parse argc/argv argument vector.
+	 */
+	int
+	getopt_long_only(int nargc, char * const *nargv, const char *options,
+	    const struct option *long_options, int *idx)
+	{
+	
+	        return (getopt_internal(nargc, nargv, options, long_options, idx,
+	            FLAG_PERMUTE|FLAG_LONGONLY));
+	}
+	
+#endif // defined _MSC_VER || defined __MINGW32__
\ No newline at end of file
diff --git a/mesalib/src/glsl/glcpp/glcpp.c b/mesalib/src/glsl/glcpp/glcpp.c
index 63eb061c2..fd602c1fb 100644
--- a/mesalib/src/glsl/glcpp/glcpp.c
+++ b/mesalib/src/glsl/glcpp/glcpp.c
@@ -28,6 +28,14 @@
 #include "main/mtypes.h"

 #include "main/shaderobj.h"

 

+#ifdef _MSC_VER

+#include <io.h>

+#define STDIN_FILENO 0

+#define read _read

+#define open _open

+#define close _close

+#endif

+

 extern int yydebug;

 

 void

diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp
index e8c60936f..f18ec2ae2 100644
--- a/mesalib/src/glsl/glsl_parser_extras.cpp
+++ b/mesalib/src/glsl/glsl_parser_extras.cpp
@@ -1,831 +1,831 @@
-/*
- * Copyright © 2008, 2009 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <assert.h>
-
-extern "C" {
-#include "main/core.h" /* for struct gl_context */
-}
-
-#include "ralloc.h"
-#include "ast.h"
-#include "glsl_parser_extras.h"
-#include "glsl_parser.h"
-#include "ir_optimization.h"
-#include "loop_analysis.h"
-
-_mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *ctx,
-					       GLenum target, void *mem_ctx)
-{
-   switch (target) {
-   case GL_VERTEX_SHADER:   this->target = vertex_shader; break;
-   case GL_FRAGMENT_SHADER: this->target = fragment_shader; break;
-   case GL_GEOMETRY_SHADER: this->target = geometry_shader; break;
-   }
-
-   this->scanner = NULL;
-   this->translation_unit.make_empty();
-   this->symbols = new(mem_ctx) glsl_symbol_table;
-   this->info_log = ralloc_strdup(mem_ctx, "");
-   this->error = false;
-   this->loop_or_switch_nesting = NULL;
-
-   /* Set default language version and extensions */
-   this->language_version = 110;
-   this->es_shader = false;
-   this->ARB_texture_rectangle_enable = true;
-
-   /* OpenGL ES 2.0 has different defaults from desktop GL. */
-   if (ctx->API == API_OPENGLES2) {
-      this->language_version = 100;
-      this->es_shader = true;
-      this->ARB_texture_rectangle_enable = false;
-   }
-
-   this->extensions = &ctx->Extensions;
-
-   this->Const.MaxLights = ctx->Const.MaxLights;
-   this->Const.MaxClipPlanes = ctx->Const.MaxClipPlanes;
-   this->Const.MaxTextureUnits = ctx->Const.MaxTextureUnits;
-   this->Const.MaxTextureCoords = ctx->Const.MaxTextureCoordUnits;
-   this->Const.MaxVertexAttribs = ctx->Const.VertexProgram.MaxAttribs;
-   this->Const.MaxVertexUniformComponents = ctx->Const.VertexProgram.MaxUniformComponents;
-   this->Const.MaxVaryingFloats = ctx->Const.MaxVarying * 4;
-   this->Const.MaxVertexTextureImageUnits = ctx->Const.MaxVertexTextureImageUnits;
-   this->Const.MaxCombinedTextureImageUnits = ctx->Const.MaxCombinedTextureImageUnits;
-   this->Const.MaxTextureImageUnits = ctx->Const.MaxTextureImageUnits;
-   this->Const.MaxFragmentUniformComponents = ctx->Const.FragmentProgram.MaxUniformComponents;
-
-   this->Const.MaxDrawBuffers = ctx->Const.MaxDrawBuffers;
-
-   /* Note: Once the OpenGL 3.0 'forward compatible' context or the OpenGL 3.2
-    * Core context is supported, this logic will need change.  Older versions of
-    * GLSL are no longer supported outside the compatibility contexts of 3.x.
-    */
-   this->Const.GLSL_100ES = (ctx->API == API_OPENGLES2)
-      || ctx->Extensions.ARB_ES2_compatibility;
-   this->Const.GLSL_110 = (ctx->API == API_OPENGL);
-   this->Const.GLSL_120 = (ctx->API == API_OPENGL)
-      && (ctx->Const.GLSLVersion >= 120);
-   this->Const.GLSL_130 = (ctx->API == API_OPENGL)
-      && (ctx->Const.GLSLVersion >= 130);
-
-   const unsigned lowest_version =
-      (ctx->API == API_OPENGLES2) || ctx->Extensions.ARB_ES2_compatibility
-      ? 100 : 110;
-   const unsigned highest_version =
-      (ctx->API == API_OPENGL) ? ctx->Const.GLSLVersion : 100;
-   char *supported = ralloc_strdup(this, "");
-
-   for (unsigned ver = lowest_version; ver <= highest_version; ver += 10) {
-      const char *const prefix = (ver == lowest_version)
-	 ? ""
-	 : ((ver == highest_version) ? ", and " : ", ");
-
-      ralloc_asprintf_append(& supported, "%s%d.%02d%s",
-			     prefix,
-			     ver / 100, ver % 100,
-			     (ver == 100) ? " ES" : "");
-   }
-
-   this->supported_version_string = supported;
-}
-
-const char *
-_mesa_glsl_shader_target_name(enum _mesa_glsl_parser_targets target)
-{
-   switch (target) {
-   case vertex_shader:   return "vertex";
-   case fragment_shader: return "fragment";
-   case geometry_shader: return "geometry";
-   }
-
-   assert(!"Should not get here.");
-   return "unknown";
-}
-
-
-void
-_mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
-		 const char *fmt, ...)
-{
-   va_list ap;
-
-   state->error = true;
-
-   assert(state->info_log != NULL);
-   ralloc_asprintf_append(&state->info_log, "%u:%u(%u): error: ",
-					    locp->source,
-					    locp->first_line,
-					    locp->first_column);
-   va_start(ap, fmt);
-   ralloc_vasprintf_append(&state->info_log, fmt, ap);
-   va_end(ap);
-   ralloc_strcat(&state->info_log, "\n");
-}
-
-
-void
-_mesa_glsl_warning(const YYLTYPE *locp, _mesa_glsl_parse_state *state,
-		   const char *fmt, ...)
-{
-   va_list ap;
-
-   assert(state->info_log != NULL);
-   ralloc_asprintf_append(&state->info_log, "%u:%u(%u): warning: ",
-					    locp->source,
-					    locp->first_line,
-					    locp->first_column);
-   va_start(ap, fmt);
-   ralloc_vasprintf_append(&state->info_log, fmt, ap);
-   va_end(ap);
-   ralloc_strcat(&state->info_log, "\n");
-}
-
-
-bool
-_mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,
-			     const char *behavior, YYLTYPE *behavior_locp,
-			     _mesa_glsl_parse_state *state)
-{
-   enum {
-      extension_disable,
-      extension_enable,
-      extension_require,
-      extension_warn
-   } ext_mode;
-
-   if (strcmp(behavior, "warn") == 0) {
-      ext_mode = extension_warn;
-   } else if (strcmp(behavior, "require") == 0) {
-      ext_mode = extension_require;
-   } else if (strcmp(behavior, "enable") == 0) {
-      ext_mode = extension_enable;
-   } else if (strcmp(behavior, "disable") == 0) {
-      ext_mode = extension_disable;
-   } else {
-      _mesa_glsl_error(behavior_locp, state,
-		       "Unknown extension behavior `%s'",
-		       behavior);
-      return false;
-   }
-
-   bool unsupported = false;
-
-   if (strcmp(name, "all") == 0) {
-      if ((ext_mode == extension_enable) || (ext_mode == extension_require)) {
-	 _mesa_glsl_error(name_locp, state, "Cannot %s all extensions",
-			  (ext_mode == extension_enable)
-			  ? "enable" : "require");
-	 return false;
-      }
-   } else if (strcmp(name, "GL_ARB_draw_buffers") == 0) {
-      /* This extension is only supported in fragment shaders.
-       */
-      if (state->target != fragment_shader) {
-	 unsupported = true;
-      } else {
-	 state->ARB_draw_buffers_enable = (ext_mode != extension_disable);
-	 state->ARB_draw_buffers_warn = (ext_mode == extension_warn);
-      }
-   } else if (strcmp(name, "GL_ARB_draw_instanced") == 0) {
-      /* This extension is only supported in vertex shaders.
-       */
-      if (state->target != vertex_shader) {
-	 unsupported = true;
-      } else {
-	 state->ARB_draw_instanced_enable = (ext_mode != extension_disable);
-	 state->ARB_draw_instanced_warn = (ext_mode == extension_warn);
-      }
-   } else if (strcmp(name, "GL_ARB_explicit_attrib_location") == 0) {
-      state->ARB_explicit_attrib_location_enable =
-	 (ext_mode != extension_disable);
-      state->ARB_explicit_attrib_location_warn =
-	 (ext_mode == extension_warn);
-
-      unsupported = !state->extensions->ARB_explicit_attrib_location;
-   } else if (strcmp(name, "GL_ARB_fragment_coord_conventions") == 0) {
-      state->ARB_fragment_coord_conventions_enable =
-	 (ext_mode != extension_disable);
-      state->ARB_fragment_coord_conventions_warn =
-	 (ext_mode == extension_warn);
-
-      unsupported = !state->extensions->ARB_fragment_coord_conventions;
-   } else if (strcmp(name, "GL_ARB_texture_rectangle") == 0) {
-      state->ARB_texture_rectangle_enable = (ext_mode != extension_disable);
-      state->ARB_texture_rectangle_warn = (ext_mode == extension_warn);
-   } else if (strcmp(name, "GL_EXT_texture_array") == 0) {
-      state->EXT_texture_array_enable = (ext_mode != extension_disable);
-      state->EXT_texture_array_warn = (ext_mode == extension_warn);
-
-      unsupported = !state->extensions->EXT_texture_array;
-   } else if (strcmp(name, "GL_ARB_shader_stencil_export") == 0) {
-      if (state->target != fragment_shader) {
-	 unsupported = true;
-      } else {
-	 state->ARB_shader_stencil_export_enable = (ext_mode != extension_disable);
-	 state->ARB_shader_stencil_export_warn = (ext_mode == extension_warn);
-	 unsupported = !state->extensions->ARB_shader_stencil_export;
-      }
-   } else if (strcmp(name, "GL_AMD_conservative_depth") == 0) {
-      /* The AMD_conservative spec does not forbid requiring the extension in
-       * the vertex shader.
-       */
-      state->AMD_conservative_depth_enable = (ext_mode != extension_disable);
-      state->AMD_conservative_depth_warn = (ext_mode == extension_warn);
-      unsupported = !state->extensions->AMD_conservative_depth;
-   } else if (strcmp(name, "GL_OES_texture_3D") == 0 && state->es_shader) {
-      state->OES_texture_3D_enable = (ext_mode != extension_disable);
-      state->OES_texture_3D_warn = (ext_mode == extension_warn);
-
-      unsupported = !state->extensions->EXT_texture3D;
-   } else {
-      unsupported = true;
-   }
-
-   if (unsupported) {
-      static const char *const fmt = "extension `%s' unsupported in %s shader";
-
-      if (ext_mode == extension_require) {
-	 _mesa_glsl_error(name_locp, state, fmt,
-			  name, _mesa_glsl_shader_target_name(state->target));
-	 return false;
-      } else {
-	 _mesa_glsl_warning(name_locp, state, fmt,
-			    name, _mesa_glsl_shader_target_name(state->target));
-      }
-   }
-
-   return true;
-}
-
-void
-_mesa_ast_type_qualifier_print(const struct ast_type_qualifier *q)
-{
-   if (q->flags.q.constant)
-      printf("const ");
-
-   if (q->flags.q.invariant)
-      printf("invariant ");
-
-   if (q->flags.q.attribute)
-      printf("attribute ");
-
-   if (q->flags.q.varying)
-      printf("varying ");
-
-   if (q->flags.q.in && q->flags.q.out)
-      printf("inout ");
-   else {
-      if (q->flags.q.in)
-	 printf("in ");
-
-      if (q->flags.q.out)
-	 printf("out ");
-   }
-
-   if (q->flags.q.centroid)
-      printf("centroid ");
-   if (q->flags.q.uniform)
-      printf("uniform ");
-   if (q->flags.q.smooth)
-      printf("smooth ");
-   if (q->flags.q.flat)
-      printf("flat ");
-   if (q->flags.q.noperspective)
-      printf("noperspective ");
-}
-
-
-void
-ast_node::print(void) const
-{
-   printf("unhandled node ");
-}
-
-
-ast_node::ast_node(void)
-{
-   this->location.source = 0;
-   this->location.line = 0;
-   this->location.column = 0;
-}
-
-
-static void
-ast_opt_array_size_print(bool is_array, const ast_expression *array_size)
-{
-   if (is_array) {
-      printf("[ ");
-
-      if (array_size)
-	 array_size->print();
-
-      printf("] ");
-   }
-}
-
-
-void
-ast_compound_statement::print(void) const
-{
-   printf("{\n");
-   
-   foreach_list_const(n, &this->statements) {
-      ast_node *ast = exec_node_data(ast_node, n, link);
-      ast->print();
-   }
-
-   printf("}\n");
-}
-
-
-ast_compound_statement::ast_compound_statement(int new_scope,
-					       ast_node *statements)
-{
-   this->new_scope = new_scope;
-
-   if (statements != NULL) {
-      this->statements.push_degenerate_list_at_head(&statements->link);
-   }
-}
-
-
-void
-ast_expression::print(void) const
-{
-   switch (oper) {
-   case ast_assign:
-   case ast_mul_assign:
-   case ast_div_assign:
-   case ast_mod_assign:
-   case ast_add_assign:
-   case ast_sub_assign:
-   case ast_ls_assign:
-   case ast_rs_assign:
-   case ast_and_assign:
-   case ast_xor_assign:
-   case ast_or_assign:
-      subexpressions[0]->print();
-      printf("%s ", operator_string(oper));
-      subexpressions[1]->print();
-      break;
-
-   case ast_field_selection:
-      subexpressions[0]->print();
-      printf(". %s ", primary_expression.identifier);
-      break;
-
-   case ast_plus:
-   case ast_neg:
-   case ast_bit_not:
-   case ast_logic_not:
-   case ast_pre_inc:
-   case ast_pre_dec:
-      printf("%s ", operator_string(oper));
-      subexpressions[0]->print();
-      break;
-
-   case ast_post_inc:
-   case ast_post_dec:
-      subexpressions[0]->print();
-      printf("%s ", operator_string(oper));
-      break;
-
-   case ast_conditional:
-      subexpressions[0]->print();
-      printf("? ");
-      subexpressions[1]->print();
-      printf(": ");
-      subexpressions[1]->print();
-      break;
-
-   case ast_array_index:
-      subexpressions[0]->print();
-      printf("[ ");
-      subexpressions[1]->print();
-      printf("] ");
-      break;
-
-   case ast_function_call: {
-      subexpressions[0]->print();
-      printf("( ");
-
-      foreach_list_const (n, &this->expressions) {
-	 if (n != this->expressions.get_head())
-	    printf(", ");
-
-	 ast_node *ast = exec_node_data(ast_node, n, link);
-	 ast->print();
-      }
-
-      printf(") ");
-      break;
-   }
-
-   case ast_identifier:
-      printf("%s ", primary_expression.identifier);
-      break;
-
-   case ast_int_constant:
-      printf("%d ", primary_expression.int_constant);
-      break;
-
-   case ast_uint_constant:
-      printf("%u ", primary_expression.uint_constant);
-      break;
-
-   case ast_float_constant:
-      printf("%f ", primary_expression.float_constant);
-      break;
-
-   case ast_bool_constant:
-      printf("%s ",
-	     primary_expression.bool_constant
-	     ? "true" : "false");
-      break;
-
-   case ast_sequence: {
-      printf("( ");
-      foreach_list_const(n, & this->expressions) {
-	 if (n != this->expressions.get_head())
-	    printf(", ");
-
-	 ast_node *ast = exec_node_data(ast_node, n, link);
-	 ast->print();
-      }
-      printf(") ");
-      break;
-   }
-
-   default:
-      assert(0);
-      break;
-   }
-}
-
-ast_expression::ast_expression(int oper,
-			       ast_expression *ex0,
-			       ast_expression *ex1,
-			       ast_expression *ex2)
-{
-   this->oper = ast_operators(oper);
-   this->subexpressions[0] = ex0;
-   this->subexpressions[1] = ex1;
-   this->subexpressions[2] = ex2;
-}
-
-
-void
-ast_expression_statement::print(void) const
-{
-   if (expression)
-      expression->print();
-
-   printf("; ");
-}
-
-
-ast_expression_statement::ast_expression_statement(ast_expression *ex) :
-   expression(ex)
-{
-   /* empty */
-}
-
-
-void
-ast_function::print(void) const
-{
-   return_type->print();
-   printf(" %s (", identifier);
-
-   foreach_list_const(n, & this->parameters) {
-      ast_node *ast = exec_node_data(ast_node, n, link);
-      ast->print();
-   }
-
-   printf(")");
-}
-
-
-ast_function::ast_function(void)
-   : is_definition(false), signature(NULL)
-{
-   /* empty */
-}
-
-
-void
-ast_fully_specified_type::print(void) const
-{
-   _mesa_ast_type_qualifier_print(& qualifier);
-   specifier->print();
-}
-
-
-void
-ast_parameter_declarator::print(void) const
-{
-   type->print();
-   if (identifier)
-      printf("%s ", identifier);
-   ast_opt_array_size_print(is_array, array_size);
-}
-
-
-void
-ast_function_definition::print(void) const
-{
-   prototype->print();
-   body->print();
-}
-
-
-void
-ast_declaration::print(void) const
-{
-   printf("%s ", identifier);
-   ast_opt_array_size_print(is_array, array_size);
-
-   if (initializer) {
-      printf("= ");
-      initializer->print();
-   }
-}
-
-
-ast_declaration::ast_declaration(char *identifier, int is_array,
-				 ast_expression *array_size,
-				 ast_expression *initializer)
-{
-   this->identifier = identifier;
-   this->is_array = is_array;
-   this->array_size = array_size;
-   this->initializer = initializer;
-}
-
-
-void
-ast_declarator_list::print(void) const
-{
-   assert(type || invariant);
-
-   if (type)
-      type->print();
-   else
-      printf("invariant ");
-
-   foreach_list_const (ptr, & this->declarations) {
-      if (ptr != this->declarations.get_head())
-	 printf(", ");
-
-      ast_node *ast = exec_node_data(ast_node, ptr, link);
-      ast->print();
-   }
-
-   printf("; ");
-}
-
-
-ast_declarator_list::ast_declarator_list(ast_fully_specified_type *type)
-{
-   this->type = type;
-   this->invariant = false;
-}
-
-void
-ast_jump_statement::print(void) const
-{
-   switch (mode) {
-   case ast_continue:
-      printf("continue; ");
-      break;
-   case ast_break:
-      printf("break; ");
-      break;
-   case ast_return:
-      printf("return ");
-      if (opt_return_value)
-	 opt_return_value->print();
-
-      printf("; ");
-      break;
-   case ast_discard:
-      printf("discard; ");
-      break;
-   }
-}
-
-
-ast_jump_statement::ast_jump_statement(int mode, ast_expression *return_value)
-{
-   this->mode = ast_jump_modes(mode);
-
-   if (mode == ast_return)
-      opt_return_value = return_value;
-}
-
-
-void
-ast_selection_statement::print(void) const
-{
-   printf("if ( ");
-   condition->print();
-   printf(") ");
-
-   then_statement->print();
-
-   if (else_statement) {
-      printf("else ");
-      else_statement->print();
-   }
-   
-}
-
-
-ast_selection_statement::ast_selection_statement(ast_expression *condition,
-						 ast_node *then_statement,
-						 ast_node *else_statement)
-{
-   this->condition = condition;
-   this->then_statement = then_statement;
-   this->else_statement = else_statement;
-}
-
-
-void
-ast_iteration_statement::print(void) const
-{
-   switch (mode) {
-   case ast_for:
-      printf("for( ");
-      if (init_statement)
-	 init_statement->print();
-      printf("; ");
-
-      if (condition)
-	 condition->print();
-      printf("; ");
-
-      if (rest_expression)
-	 rest_expression->print();
-      printf(") ");
-
-      body->print();
-      break;
-
-   case ast_while:
-      printf("while ( ");
-      if (condition)
-	 condition->print();
-      printf(") ");
-      body->print();
-      break;
-
-   case ast_do_while:
-      printf("do ");
-      body->print();
-      printf("while ( ");
-      if (condition)
-	 condition->print();
-      printf("); ");
-      break;
-   }
-}
-
-
-ast_iteration_statement::ast_iteration_statement(int mode,
-						 ast_node *init,
-						 ast_node *condition,
-						 ast_expression *rest_expression,
-						 ast_node *body)
-{
-   this->mode = ast_iteration_modes(mode);
-   this->init_statement = init;
-   this->condition = condition;
-   this->rest_expression = rest_expression;
-   this->body = body;
-}
-
-
-void
-ast_struct_specifier::print(void) const
-{
-   printf("struct %s { ", name);
-   foreach_list_const(n, &this->declarations) {
-      ast_node *ast = exec_node_data(ast_node, n, link);
-      ast->print();
-   }
-   printf("} ");
-}
-
-
-ast_struct_specifier::ast_struct_specifier(char *identifier,
-					   ast_node *declarator_list)
-{
-   if (identifier == NULL) {
-      static unsigned anon_count = 1;
-      identifier = ralloc_asprintf(this, "#anon_struct_%04x", anon_count);
-      anon_count++;
-   }
-   name = identifier;
-   this->declarations.push_degenerate_list_at_head(&declarator_list->link);
-}
-
-bool
-do_common_optimization(exec_list *ir, bool linked, unsigned max_unroll_iterations)
-{
-   GLboolean progress = GL_FALSE;
-
-   progress = lower_instructions(ir, SUB_TO_ADD_NEG) || progress;
-
-   if (linked) {
-      progress = do_function_inlining(ir) || progress;
-      progress = do_dead_functions(ir) || progress;
-   }
-   progress = do_structure_splitting(ir) || progress;
-   progress = do_if_simplification(ir) || progress;
-   progress = do_discard_simplification(ir) || progress;
-   progress = do_copy_propagation(ir) || progress;
-   /*progress = do_copy_propagation_elements(ir) || progress;*/
-   if (linked)
-      progress = do_dead_code(ir) || progress;
-   else
-      progress = do_dead_code_unlinked(ir) || progress;
-   progress = do_dead_code_local(ir) || progress;
-   progress = do_tree_grafting(ir) || progress;
-   progress = do_constant_propagation(ir) || progress;
-   if (linked)
-      progress = do_constant_variable(ir) || progress;
-   else
-      progress = do_constant_variable_unlinked(ir) || progress;
-   progress = do_constant_folding(ir) || progress;
-   progress = do_algebraic(ir) || progress;
-   progress = do_lower_jumps(ir) || progress;
-   progress = do_vec_index_to_swizzle(ir) || progress;
-   progress = do_swizzle_swizzle(ir) || progress;
-   progress = do_noop_swizzle(ir) || progress;
-
-   progress = optimize_redundant_jumps(ir) || progress;
-
-   loop_state *ls = analyze_loop_variables(ir);
-   if (ls->loop_found) {
-      progress = set_loop_controls(ir, ls) || progress;
-      progress = unroll_loops(ir, ls, max_unroll_iterations) || progress;
-   }
-   delete ls;
-
-   return progress;
-}
-
-extern "C" {
-
-/**
- * To be called at GL teardown time, this frees compiler datastructures.
- *
- * After calling this, any previously compiled shaders and shader
- * programs would be invalid.  So this should happen at approximately
- * program exit.
- */
-void
-_mesa_destroy_shader_compiler(void)
-{
-   _mesa_destroy_shader_compiler_caches();
-
-   _mesa_glsl_release_types();
-}
-
-/**
- * Releases compiler caches to trade off performance for memory.
- *
- * Intended to be used with glReleaseShaderCompiler().
- */
-void
-_mesa_destroy_shader_compiler_caches(void)
-{
-   _mesa_glsl_release_functions();
-}
-
-}
+/*

+ * Copyright © 2008, 2009 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+#include <stdio.h>

+#include <stdarg.h>

+#include <string.h>

+#include <assert.h>

+

+extern "C" {

+#include "main/core.h" /* for struct gl_context */

+}

+

+#include "ralloc.h"

+#include "ast.h"

+#include "glsl_parser_extras.h"

+#include "glsl_parser.h"

+#include "ir_optimization.h"

+#include "loop_analysis.h"

+

+_mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *ctx,

+					       GLenum target, void *mem_ctx)

+{

+   switch (target) {

+   case GL_VERTEX_SHADER:   this->target = vertex_shader; break;

+   case GL_FRAGMENT_SHADER: this->target = fragment_shader; break;

+   case GL_GEOMETRY_SHADER: this->target = geometry_shader; break;

+   }

+

+   this->scanner = NULL;

+   this->translation_unit.make_empty();

+   this->symbols = new(mem_ctx) glsl_symbol_table;

+   this->info_log = ralloc_strdup(mem_ctx, "");

+   this->error = false;

+   this->loop_or_switch_nesting = NULL;

+

+   /* Set default language version and extensions */

+   this->language_version = 110;

+   this->es_shader = false;

+   this->ARB_texture_rectangle_enable = true;

+

+   /* OpenGL ES 2.0 has different defaults from desktop GL. */

+   if (ctx->API == API_OPENGLES2) {

+      this->language_version = 100;

+      this->es_shader = true;

+      this->ARB_texture_rectangle_enable = false;

+   }

+

+   this->extensions = &ctx->Extensions;

+

+   this->Const.MaxLights = ctx->Const.MaxLights;

+   this->Const.MaxClipPlanes = ctx->Const.MaxClipPlanes;

+   this->Const.MaxTextureUnits = ctx->Const.MaxTextureUnits;

+   this->Const.MaxTextureCoords = ctx->Const.MaxTextureCoordUnits;

+   this->Const.MaxVertexAttribs = ctx->Const.VertexProgram.MaxAttribs;

+   this->Const.MaxVertexUniformComponents = ctx->Const.VertexProgram.MaxUniformComponents;

+   this->Const.MaxVaryingFloats = ctx->Const.MaxVarying * 4;

+   this->Const.MaxVertexTextureImageUnits = ctx->Const.MaxVertexTextureImageUnits;

+   this->Const.MaxCombinedTextureImageUnits = ctx->Const.MaxCombinedTextureImageUnits;

+   this->Const.MaxTextureImageUnits = ctx->Const.MaxTextureImageUnits;

+   this->Const.MaxFragmentUniformComponents = ctx->Const.FragmentProgram.MaxUniformComponents;

+

+   this->Const.MaxDrawBuffers = ctx->Const.MaxDrawBuffers;

+

+   /* Note: Once the OpenGL 3.0 'forward compatible' context or the OpenGL 3.2

+    * Core context is supported, this logic will need change.  Older versions of

+    * GLSL are no longer supported outside the compatibility contexts of 3.x.

+    */

+   this->Const.GLSL_100ES = (ctx->API == API_OPENGLES2)

+      || ctx->Extensions.ARB_ES2_compatibility;

+   this->Const.GLSL_110 = (ctx->API == API_OPENGL);

+   this->Const.GLSL_120 = (ctx->API == API_OPENGL)

+      && (ctx->Const.GLSLVersion >= 120);

+   this->Const.GLSL_130 = (ctx->API == API_OPENGL)

+      && (ctx->Const.GLSLVersion >= 130);

+

+   const unsigned lowest_version =

+      (ctx->API == API_OPENGLES2) || ctx->Extensions.ARB_ES2_compatibility

+      ? 100 : 110;

+   const unsigned highest_version =

+      (ctx->API == API_OPENGL) ? ctx->Const.GLSLVersion : 100;

+   char *supported = ralloc_strdup(this, "");

+

+   for (unsigned ver = lowest_version; ver <= highest_version; ver += 10) {

+      const char *const prefix = (ver == lowest_version)

+	 ? ""

+	 : ((ver == highest_version) ? ", and " : ", ");

+

+      ralloc_asprintf_append(& supported, "%s%d.%02d%s",

+			     prefix,

+			     ver / 100, ver % 100,

+			     (ver == 100) ? " ES" : "");

+   }

+

+   this->supported_version_string = supported;

+}

+

+const char *

+_mesa_glsl_shader_target_name(enum _mesa_glsl_parser_targets target)

+{

+   switch (target) {

+   case vertex_shader:   return "vertex";

+   case fragment_shader: return "fragment";

+   case geometry_shader: return "geometry";

+   }

+

+   assert(!"Should not get here.");

+   return "unknown";

+}

+

+

+void

+_mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,

+		 const char *fmt, ...)

+{

+   va_list ap;

+

+   state->error = true;

+

+   assert(state->info_log != NULL);

+   ralloc_asprintf_append(&state->info_log, "%u:%u(%u): error: ",

+					    locp->source,

+					    locp->first_line,

+					    locp->first_column);

+   va_start(ap, fmt);

+   ralloc_vasprintf_append(&state->info_log, fmt, ap);

+   va_end(ap);

+   ralloc_strcat(&state->info_log, "\n");

+}

+

+

+void

+_mesa_glsl_warning(const YYLTYPE *locp, _mesa_glsl_parse_state *state,

+		   const char *fmt, ...)

+{

+   va_list ap;

+

+   assert(state->info_log != NULL);

+   ralloc_asprintf_append(&state->info_log, "%u:%u(%u): warning: ",

+					    locp->source,

+					    locp->first_line,

+					    locp->first_column);

+   va_start(ap, fmt);

+   ralloc_vasprintf_append(&state->info_log, fmt, ap);

+   va_end(ap);

+   ralloc_strcat(&state->info_log, "\n");

+}

+

+

+bool

+_mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,

+			     const char *behavior, YYLTYPE *behavior_locp,

+			     _mesa_glsl_parse_state *state)

+{

+   enum {

+      extension_disable,

+      extension_enable,

+      extension_require,

+      extension_warn

+   } ext_mode;

+

+   if (strcmp(behavior, "warn") == 0) {

+      ext_mode = extension_warn;

+   } else if (strcmp(behavior, "require") == 0) {

+      ext_mode = extension_require;

+   } else if (strcmp(behavior, "enable") == 0) {

+      ext_mode = extension_enable;

+   } else if (strcmp(behavior, "disable") == 0) {

+      ext_mode = extension_disable;

+   } else {

+      _mesa_glsl_error(behavior_locp, state,

+		       "Unknown extension behavior `%s'",

+		       behavior);

+      return false;

+   }

+

+   bool unsupported = false;

+

+   if (strcmp(name, "all") == 0) {

+      if ((ext_mode == extension_enable) || (ext_mode == extension_require)) {

+	 _mesa_glsl_error(name_locp, state, "Cannot %s all extensions",

+			  (ext_mode == extension_enable)

+			  ? "enable" : "require");

+	 return false;

+      }

+   } else if (strcmp(name, "GL_ARB_draw_buffers") == 0) {

+      /* This extension is only supported in fragment shaders.

+       */

+      if (state->target != fragment_shader) {

+	 unsupported = true;

+      } else {

+	 state->ARB_draw_buffers_enable = (ext_mode != extension_disable);

+	 state->ARB_draw_buffers_warn = (ext_mode == extension_warn);

+      }

+   } else if (strcmp(name, "GL_ARB_draw_instanced") == 0) {

+      /* This extension is only supported in vertex shaders.

+       */

+      if (state->target != vertex_shader) {

+	 unsupported = true;

+      } else {

+	 state->ARB_draw_instanced_enable = (ext_mode != extension_disable);

+	 state->ARB_draw_instanced_warn = (ext_mode == extension_warn);

+      }

+   } else if (strcmp(name, "GL_ARB_explicit_attrib_location") == 0) {

+      state->ARB_explicit_attrib_location_enable =

+	 (ext_mode != extension_disable);

+      state->ARB_explicit_attrib_location_warn =

+	 (ext_mode == extension_warn);

+

+      unsupported = !state->extensions->ARB_explicit_attrib_location;

+   } else if (strcmp(name, "GL_ARB_fragment_coord_conventions") == 0) {

+      state->ARB_fragment_coord_conventions_enable =

+	 (ext_mode != extension_disable);

+      state->ARB_fragment_coord_conventions_warn =

+	 (ext_mode == extension_warn);

+

+      unsupported = !state->extensions->ARB_fragment_coord_conventions;

+   } else if (strcmp(name, "GL_ARB_texture_rectangle") == 0) {

+      state->ARB_texture_rectangle_enable = (ext_mode != extension_disable);

+      state->ARB_texture_rectangle_warn = (ext_mode == extension_warn);

+   } else if (strcmp(name, "GL_EXT_texture_array") == 0) {

+      state->EXT_texture_array_enable = (ext_mode != extension_disable);

+      state->EXT_texture_array_warn = (ext_mode == extension_warn);

+

+      unsupported = !state->extensions->EXT_texture_array;

+   } else if (strcmp(name, "GL_ARB_shader_stencil_export") == 0) {

+      if (state->target != fragment_shader) {

+	 unsupported = true;

+      } else {

+	 state->ARB_shader_stencil_export_enable = (ext_mode != extension_disable);

+	 state->ARB_shader_stencil_export_warn = (ext_mode == extension_warn);

+	 unsupported = !state->extensions->ARB_shader_stencil_export;

+      }

+   } else if (strcmp(name, "GL_AMD_conservative_depth") == 0) {

+      /* The AMD_conservative spec does not forbid requiring the extension in

+       * the vertex shader.

+       */

+      state->AMD_conservative_depth_enable = (ext_mode != extension_disable);

+      state->AMD_conservative_depth_warn = (ext_mode == extension_warn);

+      unsupported = !state->extensions->AMD_conservative_depth;

+   } else if (strcmp(name, "GL_OES_texture_3D") == 0 && state->es_shader) {

+      state->OES_texture_3D_enable = (ext_mode != extension_disable);

+      state->OES_texture_3D_warn = (ext_mode == extension_warn);

+

+      unsupported = !state->extensions->EXT_texture3D;

+   } else {

+      unsupported = true;

+   }

+

+   if (unsupported) {

+      static const char *const fmt = "extension `%s' unsupported in %s shader";

+

+      if (ext_mode == extension_require) {

+	 _mesa_glsl_error(name_locp, state, fmt,

+			  name, _mesa_glsl_shader_target_name(state->target));

+	 return false;

+      } else {

+	 _mesa_glsl_warning(name_locp, state, fmt,

+			    name, _mesa_glsl_shader_target_name(state->target));

+      }

+   }

+

+   return true;

+}

+

+void

+_mesa_ast_type_qualifier_print(const struct ast_type_qualifier *q)

+{

+   if (q->flags.q.constant)

+      printf("const ");

+

+   if (q->flags.q.invariant)

+      printf("invariant ");

+

+   if (q->flags.q.attribute)

+      printf("attribute ");

+

+   if (q->flags.q.varying)

+      printf("varying ");

+

+   if (q->flags.q.in && q->flags.q.out)

+      printf("inout ");

+   else {

+      if (q->flags.q.in)

+	 printf("in ");

+

+      if (q->flags.q.out)

+	 printf("out ");

+   }

+

+   if (q->flags.q.centroid)

+      printf("centroid ");

+   if (q->flags.q.uniform)

+      printf("uniform ");

+   if (q->flags.q.smooth)

+      printf("smooth ");

+   if (q->flags.q.flat)

+      printf("flat ");

+   if (q->flags.q.noperspective)

+      printf("noperspective ");

+}

+

+

+void

+ast_node::print(void) const

+{

+   printf("unhandled node ");

+}

+

+

+ast_node::ast_node(void)

+{

+   this->location.source = 0;

+   this->location.line = 0;

+   this->location.column = 0;

+}

+

+

+static void

+ast_opt_array_size_print(bool is_array, const ast_expression *array_size)

+{

+   if (is_array) {

+      printf("[ ");

+

+      if (array_size)

+	 array_size->print();

+

+      printf("] ");

+   }

+}

+

+

+void

+ast_compound_statement::print(void) const

+{

+   printf("{\n");

+   

+   foreach_list_const(n, &this->statements) {

+      ast_node *ast = exec_node_data(ast_node, n, link);

+      ast->print();

+   }

+

+   printf("}\n");

+}

+

+

+ast_compound_statement::ast_compound_statement(int new_scope,

+					       ast_node *statements)

+{

+   this->new_scope = new_scope;

+

+   if (statements != NULL) {

+      this->statements.push_degenerate_list_at_head(&statements->link);

+   }

+}

+

+

+void

+ast_expression::print(void) const

+{

+   switch (oper) {

+   case ast_assign:

+   case ast_mul_assign:

+   case ast_div_assign:

+   case ast_mod_assign:

+   case ast_add_assign:

+   case ast_sub_assign:

+   case ast_ls_assign:

+   case ast_rs_assign:

+   case ast_and_assign:

+   case ast_xor_assign:

+   case ast_or_assign:

+      subexpressions[0]->print();

+      printf("%s ", operator_string(oper));

+      subexpressions[1]->print();

+      break;

+

+   case ast_field_selection:

+      subexpressions[0]->print();

+      printf(". %s ", primary_expression.identifier);

+      break;

+

+   case ast_plus:

+   case ast_neg:

+   case ast_bit_not:

+   case ast_logic_not:

+   case ast_pre_inc:

+   case ast_pre_dec:

+      printf("%s ", operator_string(oper));

+      subexpressions[0]->print();

+      break;

+

+   case ast_post_inc:

+   case ast_post_dec:

+      subexpressions[0]->print();

+      printf("%s ", operator_string(oper));

+      break;

+

+   case ast_conditional:

+      subexpressions[0]->print();

+      printf("? ");

+      subexpressions[1]->print();

+      printf(": ");

+      subexpressions[1]->print();

+      break;

+

+   case ast_array_index:

+      subexpressions[0]->print();

+      printf("[ ");

+      subexpressions[1]->print();

+      printf("] ");

+      break;

+

+   case ast_function_call: {

+      subexpressions[0]->print();

+      printf("( ");

+

+      foreach_list_const (n, &this->expressions) {

+	 if (n != this->expressions.get_head())

+	    printf(", ");

+

+	 ast_node *ast = exec_node_data(ast_node, n, link);

+	 ast->print();

+      }

+

+      printf(") ");

+      break;

+   }

+

+   case ast_identifier:

+      printf("%s ", primary_expression.identifier);

+      break;

+

+   case ast_int_constant:

+      printf("%d ", primary_expression.int_constant);

+      break;

+

+   case ast_uint_constant:

+      printf("%u ", primary_expression.uint_constant);

+      break;

+

+   case ast_float_constant:

+      printf("%f ", primary_expression.float_constant);

+      break;

+

+   case ast_bool_constant:

+      printf("%s ",

+	     primary_expression.bool_constant

+	     ? "true" : "false");

+      break;

+

+   case ast_sequence: {

+      printf("( ");

+      foreach_list_const(n, & this->expressions) {

+	 if (n != this->expressions.get_head())

+	    printf(", ");

+

+	 ast_node *ast = exec_node_data(ast_node, n, link);

+	 ast->print();

+      }

+      printf(") ");

+      break;

+   }

+

+   default:

+      assert(0);

+      break;

+   }

+}

+

+ast_expression::ast_expression(int oper,

+			       ast_expression *ex0,

+			       ast_expression *ex1,

+			       ast_expression *ex2)

+{

+   this->oper = ast_operators(oper);

+   this->subexpressions[0] = ex0;

+   this->subexpressions[1] = ex1;

+   this->subexpressions[2] = ex2;

+}

+

+

+void

+ast_expression_statement::print(void) const

+{

+   if (expression)

+      expression->print();

+

+   printf("; ");

+}

+

+

+ast_expression_statement::ast_expression_statement(ast_expression *ex) :

+   expression(ex)

+{

+   /* empty */

+}

+

+

+void

+ast_function::print(void) const

+{

+   return_type->print();

+   printf(" %s (", identifier);

+

+   foreach_list_const(n, & this->parameters) {

+      ast_node *ast = exec_node_data(ast_node, n, link);

+      ast->print();

+   }

+

+   printf(")");

+}

+

+

+ast_function::ast_function(void)

+   : is_definition(false), signature(NULL)

+{

+   /* empty */

+}

+

+

+void

+ast_fully_specified_type::print(void) const

+{

+   _mesa_ast_type_qualifier_print(& qualifier);

+   specifier->print();

+}

+

+

+void

+ast_parameter_declarator::print(void) const

+{

+   type->print();

+   if (identifier)

+      printf("%s ", identifier);

+   ast_opt_array_size_print(is_array, array_size);

+}

+

+

+void

+ast_function_definition::print(void) const

+{

+   prototype->print();

+   body->print();

+}

+

+

+void

+ast_declaration::print(void) const

+{

+   printf("%s ", identifier);

+   ast_opt_array_size_print(is_array, array_size);

+

+   if (initializer) {

+      printf("= ");

+      initializer->print();

+   }

+}

+

+

+ast_declaration::ast_declaration(char *identifier, int is_array,

+				 ast_expression *array_size,

+				 ast_expression *initializer)

+{

+   this->identifier = identifier;

+   this->is_array = is_array;

+   this->array_size = array_size;

+   this->initializer = initializer;

+}

+

+

+void

+ast_declarator_list::print(void) const

+{

+   assert(type || invariant);

+

+   if (type)

+      type->print();

+   else

+      printf("invariant ");

+

+   foreach_list_const (ptr, & this->declarations) {

+      if (ptr != this->declarations.get_head())

+	 printf(", ");

+

+      ast_node *ast = exec_node_data(ast_node, ptr, link);

+      ast->print();

+   }

+

+   printf("; ");

+}

+

+

+ast_declarator_list::ast_declarator_list(ast_fully_specified_type *type)

+{

+   this->type = type;

+   this->invariant = false;

+}

+

+void

+ast_jump_statement::print(void) const

+{

+   switch (mode) {

+   case ast_continue:

+      printf("continue; ");

+      break;

+   case ast_break:

+      printf("break; ");

+      break;

+   case ast_return:

+      printf("return ");

+      if (opt_return_value)

+	 opt_return_value->print();

+

+      printf("; ");

+      break;

+   case ast_discard:

+      printf("discard; ");

+      break;

+   }

+}

+

+

+ast_jump_statement::ast_jump_statement(int mode, ast_expression *return_value)

+{

+   this->mode = ast_jump_modes(mode);

+

+   if (mode == ast_return)

+      opt_return_value = return_value;

+}

+

+

+void

+ast_selection_statement::print(void) const

+{

+   printf("if ( ");

+   condition->print();

+   printf(") ");

+

+   then_statement->print();

+

+   if (else_statement) {

+      printf("else ");

+      else_statement->print();

+   }

+   

+}

+

+

+ast_selection_statement::ast_selection_statement(ast_expression *condition,

+						 ast_node *then_statement,

+						 ast_node *else_statement)

+{

+   this->condition = condition;

+   this->then_statement = then_statement;

+   this->else_statement = else_statement;

+}

+

+

+void

+ast_iteration_statement::print(void) const

+{

+   switch (mode) {

+   case ast_for:

+      printf("for( ");

+      if (init_statement)

+	 init_statement->print();

+      printf("; ");

+

+      if (condition)

+	 condition->print();

+      printf("; ");

+

+      if (rest_expression)

+	 rest_expression->print();

+      printf(") ");

+

+      body->print();

+      break;

+

+   case ast_while:

+      printf("while ( ");

+      if (condition)

+	 condition->print();

+      printf(") ");

+      body->print();

+      break;

+

+   case ast_do_while:

+      printf("do ");

+      body->print();

+      printf("while ( ");

+      if (condition)

+	 condition->print();

+      printf("); ");

+      break;

+   }

+}

+

+

+ast_iteration_statement::ast_iteration_statement(int mode,

+						 ast_node *init,

+						 ast_node *condition,

+						 ast_expression *rest_expression,

+						 ast_node *body)

+{

+   this->mode = ast_iteration_modes(mode);

+   this->init_statement = init;

+   this->condition = condition;

+   this->rest_expression = rest_expression;

+   this->body = body;

+}

+

+

+void

+ast_struct_specifier::print(void) const

+{

+   printf("struct %s { ", name);

+   foreach_list_const(n, &this->declarations) {

+      ast_node *ast = exec_node_data(ast_node, n, link);

+      ast->print();

+   }

+   printf("} ");

+}

+

+

+ast_struct_specifier::ast_struct_specifier(char *identifier,

+					   ast_node *declarator_list)

+{

+   if (identifier == NULL) {

+      static unsigned anon_count = 1;

+      identifier = ralloc_asprintf(this, "#anon_struct_%04x", anon_count);

+      anon_count++;

+   }

+   name = identifier;

+   this->declarations.push_degenerate_list_at_head(&declarator_list->link);

+}

+

+bool

+do_common_optimization(exec_list *ir, bool linked, unsigned max_unroll_iterations)

+{

+   GLboolean progress = GL_FALSE;

+

+   progress = lower_instructions(ir, SUB_TO_ADD_NEG) || progress;

+

+   if (linked) {

+      progress = do_function_inlining(ir) || progress;

+      progress = do_dead_functions(ir) || progress;

+   }

+   progress = do_structure_splitting(ir) || progress;

+   progress = do_if_simplification(ir) || progress;

+   progress = do_discard_simplification(ir) || progress;

+   progress = do_copy_propagation(ir) || progress;

+   /*progress = do_copy_propagation_elements(ir) || progress;*/

+   if (linked)

+      progress = do_dead_code(ir) || progress;

+   else

+      progress = do_dead_code_unlinked(ir) || progress;

+   progress = do_dead_code_local(ir) || progress;

+   progress = do_tree_grafting(ir) || progress;

+   progress = do_constant_propagation(ir) || progress;

+   if (linked)

+      progress = do_constant_variable(ir) || progress;

+   else

+      progress = do_constant_variable_unlinked(ir) || progress;

+   progress = do_constant_folding(ir) || progress;

+   progress = do_algebraic(ir) || progress;

+   progress = do_lower_jumps(ir) || progress;

+   progress = do_vec_index_to_swizzle(ir) || progress;

+   progress = do_swizzle_swizzle(ir) || progress;

+   progress = do_noop_swizzle(ir) || progress;

+

+   progress = optimize_redundant_jumps(ir) || progress;

+

+   loop_state *ls = analyze_loop_variables(ir);

+   if (ls->loop_found) {

+      progress = set_loop_controls(ir, ls) || progress;

+      progress = unroll_loops(ir, ls, max_unroll_iterations) || progress;

+   }

+   delete ls;

+

+   return progress;

+}

+

+extern "C" {

+

+/**

+ * To be called at GL teardown time, this frees compiler datastructures.

+ *

+ * After calling this, any previously compiled shaders and shader

+ * programs would be invalid.  So this should happen at approximately

+ * program exit.

+ */

+void

+_mesa_destroy_shader_compiler(void)

+{

+   _mesa_destroy_shader_compiler_caches();

+

+   _mesa_glsl_release_types();

+}

+

+/**

+ * Releases compiler caches to trade off performance for memory.

+ *

+ * Intended to be used with glReleaseShaderCompiler().

+ */

+void

+_mesa_destroy_shader_compiler_caches(void)

+{

+   _mesa_glsl_release_functions();

+}

+

+}

diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h
index 6df0e160a..59515b5c3 100644
--- a/mesalib/src/glsl/glsl_parser_extras.h
+++ b/mesalib/src/glsl/glsl_parser_extras.h
@@ -1,279 +1,283 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#pragma once
-#ifndef GLSL_PARSER_EXTRAS_H
-#define GLSL_PARSER_EXTRAS_H
-
-/*
- * Most of the definitions here only apply to C++
- */
-#ifdef __cplusplus
-
-
-#include <stdlib.h>
-#include "glsl_symbol_table.h"
-
-enum _mesa_glsl_parser_targets {
-   vertex_shader,
-   geometry_shader,
-   fragment_shader
-};
-
-struct gl_context;
-
-struct _mesa_glsl_parse_state {
-   _mesa_glsl_parse_state(struct gl_context *ctx, GLenum target,
-			  void *mem_ctx);
-
-   /* 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 *mem = rzalloc_size(ctx, size);
-      assert(mem != NULL);
-
-      return mem;
-   }
-
-   /* If the user *does* call delete, that's OK, we will just
-    * ralloc_free in that case. */
-   static void operator delete(void *mem)
-   {
-      ralloc_free(mem);
-   }
-
-   void *scanner;
-   exec_list translation_unit;
-   glsl_symbol_table *symbols;
-
-   bool es_shader;
-   unsigned language_version;
-   const char *version_string;
-   enum _mesa_glsl_parser_targets target;
-
-   /**
-    * Printable list of GLSL versions supported by the current context
-    *
-    * \note
-    * This string should probably be generated per-context instead of per
-    * invokation of the compiler.  This should be changed when the method of
-    * tracking supported GLSL versions changes.
-    */
-   const char *supported_version_string;
-
-   /**
-    * Implementation defined limits that affect built-in variables, etc.
-    *
-    * \sa struct gl_constants (in mtypes.h)
-    */
-   struct {
-      /* 1.10 */
-      unsigned MaxLights;
-      unsigned MaxClipPlanes;
-      unsigned MaxTextureUnits;
-      unsigned MaxTextureCoords;
-      unsigned MaxVertexAttribs;
-      unsigned MaxVertexUniformComponents;
-      unsigned MaxVaryingFloats;
-      unsigned MaxVertexTextureImageUnits;
-      unsigned MaxCombinedTextureImageUnits;
-      unsigned MaxTextureImageUnits;
-      unsigned MaxFragmentUniformComponents;
-
-      /* ARB_draw_buffers */
-      unsigned MaxDrawBuffers;
-
-      /**
-       * Set of GLSL versions supported by the current context
-       *
-       * Knowing that version X is supported doesn't mean that versions before
-       * X are also supported.  Version 1.00 is only supported in an ES2
-       * context or when GL_ARB_ES2_compatibility is supported.  In an OpenGL
-       * 3.0 "forward compatible" context, GLSL 1.10 and 1.20 are \b not
-       * supported.
-       */
-      /*@{*/
-      unsigned GLSL_100ES:1;
-      unsigned GLSL_110:1;
-      unsigned GLSL_120:1;
-      unsigned GLSL_130:1;
-      /*@}*/
-   } Const;
-
-   /**
-    * During AST to IR conversion, pointer to current IR function
-    *
-    * Will be \c NULL whenever the AST to IR conversion is not inside a
-    * function definition.
-    */
-   class ir_function_signature *current_function;
-
-   /** Have we found a return statement in this function? */
-   bool found_return;
-
-   /** Was there an error during compilation? */
-   bool error;
-
-   /**
-    * Are all shader inputs / outputs invariant?
-    *
-    * This is set when the 'STDGL invariant(all)' pragma is used.
-    */
-   bool all_invariant;
-
-   /** Loop or switch statement containing the current instructions. */
-   class ir_instruction *loop_or_switch_nesting;
-   class ast_iteration_statement *loop_or_switch_nesting_ast;
-
-   /** List of structures defined in user code. */
-   const glsl_type **user_structures;
-   unsigned num_user_structures;
-
-   char *info_log;
-
-   /**
-    * \name Enable bits for GLSL extensions
-    */
-   /*@{*/
-   unsigned ARB_draw_buffers_enable:1;
-   unsigned ARB_draw_buffers_warn:1;
-   unsigned ARB_draw_instanced_enable:1;
-   unsigned ARB_draw_instanced_warn:1;
-   unsigned ARB_explicit_attrib_location_enable:1;
-   unsigned ARB_explicit_attrib_location_warn:1;
-   unsigned ARB_fragment_coord_conventions_enable:1;
-   unsigned ARB_fragment_coord_conventions_warn:1;
-   unsigned ARB_texture_rectangle_enable:1;
-   unsigned ARB_texture_rectangle_warn:1;
-   unsigned EXT_texture_array_enable:1;
-   unsigned EXT_texture_array_warn:1;
-   unsigned ARB_shader_stencil_export_enable:1;
-   unsigned ARB_shader_stencil_export_warn:1;
-   unsigned AMD_conservative_depth_enable:1;
-   unsigned AMD_conservative_depth_warn:1;
-   unsigned OES_texture_3D_enable:1;
-   unsigned OES_texture_3D_warn:1;
-   /*@}*/
-
-   /** Extensions supported by the OpenGL implementation. */
-   const struct gl_extensions *extensions;
-
-   /** Shaders containing built-in functions that are used for linking. */
-   struct gl_shader *builtins_to_link[16];
-   unsigned num_builtins_to_link;
-};
-
-typedef struct YYLTYPE {
-   int first_line;
-   int first_column;
-   int last_line;
-   int last_column;
-   unsigned source;
-} YYLTYPE;
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-
-# define YYLLOC_DEFAULT(Current, Rhs, N)			\
-do {								\
-   if (N)							\
-   {								\
-      (Current).first_line   = YYRHSLOC(Rhs, 1).first_line;	\
-      (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\
-      (Current).last_line    = YYRHSLOC(Rhs, N).last_line;	\
-      (Current).last_column  = YYRHSLOC(Rhs, N).last_column;	\
-   }								\
-   else								\
-   {								\
-      (Current).first_line   = (Current).last_line =		\
-	 YYRHSLOC(Rhs, 0).last_line;				\
-      (Current).first_column = (Current).last_column =		\
-	 YYRHSLOC(Rhs, 0).last_column;				\
-   }								\
-   (Current).source = 0;					\
-} while (0)
-
-extern void _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
-			     const char *fmt, ...);
-
-/**
- * Emit a warning to the shader log
- *
- * \sa _mesa_glsl_error
- */
-extern void _mesa_glsl_warning(const YYLTYPE *locp,
-			       _mesa_glsl_parse_state *state,
-			       const char *fmt, ...);
-
-extern void _mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state,
-				  const char *string);
-
-extern void _mesa_glsl_lexer_dtor(struct _mesa_glsl_parse_state *state);
-
-union YYSTYPE;
-extern int _mesa_glsl_lex(union YYSTYPE *yylval, YYLTYPE *yylloc, 
-			  void *scanner);
-
-extern int _mesa_glsl_parse(struct _mesa_glsl_parse_state *);
-
-/**
- * Process elements of the #extension directive
- *
- * \return
- * If \c name and \c behavior are valid, \c true is returned.  Otherwise
- * \c false is returned.
- */
-extern bool _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,
-					 const char *behavior,
-					 YYLTYPE *behavior_locp,
-					 _mesa_glsl_parse_state *state);
-
-/**
- * Get the textual name of the specified shader target
- */
-extern const char *
-_mesa_glsl_shader_target_name(enum _mesa_glsl_parser_targets target);
-
-
-#endif /* __cplusplus */
-
-
-/*
- * These definitions apply to C and C++
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int preprocess(void *ctx, const char **shader, char **info_log,
-                      const struct gl_extensions *extensions, int api);
-
-extern void _mesa_destroy_shader_compiler(void);
-extern void _mesa_destroy_shader_compiler_caches(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* GLSL_PARSER_EXTRAS_H */
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#pragma once

+#ifndef GLSL_PARSER_EXTRAS_H

+#define GLSL_PARSER_EXTRAS_H

+

+/*

+ * Most of the definitions here only apply to C++

+ */

+#ifdef __cplusplus

+

+

+#include <stdlib.h>

+#include "glsl_symbol_table.h"

+

+enum _mesa_glsl_parser_targets {

+   vertex_shader,

+   geometry_shader,

+   fragment_shader

+};

+

+struct gl_context;

+

+struct _mesa_glsl_parse_state {

+   _mesa_glsl_parse_state(struct gl_context *ctx, GLenum target,

+			  void *mem_ctx);

+

+   /* 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 *mem = rzalloc_size(ctx, size);

+      assert(mem != NULL);

+

+      return mem;

+   }

+

+   /* If the user *does* call delete, that's OK, we will just

+    * ralloc_free in that case. */

+   static void operator delete(void *mem, void *ctx)

+   {

+      ralloc_free(mem);

+   }

+   static void operator delete(void *mem)

+   {

+      ralloc_free(mem);

+   }

+

+   void *scanner;

+   exec_list translation_unit;

+   glsl_symbol_table *symbols;

+

+   bool es_shader;

+   unsigned language_version;

+   const char *version_string;

+   enum _mesa_glsl_parser_targets target;

+

+   /**

+    * Printable list of GLSL versions supported by the current context

+    *

+    * \note

+    * This string should probably be generated per-context instead of per

+    * invokation of the compiler.  This should be changed when the method of

+    * tracking supported GLSL versions changes.

+    */

+   const char *supported_version_string;

+

+   /**

+    * Implementation defined limits that affect built-in variables, etc.

+    *

+    * \sa struct gl_constants (in mtypes.h)

+    */

+   struct {

+      /* 1.10 */

+      unsigned MaxLights;

+      unsigned MaxClipPlanes;

+      unsigned MaxTextureUnits;

+      unsigned MaxTextureCoords;

+      unsigned MaxVertexAttribs;

+      unsigned MaxVertexUniformComponents;

+      unsigned MaxVaryingFloats;

+      unsigned MaxVertexTextureImageUnits;

+      unsigned MaxCombinedTextureImageUnits;

+      unsigned MaxTextureImageUnits;

+      unsigned MaxFragmentUniformComponents;

+

+      /* ARB_draw_buffers */

+      unsigned MaxDrawBuffers;

+

+      /**

+       * Set of GLSL versions supported by the current context

+       *

+       * Knowing that version X is supported doesn't mean that versions before

+       * X are also supported.  Version 1.00 is only supported in an ES2

+       * context or when GL_ARB_ES2_compatibility is supported.  In an OpenGL

+       * 3.0 "forward compatible" context, GLSL 1.10 and 1.20 are \b not

+       * supported.

+       */

+      /*@{*/

+      unsigned GLSL_100ES:1;

+      unsigned GLSL_110:1;

+      unsigned GLSL_120:1;

+      unsigned GLSL_130:1;

+      /*@}*/

+   } Const;

+

+   /**

+    * During AST to IR conversion, pointer to current IR function

+    *

+    * Will be \c NULL whenever the AST to IR conversion is not inside a

+    * function definition.

+    */

+   class ir_function_signature *current_function;

+

+   /** Have we found a return statement in this function? */

+   bool found_return;

+

+   /** Was there an error during compilation? */

+   bool error;

+

+   /**

+    * Are all shader inputs / outputs invariant?

+    *

+    * This is set when the 'STDGL invariant(all)' pragma is used.

+    */

+   bool all_invariant;

+

+   /** Loop or switch statement containing the current instructions. */

+   class ir_instruction *loop_or_switch_nesting;

+   class ast_iteration_statement *loop_or_switch_nesting_ast;

+

+   /** List of structures defined in user code. */

+   const glsl_type **user_structures;

+   unsigned num_user_structures;

+

+   char *info_log;

+

+   /**

+    * \name Enable bits for GLSL extensions

+    */

+   /*@{*/

+   unsigned ARB_draw_buffers_enable:1;

+   unsigned ARB_draw_buffers_warn:1;

+   unsigned ARB_draw_instanced_enable:1;

+   unsigned ARB_draw_instanced_warn:1;

+   unsigned ARB_explicit_attrib_location_enable:1;

+   unsigned ARB_explicit_attrib_location_warn:1;

+   unsigned ARB_fragment_coord_conventions_enable:1;

+   unsigned ARB_fragment_coord_conventions_warn:1;

+   unsigned ARB_texture_rectangle_enable:1;

+   unsigned ARB_texture_rectangle_warn:1;

+   unsigned EXT_texture_array_enable:1;

+   unsigned EXT_texture_array_warn:1;

+   unsigned ARB_shader_stencil_export_enable:1;

+   unsigned ARB_shader_stencil_export_warn:1;

+   unsigned AMD_conservative_depth_enable:1;

+   unsigned AMD_conservative_depth_warn:1;

+   unsigned OES_texture_3D_enable:1;

+   unsigned OES_texture_3D_warn:1;

+   /*@}*/

+

+   /** Extensions supported by the OpenGL implementation. */

+   const struct gl_extensions *extensions;

+

+   /** Shaders containing built-in functions that are used for linking. */

+   struct gl_shader *builtins_to_link[16];

+   unsigned num_builtins_to_link;

+};

+

+typedef struct YYLTYPE {

+   int first_line;

+   int first_column;

+   int last_line;

+   int last_column;

+   unsigned source;

+} YYLTYPE;

+# define YYLTYPE_IS_DECLARED 1

+# define YYLTYPE_IS_TRIVIAL 1

+

+# define YYLLOC_DEFAULT(Current, Rhs, N)			\

+do {								\

+   if (N)							\

+   {								\

+      (Current).first_line   = YYRHSLOC(Rhs, 1).first_line;	\

+      (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\

+      (Current).last_line    = YYRHSLOC(Rhs, N).last_line;	\

+      (Current).last_column  = YYRHSLOC(Rhs, N).last_column;	\

+   }								\

+   else								\

+   {								\

+      (Current).first_line   = (Current).last_line =		\

+	 YYRHSLOC(Rhs, 0).last_line;				\

+      (Current).first_column = (Current).last_column =		\

+	 YYRHSLOC(Rhs, 0).last_column;				\

+   }								\

+   (Current).source = 0;					\

+} while (0)

+

+extern void _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,

+			     const char *fmt, ...);

+

+/**

+ * Emit a warning to the shader log

+ *

+ * \sa _mesa_glsl_error

+ */

+extern void _mesa_glsl_warning(const YYLTYPE *locp,

+			       _mesa_glsl_parse_state *state,

+			       const char *fmt, ...);

+

+extern void _mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state,

+				  const char *string);

+

+extern void _mesa_glsl_lexer_dtor(struct _mesa_glsl_parse_state *state);

+

+union YYSTYPE;

+extern int _mesa_glsl_lex(union YYSTYPE *yylval, YYLTYPE *yylloc, 

+			  void *scanner);

+

+extern int _mesa_glsl_parse(struct _mesa_glsl_parse_state *);

+

+/**

+ * Process elements of the #extension directive

+ *

+ * \return

+ * If \c name and \c behavior are valid, \c true is returned.  Otherwise

+ * \c false is returned.

+ */

+extern bool _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,

+					 const char *behavior,

+					 YYLTYPE *behavior_locp,

+					 _mesa_glsl_parse_state *state);

+

+/**

+ * Get the textual name of the specified shader target

+ */

+extern const char *

+_mesa_glsl_shader_target_name(enum _mesa_glsl_parser_targets target);

+

+

+#endif /* __cplusplus */

+

+

+/*

+ * These definitions apply to C and C++

+ */

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+extern int preprocess(void *ctx, const char **shader, char **info_log,

+                      const struct gl_extensions *extensions, int api);

+

+extern void _mesa_destroy_shader_compiler(void);

+extern void _mesa_destroy_shader_compiler_caches(void);

+

+#ifdef __cplusplus

+}

+#endif

+

+

+#endif /* GLSL_PARSER_EXTRAS_H */

diff --git a/mesalib/src/glsl/glsl_symbol_table.cpp b/mesalib/src/glsl/glsl_symbol_table.cpp
index bcb65d301..fa6458df5 100644
--- a/mesalib/src/glsl/glsl_symbol_table.cpp
+++ b/mesalib/src/glsl/glsl_symbol_table.cpp
@@ -1,165 +1,169 @@
-/* -*- c++ -*- */
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#include "glsl_symbol_table.h"
-
-class symbol_table_entry {
-public:
-   /* 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 *entry = ralloc_size(ctx, size);
-      assert(entry != NULL);
-      return entry;
-   }
-
-   /* If the user *does* call delete, that's OK, we will just ralloc_free. */
-   static void operator delete(void *entry)
-   {
-      ralloc_free(entry);
-   }
-
-   symbol_table_entry(ir_variable *v)                     : v(v), f(0), t(0) {}
-   symbol_table_entry(ir_function *f)                     : v(0), f(f), t(0) {}
-   symbol_table_entry(const glsl_type *t)                 : v(0), f(0), t(t) {}
-
-   ir_variable *v;
-   ir_function *f;
-   const glsl_type *t;
-};
-
-glsl_symbol_table::glsl_symbol_table()
-{
-   this->language_version = 120;
-   this->table = _mesa_symbol_table_ctor();
-   this->mem_ctx = ralloc_context(NULL);
-}
-
-glsl_symbol_table::~glsl_symbol_table()
-{
-   _mesa_symbol_table_dtor(table);
-   ralloc_free(mem_ctx);
-}
-
-void glsl_symbol_table::push_scope()
-{
-   _mesa_symbol_table_push_scope(table);
-}
-
-void glsl_symbol_table::pop_scope()
-{
-   _mesa_symbol_table_pop_scope(table);
-}
-
-bool glsl_symbol_table::name_declared_this_scope(const char *name)
-{
-   return _mesa_symbol_table_symbol_scope(table, -1, name) == 0;
-}
-
-bool glsl_symbol_table::add_variable(ir_variable *v)
-{
-   if (this->language_version == 110) {
-      /* In 1.10, functions and variables have separate namespaces. */
-      symbol_table_entry *existing = get_entry(v->name);
-      if (name_declared_this_scope(v->name)) {
-	 /* If there's already an existing function (not a constructor!) in
-	  * the current scope, just update the existing entry to include 'v'.
-	  */
-	 if (existing->v == NULL && existing->t == NULL) {
-	    existing->v = v;
-	    return true;
-	 }
-      } else {
-	 /* If not declared at this scope, add a new entry.  But if an existing
-	  * entry includes a function, propagate that to this block - otherwise
-	  * the new variable declaration would shadow the function.
-	  */
-	 symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);
-	 if (existing != NULL)
-	    entry->f = existing->f;
-	 int added = _mesa_symbol_table_add_symbol(table, -1, v->name, entry);
-	 assert(added == 0);
-	 (void)added;
-	 return true;
-      }
-      return false;
-   }
-
-   /* 1.20+ rules: */
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);
-   return _mesa_symbol_table_add_symbol(table, -1, v->name, entry) == 0;
-}
-
-bool glsl_symbol_table::add_type(const char *name, const glsl_type *t)
-{
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(t);
-   return _mesa_symbol_table_add_symbol(table, -1, name, entry) == 0;
-}
-
-bool glsl_symbol_table::add_function(ir_function *f)
-{
-   if (this->language_version == 110 && name_declared_this_scope(f->name)) {
-      /* In 1.10, functions and variables have separate namespaces. */
-      symbol_table_entry *existing = get_entry(f->name);
-      if ((existing->f == NULL) && (existing->t == NULL)) {
-	 existing->f = f;
-	 return true;
-      }
-   }
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);
-   return _mesa_symbol_table_add_symbol(table, -1, f->name, entry) == 0;
-}
-
-void glsl_symbol_table::add_global_function(ir_function *f)
-{
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);
-   int added = _mesa_symbol_table_add_global_symbol(table, -1, f->name, entry);
-   assert(added == 0);
-   (void)added;
-}
-
-ir_variable *glsl_symbol_table::get_variable(const char *name)
-{
-   symbol_table_entry *entry = get_entry(name);
-   return entry != NULL ? entry->v : NULL;
-}
-
-const glsl_type *glsl_symbol_table::get_type(const char *name)
-{
-   symbol_table_entry *entry = get_entry(name);
-   return entry != NULL ? entry->t : NULL;
-}
-
-ir_function *glsl_symbol_table::get_function(const char *name)
-{
-   symbol_table_entry *entry = get_entry(name);
-   return entry != NULL ? entry->f : NULL;
-}
-
-symbol_table_entry *glsl_symbol_table::get_entry(const char *name)
-{
-   return (symbol_table_entry *)
-      _mesa_symbol_table_find_symbol(table, -1, name);
-}
+/* -*- c++ -*- */

+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#include "glsl_symbol_table.h"

+

+class symbol_table_entry {

+public:

+   /* 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 *entry = ralloc_size(ctx, size);

+      assert(entry != NULL);

+      return entry;

+   }

+

+   /* If the user *does* call delete, that's OK, we will just ralloc_free. */

+   static void operator delete(void *entry, void *ctx)

+   {

+      ralloc_free(entry);

+   }

+   static void operator delete(void *entry)

+   {

+      ralloc_free(entry);

+   }

+

+   symbol_table_entry(ir_variable *v)                     : v(v), f(0), t(0) {}

+   symbol_table_entry(ir_function *f)                     : v(0), f(f), t(0) {}

+   symbol_table_entry(const glsl_type *t)                 : v(0), f(0), t(t) {}

+

+   ir_variable *v;

+   ir_function *f;

+   const glsl_type *t;

+};

+

+glsl_symbol_table::glsl_symbol_table()

+{

+   this->language_version = 120;

+   this->table = _mesa_symbol_table_ctor();

+   this->mem_ctx = ralloc_context(NULL);

+}

+

+glsl_symbol_table::~glsl_symbol_table()

+{

+   _mesa_symbol_table_dtor(table);

+   ralloc_free(mem_ctx);

+}

+

+void glsl_symbol_table::push_scope()

+{

+   _mesa_symbol_table_push_scope(table);

+}

+

+void glsl_symbol_table::pop_scope()

+{

+   _mesa_symbol_table_pop_scope(table);

+}

+

+bool glsl_symbol_table::name_declared_this_scope(const char *name)

+{

+   return _mesa_symbol_table_symbol_scope(table, -1, name) == 0;

+}

+

+bool glsl_symbol_table::add_variable(ir_variable *v)

+{

+   if (this->language_version == 110) {

+      /* In 1.10, functions and variables have separate namespaces. */

+      symbol_table_entry *existing = get_entry(v->name);

+      if (name_declared_this_scope(v->name)) {

+	 /* If there's already an existing function (not a constructor!) in

+	  * the current scope, just update the existing entry to include 'v'.

+	  */

+	 if (existing->v == NULL && existing->t == NULL) {

+	    existing->v = v;

+	    return true;

+	 }

+      } else {

+	 /* If not declared at this scope, add a new entry.  But if an existing

+	  * entry includes a function, propagate that to this block - otherwise

+	  * the new variable declaration would shadow the function.

+	  */

+	 symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);

+	 if (existing != NULL)

+	    entry->f = existing->f;

+	 int added = _mesa_symbol_table_add_symbol(table, -1, v->name, entry);

+	 assert(added == 0);

+	 (void)added;

+	 return true;

+      }

+      return false;

+   }

+

+   /* 1.20+ rules: */

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);

+   return _mesa_symbol_table_add_symbol(table, -1, v->name, entry) == 0;

+}

+

+bool glsl_symbol_table::add_type(const char *name, const glsl_type *t)

+{

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(t);

+   return _mesa_symbol_table_add_symbol(table, -1, name, entry) == 0;

+}

+

+bool glsl_symbol_table::add_function(ir_function *f)

+{

+   if (this->language_version == 110 && name_declared_this_scope(f->name)) {

+      /* In 1.10, functions and variables have separate namespaces. */

+      symbol_table_entry *existing = get_entry(f->name);

+      if ((existing->f == NULL) && (existing->t == NULL)) {

+	 existing->f = f;

+	 return true;

+      }

+   }

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);

+   return _mesa_symbol_table_add_symbol(table, -1, f->name, entry) == 0;

+}

+

+void glsl_symbol_table::add_global_function(ir_function *f)

+{

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);

+   int added = _mesa_symbol_table_add_global_symbol(table, -1, f->name, entry);

+   assert(added == 0);

+   (void)added;

+}

+

+ir_variable *glsl_symbol_table::get_variable(const char *name)

+{

+   symbol_table_entry *entry = get_entry(name);

+   return entry != NULL ? entry->v : NULL;

+}

+

+const glsl_type *glsl_symbol_table::get_type(const char *name)

+{

+   symbol_table_entry *entry = get_entry(name);

+   return entry != NULL ? entry->t : NULL;

+}

+

+ir_function *glsl_symbol_table::get_function(const char *name)

+{

+   symbol_table_entry *entry = get_entry(name);

+   return entry != NULL ? entry->f : NULL;

+}

+

+symbol_table_entry *glsl_symbol_table::get_entry(const char *name)

+{

+   return (symbol_table_entry *)

+      _mesa_symbol_table_find_symbol(table, -1, name);

+}

diff --git a/mesalib/src/glsl/glsl_symbol_table.h b/mesalib/src/glsl/glsl_symbol_table.h
index 637bc033b..1afeddb33 100644
--- a/mesalib/src/glsl/glsl_symbol_table.h
+++ b/mesalib/src/glsl/glsl_symbol_table.h
@@ -68,6 +68,11 @@ public:
    /* If the user *does* call delete, that's OK, we will just
     * ralloc_free in that case. Here, C++ will have already called the
     * destructor so tell ralloc not to do that again. */
+   static void operator delete(void *table, void *ctx)
+   {
+      ralloc_set_destructor(table, NULL);
+      ralloc_free(table);
+   }
    static void operator delete(void *table)
    {
       ralloc_set_destructor(table, NULL);
diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp
index 78d10bd93..ba862dfd6 100644
--- a/mesalib/src/glsl/glsl_types.cpp
+++ b/mesalib/src/glsl/glsl_types.cpp
@@ -1,509 +1,509 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "main/core.h" /* for Elements */
-#include "glsl_symbol_table.h"
-#include "glsl_parser_extras.h"
-#include "glsl_types.h"
-#include "builtin_types.h"
-extern "C" {
-#include "program/hash_table.h"
-}
-
-hash_table *glsl_type::array_types = NULL;
-hash_table *glsl_type::record_types = NULL;
-void *glsl_type::mem_ctx = NULL;
-
-void
-glsl_type::init_ralloc_type_ctx(void)
-{
-   if (glsl_type::mem_ctx == NULL) {
-      glsl_type::mem_ctx = ralloc_autofree_context();
-      assert(glsl_type::mem_ctx != NULL);
-   }
-}
-
-glsl_type::glsl_type(GLenum gl_type,
-		     glsl_base_type base_type, unsigned vector_elements,
-		     unsigned matrix_columns, const char *name) :
-   gl_type(gl_type),
-   base_type(base_type),
-   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
-   sampler_type(0),
-   vector_elements(vector_elements), matrix_columns(matrix_columns),
-   length(0)
-{
-   init_ralloc_type_ctx();
-   this->name = ralloc_strdup(this->mem_ctx, name);
-   /* Neither dimension is zero or both dimensions are zero.
-    */
-   assert((vector_elements == 0) == (matrix_columns == 0));
-   memset(& fields, 0, sizeof(fields));
-}
-
-glsl_type::glsl_type(GLenum gl_type,
-		     enum glsl_sampler_dim dim, bool shadow, bool array,
-		     unsigned type, const char *name) :
-   gl_type(gl_type),
-   base_type(GLSL_TYPE_SAMPLER),
-   sampler_dimensionality(dim), sampler_shadow(shadow),
-   sampler_array(array), sampler_type(type),
-   vector_elements(0), matrix_columns(0),
-   length(0)
-{
-   init_ralloc_type_ctx();
-   this->name = ralloc_strdup(this->mem_ctx, name);
-   memset(& fields, 0, sizeof(fields));
-}
-
-glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields,
-		     const char *name) :
-   base_type(GLSL_TYPE_STRUCT),
-   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
-   sampler_type(0),
-   vector_elements(0), matrix_columns(0),
-   length(num_fields)
-{
-   unsigned int i;
-
-   init_ralloc_type_ctx();
-   this->name = ralloc_strdup(this->mem_ctx, name);
-   this->fields.structure = ralloc_array(this->mem_ctx,
-					 glsl_struct_field, length);
-   for (i = 0; i < length; i++) {
-      this->fields.structure[i].type = fields[i].type;
-      this->fields.structure[i].name = ralloc_strdup(this->fields.structure,
-						     fields[i].name);
-   }
-}
-
-static void
-add_types_to_symbol_table(glsl_symbol_table *symtab,
-			  const struct glsl_type *types,
-			  unsigned num_types, bool warn)
-{
-   (void) warn;
-
-   for (unsigned i = 0; i < num_types; i++) {
-      symtab->add_type(types[i].name, & types[i]);
-   }
-}
-
-void
-glsl_type::generate_100ES_types(glsl_symbol_table *symtab)
-{
-   add_types_to_symbol_table(symtab, builtin_core_types,
-			     Elements(builtin_core_types),
-			     false);
-   add_types_to_symbol_table(symtab, builtin_structure_types,
-			     Elements(builtin_structure_types),
-			     false);
-   add_types_to_symbol_table(symtab, void_type, 1, false);
-}
-
-void
-glsl_type::generate_110_types(glsl_symbol_table *symtab)
-{
-   generate_100ES_types(symtab);
-
-   add_types_to_symbol_table(symtab, builtin_110_types,
-			     Elements(builtin_110_types),
-			     false);
-   add_types_to_symbol_table(symtab, &_sampler3D_type, 1, false);
-   add_types_to_symbol_table(symtab, builtin_110_deprecated_structure_types,
-			     Elements(builtin_110_deprecated_structure_types),
-			     false);
-}
-
-
-void
-glsl_type::generate_120_types(glsl_symbol_table *symtab)
-{
-   generate_110_types(symtab);
-
-   add_types_to_symbol_table(symtab, builtin_120_types,
-			     Elements(builtin_120_types), false);
-}
-
-
-void
-glsl_type::generate_130_types(glsl_symbol_table *symtab)
-{
-   generate_120_types(symtab);
-
-   add_types_to_symbol_table(symtab, builtin_130_types,
-			     Elements(builtin_130_types), false);
-   generate_EXT_texture_array_types(symtab, false);
-}
-
-
-void
-glsl_type::generate_ARB_texture_rectangle_types(glsl_symbol_table *symtab,
-						bool warn)
-{
-   add_types_to_symbol_table(symtab, builtin_ARB_texture_rectangle_types,
-			     Elements(builtin_ARB_texture_rectangle_types),
-			     warn);
-}
-
-
-void
-glsl_type::generate_EXT_texture_array_types(glsl_symbol_table *symtab,
-					    bool warn)
-{
-   add_types_to_symbol_table(symtab, builtin_EXT_texture_array_types,
-			     Elements(builtin_EXT_texture_array_types),
-			     warn);
-}
-
-
-void
-glsl_type::generate_OES_texture_3D_types(glsl_symbol_table *symtab, bool warn)
-{
-   add_types_to_symbol_table(symtab, &_sampler3D_type, 1, warn);
-}
-
-
-void
-_mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state)
-{
-   switch (state->language_version) {
-   case 100:
-      assert(state->es_shader);
-      glsl_type::generate_100ES_types(state->symbols);
-      break;
-   case 110:
-      glsl_type::generate_110_types(state->symbols);
-      break;
-   case 120:
-      glsl_type::generate_120_types(state->symbols);
-      break;
-   case 130:
-      glsl_type::generate_130_types(state->symbols);
-      break;
-   default:
-      /* error */
-      break;
-   }
-
-   if (state->ARB_texture_rectangle_enable) {
-      glsl_type::generate_ARB_texture_rectangle_types(state->symbols,
-					   state->ARB_texture_rectangle_warn);
-   }
-   if (state->OES_texture_3D_enable && state->language_version == 100) {
-      glsl_type::generate_OES_texture_3D_types(state->symbols,
-					       state->OES_texture_3D_warn);
-   }
-
-   if (state->EXT_texture_array_enable && state->language_version < 130) {
-      // These are already included in 130; don't create twice.
-      glsl_type::generate_EXT_texture_array_types(state->symbols,
-				       state->EXT_texture_array_warn);
-   }
-}
-
-
-const glsl_type *glsl_type::get_base_type() const
-{
-   switch (base_type) {
-   case GLSL_TYPE_UINT:
-      return uint_type;
-   case GLSL_TYPE_INT:
-      return int_type;
-   case GLSL_TYPE_FLOAT:
-      return float_type;
-   case GLSL_TYPE_BOOL:
-      return bool_type;
-   default:
-      return error_type;
-   }
-}
-
-
-void
-_mesa_glsl_release_types(void)
-{
-   if (glsl_type::array_types != NULL) {
-      hash_table_dtor(glsl_type::array_types);
-      glsl_type::array_types = NULL;
-   }
-
-   if (glsl_type::record_types != NULL) {
-      hash_table_dtor(glsl_type::record_types);
-      glsl_type::record_types = NULL;
-   }
-}
-
-
-glsl_type::glsl_type(const glsl_type *array, unsigned length) :
-   base_type(GLSL_TYPE_ARRAY),
-   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
-   sampler_type(0),
-   vector_elements(0), matrix_columns(0),
-   name(NULL), length(length)
-{
-   this->fields.array = array;
-   /* Inherit the gl type of the base. The GL type is used for
-    * uniform/statevar handling in Mesa and the arrayness of the type
-    * is represented by the size rather than the type.
-    */
-   this->gl_type = array->gl_type;
-
-   /* Allow a maximum of 10 characters for the array size.  This is enough
-    * for 32-bits of ~0.  The extra 3 are for the '[', ']', and terminating
-    * NUL.
-    */
-   const unsigned name_length = strlen(array->name) + 10 + 3;
-   char *const n = (char *) ralloc_size(this->mem_ctx, name_length);
-
-   if (length == 0)
-      snprintf(n, name_length, "%s[]", array->name);
-   else
-      snprintf(n, name_length, "%s[%u]", array->name, length);
-
-   this->name = n;
-}
-
-
-const glsl_type *
-glsl_type::get_instance(unsigned base_type, unsigned rows, unsigned columns)
-{
-   if (base_type == GLSL_TYPE_VOID)
-      return void_type;
-
-   if ((rows < 1) || (rows > 4) || (columns < 1) || (columns > 4))
-      return error_type;
-
-   /* Treat GLSL vectors as Nx1 matrices.
-    */
-   if (columns == 1) {
-      switch (base_type) {
-      case GLSL_TYPE_UINT:
-	 return uint_type + (rows - 1);
-      case GLSL_TYPE_INT:
-	 return int_type + (rows - 1);
-      case GLSL_TYPE_FLOAT:
-	 return float_type + (rows - 1);
-      case GLSL_TYPE_BOOL:
-	 return bool_type + (rows - 1);
-      default:
-	 return error_type;
-      }
-   } else {
-      if ((base_type != GLSL_TYPE_FLOAT) || (rows == 1))
-	 return error_type;
-
-      /* GLSL matrix types are named mat{COLUMNS}x{ROWS}.  Only the following
-       * combinations are valid:
-       *
-       *   1 2 3 4
-       * 1
-       * 2   x x x
-       * 3   x x x
-       * 4   x x x
-       */
-#define IDX(c,r) (((c-1)*3) + (r-1))
-
-      switch (IDX(columns, rows)) {
-      case IDX(2,2): return mat2_type;
-      case IDX(2,3): return mat2x3_type;
-      case IDX(2,4): return mat2x4_type;
-      case IDX(3,2): return mat3x2_type;
-      case IDX(3,3): return mat3_type;
-      case IDX(3,4): return mat3x4_type;
-      case IDX(4,2): return mat4x2_type;
-      case IDX(4,3): return mat4x3_type;
-      case IDX(4,4): return mat4_type;
-      default: return error_type;
-      }
-   }
-
-   assert(!"Should not get here.");
-   return error_type;
-}
-
-
-const glsl_type *
-glsl_type::get_array_instance(const glsl_type *base, unsigned array_size)
-{
-
-   if (array_types == NULL) {
-      array_types = hash_table_ctor(64, hash_table_string_hash,
-				    hash_table_string_compare);
-   }
-
-   /* Generate a name using the base type pointer in the key.  This is
-    * done because the name of the base type may not be unique across
-    * shaders.  For example, two shaders may have different record types
-    * named 'foo'.
-    */
-   char key[128];
-   snprintf(key, sizeof(key), "%p[%u]", (void *) base, array_size);
-
-   const glsl_type *t = (glsl_type *) hash_table_find(array_types, key);
-   if (t == NULL) {
-      t = new glsl_type(base, array_size);
-
-      hash_table_insert(array_types, (void *) t, ralloc_strdup(mem_ctx, key));
-   }
-
-   assert(t->base_type == GLSL_TYPE_ARRAY);
-   assert(t->length == array_size);
-   assert(t->fields.array == base);
-
-   return t;
-}
-
-
-int
-glsl_type::record_key_compare(const void *a, const void *b)
-{
-   const glsl_type *const key1 = (glsl_type *) a;
-   const glsl_type *const key2 = (glsl_type *) b;
-
-   /* Return zero is the types match (there is zero difference) or non-zero
-    * otherwise.
-    */
-   if (strcmp(key1->name, key2->name) != 0)
-      return 1;
-
-   if (key1->length != key2->length)
-      return 1;
-
-   for (unsigned i = 0; i < key1->length; i++) {
-      if (key1->fields.structure[i].type != key2->fields.structure[i].type)
-	 return 1;
-      if (strcmp(key1->fields.structure[i].name,
-		 key2->fields.structure[i].name) != 0)
-	 return 1;
-   }
-
-   return 0;
-}
-
-
-unsigned
-glsl_type::record_key_hash(const void *a)
-{
-   const glsl_type *const key = (glsl_type *) a;
-   char hash_key[128];
-   unsigned size = 0;
-
-   size = snprintf(hash_key, sizeof(hash_key), "%08x", key->length);
-
-   for (unsigned i = 0; i < key->length; i++) {
-      if (size >= sizeof(hash_key))
-	 break;
-
-      size += snprintf(& hash_key[size], sizeof(hash_key) - size,
-		       "%p", (void *) key->fields.structure[i].type);
-   }
-
-   return hash_table_string_hash(& hash_key);
-}
-
-
-const glsl_type *
-glsl_type::get_record_instance(const glsl_struct_field *fields,
-			       unsigned num_fields,
-			       const char *name)
-{
-   const glsl_type key(fields, num_fields, name);
-
-   if (record_types == NULL) {
-      record_types = hash_table_ctor(64, record_key_hash, record_key_compare);
-   }
-
-   const glsl_type *t = (glsl_type *) hash_table_find(record_types, & key);
-   if (t == NULL) {
-      t = new glsl_type(fields, num_fields, name);
-
-      hash_table_insert(record_types, (void *) t, t);
-   }
-
-   assert(t->base_type == GLSL_TYPE_STRUCT);
-   assert(t->length == num_fields);
-   assert(strcmp(t->name, name) == 0);
-
-   return t;
-}
-
-
-const glsl_type *
-glsl_type::field_type(const char *name) const
-{
-   if (this->base_type != GLSL_TYPE_STRUCT)
-      return error_type;
-
-   for (unsigned i = 0; i < this->length; i++) {
-      if (strcmp(name, this->fields.structure[i].name) == 0)
-	 return this->fields.structure[i].type;
-   }
-
-   return error_type;
-}
-
-
-int
-glsl_type::field_index(const char *name) const
-{
-   if (this->base_type != GLSL_TYPE_STRUCT)
-      return -1;
-
-   for (unsigned i = 0; i < this->length; i++) {
-      if (strcmp(name, this->fields.structure[i].name) == 0)
-	 return i;
-   }
-
-   return -1;
-}
-
-
-unsigned
-glsl_type::component_slots() const
-{
-   switch (this->base_type) {
-   case GLSL_TYPE_UINT:
-   case GLSL_TYPE_INT:
-   case GLSL_TYPE_FLOAT:
-   case GLSL_TYPE_BOOL:
-      return this->components();
-
-   case GLSL_TYPE_STRUCT: {
-      unsigned size = 0;
-
-      for (unsigned i = 0; i < this->length; i++)
-	 size += this->fields.structure[i].type->component_slots();
-
-      return size;
-   }
-
-   case GLSL_TYPE_ARRAY:
-      return this->length * this->fields.array->component_slots();
-
-   default:
-      return 0;
-   }
-}
+/*

+ * Copyright © 2009 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#include <stdio.h>

+#include <stdlib.h>

+#include "main/core.h" /* for Elements */

+#include "glsl_symbol_table.h"

+#include "glsl_parser_extras.h"

+#include "glsl_types.h"

+#include "builtin_types.h"

+extern "C" {

+#include "program/hash_table.h"

+}

+

+hash_table *glsl_type::array_types = NULL;

+hash_table *glsl_type::record_types = NULL;

+void *glsl_type::mem_ctx = NULL;

+

+void

+glsl_type::init_ralloc_type_ctx(void)

+{

+   if (glsl_type::mem_ctx == NULL) {

+      glsl_type::mem_ctx = ralloc_autofree_context();

+      assert(glsl_type::mem_ctx != NULL);

+   }

+}

+

+glsl_type::glsl_type(GLenum gl_type,

+		     glsl_base_type base_type, unsigned vector_elements,

+		     unsigned matrix_columns, const char *name) :

+   gl_type(gl_type),

+   base_type(base_type),

+   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),

+   sampler_type(0),

+   vector_elements(vector_elements), matrix_columns(matrix_columns),

+   length(0)

+{

+   init_ralloc_type_ctx();

+   this->name = ralloc_strdup(this->mem_ctx, name);

+   /* Neither dimension is zero or both dimensions are zero.

+    */

+   assert((vector_elements == 0) == (matrix_columns == 0));

+   memset(& fields, 0, sizeof(fields));

+}

+

+glsl_type::glsl_type(GLenum gl_type,

+		     enum glsl_sampler_dim dim, bool shadow, bool array,

+		     unsigned type, const char *name) :

+   gl_type(gl_type),

+   base_type(GLSL_TYPE_SAMPLER),

+   sampler_dimensionality(dim), sampler_shadow(shadow),

+   sampler_array(array), sampler_type(type),

+   vector_elements(0), matrix_columns(0),

+   length(0)

+{

+   init_ralloc_type_ctx();

+   this->name = ralloc_strdup(this->mem_ctx, name);

+   memset(& fields, 0, sizeof(fields));

+}

+

+glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields,

+		     const char *name) :

+   base_type(GLSL_TYPE_STRUCT),

+   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),

+   sampler_type(0),

+   vector_elements(0), matrix_columns(0),

+   length(num_fields)

+{

+   unsigned int i;

+

+   init_ralloc_type_ctx();

+   this->name = ralloc_strdup(this->mem_ctx, name);

+   this->fields.structure = ralloc_array(this->mem_ctx,

+					 glsl_struct_field, length);

+   for (i = 0; i < length; i++) {

+      this->fields.structure[i].type = fields[i].type;

+      this->fields.structure[i].name = ralloc_strdup(this->fields.structure,

+						     fields[i].name);

+   }

+}

+

+static void

+add_types_to_symbol_table(glsl_symbol_table *symtab,

+			  const struct glsl_type *types,

+			  unsigned num_types, bool warn)

+{

+   (void) warn;

+

+   for (unsigned i = 0; i < num_types; i++) {

+      symtab->add_type(types[i].name, & types[i]);

+   }

+}

+

+void

+glsl_type::generate_100ES_types(glsl_symbol_table *symtab)

+{

+   add_types_to_symbol_table(symtab, builtin_core_types,

+			     Elements(builtin_core_types),

+			     false);

+   add_types_to_symbol_table(symtab, builtin_structure_types,

+			     Elements(builtin_structure_types),

+			     false);

+   add_types_to_symbol_table(symtab, void_type, 1, false);

+}

+

+void

+glsl_type::generate_110_types(glsl_symbol_table *symtab)

+{

+   generate_100ES_types(symtab);

+

+   add_types_to_symbol_table(symtab, builtin_110_types,

+			     Elements(builtin_110_types),

+			     false);

+   add_types_to_symbol_table(symtab, &_sampler3D_type, 1, false);

+   add_types_to_symbol_table(symtab, builtin_110_deprecated_structure_types,

+			     Elements(builtin_110_deprecated_structure_types),

+			     false);

+}

+

+

+void

+glsl_type::generate_120_types(glsl_symbol_table *symtab)

+{

+   generate_110_types(symtab);

+

+   add_types_to_symbol_table(symtab, builtin_120_types,

+			     Elements(builtin_120_types), false);

+}

+

+

+void

+glsl_type::generate_130_types(glsl_symbol_table *symtab)

+{

+   generate_120_types(symtab);

+

+   add_types_to_symbol_table(symtab, builtin_130_types,

+			     Elements(builtin_130_types), false);

+   generate_EXT_texture_array_types(symtab, false);

+}

+

+

+void

+glsl_type::generate_ARB_texture_rectangle_types(glsl_symbol_table *symtab,

+						bool warn)

+{

+   add_types_to_symbol_table(symtab, builtin_ARB_texture_rectangle_types,

+			     Elements(builtin_ARB_texture_rectangle_types),

+			     warn);

+}

+

+

+void

+glsl_type::generate_EXT_texture_array_types(glsl_symbol_table *symtab,

+					    bool warn)

+{

+   add_types_to_symbol_table(symtab, builtin_EXT_texture_array_types,

+			     Elements(builtin_EXT_texture_array_types),

+			     warn);

+}

+

+

+void

+glsl_type::generate_OES_texture_3D_types(glsl_symbol_table *symtab, bool warn)

+{

+   add_types_to_symbol_table(symtab, &_sampler3D_type, 1, warn);

+}

+

+

+void

+_mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state)

+{

+   switch (state->language_version) {

+   case 100:

+      assert(state->es_shader);

+      glsl_type::generate_100ES_types(state->symbols);

+      break;

+   case 110:

+      glsl_type::generate_110_types(state->symbols);

+      break;

+   case 120:

+      glsl_type::generate_120_types(state->symbols);

+      break;

+   case 130:

+      glsl_type::generate_130_types(state->symbols);

+      break;

+   default:

+      /* error */

+      break;

+   }

+

+   if (state->ARB_texture_rectangle_enable) {

+      glsl_type::generate_ARB_texture_rectangle_types(state->symbols,

+					   state->ARB_texture_rectangle_warn);

+   }

+   if (state->OES_texture_3D_enable && state->language_version == 100) {

+      glsl_type::generate_OES_texture_3D_types(state->symbols,

+					       state->OES_texture_3D_warn);

+   }

+

+   if (state->EXT_texture_array_enable && state->language_version < 130) {

+      // These are already included in 130; don't create twice.

+      glsl_type::generate_EXT_texture_array_types(state->symbols,

+				       state->EXT_texture_array_warn);

+   }

+}

+

+

+const glsl_type *glsl_type::get_base_type() const

+{

+   switch (base_type) {

+   case GLSL_TYPE_UINT:

+      return uint_type;

+   case GLSL_TYPE_INT:

+      return int_type;

+   case GLSL_TYPE_FLOAT:

+      return float_type;

+   case GLSL_TYPE_BOOL:

+      return bool_type;

+   default:

+      return error_type;

+   }

+}

+

+

+void

+_mesa_glsl_release_types(void)

+{

+   if (glsl_type::array_types != NULL) {

+      hash_table_dtor(glsl_type::array_types);

+      glsl_type::array_types = NULL;

+   }

+

+   if (glsl_type::record_types != NULL) {

+      hash_table_dtor(glsl_type::record_types);

+      glsl_type::record_types = NULL;

+   }

+}

+

+

+glsl_type::glsl_type(const glsl_type *array, unsigned length) :

+   base_type(GLSL_TYPE_ARRAY),

+   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),

+   sampler_type(0),

+   vector_elements(0), matrix_columns(0),

+   name(NULL), length(length)

+{

+   this->fields.array = array;

+   /* Inherit the gl type of the base. The GL type is used for

+    * uniform/statevar handling in Mesa and the arrayness of the type

+    * is represented by the size rather than the type.

+    */

+   this->gl_type = array->gl_type;

+

+   /* Allow a maximum of 10 characters for the array size.  This is enough

+    * for 32-bits of ~0.  The extra 3 are for the '[', ']', and terminating

+    * NUL.

+    */

+   const unsigned name_length = strlen(array->name) + 10 + 3;

+   char *const n = (char *) ralloc_size(this->mem_ctx, name_length);

+

+   if (length == 0)

+      snprintf(n, name_length, "%s[]", array->name);

+   else

+      snprintf(n, name_length, "%s[%u]", array->name, length);

+

+   this->name = n;

+}

+

+

+const glsl_type *

+glsl_type::get_instance(unsigned base_type, unsigned rows, unsigned columns)

+{

+   if (base_type == GLSL_TYPE_VOID)

+      return void_type;

+

+   if ((rows < 1) || (rows > 4) || (columns < 1) || (columns > 4))

+      return error_type;

+

+   /* Treat GLSL vectors as Nx1 matrices.

+    */

+   if (columns == 1) {

+      switch (base_type) {

+      case GLSL_TYPE_UINT:

+	 return uint_type + (rows - 1);

+      case GLSL_TYPE_INT:

+	 return int_type + (rows - 1);

+      case GLSL_TYPE_FLOAT:

+	 return float_type + (rows - 1);

+      case GLSL_TYPE_BOOL:

+	 return bool_type + (rows - 1);

+      default:

+	 return error_type;

+      }

+   } else {

+      if ((base_type != GLSL_TYPE_FLOAT) || (rows == 1))

+	 return error_type;

+

+      /* GLSL matrix types are named mat{COLUMNS}x{ROWS}.  Only the following

+       * combinations are valid:

+       *

+       *   1 2 3 4

+       * 1

+       * 2   x x x

+       * 3   x x x

+       * 4   x x x

+       */

+#define IDX(c,r) (((c-1)*3) + (r-1))

+

+      switch (IDX(columns, rows)) {

+      case IDX(2,2): return mat2_type;

+      case IDX(2,3): return mat2x3_type;

+      case IDX(2,4): return mat2x4_type;

+      case IDX(3,2): return mat3x2_type;

+      case IDX(3,3): return mat3_type;

+      case IDX(3,4): return mat3x4_type;

+      case IDX(4,2): return mat4x2_type;

+      case IDX(4,3): return mat4x3_type;

+      case IDX(4,4): return mat4_type;

+      default: return error_type;

+      }

+   }

+

+   assert(!"Should not get here.");

+   return error_type;

+}

+

+

+const glsl_type *

+glsl_type::get_array_instance(const glsl_type *base, unsigned array_size)

+{

+

+   if (array_types == NULL) {

+      array_types = hash_table_ctor(64, hash_table_string_hash,

+				    hash_table_string_compare);

+   }

+

+   /* Generate a name using the base type pointer in the key.  This is

+    * done because the name of the base type may not be unique across

+    * shaders.  For example, two shaders may have different record types

+    * named 'foo'.

+    */

+   char key[128];

+   snprintf(key, sizeof(key), "%p[%u]", (void *) base, array_size);

+

+   const glsl_type *t = (glsl_type *) hash_table_find(array_types, key);

+   if (t == NULL) {

+      t = new glsl_type(base, array_size);

+

+      hash_table_insert(array_types, (void *) t, ralloc_strdup(mem_ctx, key));

+   }

+

+   assert(t->base_type == GLSL_TYPE_ARRAY);

+   assert(t->length == array_size);

+   assert(t->fields.array == base);

+

+   return t;

+}

+

+

+int

+glsl_type::record_key_compare(const void *a, const void *b)

+{

+   const glsl_type *const key1 = (glsl_type *) a;

+   const glsl_type *const key2 = (glsl_type *) b;

+

+   /* Return zero is the types match (there is zero difference) or non-zero

+    * otherwise.

+    */

+   if (strcmp(key1->name, key2->name) != 0)

+      return 1;

+

+   if (key1->length != key2->length)

+      return 1;

+

+   for (unsigned i = 0; i < key1->length; i++) {

+      if (key1->fields.structure[i].type != key2->fields.structure[i].type)

+	 return 1;

+      if (strcmp(key1->fields.structure[i].name,

+		 key2->fields.structure[i].name) != 0)

+	 return 1;

+   }

+

+   return 0;

+}

+

+

+unsigned

+glsl_type::record_key_hash(const void *a)

+{

+   const glsl_type *const key = (glsl_type *) a;

+   char hash_key[128];

+   unsigned size = 0;

+

+   size = snprintf(hash_key, sizeof(hash_key), "%08x", key->length);

+

+   for (unsigned i = 0; i < key->length; i++) {

+      if (size >= sizeof(hash_key))

+	 break;

+

+      size += snprintf(& hash_key[size], sizeof(hash_key) - size,

+		       "%p", (void *) key->fields.structure[i].type);

+   }

+

+   return hash_table_string_hash(& hash_key);

+}

+

+

+const glsl_type *

+glsl_type::get_record_instance(const glsl_struct_field *fields,

+			       unsigned num_fields,

+			       const char *name)

+{

+   const glsl_type key(fields, num_fields, name);

+

+   if (record_types == NULL) {

+      record_types = hash_table_ctor(64, record_key_hash, record_key_compare);

+   }

+

+   const glsl_type *t = (glsl_type *) hash_table_find(record_types, & key);

+   if (t == NULL) {

+      t = new glsl_type(fields, num_fields, name);

+

+      hash_table_insert(record_types, (void *) t, t);

+   }

+

+   assert(t->base_type == GLSL_TYPE_STRUCT);

+   assert(t->length == num_fields);

+   assert(strcmp(t->name, name) == 0);

+

+   return t;

+}

+

+

+const glsl_type *

+glsl_type::field_type(const char *name) const

+{

+   if (this->base_type != GLSL_TYPE_STRUCT)

+      return error_type;

+

+   for (unsigned i = 0; i < this->length; i++) {

+      if (strcmp(name, this->fields.structure[i].name) == 0)

+	 return this->fields.structure[i].type;

+   }

+

+   return error_type;

+}

+

+

+int

+glsl_type::field_index(const char *name) const

+{

+   if (this->base_type != GLSL_TYPE_STRUCT)

+      return -1;

+

+   for (unsigned i = 0; i < this->length; i++) {

+      if (strcmp(name, this->fields.structure[i].name) == 0)

+	 return i;

+   }

+

+   return -1;

+}

+

+

+unsigned

+glsl_type::component_slots() const

+{

+   switch (this->base_type) {

+   case GLSL_TYPE_UINT:

+   case GLSL_TYPE_INT:

+   case GLSL_TYPE_FLOAT:

+   case GLSL_TYPE_BOOL:

+      return this->components();

+

+   case GLSL_TYPE_STRUCT: {

+      unsigned size = 0;

+

+      for (unsigned i = 0; i < this->length; i++)

+	 size += this->fields.structure[i].type->component_slots();

+

+      return size;

+   }

+

+   case GLSL_TYPE_ARRAY:

+      return this->length * this->fields.array->component_slots();

+

+   default:

+      return 0;

+   }

+}

diff --git a/mesalib/src/glsl/hir_field_selection.cpp b/mesalib/src/glsl/hir_field_selection.cpp
index 3c33127b5..21f107405 100644
--- a/mesalib/src/glsl/hir_field_selection.cpp
+++ b/mesalib/src/glsl/hir_field_selection.cpp
@@ -1,102 +1,102 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#include "ir.h"
-#include "program/symbol_table.h"
-#include "glsl_parser_extras.h"
-#include "ast.h"
-#include "glsl_types.h"
-
-ir_rvalue *
-_mesa_ast_field_selection_to_hir(const ast_expression *expr,
-				 exec_list *instructions,
-				 struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   ir_rvalue *result = NULL;
-   ir_rvalue *op;
-
-   op = expr->subexpressions[0]->hir(instructions, state);
-
-   /* There are two kinds of field selection.  There is the selection of a
-    * specific field from a structure, and there is the selection of a
-    * swizzle / mask from a vector.  Which is which is determined entirely
-    * by the base type of the thing to which the field selection operator is
-    * being applied.
-    */
-   YYLTYPE loc = expr->get_location();
-   if (op->type->is_error()) {
-      /* silently propagate the error */
-   } else if (op->type->is_vector()) {
-      ir_swizzle *swiz = ir_swizzle::create(op,
-					    expr->primary_expression.identifier,
-					    op->type->vector_elements);
-      if (swiz != NULL) {
-	 result = swiz;
-      } else {
-	 /* FINISHME: Logging of error messages should be moved into
-	  * FINISHME: ir_swizzle::create.  This allows the generation of more
-	  * FINISHME: specific error messages.
-	  */
-	 _mesa_glsl_error(& loc, state, "Invalid swizzle / mask `%s'",
-			  expr->primary_expression.identifier);
-      }
-   } else if (op->type->base_type == GLSL_TYPE_STRUCT) {
-      result = new(ctx) ir_dereference_record(op,
-					      expr->primary_expression.identifier);
-
-      if (result->type->is_error()) {
-	 _mesa_glsl_error(& loc, state, "Cannot access field `%s' of "
-			  "structure",
-			  expr->primary_expression.identifier);
-      }
-   } else if (expr->subexpressions[1] != NULL) {
-      /* Handle "method calls" in GLSL 1.20 - namely, array.length() */
-      if (state->language_version < 120)
-	 _mesa_glsl_error(&loc, state, "Methods not supported in GLSL 1.10.");
-
-      ast_expression *call = expr->subexpressions[1];
-      assert(call->oper == ast_function_call);
-
-      const char *method;
-      method = call->subexpressions[0]->primary_expression.identifier;
-
-      if (op->type->is_array() && strcmp(method, "length") == 0) {
-	 if (!call->expressions.is_empty())
-	    _mesa_glsl_error(&loc, state, "length method takes no arguments.");
-
-	 if (op->type->array_size() == 0)
-	    _mesa_glsl_error(&loc, state, "length called on unsized array.");
-
-	 result = new(ctx) ir_constant(op->type->array_size());
-      } else {
-	 _mesa_glsl_error(&loc, state, "Unknown method: `%s'.", method);
-      }
-   } else {
-      _mesa_glsl_error(& loc, state, "Cannot access field `%s' of "
-		       "non-structure / non-vector.",
-		       expr->primary_expression.identifier);
-   }
-
-   return result ? result : ir_call::get_error_instruction(ctx);
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#include "ir.h"

+#include "program/symbol_table.h"

+#include "glsl_parser_extras.h"

+#include "ast.h"

+#include "glsl_types.h"

+

+ir_rvalue *

+_mesa_ast_field_selection_to_hir(const ast_expression *expr,

+				 exec_list *instructions,

+				 struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   ir_rvalue *result = NULL;

+   ir_rvalue *op;

+

+   op = expr->subexpressions[0]->hir(instructions, state);

+

+   /* There are two kinds of field selection.  There is the selection of a

+    * specific field from a structure, and there is the selection of a

+    * swizzle / mask from a vector.  Which is which is determined entirely

+    * by the base type of the thing to which the field selection operator is

+    * being applied.

+    */

+   YYLTYPE loc = expr->get_location();

+   if (op->type->is_error()) {

+      /* silently propagate the error */

+   } else if (op->type->is_vector()) {

+      ir_swizzle *swiz = ir_swizzle::create(op,

+					    expr->primary_expression.identifier,

+					    op->type->vector_elements);

+      if (swiz != NULL) {

+	 result = swiz;

+      } else {

+	 /* FINISHME: Logging of error messages should be moved into

+	  * FINISHME: ir_swizzle::create.  This allows the generation of more

+	  * FINISHME: specific error messages.

+	  */

+	 _mesa_glsl_error(& loc, state, "Invalid swizzle / mask `%s'",

+			  expr->primary_expression.identifier);

+      }

+   } else if (op->type->base_type == GLSL_TYPE_STRUCT) {

+      result = new(ctx) ir_dereference_record(op,

+					      expr->primary_expression.identifier);

+

+      if (result->type->is_error()) {

+	 _mesa_glsl_error(& loc, state, "Cannot access field `%s' of "

+			  "structure",

+			  expr->primary_expression.identifier);

+      }

+   } else if (expr->subexpressions[1] != NULL) {

+      /* Handle "method calls" in GLSL 1.20 - namely, array.length() */

+      if (state->language_version < 120)

+	 _mesa_glsl_error(&loc, state, "Methods not supported in GLSL 1.10.");

+

+      ast_expression *call = expr->subexpressions[1];

+      assert(call->oper == ast_function_call);

+

+      const char *method;

+      method = call->subexpressions[0]->primary_expression.identifier;

+

+      if (op->type->is_array() && strcmp(method, "length") == 0) {

+	 if (!call->expressions.is_empty())

+	    _mesa_glsl_error(&loc, state, "length method takes no arguments.");

+

+	 if (op->type->array_size() == 0)

+	    _mesa_glsl_error(&loc, state, "length called on unsized array.");

+

+	 result = new(ctx) ir_constant(op->type->array_size());

+      } else {

+	 _mesa_glsl_error(&loc, state, "Unknown method: `%s'.", method);

+      }

+   } else {

+      _mesa_glsl_error(& loc, state, "Cannot access field `%s' of "

+		       "non-structure / non-vector.",

+		       expr->primary_expression.identifier);

+   }

+

+   return result ? result : ir_call::get_error_instruction(ctx);

+}

diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp
index a3623b31e..7ee07f3c6 100644
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
@@ -1,1572 +1,1572 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-#include <string.h>
-#include "main/core.h" /* for MAX2 */
-#include "ir.h"
-#include "ir_visitor.h"
-#include "glsl_types.h"
-
-ir_rvalue::ir_rvalue()
-{
-   this->type = glsl_type::error_type;
-}
-
-bool ir_rvalue::is_zero() const
-{
-   return false;
-}
-
-bool ir_rvalue::is_one() const
-{
-   return false;
-}
-
-bool ir_rvalue::is_negative_one() const
-{
-   return false;
-}
-
-/**
- * Modify the swizzle make to move one component to another
- *
- * \param m    IR swizzle to be modified
- * \param from Component in the RHS that is to be swizzled
- * \param to   Desired swizzle location of \c from
- */
-static void
-update_rhs_swizzle(ir_swizzle_mask &m, unsigned from, unsigned to)
-{
-   switch (to) {
-   case 0: m.x = from; break;
-   case 1: m.y = from; break;
-   case 2: m.z = from; break;
-   case 3: m.w = from; break;
-   default: assert(!"Should not get here.");
-   }
-
-   m.num_components = MAX2(m.num_components, (to + 1));
-}
-
-void
-ir_assignment::set_lhs(ir_rvalue *lhs)
-{
-   void *mem_ctx = this;
-   bool swizzled = false;
-
-   while (lhs != NULL) {
-      ir_swizzle *swiz = lhs->as_swizzle();
-
-      if (swiz == NULL)
-	 break;
-
-      unsigned write_mask = 0;
-      ir_swizzle_mask rhs_swiz = { 0, 0, 0, 0, 0, 0 };
-
-      for (unsigned i = 0; i < swiz->mask.num_components; i++) {
-	 unsigned c = 0;
-
-	 switch (i) {
-	 case 0: c = swiz->mask.x; break;
-	 case 1: c = swiz->mask.y; break;
-	 case 2: c = swiz->mask.z; break;
-	 case 3: c = swiz->mask.w; break;
-	 default: assert(!"Should not get here.");
-	 }
-
-	 write_mask |= (((this->write_mask >> i) & 1) << c);
-	 update_rhs_swizzle(rhs_swiz, i, c);
-      }
-
-      this->write_mask = write_mask;
-      lhs = swiz->val;
-
-      this->rhs = new(mem_ctx) ir_swizzle(this->rhs, rhs_swiz);
-      swizzled = true;
-   }
-
-   if (swizzled) {
-      /* Now, RHS channels line up with the LHS writemask.  Collapse it
-       * to just the channels that will be written.
-       */
-      ir_swizzle_mask rhs_swiz = { 0, 0, 0, 0, 0, 0 };
-      int rhs_chan = 0;
-      for (int i = 0; i < 4; i++) {
-	 if (write_mask & (1 << i))
-	    update_rhs_swizzle(rhs_swiz, i, rhs_chan++);
-      }
-      this->rhs = new(mem_ctx) ir_swizzle(this->rhs, rhs_swiz);
-   }
-
-   assert((lhs == NULL) || lhs->as_dereference());
-
-   this->lhs = (ir_dereference *) lhs;
-}
-
-ir_variable *
-ir_assignment::whole_variable_written()
-{
-   ir_variable *v = this->lhs->whole_variable_referenced();
-
-   if (v == NULL)
-      return NULL;
-
-   if (v->type->is_scalar())
-      return v;
-
-   if (v->type->is_vector()) {
-      const unsigned mask = (1U << v->type->vector_elements) - 1;
-
-      if (mask != this->write_mask)
-	 return NULL;
-   }
-
-   /* Either all the vector components are assigned or the variable is some
-    * composite type (and the whole thing is assigned.
-    */
-   return v;
-}
-
-ir_assignment::ir_assignment(ir_dereference *lhs, ir_rvalue *rhs,
-			     ir_rvalue *condition, unsigned write_mask)
-{
-   this->ir_type = ir_type_assignment;
-   this->condition = condition;
-   this->rhs = rhs;
-   this->lhs = lhs;
-   this->write_mask = write_mask;
-
-   if (lhs->type->is_scalar() || lhs->type->is_vector()) {
-      int lhs_components = 0;
-      for (int i = 0; i < 4; i++) {
-	 if (write_mask & (1 << i))
-	    lhs_components++;
-      }
-
-      assert(lhs_components == this->rhs->type->vector_elements);
-   }
-}
-
-ir_assignment::ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs,
-			     ir_rvalue *condition)
-{
-   this->ir_type = ir_type_assignment;
-   this->condition = condition;
-   this->rhs = rhs;
-
-   /* If the RHS is a vector type, assume that all components of the vector
-    * type are being written to the LHS.  The write mask comes from the RHS
-    * because we can have a case where the LHS is a vec4 and the RHS is a
-    * vec3.  In that case, the assignment is:
-    *
-    *     (assign (...) (xyz) (var_ref lhs) (var_ref rhs))
-    */
-   if (rhs->type->is_vector())
-      this->write_mask = (1U << rhs->type->vector_elements) - 1;
-   else if (rhs->type->is_scalar())
-      this->write_mask = 1;
-   else
-      this->write_mask = 0;
-
-   this->set_lhs(lhs);
-}
-
-
-ir_expression::ir_expression(int op, const struct glsl_type *type,
-			     ir_rvalue *op0)
-{
-   assert(get_num_operands(ir_expression_operation(op)) == 1);
-   this->ir_type = ir_type_expression;
-   this->type = type;
-   this->operation = ir_expression_operation(op);
-   this->operands[0] = op0;
-   this->operands[1] = NULL;
-   this->operands[2] = NULL;
-   this->operands[3] = NULL;
-}
-
-ir_expression::ir_expression(int op, const struct glsl_type *type,
-			     ir_rvalue *op0, ir_rvalue *op1)
-{
-   assert(((op1 == NULL) && (get_num_operands(ir_expression_operation(op)) == 1))
-	  || (get_num_operands(ir_expression_operation(op)) == 2));
-   this->ir_type = ir_type_expression;
-   this->type = type;
-   this->operation = ir_expression_operation(op);
-   this->operands[0] = op0;
-   this->operands[1] = op1;
-   this->operands[2] = NULL;
-   this->operands[3] = NULL;
-}
-
-ir_expression::ir_expression(int op, const struct glsl_type *type,
-			     ir_rvalue *op0, ir_rvalue *op1,
-			     ir_rvalue *op2, ir_rvalue *op3)
-{
-   this->ir_type = ir_type_expression;
-   this->type = type;
-   this->operation = ir_expression_operation(op);
-   this->operands[0] = op0;
-   this->operands[1] = op1;
-   this->operands[2] = op2;
-   this->operands[3] = op3;
-}
-
-ir_expression::ir_expression(int op, ir_rvalue *op0)
-{
-   this->ir_type = ir_type_expression;
-
-   this->operation = ir_expression_operation(op);
-   this->operands[0] = op0;
-   this->operands[1] = NULL;
-   this->operands[2] = NULL;
-   this->operands[3] = NULL;
-
-   assert(op <= ir_last_unop);
-
-   switch (this->operation) {
-   case ir_unop_bit_not:
-   case ir_unop_logic_not:
-   case ir_unop_neg:
-   case ir_unop_abs:
-   case ir_unop_sign:
-   case ir_unop_rcp:
-   case ir_unop_rsq:
-   case ir_unop_sqrt:
-   case ir_unop_exp:
-   case ir_unop_log:
-   case ir_unop_exp2:
-   case ir_unop_log2:
-   case ir_unop_trunc:
-   case ir_unop_ceil:
-   case ir_unop_floor:
-   case ir_unop_fract:
-   case ir_unop_round_even:
-   case ir_unop_sin:
-   case ir_unop_cos:
-   case ir_unop_sin_reduced:
-   case ir_unop_cos_reduced:
-   case ir_unop_dFdx:
-   case ir_unop_dFdy:
-      this->type = op0->type;
-      break;
-
-   case ir_unop_f2i:
-   case ir_unop_b2i:
-      this->type = glsl_type::get_instance(GLSL_TYPE_INT,
-					   op0->type->vector_elements, 1);
-      break;
-
-   case ir_unop_b2f:
-   case ir_unop_i2f:
-   case ir_unop_u2f:
-      this->type = glsl_type::get_instance(GLSL_TYPE_FLOAT,
-					   op0->type->vector_elements, 1);
-      break;
-
-   case ir_unop_f2b:
-   case ir_unop_i2b:
-      this->type = glsl_type::get_instance(GLSL_TYPE_BOOL,
-					   op0->type->vector_elements, 1);
-      break;
-
-   case ir_unop_noise:
-      this->type = glsl_type::float_type;
-      break;
-
-   case ir_unop_any:
-      this->type = glsl_type::bool_type;
-      break;
-
-   default:
-      assert(!"not reached: missing automatic type setup for ir_expression");
-      this->type = op0->type;
-      break;
-   }
-}
-
-ir_expression::ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1)
-{
-   this->ir_type = ir_type_expression;
-
-   this->operation = ir_expression_operation(op);
-   this->operands[0] = op0;
-   this->operands[1] = op1;
-   this->operands[2] = NULL;
-   this->operands[3] = NULL;
-
-   assert(op > ir_last_unop);
-
-   switch (this->operation) {
-   case ir_binop_all_equal:
-   case ir_binop_any_nequal:
-      this->type = glsl_type::bool_type;
-      break;
-
-   case ir_binop_add:
-   case ir_binop_sub:
-   case ir_binop_min:
-   case ir_binop_max:
-   case ir_binop_pow:
-   case ir_binop_mul:
-   case ir_binop_div:
-   case ir_binop_mod:
-      if (op0->type->is_scalar()) {
-	 this->type = op1->type;
-      } else if (op1->type->is_scalar()) {
-	 this->type = op0->type;
-      } else {
-	 /* FINISHME: matrix types */
-	 assert(!op0->type->is_matrix() && !op1->type->is_matrix());
-	 assert(op0->type == op1->type);
-	 this->type = op0->type;
-      }
-      break;
-
-   case ir_binop_logic_and:
-   case ir_binop_logic_xor:
-   case ir_binop_logic_or:
-   case ir_binop_bit_and:
-   case ir_binop_bit_xor:
-   case ir_binop_bit_or:
-      if (op0->type->is_scalar()) {
-	 this->type = op1->type;
-      } else if (op1->type->is_scalar()) {
-	 this->type = op0->type;
-      }
-      break;
-
-   case ir_binop_equal:
-   case ir_binop_nequal:
-   case ir_binop_lequal:
-   case ir_binop_gequal:
-   case ir_binop_less:
-   case ir_binop_greater:
-      assert(op0->type == op1->type);
-      this->type = glsl_type::get_instance(GLSL_TYPE_BOOL,
-					   op0->type->vector_elements, 1);
-      break;
-
-   case ir_binop_dot:
-      this->type = glsl_type::float_type;
-      break;
-
-   case ir_binop_lshift:
-   case ir_binop_rshift:
-      this->type = op0->type;
-      break;
-
-   default:
-      assert(!"not reached: missing automatic type setup for ir_expression");
-      this->type = glsl_type::float_type;
-   }
-}
-
-unsigned int
-ir_expression::get_num_operands(ir_expression_operation op)
-{
-   assert(op <= ir_last_opcode);
-
-   if (op <= ir_last_unop)
-      return 1;
-
-   if (op <= ir_last_binop)
-      return 2;
-
-   if (op == ir_quadop_vector)
-      return 4;
-
-   assert(false);
-   return 0;
-}
-
-static const char *const operator_strs[] = {
-   "~",
-   "!",
-   "neg",
-   "abs",
-   "sign",
-   "rcp",
-   "rsq",
-   "sqrt",
-   "exp",
-   "log",
-   "exp2",
-   "log2",
-   "f2i",
-   "i2f",
-   "f2b",
-   "b2f",
-   "i2b",
-   "b2i",
-   "u2f",
-   "any",
-   "trunc",
-   "ceil",
-   "floor",
-   "fract",
-   "round_even",
-   "sin",
-   "cos",
-   "sin_reduced",
-   "cos_reduced",
-   "dFdx",
-   "dFdy",
-   "noise",
-   "+",
-   "-",
-   "*",
-   "/",
-   "%",
-   "<",
-   ">",
-   "<=",
-   ">=",
-   "==",
-   "!=",
-   "all_equal",
-   "any_nequal",
-   "<<",
-   ">>",
-   "&",
-   "^",
-   "|",
-   "&&",
-   "^^",
-   "||",
-   "dot",
-   "min",
-   "max",
-   "pow",
-   "vector",
-};
-
-const char *ir_expression::operator_string(ir_expression_operation op)
-{
-   assert((unsigned int) op < Elements(operator_strs));
-   assert(Elements(operator_strs) == (ir_quadop_vector + 1));
-   return operator_strs[op];
-}
-
-const char *ir_expression::operator_string()
-{
-   return operator_string(this->operation);
-}
-
-const char*
-depth_layout_string(ir_depth_layout layout)
-{
-   switch(layout) {
-   case ir_depth_layout_none:      return "";
-   case ir_depth_layout_any:       return "depth_any";
-   case ir_depth_layout_greater:   return "depth_greater";
-   case ir_depth_layout_less:      return "depth_less";
-   case ir_depth_layout_unchanged: return "depth_unchanged";
-
-   default:
-      assert(0);
-      return "";
-   }
-}
-
-ir_expression_operation
-ir_expression::get_operator(const char *str)
-{
-   const int operator_count = sizeof(operator_strs) / sizeof(operator_strs[0]);
-   for (int op = 0; op < operator_count; op++) {
-      if (strcmp(str, operator_strs[op]) == 0)
-	 return (ir_expression_operation) op;
-   }
-   return (ir_expression_operation) -1;
-}
-
-ir_constant::ir_constant()
-{
-   this->ir_type = ir_type_constant;
-}
-
-ir_constant::ir_constant(const struct glsl_type *type,
-			 const ir_constant_data *data)
-{
-   assert((type->base_type >= GLSL_TYPE_UINT)
-	  && (type->base_type <= GLSL_TYPE_BOOL));
-
-   this->ir_type = ir_type_constant;
-   this->type = type;
-   memcpy(& this->value, data, sizeof(this->value));
-}
-
-ir_constant::ir_constant(float f)
-{
-   this->ir_type = ir_type_constant;
-   this->type = glsl_type::float_type;
-   this->value.f[0] = f;
-   for (int i = 1; i < 16; i++)  {
-      this->value.f[i] = 0;
-   }
-}
-
-ir_constant::ir_constant(unsigned int u)
-{
-   this->ir_type = ir_type_constant;
-   this->type = glsl_type::uint_type;
-   this->value.u[0] = u;
-   for (int i = 1; i < 16; i++) {
-      this->value.u[i] = 0;
-   }
-}
-
-ir_constant::ir_constant(int i)
-{
-   this->ir_type = ir_type_constant;
-   this->type = glsl_type::int_type;
-   this->value.i[0] = i;
-   for (int i = 1; i < 16; i++) {
-      this->value.i[i] = 0;
-   }
-}
-
-ir_constant::ir_constant(bool b)
-{
-   this->ir_type = ir_type_constant;
-   this->type = glsl_type::bool_type;
-   this->value.b[0] = b;
-   for (int i = 1; i < 16; i++) {
-      this->value.b[i] = false;
-   }
-}
-
-ir_constant::ir_constant(const ir_constant *c, unsigned i)
-{
-   this->ir_type = ir_type_constant;
-   this->type = c->type->get_base_type();
-
-   switch (this->type->base_type) {
-   case GLSL_TYPE_UINT:  this->value.u[0] = c->value.u[i]; break;
-   case GLSL_TYPE_INT:   this->value.i[0] = c->value.i[i]; break;
-   case GLSL_TYPE_FLOAT: this->value.f[0] = c->value.f[i]; break;
-   case GLSL_TYPE_BOOL:  this->value.b[0] = c->value.b[i]; break;
-   default:              assert(!"Should not get here."); break;
-   }
-}
-
-ir_constant::ir_constant(const struct glsl_type *type, exec_list *value_list)
-{
-   this->ir_type = ir_type_constant;
-   this->type = type;
-
-   assert(type->is_scalar() || type->is_vector() || type->is_matrix()
-	  || type->is_record() || type->is_array());
-
-   if (type->is_array()) {
-      this->array_elements = ralloc_array(this, ir_constant *, type->length);
-      unsigned i = 0;
-      foreach_list(node, value_list) {
-	 ir_constant *value = (ir_constant *) node;
-	 assert(value->as_constant() != NULL);
-
-	 this->array_elements[i++] = value;
-      }
-      return;
-   }
-
-   /* If the constant is a record, the types of each of the entries in
-    * value_list must be a 1-for-1 match with the structure components.  Each
-    * entry must also be a constant.  Just move the nodes from the value_list
-    * to the list in the ir_constant.
-    */
-   /* FINISHME: Should there be some type checking and / or assertions here? */
-   /* FINISHME: Should the new constant take ownership of the nodes from
-    * FINISHME: value_list, or should it make copies?
-    */
-   if (type->is_record()) {
-      value_list->move_nodes_to(& this->components);
-      return;
-   }
-
-   for (unsigned i = 0; i < 16; i++) {
-      this->value.u[i] = 0;
-   }
-
-   ir_constant *value = (ir_constant *) (value_list->head);
-
-   /* Constructors with exactly one scalar argument are special for vectors
-    * and matrices.  For vectors, the scalar value is replicated to fill all
-    * the components.  For matrices, the scalar fills the components of the
-    * diagonal while the rest is filled with 0.
-    */
-   if (value->type->is_scalar() && value->next->is_tail_sentinel()) {
-      if (type->is_matrix()) {
-	 /* Matrix - fill diagonal (rest is already set to 0) */
-	 assert(type->base_type == GLSL_TYPE_FLOAT);
-	 for (unsigned i = 0; i < type->matrix_columns; i++)
-	    this->value.f[i * type->vector_elements + i] = value->value.f[0];
-      } else {
-	 /* Vector or scalar - fill all components */
-	 switch (type->base_type) {
-	 case GLSL_TYPE_UINT:
-	 case GLSL_TYPE_INT:
-	    for (unsigned i = 0; i < type->components(); i++)
-	       this->value.u[i] = value->value.u[0];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    for (unsigned i = 0; i < type->components(); i++)
-	       this->value.f[i] = value->value.f[0];
-	    break;
-	 case GLSL_TYPE_BOOL:
-	    for (unsigned i = 0; i < type->components(); i++)
-	       this->value.b[i] = value->value.b[0];
-	    break;
-	 default:
-	    assert(!"Should not get here.");
-	    break;
-	 }
-      }
-      return;
-   }
-
-   if (type->is_matrix() && value->type->is_matrix()) {
-      assert(value->next->is_tail_sentinel());
-
-      /* From section 5.4.2 of the GLSL 1.20 spec:
-       * "If a matrix is constructed from a matrix, then each component
-       *  (column i, row j) in the result that has a corresponding component
-       *  (column i, row j) in the argument will be initialized from there."
-       */
-      unsigned cols = MIN2(type->matrix_columns, value->type->matrix_columns);
-      unsigned rows = MIN2(type->vector_elements, value->type->vector_elements);
-      for (unsigned i = 0; i < cols; i++) {
-	 for (unsigned j = 0; j < rows; j++) {
-	    const unsigned src = i * value->type->vector_elements + j;
-	    const unsigned dst = i * type->vector_elements + j;
-	    this->value.f[dst] = value->value.f[src];
-	 }
-      }
-
-      /* "All other components will be initialized to the identity matrix." */
-      for (unsigned i = cols; i < type->matrix_columns; i++)
-	 this->value.f[i * type->vector_elements + i] = 1.0;
-
-      return;
-   }
-
-   /* Use each component from each entry in the value_list to initialize one
-    * component of the constant being constructed.
-    */
-   for (unsigned i = 0; i < type->components(); /* empty */) {
-      assert(value->as_constant() != NULL);
-      assert(!value->is_tail_sentinel());
-
-      for (unsigned j = 0; j < value->type->components(); j++) {
-	 switch (type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    this->value.u[i] = value->get_uint_component(j);
-	    break;
-	 case GLSL_TYPE_INT:
-	    this->value.i[i] = value->get_int_component(j);
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    this->value.f[i] = value->get_float_component(j);
-	    break;
-	 case GLSL_TYPE_BOOL:
-	    this->value.b[i] = value->get_bool_component(j);
-	    break;
-	 default:
-	    /* FINISHME: What to do?  Exceptions are not the answer.
-	     */
-	    break;
-	 }
-
-	 i++;
-	 if (i >= type->components())
-	    break;
-      }
-
-      value = (ir_constant *) value->next;
-   }
-}
-
-ir_constant *
-ir_constant::zero(void *mem_ctx, const glsl_type *type)
-{
-   assert(type->is_numeric() || type->is_boolean());
-
-   ir_constant *c = new(mem_ctx) ir_constant;
-   c->type = type;
-   memset(&c->value, 0, sizeof(c->value));
-
-   return c;
-}
-
-bool
-ir_constant::get_bool_component(unsigned i) const
-{
-   switch (this->type->base_type) {
-   case GLSL_TYPE_UINT:  return this->value.u[i] != 0;
-   case GLSL_TYPE_INT:   return this->value.i[i] != 0;
-   case GLSL_TYPE_FLOAT: return ((int)this->value.f[i]) != 0;
-   case GLSL_TYPE_BOOL:  return this->value.b[i];
-   default:              assert(!"Should not get here."); break;
-   }
-
-   /* Must return something to make the compiler happy.  This is clearly an
-    * error case.
-    */
-   return false;
-}
-
-float
-ir_constant::get_float_component(unsigned i) const
-{
-   switch (this->type->base_type) {
-   case GLSL_TYPE_UINT:  return (float) this->value.u[i];
-   case GLSL_TYPE_INT:   return (float) this->value.i[i];
-   case GLSL_TYPE_FLOAT: return this->value.f[i];
-   case GLSL_TYPE_BOOL:  return this->value.b[i] ? 1.0 : 0.0;
-   default:              assert(!"Should not get here."); break;
-   }
-
-   /* Must return something to make the compiler happy.  This is clearly an
-    * error case.
-    */
-   return 0.0;
-}
-
-int
-ir_constant::get_int_component(unsigned i) const
-{
-   switch (this->type->base_type) {
-   case GLSL_TYPE_UINT:  return this->value.u[i];
-   case GLSL_TYPE_INT:   return this->value.i[i];
-   case GLSL_TYPE_FLOAT: return (int) this->value.f[i];
-   case GLSL_TYPE_BOOL:  return this->value.b[i] ? 1 : 0;
-   default:              assert(!"Should not get here."); break;
-   }
-
-   /* Must return something to make the compiler happy.  This is clearly an
-    * error case.
-    */
-   return 0;
-}
-
-unsigned
-ir_constant::get_uint_component(unsigned i) const
-{
-   switch (this->type->base_type) {
-   case GLSL_TYPE_UINT:  return this->value.u[i];
-   case GLSL_TYPE_INT:   return this->value.i[i];
-   case GLSL_TYPE_FLOAT: return (unsigned) this->value.f[i];
-   case GLSL_TYPE_BOOL:  return this->value.b[i] ? 1 : 0;
-   default:              assert(!"Should not get here."); break;
-   }
-
-   /* Must return something to make the compiler happy.  This is clearly an
-    * error case.
-    */
-   return 0;
-}
-
-ir_constant *
-ir_constant::get_array_element(unsigned i) const
-{
-   assert(this->type->is_array());
-
-   /* From page 35 (page 41 of the PDF) of the GLSL 1.20 spec:
-    *
-    *     "Behavior is undefined if a shader subscripts an array with an index
-    *     less than 0 or greater than or equal to the size the array was
-    *     declared with."
-    *
-    * Most out-of-bounds accesses are removed before things could get this far.
-    * There are cases where non-constant array index values can get constant
-    * folded.
-    */
-   if (int(i) < 0)
-      i = 0;
-   else if (i >= this->type->length)
-      i = this->type->length - 1;
-
-   return array_elements[i];
-}
-
-ir_constant *
-ir_constant::get_record_field(const char *name)
-{
-   int idx = this->type->field_index(name);
-
-   if (idx < 0)
-      return NULL;
-
-   if (this->components.is_empty())
-      return NULL;
-
-   exec_node *node = this->components.head;
-   for (int i = 0; i < idx; i++) {
-      node = node->next;
-
-      /* If the end of the list is encountered before the element matching the
-       * requested field is found, return NULL.
-       */
-      if (node->is_tail_sentinel())
-	 return NULL;
-   }
-
-   return (ir_constant *) node;
-}
-
-
-bool
-ir_constant::has_value(const ir_constant *c) const
-{
-   if (this->type != c->type)
-      return false;
-
-   if (this->type->is_array()) {
-      for (unsigned i = 0; i < this->type->length; i++) {
-	 if (!this->array_elements[i]->has_value(c->array_elements[i]))
-	    return false;
-      }
-      return true;
-   }
-
-   if (this->type->base_type == GLSL_TYPE_STRUCT) {
-      const exec_node *a_node = this->components.head;
-      const exec_node *b_node = c->components.head;
-
-      while (!a_node->is_tail_sentinel()) {
-	 assert(!b_node->is_tail_sentinel());
-
-	 const ir_constant *const a_field = (ir_constant *) a_node;
-	 const ir_constant *const b_field = (ir_constant *) b_node;
-
-	 if (!a_field->has_value(b_field))
-	    return false;
-
-	 a_node = a_node->next;
-	 b_node = b_node->next;
-      }
-
-      return true;
-   }
-
-   for (unsigned i = 0; i < this->type->components(); i++) {
-      switch (this->type->base_type) {
-      case GLSL_TYPE_UINT:
-	 if (this->value.u[i] != c->value.u[i])
-	    return false;
-	 break;
-      case GLSL_TYPE_INT:
-	 if (this->value.i[i] != c->value.i[i])
-	    return false;
-	 break;
-      case GLSL_TYPE_FLOAT:
-	 if (this->value.f[i] != c->value.f[i])
-	    return false;
-	 break;
-      case GLSL_TYPE_BOOL:
-	 if (this->value.b[i] != c->value.b[i])
-	    return false;
-	 break;
-      default:
-	 assert(!"Should not get here.");
-	 return false;
-      }
-   }
-
-   return true;
-}
-
-bool
-ir_constant::is_zero() const
-{
-   if (!this->type->is_scalar() && !this->type->is_vector())
-      return false;
-
-   for (unsigned c = 0; c < this->type->vector_elements; c++) {
-      switch (this->type->base_type) {
-      case GLSL_TYPE_FLOAT:
-	 if (this->value.f[c] != 0.0)
-	    return false;
-	 break;
-      case GLSL_TYPE_INT:
-	 if (this->value.i[c] != 0)
-	    return false;
-	 break;
-      case GLSL_TYPE_UINT:
-	 if (this->value.u[c] != 0)
-	    return false;
-	 break;
-      case GLSL_TYPE_BOOL:
-	 if (this->value.b[c] != false)
-	    return false;
-	 break;
-      default:
-	 /* The only other base types are structures, arrays, and samplers.
-	  * Samplers cannot be constants, and the others should have been
-	  * filtered out above.
-	  */
-	 assert(!"Should not get here.");
-	 return false;
-      }
-   }
-
-   return true;
-}
-
-bool
-ir_constant::is_one() const
-{
-   if (!this->type->is_scalar() && !this->type->is_vector())
-      return false;
-
-   for (unsigned c = 0; c < this->type->vector_elements; c++) {
-      switch (this->type->base_type) {
-      case GLSL_TYPE_FLOAT:
-	 if (this->value.f[c] != 1.0)
-	    return false;
-	 break;
-      case GLSL_TYPE_INT:
-	 if (this->value.i[c] != 1)
-	    return false;
-	 break;
-      case GLSL_TYPE_UINT:
-	 if (this->value.u[c] != 1)
-	    return false;
-	 break;
-      case GLSL_TYPE_BOOL:
-	 if (this->value.b[c] != true)
-	    return false;
-	 break;
-      default:
-	 /* The only other base types are structures, arrays, and samplers.
-	  * Samplers cannot be constants, and the others should have been
-	  * filtered out above.
-	  */
-	 assert(!"Should not get here.");
-	 return false;
-      }
-   }
-
-   return true;
-}
-
-bool
-ir_constant::is_negative_one() const
-{
-   if (!this->type->is_scalar() && !this->type->is_vector())
-      return false;
-
-   if (this->type->is_boolean())
-      return false;
-
-   for (unsigned c = 0; c < this->type->vector_elements; c++) {
-      switch (this->type->base_type) {
-      case GLSL_TYPE_FLOAT:
-	 if (this->value.f[c] != -1.0)
-	    return false;
-	 break;
-      case GLSL_TYPE_INT:
-	 if (this->value.i[c] != -1)
-	    return false;
-	 break;
-      case GLSL_TYPE_UINT:
-	 if (int(this->value.u[c]) != -1)
-	    return false;
-	 break;
-      default:
-	 /* The only other base types are structures, arrays, samplers, and
-	  * booleans.  Samplers cannot be constants, and the others should
-	  * have been filtered out above.
-	  */
-	 assert(!"Should not get here.");
-	 return false;
-      }
-   }
-
-   return true;
-}
-
-ir_loop::ir_loop()
-{
-   this->ir_type = ir_type_loop;
-   this->cmp = ir_unop_neg;
-   this->from = NULL;
-   this->to = NULL;
-   this->increment = NULL;
-   this->counter = NULL;
-}
-
-
-ir_dereference_variable::ir_dereference_variable(ir_variable *var)
-{
-   this->ir_type = ir_type_dereference_variable;
-   this->var = var;
-   this->type = (var != NULL) ? var->type : glsl_type::error_type;
-}
-
-
-ir_dereference_array::ir_dereference_array(ir_rvalue *value,
-					   ir_rvalue *array_index)
-{
-   this->ir_type = ir_type_dereference_array;
-   this->array_index = array_index;
-   this->set_array(value);
-}
-
-
-ir_dereference_array::ir_dereference_array(ir_variable *var,
-					   ir_rvalue *array_index)
-{
-   void *ctx = ralloc_parent(var);
-
-   this->ir_type = ir_type_dereference_array;
-   this->array_index = array_index;
-   this->set_array(new(ctx) ir_dereference_variable(var));
-}
-
-
-void
-ir_dereference_array::set_array(ir_rvalue *value)
-{
-   this->array = value;
-   this->type = glsl_type::error_type;
-
-   if (this->array != NULL) {
-      const glsl_type *const vt = this->array->type;
-
-      if (vt->is_array()) {
-	 type = vt->element_type();
-      } else if (vt->is_matrix()) {
-	 type = vt->column_type();
-      } else if (vt->is_vector()) {
-	 type = vt->get_base_type();
-      }
-   }
-}
-
-
-ir_dereference_record::ir_dereference_record(ir_rvalue *value,
-					     const char *field)
-{
-   this->ir_type = ir_type_dereference_record;
-   this->record = value;
-   this->field = ralloc_strdup(this, field);
-   this->type = (this->record != NULL)
-      ? this->record->type->field_type(field) : glsl_type::error_type;
-}
-
-
-ir_dereference_record::ir_dereference_record(ir_variable *var,
-					     const char *field)
-{
-   void *ctx = ralloc_parent(var);
-
-   this->ir_type = ir_type_dereference_record;
-   this->record = new(ctx) ir_dereference_variable(var);
-   this->field = ralloc_strdup(this, field);
-   this->type = (this->record != NULL)
-      ? this->record->type->field_type(field) : glsl_type::error_type;
-}
-
-bool type_contains_sampler(const glsl_type *type)
-{
-   if (type->is_array()) {
-      return type_contains_sampler(type->fields.array);
-   } else if (type->is_record()) {
-      for (unsigned int i = 0; i < type->length; i++) {
-	 if (type_contains_sampler(type->fields.structure[i].type))
-	    return true;
-      }
-      return false;
-   } else {
-      return type->is_sampler();
-   }
-}
-
-bool
-ir_dereference::is_lvalue()
-{
-   ir_variable *var = this->variable_referenced();
-
-   /* Every l-value derference chain eventually ends in a variable.
-    */
-   if ((var == NULL) || var->read_only)
-      return false;
-
-   if (this->type->is_array() && !var->array_lvalue)
-      return false;
-
-   /* From page 17 (page 23 of the PDF) of the GLSL 1.20 spec:
-    *
-    *    "Samplers cannot be treated as l-values; hence cannot be used
-    *     as out or inout function parameters, nor can they be
-    *     assigned into."
-    */
-   if (type_contains_sampler(this->type))
-      return false;
-
-   return true;
-}
-
-
-const char *tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf" };
-
-const char *ir_texture::opcode_string()
-{
-   assert((unsigned int) op <=
-	  sizeof(tex_opcode_strs) / sizeof(tex_opcode_strs[0]));
-   return tex_opcode_strs[op];
-}
-
-ir_texture_opcode
-ir_texture::get_opcode(const char *str)
-{
-   const int count = sizeof(tex_opcode_strs) / sizeof(tex_opcode_strs[0]);
-   for (int op = 0; op < count; op++) {
-      if (strcmp(str, tex_opcode_strs[op]) == 0)
-	 return (ir_texture_opcode) op;
-   }
-   return (ir_texture_opcode) -1;
-}
-
-
-void
-ir_texture::set_sampler(ir_dereference *sampler, const glsl_type *type)
-{
-   assert(sampler != NULL);
-   assert(type != NULL);
-   this->sampler = sampler;
-   this->type = type;
-
-   assert(sampler->type->sampler_type == (int) type->base_type);
-   if (sampler->type->sampler_shadow)
-      assert(type->vector_elements == 4 || type->vector_elements == 1);
-   else
-      assert(type->vector_elements == 4);
-}
-
-
-void
-ir_swizzle::init_mask(const unsigned *comp, unsigned count)
-{
-   assert((count >= 1) && (count <= 4));
-
-   memset(&this->mask, 0, sizeof(this->mask));
-   this->mask.num_components = count;
-
-   unsigned dup_mask = 0;
-   switch (count) {
-   case 4:
-      assert(comp[3] <= 3);
-      dup_mask |= (1U << comp[3])
-	 & ((1U << comp[0]) | (1U << comp[1]) | (1U << comp[2]));
-      this->mask.w = comp[3];
-
-   case 3:
-      assert(comp[2] <= 3);
-      dup_mask |= (1U << comp[2])
-	 & ((1U << comp[0]) | (1U << comp[1]));
-      this->mask.z = comp[2];
-
-   case 2:
-      assert(comp[1] <= 3);
-      dup_mask |= (1U << comp[1])
-	 & ((1U << comp[0]));
-      this->mask.y = comp[1];
-
-   case 1:
-      assert(comp[0] <= 3);
-      this->mask.x = comp[0];
-   }
-
-   this->mask.has_duplicates = dup_mask != 0;
-
-   /* Based on the number of elements in the swizzle and the base type
-    * (i.e., float, int, unsigned, or bool) of the vector being swizzled,
-    * generate the type of the resulting value.
-    */
-   type = glsl_type::get_instance(val->type->base_type, mask.num_components, 1);
-}
-
-ir_swizzle::ir_swizzle(ir_rvalue *val, unsigned x, unsigned y, unsigned z,
-		       unsigned w, unsigned count)
-   : val(val)
-{
-   const unsigned components[4] = { x, y, z, w };
-   this->ir_type = ir_type_swizzle;
-   this->init_mask(components, count);
-}
-
-ir_swizzle::ir_swizzle(ir_rvalue *val, const unsigned *comp,
-		       unsigned count)
-   : val(val)
-{
-   this->ir_type = ir_type_swizzle;
-   this->init_mask(comp, count);
-}
-
-ir_swizzle::ir_swizzle(ir_rvalue *val, ir_swizzle_mask mask)
-{
-   this->ir_type = ir_type_swizzle;
-   this->val = val;
-   this->mask = mask;
-   this->type = glsl_type::get_instance(val->type->base_type,
-					mask.num_components, 1);
-}
-
-#define X 1
-#define R 5
-#define S 9
-#define I 13
-
-ir_swizzle *
-ir_swizzle::create(ir_rvalue *val, const char *str, unsigned vector_length)
-{
-   void *ctx = ralloc_parent(val);
-
-   /* For each possible swizzle character, this table encodes the value in
-    * \c idx_map that represents the 0th element of the vector.  For invalid
-    * swizzle characters (e.g., 'k'), a special value is used that will allow
-    * detection of errors.
-    */
-   static const unsigned char base_idx[26] = {
-   /* a  b  c  d  e  f  g  h  i  j  k  l  m */
-      R, R, I, I, I, I, R, I, I, I, I, I, I,
-   /* n  o  p  q  r  s  t  u  v  w  x  y  z */
-      I, I, S, S, R, S, S, I, I, X, X, X, X
-   };
-
-   /* Each valid swizzle character has an entry in the previous table.  This
-    * table encodes the base index encoded in the previous table plus the actual
-    * index of the swizzle character.  When processing swizzles, the first
-    * character in the string is indexed in the previous table.  Each character
-    * in the string is indexed in this table, and the value found there has the
-    * value form the first table subtracted.  The result must be on the range
-    * [0,3].
-    *
-    * For example, the string "wzyx" will get X from the first table.  Each of
-    * the charcaters will get X+3, X+2, X+1, and X+0 from this table.  After
-    * subtraction, the swizzle values are { 3, 2, 1, 0 }.
-    *
-    * The string "wzrg" will get X from the first table.  Each of the characters
-    * will get X+3, X+2, R+0, and R+1 from this table.  After subtraction, the
-    * swizzle values are { 3, 2, 4, 5 }.  Since 4 and 5 are outside the range
-    * [0,3], the error is detected.
-    */
-   static const unsigned char idx_map[26] = {
-   /* a    b    c    d    e    f    g    h    i    j    k    l    m */
-      R+3, R+2, 0,   0,   0,   0,   R+1, 0,   0,   0,   0,   0,   0,
-   /* n    o    p    q    r    s    t    u    v    w    x    y    z */
-      0,   0,   S+2, S+3, R+0, S+0, S+1, 0,   0,   X+3, X+0, X+1, X+2
-   };
-
-   int swiz_idx[4] = { 0, 0, 0, 0 };
-   unsigned i;
-
-
-   /* Validate the first character in the swizzle string and look up the base
-    * index value as described above.
-    */
-   if ((str[0] < 'a') || (str[0] > 'z'))
-      return NULL;
-
-   const unsigned base = base_idx[str[0] - 'a'];
-
-
-   for (i = 0; (i < 4) && (str[i] != '\0'); i++) {
-      /* Validate the next character, and, as described above, convert it to a
-       * swizzle index.
-       */
-      if ((str[i] < 'a') || (str[i] > 'z'))
-	 return NULL;
-
-      swiz_idx[i] = idx_map[str[i] - 'a'] - base;
-      if ((swiz_idx[i] < 0) || (swiz_idx[i] >= (int) vector_length))
-	 return NULL;
-   }
-
-   if (str[i] != '\0')
-	 return NULL;
-
-   return new(ctx) ir_swizzle(val, swiz_idx[0], swiz_idx[1], swiz_idx[2],
-			      swiz_idx[3], i);
-}
-
-#undef X
-#undef R
-#undef S
-#undef I
-
-ir_variable *
-ir_swizzle::variable_referenced()
-{
-   return this->val->variable_referenced();
-}
-
-
-ir_variable::ir_variable(const struct glsl_type *type, const char *name,
-			 ir_variable_mode mode)
-   : max_array_access(0), read_only(false), centroid(false), invariant(false),
-     mode(mode), interpolation(ir_var_smooth), array_lvalue(false)
-{
-   this->ir_type = ir_type_variable;
-   this->type = type;
-   this->name = ralloc_strdup(this, name);
-   this->explicit_location = false;
-   this->location = -1;
-   this->warn_extension = NULL;
-   this->constant_value = NULL;
-   this->origin_upper_left = false;
-   this->pixel_center_integer = false;
-   this->depth_layout = ir_depth_layout_none;
-   this->used = false;
-
-   if (type && type->base_type == GLSL_TYPE_SAMPLER)
-      this->read_only = true;
-}
-
-
-const char *
-ir_variable::interpolation_string() const
-{
-   switch (this->interpolation) {
-   case ir_var_smooth:        return "smooth";
-   case ir_var_flat:          return "flat";
-   case ir_var_noperspective: return "noperspective";
-   }
-
-   assert(!"Should not get here.");
-   return "";
-}
-
-
-unsigned
-ir_variable::component_slots() const
-{
-   /* FINISHME: Sparsely accessed arrays require fewer slots. */
-   return this->type->component_slots();
-}
-
-
-ir_function_signature::ir_function_signature(const glsl_type *return_type)
-   : return_type(return_type), is_defined(false), _function(NULL)
-{
-   this->ir_type = ir_type_function_signature;
-   this->is_builtin = false;
-}
-
-
-static bool
-modes_match(unsigned a, unsigned b)
-{
-   if (a == b)
-      return true;
-
-   /* Accept "in" vs. "const in" */
-   if ((a == ir_var_const_in && b == ir_var_in) ||
-       (b == ir_var_const_in && a == ir_var_in))
-      return true;
-
-   return false;
-}
-
-
-const char *
-ir_function_signature::qualifiers_match(exec_list *params)
-{
-   exec_list_iterator iter_a = parameters.iterator();
-   exec_list_iterator iter_b = params->iterator();
-
-   /* check that the qualifiers match. */
-   while (iter_a.has_next()) {
-      ir_variable *a = (ir_variable *)iter_a.get();
-      ir_variable *b = (ir_variable *)iter_b.get();
-
-      if (a->read_only != b->read_only ||
-	  !modes_match(a->mode, b->mode) ||
-	  a->interpolation != b->interpolation ||
-	  a->centroid != b->centroid) {
-
-	 /* parameter a's qualifiers don't match */
-	 return a->name;
-      }
-
-      iter_a.next();
-      iter_b.next();
-   }
-   return NULL;
-}
-
-
-void
-ir_function_signature::replace_parameters(exec_list *new_params)
-{
-   /* Destroy all of the previous parameter information.  If the previous
-    * parameter information comes from the function prototype, it may either
-    * specify incorrect parameter names or not have names at all.
-    */
-   foreach_iter(exec_list_iterator, iter, parameters) {
-      assert(((ir_instruction *) iter.get())->as_variable() != NULL);
-
-      iter.remove();
-   }
-
-   new_params->move_nodes_to(&parameters);
-}
-
-
-ir_function::ir_function(const char *name)
-{
-   this->ir_type = ir_type_function;
-   this->name = ralloc_strdup(this, name);
-}
-
-
-bool
-ir_function::has_user_signature()
-{
-   foreach_list(n, &this->signatures) {
-      ir_function_signature *const sig = (ir_function_signature *) n;
-      if (!sig->is_builtin)
-	 return true;
-   }
-   return false;
-}
-
-
-ir_call *
-ir_call::get_error_instruction(void *ctx)
-{
-   ir_call *call = new(ctx) ir_call;
-
-   call->type = glsl_type::error_type;
-   return call;
-}
-
-void
-ir_call::set_callee(ir_function_signature *sig)
-{
-   assert((this->type == NULL) || (this->type == sig->return_type));
-
-   this->callee = sig;
-}
-
-void
-visit_exec_list(exec_list *list, ir_visitor *visitor)
-{
-   foreach_iter(exec_list_iterator, iter, *list) {
-      ((ir_instruction *)iter.get())->accept(visitor);
-   }
-}
-
-
-static void
-steal_memory(ir_instruction *ir, void *new_ctx)
-{
-   ir_variable *var = ir->as_variable();
-   ir_constant *constant = ir->as_constant();
-   if (var != NULL && var->constant_value != NULL)
-      steal_memory(var->constant_value, ir);
-
-   /* The components of aggregate constants are not visited by the normal
-    * visitor, so steal their values by hand.
-    */
-   if (constant != NULL) {
-      if (constant->type->is_record()) {
-	 foreach_iter(exec_list_iterator, iter, constant->components) {
-	    ir_constant *field = (ir_constant *)iter.get();
-	    steal_memory(field, ir);
-	 }
-      } else if (constant->type->is_array()) {
-	 for (unsigned int i = 0; i < constant->type->length; i++) {
-	    steal_memory(constant->array_elements[i], ir);
-	 }
-      }
-   }
-
-   ralloc_steal(new_ctx, ir);
-}
-
-
-void
-reparent_ir(exec_list *list, void *mem_ctx)
-{
-   foreach_list(node, list) {
-      visit_tree((ir_instruction *) node, steal_memory, mem_ctx);
-   }
-}
-
-
-static ir_rvalue *
-try_min_one(ir_rvalue *ir)
-{
-   ir_expression *expr = ir->as_expression();
-
-   if (!expr || expr->operation != ir_binop_min)
-      return NULL;
-
-   if (expr->operands[0]->is_one())
-      return expr->operands[1];
-
-   if (expr->operands[1]->is_one())
-      return expr->operands[0];
-
-   return NULL;
-}
-
-static ir_rvalue *
-try_max_zero(ir_rvalue *ir)
-{
-   ir_expression *expr = ir->as_expression();
-
-   if (!expr || expr->operation != ir_binop_max)
-      return NULL;
-
-   if (expr->operands[0]->is_zero())
-      return expr->operands[1];
-
-   if (expr->operands[1]->is_zero())
-      return expr->operands[0];
-
-   return NULL;
-}
-
-ir_rvalue *
-ir_rvalue::as_rvalue_to_saturate()
-{
-   ir_expression *expr = this->as_expression();
-
-   if (!expr)
-      return NULL;
-
-   ir_rvalue *max_zero = try_max_zero(expr);
-   if (max_zero) {
-      return try_min_one(max_zero);
-   } else {
-      ir_rvalue *min_one = try_min_one(expr);
-      if (min_one) {
-	 return try_max_zero(min_one);
-      }
-   }
-
-   return NULL;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+#include <string.h>

+#include "main/core.h" /* for MAX2 */

+#include "ir.h"

+#include "ir_visitor.h"

+#include "glsl_types.h"

+

+ir_rvalue::ir_rvalue()

+{

+   this->type = glsl_type::error_type;

+}

+

+bool ir_rvalue::is_zero() const

+{

+   return false;

+}

+

+bool ir_rvalue::is_one() const

+{

+   return false;

+}

+

+bool ir_rvalue::is_negative_one() const

+{

+   return false;

+}

+

+/**

+ * Modify the swizzle make to move one component to another

+ *

+ * \param m    IR swizzle to be modified

+ * \param from Component in the RHS that is to be swizzled

+ * \param to   Desired swizzle location of \c from

+ */

+static void

+update_rhs_swizzle(ir_swizzle_mask &m, unsigned from, unsigned to)

+{

+   switch (to) {

+   case 0: m.x = from; break;

+   case 1: m.y = from; break;

+   case 2: m.z = from; break;

+   case 3: m.w = from; break;

+   default: assert(!"Should not get here.");

+   }

+

+   m.num_components = MAX2(m.num_components, (to + 1));

+}

+

+void

+ir_assignment::set_lhs(ir_rvalue *lhs)

+{

+   void *mem_ctx = this;

+   bool swizzled = false;

+

+   while (lhs != NULL) {

+      ir_swizzle *swiz = lhs->as_swizzle();

+

+      if (swiz == NULL)

+	 break;

+

+      unsigned write_mask = 0;

+      ir_swizzle_mask rhs_swiz = { 0, 0, 0, 0, 0, 0 };

+

+      for (unsigned i = 0; i < swiz->mask.num_components; i++) {

+	 unsigned c = 0;

+

+	 switch (i) {

+	 case 0: c = swiz->mask.x; break;

+	 case 1: c = swiz->mask.y; break;

+	 case 2: c = swiz->mask.z; break;

+	 case 3: c = swiz->mask.w; break;

+	 default: assert(!"Should not get here.");

+	 }

+

+	 write_mask |= (((this->write_mask >> i) & 1) << c);

+	 update_rhs_swizzle(rhs_swiz, i, c);

+      }

+

+      this->write_mask = write_mask;

+      lhs = swiz->val;

+

+      this->rhs = new(mem_ctx) ir_swizzle(this->rhs, rhs_swiz);

+      swizzled = true;

+   }

+

+   if (swizzled) {

+      /* Now, RHS channels line up with the LHS writemask.  Collapse it

+       * to just the channels that will be written.

+       */

+      ir_swizzle_mask rhs_swiz = { 0, 0, 0, 0, 0, 0 };

+      int rhs_chan = 0;

+      for (int i = 0; i < 4; i++) {

+	 if (write_mask & (1 << i))

+	    update_rhs_swizzle(rhs_swiz, i, rhs_chan++);

+      }

+      this->rhs = new(mem_ctx) ir_swizzle(this->rhs, rhs_swiz);

+   }

+

+   assert((lhs == NULL) || lhs->as_dereference());

+

+   this->lhs = (ir_dereference *) lhs;

+}

+

+ir_variable *

+ir_assignment::whole_variable_written()

+{

+   ir_variable *v = this->lhs->whole_variable_referenced();

+

+   if (v == NULL)

+      return NULL;

+

+   if (v->type->is_scalar())

+      return v;

+

+   if (v->type->is_vector()) {

+      const unsigned mask = (1U << v->type->vector_elements) - 1;

+

+      if (mask != this->write_mask)

+	 return NULL;

+   }

+

+   /* Either all the vector components are assigned or the variable is some

+    * composite type (and the whole thing is assigned.

+    */

+   return v;

+}

+

+ir_assignment::ir_assignment(ir_dereference *lhs, ir_rvalue *rhs,

+			     ir_rvalue *condition, unsigned write_mask)

+{

+   this->ir_type = ir_type_assignment;

+   this->condition = condition;

+   this->rhs = rhs;

+   this->lhs = lhs;

+   this->write_mask = write_mask;

+

+   if (lhs->type->is_scalar() || lhs->type->is_vector()) {

+      int lhs_components = 0;

+      for (int i = 0; i < 4; i++) {

+	 if (write_mask & (1 << i))

+	    lhs_components++;

+      }

+

+      assert(lhs_components == this->rhs->type->vector_elements);

+   }

+}

+

+ir_assignment::ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs,

+			     ir_rvalue *condition)

+{

+   this->ir_type = ir_type_assignment;

+   this->condition = condition;

+   this->rhs = rhs;

+

+   /* If the RHS is a vector type, assume that all components of the vector

+    * type are being written to the LHS.  The write mask comes from the RHS

+    * because we can have a case where the LHS is a vec4 and the RHS is a

+    * vec3.  In that case, the assignment is:

+    *

+    *     (assign (...) (xyz) (var_ref lhs) (var_ref rhs))

+    */

+   if (rhs->type->is_vector())

+      this->write_mask = (1U << rhs->type->vector_elements) - 1;

+   else if (rhs->type->is_scalar())

+      this->write_mask = 1;

+   else

+      this->write_mask = 0;

+

+   this->set_lhs(lhs);

+}

+

+

+ir_expression::ir_expression(int op, const struct glsl_type *type,

+			     ir_rvalue *op0)

+{

+   assert(get_num_operands(ir_expression_operation(op)) == 1);

+   this->ir_type = ir_type_expression;

+   this->type = type;

+   this->operation = ir_expression_operation(op);

+   this->operands[0] = op0;

+   this->operands[1] = NULL;

+   this->operands[2] = NULL;

+   this->operands[3] = NULL;

+}

+

+ir_expression::ir_expression(int op, const struct glsl_type *type,

+			     ir_rvalue *op0, ir_rvalue *op1)

+{

+   assert(((op1 == NULL) && (get_num_operands(ir_expression_operation(op)) == 1))

+	  || (get_num_operands(ir_expression_operation(op)) == 2));

+   this->ir_type = ir_type_expression;

+   this->type = type;

+   this->operation = ir_expression_operation(op);

+   this->operands[0] = op0;

+   this->operands[1] = op1;

+   this->operands[2] = NULL;

+   this->operands[3] = NULL;

+}

+

+ir_expression::ir_expression(int op, const struct glsl_type *type,

+			     ir_rvalue *op0, ir_rvalue *op1,

+			     ir_rvalue *op2, ir_rvalue *op3)

+{

+   this->ir_type = ir_type_expression;

+   this->type = type;

+   this->operation = ir_expression_operation(op);

+   this->operands[0] = op0;

+   this->operands[1] = op1;

+   this->operands[2] = op2;

+   this->operands[3] = op3;

+}

+

+ir_expression::ir_expression(int op, ir_rvalue *op0)

+{

+   this->ir_type = ir_type_expression;

+

+   this->operation = ir_expression_operation(op);

+   this->operands[0] = op0;

+   this->operands[1] = NULL;

+   this->operands[2] = NULL;

+   this->operands[3] = NULL;

+

+   assert(op <= ir_last_unop);

+

+   switch (this->operation) {

+   case ir_unop_bit_not:

+   case ir_unop_logic_not:

+   case ir_unop_neg:

+   case ir_unop_abs:

+   case ir_unop_sign:

+   case ir_unop_rcp:

+   case ir_unop_rsq:

+   case ir_unop_sqrt:

+   case ir_unop_exp:

+   case ir_unop_log:

+   case ir_unop_exp2:

+   case ir_unop_log2:

+   case ir_unop_trunc:

+   case ir_unop_ceil:

+   case ir_unop_floor:

+   case ir_unop_fract:

+   case ir_unop_round_even:

+   case ir_unop_sin:

+   case ir_unop_cos:

+   case ir_unop_sin_reduced:

+   case ir_unop_cos_reduced:

+   case ir_unop_dFdx:

+   case ir_unop_dFdy:

+      this->type = op0->type;

+      break;

+

+   case ir_unop_f2i:

+   case ir_unop_b2i:

+      this->type = glsl_type::get_instance(GLSL_TYPE_INT,

+					   op0->type->vector_elements, 1);

+      break;

+

+   case ir_unop_b2f:

+   case ir_unop_i2f:

+   case ir_unop_u2f:

+      this->type = glsl_type::get_instance(GLSL_TYPE_FLOAT,

+					   op0->type->vector_elements, 1);

+      break;

+

+   case ir_unop_f2b:

+   case ir_unop_i2b:

+      this->type = glsl_type::get_instance(GLSL_TYPE_BOOL,

+					   op0->type->vector_elements, 1);

+      break;

+

+   case ir_unop_noise:

+      this->type = glsl_type::float_type;

+      break;

+

+   case ir_unop_any:

+      this->type = glsl_type::bool_type;

+      break;

+

+   default:

+      assert(!"not reached: missing automatic type setup for ir_expression");

+      this->type = op0->type;

+      break;

+   }

+}

+

+ir_expression::ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1)

+{

+   this->ir_type = ir_type_expression;

+

+   this->operation = ir_expression_operation(op);

+   this->operands[0] = op0;

+   this->operands[1] = op1;

+   this->operands[2] = NULL;

+   this->operands[3] = NULL;

+

+   assert(op > ir_last_unop);

+

+   switch (this->operation) {

+   case ir_binop_all_equal:

+   case ir_binop_any_nequal:

+      this->type = glsl_type::bool_type;

+      break;

+

+   case ir_binop_add:

+   case ir_binop_sub:

+   case ir_binop_min:

+   case ir_binop_max:

+   case ir_binop_pow:

+   case ir_binop_mul:

+   case ir_binop_div:

+   case ir_binop_mod:

+      if (op0->type->is_scalar()) {

+	 this->type = op1->type;

+      } else if (op1->type->is_scalar()) {

+	 this->type = op0->type;

+      } else {

+	 /* FINISHME: matrix types */

+	 assert(!op0->type->is_matrix() && !op1->type->is_matrix());

+	 assert(op0->type == op1->type);

+	 this->type = op0->type;

+      }

+      break;

+

+   case ir_binop_logic_and:

+   case ir_binop_logic_xor:

+   case ir_binop_logic_or:

+   case ir_binop_bit_and:

+   case ir_binop_bit_xor:

+   case ir_binop_bit_or:

+      if (op0->type->is_scalar()) {

+	 this->type = op1->type;

+      } else if (op1->type->is_scalar()) {

+	 this->type = op0->type;

+      }

+      break;

+

+   case ir_binop_equal:

+   case ir_binop_nequal:

+   case ir_binop_lequal:

+   case ir_binop_gequal:

+   case ir_binop_less:

+   case ir_binop_greater:

+      assert(op0->type == op1->type);

+      this->type = glsl_type::get_instance(GLSL_TYPE_BOOL,

+					   op0->type->vector_elements, 1);

+      break;

+

+   case ir_binop_dot:

+      this->type = glsl_type::float_type;

+      break;

+

+   case ir_binop_lshift:

+   case ir_binop_rshift:

+      this->type = op0->type;

+      break;

+

+   default:

+      assert(!"not reached: missing automatic type setup for ir_expression");

+      this->type = glsl_type::float_type;

+   }

+}

+

+unsigned int

+ir_expression::get_num_operands(ir_expression_operation op)

+{

+   assert(op <= ir_last_opcode);

+

+   if (op <= ir_last_unop)

+      return 1;

+

+   if (op <= ir_last_binop)

+      return 2;

+

+   if (op == ir_quadop_vector)

+      return 4;

+

+   assert(false);

+   return 0;

+}

+

+static const char *const operator_strs[] = {

+   "~",

+   "!",

+   "neg",

+   "abs",

+   "sign",

+   "rcp",

+   "rsq",

+   "sqrt",

+   "exp",

+   "log",

+   "exp2",

+   "log2",

+   "f2i",

+   "i2f",

+   "f2b",

+   "b2f",

+   "i2b",

+   "b2i",

+   "u2f",

+   "any",

+   "trunc",

+   "ceil",

+   "floor",

+   "fract",

+   "round_even",

+   "sin",

+   "cos",

+   "sin_reduced",

+   "cos_reduced",

+   "dFdx",

+   "dFdy",

+   "noise",

+   "+",

+   "-",

+   "*",

+   "/",

+   "%",

+   "<",

+   ">",

+   "<=",

+   ">=",

+   "==",

+   "!=",

+   "all_equal",

+   "any_nequal",

+   "<<",

+   ">>",

+   "&",

+   "^",

+   "|",

+   "&&",

+   "^^",

+   "||",

+   "dot",

+   "min",

+   "max",

+   "pow",

+   "vector",

+};

+

+const char *ir_expression::operator_string(ir_expression_operation op)

+{

+   assert((unsigned int) op < Elements(operator_strs));

+   assert(Elements(operator_strs) == (ir_quadop_vector + 1));

+   return operator_strs[op];

+}

+

+const char *ir_expression::operator_string()

+{

+   return operator_string(this->operation);

+}

+

+const char*

+depth_layout_string(ir_depth_layout layout)

+{

+   switch(layout) {

+   case ir_depth_layout_none:      return "";

+   case ir_depth_layout_any:       return "depth_any";

+   case ir_depth_layout_greater:   return "depth_greater";

+   case ir_depth_layout_less:      return "depth_less";

+   case ir_depth_layout_unchanged: return "depth_unchanged";

+

+   default:

+      assert(0);

+      return "";

+   }

+}

+

+ir_expression_operation

+ir_expression::get_operator(const char *str)

+{

+   const int operator_count = sizeof(operator_strs) / sizeof(operator_strs[0]);

+   for (int op = 0; op < operator_count; op++) {

+      if (strcmp(str, operator_strs[op]) == 0)

+	 return (ir_expression_operation) op;

+   }

+   return (ir_expression_operation) -1;

+}

+

+ir_constant::ir_constant()

+{

+   this->ir_type = ir_type_constant;

+}

+

+ir_constant::ir_constant(const struct glsl_type *type,

+			 const ir_constant_data *data)

+{

+   assert((type->base_type >= GLSL_TYPE_UINT)

+	  && (type->base_type <= GLSL_TYPE_BOOL));

+

+   this->ir_type = ir_type_constant;

+   this->type = type;

+   memcpy(& this->value, data, sizeof(this->value));

+}

+

+ir_constant::ir_constant(float f)

+{

+   this->ir_type = ir_type_constant;

+   this->type = glsl_type::float_type;

+   this->value.f[0] = f;

+   for (int i = 1; i < 16; i++)  {

+      this->value.f[i] = 0;

+   }

+}

+

+ir_constant::ir_constant(unsigned int u)

+{

+   this->ir_type = ir_type_constant;

+   this->type = glsl_type::uint_type;

+   this->value.u[0] = u;

+   for (int i = 1; i < 16; i++) {

+      this->value.u[i] = 0;

+   }

+}

+

+ir_constant::ir_constant(int i)

+{

+   this->ir_type = ir_type_constant;

+   this->type = glsl_type::int_type;

+   this->value.i[0] = i;

+   for (int i = 1; i < 16; i++) {

+      this->value.i[i] = 0;

+   }

+}

+

+ir_constant::ir_constant(bool b)

+{

+   this->ir_type = ir_type_constant;

+   this->type = glsl_type::bool_type;

+   this->value.b[0] = b;

+   for (int i = 1; i < 16; i++) {

+      this->value.b[i] = false;

+   }

+}

+

+ir_constant::ir_constant(const ir_constant *c, unsigned i)

+{

+   this->ir_type = ir_type_constant;

+   this->type = c->type->get_base_type();

+

+   switch (this->type->base_type) {

+   case GLSL_TYPE_UINT:  this->value.u[0] = c->value.u[i]; break;

+   case GLSL_TYPE_INT:   this->value.i[0] = c->value.i[i]; break;

+   case GLSL_TYPE_FLOAT: this->value.f[0] = c->value.f[i]; break;

+   case GLSL_TYPE_BOOL:  this->value.b[0] = c->value.b[i]; break;

+   default:              assert(!"Should not get here."); break;

+   }

+}

+

+ir_constant::ir_constant(const struct glsl_type *type, exec_list *value_list)

+{

+   this->ir_type = ir_type_constant;

+   this->type = type;

+

+   assert(type->is_scalar() || type->is_vector() || type->is_matrix()

+	  || type->is_record() || type->is_array());

+

+   if (type->is_array()) {

+      this->array_elements = ralloc_array(this, ir_constant *, type->length);

+      unsigned i = 0;

+      foreach_list(node, value_list) {

+	 ir_constant *value = (ir_constant *) node;

+	 assert(value->as_constant() != NULL);

+

+	 this->array_elements[i++] = value;

+      }

+      return;

+   }

+

+   /* If the constant is a record, the types of each of the entries in

+    * value_list must be a 1-for-1 match with the structure components.  Each

+    * entry must also be a constant.  Just move the nodes from the value_list

+    * to the list in the ir_constant.

+    */

+   /* FINISHME: Should there be some type checking and / or assertions here? */

+   /* FINISHME: Should the new constant take ownership of the nodes from

+    * FINISHME: value_list, or should it make copies?

+    */

+   if (type->is_record()) {

+      value_list->move_nodes_to(& this->components);

+      return;

+   }

+

+   for (unsigned i = 0; i < 16; i++) {

+      this->value.u[i] = 0;

+   }

+

+   ir_constant *value = (ir_constant *) (value_list->head);

+

+   /* Constructors with exactly one scalar argument are special for vectors

+    * and matrices.  For vectors, the scalar value is replicated to fill all

+    * the components.  For matrices, the scalar fills the components of the

+    * diagonal while the rest is filled with 0.

+    */

+   if (value->type->is_scalar() && value->next->is_tail_sentinel()) {

+      if (type->is_matrix()) {

+	 /* Matrix - fill diagonal (rest is already set to 0) */

+	 assert(type->base_type == GLSL_TYPE_FLOAT);

+	 for (unsigned i = 0; i < type->matrix_columns; i++)

+	    this->value.f[i * type->vector_elements + i] = value->value.f[0];

+      } else {

+	 /* Vector or scalar - fill all components */

+	 switch (type->base_type) {

+	 case GLSL_TYPE_UINT:

+	 case GLSL_TYPE_INT:

+	    for (unsigned i = 0; i < type->components(); i++)

+	       this->value.u[i] = value->value.u[0];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    for (unsigned i = 0; i < type->components(); i++)

+	       this->value.f[i] = value->value.f[0];

+	    break;

+	 case GLSL_TYPE_BOOL:

+	    for (unsigned i = 0; i < type->components(); i++)

+	       this->value.b[i] = value->value.b[0];

+	    break;

+	 default:

+	    assert(!"Should not get here.");

+	    break;

+	 }

+      }

+      return;

+   }

+

+   if (type->is_matrix() && value->type->is_matrix()) {

+      assert(value->next->is_tail_sentinel());

+

+      /* From section 5.4.2 of the GLSL 1.20 spec:

+       * "If a matrix is constructed from a matrix, then each component

+       *  (column i, row j) in the result that has a corresponding component

+       *  (column i, row j) in the argument will be initialized from there."

+       */

+      unsigned cols = MIN2(type->matrix_columns, value->type->matrix_columns);

+      unsigned rows = MIN2(type->vector_elements, value->type->vector_elements);

+      for (unsigned i = 0; i < cols; i++) {

+	 for (unsigned j = 0; j < rows; j++) {

+	    const unsigned src = i * value->type->vector_elements + j;

+	    const unsigned dst = i * type->vector_elements + j;

+	    this->value.f[dst] = value->value.f[src];

+	 }

+      }

+

+      /* "All other components will be initialized to the identity matrix." */

+      for (unsigned i = cols; i < type->matrix_columns; i++)

+	 this->value.f[i * type->vector_elements + i] = 1.0;

+

+      return;

+   }

+

+   /* Use each component from each entry in the value_list to initialize one

+    * component of the constant being constructed.

+    */

+   for (unsigned i = 0; i < type->components(); /* empty */) {

+      assert(value->as_constant() != NULL);

+      assert(!value->is_tail_sentinel());

+

+      for (unsigned j = 0; j < value->type->components(); j++) {

+	 switch (type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    this->value.u[i] = value->get_uint_component(j);

+	    break;

+	 case GLSL_TYPE_INT:

+	    this->value.i[i] = value->get_int_component(j);

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    this->value.f[i] = value->get_float_component(j);

+	    break;

+	 case GLSL_TYPE_BOOL:

+	    this->value.b[i] = value->get_bool_component(j);

+	    break;

+	 default:

+	    /* FINISHME: What to do?  Exceptions are not the answer.

+	     */

+	    break;

+	 }

+

+	 i++;

+	 if (i >= type->components())

+	    break;

+      }

+

+      value = (ir_constant *) value->next;

+   }

+}

+

+ir_constant *

+ir_constant::zero(void *mem_ctx, const glsl_type *type)

+{

+   assert(type->is_numeric() || type->is_boolean());

+

+   ir_constant *c = new(mem_ctx) ir_constant;

+   c->type = type;

+   memset(&c->value, 0, sizeof(c->value));

+

+   return c;

+}

+

+bool

+ir_constant::get_bool_component(unsigned i) const

+{

+   switch (this->type->base_type) {

+   case GLSL_TYPE_UINT:  return this->value.u[i] != 0;

+   case GLSL_TYPE_INT:   return this->value.i[i] != 0;

+   case GLSL_TYPE_FLOAT: return ((int)this->value.f[i]) != 0;

+   case GLSL_TYPE_BOOL:  return this->value.b[i];

+   default:              assert(!"Should not get here."); break;

+   }

+

+   /* Must return something to make the compiler happy.  This is clearly an

+    * error case.

+    */

+   return false;

+}

+

+float

+ir_constant::get_float_component(unsigned i) const

+{

+   switch (this->type->base_type) {

+   case GLSL_TYPE_UINT:  return (float) this->value.u[i];

+   case GLSL_TYPE_INT:   return (float) this->value.i[i];

+   case GLSL_TYPE_FLOAT: return this->value.f[i];

+   case GLSL_TYPE_BOOL:  return this->value.b[i] ? 1.0 : 0.0;

+   default:              assert(!"Should not get here."); break;

+   }

+

+   /* Must return something to make the compiler happy.  This is clearly an

+    * error case.

+    */

+   return 0.0;

+}

+

+int

+ir_constant::get_int_component(unsigned i) const

+{

+   switch (this->type->base_type) {

+   case GLSL_TYPE_UINT:  return this->value.u[i];

+   case GLSL_TYPE_INT:   return this->value.i[i];

+   case GLSL_TYPE_FLOAT: return (int) this->value.f[i];

+   case GLSL_TYPE_BOOL:  return this->value.b[i] ? 1 : 0;

+   default:              assert(!"Should not get here."); break;

+   }

+

+   /* Must return something to make the compiler happy.  This is clearly an

+    * error case.

+    */

+   return 0;

+}

+

+unsigned

+ir_constant::get_uint_component(unsigned i) const

+{

+   switch (this->type->base_type) {

+   case GLSL_TYPE_UINT:  return this->value.u[i];

+   case GLSL_TYPE_INT:   return this->value.i[i];

+   case GLSL_TYPE_FLOAT: return (unsigned) this->value.f[i];

+   case GLSL_TYPE_BOOL:  return this->value.b[i] ? 1 : 0;

+   default:              assert(!"Should not get here."); break;

+   }

+

+   /* Must return something to make the compiler happy.  This is clearly an

+    * error case.

+    */

+   return 0;

+}

+

+ir_constant *

+ir_constant::get_array_element(unsigned i) const

+{

+   assert(this->type->is_array());

+

+   /* From page 35 (page 41 of the PDF) of the GLSL 1.20 spec:

+    *

+    *     "Behavior is undefined if a shader subscripts an array with an index

+    *     less than 0 or greater than or equal to the size the array was

+    *     declared with."

+    *

+    * Most out-of-bounds accesses are removed before things could get this far.

+    * There are cases where non-constant array index values can get constant

+    * folded.

+    */

+   if (int(i) < 0)

+      i = 0;

+   else if (i >= this->type->length)

+      i = this->type->length - 1;

+

+   return array_elements[i];

+}

+

+ir_constant *

+ir_constant::get_record_field(const char *name)

+{

+   int idx = this->type->field_index(name);

+

+   if (idx < 0)

+      return NULL;

+

+   if (this->components.is_empty())

+      return NULL;

+

+   exec_node *node = this->components.head;

+   for (int i = 0; i < idx; i++) {

+      node = node->next;

+

+      /* If the end of the list is encountered before the element matching the

+       * requested field is found, return NULL.

+       */

+      if (node->is_tail_sentinel())

+	 return NULL;

+   }

+

+   return (ir_constant *) node;

+}

+

+

+bool

+ir_constant::has_value(const ir_constant *c) const

+{

+   if (this->type != c->type)

+      return false;

+

+   if (this->type->is_array()) {

+      for (unsigned i = 0; i < this->type->length; i++) {

+	 if (!this->array_elements[i]->has_value(c->array_elements[i]))

+	    return false;

+      }

+      return true;

+   }

+

+   if (this->type->base_type == GLSL_TYPE_STRUCT) {

+      const exec_node *a_node = this->components.head;

+      const exec_node *b_node = c->components.head;

+

+      while (!a_node->is_tail_sentinel()) {

+	 assert(!b_node->is_tail_sentinel());

+

+	 const ir_constant *const a_field = (ir_constant *) a_node;

+	 const ir_constant *const b_field = (ir_constant *) b_node;

+

+	 if (!a_field->has_value(b_field))

+	    return false;

+

+	 a_node = a_node->next;

+	 b_node = b_node->next;

+      }

+

+      return true;

+   }

+

+   for (unsigned i = 0; i < this->type->components(); i++) {

+      switch (this->type->base_type) {

+      case GLSL_TYPE_UINT:

+	 if (this->value.u[i] != c->value.u[i])

+	    return false;

+	 break;

+      case GLSL_TYPE_INT:

+	 if (this->value.i[i] != c->value.i[i])

+	    return false;

+	 break;

+      case GLSL_TYPE_FLOAT:

+	 if (this->value.f[i] != c->value.f[i])

+	    return false;

+	 break;

+      case GLSL_TYPE_BOOL:

+	 if (this->value.b[i] != c->value.b[i])

+	    return false;

+	 break;

+      default:

+	 assert(!"Should not get here.");

+	 return false;

+      }

+   }

+

+   return true;

+}

+

+bool

+ir_constant::is_zero() const

+{

+   if (!this->type->is_scalar() && !this->type->is_vector())

+      return false;

+

+   for (unsigned c = 0; c < this->type->vector_elements; c++) {

+      switch (this->type->base_type) {

+      case GLSL_TYPE_FLOAT:

+	 if (this->value.f[c] != 0.0)

+	    return false;

+	 break;

+      case GLSL_TYPE_INT:

+	 if (this->value.i[c] != 0)

+	    return false;

+	 break;

+      case GLSL_TYPE_UINT:

+	 if (this->value.u[c] != 0)

+	    return false;

+	 break;

+      case GLSL_TYPE_BOOL:

+	 if (this->value.b[c] != false)

+	    return false;

+	 break;

+      default:

+	 /* The only other base types are structures, arrays, and samplers.

+	  * Samplers cannot be constants, and the others should have been

+	  * filtered out above.

+	  */

+	 assert(!"Should not get here.");

+	 return false;

+      }

+   }

+

+   return true;

+}

+

+bool

+ir_constant::is_one() const

+{

+   if (!this->type->is_scalar() && !this->type->is_vector())

+      return false;

+

+   for (unsigned c = 0; c < this->type->vector_elements; c++) {

+      switch (this->type->base_type) {

+      case GLSL_TYPE_FLOAT:

+	 if (this->value.f[c] != 1.0)

+	    return false;

+	 break;

+      case GLSL_TYPE_INT:

+	 if (this->value.i[c] != 1)

+	    return false;

+	 break;

+      case GLSL_TYPE_UINT:

+	 if (this->value.u[c] != 1)

+	    return false;

+	 break;

+      case GLSL_TYPE_BOOL:

+	 if (this->value.b[c] != true)

+	    return false;

+	 break;

+      default:

+	 /* The only other base types are structures, arrays, and samplers.

+	  * Samplers cannot be constants, and the others should have been

+	  * filtered out above.

+	  */

+	 assert(!"Should not get here.");

+	 return false;

+      }

+   }

+

+   return true;

+}

+

+bool

+ir_constant::is_negative_one() const

+{

+   if (!this->type->is_scalar() && !this->type->is_vector())

+      return false;

+

+   if (this->type->is_boolean())

+      return false;

+

+   for (unsigned c = 0; c < this->type->vector_elements; c++) {

+      switch (this->type->base_type) {

+      case GLSL_TYPE_FLOAT:

+	 if (this->value.f[c] != -1.0)

+	    return false;

+	 break;

+      case GLSL_TYPE_INT:

+	 if (this->value.i[c] != -1)

+	    return false;

+	 break;

+      case GLSL_TYPE_UINT:

+	 if (int(this->value.u[c]) != -1)

+	    return false;

+	 break;

+      default:

+	 /* The only other base types are structures, arrays, samplers, and

+	  * booleans.  Samplers cannot be constants, and the others should

+	  * have been filtered out above.

+	  */

+	 assert(!"Should not get here.");

+	 return false;

+      }

+   }

+

+   return true;

+}

+

+ir_loop::ir_loop()

+{

+   this->ir_type = ir_type_loop;

+   this->cmp = ir_unop_neg;

+   this->from = NULL;

+   this->to = NULL;

+   this->increment = NULL;

+   this->counter = NULL;

+}

+

+

+ir_dereference_variable::ir_dereference_variable(ir_variable *var)

+{

+   this->ir_type = ir_type_dereference_variable;

+   this->var = var;

+   this->type = (var != NULL) ? var->type : glsl_type::error_type;

+}

+

+

+ir_dereference_array::ir_dereference_array(ir_rvalue *value,

+					   ir_rvalue *array_index)

+{

+   this->ir_type = ir_type_dereference_array;

+   this->array_index = array_index;

+   this->set_array(value);

+}

+

+

+ir_dereference_array::ir_dereference_array(ir_variable *var,

+					   ir_rvalue *array_index)

+{

+   void *ctx = ralloc_parent(var);

+

+   this->ir_type = ir_type_dereference_array;

+   this->array_index = array_index;

+   this->set_array(new(ctx) ir_dereference_variable(var));

+}

+

+

+void

+ir_dereference_array::set_array(ir_rvalue *value)

+{

+   this->array = value;

+   this->type = glsl_type::error_type;

+

+   if (this->array != NULL) {

+      const glsl_type *const vt = this->array->type;

+

+      if (vt->is_array()) {

+	 type = vt->element_type();

+      } else if (vt->is_matrix()) {

+	 type = vt->column_type();

+      } else if (vt->is_vector()) {

+	 type = vt->get_base_type();

+      }

+   }

+}

+

+

+ir_dereference_record::ir_dereference_record(ir_rvalue *value,

+					     const char *field)

+{

+   this->ir_type = ir_type_dereference_record;

+   this->record = value;

+   this->field = ralloc_strdup(this, field);

+   this->type = (this->record != NULL)

+      ? this->record->type->field_type(field) : glsl_type::error_type;

+}

+

+

+ir_dereference_record::ir_dereference_record(ir_variable *var,

+					     const char *field)

+{

+   void *ctx = ralloc_parent(var);

+

+   this->ir_type = ir_type_dereference_record;

+   this->record = new(ctx) ir_dereference_variable(var);

+   this->field = ralloc_strdup(this, field);

+   this->type = (this->record != NULL)

+      ? this->record->type->field_type(field) : glsl_type::error_type;

+}

+

+bool type_contains_sampler(const glsl_type *type)

+{

+   if (type->is_array()) {

+      return type_contains_sampler(type->fields.array);

+   } else if (type->is_record()) {

+      for (unsigned int i = 0; i < type->length; i++) {

+	 if (type_contains_sampler(type->fields.structure[i].type))

+	    return true;

+      }

+      return false;

+   } else {

+      return type->is_sampler();

+   }

+}

+

+bool

+ir_dereference::is_lvalue()

+{

+   ir_variable *var = this->variable_referenced();

+

+   /* Every l-value derference chain eventually ends in a variable.

+    */

+   if ((var == NULL) || var->read_only)

+      return false;

+

+   if (this->type->is_array() && !var->array_lvalue)

+      return false;

+

+   /* From page 17 (page 23 of the PDF) of the GLSL 1.20 spec:

+    *

+    *    "Samplers cannot be treated as l-values; hence cannot be used

+    *     as out or inout function parameters, nor can they be

+    *     assigned into."

+    */

+   if (type_contains_sampler(this->type))

+      return false;

+

+   return true;

+}

+

+

+const char *tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf" };

+

+const char *ir_texture::opcode_string()

+{

+   assert((unsigned int) op <=

+	  sizeof(tex_opcode_strs) / sizeof(tex_opcode_strs[0]));

+   return tex_opcode_strs[op];

+}

+

+ir_texture_opcode

+ir_texture::get_opcode(const char *str)

+{

+   const int count = sizeof(tex_opcode_strs) / sizeof(tex_opcode_strs[0]);

+   for (int op = 0; op < count; op++) {

+      if (strcmp(str, tex_opcode_strs[op]) == 0)

+	 return (ir_texture_opcode) op;

+   }

+   return (ir_texture_opcode) -1;

+}

+

+

+void

+ir_texture::set_sampler(ir_dereference *sampler, const glsl_type *type)

+{

+   assert(sampler != NULL);

+   assert(type != NULL);

+   this->sampler = sampler;

+   this->type = type;

+

+   assert(sampler->type->sampler_type == (int) type->base_type);

+   if (sampler->type->sampler_shadow)

+      assert(type->vector_elements == 4 || type->vector_elements == 1);

+   else

+      assert(type->vector_elements == 4);

+}

+

+

+void

+ir_swizzle::init_mask(const unsigned *comp, unsigned count)

+{

+   assert((count >= 1) && (count <= 4));

+

+   memset(&this->mask, 0, sizeof(this->mask));

+   this->mask.num_components = count;

+

+   unsigned dup_mask = 0;

+   switch (count) {

+   case 4:

+      assert(comp[3] <= 3);

+      dup_mask |= (1U << comp[3])

+	 & ((1U << comp[0]) | (1U << comp[1]) | (1U << comp[2]));

+      this->mask.w = comp[3];

+

+   case 3:

+      assert(comp[2] <= 3);

+      dup_mask |= (1U << comp[2])

+	 & ((1U << comp[0]) | (1U << comp[1]));

+      this->mask.z = comp[2];

+

+   case 2:

+      assert(comp[1] <= 3);

+      dup_mask |= (1U << comp[1])

+	 & ((1U << comp[0]));

+      this->mask.y = comp[1];

+

+   case 1:

+      assert(comp[0] <= 3);

+      this->mask.x = comp[0];

+   }

+

+   this->mask.has_duplicates = dup_mask != 0;

+

+   /* Based on the number of elements in the swizzle and the base type

+    * (i.e., float, int, unsigned, or bool) of the vector being swizzled,

+    * generate the type of the resulting value.

+    */

+   type = glsl_type::get_instance(val->type->base_type, mask.num_components, 1);

+}

+

+ir_swizzle::ir_swizzle(ir_rvalue *val, unsigned x, unsigned y, unsigned z,

+		       unsigned w, unsigned count)

+   : val(val)

+{

+   const unsigned components[4] = { x, y, z, w };

+   this->ir_type = ir_type_swizzle;

+   this->init_mask(components, count);

+}

+

+ir_swizzle::ir_swizzle(ir_rvalue *val, const unsigned *comp,

+		       unsigned count)

+   : val(val)

+{

+   this->ir_type = ir_type_swizzle;

+   this->init_mask(comp, count);

+}

+

+ir_swizzle::ir_swizzle(ir_rvalue *val, ir_swizzle_mask mask)

+{

+   this->ir_type = ir_type_swizzle;

+   this->val = val;

+   this->mask = mask;

+   this->type = glsl_type::get_instance(val->type->base_type,

+					mask.num_components, 1);

+}

+

+#define X 1

+#define R 5

+#define S 9

+#define I 13

+

+ir_swizzle *

+ir_swizzle::create(ir_rvalue *val, const char *str, unsigned vector_length)

+{

+   void *ctx = ralloc_parent(val);

+

+   /* For each possible swizzle character, this table encodes the value in

+    * \c idx_map that represents the 0th element of the vector.  For invalid

+    * swizzle characters (e.g., 'k'), a special value is used that will allow

+    * detection of errors.

+    */

+   static const unsigned char base_idx[26] = {

+   /* a  b  c  d  e  f  g  h  i  j  k  l  m */

+      R, R, I, I, I, I, R, I, I, I, I, I, I,

+   /* n  o  p  q  r  s  t  u  v  w  x  y  z */

+      I, I, S, S, R, S, S, I, I, X, X, X, X

+   };

+

+   /* Each valid swizzle character has an entry in the previous table.  This

+    * table encodes the base index encoded in the previous table plus the actual

+    * index of the swizzle character.  When processing swizzles, the first

+    * character in the string is indexed in the previous table.  Each character

+    * in the string is indexed in this table, and the value found there has the

+    * value form the first table subtracted.  The result must be on the range

+    * [0,3].

+    *

+    * For example, the string "wzyx" will get X from the first table.  Each of

+    * the charcaters will get X+3, X+2, X+1, and X+0 from this table.  After

+    * subtraction, the swizzle values are { 3, 2, 1, 0 }.

+    *

+    * The string "wzrg" will get X from the first table.  Each of the characters

+    * will get X+3, X+2, R+0, and R+1 from this table.  After subtraction, the

+    * swizzle values are { 3, 2, 4, 5 }.  Since 4 and 5 are outside the range

+    * [0,3], the error is detected.

+    */

+   static const unsigned char idx_map[26] = {

+   /* a    b    c    d    e    f    g    h    i    j    k    l    m */

+      R+3, R+2, 0,   0,   0,   0,   R+1, 0,   0,   0,   0,   0,   0,

+   /* n    o    p    q    r    s    t    u    v    w    x    y    z */

+      0,   0,   S+2, S+3, R+0, S+0, S+1, 0,   0,   X+3, X+0, X+1, X+2

+   };

+

+   int swiz_idx[4] = { 0, 0, 0, 0 };

+   unsigned i;

+

+

+   /* Validate the first character in the swizzle string and look up the base

+    * index value as described above.

+    */

+   if ((str[0] < 'a') || (str[0] > 'z'))

+      return NULL;

+

+   const unsigned base = base_idx[str[0] - 'a'];

+

+

+   for (i = 0; (i < 4) && (str[i] != '\0'); i++) {

+      /* Validate the next character, and, as described above, convert it to a

+       * swizzle index.

+       */

+      if ((str[i] < 'a') || (str[i] > 'z'))

+	 return NULL;

+

+      swiz_idx[i] = idx_map[str[i] - 'a'] - base;

+      if ((swiz_idx[i] < 0) || (swiz_idx[i] >= (int) vector_length))

+	 return NULL;

+   }

+

+   if (str[i] != '\0')

+	 return NULL;

+

+   return new(ctx) ir_swizzle(val, swiz_idx[0], swiz_idx[1], swiz_idx[2],

+			      swiz_idx[3], i);

+}

+

+#undef X

+#undef R

+#undef S

+#undef I

+

+ir_variable *

+ir_swizzle::variable_referenced()

+{

+   return this->val->variable_referenced();

+}

+

+

+ir_variable::ir_variable(const struct glsl_type *type, const char *name,

+			 ir_variable_mode mode)

+   : max_array_access(0), read_only(false), centroid(false), invariant(false),

+     mode(mode), interpolation(ir_var_smooth), array_lvalue(false)

+{

+   this->ir_type = ir_type_variable;

+   this->type = type;

+   this->name = ralloc_strdup(this, name);

+   this->explicit_location = false;

+   this->location = -1;

+   this->warn_extension = NULL;

+   this->constant_value = NULL;

+   this->origin_upper_left = false;

+   this->pixel_center_integer = false;

+   this->depth_layout = ir_depth_layout_none;

+   this->used = false;

+

+   if (type && type->base_type == GLSL_TYPE_SAMPLER)

+      this->read_only = true;

+}

+

+

+const char *

+ir_variable::interpolation_string() const

+{

+   switch (this->interpolation) {

+   case ir_var_smooth:        return "smooth";

+   case ir_var_flat:          return "flat";

+   case ir_var_noperspective: return "noperspective";

+   }

+

+   assert(!"Should not get here.");

+   return "";

+}

+

+

+unsigned

+ir_variable::component_slots() const

+{

+   /* FINISHME: Sparsely accessed arrays require fewer slots. */

+   return this->type->component_slots();

+}

+

+

+ir_function_signature::ir_function_signature(const glsl_type *return_type)

+   : return_type(return_type), is_defined(false), _function(NULL)

+{

+   this->ir_type = ir_type_function_signature;

+   this->is_builtin = false;

+}

+

+

+static bool

+modes_match(unsigned a, unsigned b)

+{

+   if (a == b)

+      return true;

+

+   /* Accept "in" vs. "const in" */

+   if ((a == ir_var_const_in && b == ir_var_in) ||

+       (b == ir_var_const_in && a == ir_var_in))

+      return true;

+

+   return false;

+}

+

+

+const char *

+ir_function_signature::qualifiers_match(exec_list *params)

+{

+   exec_list_iterator iter_a = parameters.iterator();

+   exec_list_iterator iter_b = params->iterator();

+

+   /* check that the qualifiers match. */

+   while (iter_a.has_next()) {

+      ir_variable *a = (ir_variable *)iter_a.get();

+      ir_variable *b = (ir_variable *)iter_b.get();

+

+      if (a->read_only != b->read_only ||

+	  !modes_match(a->mode, b->mode) ||

+	  a->interpolation != b->interpolation ||

+	  a->centroid != b->centroid) {

+

+	 /* parameter a's qualifiers don't match */

+	 return a->name;

+      }

+

+      iter_a.next();

+      iter_b.next();

+   }

+   return NULL;

+}

+

+

+void

+ir_function_signature::replace_parameters(exec_list *new_params)

+{

+   /* Destroy all of the previous parameter information.  If the previous

+    * parameter information comes from the function prototype, it may either

+    * specify incorrect parameter names or not have names at all.

+    */

+   foreach_iter(exec_list_iterator, iter, parameters) {

+      assert(((ir_instruction *) iter.get())->as_variable() != NULL);

+

+      iter.remove();

+   }

+

+   new_params->move_nodes_to(&parameters);

+}

+

+

+ir_function::ir_function(const char *name)

+{

+   this->ir_type = ir_type_function;

+   this->name = ralloc_strdup(this, name);

+}

+

+

+bool

+ir_function::has_user_signature()

+{

+   foreach_list(n, &this->signatures) {

+      ir_function_signature *const sig = (ir_function_signature *) n;

+      if (!sig->is_builtin)

+	 return true;

+   }

+   return false;

+}

+

+

+ir_call *

+ir_call::get_error_instruction(void *ctx)

+{

+   ir_call *call = new(ctx) ir_call;

+

+   call->type = glsl_type::error_type;

+   return call;

+}

+

+void

+ir_call::set_callee(ir_function_signature *sig)

+{

+   assert((this->type == NULL) || (this->type == sig->return_type));

+

+   this->callee = sig;

+}

+

+void

+visit_exec_list(exec_list *list, ir_visitor *visitor)

+{

+   foreach_iter(exec_list_iterator, iter, *list) {

+      ((ir_instruction *)iter.get())->accept(visitor);

+   }

+}

+

+

+static void

+steal_memory(ir_instruction *ir, void *new_ctx)

+{

+   ir_variable *var = ir->as_variable();

+   ir_constant *constant = ir->as_constant();

+   if (var != NULL && var->constant_value != NULL)

+      steal_memory(var->constant_value, ir);

+

+   /* The components of aggregate constants are not visited by the normal

+    * visitor, so steal their values by hand.

+    */

+   if (constant != NULL) {

+      if (constant->type->is_record()) {

+	 foreach_iter(exec_list_iterator, iter, constant->components) {

+	    ir_constant *field = (ir_constant *)iter.get();

+	    steal_memory(field, ir);

+	 }

+      } else if (constant->type->is_array()) {

+	 for (unsigned int i = 0; i < constant->type->length; i++) {

+	    steal_memory(constant->array_elements[i], ir);

+	 }

+      }

+   }

+

+   ralloc_steal(new_ctx, ir);

+}

+

+

+void

+reparent_ir(exec_list *list, void *mem_ctx)

+{

+   foreach_list(node, list) {

+      visit_tree((ir_instruction *) node, steal_memory, mem_ctx);

+   }

+}

+

+

+static ir_rvalue *

+try_min_one(ir_rvalue *ir)

+{

+   ir_expression *expr = ir->as_expression();

+

+   if (!expr || expr->operation != ir_binop_min)

+      return NULL;

+

+   if (expr->operands[0]->is_one())

+      return expr->operands[1];

+

+   if (expr->operands[1]->is_one())

+      return expr->operands[0];

+

+   return NULL;

+}

+

+static ir_rvalue *

+try_max_zero(ir_rvalue *ir)

+{

+   ir_expression *expr = ir->as_expression();

+

+   if (!expr || expr->operation != ir_binop_max)

+      return NULL;

+

+   if (expr->operands[0]->is_zero())

+      return expr->operands[1];

+

+   if (expr->operands[1]->is_zero())

+      return expr->operands[0];

+

+   return NULL;

+}

+

+ir_rvalue *

+ir_rvalue::as_rvalue_to_saturate()

+{

+   ir_expression *expr = this->as_expression();

+

+   if (!expr)

+      return NULL;

+

+   ir_rvalue *max_zero = try_max_zero(expr);

+   if (max_zero) {

+      return try_min_one(max_zero);

+   } else {

+      ir_rvalue *min_one = try_min_one(expr);

+      if (min_one) {

+	 return try_max_zero(min_one);

+      }

+   }

+

+   return NULL;

+}

diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h
index a41984310..6292bec1b 100644
--- a/mesalib/src/glsl/ir.h
+++ b/mesalib/src/glsl/ir.h
@@ -1,1666 +1,1666 @@
-/* -*- c++ -*- */
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#pragma once
-#ifndef IR_H
-#define IR_H
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "ralloc.h"
-#include "glsl_types.h"
-#include "list.h"
-#include "ir_visitor.h"
-#include "ir_hierarchical_visitor.h"
-
-/**
- * \defgroup IR Intermediate representation nodes
- *
- * @{
- */
-
-/**
- * Class tags
- *
- * Each concrete class derived from \c ir_instruction has a value in this
- * enumerant.  The value for the type is stored in \c ir_instruction::ir_type
- * by the constructor.  While using type tags is not very C++, it is extremely
- * convenient.  For example, during debugging you can simply inspect
- * \c ir_instruction::ir_type to find out the actual type of the object.
- *
- * In addition, it is possible to use a switch-statement based on \c
- * \c ir_instruction::ir_type to select different behavior for different object
- * types.  For functions that have only slight differences for several object
- * types, this allows writing very straightforward, readable code.
- */
-enum ir_node_type {
-   /**
-    * Zero is unused so that the IR validator can detect cases where
-    * \c ir_instruction::ir_type has not been initialized.
-    */
-   ir_type_unset,
-   ir_type_variable,
-   ir_type_assignment,
-   ir_type_call,
-   ir_type_constant,
-   ir_type_dereference_array,
-   ir_type_dereference_record,
-   ir_type_dereference_variable,
-   ir_type_discard,
-   ir_type_expression,
-   ir_type_function,
-   ir_type_function_signature,
-   ir_type_if,
-   ir_type_loop,
-   ir_type_loop_jump,
-   ir_type_return,
-   ir_type_swizzle,
-   ir_type_texture,
-   ir_type_max /**< maximum ir_type enum number, for validation */
-};
-
-/**
- * Base class of all IR instructions
- */
-class ir_instruction : public exec_node {
-public:
-   enum ir_node_type ir_type;
-   const struct glsl_type *type;
-
-   /** ir_print_visitor helper for debugging. */
-   void print(void) const;
-
-   virtual void accept(ir_visitor *) = 0;
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *) = 0;
-   virtual ir_instruction *clone(void *mem_ctx,
-				 struct hash_table *ht) const = 0;
-
-   /**
-    * \name IR instruction downcast functions
-    *
-    * These functions either cast the object to a derived class or return
-    * \c NULL if the object's type does not match the specified derived class.
-    * Additional downcast functions will be added as needed.
-    */
-   /*@{*/
-   virtual class ir_variable *          as_variable()         { return NULL; }
-   virtual class ir_function *          as_function()         { return NULL; }
-   virtual class ir_dereference *       as_dereference()      { return NULL; }
-   virtual class ir_dereference_array *	as_dereference_array() { return NULL; }
-   virtual class ir_dereference_variable *as_dereference_variable() { return NULL; }
-   virtual class ir_expression *        as_expression()       { return NULL; }
-   virtual class ir_rvalue *            as_rvalue()           { return NULL; }
-   virtual class ir_loop *              as_loop()             { return NULL; }
-   virtual class ir_assignment *        as_assignment()       { return NULL; }
-   virtual class ir_call *              as_call()             { return NULL; }
-   virtual class ir_return *            as_return()           { return NULL; }
-   virtual class ir_if *                as_if()               { return NULL; }
-   virtual class ir_swizzle *           as_swizzle()          { return NULL; }
-   virtual class ir_constant *          as_constant()         { return NULL; }
-   virtual class ir_discard *           as_discard()          { return NULL; }
-   /*@}*/
-
-protected:
-   ir_instruction()
-   {
-      ir_type = ir_type_unset;
-      type = NULL;
-   }
-};
-
-
-class ir_rvalue : public ir_instruction {
-public:
-   virtual ir_rvalue *clone(void *mem_ctx, struct hash_table *) const = 0;
-
-   virtual ir_constant *constant_expression_value() = 0;
-
-   virtual ir_rvalue * as_rvalue()
-   {
-      return this;
-   }
-
-   ir_rvalue *as_rvalue_to_saturate();
-
-   virtual bool is_lvalue()
-   {
-      return false;
-   }
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced()
-   {
-      return NULL;
-   }
-
-
-   /**
-    * If an r-value is a reference to a whole variable, get that variable
-    *
-    * \return
-    * Pointer to a variable that is completely dereferenced by the r-value.  If
-    * the r-value is not a dereference or the dereference does not access the
-    * entire variable (i.e., it's just one array element, struct field), \c NULL
-    * is returned.
-    */
-   virtual ir_variable *whole_variable_referenced()
-   {
-      return NULL;
-   }
-
-   /**
-    * Determine if an r-value has the value zero
-    *
-    * The base implementation of this function always returns \c false.  The
-    * \c ir_constant class over-rides this function to return \c true \b only
-    * for vector and scalar types that have all elements set to the value
-    * zero (or \c false for booleans).
-    *
-    * \sa ir_constant::has_value, ir_rvalue::is_one, ir_rvalue::is_negative_one
-    */
-   virtual bool is_zero() const;
-
-   /**
-    * Determine if an r-value has the value one
-    *
-    * The base implementation of this function always returns \c false.  The
-    * \c ir_constant class over-rides this function to return \c true \b only
-    * for vector and scalar types that have all elements set to the value
-    * one (or \c true for booleans).
-    *
-    * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_negative_one
-    */
-   virtual bool is_one() const;
-
-   /**
-    * Determine if an r-value has the value negative one
-    *
-    * The base implementation of this function always returns \c false.  The
-    * \c ir_constant class over-rides this function to return \c true \b only
-    * for vector and scalar types that have all elements set to the value
-    * negative one.  For boolean times, the result is always \c false.
-    *
-    * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_one
-    */
-   virtual bool is_negative_one() const;
-
-protected:
-   ir_rvalue();
-};
-
-
-/**
- * Variable storage classes
- */
-enum ir_variable_mode {
-   ir_var_auto = 0,     /**< Function local variables and globals. */
-   ir_var_uniform,      /**< Variable declared as a uniform. */
-   ir_var_in,
-   ir_var_out,
-   ir_var_inout,
-   ir_var_const_in,	/**< "in" param that must be a constant expression */
-   ir_var_system_value, /**< Ex: front-face, instance-id, etc. */
-   ir_var_temporary	/**< Temporary variable generated during compilation. */
-};
-
-enum ir_variable_interpolation {
-   ir_var_smooth = 0,
-   ir_var_flat,
-   ir_var_noperspective
-};
-
-/**
- * \brief Layout qualifiers for gl_FragDepth.
- *
- * The AMD_conservative_depth extension allows gl_FragDepth to be redeclared
- * with a layout qualifier.
- */
-enum ir_depth_layout {
-    ir_depth_layout_none, /**< No depth layout is specified. */
-    ir_depth_layout_any,
-    ir_depth_layout_greater,
-    ir_depth_layout_less,
-    ir_depth_layout_unchanged
-};
-
-/**
- * \brief Convert depth layout qualifier to string.
- */
-const char*
-depth_layout_string(ir_depth_layout layout);
-
-/**
- * Description of built-in state associated with a uniform
- *
- * \sa ir_variable::state_slots
- */
-struct ir_state_slot {
-   int tokens[5];
-   int swizzle;
-};
-
-class ir_variable : public ir_instruction {
-public:
-   ir_variable(const struct glsl_type *, const char *, ir_variable_mode);
-
-   virtual ir_variable *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual ir_variable *as_variable()
-   {
-      return this;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-
-   /**
-    * Get the string value for the interpolation qualifier
-    *
-    * \return The string that would be used in a shader to specify \c
-    * mode will be returned.
-    *
-    * This function should only be used on a shader input or output variable.
-    */
-   const char *interpolation_string() const;
-
-   /**
-    * Calculate the number of slots required to hold this variable
-    *
-    * This is used to determine how many uniform or varying locations a variable
-    * occupies.  The count is in units of floating point components.
-    */
-   unsigned component_slots() const;
-
-   /**
-    * Delcared name of the variable
-    */
-   const char *name;
-
-   /**
-    * Highest element accessed with a constant expression array index
-    *
-    * Not used for non-array variables.
-    */
-   unsigned max_array_access;
-
-   /**
-    * Is the variable read-only?
-    *
-    * This is set for variables declared as \c const, shader inputs,
-    * and uniforms.
-    */
-   unsigned read_only:1;
-   unsigned centroid:1;
-   unsigned invariant:1;
-
-   /**
-    * Has this variable been used for reading or writing?
-    *
-    * Several GLSL semantic checks require knowledge of whether or not a
-    * variable has been used.  For example, it is an error to redeclare a
-    * variable as invariant after it has been used.
-    */
-   unsigned used:1;
-
-   /**
-    * Storage class of the variable.
-    *
-    * \sa ir_variable_mode
-    */
-   unsigned mode:3;
-
-   /**
-    * Interpolation mode for shader inputs / outputs
-    *
-    * \sa ir_variable_interpolation
-    */
-   unsigned interpolation:2;
-
-   /**
-    * Flag that the whole array is assignable
-    *
-    * In GLSL 1.20 and later whole arrays are assignable (and comparable for
-    * equality).  This flag enables this behavior.
-    */
-   unsigned array_lvalue:1;
-
-   /**
-    * \name ARB_fragment_coord_conventions
-    * @{
-    */
-   unsigned origin_upper_left:1;
-   unsigned pixel_center_integer:1;
-   /*@}*/
-
-   /**
-    * \brief Layout qualifier for gl_FragDepth.
-    *
-    * This is not equal to \c ir_depth_layout_none if and only if this
-    * variable is \c gl_FragDepth and a layout qualifier is specified.
-    */
-   ir_depth_layout depth_layout;
-
-   /**
-    * Was the location explicitly set in the shader?
-    *
-    * If the location is explicitly set in the shader, it \b cannot be changed
-    * by the linker or by the API (e.g., calls to \c glBindAttribLocation have
-    * no effect).
-    */
-   unsigned explicit_location:1;
-
-   /**
-    * Storage location of the base of this variable
-    *
-    * The precise meaning of this field depends on the nature of the variable.
-    *
-    *   - Vertex shader input: one of the values from \c gl_vert_attrib.
-    *   - Vertex shader output: one of the values from \c gl_vert_result.
-    *   - Fragment shader input: one of the values from \c gl_frag_attrib.
-    *   - Fragment shader output: one of the values from \c gl_frag_result.
-    *   - Uniforms: Per-stage uniform slot number.
-    *   - Other: This field is not currently used.
-    *
-    * If the variable is a uniform, shader input, or shader output, and the
-    * slot has not been assigned, the value will be -1.
-    */
-   int location;
-
-   /**
-    * Built-in state that backs this uniform
-    *
-    * Once set at variable creation, \c state_slots must remain invariant.
-    * This is because, ideally, this array would be shared by all clones of
-    * this variable in the IR tree.  In other words, we'd really like for it
-    * to be a fly-weight.
-    *
-    * If the variable is not a uniform, \c num_state_slots will be zero and
-    * \c state_slots will be \c NULL.
-    */
-   /*@{*/
-   unsigned num_state_slots;    /**< Number of state slots used */
-   ir_state_slot *state_slots;  /**< State descriptors. */
-   /*@}*/
-
-   /**
-    * Emit a warning if this variable is accessed.
-    */
-   const char *warn_extension;
-
-   /**
-    * Value assigned in the initializer of a variable declared "const"
-    */
-   ir_constant *constant_value;
-};
-
-
-/*@{*/
-/**
- * The representation of a function instance; may be the full definition or
- * simply a prototype.
- */
-class ir_function_signature : public ir_instruction {
-   /* An ir_function_signature will be part of the list of signatures in
-    * an ir_function.
-    */
-public:
-   ir_function_signature(const glsl_type *return_type);
-
-   virtual ir_function_signature *clone(void *mem_ctx,
-					struct hash_table *ht) const;
-   ir_function_signature *clone_prototype(void *mem_ctx,
-					  struct hash_table *ht) const;
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   /**
-    * Get the name of the function for which this is a signature
-    */
-   const char *function_name() const;
-
-   /**
-    * Get a handle to the function for which this is a signature
-    *
-    * There is no setter function, this function returns a \c const pointer,
-    * and \c ir_function_signature::_function is private for a reason.  The
-    * only way to make a connection between a function and function signature
-    * is via \c ir_function::add_signature.  This helps ensure that certain
-    * invariants (i.e., a function signature is in the list of signatures for
-    * its \c _function) are met.
-    *
-    * \sa ir_function::add_signature
-    */
-   inline const class ir_function *function() const
-   {
-      return this->_function;
-   }
-
-   /**
-    * Check whether the qualifiers match between this signature's parameters
-    * and the supplied parameter list.  If not, returns the name of the first
-    * parameter with mismatched qualifiers (for use in error messages).
-    */
-   const char *qualifiers_match(exec_list *params);
-
-   /**
-    * Replace the current parameter list with the given one.  This is useful
-    * if the current information came from a prototype, and either has invalid
-    * or missing parameter names.
-    */
-   void replace_parameters(exec_list *new_params);
-
-   /**
-    * Function return type.
-    *
-    * \note This discards the optional precision qualifier.
-    */
-   const struct glsl_type *return_type;
-
-   /**
-    * List of ir_variable of function parameters.
-    *
-    * This represents the storage.  The paramaters passed in a particular
-    * call will be in ir_call::actual_paramaters.
-    */
-   struct exec_list parameters;
-
-   /** Whether or not this function has a body (which may be empty). */
-   unsigned is_defined:1;
-
-   /** Whether or not this function signature is a built-in. */
-   unsigned is_builtin:1;
-
-   /** Body of instructions in the function. */
-   struct exec_list body;
-
-private:
-   /** Function of which this signature is one overload. */
-   class ir_function *_function;
-
-   friend class ir_function;
-};
-
-
-/**
- * Header for tracking multiple overloaded functions with the same name.
- * Contains a list of ir_function_signatures representing each of the
- * actual functions.
- */
-class ir_function : public ir_instruction {
-public:
-   ir_function(const char *name);
-
-   virtual ir_function *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual ir_function *as_function()
-   {
-      return this;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   void add_signature(ir_function_signature *sig)
-   {
-      sig->_function = this;
-      this->signatures.push_tail(sig);
-   }
-
-   /**
-    * Get an iterator for the set of function signatures
-    */
-   exec_list_iterator iterator()
-   {
-      return signatures.iterator();
-   }
-
-   /**
-    * Find a signature that matches a set of actual parameters, taking implicit
-    * conversions into account.
-    */
-   ir_function_signature *matching_signature(const exec_list *actual_param);
-
-   /**
-    * Find a signature that exactly matches a set of actual parameters without
-    * any implicit type conversions.
-    */
-   ir_function_signature *exact_matching_signature(const exec_list *actual_ps);
-
-   /**
-    * Name of the function.
-    */
-   const char *name;
-
-   /** Whether or not this function has a signature that isn't a built-in. */
-   bool has_user_signature();
-
-   /**
-    * List of ir_function_signature for each overloaded function with this name.
-    */
-   struct exec_list signatures;
-};
-
-inline const char *ir_function_signature::function_name() const
-{
-   return this->_function->name;
-}
-/*@}*/
-
-
-/**
- * IR instruction representing high-level if-statements
- */
-class ir_if : public ir_instruction {
-public:
-   ir_if(ir_rvalue *condition)
-      : condition(condition)
-   {
-      ir_type = ir_type_if;
-   }
-
-   virtual ir_if *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual ir_if *as_if()
-   {
-      return this;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   ir_rvalue *condition;
-   /** List of ir_instruction for the body of the then branch */
-   exec_list  then_instructions;
-   /** List of ir_instruction for the body of the else branch */
-   exec_list  else_instructions;
-};
-
-
-/**
- * IR instruction representing a high-level loop structure.
- */
-class ir_loop : public ir_instruction {
-public:
-   ir_loop();
-
-   virtual ir_loop *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   virtual ir_loop *as_loop()
-   {
-      return this;
-   }
-
-   /**
-    * Get an iterator for the instructions of the loop body
-    */
-   exec_list_iterator iterator()
-   {
-      return body_instructions.iterator();
-   }
-
-   /** List of ir_instruction that make up the body of the loop. */
-   exec_list body_instructions;
-
-   /**
-    * \name Loop counter and controls
-    *
-    * Represents a loop like a FORTRAN \c do-loop.
-    *
-    * \note
-    * If \c from and \c to are the same value, the loop will execute once.
-    */
-   /*@{*/
-   ir_rvalue *from;             /** Value of the loop counter on the first
-				 * iteration of the loop.
-				 */
-   ir_rvalue *to;               /** Value of the loop counter on the last
-				 * iteration of the loop.
-				 */
-   ir_rvalue *increment;
-   ir_variable *counter;
-
-   /**
-    * Comparison operation in the loop terminator.
-    *
-    * If any of the loop control fields are non-\c NULL, this field must be
-    * one of \c ir_binop_less, \c ir_binop_greater, \c ir_binop_lequal,
-    * \c ir_binop_gequal, \c ir_binop_equal, or \c ir_binop_nequal.
-    */
-   int cmp;
-   /*@}*/
-};
-
-
-class ir_assignment : public ir_instruction {
-public:
-   ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs, ir_rvalue *condition);
-
-   /**
-    * Construct an assignment with an explicit write mask
-    *
-    * \note
-    * Since a write mask is supplied, the LHS must already be a bare
-    * \c ir_dereference.  The cannot be any swizzles in the LHS.
-    */
-   ir_assignment(ir_dereference *lhs, ir_rvalue *rhs, ir_rvalue *condition,
-		 unsigned write_mask);
-
-   virtual ir_assignment *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   virtual ir_assignment * as_assignment()
-   {
-      return this;
-   }
-
-   /**
-    * Get a whole variable written by an assignment
-    *
-    * If the LHS of the assignment writes a whole variable, the variable is
-    * returned.  Otherwise \c NULL is returned.  Examples of whole-variable
-    * assignment are:
-    *
-    *  - Assigning to a scalar
-    *  - Assigning to all components of a vector
-    *  - Whole array (or matrix) assignment
-    *  - Whole structure assignment
-    */
-   ir_variable *whole_variable_written();
-
-   /**
-    * Set the LHS of an assignment
-    */
-   void set_lhs(ir_rvalue *lhs);
-
-   /**
-    * Left-hand side of the assignment.
-    *
-    * This should be treated as read only.  If you need to set the LHS of an
-    * assignment, use \c ir_assignment::set_lhs.
-    */
-   ir_dereference *lhs;
-
-   /**
-    * Value being assigned
-    */
-   ir_rvalue *rhs;
-
-   /**
-    * Optional condition for the assignment.
-    */
-   ir_rvalue *condition;
-
-
-   /**
-    * Component mask written
-    *
-    * For non-vector types in the LHS, this field will be zero.  For vector
-    * types, a bit will be set for each component that is written.  Note that
-    * for \c vec2 and \c vec3 types only the lower bits will ever be set.
-    *
-    * A partially-set write mask means that each enabled channel gets
-    * the value from a consecutive channel of the rhs.  For example,
-    * to write just .xyw of gl_FrontColor with color:
-    *
-    * (assign (constant bool (1)) (xyw)
-    *     (var_ref gl_FragColor)
-    *     (swiz xyw (var_ref color)))
-    */
-   unsigned write_mask:4;
-};
-
-/* Update ir_expression::num_operands() and operator_strs when
- * updating this list.
- */
-enum ir_expression_operation {
-   ir_unop_bit_not,
-   ir_unop_logic_not,
-   ir_unop_neg,
-   ir_unop_abs,
-   ir_unop_sign,
-   ir_unop_rcp,
-   ir_unop_rsq,
-   ir_unop_sqrt,
-   ir_unop_exp,      /**< Log base e on gentype */
-   ir_unop_log,	     /**< Natural log on gentype */
-   ir_unop_exp2,
-   ir_unop_log2,
-   ir_unop_f2i,      /**< Float-to-integer conversion. */
-   ir_unop_i2f,      /**< Integer-to-float conversion. */
-   ir_unop_f2b,      /**< Float-to-boolean conversion */
-   ir_unop_b2f,      /**< Boolean-to-float conversion */
-   ir_unop_i2b,      /**< int-to-boolean conversion */
-   ir_unop_b2i,      /**< Boolean-to-int conversion */
-   ir_unop_u2f,      /**< Unsigned-to-float conversion. */
-   ir_unop_any,
-
-   /**
-    * \name Unary floating-point rounding operations.
-    */
-   /*@{*/
-   ir_unop_trunc,
-   ir_unop_ceil,
-   ir_unop_floor,
-   ir_unop_fract,
-   ir_unop_round_even,
-   /*@}*/
-
-   /**
-    * \name Trigonometric operations.
-    */
-   /*@{*/
-   ir_unop_sin,
-   ir_unop_cos,
-   ir_unop_sin_reduced,    /**< Reduced range sin. [-pi, pi] */
-   ir_unop_cos_reduced,    /**< Reduced range cos. [-pi, pi] */
-   /*@}*/
-
-   /**
-    * \name Partial derivatives.
-    */
-   /*@{*/
-   ir_unop_dFdx,
-   ir_unop_dFdy,
-   /*@}*/
-
-   ir_unop_noise,
-
-   /**
-    * A sentinel marking the last of the unary operations.
-    */
-   ir_last_unop = ir_unop_noise,
-
-   ir_binop_add,
-   ir_binop_sub,
-   ir_binop_mul,
-   ir_binop_div,
-
-   /**
-    * Takes one of two combinations of arguments:
-    *
-    * - mod(vecN, vecN)
-    * - mod(vecN, float)
-    *
-    * Does not take integer types.
-    */
-   ir_binop_mod,
-
-   /**
-    * \name Binary comparison operators which return a boolean vector.
-    * The type of both operands must be equal.
-    */
-   /*@{*/
-   ir_binop_less,
-   ir_binop_greater,
-   ir_binop_lequal,
-   ir_binop_gequal,
-   ir_binop_equal,
-   ir_binop_nequal,
-   /**
-    * Returns single boolean for whether all components of operands[0]
-    * equal the components of operands[1].
-    */
-   ir_binop_all_equal,
-   /**
-    * Returns single boolean for whether any component of operands[0]
-    * is not equal to the corresponding component of operands[1].
-    */
-   ir_binop_any_nequal,
-   /*@}*/
-
-   /**
-    * \name Bit-wise binary operations.
-    */
-   /*@{*/
-   ir_binop_lshift,
-   ir_binop_rshift,
-   ir_binop_bit_and,
-   ir_binop_bit_xor,
-   ir_binop_bit_or,
-   /*@}*/
-
-   ir_binop_logic_and,
-   ir_binop_logic_xor,
-   ir_binop_logic_or,
-
-   ir_binop_dot,
-   ir_binop_min,
-   ir_binop_max,
-
-   ir_binop_pow,
-
-   /**
-    * A sentinel marking the last of the binary operations.
-    */
-   ir_last_binop = ir_binop_pow,
-
-   ir_quadop_vector,
-
-   /**
-    * A sentinel marking the last of all operations.
-    */
-   ir_last_opcode = ir_last_binop
-};
-
-class ir_expression : public ir_rvalue {
-public:
-   /**
-    * Constructor for unary operation expressions
-    */
-   ir_expression(int op, const struct glsl_type *type, ir_rvalue *);
-   ir_expression(int op, ir_rvalue *);
-
-   /**
-    * Constructor for binary operation expressions
-    */
-   ir_expression(int op, const struct glsl_type *type,
-		 ir_rvalue *, ir_rvalue *);
-   ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1);
-
-   /**
-    * Constructor for quad operator expressions
-    */
-   ir_expression(int op, const struct glsl_type *type,
-		 ir_rvalue *, ir_rvalue *, ir_rvalue *, ir_rvalue *);
-
-   virtual ir_expression *as_expression()
-   {
-      return this;
-   }
-
-   virtual ir_expression *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   /**
-    * Attempt to constant-fold the expression
-    *
-    * If the expression cannot be constant folded, this method will return
-    * \c NULL.
-    */
-   virtual ir_constant *constant_expression_value();
-
-   /**
-    * Determine the number of operands used by an expression
-    */
-   static unsigned int get_num_operands(ir_expression_operation);
-
-   /**
-    * Determine the number of operands used by an expression
-    */
-   unsigned int get_num_operands() const
-   {
-      return (this->operation == ir_quadop_vector)
-	 ? this->type->vector_elements : get_num_operands(operation);
-   }
-
-   /**
-    * Return a string representing this expression's operator.
-    */
-   const char *operator_string();
-
-   /**
-    * Return a string representing this expression's operator.
-    */
-   static const char *operator_string(ir_expression_operation);
-
-
-   /**
-    * Do a reverse-lookup to translate the given string into an operator.
-    */
-   static ir_expression_operation get_operator(const char *);
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   ir_expression_operation operation;
-   ir_rvalue *operands[4];
-};
-
-
-/**
- * IR instruction representing a function call
- */
-class ir_call : public ir_rvalue {
-public:
-   ir_call(ir_function_signature *callee, exec_list *actual_parameters)
-      : callee(callee)
-   {
-      ir_type = ir_type_call;
-      assert(callee->return_type != NULL);
-      type = callee->return_type;
-      actual_parameters->move_nodes_to(& this->actual_parameters);
-   }
-
-   virtual ir_call *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual ir_call *as_call()
-   {
-      return this;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   /**
-    * Get a generic ir_call object when an error occurs
-    *
-    * Any allocation will be performed with 'ctx' as ralloc owner.
-    */
-   static ir_call *get_error_instruction(void *ctx);
-
-   /**
-    * Get an iterator for the set of acutal parameters
-    */
-   exec_list_iterator iterator()
-   {
-      return actual_parameters.iterator();
-   }
-
-   /**
-    * Get the name of the function being called.
-    */
-   const char *callee_name() const
-   {
-      return callee->function_name();
-   }
-
-   /**
-    * Get the function signature bound to this function call
-    */
-   ir_function_signature *get_callee()
-   {
-      return callee;
-   }
-
-   /**
-    * Set the function call target
-    */
-   void set_callee(ir_function_signature *sig);
-
-   /**
-    * Generates an inline version of the function before @ir,
-    * returning the return value of the function.
-    */
-   ir_rvalue *generate_inline(ir_instruction *ir);
-
-   /* List of ir_rvalue of paramaters passed in this call. */
-   exec_list actual_parameters;
-
-private:
-   ir_call()
-      : callee(NULL)
-   {
-      this->ir_type = ir_type_call;
-   }
-
-   ir_function_signature *callee;
-};
-
-
-/**
- * \name Jump-like IR instructions.
- *
- * These include \c break, \c continue, \c return, and \c discard.
- */
-/*@{*/
-class ir_jump : public ir_instruction {
-protected:
-   ir_jump()
-   {
-      ir_type = ir_type_unset;
-   }
-};
-
-class ir_return : public ir_jump {
-public:
-   ir_return()
-      : value(NULL)
-   {
-      this->ir_type = ir_type_return;
-   }
-
-   ir_return(ir_rvalue *value)
-      : value(value)
-   {
-      this->ir_type = ir_type_return;
-   }
-
-   virtual ir_return *clone(void *mem_ctx, struct hash_table *) const;
-
-   virtual ir_return *as_return()
-   {
-      return this;
-   }
-
-   ir_rvalue *get_value() const
-   {
-      return value;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   ir_rvalue *value;
-};
-
-
-/**
- * Jump instructions used inside loops
- *
- * These include \c break and \c continue.  The \c break within a loop is
- * different from the \c break within a switch-statement.
- *
- * \sa ir_switch_jump
- */
-class ir_loop_jump : public ir_jump {
-public:
-   enum jump_mode {
-      jump_break,
-      jump_continue
-   };
-
-   ir_loop_jump(jump_mode mode)
-   {
-      this->ir_type = ir_type_loop_jump;
-      this->mode = mode;
-      this->loop = loop;
-   }
-
-   virtual ir_loop_jump *clone(void *mem_ctx, struct hash_table *) const;
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   bool is_break() const
-   {
-      return mode == jump_break;
-   }
-
-   bool is_continue() const
-   {
-      return mode == jump_continue;
-   }
-
-   /** Mode selector for the jump instruction. */
-   enum jump_mode mode;
-private:
-   /** Loop containing this break instruction. */
-   ir_loop *loop;
-};
-
-/**
- * IR instruction representing discard statements.
- */
-class ir_discard : public ir_jump {
-public:
-   ir_discard()
-   {
-      this->ir_type = ir_type_discard;
-      this->condition = NULL;
-   }
-
-   ir_discard(ir_rvalue *cond)
-   {
-      this->ir_type = ir_type_discard;
-      this->condition = cond;
-   }
-
-   virtual ir_discard *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   virtual ir_discard *as_discard()
-   {
-      return this;
-   }
-
-   ir_rvalue *condition;
-};
-/*@}*/
-
-
-/**
- * Texture sampling opcodes used in ir_texture
- */
-enum ir_texture_opcode {
-   ir_tex,		/**< Regular texture look-up */
-   ir_txb,		/**< Texture look-up with LOD bias */
-   ir_txl,		/**< Texture look-up with explicit LOD */
-   ir_txd,		/**< Texture look-up with partial derivatvies */
-   ir_txf		/**< Texel fetch with explicit LOD */
-};
-
-
-/**
- * IR instruction to sample a texture
- *
- * The specific form of the IR instruction depends on the \c mode value
- * selected from \c ir_texture_opcodes.  In the printed IR, these will
- * appear as:
- *
- *                                    Texel offset (0 or an expression)
- *                                    | Projection divisor
- *                                    | |  Shadow comparitor
- *                                    | |  |
- *                                    v v  v
- * (tex <type> <sampler> <coordinate> 0 1 ( ))
- * (txb <type> <sampler> <coordinate> 0 1 ( ) <bias>)
- * (txl <type> <sampler> <coordinate> 0 1 ( ) <lod>)
- * (txd <type> <sampler> <coordinate> 0 1 ( ) (dPdx dPdy))
- * (txf <type> <sampler> <coordinate> 0       <lod>)
- */
-class ir_texture : public ir_rvalue {
-public:
-   ir_texture(enum ir_texture_opcode op)
-      : op(op), projector(NULL), shadow_comparitor(NULL), offset(NULL)
-   {
-      this->ir_type = ir_type_texture;
-   }
-
-   virtual ir_texture *clone(void *mem_ctx, struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   /**
-    * Return a string representing the ir_texture_opcode.
-    */
-   const char *opcode_string();
-
-   /** Set the sampler and type. */
-   void set_sampler(ir_dereference *sampler, const glsl_type *type);
-
-   /**
-    * Do a reverse-lookup to translate a string into an ir_texture_opcode.
-    */
-   static ir_texture_opcode get_opcode(const char *);
-
-   enum ir_texture_opcode op;
-
-   /** Sampler to use for the texture access. */
-   ir_dereference *sampler;
-
-   /** Texture coordinate to sample */
-   ir_rvalue *coordinate;
-
-   /**
-    * Value used for projective divide.
-    *
-    * If there is no projective divide (the common case), this will be
-    * \c NULL.  Optimization passes should check for this to point to a constant
-    * of 1.0 and replace that with \c NULL.
-    */
-   ir_rvalue *projector;
-
-   /**
-    * Coordinate used for comparison on shadow look-ups.
-    *
-    * If there is no shadow comparison, this will be \c NULL.  For the
-    * \c ir_txf opcode, this *must* be \c NULL.
-    */
-   ir_rvalue *shadow_comparitor;
-
-   /** Texel offset. */
-   ir_rvalue *offset;
-
-   union {
-      ir_rvalue *lod;		/**< Floating point LOD */
-      ir_rvalue *bias;		/**< Floating point LOD bias */
-      struct {
-	 ir_rvalue *dPdx;	/**< Partial derivative of coordinate wrt X */
-	 ir_rvalue *dPdy;	/**< Partial derivative of coordinate wrt Y */
-      } grad;
-   } lod_info;
-};
-
-
-struct ir_swizzle_mask {
-   unsigned x:2;
-   unsigned y:2;
-   unsigned z:2;
-   unsigned w:2;
-
-   /**
-    * Number of components in the swizzle.
-    */
-   unsigned num_components:3;
-
-   /**
-    * Does the swizzle contain duplicate components?
-    *
-    * L-value swizzles cannot contain duplicate components.
-    */
-   unsigned has_duplicates:1;
-};
-
-
-class ir_swizzle : public ir_rvalue {
-public:
-   ir_swizzle(ir_rvalue *, unsigned x, unsigned y, unsigned z, unsigned w,
-              unsigned count);
-
-   ir_swizzle(ir_rvalue *val, const unsigned *components, unsigned count);
-
-   ir_swizzle(ir_rvalue *val, ir_swizzle_mask mask);
-
-   virtual ir_swizzle *clone(void *mem_ctx, struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual ir_swizzle *as_swizzle()
-   {
-      return this;
-   }
-
-   /**
-    * Construct an ir_swizzle from the textual representation.  Can fail.
-    */
-   static ir_swizzle *create(ir_rvalue *, const char *, unsigned vector_length);
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   bool is_lvalue()
-   {
-      return val->is_lvalue() && !mask.has_duplicates;
-   }
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced();
-
-   ir_rvalue *val;
-   ir_swizzle_mask mask;
-
-private:
-   /**
-    * Initialize the mask component of a swizzle
-    *
-    * This is used by the \c ir_swizzle constructors.
-    */
-   void init_mask(const unsigned *components, unsigned count);
-};
-
-
-class ir_dereference : public ir_rvalue {
-public:
-   virtual ir_dereference *clone(void *mem_ctx, struct hash_table *) const = 0;
-
-   virtual ir_dereference *as_dereference()
-   {
-      return this;
-   }
-
-   bool is_lvalue();
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced() = 0;
-};
-
-
-class ir_dereference_variable : public ir_dereference {
-public:
-   ir_dereference_variable(ir_variable *var);
-
-   virtual ir_dereference_variable *clone(void *mem_ctx,
-					  struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual ir_dereference_variable *as_dereference_variable()
-   {
-      return this;
-   }
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced()
-   {
-      return this->var;
-   }
-
-   virtual ir_variable *whole_variable_referenced()
-   {
-      /* ir_dereference_variable objects always dereference the entire
-       * variable.  However, if this dereference is dereferenced by anything
-       * else, the complete deferefernce chain is not a whole-variable
-       * dereference.  This method should only be called on the top most
-       * ir_rvalue in a dereference chain.
-       */
-      return this->var;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   /**
-    * Object being dereferenced.
-    */
-   ir_variable *var;
-};
-
-
-class ir_dereference_array : public ir_dereference {
-public:
-   ir_dereference_array(ir_rvalue *value, ir_rvalue *array_index);
-
-   ir_dereference_array(ir_variable *var, ir_rvalue *array_index);
-
-   virtual ir_dereference_array *clone(void *mem_ctx,
-				       struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual ir_dereference_array *as_dereference_array()
-   {
-      return this;
-   }
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced()
-   {
-      return this->array->variable_referenced();
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   ir_rvalue *array;
-   ir_rvalue *array_index;
-
-private:
-   void set_array(ir_rvalue *value);
-};
-
-
-class ir_dereference_record : public ir_dereference {
-public:
-   ir_dereference_record(ir_rvalue *value, const char *field);
-
-   ir_dereference_record(ir_variable *var, const char *field);
-
-   virtual ir_dereference_record *clone(void *mem_ctx,
-					struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced()
-   {
-      return this->record->variable_referenced();
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   ir_rvalue *record;
-   const char *field;
-};
-
-
-/**
- * Data stored in an ir_constant
- */
-union ir_constant_data {
-      unsigned u[16];
-      int i[16];
-      float f[16];
-      bool b[16];
-};
-
-
-class ir_constant : public ir_rvalue {
-public:
-   ir_constant(const struct glsl_type *type, const ir_constant_data *data);
-   ir_constant(bool b);
-   ir_constant(unsigned int u);
-   ir_constant(int i);
-   ir_constant(float f);
-
-   /**
-    * Construct an ir_constant from a list of ir_constant values
-    */
-   ir_constant(const struct glsl_type *type, exec_list *values);
-
-   /**
-    * Construct an ir_constant from a scalar component of another ir_constant
-    *
-    * The new \c ir_constant inherits the type of the component from the
-    * source constant.
-    *
-    * \note
-    * In the case of a matrix constant, the new constant is a scalar, \b not
-    * a vector.
-    */
-   ir_constant(const ir_constant *c, unsigned i);
-
-   /**
-    * Return a new ir_constant of the specified type containing all zeros.
-    */
-   static ir_constant *zero(void *mem_ctx, const glsl_type *type);
-
-   virtual ir_constant *clone(void *mem_ctx, struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual ir_constant *as_constant()
-   {
-      return this;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   /**
-    * Get a particular component of a constant as a specific type
-    *
-    * This is useful, for example, to get a value from an integer constant
-    * as a float or bool.  This appears frequently when constructors are
-    * called with all constant parameters.
-    */
-   /*@{*/
-   bool get_bool_component(unsigned i) const;
-   float get_float_component(unsigned i) const;
-   int get_int_component(unsigned i) const;
-   unsigned get_uint_component(unsigned i) const;
-   /*@}*/
-
-   ir_constant *get_array_element(unsigned i) const;
-
-   ir_constant *get_record_field(const char *name);
-
-   /**
-    * Determine whether a constant has the same value as another constant
-    *
-    * \sa ir_constant::is_zero, ir_constant::is_one,
-    * ir_constant::is_negative_one
-    */
-   bool has_value(const ir_constant *) const;
-
-   virtual bool is_zero() const;
-   virtual bool is_one() const;
-   virtual bool is_negative_one() const;
-
-   /**
-    * Value of the constant.
-    *
-    * The field used to back the values supplied by the constant is determined
-    * by the type associated with the \c ir_instruction.  Constants may be
-    * scalars, vectors, or matrices.
-    */
-   union ir_constant_data value;
-
-   /* Array elements */
-   ir_constant **array_elements;
-
-   /* Structure fields */
-   exec_list components;
-
-private:
-   /**
-    * Parameterless constructor only used by the clone method
-    */
-   ir_constant(void);
-};
-
-/*@}*/
-
-/**
- * Apply a visitor to each IR node in a list
- */
-void
-visit_exec_list(exec_list *list, ir_visitor *visitor);
-
-/**
- * Validate invariants on each IR node in a list
- */
-void validate_ir_tree(exec_list *instructions);
-
-/**
- * Make a clone of each IR instruction in a list
- *
- * \param in   List of IR instructions that are to be cloned
- * \param out  List to hold the cloned instructions
- */
-void
-clone_ir_list(void *mem_ctx, exec_list *out, const exec_list *in);
-
-extern void
-_mesa_glsl_initialize_variables(exec_list *instructions,
-				struct _mesa_glsl_parse_state *state);
-
-extern void
-_mesa_glsl_initialize_functions(_mesa_glsl_parse_state *state);
-
-extern void
-_mesa_glsl_release_functions(void);
-
-extern void
-reparent_ir(exec_list *list, void *mem_ctx);
-
-struct glsl_symbol_table;
-
-extern void
-import_prototypes(const exec_list *source, exec_list *dest,
-		  struct glsl_symbol_table *symbols, void *mem_ctx);
-
-extern bool
-ir_has_call(ir_instruction *ir);
-
-extern void
-do_set_program_inouts(exec_list *instructions, struct gl_program *prog);
-
-#endif /* IR_H */
+/* -*- c++ -*- */

+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#pragma once

+#ifndef IR_H

+#define IR_H

+

+#include <stdio.h>

+#include <stdlib.h>

+

+#include "ralloc.h"

+#include "glsl_types.h"

+#include "list.h"

+#include "ir_visitor.h"

+#include "ir_hierarchical_visitor.h"

+

+/**

+ * \defgroup IR Intermediate representation nodes

+ *

+ * @{

+ */

+

+/**

+ * Class tags

+ *

+ * Each concrete class derived from \c ir_instruction has a value in this

+ * enumerant.  The value for the type is stored in \c ir_instruction::ir_type

+ * by the constructor.  While using type tags is not very C++, it is extremely

+ * convenient.  For example, during debugging you can simply inspect

+ * \c ir_instruction::ir_type to find out the actual type of the object.

+ *

+ * In addition, it is possible to use a switch-statement based on \c

+ * \c ir_instruction::ir_type to select different behavior for different object

+ * types.  For functions that have only slight differences for several object

+ * types, this allows writing very straightforward, readable code.

+ */

+enum ir_node_type {

+   /**

+    * Zero is unused so that the IR validator can detect cases where

+    * \c ir_instruction::ir_type has not been initialized.

+    */

+   ir_type_unset,

+   ir_type_variable,

+   ir_type_assignment,

+   ir_type_call,

+   ir_type_constant,

+   ir_type_dereference_array,

+   ir_type_dereference_record,

+   ir_type_dereference_variable,

+   ir_type_discard,

+   ir_type_expression,

+   ir_type_function,

+   ir_type_function_signature,

+   ir_type_if,

+   ir_type_loop,

+   ir_type_loop_jump,

+   ir_type_return,

+   ir_type_swizzle,

+   ir_type_texture,

+   ir_type_max /**< maximum ir_type enum number, for validation */

+};

+

+/**

+ * Base class of all IR instructions

+ */

+class ir_instruction : public exec_node {

+public:

+   enum ir_node_type ir_type;

+   const struct glsl_type *type;

+

+   /** ir_print_visitor helper for debugging. */

+   void print(void) const;

+

+   virtual void accept(ir_visitor *) = 0;

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *) = 0;

+   virtual ir_instruction *clone(void *mem_ctx,

+				 struct hash_table *ht) const = 0;

+

+   /**

+    * \name IR instruction downcast functions

+    *

+    * These functions either cast the object to a derived class or return

+    * \c NULL if the object's type does not match the specified derived class.

+    * Additional downcast functions will be added as needed.

+    */

+   /*@{*/

+   virtual class ir_variable *          as_variable()         { return NULL; }

+   virtual class ir_function *          as_function()         { return NULL; }

+   virtual class ir_dereference *       as_dereference()      { return NULL; }

+   virtual class ir_dereference_array *	as_dereference_array() { return NULL; }

+   virtual class ir_dereference_variable *as_dereference_variable() { return NULL; }

+   virtual class ir_expression *        as_expression()       { return NULL; }

+   virtual class ir_rvalue *            as_rvalue()           { return NULL; }

+   virtual class ir_loop *              as_loop()             { return NULL; }

+   virtual class ir_assignment *        as_assignment()       { return NULL; }

+   virtual class ir_call *              as_call()             { return NULL; }

+   virtual class ir_return *            as_return()           { return NULL; }

+   virtual class ir_if *                as_if()               { return NULL; }

+   virtual class ir_swizzle *           as_swizzle()          { return NULL; }

+   virtual class ir_constant *          as_constant()         { return NULL; }

+   virtual class ir_discard *           as_discard()          { return NULL; }

+   /*@}*/

+

+protected:

+   ir_instruction()

+   {

+      ir_type = ir_type_unset;

+      type = NULL;

+   }

+};

+

+

+class ir_rvalue : public ir_instruction {

+public:

+   virtual ir_rvalue *clone(void *mem_ctx, struct hash_table *) const = 0;

+

+   virtual ir_constant *constant_expression_value() = 0;

+

+   virtual ir_rvalue * as_rvalue()

+   {

+      return this;

+   }

+

+   ir_rvalue *as_rvalue_to_saturate();

+

+   virtual bool is_lvalue()

+   {

+      return false;

+   }

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced()

+   {

+      return NULL;

+   }

+

+

+   /**

+    * If an r-value is a reference to a whole variable, get that variable

+    *

+    * \return

+    * Pointer to a variable that is completely dereferenced by the r-value.  If

+    * the r-value is not a dereference or the dereference does not access the

+    * entire variable (i.e., it's just one array element, struct field), \c NULL

+    * is returned.

+    */

+   virtual ir_variable *whole_variable_referenced()

+   {

+      return NULL;

+   }

+

+   /**

+    * Determine if an r-value has the value zero

+    *

+    * The base implementation of this function always returns \c false.  The

+    * \c ir_constant class over-rides this function to return \c true \b only

+    * for vector and scalar types that have all elements set to the value

+    * zero (or \c false for booleans).

+    *

+    * \sa ir_constant::has_value, ir_rvalue::is_one, ir_rvalue::is_negative_one

+    */

+   virtual bool is_zero() const;

+

+   /**

+    * Determine if an r-value has the value one

+    *

+    * The base implementation of this function always returns \c false.  The

+    * \c ir_constant class over-rides this function to return \c true \b only

+    * for vector and scalar types that have all elements set to the value

+    * one (or \c true for booleans).

+    *

+    * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_negative_one

+    */

+   virtual bool is_one() const;

+

+   /**

+    * Determine if an r-value has the value negative one

+    *

+    * The base implementation of this function always returns \c false.  The

+    * \c ir_constant class over-rides this function to return \c true \b only

+    * for vector and scalar types that have all elements set to the value

+    * negative one.  For boolean times, the result is always \c false.

+    *

+    * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_one

+    */

+   virtual bool is_negative_one() const;

+

+protected:

+   ir_rvalue();

+};

+

+

+/**

+ * Variable storage classes

+ */

+enum ir_variable_mode {

+   ir_var_auto = 0,     /**< Function local variables and globals. */

+   ir_var_uniform,      /**< Variable declared as a uniform. */

+   ir_var_in,

+   ir_var_out,

+   ir_var_inout,

+   ir_var_const_in,	/**< "in" param that must be a constant expression */

+   ir_var_system_value, /**< Ex: front-face, instance-id, etc. */

+   ir_var_temporary	/**< Temporary variable generated during compilation. */

+};

+

+enum ir_variable_interpolation {

+   ir_var_smooth = 0,

+   ir_var_flat,

+   ir_var_noperspective

+};

+

+/**

+ * \brief Layout qualifiers for gl_FragDepth.

+ *

+ * The AMD_conservative_depth extension allows gl_FragDepth to be redeclared

+ * with a layout qualifier.

+ */

+enum ir_depth_layout {

+    ir_depth_layout_none, /**< No depth layout is specified. */

+    ir_depth_layout_any,

+    ir_depth_layout_greater,

+    ir_depth_layout_less,

+    ir_depth_layout_unchanged

+};

+

+/**

+ * \brief Convert depth layout qualifier to string.

+ */

+const char*

+depth_layout_string(ir_depth_layout layout);

+

+/**

+ * Description of built-in state associated with a uniform

+ *

+ * \sa ir_variable::state_slots

+ */

+struct ir_state_slot {

+   int tokens[5];

+   int swizzle;

+};

+

+class ir_variable : public ir_instruction {

+public:

+   ir_variable(const struct glsl_type *, const char *, ir_variable_mode);

+

+   virtual ir_variable *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual ir_variable *as_variable()

+   {

+      return this;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+

+   /**

+    * Get the string value for the interpolation qualifier

+    *

+    * \return The string that would be used in a shader to specify \c

+    * mode will be returned.

+    *

+    * This function should only be used on a shader input or output variable.

+    */

+   const char *interpolation_string() const;

+

+   /**

+    * Calculate the number of slots required to hold this variable

+    *

+    * This is used to determine how many uniform or varying locations a variable

+    * occupies.  The count is in units of floating point components.

+    */

+   unsigned component_slots() const;

+

+   /**

+    * Delcared name of the variable

+    */

+   const char *name;

+

+   /**

+    * Highest element accessed with a constant expression array index

+    *

+    * Not used for non-array variables.

+    */

+   unsigned max_array_access;

+

+   /**

+    * Is the variable read-only?

+    *

+    * This is set for variables declared as \c const, shader inputs,

+    * and uniforms.

+    */

+   unsigned read_only:1;

+   unsigned centroid:1;

+   unsigned invariant:1;

+

+   /**

+    * Has this variable been used for reading or writing?

+    *

+    * Several GLSL semantic checks require knowledge of whether or not a

+    * variable has been used.  For example, it is an error to redeclare a

+    * variable as invariant after it has been used.

+    */

+   unsigned used:1;

+

+   /**

+    * Storage class of the variable.

+    *

+    * \sa ir_variable_mode

+    */

+   unsigned mode:3;

+

+   /**

+    * Interpolation mode for shader inputs / outputs

+    *

+    * \sa ir_variable_interpolation

+    */

+   unsigned interpolation:2;

+

+   /**

+    * Flag that the whole array is assignable

+    *

+    * In GLSL 1.20 and later whole arrays are assignable (and comparable for

+    * equality).  This flag enables this behavior.

+    */

+   unsigned array_lvalue:1;

+

+   /**

+    * \name ARB_fragment_coord_conventions

+    * @{

+    */

+   unsigned origin_upper_left:1;

+   unsigned pixel_center_integer:1;

+   /*@}*/

+

+   /**

+    * \brief Layout qualifier for gl_FragDepth.

+    *

+    * This is not equal to \c ir_depth_layout_none if and only if this

+    * variable is \c gl_FragDepth and a layout qualifier is specified.

+    */

+   ir_depth_layout depth_layout;

+

+   /**

+    * Was the location explicitly set in the shader?

+    *

+    * If the location is explicitly set in the shader, it \b cannot be changed

+    * by the linker or by the API (e.g., calls to \c glBindAttribLocation have

+    * no effect).

+    */

+   unsigned explicit_location:1;

+

+   /**

+    * Storage location of the base of this variable

+    *

+    * The precise meaning of this field depends on the nature of the variable.

+    *

+    *   - Vertex shader input: one of the values from \c gl_vert_attrib.

+    *   - Vertex shader output: one of the values from \c gl_vert_result.

+    *   - Fragment shader input: one of the values from \c gl_frag_attrib.

+    *   - Fragment shader output: one of the values from \c gl_frag_result.

+    *   - Uniforms: Per-stage uniform slot number.

+    *   - Other: This field is not currently used.

+    *

+    * If the variable is a uniform, shader input, or shader output, and the

+    * slot has not been assigned, the value will be -1.

+    */

+   int location;

+

+   /**

+    * Built-in state that backs this uniform

+    *

+    * Once set at variable creation, \c state_slots must remain invariant.

+    * This is because, ideally, this array would be shared by all clones of

+    * this variable in the IR tree.  In other words, we'd really like for it

+    * to be a fly-weight.

+    *

+    * If the variable is not a uniform, \c num_state_slots will be zero and

+    * \c state_slots will be \c NULL.

+    */

+   /*@{*/

+   unsigned num_state_slots;    /**< Number of state slots used */

+   ir_state_slot *state_slots;  /**< State descriptors. */

+   /*@}*/

+

+   /**

+    * Emit a warning if this variable is accessed.

+    */

+   const char *warn_extension;

+

+   /**

+    * Value assigned in the initializer of a variable declared "const"

+    */

+   ir_constant *constant_value;

+};

+

+

+/*@{*/

+/**

+ * The representation of a function instance; may be the full definition or

+ * simply a prototype.

+ */

+class ir_function_signature : public ir_instruction {

+   /* An ir_function_signature will be part of the list of signatures in

+    * an ir_function.

+    */

+public:

+   ir_function_signature(const glsl_type *return_type);

+

+   virtual ir_function_signature *clone(void *mem_ctx,

+					struct hash_table *ht) const;

+   ir_function_signature *clone_prototype(void *mem_ctx,

+					  struct hash_table *ht) const;

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   /**

+    * Get the name of the function for which this is a signature

+    */

+   const char *function_name() const;

+

+   /**

+    * Get a handle to the function for which this is a signature

+    *

+    * There is no setter function, this function returns a \c const pointer,

+    * and \c ir_function_signature::_function is private for a reason.  The

+    * only way to make a connection between a function and function signature

+    * is via \c ir_function::add_signature.  This helps ensure that certain

+    * invariants (i.e., a function signature is in the list of signatures for

+    * its \c _function) are met.

+    *

+    * \sa ir_function::add_signature

+    */

+   inline const class ir_function *function() const

+   {

+      return this->_function;

+   }

+

+   /**

+    * Check whether the qualifiers match between this signature's parameters

+    * and the supplied parameter list.  If not, returns the name of the first

+    * parameter with mismatched qualifiers (for use in error messages).

+    */

+   const char *qualifiers_match(exec_list *params);

+

+   /**

+    * Replace the current parameter list with the given one.  This is useful

+    * if the current information came from a prototype, and either has invalid

+    * or missing parameter names.

+    */

+   void replace_parameters(exec_list *new_params);

+

+   /**

+    * Function return type.

+    *

+    * \note This discards the optional precision qualifier.

+    */

+   const struct glsl_type *return_type;

+

+   /**

+    * List of ir_variable of function parameters.

+    *

+    * This represents the storage.  The paramaters passed in a particular

+    * call will be in ir_call::actual_paramaters.

+    */

+   struct exec_list parameters;

+

+   /** Whether or not this function has a body (which may be empty). */

+   unsigned is_defined:1;

+

+   /** Whether or not this function signature is a built-in. */

+   unsigned is_builtin:1;

+

+   /** Body of instructions in the function. */

+   struct exec_list body;

+

+private:

+   /** Function of which this signature is one overload. */

+   class ir_function *_function;

+

+   friend class ir_function;

+};

+

+

+/**

+ * Header for tracking multiple overloaded functions with the same name.

+ * Contains a list of ir_function_signatures representing each of the

+ * actual functions.

+ */

+class ir_function : public ir_instruction {

+public:

+   ir_function(const char *name);

+

+   virtual ir_function *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual ir_function *as_function()

+   {

+      return this;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   void add_signature(ir_function_signature *sig)

+   {

+      sig->_function = this;

+      this->signatures.push_tail(sig);

+   }

+

+   /**

+    * Get an iterator for the set of function signatures

+    */

+   exec_list_iterator iterator()

+   {

+      return signatures.iterator();

+   }

+

+   /**

+    * Find a signature that matches a set of actual parameters, taking implicit

+    * conversions into account.

+    */

+   ir_function_signature *matching_signature(const exec_list *actual_param);

+

+   /**

+    * Find a signature that exactly matches a set of actual parameters without

+    * any implicit type conversions.

+    */

+   ir_function_signature *exact_matching_signature(const exec_list *actual_ps);

+

+   /**

+    * Name of the function.

+    */

+   const char *name;

+

+   /** Whether or not this function has a signature that isn't a built-in. */

+   bool has_user_signature();

+

+   /**

+    * List of ir_function_signature for each overloaded function with this name.

+    */

+   struct exec_list signatures;

+};

+

+inline const char *ir_function_signature::function_name() const

+{

+   return this->_function->name;

+}

+/*@}*/

+

+

+/**

+ * IR instruction representing high-level if-statements

+ */

+class ir_if : public ir_instruction {

+public:

+   ir_if(ir_rvalue *condition)

+      : condition(condition)

+   {

+      ir_type = ir_type_if;

+   }

+

+   virtual ir_if *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual ir_if *as_if()

+   {

+      return this;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   ir_rvalue *condition;

+   /** List of ir_instruction for the body of the then branch */

+   exec_list  then_instructions;

+   /** List of ir_instruction for the body of the else branch */

+   exec_list  else_instructions;

+};

+

+

+/**

+ * IR instruction representing a high-level loop structure.

+ */

+class ir_loop : public ir_instruction {

+public:

+   ir_loop();

+

+   virtual ir_loop *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   virtual ir_loop *as_loop()

+   {

+      return this;

+   }

+

+   /**

+    * Get an iterator for the instructions of the loop body

+    */

+   exec_list_iterator iterator()

+   {

+      return body_instructions.iterator();

+   }

+

+   /** List of ir_instruction that make up the body of the loop. */

+   exec_list body_instructions;

+

+   /**

+    * \name Loop counter and controls

+    *

+    * Represents a loop like a FORTRAN \c do-loop.

+    *

+    * \note

+    * If \c from and \c to are the same value, the loop will execute once.

+    */

+   /*@{*/

+   ir_rvalue *from;             /** Value of the loop counter on the first

+				 * iteration of the loop.

+				 */

+   ir_rvalue *to;               /** Value of the loop counter on the last

+				 * iteration of the loop.

+				 */

+   ir_rvalue *increment;

+   ir_variable *counter;

+

+   /**

+    * Comparison operation in the loop terminator.

+    *

+    * If any of the loop control fields are non-\c NULL, this field must be

+    * one of \c ir_binop_less, \c ir_binop_greater, \c ir_binop_lequal,

+    * \c ir_binop_gequal, \c ir_binop_equal, or \c ir_binop_nequal.

+    */

+   int cmp;

+   /*@}*/

+};

+

+

+class ir_assignment : public ir_instruction {

+public:

+   ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs, ir_rvalue *condition);

+

+   /**

+    * Construct an assignment with an explicit write mask

+    *

+    * \note

+    * Since a write mask is supplied, the LHS must already be a bare

+    * \c ir_dereference.  The cannot be any swizzles in the LHS.

+    */

+   ir_assignment(ir_dereference *lhs, ir_rvalue *rhs, ir_rvalue *condition,

+		 unsigned write_mask);

+

+   virtual ir_assignment *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   virtual ir_assignment * as_assignment()

+   {

+      return this;

+   }

+

+   /**

+    * Get a whole variable written by an assignment

+    *

+    * If the LHS of the assignment writes a whole variable, the variable is

+    * returned.  Otherwise \c NULL is returned.  Examples of whole-variable

+    * assignment are:

+    *

+    *  - Assigning to a scalar

+    *  - Assigning to all components of a vector

+    *  - Whole array (or matrix) assignment

+    *  - Whole structure assignment

+    */

+   ir_variable *whole_variable_written();

+

+   /**

+    * Set the LHS of an assignment

+    */

+   void set_lhs(ir_rvalue *lhs);

+

+   /**

+    * Left-hand side of the assignment.

+    *

+    * This should be treated as read only.  If you need to set the LHS of an

+    * assignment, use \c ir_assignment::set_lhs.

+    */

+   ir_dereference *lhs;

+

+   /**

+    * Value being assigned

+    */

+   ir_rvalue *rhs;

+

+   /**

+    * Optional condition for the assignment.

+    */

+   ir_rvalue *condition;

+

+

+   /**

+    * Component mask written

+    *

+    * For non-vector types in the LHS, this field will be zero.  For vector

+    * types, a bit will be set for each component that is written.  Note that

+    * for \c vec2 and \c vec3 types only the lower bits will ever be set.

+    *

+    * A partially-set write mask means that each enabled channel gets

+    * the value from a consecutive channel of the rhs.  For example,

+    * to write just .xyw of gl_FrontColor with color:

+    *

+    * (assign (constant bool (1)) (xyw)

+    *     (var_ref gl_FragColor)

+    *     (swiz xyw (var_ref color)))

+    */

+   unsigned write_mask:4;

+};

+

+/* Update ir_expression::num_operands() and operator_strs when

+ * updating this list.

+ */

+enum ir_expression_operation {

+   ir_unop_bit_not,

+   ir_unop_logic_not,

+   ir_unop_neg,

+   ir_unop_abs,

+   ir_unop_sign,

+   ir_unop_rcp,

+   ir_unop_rsq,

+   ir_unop_sqrt,

+   ir_unop_exp,      /**< Log base e on gentype */

+   ir_unop_log,	     /**< Natural log on gentype */

+   ir_unop_exp2,

+   ir_unop_log2,

+   ir_unop_f2i,      /**< Float-to-integer conversion. */

+   ir_unop_i2f,      /**< Integer-to-float conversion. */

+   ir_unop_f2b,      /**< Float-to-boolean conversion */

+   ir_unop_b2f,      /**< Boolean-to-float conversion */

+   ir_unop_i2b,      /**< int-to-boolean conversion */

+   ir_unop_b2i,      /**< Boolean-to-int conversion */

+   ir_unop_u2f,      /**< Unsigned-to-float conversion. */

+   ir_unop_any,

+

+   /**

+    * \name Unary floating-point rounding operations.

+    */

+   /*@{*/

+   ir_unop_trunc,

+   ir_unop_ceil,

+   ir_unop_floor,

+   ir_unop_fract,

+   ir_unop_round_even,

+   /*@}*/

+

+   /**

+    * \name Trigonometric operations.

+    */

+   /*@{*/

+   ir_unop_sin,

+   ir_unop_cos,

+   ir_unop_sin_reduced,    /**< Reduced range sin. [-pi, pi] */

+   ir_unop_cos_reduced,    /**< Reduced range cos. [-pi, pi] */

+   /*@}*/

+

+   /**

+    * \name Partial derivatives.

+    */

+   /*@{*/

+   ir_unop_dFdx,

+   ir_unop_dFdy,

+   /*@}*/

+

+   ir_unop_noise,

+

+   /**

+    * A sentinel marking the last of the unary operations.

+    */

+   ir_last_unop = ir_unop_noise,

+

+   ir_binop_add,

+   ir_binop_sub,

+   ir_binop_mul,

+   ir_binop_div,

+

+   /**

+    * Takes one of two combinations of arguments:

+    *

+    * - mod(vecN, vecN)

+    * - mod(vecN, float)

+    *

+    * Does not take integer types.

+    */

+   ir_binop_mod,

+

+   /**

+    * \name Binary comparison operators which return a boolean vector.

+    * The type of both operands must be equal.

+    */

+   /*@{*/

+   ir_binop_less,

+   ir_binop_greater,

+   ir_binop_lequal,

+   ir_binop_gequal,

+   ir_binop_equal,

+   ir_binop_nequal,

+   /**

+    * Returns single boolean for whether all components of operands[0]

+    * equal the components of operands[1].

+    */

+   ir_binop_all_equal,

+   /**

+    * Returns single boolean for whether any component of operands[0]

+    * is not equal to the corresponding component of operands[1].

+    */

+   ir_binop_any_nequal,

+   /*@}*/

+

+   /**

+    * \name Bit-wise binary operations.

+    */

+   /*@{*/

+   ir_binop_lshift,

+   ir_binop_rshift,

+   ir_binop_bit_and,

+   ir_binop_bit_xor,

+   ir_binop_bit_or,

+   /*@}*/

+

+   ir_binop_logic_and,

+   ir_binop_logic_xor,

+   ir_binop_logic_or,

+

+   ir_binop_dot,

+   ir_binop_min,

+   ir_binop_max,

+

+   ir_binop_pow,

+

+   /**

+    * A sentinel marking the last of the binary operations.

+    */

+   ir_last_binop = ir_binop_pow,

+

+   ir_quadop_vector,

+

+   /**

+    * A sentinel marking the last of all operations.

+    */

+   ir_last_opcode = ir_last_binop

+};

+

+class ir_expression : public ir_rvalue {

+public:

+   /**

+    * Constructor for unary operation expressions

+    */

+   ir_expression(int op, const struct glsl_type *type, ir_rvalue *);

+   ir_expression(int op, ir_rvalue *);

+

+   /**

+    * Constructor for binary operation expressions

+    */

+   ir_expression(int op, const struct glsl_type *type,

+		 ir_rvalue *, ir_rvalue *);

+   ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1);

+

+   /**

+    * Constructor for quad operator expressions

+    */

+   ir_expression(int op, const struct glsl_type *type,

+		 ir_rvalue *, ir_rvalue *, ir_rvalue *, ir_rvalue *);

+

+   virtual ir_expression *as_expression()

+   {

+      return this;

+   }

+

+   virtual ir_expression *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   /**

+    * Attempt to constant-fold the expression

+    *

+    * If the expression cannot be constant folded, this method will return

+    * \c NULL.

+    */

+   virtual ir_constant *constant_expression_value();

+

+   /**

+    * Determine the number of operands used by an expression

+    */

+   static unsigned int get_num_operands(ir_expression_operation);

+

+   /**

+    * Determine the number of operands used by an expression

+    */

+   unsigned int get_num_operands() const

+   {

+      return (this->operation == ir_quadop_vector)

+	 ? this->type->vector_elements : get_num_operands(operation);

+   }

+

+   /**

+    * Return a string representing this expression's operator.

+    */

+   const char *operator_string();

+

+   /**

+    * Return a string representing this expression's operator.

+    */

+   static const char *operator_string(ir_expression_operation);

+

+

+   /**

+    * Do a reverse-lookup to translate the given string into an operator.

+    */

+   static ir_expression_operation get_operator(const char *);

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   ir_expression_operation operation;

+   ir_rvalue *operands[4];

+};

+

+

+/**

+ * IR instruction representing a function call

+ */

+class ir_call : public ir_rvalue {

+public:

+   ir_call(ir_function_signature *callee, exec_list *actual_parameters)

+      : callee(callee)

+   {

+      ir_type = ir_type_call;

+      assert(callee->return_type != NULL);

+      type = callee->return_type;

+      actual_parameters->move_nodes_to(& this->actual_parameters);

+   }

+

+   virtual ir_call *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual ir_call *as_call()

+   {

+      return this;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   /**

+    * Get a generic ir_call object when an error occurs

+    *

+    * Any allocation will be performed with 'ctx' as ralloc owner.

+    */

+   static ir_call *get_error_instruction(void *ctx);

+

+   /**

+    * Get an iterator for the set of acutal parameters

+    */

+   exec_list_iterator iterator()

+   {

+      return actual_parameters.iterator();

+   }

+

+   /**

+    * Get the name of the function being called.

+    */

+   const char *callee_name() const

+   {

+      return callee->function_name();

+   }

+

+   /**

+    * Get the function signature bound to this function call

+    */

+   ir_function_signature *get_callee()

+   {

+      return callee;

+   }

+

+   /**

+    * Set the function call target

+    */

+   void set_callee(ir_function_signature *sig);

+

+   /**

+    * Generates an inline version of the function before @ir,

+    * returning the return value of the function.

+    */

+   ir_rvalue *generate_inline(ir_instruction *ir);

+

+   /* List of ir_rvalue of paramaters passed in this call. */

+   exec_list actual_parameters;

+

+private:

+   ir_call()

+      : callee(NULL)

+   {

+      this->ir_type = ir_type_call;

+   }

+

+   ir_function_signature *callee;

+};

+

+

+/**

+ * \name Jump-like IR instructions.

+ *

+ * These include \c break, \c continue, \c return, and \c discard.

+ */

+/*@{*/

+class ir_jump : public ir_instruction {

+protected:

+   ir_jump()

+   {

+      ir_type = ir_type_unset;

+   }

+};

+

+class ir_return : public ir_jump {

+public:

+   ir_return()

+      : value(NULL)

+   {

+      this->ir_type = ir_type_return;

+   }

+

+   ir_return(ir_rvalue *value)

+      : value(value)

+   {

+      this->ir_type = ir_type_return;

+   }

+

+   virtual ir_return *clone(void *mem_ctx, struct hash_table *) const;

+

+   virtual ir_return *as_return()

+   {

+      return this;

+   }

+

+   ir_rvalue *get_value() const

+   {

+      return value;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   ir_rvalue *value;

+};

+

+

+/**

+ * Jump instructions used inside loops

+ *

+ * These include \c break and \c continue.  The \c break within a loop is

+ * different from the \c break within a switch-statement.

+ *

+ * \sa ir_switch_jump

+ */

+class ir_loop_jump : public ir_jump {

+public:

+   enum jump_mode {

+      jump_break,

+      jump_continue

+   };

+

+   ir_loop_jump(jump_mode mode)

+   {

+      this->ir_type = ir_type_loop_jump;

+      this->mode = mode;

+      this->loop = loop;

+   }

+

+   virtual ir_loop_jump *clone(void *mem_ctx, struct hash_table *) const;

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   bool is_break() const

+   {

+      return mode == jump_break;

+   }

+

+   bool is_continue() const

+   {

+      return mode == jump_continue;

+   }

+

+   /** Mode selector for the jump instruction. */

+   enum jump_mode mode;

+private:

+   /** Loop containing this break instruction. */

+   ir_loop *loop;

+};

+

+/**

+ * IR instruction representing discard statements.

+ */

+class ir_discard : public ir_jump {

+public:

+   ir_discard()

+   {

+      this->ir_type = ir_type_discard;

+      this->condition = NULL;

+   }

+

+   ir_discard(ir_rvalue *cond)

+   {

+      this->ir_type = ir_type_discard;

+      this->condition = cond;

+   }

+

+   virtual ir_discard *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   virtual ir_discard *as_discard()

+   {

+      return this;

+   }

+

+   ir_rvalue *condition;

+};

+/*@}*/

+

+

+/**

+ * Texture sampling opcodes used in ir_texture

+ */

+enum ir_texture_opcode {

+   ir_tex,		/**< Regular texture look-up */

+   ir_txb,		/**< Texture look-up with LOD bias */

+   ir_txl,		/**< Texture look-up with explicit LOD */

+   ir_txd,		/**< Texture look-up with partial derivatvies */

+   ir_txf		/**< Texel fetch with explicit LOD */

+};

+

+

+/**

+ * IR instruction to sample a texture

+ *

+ * The specific form of the IR instruction depends on the \c mode value

+ * selected from \c ir_texture_opcodes.  In the printed IR, these will

+ * appear as:

+ *

+ *                                    Texel offset (0 or an expression)

+ *                                    | Projection divisor

+ *                                    | |  Shadow comparitor

+ *                                    | |  |

+ *                                    v v  v

+ * (tex <type> <sampler> <coordinate> 0 1 ( ))

+ * (txb <type> <sampler> <coordinate> 0 1 ( ) <bias>)

+ * (txl <type> <sampler> <coordinate> 0 1 ( ) <lod>)

+ * (txd <type> <sampler> <coordinate> 0 1 ( ) (dPdx dPdy))

+ * (txf <type> <sampler> <coordinate> 0       <lod>)

+ */

+class ir_texture : public ir_rvalue {

+public:

+   ir_texture(enum ir_texture_opcode op)

+      : op(op), projector(NULL), shadow_comparitor(NULL), offset(NULL)

+   {

+      this->ir_type = ir_type_texture;

+   }

+

+   virtual ir_texture *clone(void *mem_ctx, struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   /**

+    * Return a string representing the ir_texture_opcode.

+    */

+   const char *opcode_string();

+

+   /** Set the sampler and type. */

+   void set_sampler(ir_dereference *sampler, const glsl_type *type);

+

+   /**

+    * Do a reverse-lookup to translate a string into an ir_texture_opcode.

+    */

+   static ir_texture_opcode get_opcode(const char *);

+

+   enum ir_texture_opcode op;

+

+   /** Sampler to use for the texture access. */

+   ir_dereference *sampler;

+

+   /** Texture coordinate to sample */

+   ir_rvalue *coordinate;

+

+   /**

+    * Value used for projective divide.

+    *

+    * If there is no projective divide (the common case), this will be

+    * \c NULL.  Optimization passes should check for this to point to a constant

+    * of 1.0 and replace that with \c NULL.

+    */

+   ir_rvalue *projector;

+

+   /**

+    * Coordinate used for comparison on shadow look-ups.

+    *

+    * If there is no shadow comparison, this will be \c NULL.  For the

+    * \c ir_txf opcode, this *must* be \c NULL.

+    */

+   ir_rvalue *shadow_comparitor;

+

+   /** Texel offset. */

+   ir_rvalue *offset;

+

+   union {

+      ir_rvalue *lod;		/**< Floating point LOD */

+      ir_rvalue *bias;		/**< Floating point LOD bias */

+      struct {

+	 ir_rvalue *dPdx;	/**< Partial derivative of coordinate wrt X */

+	 ir_rvalue *dPdy;	/**< Partial derivative of coordinate wrt Y */

+      } grad;

+   } lod_info;

+};

+

+

+struct ir_swizzle_mask {

+   unsigned x:2;

+   unsigned y:2;

+   unsigned z:2;

+   unsigned w:2;

+

+   /**

+    * Number of components in the swizzle.

+    */

+   unsigned num_components:3;

+

+   /**

+    * Does the swizzle contain duplicate components?

+    *

+    * L-value swizzles cannot contain duplicate components.

+    */

+   unsigned has_duplicates:1;

+};

+

+

+class ir_swizzle : public ir_rvalue {

+public:

+   ir_swizzle(ir_rvalue *, unsigned x, unsigned y, unsigned z, unsigned w,

+              unsigned count);

+

+   ir_swizzle(ir_rvalue *val, const unsigned *components, unsigned count);

+

+   ir_swizzle(ir_rvalue *val, ir_swizzle_mask mask);

+

+   virtual ir_swizzle *clone(void *mem_ctx, struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual ir_swizzle *as_swizzle()

+   {

+      return this;

+   }

+

+   /**

+    * Construct an ir_swizzle from the textual representation.  Can fail.

+    */

+   static ir_swizzle *create(ir_rvalue *, const char *, unsigned vector_length);

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   bool is_lvalue()

+   {

+      return val->is_lvalue() && !mask.has_duplicates;

+   }

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced();

+

+   ir_rvalue *val;

+   ir_swizzle_mask mask;

+

+private:

+   /**

+    * Initialize the mask component of a swizzle

+    *

+    * This is used by the \c ir_swizzle constructors.

+    */

+   void init_mask(const unsigned *components, unsigned count);

+};

+

+

+class ir_dereference : public ir_rvalue {

+public:

+   virtual ir_dereference *clone(void *mem_ctx, struct hash_table *) const = 0;

+

+   virtual ir_dereference *as_dereference()

+   {

+      return this;

+   }

+

+   bool is_lvalue();

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced() = 0;

+};

+

+

+class ir_dereference_variable : public ir_dereference {

+public:

+   ir_dereference_variable(ir_variable *var);

+

+   virtual ir_dereference_variable *clone(void *mem_ctx,

+					  struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual ir_dereference_variable *as_dereference_variable()

+   {

+      return this;

+   }

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced()

+   {

+      return this->var;

+   }

+

+   virtual ir_variable *whole_variable_referenced()

+   {

+      /* ir_dereference_variable objects always dereference the entire

+       * variable.  However, if this dereference is dereferenced by anything

+       * else, the complete deferefernce chain is not a whole-variable

+       * dereference.  This method should only be called on the top most

+       * ir_rvalue in a dereference chain.

+       */

+      return this->var;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   /**

+    * Object being dereferenced.

+    */

+   ir_variable *var;

+};

+

+

+class ir_dereference_array : public ir_dereference {

+public:

+   ir_dereference_array(ir_rvalue *value, ir_rvalue *array_index);

+

+   ir_dereference_array(ir_variable *var, ir_rvalue *array_index);

+

+   virtual ir_dereference_array *clone(void *mem_ctx,

+				       struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual ir_dereference_array *as_dereference_array()

+   {

+      return this;

+   }

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced()

+   {

+      return this->array->variable_referenced();

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   ir_rvalue *array;

+   ir_rvalue *array_index;

+

+private:

+   void set_array(ir_rvalue *value);

+};

+

+

+class ir_dereference_record : public ir_dereference {

+public:

+   ir_dereference_record(ir_rvalue *value, const char *field);

+

+   ir_dereference_record(ir_variable *var, const char *field);

+

+   virtual ir_dereference_record *clone(void *mem_ctx,

+					struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced()

+   {

+      return this->record->variable_referenced();

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   ir_rvalue *record;

+   const char *field;

+};

+

+

+/**

+ * Data stored in an ir_constant

+ */

+union ir_constant_data {

+      unsigned u[16];

+      int i[16];

+      float f[16];

+      bool b[16];

+};

+

+

+class ir_constant : public ir_rvalue {

+public:

+   ir_constant(const struct glsl_type *type, const ir_constant_data *data);

+   ir_constant(bool b);

+   ir_constant(unsigned int u);

+   ir_constant(int i);

+   ir_constant(float f);

+

+   /**

+    * Construct an ir_constant from a list of ir_constant values

+    */

+   ir_constant(const struct glsl_type *type, exec_list *values);

+

+   /**

+    * Construct an ir_constant from a scalar component of another ir_constant

+    *

+    * The new \c ir_constant inherits the type of the component from the

+    * source constant.

+    *

+    * \note

+    * In the case of a matrix constant, the new constant is a scalar, \b not

+    * a vector.

+    */

+   ir_constant(const ir_constant *c, unsigned i);

+

+   /**

+    * Return a new ir_constant of the specified type containing all zeros.

+    */

+   static ir_constant *zero(void *mem_ctx, const glsl_type *type);

+

+   virtual ir_constant *clone(void *mem_ctx, struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual ir_constant *as_constant()

+   {

+      return this;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   /**

+    * Get a particular component of a constant as a specific type

+    *

+    * This is useful, for example, to get a value from an integer constant

+    * as a float or bool.  This appears frequently when constructors are

+    * called with all constant parameters.

+    */

+   /*@{*/

+   bool get_bool_component(unsigned i) const;

+   float get_float_component(unsigned i) const;

+   int get_int_component(unsigned i) const;

+   unsigned get_uint_component(unsigned i) const;

+   /*@}*/

+

+   ir_constant *get_array_element(unsigned i) const;

+

+   ir_constant *get_record_field(const char *name);

+

+   /**

+    * Determine whether a constant has the same value as another constant

+    *

+    * \sa ir_constant::is_zero, ir_constant::is_one,

+    * ir_constant::is_negative_one

+    */

+   bool has_value(const ir_constant *) const;

+

+   virtual bool is_zero() const;

+   virtual bool is_one() const;

+   virtual bool is_negative_one() const;

+

+   /**

+    * Value of the constant.

+    *

+    * The field used to back the values supplied by the constant is determined

+    * by the type associated with the \c ir_instruction.  Constants may be

+    * scalars, vectors, or matrices.

+    */

+   union ir_constant_data value;

+

+   /* Array elements */

+   ir_constant **array_elements;

+

+   /* Structure fields */

+   exec_list components;

+

+private:

+   /**

+    * Parameterless constructor only used by the clone method

+    */

+   ir_constant(void);

+};

+

+/*@}*/

+

+/**

+ * Apply a visitor to each IR node in a list

+ */

+void

+visit_exec_list(exec_list *list, ir_visitor *visitor);

+

+/**

+ * Validate invariants on each IR node in a list

+ */

+void validate_ir_tree(exec_list *instructions);

+

+/**

+ * Make a clone of each IR instruction in a list

+ *

+ * \param in   List of IR instructions that are to be cloned

+ * \param out  List to hold the cloned instructions

+ */

+void

+clone_ir_list(void *mem_ctx, exec_list *out, const exec_list *in);

+

+extern void

+_mesa_glsl_initialize_variables(exec_list *instructions,

+				struct _mesa_glsl_parse_state *state);

+

+extern void

+_mesa_glsl_initialize_functions(_mesa_glsl_parse_state *state);

+

+extern void

+_mesa_glsl_release_functions(void);

+

+extern void

+reparent_ir(exec_list *list, void *mem_ctx);

+

+struct glsl_symbol_table;

+

+extern void

+import_prototypes(const exec_list *source, exec_list *dest,

+		  struct glsl_symbol_table *symbols, void *mem_ctx);

+

+extern bool

+ir_has_call(ir_instruction *ir);

+

+extern void

+do_set_program_inouts(exec_list *instructions, struct gl_program *prog);

+

+#endif /* IR_H */

diff --git a/mesalib/src/glsl/ir_clone.cpp b/mesalib/src/glsl/ir_clone.cpp
index 069bb85e8..eac1f7492 100644
--- a/mesalib/src/glsl/ir_clone.cpp
+++ b/mesalib/src/glsl/ir_clone.cpp
@@ -1,432 +1,432 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#include <string.h>
-#include "main/compiler.h"
-#include "ir.h"
-#include "glsl_types.h"
-extern "C" {
-#include "program/hash_table.h"
-}
-
-/**
- * Duplicate an IR variable
- *
- * \note
- * This will probably be made \c virtual and moved to the base class
- * eventually.
- */
-ir_variable *
-ir_variable::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_variable *var = new(mem_ctx) ir_variable(this->type, this->name,
-					       (ir_variable_mode) this->mode);
-
-   var->max_array_access = this->max_array_access;
-   var->read_only = this->read_only;
-   var->centroid = this->centroid;
-   var->invariant = this->invariant;
-   var->interpolation = this->interpolation;
-   var->array_lvalue = this->array_lvalue;
-   var->location = this->location;
-   var->warn_extension = this->warn_extension;
-   var->origin_upper_left = this->origin_upper_left;
-   var->pixel_center_integer = this->pixel_center_integer;
-   var->explicit_location = this->explicit_location;
-
-   var->num_state_slots = this->num_state_slots;
-   if (this->state_slots) {
-      /* FINISHME: This really wants to use something like talloc_reference, but
-       * FINISHME: ralloc doesn't have any similar function.
-       */
-      var->state_slots = ralloc_array(var, ir_state_slot,
-				      this->num_state_slots);
-      memcpy(var->state_slots, this->state_slots,
-	     sizeof(this->state_slots[0]) * var->num_state_slots);
-   }
-
-   if (this->explicit_location)
-      var->location = this->location;
-
-   if (this->constant_value)
-      var->constant_value = this->constant_value->clone(mem_ctx, ht);
-
-   if (ht) {
-      hash_table_insert(ht, var, (void *)const_cast<ir_variable *>(this));
-   }
-
-   return var;
-}
-
-ir_swizzle *
-ir_swizzle::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   return new(mem_ctx) ir_swizzle(this->val->clone(mem_ctx, ht), this->mask);
-}
-
-ir_return *
-ir_return::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_rvalue *new_value = NULL;
-
-   if (this->value)
-      new_value = this->value->clone(mem_ctx, ht);
-
-   return new(mem_ctx) ir_return(new_value);
-}
-
-ir_discard *
-ir_discard::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_rvalue *new_condition = NULL;
-
-   if (this->condition != NULL)
-      new_condition = this->condition->clone(mem_ctx, ht);
-
-   return new(mem_ctx) ir_discard(new_condition);
-}
-
-ir_loop_jump *
-ir_loop_jump::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   (void)ht;
-
-   return new(mem_ctx) ir_loop_jump(this->mode);
-}
-
-ir_if *
-ir_if::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_if *new_if = new(mem_ctx) ir_if(this->condition->clone(mem_ctx, ht));
-
-   foreach_iter(exec_list_iterator, iter, this->then_instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      new_if->then_instructions.push_tail(ir->clone(mem_ctx, ht));
-   }
-
-   foreach_iter(exec_list_iterator, iter, this->else_instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      new_if->else_instructions.push_tail(ir->clone(mem_ctx, ht));
-   }
-
-   return new_if;
-}
-
-ir_loop *
-ir_loop::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_loop *new_loop = new(mem_ctx) ir_loop();
-
-   if (this->from)
-      new_loop->from = this->from->clone(mem_ctx, ht);
-   if (this->to)
-      new_loop->to = this->to->clone(mem_ctx, ht);
-   if (this->increment)
-      new_loop->increment = this->increment->clone(mem_ctx, ht);
-   new_loop->counter = counter;
-
-   foreach_iter(exec_list_iterator, iter, this->body_instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      new_loop->body_instructions.push_tail(ir->clone(mem_ctx, ht));
-   }
-
-   new_loop->cmp = this->cmp;
-   return new_loop;
-}
-
-ir_call *
-ir_call::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   if (this->type == glsl_type::error_type)
-      return ir_call::get_error_instruction(mem_ctx);
-
-   exec_list new_parameters;
-
-   foreach_iter(exec_list_iterator, iter, this->actual_parameters) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      new_parameters.push_tail(ir->clone(mem_ctx, ht));
-   }
-
-   return new(mem_ctx) ir_call(this->callee, &new_parameters);
-}
-
-ir_expression *
-ir_expression::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_rvalue *op[Elements(this->operands)] = { NULL, };
-   unsigned int i;
-
-   for (i = 0; i < get_num_operands(); i++) {
-      op[i] = this->operands[i]->clone(mem_ctx, ht);
-   }
-
-   return new(mem_ctx) ir_expression(this->operation, this->type,
-				     op[0], op[1], op[2], op[3]);
-}
-
-ir_dereference_variable *
-ir_dereference_variable::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_variable *new_var;
-
-   if (ht) {
-      new_var = (ir_variable *)hash_table_find(ht, this->var);
-      if (!new_var)
-	 new_var = this->var;
-   } else {
-      new_var = this->var;
-   }
-
-   return new(mem_ctx) ir_dereference_variable(new_var);
-}
-
-ir_dereference_array *
-ir_dereference_array::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   return new(mem_ctx) ir_dereference_array(this->array->clone(mem_ctx, ht),
-					    this->array_index->clone(mem_ctx,
-								     ht));
-}
-
-ir_dereference_record *
-ir_dereference_record::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   return new(mem_ctx) ir_dereference_record(this->record->clone(mem_ctx, ht),
-					     this->field);
-}
-
-ir_texture *
-ir_texture::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_texture *new_tex = new(mem_ctx) ir_texture(this->op);
-   new_tex->type = this->type;
-
-   new_tex->sampler = this->sampler->clone(mem_ctx, ht);
-   new_tex->coordinate = this->coordinate->clone(mem_ctx, ht);
-   if (this->projector)
-      new_tex->projector = this->projector->clone(mem_ctx, ht);
-   if (this->shadow_comparitor) {
-      new_tex->shadow_comparitor = this->shadow_comparitor->clone(mem_ctx, ht);
-   }
-
-   if (this->offset != NULL)
-      new_tex->offset = this->offset->clone(mem_ctx, ht);
-
-   switch (this->op) {
-   case ir_tex:
-      break;
-   case ir_txb:
-      new_tex->lod_info.bias = this->lod_info.bias->clone(mem_ctx, ht);
-      break;
-   case ir_txl:
-   case ir_txf:
-      new_tex->lod_info.lod = this->lod_info.lod->clone(mem_ctx, ht);
-      break;
-   case ir_txd:
-      new_tex->lod_info.grad.dPdx = this->lod_info.grad.dPdx->clone(mem_ctx, ht);
-      new_tex->lod_info.grad.dPdy = this->lod_info.grad.dPdy->clone(mem_ctx, ht);
-      break;
-   }
-
-   return new_tex;
-}
-
-ir_assignment *
-ir_assignment::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_rvalue *new_condition = NULL;
-
-   if (this->condition)
-      new_condition = this->condition->clone(mem_ctx, ht);
-
-   return new(mem_ctx) ir_assignment(this->lhs->clone(mem_ctx, ht),
-				     this->rhs->clone(mem_ctx, ht),
-				     new_condition,
-				     this->write_mask);
-}
-
-ir_function *
-ir_function::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_function *copy = new(mem_ctx) ir_function(this->name);
-
-   foreach_list_const(node, &this->signatures) {
-      const ir_function_signature *const sig =
-	 (const ir_function_signature *const) node;
-
-      ir_function_signature *sig_copy = sig->clone(mem_ctx, ht);
-      copy->add_signature(sig_copy);
-
-      if (ht != NULL)
-	 hash_table_insert(ht, sig_copy,
-			   (void *)const_cast<ir_function_signature *>(sig));
-   }
-
-   return copy;
-}
-
-ir_function_signature *
-ir_function_signature::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_function_signature *copy = this->clone_prototype(mem_ctx, ht);
-
-   copy->is_defined = this->is_defined;
-
-   /* Clone the instruction list.
-    */
-   foreach_list_const(node, &this->body) {
-      const ir_instruction *const inst = (const ir_instruction *) node;
-
-      ir_instruction *const inst_copy = inst->clone(mem_ctx, ht);
-      copy->body.push_tail(inst_copy);
-   }
-
-   return copy;
-}
-
-ir_function_signature *
-ir_function_signature::clone_prototype(void *mem_ctx, struct hash_table *ht) const
-{
-   ir_function_signature *copy =
-      new(mem_ctx) ir_function_signature(this->return_type);
-
-   copy->is_defined = false;
-   copy->is_builtin = this->is_builtin;
-
-   /* Clone the parameter list, but NOT the body.
-    */
-   foreach_list_const(node, &this->parameters) {
-      const ir_variable *const param = (const ir_variable *) node;
-
-      assert(const_cast<ir_variable *>(param)->as_variable() != NULL);
-
-      ir_variable *const param_copy = param->clone(mem_ctx, ht);
-      copy->parameters.push_tail(param_copy);
-   }
-
-   return copy;
-}
-
-ir_constant *
-ir_constant::clone(void *mem_ctx, struct hash_table *ht) const
-{
-   (void)ht;
-
-   switch (this->type->base_type) {
-   case GLSL_TYPE_UINT:
-   case GLSL_TYPE_INT:
-   case GLSL_TYPE_FLOAT:
-   case GLSL_TYPE_BOOL:
-      return new(mem_ctx) ir_constant(this->type, &this->value);
-
-   case GLSL_TYPE_STRUCT: {
-      ir_constant *c = new(mem_ctx) ir_constant;
-
-      c->type = this->type;
-      for (exec_node *node = this->components.head
-	      ; !node->is_tail_sentinel()
-	      ; node = node->next) {
-	 ir_constant *const orig = (ir_constant *) node;
-
-	 c->components.push_tail(orig->clone(mem_ctx, NULL));
-      }
-
-      return c;
-   }
-
-   case GLSL_TYPE_ARRAY: {
-      ir_constant *c = new(mem_ctx) ir_constant;
-
-      c->type = this->type;
-      c->array_elements = ralloc_array(c, ir_constant *, this->type->length);
-      for (unsigned i = 0; i < this->type->length; i++) {
-	 c->array_elements[i] = this->array_elements[i]->clone(mem_ctx, NULL);
-      }
-      return c;
-   }
-
-   default:
-      assert(!"Should not get here.");
-      return NULL;
-   }
-}
-
-
-class fixup_ir_call_visitor : public ir_hierarchical_visitor {
-public:
-   fixup_ir_call_visitor(struct hash_table *ht)
-   {
-      this->ht = ht;
-   }
-
-   virtual ir_visitor_status visit_enter(ir_call *ir)
-   {
-      /* Try to find the function signature referenced by the ir_call in the
-       * table.  If it is found, replace it with the value from the table.
-       */
-      ir_function_signature *sig =
-	 (ir_function_signature *) hash_table_find(this->ht, ir->get_callee());
-      if (sig != NULL)
-	 ir->set_callee(sig);
-
-      /* Since this may be used before function call parameters are flattened,
-       * the children also need to be processed.
-       */
-      return visit_continue;
-   }
-
-private:
-   struct hash_table *ht;
-};
-
-
-static void
-fixup_function_calls(struct hash_table *ht, exec_list *instructions)
-{
-   fixup_ir_call_visitor v(ht);
-   v.run(instructions);
-}
-
-
-void
-clone_ir_list(void *mem_ctx, exec_list *out, const exec_list *in)
-{
-   struct hash_table *ht =
-      hash_table_ctor(0, hash_table_pointer_hash, hash_table_pointer_compare);
-
-   foreach_list_const(node, in) {
-      const ir_instruction *const original = (ir_instruction *) node;
-      ir_instruction *copy = original->clone(mem_ctx, ht);
-
-      out->push_tail(copy);
-   }
-
-   /* Make a pass over the cloned tree to fix up ir_call nodes to point to the
-    * cloned ir_function_signature nodes.  This cannot be done automatically
-    * during cloning because the ir_call might be a forward reference (i.e.,
-    * the function signature that it references may not have been cloned yet).
-    */
-   fixup_function_calls(ht, out);
-
-   hash_table_dtor(ht);
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#include <string.h>

+#include "main/compiler.h"

+#include "ir.h"

+#include "glsl_types.h"

+extern "C" {

+#include "program/hash_table.h"

+}

+

+/**

+ * Duplicate an IR variable

+ *

+ * \note

+ * This will probably be made \c virtual and moved to the base class

+ * eventually.

+ */

+ir_variable *

+ir_variable::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_variable *var = new(mem_ctx) ir_variable(this->type, this->name,

+					       (ir_variable_mode) this->mode);

+

+   var->max_array_access = this->max_array_access;

+   var->read_only = this->read_only;

+   var->centroid = this->centroid;

+   var->invariant = this->invariant;

+   var->interpolation = this->interpolation;

+   var->array_lvalue = this->array_lvalue;

+   var->location = this->location;

+   var->warn_extension = this->warn_extension;

+   var->origin_upper_left = this->origin_upper_left;

+   var->pixel_center_integer = this->pixel_center_integer;

+   var->explicit_location = this->explicit_location;

+

+   var->num_state_slots = this->num_state_slots;

+   if (this->state_slots) {

+      /* FINISHME: This really wants to use something like talloc_reference, but

+       * FINISHME: ralloc doesn't have any similar function.

+       */

+      var->state_slots = ralloc_array(var, ir_state_slot,

+				      this->num_state_slots);

+      memcpy(var->state_slots, this->state_slots,

+	     sizeof(this->state_slots[0]) * var->num_state_slots);

+   }

+

+   if (this->explicit_location)

+      var->location = this->location;

+

+   if (this->constant_value)

+      var->constant_value = this->constant_value->clone(mem_ctx, ht);

+

+   if (ht) {

+      hash_table_insert(ht, var, (void *)const_cast<ir_variable *>(this));

+   }

+

+   return var;

+}

+

+ir_swizzle *

+ir_swizzle::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   return new(mem_ctx) ir_swizzle(this->val->clone(mem_ctx, ht), this->mask);

+}

+

+ir_return *

+ir_return::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_rvalue *new_value = NULL;

+

+   if (this->value)

+      new_value = this->value->clone(mem_ctx, ht);

+

+   return new(mem_ctx) ir_return(new_value);

+}

+

+ir_discard *

+ir_discard::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_rvalue *new_condition = NULL;

+

+   if (this->condition != NULL)

+      new_condition = this->condition->clone(mem_ctx, ht);

+

+   return new(mem_ctx) ir_discard(new_condition);

+}

+

+ir_loop_jump *

+ir_loop_jump::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   (void)ht;

+

+   return new(mem_ctx) ir_loop_jump(this->mode);

+}

+

+ir_if *

+ir_if::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_if *new_if = new(mem_ctx) ir_if(this->condition->clone(mem_ctx, ht));

+

+   foreach_iter(exec_list_iterator, iter, this->then_instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      new_if->then_instructions.push_tail(ir->clone(mem_ctx, ht));

+   }

+

+   foreach_iter(exec_list_iterator, iter, this->else_instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      new_if->else_instructions.push_tail(ir->clone(mem_ctx, ht));

+   }

+

+   return new_if;

+}

+

+ir_loop *

+ir_loop::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_loop *new_loop = new(mem_ctx) ir_loop();

+

+   if (this->from)

+      new_loop->from = this->from->clone(mem_ctx, ht);

+   if (this->to)

+      new_loop->to = this->to->clone(mem_ctx, ht);

+   if (this->increment)

+      new_loop->increment = this->increment->clone(mem_ctx, ht);

+   new_loop->counter = counter;

+

+   foreach_iter(exec_list_iterator, iter, this->body_instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      new_loop->body_instructions.push_tail(ir->clone(mem_ctx, ht));

+   }

+

+   new_loop->cmp = this->cmp;

+   return new_loop;

+}

+

+ir_call *

+ir_call::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   if (this->type == glsl_type::error_type)

+      return ir_call::get_error_instruction(mem_ctx);

+

+   exec_list new_parameters;

+

+   foreach_iter(exec_list_iterator, iter, this->actual_parameters) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      new_parameters.push_tail(ir->clone(mem_ctx, ht));

+   }

+

+   return new(mem_ctx) ir_call(this->callee, &new_parameters);

+}

+

+ir_expression *

+ir_expression::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_rvalue *op[Elements(this->operands)] = { NULL, };

+   unsigned int i;

+

+   for (i = 0; i < get_num_operands(); i++) {

+      op[i] = this->operands[i]->clone(mem_ctx, ht);

+   }

+

+   return new(mem_ctx) ir_expression(this->operation, this->type,

+				     op[0], op[1], op[2], op[3]);

+}

+

+ir_dereference_variable *

+ir_dereference_variable::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_variable *new_var;

+

+   if (ht) {

+      new_var = (ir_variable *)hash_table_find(ht, this->var);

+      if (!new_var)

+	 new_var = this->var;

+   } else {

+      new_var = this->var;

+   }

+

+   return new(mem_ctx) ir_dereference_variable(new_var);

+}

+

+ir_dereference_array *

+ir_dereference_array::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   return new(mem_ctx) ir_dereference_array(this->array->clone(mem_ctx, ht),

+					    this->array_index->clone(mem_ctx,

+								     ht));

+}

+

+ir_dereference_record *

+ir_dereference_record::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   return new(mem_ctx) ir_dereference_record(this->record->clone(mem_ctx, ht),

+					     this->field);

+}

+

+ir_texture *

+ir_texture::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_texture *new_tex = new(mem_ctx) ir_texture(this->op);

+   new_tex->type = this->type;

+

+   new_tex->sampler = this->sampler->clone(mem_ctx, ht);

+   new_tex->coordinate = this->coordinate->clone(mem_ctx, ht);

+   if (this->projector)

+      new_tex->projector = this->projector->clone(mem_ctx, ht);

+   if (this->shadow_comparitor) {

+      new_tex->shadow_comparitor = this->shadow_comparitor->clone(mem_ctx, ht);

+   }

+

+   if (this->offset != NULL)

+      new_tex->offset = this->offset->clone(mem_ctx, ht);

+

+   switch (this->op) {

+   case ir_tex:

+      break;

+   case ir_txb:

+      new_tex->lod_info.bias = this->lod_info.bias->clone(mem_ctx, ht);

+      break;

+   case ir_txl:

+   case ir_txf:

+      new_tex->lod_info.lod = this->lod_info.lod->clone(mem_ctx, ht);

+      break;

+   case ir_txd:

+      new_tex->lod_info.grad.dPdx = this->lod_info.grad.dPdx->clone(mem_ctx, ht);

+      new_tex->lod_info.grad.dPdy = this->lod_info.grad.dPdy->clone(mem_ctx, ht);

+      break;

+   }

+

+   return new_tex;

+}

+

+ir_assignment *

+ir_assignment::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_rvalue *new_condition = NULL;

+

+   if (this->condition)

+      new_condition = this->condition->clone(mem_ctx, ht);

+

+   return new(mem_ctx) ir_assignment(this->lhs->clone(mem_ctx, ht),

+				     this->rhs->clone(mem_ctx, ht),

+				     new_condition,

+				     this->write_mask);

+}

+

+ir_function *

+ir_function::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_function *copy = new(mem_ctx) ir_function(this->name);

+

+   foreach_list_const(node, &this->signatures) {

+      const ir_function_signature *const sig =

+	 (const ir_function_signature *const) node;

+

+      ir_function_signature *sig_copy = sig->clone(mem_ctx, ht);

+      copy->add_signature(sig_copy);

+

+      if (ht != NULL)

+	 hash_table_insert(ht, sig_copy,

+			   (void *)const_cast<ir_function_signature *>(sig));

+   }

+

+   return copy;

+}

+

+ir_function_signature *

+ir_function_signature::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_function_signature *copy = this->clone_prototype(mem_ctx, ht);

+

+   copy->is_defined = this->is_defined;

+

+   /* Clone the instruction list.

+    */

+   foreach_list_const(node, &this->body) {

+      const ir_instruction *const inst = (const ir_instruction *) node;

+

+      ir_instruction *const inst_copy = inst->clone(mem_ctx, ht);

+      copy->body.push_tail(inst_copy);

+   }

+

+   return copy;

+}

+

+ir_function_signature *

+ir_function_signature::clone_prototype(void *mem_ctx, struct hash_table *ht) const

+{

+   ir_function_signature *copy =

+      new(mem_ctx) ir_function_signature(this->return_type);

+

+   copy->is_defined = false;

+   copy->is_builtin = this->is_builtin;

+

+   /* Clone the parameter list, but NOT the body.

+    */

+   foreach_list_const(node, &this->parameters) {

+      const ir_variable *const param = (const ir_variable *) node;

+

+      assert(const_cast<ir_variable *>(param)->as_variable() != NULL);

+

+      ir_variable *const param_copy = param->clone(mem_ctx, ht);

+      copy->parameters.push_tail(param_copy);

+   }

+

+   return copy;

+}

+

+ir_constant *

+ir_constant::clone(void *mem_ctx, struct hash_table *ht) const

+{

+   (void)ht;

+

+   switch (this->type->base_type) {

+   case GLSL_TYPE_UINT:

+   case GLSL_TYPE_INT:

+   case GLSL_TYPE_FLOAT:

+   case GLSL_TYPE_BOOL:

+      return new(mem_ctx) ir_constant(this->type, &this->value);

+

+   case GLSL_TYPE_STRUCT: {

+      ir_constant *c = new(mem_ctx) ir_constant;

+

+      c->type = this->type;

+      for (exec_node *node = this->components.head

+	      ; !node->is_tail_sentinel()

+	      ; node = node->next) {

+	 ir_constant *const orig = (ir_constant *) node;

+

+	 c->components.push_tail(orig->clone(mem_ctx, NULL));

+      }

+

+      return c;

+   }

+

+   case GLSL_TYPE_ARRAY: {

+      ir_constant *c = new(mem_ctx) ir_constant;

+

+      c->type = this->type;

+      c->array_elements = ralloc_array(c, ir_constant *, this->type->length);

+      for (unsigned i = 0; i < this->type->length; i++) {

+	 c->array_elements[i] = this->array_elements[i]->clone(mem_ctx, NULL);

+      }

+      return c;

+   }

+

+   default:

+      assert(!"Should not get here.");

+      return NULL;

+   }

+}

+

+

+class fixup_ir_call_visitor : public ir_hierarchical_visitor {

+public:

+   fixup_ir_call_visitor(struct hash_table *ht)

+   {

+      this->ht = ht;

+   }

+

+   virtual ir_visitor_status visit_enter(ir_call *ir)

+   {

+      /* Try to find the function signature referenced by the ir_call in the

+       * table.  If it is found, replace it with the value from the table.

+       */

+      ir_function_signature *sig =

+	 (ir_function_signature *) hash_table_find(this->ht, ir->get_callee());

+      if (sig != NULL)

+	 ir->set_callee(sig);

+

+      /* Since this may be used before function call parameters are flattened,

+       * the children also need to be processed.

+       */

+      return visit_continue;

+   }

+

+private:

+   struct hash_table *ht;

+};

+

+

+static void

+fixup_function_calls(struct hash_table *ht, exec_list *instructions)

+{

+   fixup_ir_call_visitor v(ht);

+   v.run(instructions);

+}

+

+

+void

+clone_ir_list(void *mem_ctx, exec_list *out, const exec_list *in)

+{

+   struct hash_table *ht =

+      hash_table_ctor(0, hash_table_pointer_hash, hash_table_pointer_compare);

+

+   foreach_list_const(node, in) {

+      const ir_instruction *const original = (ir_instruction *) node;

+      ir_instruction *copy = original->clone(mem_ctx, ht);

+

+      out->push_tail(copy);

+   }

+

+   /* Make a pass over the cloned tree to fix up ir_call nodes to point to the

+    * cloned ir_function_signature nodes.  This cannot be done automatically

+    * during cloning because the ir_call might be a forward reference (i.e.,

+    * the function signature that it references may not have been cloned yet).

+    */

+   fixup_function_calls(ht, out);

+

+   hash_table_dtor(ht);

+}

diff --git a/mesalib/src/glsl/ir_constant_expression.cpp b/mesalib/src/glsl/ir_constant_expression.cpp
index 2a3084896..1d39e31fa 100644
--- a/mesalib/src/glsl/ir_constant_expression.cpp
+++ b/mesalib/src/glsl/ir_constant_expression.cpp
@@ -1,1372 +1,1372 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file ir_constant_expression.cpp
- * Evaluate and process constant valued expressions
- *
- * In GLSL, constant valued expressions are used in several places.  These
- * must be processed and evaluated very early in the compilation process.
- *
- *    * Sizes of arrays
- *    * Initializers for uniforms
- *    * Initializers for \c const variables
- */
-
-#include <math.h>
-#include "main/core.h" /* for MAX2, MIN2, CLAMP */
-#include "ir.h"
-#include "ir_visitor.h"
-#include "glsl_types.h"
-
-static float
-dot(ir_constant *op0, ir_constant *op1)
-{
-   assert(op0->type->is_float() && op1->type->is_float());
-
-   float result = 0;
-   for (unsigned c = 0; c < op0->type->components(); c++)
-      result += op0->value.f[c] * op1->value.f[c];
-
-   return result;
-}
-
-ir_constant *
-ir_expression::constant_expression_value()
-{
-   if (this->type->is_error())
-      return NULL;
-
-   ir_constant *op[Elements(this->operands)] = { NULL, };
-   ir_constant_data data;
-
-   memset(&data, 0, sizeof(data));
-
-   for (unsigned operand = 0; operand < this->get_num_operands(); operand++) {
-      op[operand] = this->operands[operand]->constant_expression_value();
-      if (!op[operand])
-	 return NULL;
-   }
-
-   if (op[1] != NULL)
-      assert(op[0]->type->base_type == op[1]->type->base_type);
-
-   bool op0_scalar = op[0]->type->is_scalar();
-   bool op1_scalar = op[1] != NULL && op[1]->type->is_scalar();
-
-   /* When iterating over a vector or matrix's components, we want to increase
-    * the loop counter.  However, for scalars, we want to stay at 0.
-    */
-   unsigned c0_inc = op0_scalar ? 0 : 1;
-   unsigned c1_inc = op1_scalar ? 0 : 1;
-   unsigned components;
-   if (op1_scalar || !op[1]) {
-      components = op[0]->type->components();
-   } else {
-      components = op[1]->type->components();
-   }
-
-   void *ctx = ralloc_parent(this);
-
-   /* Handle array operations here, rather than below. */
-   if (op[0]->type->is_array()) {
-      assert(op[1] != NULL && op[1]->type->is_array());
-      switch (this->operation) {
-      case ir_binop_all_equal:
-	 return new(ctx) ir_constant(op[0]->has_value(op[1]));
-      case ir_binop_any_nequal:
-	 return new(ctx) ir_constant(!op[0]->has_value(op[1]));
-      default:
-	 break;
-      }
-      return NULL;
-   }
-
-   switch (this->operation) {
-   case ir_unop_bit_not:
-       switch (op[0]->type->base_type) {
-       case GLSL_TYPE_INT:
-           for (unsigned c = 0; c < components; c++)
-               data.i[c] = ~ op[0]->value.i[c];
-           break;
-       case GLSL_TYPE_UINT:
-           for (unsigned c = 0; c < components; c++)
-               data.u[c] = ~ op[0]->value.u[c];
-           break;
-       default:
-           assert(0);
-       }
-       break;
-
-   case ir_unop_logic_not:
-      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.b[c] = !op[0]->value.b[c];
-      break;
-
-   case ir_unop_f2i:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.i[c] = (int) op[0]->value.f[c];
-      }
-      break;
-   case ir_unop_i2f:
-      assert(op[0]->type->base_type == GLSL_TYPE_INT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = (float) op[0]->value.i[c];
-      }
-      break;
-   case ir_unop_u2f:
-      assert(op[0]->type->base_type == GLSL_TYPE_UINT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = (float) op[0]->value.u[c];
-      }
-      break;
-   case ir_unop_b2f:
-      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = op[0]->value.b[c] ? 1.0F : 0.0F;
-      }
-      break;
-   case ir_unop_f2b:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.b[c] = op[0]->value.f[c] != 0.0F ? true : false;
-      }
-      break;
-   case ir_unop_b2i:
-      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.u[c] = op[0]->value.b[c] ? 1 : 0;
-      }
-      break;
-   case ir_unop_i2b:
-      assert(op[0]->type->is_integer());
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.b[c] = op[0]->value.u[c] ? true : false;
-      }
-      break;
-
-   case ir_unop_any:
-      assert(op[0]->type->is_boolean());
-      data.b[0] = false;
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 if (op[0]->value.b[c])
-	    data.b[0] = true;
-      }
-      break;
-
-   case ir_unop_trunc:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = truncf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_ceil:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = ceilf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_floor:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = floorf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_fract:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (this->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.u[c] = 0;
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.i[c] = 0;
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.f[c] = op[0]->value.f[c] - floor(op[0]->value.f[c]);
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-
-   case ir_unop_sin:
-   case ir_unop_sin_reduced:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = sinf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_cos:
-   case ir_unop_cos_reduced:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = cosf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_neg:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (this->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.u[c] = -((int) op[0]->value.u[c]);
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.i[c] = -op[0]->value.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.f[c] = -op[0]->value.f[c];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-
-   case ir_unop_abs:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (this->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.u[c] = op[0]->value.u[c];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.i[c] = op[0]->value.i[c];
-	    if (data.i[c] < 0)
-	       data.i[c] = -data.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.f[c] = fabs(op[0]->value.f[c]);
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-
-   case ir_unop_sign:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (this->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.u[c] = op[0]->value.i[c] > 0;
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.i[c] = (op[0]->value.i[c] > 0) - (op[0]->value.i[c] < 0);
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.f[c] = float((op[0]->value.f[c] > 0)-(op[0]->value.f[c] < 0));
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-
-   case ir_unop_rcp:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (this->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    if (op[0]->value.u[c] != 0.0)
-	       data.u[c] = 1 / op[0]->value.u[c];
-	    break;
-	 case GLSL_TYPE_INT:
-	    if (op[0]->value.i[c] != 0.0)
-	       data.i[c] = 1 / op[0]->value.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    if (op[0]->value.f[c] != 0.0)
-	       data.f[c] = 1.0F / op[0]->value.f[c];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-
-   case ir_unop_rsq:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = 1.0F / sqrtf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_sqrt:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = sqrtf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_exp:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = expf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_exp2:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = exp2f(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_log:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = logf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_log2:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = log2f(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_dFdx:
-   case ir_unop_dFdy:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = 0.0;
-      }
-      break;
-
-   case ir_binop_pow:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 data.f[c] = powf(op[0]->value.f[c], op[1]->value.f[c]);
-      }
-      break;
-
-   case ir_binop_dot:
-      data.f[0] = dot(op[0], op[1]);
-      break;
-
-   case ir_binop_min:
-      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
-      for (unsigned c = 0, c0 = 0, c1 = 0;
-	   c < components;
-	   c0 += c0_inc, c1 += c1_inc, c++) {
-
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.u[c] = MIN2(op[0]->value.u[c0], op[1]->value.u[c1]);
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.i[c] = MIN2(op[0]->value.i[c0], op[1]->value.i[c1]);
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.f[c] = MIN2(op[0]->value.f[c0], op[1]->value.f[c1]);
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-
-      break;
-   case ir_binop_max:
-      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
-      for (unsigned c = 0, c0 = 0, c1 = 0;
-	   c < components;
-	   c0 += c0_inc, c1 += c1_inc, c++) {
-
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.u[c] = MAX2(op[0]->value.u[c0], op[1]->value.u[c1]);
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.i[c] = MAX2(op[0]->value.i[c0], op[1]->value.i[c1]);
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.f[c] = MAX2(op[0]->value.f[c0], op[1]->value.f[c1]);
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-
-   case ir_binop_add:
-      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
-      for (unsigned c = 0, c0 = 0, c1 = 0;
-	   c < components;
-	   c0 += c0_inc, c1 += c1_inc, c++) {
-
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.u[c] = op[0]->value.u[c0] + op[1]->value.u[c1];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.i[c] = op[0]->value.i[c0] + op[1]->value.i[c1];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.f[c] = op[0]->value.f[c0] + op[1]->value.f[c1];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-
-      break;
-   case ir_binop_sub:
-      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
-      for (unsigned c = 0, c0 = 0, c1 = 0;
-	   c < components;
-	   c0 += c0_inc, c1 += c1_inc, c++) {
-
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.u[c] = op[0]->value.u[c0] - op[1]->value.u[c1];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.i[c] = op[0]->value.i[c0] - op[1]->value.i[c1];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.f[c] = op[0]->value.f[c0] - op[1]->value.f[c1];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-
-      break;
-   case ir_binop_mul:
-      /* Check for equal types, or unequal types involving scalars */
-      if ((op[0]->type == op[1]->type && !op[0]->type->is_matrix())
-	  || op0_scalar || op1_scalar) {
-	 for (unsigned c = 0, c0 = 0, c1 = 0;
-	      c < components;
-	      c0 += c0_inc, c1 += c1_inc, c++) {
-
-	    switch (op[0]->type->base_type) {
-	    case GLSL_TYPE_UINT:
-	       data.u[c] = op[0]->value.u[c0] * op[1]->value.u[c1];
-	       break;
-	    case GLSL_TYPE_INT:
-	       data.i[c] = op[0]->value.i[c0] * op[1]->value.i[c1];
-	       break;
-	    case GLSL_TYPE_FLOAT:
-	       data.f[c] = op[0]->value.f[c0] * op[1]->value.f[c1];
-	       break;
-	    default:
-	       assert(0);
-	    }
-	 }
-      } else {
-	 assert(op[0]->type->is_matrix() || op[1]->type->is_matrix());
-
-	 /* Multiply an N-by-M matrix with an M-by-P matrix.  Since either
-	  * matrix can be a GLSL vector, either N or P can be 1.
-	  *
-	  * For vec*mat, the vector is treated as a row vector.  This
-	  * means the vector is a 1-row x M-column matrix.
-	  *
-	  * For mat*vec, the vector is treated as a column vector.  Since
-	  * matrix_columns is 1 for vectors, this just works.
-	  */
-	 const unsigned n = op[0]->type->is_vector()
-	    ? 1 : op[0]->type->vector_elements;
-	 const unsigned m = op[1]->type->vector_elements;
-	 const unsigned p = op[1]->type->matrix_columns;
-	 for (unsigned j = 0; j < p; j++) {
-	    for (unsigned i = 0; i < n; i++) {
-	       for (unsigned k = 0; k < m; k++) {
-		  data.f[i+n*j] += op[0]->value.f[i+n*k]*op[1]->value.f[k+m*j];
-	       }
-	    }
-	 }
-      }
-
-      break;
-   case ir_binop_div:
-      /* FINISHME: Emit warning when division-by-zero is detected. */
-      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
-      for (unsigned c = 0, c0 = 0, c1 = 0;
-	   c < components;
-	   c0 += c0_inc, c1 += c1_inc, c++) {
-
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    if (op[1]->value.u[c1] == 0) {
-	       data.u[c] = 0;
-	    } else {
-	       data.u[c] = op[0]->value.u[c0] / op[1]->value.u[c1];
-	    }
-	    break;
-	 case GLSL_TYPE_INT:
-	    if (op[1]->value.i[c1] == 0) {
-	       data.i[c] = 0;
-	    } else {
-	       data.i[c] = op[0]->value.i[c0] / op[1]->value.i[c1];
-	    }
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.f[c] = op[0]->value.f[c0] / op[1]->value.f[c1];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-
-      break;
-   case ir_binop_mod:
-      /* FINISHME: Emit warning when division-by-zero is detected. */
-      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
-      for (unsigned c = 0, c0 = 0, c1 = 0;
-	   c < components;
-	   c0 += c0_inc, c1 += c1_inc, c++) {
-
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    if (op[1]->value.u[c1] == 0) {
-	       data.u[c] = 0;
-	    } else {
-	       data.u[c] = op[0]->value.u[c0] % op[1]->value.u[c1];
-	    }
-	    break;
-	 case GLSL_TYPE_INT:
-	    if (op[1]->value.i[c1] == 0) {
-	       data.i[c] = 0;
-	    } else {
-	       data.i[c] = op[0]->value.i[c0] % op[1]->value.i[c1];
-	    }
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    /* We don't use fmod because it rounds toward zero; GLSL specifies
-	     * the use of floor.
-	     */
-	    data.f[c] = op[0]->value.f[c0] - op[1]->value.f[c1]
-	       * floorf(op[0]->value.f[c0] / op[1]->value.f[c1]);
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-
-      break;
-
-   case ir_binop_logic_and:
-      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.b[c] = op[0]->value.b[c] && op[1]->value.b[c];
-      break;
-   case ir_binop_logic_xor:
-      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.b[c] = op[0]->value.b[c] ^ op[1]->value.b[c];
-      break;
-   case ir_binop_logic_or:
-      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.b[c] = op[0]->value.b[c] || op[1]->value.b[c];
-      break;
-
-   case ir_binop_less:
-      assert(op[0]->type == op[1]->type);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[0] = op[0]->value.u[0] < op[1]->value.u[0];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[0] = op[0]->value.i[0] < op[1]->value.i[0];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[0] = op[0]->value.f[0] < op[1]->value.f[0];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-   case ir_binop_greater:
-      assert(op[0]->type == op[1]->type);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[c] = op[0]->value.u[c] > op[1]->value.u[c];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[c] = op[0]->value.i[c] > op[1]->value.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[c] = op[0]->value.f[c] > op[1]->value.f[c];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-   case ir_binop_lequal:
-      assert(op[0]->type == op[1]->type);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[0] = op[0]->value.u[0] <= op[1]->value.u[0];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[0] = op[0]->value.i[0] <= op[1]->value.i[0];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[0] = op[0]->value.f[0] <= op[1]->value.f[0];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-   case ir_binop_gequal:
-      assert(op[0]->type == op[1]->type);
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[0] = op[0]->value.u[0] >= op[1]->value.u[0];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[0] = op[0]->value.i[0] >= op[1]->value.i[0];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[0] = op[0]->value.f[0] >= op[1]->value.f[0];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-   case ir_binop_equal:
-      assert(op[0]->type == op[1]->type);
-      for (unsigned c = 0; c < components; c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[c] = op[0]->value.u[c] == op[1]->value.u[c];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[c] = op[0]->value.i[c] == op[1]->value.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[c] = op[0]->value.f[c] == op[1]->value.f[c];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-   case ir_binop_nequal:
-      assert(op[0]->type != op[1]->type);
-      for (unsigned c = 0; c < components; c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[c] = op[0]->value.u[c] != op[1]->value.u[c];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[c] = op[0]->value.i[c] != op[1]->value.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[c] = op[0]->value.f[c] != op[1]->value.f[c];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-   case ir_binop_all_equal:
-      data.b[0] = op[0]->has_value(op[1]);
-      break;
-   case ir_binop_any_nequal:
-      data.b[0] = !op[0]->has_value(op[1]);
-      break;
-
-   case ir_binop_lshift:
-      for (unsigned c = 0, c0 = 0, c1 = 0;
-           c < components;
-           c0 += c0_inc, c1 += c1_inc, c++) {
-
-          if (op[0]->type->base_type == GLSL_TYPE_INT &&
-              op[1]->type->base_type == GLSL_TYPE_INT) {
-              data.i[c] = op[0]->value.i[c0] << op[1]->value.i[c1];
-
-          } else if (op[0]->type->base_type == GLSL_TYPE_INT &&
-                     op[1]->type->base_type == GLSL_TYPE_UINT) {
-              data.i[c] = op[0]->value.i[c0] << op[1]->value.u[c1];
-
-          } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&
-                     op[1]->type->base_type == GLSL_TYPE_INT) {
-              data.u[c] = op[0]->value.u[c0] << op[1]->value.i[c1];
-
-          } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&
-                     op[1]->type->base_type == GLSL_TYPE_UINT) {
-              data.u[c] = op[0]->value.u[c0] << op[1]->value.u[c1];
-          }
-      }
-      break;
-
-   case ir_binop_rshift:
-       for (unsigned c = 0, c0 = 0, c1 = 0;
-            c < components;
-            c0 += c0_inc, c1 += c1_inc, c++) {
-
-           if (op[0]->type->base_type == GLSL_TYPE_INT &&
-               op[1]->type->base_type == GLSL_TYPE_INT) {
-               data.i[c] = op[0]->value.i[c0] >> op[1]->value.i[c1];
-
-           } else if (op[0]->type->base_type == GLSL_TYPE_INT &&
-                      op[1]->type->base_type == GLSL_TYPE_UINT) {
-               data.i[c] = op[0]->value.i[c0] >> op[1]->value.u[c1];
-
-           } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&
-                      op[1]->type->base_type == GLSL_TYPE_INT) {
-               data.u[c] = op[0]->value.u[c0] >> op[1]->value.i[c1];
-
-           } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&
-                      op[1]->type->base_type == GLSL_TYPE_UINT) {
-               data.u[c] = op[0]->value.u[c0] >> op[1]->value.u[c1];
-           }
-       }
-       break;
-
-   case ir_binop_bit_and:
-      for (unsigned c = 0, c0 = 0, c1 = 0;
-           c < components;
-           c0 += c0_inc, c1 += c1_inc, c++) {
-
-          switch (op[0]->type->base_type) {
-          case GLSL_TYPE_INT:
-              data.i[c] = op[0]->value.i[c0] & op[1]->value.i[c1];
-              break;
-          case GLSL_TYPE_UINT:
-              data.u[c] = op[0]->value.u[c0] & op[1]->value.u[c1];
-              break;
-          default:
-              assert(0);
-          }
-      }
-      break;
-
-   case ir_binop_bit_or:
-      for (unsigned c = 0, c0 = 0, c1 = 0;
-           c < components;
-           c0 += c0_inc, c1 += c1_inc, c++) {
-
-          switch (op[0]->type->base_type) {
-          case GLSL_TYPE_INT:
-              data.i[c] = op[0]->value.i[c0] | op[1]->value.i[c1];
-              break;
-          case GLSL_TYPE_UINT:
-              data.u[c] = op[0]->value.u[c0] | op[1]->value.u[c1];
-              break;
-          default:
-              assert(0);
-          }
-      }
-      break;
-
-   case ir_binop_bit_xor:
-      for (unsigned c = 0, c0 = 0, c1 = 0;
-           c < components;
-           c0 += c0_inc, c1 += c1_inc, c++) {
-
-          switch (op[0]->type->base_type) {
-          case GLSL_TYPE_INT:
-              data.i[c] = op[0]->value.i[c0] ^ op[1]->value.i[c1];
-              break;
-          case GLSL_TYPE_UINT:
-              data.u[c] = op[0]->value.u[c0] ^ op[1]->value.u[c1];
-              break;
-          default:
-              assert(0);
-          }
-      }
-      break;
-
-   case ir_quadop_vector:
-      for (unsigned c = 0; c < this->type->vector_elements; c++) {
-	 switch (this->type->base_type) {
-	 case GLSL_TYPE_INT:
-	    data.i[c] = op[c]->value.i[0];
-	    break;
-	 case GLSL_TYPE_UINT:
-	    data.u[c] = op[c]->value.u[0];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.f[c] = op[c]->value.f[0];
-	    break;
-	 default:
-	    assert(0);
-	 }
-      }
-      break;
-
-   default:
-      /* FINISHME: Should handle all expression types. */
-      return NULL;
-   }
-
-   return new(ctx) ir_constant(this->type, &data);
-}
-
-
-ir_constant *
-ir_texture::constant_expression_value()
-{
-   /* texture lookups aren't constant expressions */
-   return NULL;
-}
-
-
-ir_constant *
-ir_swizzle::constant_expression_value()
-{
-   ir_constant *v = this->val->constant_expression_value();
-
-   if (v != NULL) {
-      ir_constant_data data = { { 0 } };
-
-      const unsigned swiz_idx[4] = {
-	 this->mask.x, this->mask.y, this->mask.z, this->mask.w
-      };
-
-      for (unsigned i = 0; i < this->mask.num_components; i++) {
-	 switch (v->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	 case GLSL_TYPE_INT:   data.u[i] = v->value.u[swiz_idx[i]]; break;
-	 case GLSL_TYPE_FLOAT: data.f[i] = v->value.f[swiz_idx[i]]; break;
-	 case GLSL_TYPE_BOOL:  data.b[i] = v->value.b[swiz_idx[i]]; break;
-	 default:              assert(!"Should not get here."); break;
-	 }
-      }
-
-      void *ctx = ralloc_parent(this);
-      return new(ctx) ir_constant(this->type, &data);
-   }
-   return NULL;
-}
-
-
-ir_constant *
-ir_dereference_variable::constant_expression_value()
-{
-   /* This may occur during compile and var->type is glsl_type::error_type */
-   if (!var)
-      return NULL;
-
-   /* The constant_value of a uniform variable is its initializer,
-    * not the lifetime constant value of the uniform.
-    */
-   if (var->mode == ir_var_uniform)
-      return NULL;
-
-   if (!var->constant_value)
-      return NULL;
-
-   return var->constant_value->clone(ralloc_parent(var), NULL);
-}
-
-
-ir_constant *
-ir_dereference_array::constant_expression_value()
-{
-   ir_constant *array = this->array->constant_expression_value();
-   ir_constant *idx = this->array_index->constant_expression_value();
-
-   if ((array != NULL) && (idx != NULL)) {
-      void *ctx = ralloc_parent(this);
-      if (array->type->is_matrix()) {
-	 /* Array access of a matrix results in a vector.
-	  */
-	 const unsigned column = idx->value.u[0];
-
-	 const glsl_type *const column_type = array->type->column_type();
-
-	 /* Offset in the constant matrix to the first element of the column
-	  * to be extracted.
-	  */
-	 const unsigned mat_idx = column * column_type->vector_elements;
-
-	 ir_constant_data data = { { 0 } };
-
-	 switch (column_type->base_type) {
-	 case GLSL_TYPE_UINT:
-	 case GLSL_TYPE_INT:
-	    for (unsigned i = 0; i < column_type->vector_elements; i++)
-	       data.u[i] = array->value.u[mat_idx + i];
-
-	    break;
-
-	 case GLSL_TYPE_FLOAT:
-	    for (unsigned i = 0; i < column_type->vector_elements; i++)
-	       data.f[i] = array->value.f[mat_idx + i];
-
-	    break;
-
-	 default:
-	    assert(!"Should not get here.");
-	    break;
-	 }
-
-	 return new(ctx) ir_constant(column_type, &data);
-      } else if (array->type->is_vector()) {
-	 const unsigned component = idx->value.u[0];
-
-	 return new(ctx) ir_constant(array, component);
-      } else {
-	 const unsigned index = idx->value.u[0];
-	 return array->get_array_element(index)->clone(ctx, NULL);
-      }
-   }
-   return NULL;
-}
-
-
-ir_constant *
-ir_dereference_record::constant_expression_value()
-{
-   ir_constant *v = this->record->constant_expression_value();
-
-   return (v != NULL) ? v->get_record_field(this->field) : NULL;
-}
-
-
-ir_constant *
-ir_assignment::constant_expression_value()
-{
-   /* FINISHME: Handle CEs involving assignment (return RHS) */
-   return NULL;
-}
-
-
-ir_constant *
-ir_constant::constant_expression_value()
-{
-   return this;
-}
-
-
-ir_constant *
-ir_call::constant_expression_value()
-{
-   if (this->type == glsl_type::error_type)
-      return NULL;
-
-   /* From the GLSL 1.20 spec, page 23:
-    * "Function calls to user-defined functions (non-built-in functions)
-    *  cannot be used to form constant expressions."
-    */
-   if (!this->callee->is_builtin)
-      return NULL;
-
-   unsigned num_parameters = 0;
-
-   /* Check if all parameters are constant */
-   ir_constant *op[3];
-   foreach_list(n, &this->actual_parameters) {
-      ir_constant *constant = ((ir_rvalue *) n)->constant_expression_value();
-      if (constant == NULL)
-	 return NULL;
-
-      op[num_parameters] = constant;
-
-      assert(num_parameters < 3);
-      num_parameters++;
-   }
-
-   /* Individual cases below can either:
-    * - Assign "expr" a new ir_expression to evaluate (for basic opcodes)
-    * - Fill "data" with appopriate constant data
-    * - Return an ir_constant directly.
-    */
-   void *mem_ctx = ralloc_parent(this);
-   ir_expression *expr = NULL;
-
-   ir_constant_data data;
-   memset(&data, 0, sizeof(data));
-
-   const char *callee = this->callee_name();
-   if (strcmp(callee, "abs") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_abs, type, op[0], NULL);
-   } else if (strcmp(callee, "all") == 0) {
-      assert(op[0]->type->is_boolean());
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 if (!op[0]->value.b[c])
-	    return new(mem_ctx) ir_constant(false);
-      }
-      return new(mem_ctx) ir_constant(true);
-   } else if (strcmp(callee, "any") == 0) {
-      assert(op[0]->type->is_boolean());
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 if (op[0]->value.b[c])
-	    return new(mem_ctx) ir_constant(true);
-      }
-      return new(mem_ctx) ir_constant(false);
-   } else if (strcmp(callee, "acos") == 0) {
-      assert(op[0]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = acosf(op[0]->value.f[c]);
-   } else if (strcmp(callee, "acosh") == 0) {
-      assert(op[0]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = acoshf(op[0]->value.f[c]);
-   } else if (strcmp(callee, "asin") == 0) {
-      assert(op[0]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = asinf(op[0]->value.f[c]);
-   } else if (strcmp(callee, "asinh") == 0) {
-      assert(op[0]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = asinhf(op[0]->value.f[c]);
-   } else if (strcmp(callee, "atan") == 0) {
-      assert(op[0]->type->is_float());
-      if (num_parameters == 2) {
-	 assert(op[1]->type->is_float());
-	 for (unsigned c = 0; c < op[0]->type->components(); c++)
-	    data.f[c] = atan2f(op[0]->value.f[c], op[1]->value.f[c]);
-      } else {
-	 for (unsigned c = 0; c < op[0]->type->components(); c++)
-	    data.f[c] = atanf(op[0]->value.f[c]);
-      }
-   } else if (strcmp(callee, "atanh") == 0) {
-      assert(op[0]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = atanhf(op[0]->value.f[c]);
-   } else if (strcmp(callee, "dFdx") == 0 || strcmp(callee, "dFdy") == 0) {
-      return ir_constant::zero(mem_ctx, this->type);
-   } else if (strcmp(callee, "ceil") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_ceil, type, op[0], NULL);
-   } else if (strcmp(callee, "clamp") == 0) {
-      assert(num_parameters == 3);
-      unsigned c1_inc = op[1]->type->is_scalar() ? 0 : 1;
-      unsigned c2_inc = op[2]->type->is_scalar() ? 0 : 1;
-      for (unsigned c = 0, c1 = 0, c2 = 0;
-	   c < op[0]->type->components();
-	   c1 += c1_inc, c2 += c2_inc, c++) {
-
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.u[c] = CLAMP(op[0]->value.u[c], op[1]->value.u[c1],
-			      op[2]->value.u[c2]);
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.i[c] = CLAMP(op[0]->value.i[c], op[1]->value.i[c1],
-			      op[2]->value.i[c2]);
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.f[c] = CLAMP(op[0]->value.f[c], op[1]->value.f[c1],
-			      op[2]->value.f[c2]);
-	    break;
-	 default:
-	    assert(!"Should not get here.");
-	 }
-      }
-   } else if (strcmp(callee, "cos") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_cos, type, op[0], NULL);
-   } else if (strcmp(callee, "cosh") == 0) {
-      assert(op[0]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = coshf(op[0]->value.f[c]);
-   } else if (strcmp(callee, "cross") == 0) {
-      assert(op[0]->type == glsl_type::vec3_type);
-      assert(op[1]->type == glsl_type::vec3_type);
-      data.f[0] = (op[0]->value.f[1] * op[1]->value.f[2] -
-		   op[1]->value.f[1] * op[0]->value.f[2]);
-      data.f[1] = (op[0]->value.f[2] * op[1]->value.f[0] -
-		   op[1]->value.f[2] * op[0]->value.f[0]);
-      data.f[2] = (op[0]->value.f[0] * op[1]->value.f[1] -
-		   op[1]->value.f[0] * op[0]->value.f[1]);
-   } else if (strcmp(callee, "degrees") == 0) {
-      assert(op[0]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = 180.0F / M_PI * op[0]->value.f[c];
-   } else if (strcmp(callee, "distance") == 0) {
-      assert(op[0]->type->is_float() && op[1]->type->is_float());
-      float length_squared = 0.0;
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 float t = op[0]->value.f[c] - op[1]->value.f[c];
-	 length_squared += t * t;
-      }
-      return new(mem_ctx) ir_constant(sqrtf(length_squared));
-   } else if (strcmp(callee, "dot") == 0) {
-      return new(mem_ctx) ir_constant(dot(op[0], op[1]));
-   } else if (strcmp(callee, "equal") == 0) {
-      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[c] = op[0]->value.u[c] == op[1]->value.u[c];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[c] = op[0]->value.i[c] == op[1]->value.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[c] = op[0]->value.f[c] == op[1]->value.f[c];
-	    break;
-	 case GLSL_TYPE_BOOL:
-	    data.b[c] = op[0]->value.b[c] == op[1]->value.b[c];
-	    break;
-	 default:
-	    assert(!"Should not get here.");
-	 }
-      }
-   } else if (strcmp(callee, "exp") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_exp, type, op[0], NULL);
-   } else if (strcmp(callee, "exp2") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_exp2, type, op[0], NULL);
-   } else if (strcmp(callee, "faceforward") == 0) {
-      if (dot(op[2], op[1]) < 0)
-	 return op[0];
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = -op[0]->value.f[c];
-   } else if (strcmp(callee, "floor") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_floor, type, op[0], NULL);
-   } else if (strcmp(callee, "fract") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_fract, type, op[0], NULL);
-   } else if (strcmp(callee, "fwidth") == 0) {
-      return ir_constant::zero(mem_ctx, this->type);
-   } else if (strcmp(callee, "greaterThan") == 0) {
-      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[c] = op[0]->value.u[c] > op[1]->value.u[c];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[c] = op[0]->value.i[c] > op[1]->value.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[c] = op[0]->value.f[c] > op[1]->value.f[c];
-	    break;
-	 default:
-	    assert(!"Should not get here.");
-	 }
-      }
-   } else if (strcmp(callee, "greaterThanEqual") == 0) {
-      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[c] = op[0]->value.u[c] >= op[1]->value.u[c];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[c] = op[0]->value.i[c] >= op[1]->value.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[c] = op[0]->value.f[c] >= op[1]->value.f[c];
-	    break;
-	 default:
-	    assert(!"Should not get here.");
-	 }
-      }
-   } else if (strcmp(callee, "inversesqrt") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_rsq, type, op[0], NULL);
-   } else if (strcmp(callee, "length") == 0) {
-      return new(mem_ctx) ir_constant(sqrtf(dot(op[0], op[0])));
-   } else if (strcmp(callee, "lessThan") == 0) {
-      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[c] = op[0]->value.u[c] < op[1]->value.u[c];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[c] = op[0]->value.i[c] < op[1]->value.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[c] = op[0]->value.f[c] < op[1]->value.f[c];
-	    break;
-	 default:
-	    assert(!"Should not get here.");
-	 }
-      }
-   } else if (strcmp(callee, "lessThanEqual") == 0) {
-      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[c] = op[0]->value.u[c] <= op[1]->value.u[c];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[c] = op[0]->value.i[c] <= op[1]->value.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[c] = op[0]->value.f[c] <= op[1]->value.f[c];
-	    break;
-	 default:
-	    assert(!"Should not get here.");
-	 }
-      }
-   } else if (strcmp(callee, "log") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_log, type, op[0], NULL);
-   } else if (strcmp(callee, "log2") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_log2, type, op[0], NULL);
-   } else if (strcmp(callee, "matrixCompMult") == 0) {
-      assert(op[0]->type->is_float() && op[1]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = op[0]->value.f[c] * op[1]->value.f[c];
-   } else if (strcmp(callee, "max") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_binop_max, type, op[0], op[1]);
-   } else if (strcmp(callee, "min") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_binop_min, type, op[0], op[1]);
-   } else if (strcmp(callee, "mix") == 0) {
-      assert(op[0]->type->is_float() && op[1]->type->is_float());
-      if (op[2]->type->is_float()) {
-	 unsigned c2_inc = op[2]->type->is_scalar() ? 0 : 1;
-	 unsigned components = op[0]->type->components();
-	 for (unsigned c = 0, c2 = 0; c < components; c2 += c2_inc, c++) {
-	    data.f[c] = op[0]->value.f[c] * (1 - op[2]->value.f[c2]) +
-			op[1]->value.f[c] * op[2]->value.f[c2];
-	 }
-      } else {
-	 assert(op[2]->type->is_boolean());
-	 for (unsigned c = 0; c < op[0]->type->components(); c++)
-	    data.f[c] = op[op[2]->value.b[c] ? 1 : 0]->value.f[c];
-      }
-   } else if (strcmp(callee, "mod") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_binop_mod, type, op[0], op[1]);
-   } else if (strcmp(callee, "normalize") == 0) {
-      assert(op[0]->type->is_float());
-      float length = sqrtf(dot(op[0], op[0]));
-
-      if (length == 0)
-	 return ir_constant::zero(mem_ctx, this->type);
-
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = op[0]->value.f[c] / length;
-   } else if (strcmp(callee, "not") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_logic_not, type, op[0], NULL);
-   } else if (strcmp(callee, "notEqual") == 0) {
-      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (op[0]->type->base_type) {
-	 case GLSL_TYPE_UINT:
-	    data.b[c] = op[0]->value.u[c] != op[1]->value.u[c];
-	    break;
-	 case GLSL_TYPE_INT:
-	    data.b[c] = op[0]->value.i[c] != op[1]->value.i[c];
-	    break;
-	 case GLSL_TYPE_FLOAT:
-	    data.b[c] = op[0]->value.f[c] != op[1]->value.f[c];
-	    break;
-	 case GLSL_TYPE_BOOL:
-	    data.b[c] = op[0]->value.b[c] != op[1]->value.b[c];
-	    break;
-	 default:
-	    assert(!"Should not get here.");
-	 }
-      }
-   } else if (strcmp(callee, "outerProduct") == 0) {
-      assert(op[0]->type->is_vector() && op[1]->type->is_vector());
-      const unsigned m = op[0]->type->vector_elements;
-      const unsigned n = op[1]->type->vector_elements;
-      for (unsigned j = 0; j < n; j++) {
-	 for (unsigned i = 0; i < m; i++) {
-	    data.f[i+m*j] = op[0]->value.f[i] * op[1]->value.f[j];
-	 }
-      }
-   } else if (strcmp(callee, "pow") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_binop_pow, type, op[0], op[1]);
-   } else if (strcmp(callee, "radians") == 0) {
-      assert(op[0]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = M_PI / 180.0F * op[0]->value.f[c];
-   } else if (strcmp(callee, "reflect") == 0) {
-      assert(op[0]->type->is_float());
-      float dot_NI = dot(op[1], op[0]);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = op[0]->value.f[c] - 2 * dot_NI * op[1]->value.f[c];
-   } else if (strcmp(callee, "refract") == 0) {
-      const float eta = op[2]->value.f[0];
-      const float dot_NI = dot(op[1], op[0]);
-      const float k = 1.0F - eta * eta * (1.0F - dot_NI * dot_NI);
-      if (k < 0.0) {
-	 return ir_constant::zero(mem_ctx, this->type);
-      } else {
-	 for (unsigned c = 0; c < type->components(); c++) {
-	    data.f[c] = eta * op[0]->value.f[c] - (eta * dot_NI + sqrtf(k))
-			    * op[1]->value.f[c];
-	 }
-      }
-   } else if (strcmp(callee, "sign") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_sign, type, op[0], NULL);
-   } else if (strcmp(callee, "sin") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_sin, type, op[0], NULL);
-   } else if (strcmp(callee, "sinh") == 0) {
-      assert(op[0]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = sinhf(op[0]->value.f[c]);
-   } else if (strcmp(callee, "smoothstep") == 0) {
-      assert(num_parameters == 3);
-      assert(op[1]->type == op[0]->type);
-      unsigned edge_inc = op[0]->type->is_scalar() ? 0 : 1;
-      for (unsigned c = 0, e = 0; c < type->components(); e += edge_inc, c++) {
-	 const float edge0 = op[0]->value.f[e];
-	 const float edge1 = op[1]->value.f[e];
-	 if (edge0 == edge1) {
-	    data.f[c] = 0.0; /* Avoid a crash - results are undefined anyway */
-	 } else {
-	    const float numerator = op[2]->value.f[c] - edge0;
-	    const float denominator = edge1 - edge0;
-	    const float t = CLAMP(numerator/denominator, 0, 1);
-	    data.f[c] = t * t * (3 - 2 * t);
-	 }
-      }
-   } else if (strcmp(callee, "sqrt") == 0) {
-      expr = new(mem_ctx) ir_expression(ir_unop_sqrt, type, op[0], NULL);
-   } else if (strcmp(callee, "step") == 0) {
-      assert(op[0]->type->is_float() && op[1]->type->is_float());
-      /* op[0] (edge) may be either a scalar or a vector */
-      const unsigned c0_inc = op[0]->type->is_scalar() ? 0 : 1;
-      for (unsigned c = 0, c0 = 0; c < type->components(); c0 += c0_inc, c++)
-	 data.f[c] = (op[1]->value.f[c] < op[0]->value.f[c0]) ? 0.0F : 1.0F;
-   } else if (strcmp(callee, "tan") == 0) {
-      assert(op[0]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = tanf(op[0]->value.f[c]);
-   } else if (strcmp(callee, "tanh") == 0) {
-      assert(op[0]->type->is_float());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-	 data.f[c] = tanhf(op[0]->value.f[c]);
-   } else if (strcmp(callee, "transpose") == 0) {
-      assert(op[0]->type->is_matrix());
-      const unsigned n = op[0]->type->vector_elements;
-      const unsigned m = op[0]->type->matrix_columns;
-      for (unsigned j = 0; j < m; j++) {
-	 for (unsigned i = 0; i < n; i++) {
-	    data.f[m*i+j] += op[0]->value.f[i+n*j];
-	 }
-      }
-   } else {
-      /* Unsupported builtin - some are not allowed in constant expressions. */
-      return NULL;
-   }
-
-   if (expr != NULL)
-      return expr->constant_expression_value();
-
-   return new(mem_ctx) ir_constant(this->type, &data);
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file ir_constant_expression.cpp

+ * Evaluate and process constant valued expressions

+ *

+ * In GLSL, constant valued expressions are used in several places.  These

+ * must be processed and evaluated very early in the compilation process.

+ *

+ *    * Sizes of arrays

+ *    * Initializers for uniforms

+ *    * Initializers for \c const variables

+ */

+

+#include <math.h>

+#include "main/core.h" /* for MAX2, MIN2, CLAMP */

+#include "ir.h"

+#include "ir_visitor.h"

+#include "glsl_types.h"

+

+static float

+dot(ir_constant *op0, ir_constant *op1)

+{

+   assert(op0->type->is_float() && op1->type->is_float());

+

+   float result = 0;

+   for (unsigned c = 0; c < op0->type->components(); c++)

+      result += op0->value.f[c] * op1->value.f[c];

+

+   return result;

+}

+

+ir_constant *

+ir_expression::constant_expression_value()

+{

+   if (this->type->is_error())

+      return NULL;

+

+   ir_constant *op[Elements(this->operands)] = { NULL, };

+   ir_constant_data data;

+

+   memset(&data, 0, sizeof(data));

+

+   for (unsigned operand = 0; operand < this->get_num_operands(); operand++) {

+      op[operand] = this->operands[operand]->constant_expression_value();

+      if (!op[operand])

+	 return NULL;

+   }

+

+   if (op[1] != NULL)

+      assert(op[0]->type->base_type == op[1]->type->base_type);

+

+   bool op0_scalar = op[0]->type->is_scalar();

+   bool op1_scalar = op[1] != NULL && op[1]->type->is_scalar();

+

+   /* When iterating over a vector or matrix's components, we want to increase

+    * the loop counter.  However, for scalars, we want to stay at 0.

+    */

+   unsigned c0_inc = op0_scalar ? 0 : 1;

+   unsigned c1_inc = op1_scalar ? 0 : 1;

+   unsigned components;

+   if (op1_scalar || !op[1]) {

+      components = op[0]->type->components();

+   } else {

+      components = op[1]->type->components();

+   }

+

+   void *ctx = ralloc_parent(this);

+

+   /* Handle array operations here, rather than below. */

+   if (op[0]->type->is_array()) {

+      assert(op[1] != NULL && op[1]->type->is_array());

+      switch (this->operation) {

+      case ir_binop_all_equal:

+	 return new(ctx) ir_constant(op[0]->has_value(op[1]));

+      case ir_binop_any_nequal:

+	 return new(ctx) ir_constant(!op[0]->has_value(op[1]));

+      default:

+	 break;

+      }

+      return NULL;

+   }

+

+   switch (this->operation) {

+   case ir_unop_bit_not:

+       switch (op[0]->type->base_type) {

+       case GLSL_TYPE_INT:

+           for (unsigned c = 0; c < components; c++)

+               data.i[c] = ~ op[0]->value.i[c];

+           break;

+       case GLSL_TYPE_UINT:

+           for (unsigned c = 0; c < components; c++)

+               data.u[c] = ~ op[0]->value.u[c];

+           break;

+       default:

+           assert(0);

+       }

+       break;

+

+   case ir_unop_logic_not:

+      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.b[c] = !op[0]->value.b[c];

+      break;

+

+   case ir_unop_f2i:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.i[c] = (int) op[0]->value.f[c];

+      }

+      break;

+   case ir_unop_i2f:

+      assert(op[0]->type->base_type == GLSL_TYPE_INT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = (float) op[0]->value.i[c];

+      }

+      break;

+   case ir_unop_u2f:

+      assert(op[0]->type->base_type == GLSL_TYPE_UINT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = (float) op[0]->value.u[c];

+      }

+      break;

+   case ir_unop_b2f:

+      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = op[0]->value.b[c] ? 1.0F : 0.0F;

+      }

+      break;

+   case ir_unop_f2b:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.b[c] = op[0]->value.f[c] != 0.0F ? true : false;

+      }

+      break;

+   case ir_unop_b2i:

+      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.u[c] = op[0]->value.b[c] ? 1 : 0;

+      }

+      break;

+   case ir_unop_i2b:

+      assert(op[0]->type->is_integer());

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.b[c] = op[0]->value.u[c] ? true : false;

+      }

+      break;

+

+   case ir_unop_any:

+      assert(op[0]->type->is_boolean());

+      data.b[0] = false;

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 if (op[0]->value.b[c])

+	    data.b[0] = true;

+      }

+      break;

+

+   case ir_unop_trunc:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = truncf(op[0]->value.f[c]);

+      }

+      break;

+

+   case ir_unop_ceil:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = ceilf(op[0]->value.f[c]);

+      }

+      break;

+

+   case ir_unop_floor:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = floorf(op[0]->value.f[c]);

+      }

+      break;

+

+   case ir_unop_fract:

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (this->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.u[c] = 0;

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.i[c] = 0;

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.f[c] = op[0]->value.f[c] - floor(op[0]->value.f[c]);

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+

+   case ir_unop_sin:

+   case ir_unop_sin_reduced:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = sinf(op[0]->value.f[c]);

+      }

+      break;

+

+   case ir_unop_cos:

+   case ir_unop_cos_reduced:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = cosf(op[0]->value.f[c]);

+      }

+      break;

+

+   case ir_unop_neg:

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (this->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.u[c] = -((int) op[0]->value.u[c]);

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.i[c] = -op[0]->value.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.f[c] = -op[0]->value.f[c];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+

+   case ir_unop_abs:

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (this->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.u[c] = op[0]->value.u[c];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.i[c] = op[0]->value.i[c];

+	    if (data.i[c] < 0)

+	       data.i[c] = -data.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.f[c] = fabs(op[0]->value.f[c]);

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+

+   case ir_unop_sign:

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (this->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.u[c] = op[0]->value.i[c] > 0;

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.i[c] = (op[0]->value.i[c] > 0) - (op[0]->value.i[c] < 0);

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.f[c] = float((op[0]->value.f[c] > 0)-(op[0]->value.f[c] < 0));

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+

+   case ir_unop_rcp:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (this->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    if (op[0]->value.u[c] != 0.0)

+	       data.u[c] = 1 / op[0]->value.u[c];

+	    break;

+	 case GLSL_TYPE_INT:

+	    if (op[0]->value.i[c] != 0.0)

+	       data.i[c] = 1 / op[0]->value.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    if (op[0]->value.f[c] != 0.0)

+	       data.f[c] = 1.0F / op[0]->value.f[c];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+

+   case ir_unop_rsq:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = 1.0F / sqrtf(op[0]->value.f[c]);

+      }

+      break;

+

+   case ir_unop_sqrt:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = sqrtf(op[0]->value.f[c]);

+      }

+      break;

+

+   case ir_unop_exp:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = expf(op[0]->value.f[c]);

+      }

+      break;

+

+   case ir_unop_exp2:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = exp2f(op[0]->value.f[c]);

+      }

+      break;

+

+   case ir_unop_log:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = logf(op[0]->value.f[c]);

+      }

+      break;

+

+   case ir_unop_log2:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = log2f(op[0]->value.f[c]);

+      }

+      break;

+

+   case ir_unop_dFdx:

+   case ir_unop_dFdy:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = 0.0;

+      }

+      break;

+

+   case ir_binop_pow:

+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 data.f[c] = powf(op[0]->value.f[c], op[1]->value.f[c]);

+      }

+      break;

+

+   case ir_binop_dot:

+      data.f[0] = dot(op[0], op[1]);

+      break;

+

+   case ir_binop_min:

+      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);

+      for (unsigned c = 0, c0 = 0, c1 = 0;

+	   c < components;

+	   c0 += c0_inc, c1 += c1_inc, c++) {

+

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.u[c] = MIN2(op[0]->value.u[c0], op[1]->value.u[c1]);

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.i[c] = MIN2(op[0]->value.i[c0], op[1]->value.i[c1]);

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.f[c] = MIN2(op[0]->value.f[c0], op[1]->value.f[c1]);

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+

+      break;

+   case ir_binop_max:

+      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);

+      for (unsigned c = 0, c0 = 0, c1 = 0;

+	   c < components;

+	   c0 += c0_inc, c1 += c1_inc, c++) {

+

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.u[c] = MAX2(op[0]->value.u[c0], op[1]->value.u[c1]);

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.i[c] = MAX2(op[0]->value.i[c0], op[1]->value.i[c1]);

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.f[c] = MAX2(op[0]->value.f[c0], op[1]->value.f[c1]);

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+

+   case ir_binop_add:

+      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);

+      for (unsigned c = 0, c0 = 0, c1 = 0;

+	   c < components;

+	   c0 += c0_inc, c1 += c1_inc, c++) {

+

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.u[c] = op[0]->value.u[c0] + op[1]->value.u[c1];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.i[c] = op[0]->value.i[c0] + op[1]->value.i[c1];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.f[c] = op[0]->value.f[c0] + op[1]->value.f[c1];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+

+      break;

+   case ir_binop_sub:

+      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);

+      for (unsigned c = 0, c0 = 0, c1 = 0;

+	   c < components;

+	   c0 += c0_inc, c1 += c1_inc, c++) {

+

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.u[c] = op[0]->value.u[c0] - op[1]->value.u[c1];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.i[c] = op[0]->value.i[c0] - op[1]->value.i[c1];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.f[c] = op[0]->value.f[c0] - op[1]->value.f[c1];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+

+      break;

+   case ir_binop_mul:

+      /* Check for equal types, or unequal types involving scalars */

+      if ((op[0]->type == op[1]->type && !op[0]->type->is_matrix())

+	  || op0_scalar || op1_scalar) {

+	 for (unsigned c = 0, c0 = 0, c1 = 0;

+	      c < components;

+	      c0 += c0_inc, c1 += c1_inc, c++) {

+

+	    switch (op[0]->type->base_type) {

+	    case GLSL_TYPE_UINT:

+	       data.u[c] = op[0]->value.u[c0] * op[1]->value.u[c1];

+	       break;

+	    case GLSL_TYPE_INT:

+	       data.i[c] = op[0]->value.i[c0] * op[1]->value.i[c1];

+	       break;

+	    case GLSL_TYPE_FLOAT:

+	       data.f[c] = op[0]->value.f[c0] * op[1]->value.f[c1];

+	       break;

+	    default:

+	       assert(0);

+	    }

+	 }

+      } else {

+	 assert(op[0]->type->is_matrix() || op[1]->type->is_matrix());

+

+	 /* Multiply an N-by-M matrix with an M-by-P matrix.  Since either

+	  * matrix can be a GLSL vector, either N or P can be 1.

+	  *

+	  * For vec*mat, the vector is treated as a row vector.  This

+	  * means the vector is a 1-row x M-column matrix.

+	  *

+	  * For mat*vec, the vector is treated as a column vector.  Since

+	  * matrix_columns is 1 for vectors, this just works.

+	  */

+	 const unsigned n = op[0]->type->is_vector()

+	    ? 1 : op[0]->type->vector_elements;

+	 const unsigned m = op[1]->type->vector_elements;

+	 const unsigned p = op[1]->type->matrix_columns;

+	 for (unsigned j = 0; j < p; j++) {

+	    for (unsigned i = 0; i < n; i++) {

+	       for (unsigned k = 0; k < m; k++) {

+		  data.f[i+n*j] += op[0]->value.f[i+n*k]*op[1]->value.f[k+m*j];

+	       }

+	    }

+	 }

+      }

+

+      break;

+   case ir_binop_div:

+      /* FINISHME: Emit warning when division-by-zero is detected. */

+      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);

+      for (unsigned c = 0, c0 = 0, c1 = 0;

+	   c < components;

+	   c0 += c0_inc, c1 += c1_inc, c++) {

+

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    if (op[1]->value.u[c1] == 0) {

+	       data.u[c] = 0;

+	    } else {

+	       data.u[c] = op[0]->value.u[c0] / op[1]->value.u[c1];

+	    }

+	    break;

+	 case GLSL_TYPE_INT:

+	    if (op[1]->value.i[c1] == 0) {

+	       data.i[c] = 0;

+	    } else {

+	       data.i[c] = op[0]->value.i[c0] / op[1]->value.i[c1];

+	    }

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.f[c] = op[0]->value.f[c0] / op[1]->value.f[c1];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+

+      break;

+   case ir_binop_mod:

+      /* FINISHME: Emit warning when division-by-zero is detected. */

+      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);

+      for (unsigned c = 0, c0 = 0, c1 = 0;

+	   c < components;

+	   c0 += c0_inc, c1 += c1_inc, c++) {

+

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    if (op[1]->value.u[c1] == 0) {

+	       data.u[c] = 0;

+	    } else {

+	       data.u[c] = op[0]->value.u[c0] % op[1]->value.u[c1];

+	    }

+	    break;

+	 case GLSL_TYPE_INT:

+	    if (op[1]->value.i[c1] == 0) {

+	       data.i[c] = 0;

+	    } else {

+	       data.i[c] = op[0]->value.i[c0] % op[1]->value.i[c1];

+	    }

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    /* We don't use fmod because it rounds toward zero; GLSL specifies

+	     * the use of floor.

+	     */

+	    data.f[c] = op[0]->value.f[c0] - op[1]->value.f[c1]

+	       * floorf(op[0]->value.f[c0] / op[1]->value.f[c1]);

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+

+      break;

+

+   case ir_binop_logic_and:

+      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.b[c] = op[0]->value.b[c] && op[1]->value.b[c];

+      break;

+   case ir_binop_logic_xor:

+      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.b[c] = op[0]->value.b[c] ^ op[1]->value.b[c];

+      break;

+   case ir_binop_logic_or:

+      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.b[c] = op[0]->value.b[c] || op[1]->value.b[c];

+      break;

+

+   case ir_binop_less:

+      assert(op[0]->type == op[1]->type);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[0] = op[0]->value.u[0] < op[1]->value.u[0];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[0] = op[0]->value.i[0] < op[1]->value.i[0];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[0] = op[0]->value.f[0] < op[1]->value.f[0];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+   case ir_binop_greater:

+      assert(op[0]->type == op[1]->type);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[c] = op[0]->value.u[c] > op[1]->value.u[c];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[c] = op[0]->value.i[c] > op[1]->value.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[c] = op[0]->value.f[c] > op[1]->value.f[c];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+   case ir_binop_lequal:

+      assert(op[0]->type == op[1]->type);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[0] = op[0]->value.u[0] <= op[1]->value.u[0];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[0] = op[0]->value.i[0] <= op[1]->value.i[0];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[0] = op[0]->value.f[0] <= op[1]->value.f[0];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+   case ir_binop_gequal:

+      assert(op[0]->type == op[1]->type);

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[0] = op[0]->value.u[0] >= op[1]->value.u[0];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[0] = op[0]->value.i[0] >= op[1]->value.i[0];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[0] = op[0]->value.f[0] >= op[1]->value.f[0];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+   case ir_binop_equal:

+      assert(op[0]->type == op[1]->type);

+      for (unsigned c = 0; c < components; c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[c] = op[0]->value.u[c] == op[1]->value.u[c];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[c] = op[0]->value.i[c] == op[1]->value.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[c] = op[0]->value.f[c] == op[1]->value.f[c];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+   case ir_binop_nequal:

+      assert(op[0]->type != op[1]->type);

+      for (unsigned c = 0; c < components; c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[c] = op[0]->value.u[c] != op[1]->value.u[c];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[c] = op[0]->value.i[c] != op[1]->value.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[c] = op[0]->value.f[c] != op[1]->value.f[c];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+   case ir_binop_all_equal:

+      data.b[0] = op[0]->has_value(op[1]);

+      break;

+   case ir_binop_any_nequal:

+      data.b[0] = !op[0]->has_value(op[1]);

+      break;

+

+   case ir_binop_lshift:

+      for (unsigned c = 0, c0 = 0, c1 = 0;

+           c < components;

+           c0 += c0_inc, c1 += c1_inc, c++) {

+

+          if (op[0]->type->base_type == GLSL_TYPE_INT &&

+              op[1]->type->base_type == GLSL_TYPE_INT) {

+              data.i[c] = op[0]->value.i[c0] << op[1]->value.i[c1];

+

+          } else if (op[0]->type->base_type == GLSL_TYPE_INT &&

+                     op[1]->type->base_type == GLSL_TYPE_UINT) {

+              data.i[c] = op[0]->value.i[c0] << op[1]->value.u[c1];

+

+          } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&

+                     op[1]->type->base_type == GLSL_TYPE_INT) {

+              data.u[c] = op[0]->value.u[c0] << op[1]->value.i[c1];

+

+          } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&

+                     op[1]->type->base_type == GLSL_TYPE_UINT) {

+              data.u[c] = op[0]->value.u[c0] << op[1]->value.u[c1];

+          }

+      }

+      break;

+

+   case ir_binop_rshift:

+       for (unsigned c = 0, c0 = 0, c1 = 0;

+            c < components;

+            c0 += c0_inc, c1 += c1_inc, c++) {

+

+           if (op[0]->type->base_type == GLSL_TYPE_INT &&

+               op[1]->type->base_type == GLSL_TYPE_INT) {

+               data.i[c] = op[0]->value.i[c0] >> op[1]->value.i[c1];

+

+           } else if (op[0]->type->base_type == GLSL_TYPE_INT &&

+                      op[1]->type->base_type == GLSL_TYPE_UINT) {

+               data.i[c] = op[0]->value.i[c0] >> op[1]->value.u[c1];

+

+           } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&

+                      op[1]->type->base_type == GLSL_TYPE_INT) {

+               data.u[c] = op[0]->value.u[c0] >> op[1]->value.i[c1];

+

+           } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&

+                      op[1]->type->base_type == GLSL_TYPE_UINT) {

+               data.u[c] = op[0]->value.u[c0] >> op[1]->value.u[c1];

+           }

+       }

+       break;

+

+   case ir_binop_bit_and:

+      for (unsigned c = 0, c0 = 0, c1 = 0;

+           c < components;

+           c0 += c0_inc, c1 += c1_inc, c++) {

+

+          switch (op[0]->type->base_type) {

+          case GLSL_TYPE_INT:

+              data.i[c] = op[0]->value.i[c0] & op[1]->value.i[c1];

+              break;

+          case GLSL_TYPE_UINT:

+              data.u[c] = op[0]->value.u[c0] & op[1]->value.u[c1];

+              break;

+          default:

+              assert(0);

+          }

+      }

+      break;

+

+   case ir_binop_bit_or:

+      for (unsigned c = 0, c0 = 0, c1 = 0;

+           c < components;

+           c0 += c0_inc, c1 += c1_inc, c++) {

+

+          switch (op[0]->type->base_type) {

+          case GLSL_TYPE_INT:

+              data.i[c] = op[0]->value.i[c0] | op[1]->value.i[c1];

+              break;

+          case GLSL_TYPE_UINT:

+              data.u[c] = op[0]->value.u[c0] | op[1]->value.u[c1];

+              break;

+          default:

+              assert(0);

+          }

+      }

+      break;

+

+   case ir_binop_bit_xor:

+      for (unsigned c = 0, c0 = 0, c1 = 0;

+           c < components;

+           c0 += c0_inc, c1 += c1_inc, c++) {

+

+          switch (op[0]->type->base_type) {

+          case GLSL_TYPE_INT:

+              data.i[c] = op[0]->value.i[c0] ^ op[1]->value.i[c1];

+              break;

+          case GLSL_TYPE_UINT:

+              data.u[c] = op[0]->value.u[c0] ^ op[1]->value.u[c1];

+              break;

+          default:

+              assert(0);

+          }

+      }

+      break;

+

+   case ir_quadop_vector:

+      for (unsigned c = 0; c < this->type->vector_elements; c++) {

+	 switch (this->type->base_type) {

+	 case GLSL_TYPE_INT:

+	    data.i[c] = op[c]->value.i[0];

+	    break;

+	 case GLSL_TYPE_UINT:

+	    data.u[c] = op[c]->value.u[0];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.f[c] = op[c]->value.f[0];

+	    break;

+	 default:

+	    assert(0);

+	 }

+      }

+      break;

+

+   default:

+      /* FINISHME: Should handle all expression types. */

+      return NULL;

+   }

+

+   return new(ctx) ir_constant(this->type, &data);

+}

+

+

+ir_constant *

+ir_texture::constant_expression_value()

+{

+   /* texture lookups aren't constant expressions */

+   return NULL;

+}

+

+

+ir_constant *

+ir_swizzle::constant_expression_value()

+{

+   ir_constant *v = this->val->constant_expression_value();

+

+   if (v != NULL) {

+      ir_constant_data data = { { 0 } };

+

+      const unsigned swiz_idx[4] = {

+	 this->mask.x, this->mask.y, this->mask.z, this->mask.w

+      };

+

+      for (unsigned i = 0; i < this->mask.num_components; i++) {

+	 switch (v->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	 case GLSL_TYPE_INT:   data.u[i] = v->value.u[swiz_idx[i]]; break;

+	 case GLSL_TYPE_FLOAT: data.f[i] = v->value.f[swiz_idx[i]]; break;

+	 case GLSL_TYPE_BOOL:  data.b[i] = v->value.b[swiz_idx[i]]; break;

+	 default:              assert(!"Should not get here."); break;

+	 }

+      }

+

+      void *ctx = ralloc_parent(this);

+      return new(ctx) ir_constant(this->type, &data);

+   }

+   return NULL;

+}

+

+

+ir_constant *

+ir_dereference_variable::constant_expression_value()

+{

+   /* This may occur during compile and var->type is glsl_type::error_type */

+   if (!var)

+      return NULL;

+

+   /* The constant_value of a uniform variable is its initializer,

+    * not the lifetime constant value of the uniform.

+    */

+   if (var->mode == ir_var_uniform)

+      return NULL;

+

+   if (!var->constant_value)

+      return NULL;

+

+   return var->constant_value->clone(ralloc_parent(var), NULL);

+}

+

+

+ir_constant *

+ir_dereference_array::constant_expression_value()

+{

+   ir_constant *array = this->array->constant_expression_value();

+   ir_constant *idx = this->array_index->constant_expression_value();

+

+   if ((array != NULL) && (idx != NULL)) {

+      void *ctx = ralloc_parent(this);

+      if (array->type->is_matrix()) {

+	 /* Array access of a matrix results in a vector.

+	  */

+	 const unsigned column = idx->value.u[0];

+

+	 const glsl_type *const column_type = array->type->column_type();

+

+	 /* Offset in the constant matrix to the first element of the column

+	  * to be extracted.

+	  */

+	 const unsigned mat_idx = column * column_type->vector_elements;

+

+	 ir_constant_data data = { { 0 } };

+

+	 switch (column_type->base_type) {

+	 case GLSL_TYPE_UINT:

+	 case GLSL_TYPE_INT:

+	    for (unsigned i = 0; i < column_type->vector_elements; i++)

+	       data.u[i] = array->value.u[mat_idx + i];

+

+	    break;

+

+	 case GLSL_TYPE_FLOAT:

+	    for (unsigned i = 0; i < column_type->vector_elements; i++)

+	       data.f[i] = array->value.f[mat_idx + i];

+

+	    break;

+

+	 default:

+	    assert(!"Should not get here.");

+	    break;

+	 }

+

+	 return new(ctx) ir_constant(column_type, &data);

+      } else if (array->type->is_vector()) {

+	 const unsigned component = idx->value.u[0];

+

+	 return new(ctx) ir_constant(array, component);

+      } else {

+	 const unsigned index = idx->value.u[0];

+	 return array->get_array_element(index)->clone(ctx, NULL);

+      }

+   }

+   return NULL;

+}

+

+

+ir_constant *

+ir_dereference_record::constant_expression_value()

+{

+   ir_constant *v = this->record->constant_expression_value();

+

+   return (v != NULL) ? v->get_record_field(this->field) : NULL;

+}

+

+

+ir_constant *

+ir_assignment::constant_expression_value()

+{

+   /* FINISHME: Handle CEs involving assignment (return RHS) */

+   return NULL;

+}

+

+

+ir_constant *

+ir_constant::constant_expression_value()

+{

+   return this;

+}

+

+

+ir_constant *

+ir_call::constant_expression_value()

+{

+   if (this->type == glsl_type::error_type)

+      return NULL;

+

+   /* From the GLSL 1.20 spec, page 23:

+    * "Function calls to user-defined functions (non-built-in functions)

+    *  cannot be used to form constant expressions."

+    */

+   if (!this->callee->is_builtin)

+      return NULL;

+

+   unsigned num_parameters = 0;

+

+   /* Check if all parameters are constant */

+   ir_constant *op[3];

+   foreach_list(n, &this->actual_parameters) {

+      ir_constant *constant = ((ir_rvalue *) n)->constant_expression_value();

+      if (constant == NULL)

+	 return NULL;

+

+      op[num_parameters] = constant;

+

+      assert(num_parameters < 3);

+      num_parameters++;

+   }

+

+   /* Individual cases below can either:

+    * - Assign "expr" a new ir_expression to evaluate (for basic opcodes)

+    * - Fill "data" with appopriate constant data

+    * - Return an ir_constant directly.

+    */

+   void *mem_ctx = ralloc_parent(this);

+   ir_expression *expr = NULL;

+

+   ir_constant_data data;

+   memset(&data, 0, sizeof(data));

+

+   const char *callee = this->callee_name();

+   if (strcmp(callee, "abs") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_abs, type, op[0], NULL);

+   } else if (strcmp(callee, "all") == 0) {

+      assert(op[0]->type->is_boolean());

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 if (!op[0]->value.b[c])

+	    return new(mem_ctx) ir_constant(false);

+      }

+      return new(mem_ctx) ir_constant(true);

+   } else if (strcmp(callee, "any") == 0) {

+      assert(op[0]->type->is_boolean());

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 if (op[0]->value.b[c])

+	    return new(mem_ctx) ir_constant(true);

+      }

+      return new(mem_ctx) ir_constant(false);

+   } else if (strcmp(callee, "acos") == 0) {

+      assert(op[0]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = acosf(op[0]->value.f[c]);

+   } else if (strcmp(callee, "acosh") == 0) {

+      assert(op[0]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = acoshf(op[0]->value.f[c]);

+   } else if (strcmp(callee, "asin") == 0) {

+      assert(op[0]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = asinf(op[0]->value.f[c]);

+   } else if (strcmp(callee, "asinh") == 0) {

+      assert(op[0]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = asinhf(op[0]->value.f[c]);

+   } else if (strcmp(callee, "atan") == 0) {

+      assert(op[0]->type->is_float());

+      if (num_parameters == 2) {

+	 assert(op[1]->type->is_float());

+	 for (unsigned c = 0; c < op[0]->type->components(); c++)

+	    data.f[c] = atan2f(op[0]->value.f[c], op[1]->value.f[c]);

+      } else {

+	 for (unsigned c = 0; c < op[0]->type->components(); c++)

+	    data.f[c] = atanf(op[0]->value.f[c]);

+      }

+   } else if (strcmp(callee, "atanh") == 0) {

+      assert(op[0]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = atanhf(op[0]->value.f[c]);

+   } else if (strcmp(callee, "dFdx") == 0 || strcmp(callee, "dFdy") == 0) {

+      return ir_constant::zero(mem_ctx, this->type);

+   } else if (strcmp(callee, "ceil") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_ceil, type, op[0], NULL);

+   } else if (strcmp(callee, "clamp") == 0) {

+      assert(num_parameters == 3);

+      unsigned c1_inc = op[1]->type->is_scalar() ? 0 : 1;

+      unsigned c2_inc = op[2]->type->is_scalar() ? 0 : 1;

+      for (unsigned c = 0, c1 = 0, c2 = 0;

+	   c < op[0]->type->components();

+	   c1 += c1_inc, c2 += c2_inc, c++) {

+

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.u[c] = CLAMP(op[0]->value.u[c], op[1]->value.u[c1],

+			      op[2]->value.u[c2]);

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.i[c] = CLAMP(op[0]->value.i[c], op[1]->value.i[c1],

+			      op[2]->value.i[c2]);

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.f[c] = CLAMP(op[0]->value.f[c], op[1]->value.f[c1],

+			      op[2]->value.f[c2]);

+	    break;

+	 default:

+	    assert(!"Should not get here.");

+	 }

+      }

+   } else if (strcmp(callee, "cos") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_cos, type, op[0], NULL);

+   } else if (strcmp(callee, "cosh") == 0) {

+      assert(op[0]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = coshf(op[0]->value.f[c]);

+   } else if (strcmp(callee, "cross") == 0) {

+      assert(op[0]->type == glsl_type::vec3_type);

+      assert(op[1]->type == glsl_type::vec3_type);

+      data.f[0] = (op[0]->value.f[1] * op[1]->value.f[2] -

+		   op[1]->value.f[1] * op[0]->value.f[2]);

+      data.f[1] = (op[0]->value.f[2] * op[1]->value.f[0] -

+		   op[1]->value.f[2] * op[0]->value.f[0]);

+      data.f[2] = (op[0]->value.f[0] * op[1]->value.f[1] -

+		   op[1]->value.f[0] * op[0]->value.f[1]);

+   } else if (strcmp(callee, "degrees") == 0) {

+      assert(op[0]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = 180.0F / M_PI * op[0]->value.f[c];

+   } else if (strcmp(callee, "distance") == 0) {

+      assert(op[0]->type->is_float() && op[1]->type->is_float());

+      float length_squared = 0.0;

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 float t = op[0]->value.f[c] - op[1]->value.f[c];

+	 length_squared += t * t;

+      }

+      return new(mem_ctx) ir_constant(sqrtf(length_squared));

+   } else if (strcmp(callee, "dot") == 0) {

+      return new(mem_ctx) ir_constant(dot(op[0], op[1]));

+   } else if (strcmp(callee, "equal") == 0) {

+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[c] = op[0]->value.u[c] == op[1]->value.u[c];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[c] = op[0]->value.i[c] == op[1]->value.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[c] = op[0]->value.f[c] == op[1]->value.f[c];

+	    break;

+	 case GLSL_TYPE_BOOL:

+	    data.b[c] = op[0]->value.b[c] == op[1]->value.b[c];

+	    break;

+	 default:

+	    assert(!"Should not get here.");

+	 }

+      }

+   } else if (strcmp(callee, "exp") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_exp, type, op[0], NULL);

+   } else if (strcmp(callee, "exp2") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_exp2, type, op[0], NULL);

+   } else if (strcmp(callee, "faceforward") == 0) {

+      if (dot(op[2], op[1]) < 0)

+	 return op[0];

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = -op[0]->value.f[c];

+   } else if (strcmp(callee, "floor") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_floor, type, op[0], NULL);

+   } else if (strcmp(callee, "fract") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_fract, type, op[0], NULL);

+   } else if (strcmp(callee, "fwidth") == 0) {

+      return ir_constant::zero(mem_ctx, this->type);

+   } else if (strcmp(callee, "greaterThan") == 0) {

+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[c] = op[0]->value.u[c] > op[1]->value.u[c];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[c] = op[0]->value.i[c] > op[1]->value.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[c] = op[0]->value.f[c] > op[1]->value.f[c];

+	    break;

+	 default:

+	    assert(!"Should not get here.");

+	 }

+      }

+   } else if (strcmp(callee, "greaterThanEqual") == 0) {

+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[c] = op[0]->value.u[c] >= op[1]->value.u[c];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[c] = op[0]->value.i[c] >= op[1]->value.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[c] = op[0]->value.f[c] >= op[1]->value.f[c];

+	    break;

+	 default:

+	    assert(!"Should not get here.");

+	 }

+      }

+   } else if (strcmp(callee, "inversesqrt") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_rsq, type, op[0], NULL);

+   } else if (strcmp(callee, "length") == 0) {

+      return new(mem_ctx) ir_constant(sqrtf(dot(op[0], op[0])));

+   } else if (strcmp(callee, "lessThan") == 0) {

+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[c] = op[0]->value.u[c] < op[1]->value.u[c];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[c] = op[0]->value.i[c] < op[1]->value.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[c] = op[0]->value.f[c] < op[1]->value.f[c];

+	    break;

+	 default:

+	    assert(!"Should not get here.");

+	 }

+      }

+   } else if (strcmp(callee, "lessThanEqual") == 0) {

+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[c] = op[0]->value.u[c] <= op[1]->value.u[c];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[c] = op[0]->value.i[c] <= op[1]->value.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[c] = op[0]->value.f[c] <= op[1]->value.f[c];

+	    break;

+	 default:

+	    assert(!"Should not get here.");

+	 }

+      }

+   } else if (strcmp(callee, "log") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_log, type, op[0], NULL);

+   } else if (strcmp(callee, "log2") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_log2, type, op[0], NULL);

+   } else if (strcmp(callee, "matrixCompMult") == 0) {

+      assert(op[0]->type->is_float() && op[1]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = op[0]->value.f[c] * op[1]->value.f[c];

+   } else if (strcmp(callee, "max") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_binop_max, type, op[0], op[1]);

+   } else if (strcmp(callee, "min") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_binop_min, type, op[0], op[1]);

+   } else if (strcmp(callee, "mix") == 0) {

+      assert(op[0]->type->is_float() && op[1]->type->is_float());

+      if (op[2]->type->is_float()) {

+	 unsigned c2_inc = op[2]->type->is_scalar() ? 0 : 1;

+	 unsigned components = op[0]->type->components();

+	 for (unsigned c = 0, c2 = 0; c < components; c2 += c2_inc, c++) {

+	    data.f[c] = op[0]->value.f[c] * (1 - op[2]->value.f[c2]) +

+			op[1]->value.f[c] * op[2]->value.f[c2];

+	 }

+      } else {

+	 assert(op[2]->type->is_boolean());

+	 for (unsigned c = 0; c < op[0]->type->components(); c++)

+	    data.f[c] = op[op[2]->value.b[c] ? 1 : 0]->value.f[c];

+      }

+   } else if (strcmp(callee, "mod") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_binop_mod, type, op[0], op[1]);

+   } else if (strcmp(callee, "normalize") == 0) {

+      assert(op[0]->type->is_float());

+      float length = sqrtf(dot(op[0], op[0]));

+

+      if (length == 0)

+	 return ir_constant::zero(mem_ctx, this->type);

+

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = op[0]->value.f[c] / length;

+   } else if (strcmp(callee, "not") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_logic_not, type, op[0], NULL);

+   } else if (strcmp(callee, "notEqual") == 0) {

+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());

+      for (unsigned c = 0; c < op[0]->type->components(); c++) {

+	 switch (op[0]->type->base_type) {

+	 case GLSL_TYPE_UINT:

+	    data.b[c] = op[0]->value.u[c] != op[1]->value.u[c];

+	    break;

+	 case GLSL_TYPE_INT:

+	    data.b[c] = op[0]->value.i[c] != op[1]->value.i[c];

+	    break;

+	 case GLSL_TYPE_FLOAT:

+	    data.b[c] = op[0]->value.f[c] != op[1]->value.f[c];

+	    break;

+	 case GLSL_TYPE_BOOL:

+	    data.b[c] = op[0]->value.b[c] != op[1]->value.b[c];

+	    break;

+	 default:

+	    assert(!"Should not get here.");

+	 }

+      }

+   } else if (strcmp(callee, "outerProduct") == 0) {

+      assert(op[0]->type->is_vector() && op[1]->type->is_vector());

+      const unsigned m = op[0]->type->vector_elements;

+      const unsigned n = op[1]->type->vector_elements;

+      for (unsigned j = 0; j < n; j++) {

+	 for (unsigned i = 0; i < m; i++) {

+	    data.f[i+m*j] = op[0]->value.f[i] * op[1]->value.f[j];

+	 }

+      }

+   } else if (strcmp(callee, "pow") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_binop_pow, type, op[0], op[1]);

+   } else if (strcmp(callee, "radians") == 0) {

+      assert(op[0]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = M_PI / 180.0F * op[0]->value.f[c];

+   } else if (strcmp(callee, "reflect") == 0) {

+      assert(op[0]->type->is_float());

+      float dot_NI = dot(op[1], op[0]);

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = op[0]->value.f[c] - 2 * dot_NI * op[1]->value.f[c];

+   } else if (strcmp(callee, "refract") == 0) {

+      const float eta = op[2]->value.f[0];

+      const float dot_NI = dot(op[1], op[0]);

+      const float k = 1.0F - eta * eta * (1.0F - dot_NI * dot_NI);

+      if (k < 0.0) {

+	 return ir_constant::zero(mem_ctx, this->type);

+      } else {

+	 for (unsigned c = 0; c < type->components(); c++) {

+	    data.f[c] = eta * op[0]->value.f[c] - (eta * dot_NI + sqrtf(k))

+			    * op[1]->value.f[c];

+	 }

+      }

+   } else if (strcmp(callee, "sign") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_sign, type, op[0], NULL);

+   } else if (strcmp(callee, "sin") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_sin, type, op[0], NULL);

+   } else if (strcmp(callee, "sinh") == 0) {

+      assert(op[0]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = sinhf(op[0]->value.f[c]);

+   } else if (strcmp(callee, "smoothstep") == 0) {

+      assert(num_parameters == 3);

+      assert(op[1]->type == op[0]->type);

+      unsigned edge_inc = op[0]->type->is_scalar() ? 0 : 1;

+      for (unsigned c = 0, e = 0; c < type->components(); e += edge_inc, c++) {

+	 const float edge0 = op[0]->value.f[e];

+	 const float edge1 = op[1]->value.f[e];

+	 if (edge0 == edge1) {

+	    data.f[c] = 0.0; /* Avoid a crash - results are undefined anyway */

+	 } else {

+	    const float numerator = op[2]->value.f[c] - edge0;

+	    const float denominator = edge1 - edge0;

+	    const float t = CLAMP(numerator/denominator, 0, 1);

+	    data.f[c] = t * t * (3 - 2 * t);

+	 }

+      }

+   } else if (strcmp(callee, "sqrt") == 0) {

+      expr = new(mem_ctx) ir_expression(ir_unop_sqrt, type, op[0], NULL);

+   } else if (strcmp(callee, "step") == 0) {

+      assert(op[0]->type->is_float() && op[1]->type->is_float());

+      /* op[0] (edge) may be either a scalar or a vector */

+      const unsigned c0_inc = op[0]->type->is_scalar() ? 0 : 1;

+      for (unsigned c = 0, c0 = 0; c < type->components(); c0 += c0_inc, c++)

+	 data.f[c] = (op[1]->value.f[c] < op[0]->value.f[c0]) ? 0.0F : 1.0F;

+   } else if (strcmp(callee, "tan") == 0) {

+      assert(op[0]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = tanf(op[0]->value.f[c]);

+   } else if (strcmp(callee, "tanh") == 0) {

+      assert(op[0]->type->is_float());

+      for (unsigned c = 0; c < op[0]->type->components(); c++)

+	 data.f[c] = tanhf(op[0]->value.f[c]);

+   } else if (strcmp(callee, "transpose") == 0) {

+      assert(op[0]->type->is_matrix());

+      const unsigned n = op[0]->type->vector_elements;

+      const unsigned m = op[0]->type->matrix_columns;

+      for (unsigned j = 0; j < m; j++) {

+	 for (unsigned i = 0; i < n; i++) {

+	    data.f[m*i+j] += op[0]->value.f[i+n*j];

+	 }

+      }

+   } else {

+      /* Unsupported builtin - some are not allowed in constant expressions. */

+      return NULL;

+   }

+

+   if (expr != NULL)

+      return expr->constant_expression_value();

+

+   return new(mem_ctx) ir_constant(this->type, &data);

+}

diff --git a/mesalib/src/glsl/ir_import_prototypes.cpp b/mesalib/src/glsl/ir_import_prototypes.cpp
index 3585bf6b2..03d40bb68 100644
--- a/mesalib/src/glsl/ir_import_prototypes.cpp
+++ b/mesalib/src/glsl/ir_import_prototypes.cpp
@@ -1,122 +1,122 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file ir_import_prototypes.cpp
- * Import function prototypes from one IR tree into another.
- *
- * \author Ian Romanick
- */
-#include "ir.h"
-#include "glsl_symbol_table.h"
-
-/**
- * Visitor used to import function prototypes
- *
- * Normally the \c clone method of either \c ir_function or
- * \c ir_function_signature could be used.  However, we don't want a complete
- * clone of the \c ir_function_signature.  We want everything \b except the
- * body of the function.
- */
-class import_prototype_visitor : public ir_hierarchical_visitor {
-public:
-   /**
-    */
-   import_prototype_visitor(exec_list *list, glsl_symbol_table *symbols,
-			    void *mem_ctx)
-   {
-      this->mem_ctx = mem_ctx;
-      this->list = list;
-      this->symbols = symbols;
-      this->function = NULL;
-   }
-
-   virtual ir_visitor_status visit_enter(ir_function *ir)
-   {
-      assert(this->function == NULL);
-
-      this->function = this->symbols->get_function(ir->name);
-      if (!this->function) {
-	 this->function = new(this->mem_ctx) ir_function(ir->name);
-
-	 list->push_tail(this->function);
-
-	 /* Add the new function to the symbol table.
-	  */
-	 this->symbols->add_function(this->function);
-      }
-      return visit_continue;
-   }
-
-   virtual ir_visitor_status visit_leave(ir_function *ir)
-   {
-      (void) ir;
-      assert(this->function != NULL);
-
-      this->function = NULL;
-      return visit_continue;
-   }
-
-   ir_visitor_status visit_enter(ir_function_signature *ir)
-   {
-      assert(this->function != NULL);
-
-      ir_function_signature *copy = ir->clone_prototype(mem_ctx, NULL);
-
-      this->function->add_signature(copy);
-
-      /* Do not process child nodes of the ir_function_signature.  There can
-       * never be any nodes inside the ir_function_signature that we care
-       * about.  Instead continue with the next sibling.
-       */
-      return visit_continue_with_parent;
-   }
-
-private:
-   exec_list *list;
-   ir_function *function;
-   glsl_symbol_table *symbols;
-   void *mem_ctx;
-};
-
-
-/**
- * Import function prototypes from one IR tree into another
- *
- * \param source   Source instruction stream containing functions whose
- *                 prototypes are to be imported
- * \param dest     Destination instruction stream where new \c ir_function and
- *                 \c ir_function_signature nodes will be stored
- * \param symbols  Symbol table where new functions will be stored
- * \param mem_ctx  ralloc memory context used for new allocations
- */
-void
-import_prototypes(const exec_list *source, exec_list *dest,
-		  glsl_symbol_table *symbols, void *mem_ctx)
-{
-   import_prototype_visitor v(dest, symbols, mem_ctx);
-
-   /* Making source be const is just extra documentation.
-    */
-   v.run(const_cast<exec_list *>(source));
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file ir_import_prototypes.cpp

+ * Import function prototypes from one IR tree into another.

+ *

+ * \author Ian Romanick

+ */

+#include "ir.h"

+#include "glsl_symbol_table.h"

+

+/**

+ * Visitor used to import function prototypes

+ *

+ * Normally the \c clone method of either \c ir_function or

+ * \c ir_function_signature could be used.  However, we don't want a complete

+ * clone of the \c ir_function_signature.  We want everything \b except the

+ * body of the function.

+ */

+class import_prototype_visitor : public ir_hierarchical_visitor {

+public:

+   /**

+    */

+   import_prototype_visitor(exec_list *list, glsl_symbol_table *symbols,

+			    void *mem_ctx)

+   {

+      this->mem_ctx = mem_ctx;

+      this->list = list;

+      this->symbols = symbols;

+      this->function = NULL;

+   }

+

+   virtual ir_visitor_status visit_enter(ir_function *ir)

+   {

+      assert(this->function == NULL);

+

+      this->function = this->symbols->get_function(ir->name);

+      if (!this->function) {

+	 this->function = new(this->mem_ctx) ir_function(ir->name);

+

+	 list->push_tail(this->function);

+

+	 /* Add the new function to the symbol table.

+	  */

+	 this->symbols->add_function(this->function);

+      }

+      return visit_continue;

+   }

+

+   virtual ir_visitor_status visit_leave(ir_function *ir)

+   {

+      (void) ir;

+      assert(this->function != NULL);

+

+      this->function = NULL;

+      return visit_continue;

+   }

+

+   ir_visitor_status visit_enter(ir_function_signature *ir)

+   {

+      assert(this->function != NULL);

+

+      ir_function_signature *copy = ir->clone_prototype(mem_ctx, NULL);

+

+      this->function->add_signature(copy);

+

+      /* Do not process child nodes of the ir_function_signature.  There can

+       * never be any nodes inside the ir_function_signature that we care

+       * about.  Instead continue with the next sibling.

+       */

+      return visit_continue_with_parent;

+   }

+

+private:

+   exec_list *list;

+   ir_function *function;

+   glsl_symbol_table *symbols;

+   void *mem_ctx;

+};

+

+

+/**

+ * Import function prototypes from one IR tree into another

+ *

+ * \param source   Source instruction stream containing functions whose

+ *                 prototypes are to be imported

+ * \param dest     Destination instruction stream where new \c ir_function and

+ *                 \c ir_function_signature nodes will be stored

+ * \param symbols  Symbol table where new functions will be stored

+ * \param mem_ctx  ralloc memory context used for new allocations

+ */

+void

+import_prototypes(const exec_list *source, exec_list *dest,

+		  glsl_symbol_table *symbols, void *mem_ctx)

+{

+   import_prototype_visitor v(dest, symbols, mem_ctx);

+

+   /* Making source be const is just extra documentation.

+    */

+   v.run(const_cast<exec_list *>(source));

+}

diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp
index 02f3d8149..ba95103ea 100644
--- a/mesalib/src/glsl/ir_print_visitor.cpp
+++ b/mesalib/src/glsl/ir_print_visitor.cpp
@@ -1,515 +1,515 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#include "ir_print_visitor.h"
-#include "glsl_types.h"
-#include "glsl_parser_extras.h"
-
-extern "C" {
-#include "program/hash_table.h"
-}
-
-static void print_type(const glsl_type *t);
-
-void
-ir_instruction::print(void) const
-{
-   ir_instruction *deconsted = const_cast<ir_instruction *>(this);
-
-   ir_print_visitor v;
-   deconsted->accept(&v);
-}
-
-void
-_mesa_print_ir(exec_list *instructions,
-	       struct _mesa_glsl_parse_state *state)
-{
-   if (state) {
-      for (unsigned i = 0; i < state->num_user_structures; i++) {
-	 const glsl_type *const s = state->user_structures[i];
-
-	 printf("(structure (%s) (%s@%p) (%u) (\n",
-		s->name, s->name, (void *) s, s->length);
-
-	 for (unsigned j = 0; j < s->length; j++) {
-	    printf("\t((");
-	    print_type(s->fields.structure[j].type);
-	    printf(")(%s))\n", s->fields.structure[j].name);
-	 }
-
-	 printf(")\n");
-      }
-   }
-
-   printf("(\n");
-   foreach_iter(exec_list_iterator, iter, *instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      ir->print();
-      if (ir->ir_type != ir_type_function)
-	 printf("\n");
-   }
-   printf("\n)");
-}
-
-ir_print_visitor::ir_print_visitor()
-{
-   indentation = 0;
-   printable_names =
-      hash_table_ctor(32, hash_table_pointer_hash, hash_table_pointer_compare);
-   symbols = _mesa_symbol_table_ctor();
-   mem_ctx = ralloc_context(NULL);
-}
-
-ir_print_visitor::~ir_print_visitor()
-{
-   hash_table_dtor(printable_names);
-   _mesa_symbol_table_dtor(symbols);
-   ralloc_free(mem_ctx);
-}
-
-void ir_print_visitor::indent(void)
-{
-   for (int i = 0; i < indentation; i++)
-      printf("  ");
-}
-
-const char *
-ir_print_visitor::unique_name(ir_variable *var)
-{
-   /* Do we already have a name for this variable? */
-   const char *name = (const char *) hash_table_find(this->printable_names, var);
-   if (name != NULL)
-      return name;
-
-   /* If there's no conflict, just use the original name */
-   if (_mesa_symbol_table_find_symbol(this->symbols, -1, var->name) == NULL) {
-      name = var->name;
-   } else {
-      static unsigned i = 1;
-      name = ralloc_asprintf(this->mem_ctx, "%s@%u", var->name, ++i);
-   }
-   hash_table_insert(this->printable_names, (void *) name, var);
-   _mesa_symbol_table_add_symbol(this->symbols, -1, name, var);
-   return name;
-}
-
-static void
-print_type(const glsl_type *t)
-{
-   if (t->base_type == GLSL_TYPE_ARRAY) {
-      printf("(array ");
-      print_type(t->fields.array);
-      printf(" %u)", t->length);
-   } else if ((t->base_type == GLSL_TYPE_STRUCT)
-	      && (strncmp("gl_", t->name, 3) != 0)) {
-      printf("%s@%p", t->name, (void *) t);
-   } else {
-      printf("%s", t->name);
-   }
-}
-
-
-void ir_print_visitor::visit(ir_variable *ir)
-{
-   printf("(declare ");
-
-   const char *const cent = (ir->centroid) ? "centroid " : "";
-   const char *const inv = (ir->invariant) ? "invariant " : "";
-   const char *const mode[] = { "", "uniform ", "in ", "out ", "inout ",
-			        "const_in ", "sys ", "temporary " };
-   const char *const interp[] = { "", "flat", "noperspective" };
-
-   printf("(%s%s%s%s) ",
-	  cent, inv, mode[ir->mode], interp[ir->interpolation]);
-
-   print_type(ir->type);
-   printf(" %s)", unique_name(ir));
-}
-
-
-void ir_print_visitor::visit(ir_function_signature *ir)
-{
-   _mesa_symbol_table_push_scope(symbols);
-   printf("(signature ");
-   indentation++;
-
-   print_type(ir->return_type);
-   printf("\n");
-   indent();
-
-   printf("(parameters\n");
-   indentation++;
-
-   foreach_iter(exec_list_iterator, iter, ir->parameters) {
-      ir_variable *const inst = (ir_variable *) iter.get();
-
-      indent();
-      inst->accept(this);
-      printf("\n");
-   }
-   indentation--;
-
-   indent();
-   printf(")\n");
-
-   indent();
-
-   printf("(\n");
-   indentation++;
-
-   foreach_iter(exec_list_iterator, iter, ir->body) {
-      ir_instruction *const inst = (ir_instruction *) iter.get();
-
-      indent();
-      inst->accept(this);
-      printf("\n");
-   }
-   indentation--;
-   indent();
-   printf("))\n");
-   indentation--;
-   _mesa_symbol_table_pop_scope(symbols);
-}
-
-
-void ir_print_visitor::visit(ir_function *ir)
-{
-   printf("(function %s\n", ir->name);
-   indentation++;
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_function_signature *const sig = (ir_function_signature *) iter.get();
-      indent();
-      sig->accept(this);
-      printf("\n");
-   }
-   indentation--;
-   indent();
-   printf(")\n\n");
-}
-
-
-void ir_print_visitor::visit(ir_expression *ir)
-{
-   printf("(expression ");
-
-   print_type(ir->type);
-
-   printf(" %s ", ir->operator_string());
-
-   for (unsigned i = 0; i < ir->get_num_operands(); i++) {
-      ir->operands[i]->accept(this);
-   }
-
-   printf(") ");
-}
-
-
-void ir_print_visitor::visit(ir_texture *ir)
-{
-   printf("(%s ", ir->opcode_string());
-
-   print_type(ir->type);
-   printf(" ");
-
-   ir->sampler->accept(this);
-   printf(" ");
-
-   ir->coordinate->accept(this);
-
-   printf(" ");
-
-   if (ir->offset != NULL) {
-      ir->offset->accept(this);
-   } else {
-      printf("0");
-   }
-
-   printf(" ");
-
-   if (ir->op != ir_txf) {
-      if (ir->projector)
-	 ir->projector->accept(this);
-      else
-	 printf("1");
-
-      if (ir->shadow_comparitor) {
-	 printf(" ");
-	 ir->shadow_comparitor->accept(this);
-      } else {
-	 printf(" ()");
-      }
-   }
-
-   printf(" ");
-   switch (ir->op)
-   {
-   case ir_tex:
-      break;
-   case ir_txb:
-      ir->lod_info.bias->accept(this);
-      break;
-   case ir_txl:
-   case ir_txf:
-      ir->lod_info.lod->accept(this);
-      break;
-   case ir_txd:
-      printf("(");
-      ir->lod_info.grad.dPdx->accept(this);
-      printf(" ");
-      ir->lod_info.grad.dPdy->accept(this);
-      printf(")");
-      break;
-   };
-   printf(")");
-}
-
-
-void ir_print_visitor::visit(ir_swizzle *ir)
-{
-   const unsigned swiz[4] = {
-      ir->mask.x,
-      ir->mask.y,
-      ir->mask.z,
-      ir->mask.w,
-   };
-
-   printf("(swiz ");
-   for (unsigned i = 0; i < ir->mask.num_components; i++) {
-      printf("%c", "xyzw"[swiz[i]]);
-   }
-   printf(" ");
-   ir->val->accept(this);
-   printf(")");
-}
-
-
-void ir_print_visitor::visit(ir_dereference_variable *ir)
-{
-   ir_variable *var = ir->variable_referenced();
-   printf("(var_ref %s) ", unique_name(var));
-}
-
-
-void ir_print_visitor::visit(ir_dereference_array *ir)
-{
-   printf("(array_ref ");
-   ir->array->accept(this);
-   ir->array_index->accept(this);
-   printf(") ");
-}
-
-
-void ir_print_visitor::visit(ir_dereference_record *ir)
-{
-   printf("(record_ref ");
-   ir->record->accept(this);
-   printf(" %s) ", ir->field);
-}
-
-
-void ir_print_visitor::visit(ir_assignment *ir)
-{
-   printf("(assign ");
-
-   if (ir->condition)
-      ir->condition->accept(this);
-
-   char mask[5];
-   unsigned j = 0;
-
-   for (unsigned i = 0; i < 4; i++) {
-      if ((ir->write_mask & (1 << i)) != 0) {
-	 mask[j] = "xyzw"[i];
-	 j++;
-      }
-   }
-   mask[j] = '\0';
-
-   printf(" (%s) ", mask);
-
-   ir->lhs->accept(this);
-
-   printf(" ");
-
-   ir->rhs->accept(this);
-   printf(") ");
-}
-
-
-void ir_print_visitor::visit(ir_constant *ir)
-{
-   const glsl_type *const base_type = ir->type->get_base_type();
-
-   printf("(constant ");
-   print_type(ir->type);
-   printf(" (");
-
-   if (ir->type->is_array()) {
-      for (unsigned i = 0; i < ir->type->length; i++)
-	 ir->get_array_element(i)->accept(this);
-   } else if (ir->type->is_record()) {
-      ir_constant *value = (ir_constant *) ir->components.get_head();
-      for (unsigned i = 0; i < ir->type->length; i++) {
-	 printf("(%s ", ir->type->fields.structure->name);
-	 value->accept(this);
-	 printf(")");
-
-	 value = (ir_constant *) value->next;
-      }
-   } else {
-      for (unsigned i = 0; i < ir->type->components(); i++) {
-	 if (i != 0)
-	    printf(" ");
-	 switch (base_type->base_type) {
-	 case GLSL_TYPE_UINT:  printf("%u", ir->value.u[i]); break;
-	 case GLSL_TYPE_INT:   printf("%d", ir->value.i[i]); break;
-	 case GLSL_TYPE_FLOAT: printf("%f", ir->value.f[i]); break;
-	 case GLSL_TYPE_BOOL:  printf("%d", ir->value.b[i]); break;
-	 default: assert(0);
-	 }
-      }
-   }
-   printf(")) ");
-}
-
-
-void
-ir_print_visitor::visit(ir_call *ir)
-{
-   printf("(call %s (", ir->callee_name());
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_instruction *const inst = (ir_instruction *) iter.get();
-
-      inst->accept(this);
-   }
-   printf("))\n");
-}
-
-
-void
-ir_print_visitor::visit(ir_return *ir)
-{
-   printf("(return");
-
-   ir_rvalue *const value = ir->get_value();
-   if (value) {
-      printf(" ");
-      value->accept(this);
-   }
-
-   printf(")");
-}
-
-
-void
-ir_print_visitor::visit(ir_discard *ir)
-{
-   printf("(discard ");
-
-   if (ir->condition != NULL) {
-      printf(" ");
-      ir->condition->accept(this);
-   }
-
-   printf(")");
-}
-
-
-void
-ir_print_visitor::visit(ir_if *ir)
-{
-   printf("(if ");
-   ir->condition->accept(this);
-
-   printf("(\n");
-   indentation++;
-
-   foreach_iter(exec_list_iterator, iter, ir->then_instructions) {
-      ir_instruction *const inst = (ir_instruction *) iter.get();
-
-      indent();
-      inst->accept(this);
-      printf("\n");
-   }
-
-   indentation--;
-   indent();
-   printf(")\n");
-
-   indent();
-   if (!ir->else_instructions.is_empty()) {
-      printf("(\n");
-      indentation++;
-
-      foreach_iter(exec_list_iterator, iter, ir->else_instructions) {
-	 ir_instruction *const inst = (ir_instruction *) iter.get();
-
-	 indent();
-	 inst->accept(this);
-	 printf("\n");
-      }
-      indentation--;
-      indent();
-      printf("))\n");
-   } else {
-      printf("())\n");
-   }
-}
-
-
-void
-ir_print_visitor::visit(ir_loop *ir)
-{
-   printf("(loop (");
-   if (ir->counter != NULL)
-      ir->counter->accept(this);
-   printf(") (");
-   if (ir->from != NULL)
-      ir->from->accept(this);
-   printf(") (");
-   if (ir->to != NULL)
-      ir->to->accept(this);
-   printf(") (");
-   if (ir->increment != NULL)
-      ir->increment->accept(this);
-   printf(") (\n");
-   indentation++;
-
-   foreach_iter(exec_list_iterator, iter, ir->body_instructions) {
-      ir_instruction *const inst = (ir_instruction *) iter.get();
-
-      indent();
-      inst->accept(this);
-      printf("\n");
-   }
-   indentation--;
-   indent();
-   printf("))\n");
-}
-
-
-void
-ir_print_visitor::visit(ir_loop_jump *ir)
-{
-   printf("%s", ir->is_break() ? "break" : "continue");
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#include "ir_print_visitor.h"

+#include "glsl_types.h"

+#include "glsl_parser_extras.h"

+

+extern "C" {

+#include "program/hash_table.h"

+}

+

+static void print_type(const glsl_type *t);

+

+void

+ir_instruction::print(void) const

+{

+   ir_instruction *deconsted = const_cast<ir_instruction *>(this);

+

+   ir_print_visitor v;

+   deconsted->accept(&v);

+}

+

+void

+_mesa_print_ir(exec_list *instructions,

+	       struct _mesa_glsl_parse_state *state)

+{

+   if (state) {

+      for (unsigned i = 0; i < state->num_user_structures; i++) {

+	 const glsl_type *const s = state->user_structures[i];

+

+	 printf("(structure (%s) (%s@%p) (%u) (\n",

+		s->name, s->name, (void *) s, s->length);

+

+	 for (unsigned j = 0; j < s->length; j++) {

+	    printf("\t((");

+	    print_type(s->fields.structure[j].type);

+	    printf(")(%s))\n", s->fields.structure[j].name);

+	 }

+

+	 printf(")\n");

+      }

+   }

+

+   printf("(\n");

+   foreach_iter(exec_list_iterator, iter, *instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      ir->print();

+      if (ir->ir_type != ir_type_function)

+	 printf("\n");

+   }

+   printf("\n)");

+}

+

+ir_print_visitor::ir_print_visitor()

+{

+   indentation = 0;

+   printable_names =

+      hash_table_ctor(32, hash_table_pointer_hash, hash_table_pointer_compare);

+   symbols = _mesa_symbol_table_ctor();

+   mem_ctx = ralloc_context(NULL);

+}

+

+ir_print_visitor::~ir_print_visitor()

+{

+   hash_table_dtor(printable_names);

+   _mesa_symbol_table_dtor(symbols);

+   ralloc_free(mem_ctx);

+}

+

+void ir_print_visitor::indent(void)

+{

+   for (int i = 0; i < indentation; i++)

+      printf("  ");

+}

+

+const char *

+ir_print_visitor::unique_name(ir_variable *var)

+{

+   /* Do we already have a name for this variable? */

+   const char *name = (const char *) hash_table_find(this->printable_names, var);

+   if (name != NULL)

+      return name;

+

+   /* If there's no conflict, just use the original name */

+   if (_mesa_symbol_table_find_symbol(this->symbols, -1, var->name) == NULL) {

+      name = var->name;

+   } else {

+      static unsigned i = 1;

+      name = ralloc_asprintf(this->mem_ctx, "%s@%u", var->name, ++i);

+   }

+   hash_table_insert(this->printable_names, (void *) name, var);

+   _mesa_symbol_table_add_symbol(this->symbols, -1, name, var);

+   return name;

+}

+

+static void

+print_type(const glsl_type *t)

+{

+   if (t->base_type == GLSL_TYPE_ARRAY) {

+      printf("(array ");

+      print_type(t->fields.array);

+      printf(" %u)", t->length);

+   } else if ((t->base_type == GLSL_TYPE_STRUCT)

+	      && (strncmp("gl_", t->name, 3) != 0)) {

+      printf("%s@%p", t->name, (void *) t);

+   } else {

+      printf("%s", t->name);

+   }

+}

+

+

+void ir_print_visitor::visit(ir_variable *ir)

+{

+   printf("(declare ");

+

+   const char *const cent = (ir->centroid) ? "centroid " : "";

+   const char *const inv = (ir->invariant) ? "invariant " : "";

+   const char *const mode[] = { "", "uniform ", "in ", "out ", "inout ",

+			        "const_in ", "sys ", "temporary " };

+   const char *const interp[] = { "", "flat", "noperspective" };

+

+   printf("(%s%s%s%s) ",

+	  cent, inv, mode[ir->mode], interp[ir->interpolation]);

+

+   print_type(ir->type);

+   printf(" %s)", unique_name(ir));

+}

+

+

+void ir_print_visitor::visit(ir_function_signature *ir)

+{

+   _mesa_symbol_table_push_scope(symbols);

+   printf("(signature ");

+   indentation++;

+

+   print_type(ir->return_type);

+   printf("\n");

+   indent();

+

+   printf("(parameters\n");

+   indentation++;

+

+   foreach_iter(exec_list_iterator, iter, ir->parameters) {

+      ir_variable *const inst = (ir_variable *) iter.get();

+

+      indent();

+      inst->accept(this);

+      printf("\n");

+   }

+   indentation--;

+

+   indent();

+   printf(")\n");

+

+   indent();

+

+   printf("(\n");

+   indentation++;

+

+   foreach_iter(exec_list_iterator, iter, ir->body) {

+      ir_instruction *const inst = (ir_instruction *) iter.get();

+

+      indent();

+      inst->accept(this);

+      printf("\n");

+   }

+   indentation--;

+   indent();

+   printf("))\n");

+   indentation--;

+   _mesa_symbol_table_pop_scope(symbols);

+}

+

+

+void ir_print_visitor::visit(ir_function *ir)

+{

+   printf("(function %s\n", ir->name);

+   indentation++;

+   foreach_iter(exec_list_iterator, iter, *ir) {

+      ir_function_signature *const sig = (ir_function_signature *) iter.get();

+      indent();

+      sig->accept(this);

+      printf("\n");

+   }

+   indentation--;

+   indent();

+   printf(")\n\n");

+}

+

+

+void ir_print_visitor::visit(ir_expression *ir)

+{

+   printf("(expression ");

+

+   print_type(ir->type);

+

+   printf(" %s ", ir->operator_string());

+

+   for (unsigned i = 0; i < ir->get_num_operands(); i++) {

+      ir->operands[i]->accept(this);

+   }

+

+   printf(") ");

+}

+

+

+void ir_print_visitor::visit(ir_texture *ir)

+{

+   printf("(%s ", ir->opcode_string());

+

+   print_type(ir->type);

+   printf(" ");

+

+   ir->sampler->accept(this);

+   printf(" ");

+

+   ir->coordinate->accept(this);

+

+   printf(" ");

+

+   if (ir->offset != NULL) {

+      ir->offset->accept(this);

+   } else {

+      printf("0");

+   }

+

+   printf(" ");

+

+   if (ir->op != ir_txf) {

+      if (ir->projector)

+	 ir->projector->accept(this);

+      else

+	 printf("1");

+

+      if (ir->shadow_comparitor) {

+	 printf(" ");

+	 ir->shadow_comparitor->accept(this);

+      } else {

+	 printf(" ()");

+      }

+   }

+

+   printf(" ");

+   switch (ir->op)

+   {

+   case ir_tex:

+      break;

+   case ir_txb:

+      ir->lod_info.bias->accept(this);

+      break;

+   case ir_txl:

+   case ir_txf:

+      ir->lod_info.lod->accept(this);

+      break;

+   case ir_txd:

+      printf("(");

+      ir->lod_info.grad.dPdx->accept(this);

+      printf(" ");

+      ir->lod_info.grad.dPdy->accept(this);

+      printf(")");

+      break;

+   };

+   printf(")");

+}

+

+

+void ir_print_visitor::visit(ir_swizzle *ir)

+{

+   const unsigned swiz[4] = {

+      ir->mask.x,

+      ir->mask.y,

+      ir->mask.z,

+      ir->mask.w,

+   };

+

+   printf("(swiz ");

+   for (unsigned i = 0; i < ir->mask.num_components; i++) {

+      printf("%c", "xyzw"[swiz[i]]);

+   }

+   printf(" ");

+   ir->val->accept(this);

+   printf(")");

+}

+

+

+void ir_print_visitor::visit(ir_dereference_variable *ir)

+{

+   ir_variable *var = ir->variable_referenced();

+   printf("(var_ref %s) ", unique_name(var));

+}

+

+

+void ir_print_visitor::visit(ir_dereference_array *ir)

+{

+   printf("(array_ref ");

+   ir->array->accept(this);

+   ir->array_index->accept(this);

+   printf(") ");

+}

+

+

+void ir_print_visitor::visit(ir_dereference_record *ir)

+{

+   printf("(record_ref ");

+   ir->record->accept(this);

+   printf(" %s) ", ir->field);

+}

+

+

+void ir_print_visitor::visit(ir_assignment *ir)

+{

+   printf("(assign ");

+

+   if (ir->condition)

+      ir->condition->accept(this);

+

+   char mask[5];

+   unsigned j = 0;

+

+   for (unsigned i = 0; i < 4; i++) {

+      if ((ir->write_mask & (1 << i)) != 0) {

+	 mask[j] = "xyzw"[i];

+	 j++;

+      }

+   }

+   mask[j] = '\0';

+

+   printf(" (%s) ", mask);

+

+   ir->lhs->accept(this);

+

+   printf(" ");

+

+   ir->rhs->accept(this);

+   printf(") ");

+}

+

+

+void ir_print_visitor::visit(ir_constant *ir)

+{

+   const glsl_type *const base_type = ir->type->get_base_type();

+

+   printf("(constant ");

+   print_type(ir->type);

+   printf(" (");

+

+   if (ir->type->is_array()) {

+      for (unsigned i = 0; i < ir->type->length; i++)

+	 ir->get_array_element(i)->accept(this);

+   } else if (ir->type->is_record()) {

+      ir_constant *value = (ir_constant *) ir->components.get_head();

+      for (unsigned i = 0; i < ir->type->length; i++) {

+	 printf("(%s ", ir->type->fields.structure->name);

+	 value->accept(this);

+	 printf(")");

+

+	 value = (ir_constant *) value->next;

+      }

+   } else {

+      for (unsigned i = 0; i < ir->type->components(); i++) {

+	 if (i != 0)

+	    printf(" ");

+	 switch (base_type->base_type) {

+	 case GLSL_TYPE_UINT:  printf("%u", ir->value.u[i]); break;

+	 case GLSL_TYPE_INT:   printf("%d", ir->value.i[i]); break;

+	 case GLSL_TYPE_FLOAT: printf("%f", ir->value.f[i]); break;

+	 case GLSL_TYPE_BOOL:  printf("%d", ir->value.b[i]); break;

+	 default: assert(0);

+	 }

+      }

+   }

+   printf(")) ");

+}

+

+

+void

+ir_print_visitor::visit(ir_call *ir)

+{

+   printf("(call %s (", ir->callee_name());

+   foreach_iter(exec_list_iterator, iter, *ir) {

+      ir_instruction *const inst = (ir_instruction *) iter.get();

+

+      inst->accept(this);

+   }

+   printf("))\n");

+}

+

+

+void

+ir_print_visitor::visit(ir_return *ir)

+{

+   printf("(return");

+

+   ir_rvalue *const value = ir->get_value();

+   if (value) {

+      printf(" ");

+      value->accept(this);

+   }

+

+   printf(")");

+}

+

+

+void

+ir_print_visitor::visit(ir_discard *ir)

+{

+   printf("(discard ");

+

+   if (ir->condition != NULL) {

+      printf(" ");

+      ir->condition->accept(this);

+   }

+

+   printf(")");

+}

+

+

+void

+ir_print_visitor::visit(ir_if *ir)

+{

+   printf("(if ");

+   ir->condition->accept(this);

+

+   printf("(\n");

+   indentation++;

+

+   foreach_iter(exec_list_iterator, iter, ir->then_instructions) {

+      ir_instruction *const inst = (ir_instruction *) iter.get();

+

+      indent();

+      inst->accept(this);

+      printf("\n");

+   }

+

+   indentation--;

+   indent();

+   printf(")\n");

+

+   indent();

+   if (!ir->else_instructions.is_empty()) {

+      printf("(\n");

+      indentation++;

+

+      foreach_iter(exec_list_iterator, iter, ir->else_instructions) {

+	 ir_instruction *const inst = (ir_instruction *) iter.get();

+

+	 indent();

+	 inst->accept(this);

+	 printf("\n");

+      }

+      indentation--;

+      indent();

+      printf("))\n");

+   } else {

+      printf("())\n");

+   }

+}

+

+

+void

+ir_print_visitor::visit(ir_loop *ir)

+{

+   printf("(loop (");

+   if (ir->counter != NULL)

+      ir->counter->accept(this);

+   printf(") (");

+   if (ir->from != NULL)

+      ir->from->accept(this);

+   printf(") (");

+   if (ir->to != NULL)

+      ir->to->accept(this);

+   printf(") (");

+   if (ir->increment != NULL)

+      ir->increment->accept(this);

+   printf(") (\n");

+   indentation++;

+

+   foreach_iter(exec_list_iterator, iter, ir->body_instructions) {

+      ir_instruction *const inst = (ir_instruction *) iter.get();

+

+      indent();

+      inst->accept(this);

+      printf("\n");

+   }

+   indentation--;

+   indent();

+   printf("))\n");

+}

+

+

+void

+ir_print_visitor::visit(ir_loop_jump *ir)

+{

+   printf("%s", ir->is_break() ? "break" : "continue");

+}

diff --git a/mesalib/src/glsl/ir_print_visitor.h b/mesalib/src/glsl/ir_print_visitor.h
index c7136f11a..ec4d00843 100644
--- a/mesalib/src/glsl/ir_print_visitor.h
+++ b/mesalib/src/glsl/ir_print_visitor.h
@@ -1,94 +1,94 @@
-/* -*- c++ -*- */
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#pragma once
-#ifndef IR_PRINT_VISITOR_H
-#define IR_PRINT_VISITOR_H
-
-#include "ir.h"
-#include "ir_visitor.h"
-
-extern "C" {
-#include "program/symbol_table.h"
-}
-
-extern void _mesa_print_ir(exec_list *instructions,
-			   struct _mesa_glsl_parse_state *state);
-
-/**
- * Abstract base class of visitors of IR instruction trees
- */
-class ir_print_visitor : public ir_visitor {
-public:
-   ir_print_visitor();
-   virtual ~ir_print_visitor();
-
-   void indent(void);
-
-   /**
-    * \name Visit methods
-    *
-    * As typical for the visitor pattern, there must be one \c visit method for
-    * each concrete subclass of \c ir_instruction.  Virtual base classes within
-    * the hierarchy should not have \c visit methods.
-    */
-   /*@{*/
-   virtual void visit(ir_variable *);
-   virtual void visit(ir_function_signature *);
-   virtual void visit(ir_function *);
-   virtual void visit(ir_expression *);
-   virtual void visit(ir_texture *);
-   virtual void visit(ir_swizzle *);
-   virtual void visit(ir_dereference_variable *);
-   virtual void visit(ir_dereference_array *);
-   virtual void visit(ir_dereference_record *);
-   virtual void visit(ir_assignment *);
-   virtual void visit(ir_constant *);
-   virtual void visit(ir_call *);
-   virtual void visit(ir_return *);
-   virtual void visit(ir_discard *);
-   virtual void visit(ir_if *);
-   virtual void visit(ir_loop *);
-   virtual void visit(ir_loop_jump *);
-   /*@}*/
-
-private:
-   /**
-    * Fetch/generate a unique name for ir_variable.
-    *
-    * GLSL IR permits multiple ir_variables to share the same name.  This works
-    * fine until we try to print it, when we really need a unique one.
-    */
-   const char *unique_name(ir_variable *var);
-
-   /** A mapping from ir_variable * -> unique printable names. */
-   hash_table *printable_names;
-   _mesa_symbol_table *symbols;
-
-   void *mem_ctx;
-
-   int indentation;
-};
-
-#endif /* IR_PRINT_VISITOR_H */
+/* -*- c++ -*- */

+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#pragma once

+#ifndef IR_PRINT_VISITOR_H

+#define IR_PRINT_VISITOR_H

+

+#include "ir.h"

+#include "ir_visitor.h"

+

+extern "C" {

+#include "program/symbol_table.h"

+}

+

+extern void _mesa_print_ir(exec_list *instructions,

+			   struct _mesa_glsl_parse_state *state);

+

+/**

+ * Abstract base class of visitors of IR instruction trees

+ */

+class ir_print_visitor : public ir_visitor {

+public:

+   ir_print_visitor();

+   virtual ~ir_print_visitor();

+

+   void indent(void);

+

+   /**

+    * \name Visit methods

+    *

+    * As typical for the visitor pattern, there must be one \c visit method for

+    * each concrete subclass of \c ir_instruction.  Virtual base classes within

+    * the hierarchy should not have \c visit methods.

+    */

+   /*@{*/

+   virtual void visit(ir_variable *);

+   virtual void visit(ir_function_signature *);

+   virtual void visit(ir_function *);

+   virtual void visit(ir_expression *);

+   virtual void visit(ir_texture *);

+   virtual void visit(ir_swizzle *);

+   virtual void visit(ir_dereference_variable *);

+   virtual void visit(ir_dereference_array *);

+   virtual void visit(ir_dereference_record *);

+   virtual void visit(ir_assignment *);

+   virtual void visit(ir_constant *);

+   virtual void visit(ir_call *);

+   virtual void visit(ir_return *);

+   virtual void visit(ir_discard *);

+   virtual void visit(ir_if *);

+   virtual void visit(ir_loop *);

+   virtual void visit(ir_loop_jump *);

+   /*@}*/

+

+private:

+   /**

+    * Fetch/generate a unique name for ir_variable.

+    *

+    * GLSL IR permits multiple ir_variables to share the same name.  This works

+    * fine until we try to print it, when we really need a unique one.

+    */

+   const char *unique_name(ir_variable *var);

+

+   /** A mapping from ir_variable * -> unique printable names. */

+   hash_table *printable_names;

+   _mesa_symbol_table *symbols;

+

+   void *mem_ctx;

+

+   int indentation;

+};

+

+#endif /* IR_PRINT_VISITOR_H */

diff --git a/mesalib/src/glsl/ir_validate.cpp b/mesalib/src/glsl/ir_validate.cpp
index ec79d05ca..7757f5ecd 100644
--- a/mesalib/src/glsl/ir_validate.cpp
+++ b/mesalib/src/glsl/ir_validate.cpp
@@ -1,577 +1,577 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file ir_validate.cpp
- *
- * Attempts to verify that various invariants of the IR tree are true.
- *
- * In particular, at the moment it makes sure that no single
- * ir_instruction node except for ir_variable appears multiple times
- * in the ir tree.  ir_variable does appear multiple times: Once as a
- * declaration in an exec_list, and multiple times as the endpoint of
- * a dereference chain.
- */
-
-#include <inttypes.h>
-#include "ir.h"
-#include "ir_hierarchical_visitor.h"
-#include "program/hash_table.h"
-#include "glsl_types.h"
-
-class ir_validate : public ir_hierarchical_visitor {
-public:
-   ir_validate()
-   {
-      this->ht = hash_table_ctor(0, hash_table_pointer_hash,
-				 hash_table_pointer_compare);
-
-      this->current_function = NULL;
-
-      this->callback = ir_validate::validate_ir;
-      this->data = ht;
-   }
-
-   ~ir_validate()
-   {
-      hash_table_dtor(this->ht);
-   }
-
-   virtual ir_visitor_status visit(ir_variable *v);
-   virtual ir_visitor_status visit(ir_dereference_variable *ir);
-   virtual ir_visitor_status visit(ir_if *ir);
-
-   virtual ir_visitor_status visit_leave(ir_loop *ir);
-   virtual ir_visitor_status visit_enter(ir_function *ir);
-   virtual ir_visitor_status visit_leave(ir_function *ir);
-   virtual ir_visitor_status visit_enter(ir_function_signature *ir);
-
-   virtual ir_visitor_status visit_leave(ir_expression *ir);
-   virtual ir_visitor_status visit_leave(ir_swizzle *ir);
-
-   virtual ir_visitor_status visit_enter(ir_assignment *ir);
-   virtual ir_visitor_status visit_enter(ir_call *ir);
-
-   static void validate_ir(ir_instruction *ir, void *data);
-
-   ir_function *current_function;
-
-   struct hash_table *ht;
-};
-
-
-ir_visitor_status
-ir_validate::visit(ir_dereference_variable *ir)
-{
-   if ((ir->var == NULL) || (ir->var->as_variable() == NULL)) {
-      printf("ir_dereference_variable @ %p does not specify a variable %p\n",
-	     (void *) ir, (void *) ir->var);
-      abort();
-   }
-
-   if (hash_table_find(ht, ir->var) == NULL) {
-      printf("ir_dereference_variable @ %p specifies undeclared variable "
-	     "`%s' @ %p\n",
-	     (void *) ir, ir->var->name, (void *) ir->var);
-      abort();
-   }
-
-   this->validate_ir(ir, this->data);
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit(ir_if *ir)
-{
-   if (ir->condition->type != glsl_type::bool_type) {
-      printf("ir_if condition %s type instead of bool.\n",
-	     ir->condition->type->name);
-      ir->print();
-      printf("\n");
-      abort();
-   }
-
-   return visit_continue;
-}
-
-
-ir_visitor_status
-ir_validate::visit_leave(ir_loop *ir)
-{
-   if (ir->counter != NULL) {
-      if ((ir->from == NULL) || (ir->from == NULL) || (ir->increment == NULL)) {
-	 printf("ir_loop has invalid loop controls:\n"
-		"    counter:   %p\n"
-		"    from:      %p\n"
-		"    to:        %p\n"
-		"    increment: %p\n",
-		(void *) ir->counter, (void *) ir->from, (void *) ir->to,
-                (void *) ir->increment);
-	 abort();
-      }
-
-      if ((ir->cmp < ir_binop_less) || (ir->cmp > ir_binop_nequal)) {
-	 printf("ir_loop has invalid comparitor %d\n", ir->cmp);
-	 abort();
-      }
-   } else {
-      if ((ir->from != NULL) || (ir->from != NULL) || (ir->increment != NULL)) {
-	 printf("ir_loop has invalid loop controls:\n"
-		"    counter:   %p\n"
-		"    from:      %p\n"
-		"    to:        %p\n"
-		"    increment: %p\n",
-		(void *) ir->counter, (void *) ir->from, (void *) ir->to,
-                (void *) ir->increment);
-	 abort();
-      }
-   }
-
-   return visit_continue;
-}
-
-
-ir_visitor_status
-ir_validate::visit_enter(ir_function *ir)
-{
-   /* Function definitions cannot be nested.
-    */
-   if (this->current_function != NULL) {
-      printf("Function definition nested inside another function "
-	     "definition:\n");
-      printf("%s %p inside %s %p\n",
-	     ir->name, (void *) ir,
-	     this->current_function->name, (void *) this->current_function);
-      abort();
-   }
-
-   /* Store the current function hierarchy being traversed.  This is used
-    * by the function signature visitor to ensure that the signatures are
-    * linked with the correct functions.
-    */
-   this->current_function = ir;
-
-   this->validate_ir(ir, this->data);
-
-   /* Verify that all of the things stored in the list of signatures are,
-    * in fact, function signatures.
-    */
-   foreach_list(node, &ir->signatures) {
-      ir_instruction *sig = (ir_instruction *) node;
-
-      if (sig->ir_type != ir_type_function_signature) {
-	 printf("Non-signature in signature list of function `%s'\n",
-		ir->name);
-	 abort();
-      }
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit_leave(ir_function *ir)
-{
-   assert(ralloc_parent(ir->name) == ir);
-
-   this->current_function = NULL;
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit_enter(ir_function_signature *ir)
-{
-   if (this->current_function != ir->function()) {
-      printf("Function signature nested inside wrong function "
-	     "definition:\n");
-      printf("%p inside %s %p instead of %s %p\n",
-	     (void *) ir,
-	     this->current_function->name, (void *) this->current_function,
-	     ir->function_name(), (void *) ir->function());
-      abort();
-   }
-
-   if (ir->return_type == NULL) {
-      printf("Function signature %p for function %s has NULL return type.\n",
-	     (void *) ir, ir->function_name());
-      abort();
-   }
-
-   this->validate_ir(ir, this->data);
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit_leave(ir_expression *ir)
-{
-   switch (ir->operation) {
-   case ir_unop_bit_not:
-      assert(ir->operands[0]->type == ir->type);
-      break;
-   case ir_unop_logic_not:
-      assert(ir->type->base_type == GLSL_TYPE_BOOL);
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);
-      break;
-
-   case ir_unop_neg:
-   case ir_unop_abs:
-   case ir_unop_sign:
-   case ir_unop_rcp:
-   case ir_unop_rsq:
-   case ir_unop_sqrt:
-      assert(ir->type == ir->operands[0]->type);
-      break;
-
-   case ir_unop_exp:
-   case ir_unop_log:
-   case ir_unop_exp2:
-   case ir_unop_log2:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);
-      assert(ir->type == ir->operands[0]->type);
-      break;
-
-   case ir_unop_f2i:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);
-      assert(ir->type->base_type == GLSL_TYPE_INT);
-      break;
-   case ir_unop_i2f:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT);
-      assert(ir->type->base_type == GLSL_TYPE_FLOAT);
-      break;
-   case ir_unop_f2b:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);
-      assert(ir->type->base_type == GLSL_TYPE_BOOL);
-      break;
-   case ir_unop_b2f:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);
-      assert(ir->type->base_type == GLSL_TYPE_FLOAT);
-      break;
-   case ir_unop_i2b:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT);
-      assert(ir->type->base_type == GLSL_TYPE_BOOL);
-      break;
-   case ir_unop_b2i:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);
-      assert(ir->type->base_type == GLSL_TYPE_INT);
-      break;
-   case ir_unop_u2f:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_UINT);
-      assert(ir->type->base_type == GLSL_TYPE_FLOAT);
-      break;
-
-   case ir_unop_any:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);
-      assert(ir->type == glsl_type::bool_type);
-      break;
-
-   case ir_unop_trunc:
-   case ir_unop_round_even:
-   case ir_unop_ceil:
-   case ir_unop_floor:
-   case ir_unop_fract:
-   case ir_unop_sin:
-   case ir_unop_cos:
-   case ir_unop_sin_reduced:
-   case ir_unop_cos_reduced:
-   case ir_unop_dFdx:
-   case ir_unop_dFdy:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);
-      assert(ir->operands[0]->type == ir->type);
-      break;
-
-   case ir_unop_noise:
-      /* XXX what can we assert here? */
-      break;
-
-   case ir_binop_add:
-   case ir_binop_sub:
-   case ir_binop_mul:
-   case ir_binop_div:
-   case ir_binop_mod:
-   case ir_binop_min:
-   case ir_binop_max:
-   case ir_binop_pow:
-      if (ir->operands[0]->type->is_scalar())
-	 assert(ir->operands[1]->type == ir->type);
-      else if (ir->operands[1]->type->is_scalar())
-	 assert(ir->operands[0]->type == ir->type);
-      else if (ir->operands[0]->type->is_vector() &&
-	       ir->operands[1]->type->is_vector()) {
-	 assert(ir->operands[0]->type == ir->operands[1]->type);
-	 assert(ir->operands[0]->type == ir->type);
-      }
-      break;
-
-   case ir_binop_less:
-   case ir_binop_greater:
-   case ir_binop_lequal:
-   case ir_binop_gequal:
-   case ir_binop_equal:
-   case ir_binop_nequal:
-      /* The semantics of the IR operators differ from the GLSL <, >, <=, >=,
-       * ==, and != operators.  The IR operators perform a component-wise
-       * comparison on scalar or vector types and return a boolean scalar or
-       * vector type of the same size.
-       */
-      assert(ir->type->base_type == GLSL_TYPE_BOOL);
-      assert(ir->operands[0]->type == ir->operands[1]->type);
-      assert(ir->operands[0]->type->is_vector()
-	     || ir->operands[0]->type->is_scalar());
-      assert(ir->operands[0]->type->vector_elements
-	     == ir->type->vector_elements);
-      break;
-
-   case ir_binop_all_equal:
-   case ir_binop_any_nequal:
-      /* GLSL == and != operate on scalars, vectors, matrices and arrays, and
-       * return a scalar boolean.  The IR matches that.
-       */
-      assert(ir->type == glsl_type::bool_type);
-      assert(ir->operands[0]->type == ir->operands[1]->type);
-      break;
-
-   case ir_binop_lshift:
-   case ir_binop_rshift:
-      assert(ir->operands[0]->type->is_integer() &&
-             ir->operands[1]->type->is_integer());
-      if (ir->operands[0]->type->is_scalar()) {
-          assert(ir->operands[1]->type->is_scalar());
-      }
-      if (ir->operands[0]->type->is_vector() &&
-          ir->operands[1]->type->is_vector()) {
-          assert(ir->operands[0]->type->components() ==
-                 ir->operands[1]->type->components());
-      }
-      assert(ir->type == ir->operands[0]->type);
-      break;
-
-   case ir_binop_bit_and:
-   case ir_binop_bit_xor:
-   case ir_binop_bit_or:
-       assert(ir->operands[0]->type->base_type ==
-              ir->operands[1]->type->base_type);
-       assert(ir->type->is_integer());
-       if (ir->operands[0]->type->is_vector() &&
-           ir->operands[1]->type->is_vector()) {
-           assert(ir->operands[0]->type->vector_elements ==
-                  ir->operands[1]->type->vector_elements);
-       }
-       break;
-
-   case ir_binop_logic_and:
-   case ir_binop_logic_xor:
-   case ir_binop_logic_or:
-      assert(ir->type == glsl_type::bool_type);
-      assert(ir->operands[0]->type == glsl_type::bool_type);
-      assert(ir->operands[1]->type == glsl_type::bool_type);
-      break;
-
-   case ir_binop_dot:
-      assert(ir->type == glsl_type::float_type);
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);
-      assert(ir->operands[0]->type->is_vector());
-      assert(ir->operands[0]->type == ir->operands[1]->type);
-      break;
-
-   case ir_quadop_vector:
-      /* The vector operator collects some number of scalars and generates a
-       * vector from them.
-       *
-       *  - All of the operands must be scalar.
-       *  - Number of operands must matche the size of the resulting vector.
-       *  - Base type of the operands must match the base type of the result.
-       */
-      assert(ir->type->is_vector());
-      switch (ir->type->vector_elements) {
-      case 2:
-	 assert(ir->operands[0]->type->is_scalar());
-	 assert(ir->operands[0]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[1]->type->is_scalar());
-	 assert(ir->operands[1]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[2] == NULL);
-	 assert(ir->operands[3] == NULL);
-	 break;
-      case 3:
-	 assert(ir->operands[0]->type->is_scalar());
-	 assert(ir->operands[0]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[1]->type->is_scalar());
-	 assert(ir->operands[1]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[2]->type->is_scalar());
-	 assert(ir->operands[2]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[3] == NULL);
-	 break;
-      case 4:
-	 assert(ir->operands[0]->type->is_scalar());
-	 assert(ir->operands[0]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[1]->type->is_scalar());
-	 assert(ir->operands[1]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[2]->type->is_scalar());
-	 assert(ir->operands[2]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[3]->type->is_scalar());
-	 assert(ir->operands[3]->type->base_type == ir->type->base_type);
-	 break;
-      default:
-	 /* The is_vector assertion above should prevent execution from ever
-	  * getting here.
-	  */
-	 assert(!"Should not get here.");
-	 break;
-      }
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit_leave(ir_swizzle *ir)
-{
-   int chans[4] = {ir->mask.x, ir->mask.y, ir->mask.z, ir->mask.w};
-
-   for (unsigned int i = 0; i < ir->type->vector_elements; i++) {
-      if (chans[i] >= ir->val->type->vector_elements) {
-	 printf("ir_swizzle @ %p specifies a channel not present "
-		"in the value.\n", (void *) ir);
-	 ir->print();
-	 abort();
-      }
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit(ir_variable *ir)
-{
-   /* An ir_variable is the one thing that can (and will) appear multiple times
-    * in an IR tree.  It is added to the hashtable so that it can be used
-    * in the ir_dereference_variable handler to ensure that a variable is
-    * declared before it is dereferenced.
-    */
-   if (ir->name)
-      assert(ralloc_parent(ir->name) == ir);
-
-   hash_table_insert(ht, ir, ir);
-
-
-   /* If a variable is an array, verify that the maximum array index is in
-    * bounds.  There was once an error in AST-to-HIR conversion that set this
-    * to be out of bounds.
-    */
-   if (ir->type->array_size() > 0) {
-      if (ir->max_array_access >= ir->type->length) {
-	 printf("ir_variable has maximum access out of bounds (%d vs %d)\n",
-		ir->max_array_access, ir->type->length - 1);
-	 ir->print();
-	 abort();
-      }
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit_enter(ir_assignment *ir)
-{
-   const ir_dereference *const lhs = ir->lhs;
-   if (lhs->type->is_scalar() || lhs->type->is_vector()) {
-      if (ir->write_mask == 0) {
-	 printf("Assignment LHS is %s, but write mask is 0:\n",
-		lhs->type->is_scalar() ? "scalar" : "vector");
-	 ir->print();
-	 abort();
-      }
-
-      int lhs_components = 0;
-      for (int i = 0; i < 4; i++) {
-	 if (ir->write_mask & (1 << i))
-	    lhs_components++;
-      }
-
-      if (lhs_components != ir->rhs->type->vector_elements) {
-	 printf("Assignment count of LHS write mask channels enabled not\n"
-		"matching RHS vector size (%d LHS, %d RHS).\n",
-		lhs_components, ir->rhs->type->vector_elements);
-	 ir->print();
-	 abort();
-      }
-   }
-
-   this->validate_ir(ir, this->data);
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit_enter(ir_call *ir)
-{
-   ir_function_signature *const callee = ir->get_callee();
-
-   if (callee->ir_type != ir_type_function_signature) {
-      printf("IR called by ir_call is not ir_function_signature!\n");
-      abort();
-   }
-
-   return visit_continue;
-}
-
-void
-ir_validate::validate_ir(ir_instruction *ir, void *data)
-{
-   struct hash_table *ht = (struct hash_table *) data;
-
-   if (hash_table_find(ht, ir)) {
-      printf("Instruction node present twice in ir tree:\n");
-      ir->print();
-      printf("\n");
-      abort();
-   }
-   hash_table_insert(ht, ir, ir);
-}
-
-void
-check_node_type(ir_instruction *ir, void *data)
-{
-   (void) data;
-
-   if (ir->ir_type <= ir_type_unset || ir->ir_type >= ir_type_max) {
-      printf("Instruction node with unset type\n");
-      ir->print(); printf("\n");
-   }
-   assert(ir->type != glsl_type::error_type);
-}
-
-void
-validate_ir_tree(exec_list *instructions)
-{
-   ir_validate v;
-
-   v.run(instructions);
-
-   foreach_iter(exec_list_iterator, iter, *instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-
-      visit_tree(ir, check_node_type, NULL);
-   }
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file ir_validate.cpp

+ *

+ * Attempts to verify that various invariants of the IR tree are true.

+ *

+ * In particular, at the moment it makes sure that no single

+ * ir_instruction node except for ir_variable appears multiple times

+ * in the ir tree.  ir_variable does appear multiple times: Once as a

+ * declaration in an exec_list, and multiple times as the endpoint of

+ * a dereference chain.

+ */

+

+#include <inttypes.h>

+#include "ir.h"

+#include "ir_hierarchical_visitor.h"

+#include "program/hash_table.h"

+#include "glsl_types.h"

+

+class ir_validate : public ir_hierarchical_visitor {

+public:

+   ir_validate()

+   {

+      this->ht = hash_table_ctor(0, hash_table_pointer_hash,

+				 hash_table_pointer_compare);

+

+      this->current_function = NULL;

+

+      this->callback = ir_validate::validate_ir;

+      this->data = ht;

+   }

+

+   ~ir_validate()

+   {

+      hash_table_dtor(this->ht);

+   }

+

+   virtual ir_visitor_status visit(ir_variable *v);

+   virtual ir_visitor_status visit(ir_dereference_variable *ir);

+   virtual ir_visitor_status visit(ir_if *ir);

+

+   virtual ir_visitor_status visit_leave(ir_loop *ir);

+   virtual ir_visitor_status visit_enter(ir_function *ir);

+   virtual ir_visitor_status visit_leave(ir_function *ir);

+   virtual ir_visitor_status visit_enter(ir_function_signature *ir);

+

+   virtual ir_visitor_status visit_leave(ir_expression *ir);

+   virtual ir_visitor_status visit_leave(ir_swizzle *ir);

+

+   virtual ir_visitor_status visit_enter(ir_assignment *ir);

+   virtual ir_visitor_status visit_enter(ir_call *ir);

+

+   static void validate_ir(ir_instruction *ir, void *data);

+

+   ir_function *current_function;

+

+   struct hash_table *ht;

+};

+

+

+ir_visitor_status

+ir_validate::visit(ir_dereference_variable *ir)

+{

+   if ((ir->var == NULL) || (ir->var->as_variable() == NULL)) {

+      printf("ir_dereference_variable @ %p does not specify a variable %p\n",

+	     (void *) ir, (void *) ir->var);

+      abort();

+   }

+

+   if (hash_table_find(ht, ir->var) == NULL) {

+      printf("ir_dereference_variable @ %p specifies undeclared variable "

+	     "`%s' @ %p\n",

+	     (void *) ir, ir->var->name, (void *) ir->var);

+      abort();

+   }

+

+   this->validate_ir(ir, this->data);

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit(ir_if *ir)

+{

+   if (ir->condition->type != glsl_type::bool_type) {

+      printf("ir_if condition %s type instead of bool.\n",

+	     ir->condition->type->name);

+      ir->print();

+      printf("\n");

+      abort();

+   }

+

+   return visit_continue;

+}

+

+

+ir_visitor_status

+ir_validate::visit_leave(ir_loop *ir)

+{

+   if (ir->counter != NULL) {

+      if ((ir->from == NULL) || (ir->from == NULL) || (ir->increment == NULL)) {

+	 printf("ir_loop has invalid loop controls:\n"

+		"    counter:   %p\n"

+		"    from:      %p\n"

+		"    to:        %p\n"

+		"    increment: %p\n",

+		(void *) ir->counter, (void *) ir->from, (void *) ir->to,

+                (void *) ir->increment);

+	 abort();

+      }

+

+      if ((ir->cmp < ir_binop_less) || (ir->cmp > ir_binop_nequal)) {

+	 printf("ir_loop has invalid comparitor %d\n", ir->cmp);

+	 abort();

+      }

+   } else {

+      if ((ir->from != NULL) || (ir->from != NULL) || (ir->increment != NULL)) {

+	 printf("ir_loop has invalid loop controls:\n"

+		"    counter:   %p\n"

+		"    from:      %p\n"

+		"    to:        %p\n"

+		"    increment: %p\n",

+		(void *) ir->counter, (void *) ir->from, (void *) ir->to,

+                (void *) ir->increment);

+	 abort();

+      }

+   }

+

+   return visit_continue;

+}

+

+

+ir_visitor_status

+ir_validate::visit_enter(ir_function *ir)

+{

+   /* Function definitions cannot be nested.

+    */

+   if (this->current_function != NULL) {

+      printf("Function definition nested inside another function "

+	     "definition:\n");

+      printf("%s %p inside %s %p\n",

+	     ir->name, (void *) ir,

+	     this->current_function->name, (void *) this->current_function);

+      abort();

+   }

+

+   /* Store the current function hierarchy being traversed.  This is used

+    * by the function signature visitor to ensure that the signatures are

+    * linked with the correct functions.

+    */

+   this->current_function = ir;

+

+   this->validate_ir(ir, this->data);

+

+   /* Verify that all of the things stored in the list of signatures are,

+    * in fact, function signatures.

+    */

+   foreach_list(node, &ir->signatures) {

+      ir_instruction *sig = (ir_instruction *) node;

+

+      if (sig->ir_type != ir_type_function_signature) {

+	 printf("Non-signature in signature list of function `%s'\n",

+		ir->name);

+	 abort();

+      }

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit_leave(ir_function *ir)

+{

+   assert(ralloc_parent(ir->name) == ir);

+

+   this->current_function = NULL;

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit_enter(ir_function_signature *ir)

+{

+   if (this->current_function != ir->function()) {

+      printf("Function signature nested inside wrong function "

+	     "definition:\n");

+      printf("%p inside %s %p instead of %s %p\n",

+	     (void *) ir,

+	     this->current_function->name, (void *) this->current_function,

+	     ir->function_name(), (void *) ir->function());

+      abort();

+   }

+

+   if (ir->return_type == NULL) {

+      printf("Function signature %p for function %s has NULL return type.\n",

+	     (void *) ir, ir->function_name());

+      abort();

+   }

+

+   this->validate_ir(ir, this->data);

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit_leave(ir_expression *ir)

+{

+   switch (ir->operation) {

+   case ir_unop_bit_not:

+      assert(ir->operands[0]->type == ir->type);

+      break;

+   case ir_unop_logic_not:

+      assert(ir->type->base_type == GLSL_TYPE_BOOL);

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);

+      break;

+

+   case ir_unop_neg:

+   case ir_unop_abs:

+   case ir_unop_sign:

+   case ir_unop_rcp:

+   case ir_unop_rsq:

+   case ir_unop_sqrt:

+      assert(ir->type == ir->operands[0]->type);

+      break;

+

+   case ir_unop_exp:

+   case ir_unop_log:

+   case ir_unop_exp2:

+   case ir_unop_log2:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);

+      assert(ir->type == ir->operands[0]->type);

+      break;

+

+   case ir_unop_f2i:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);

+      assert(ir->type->base_type == GLSL_TYPE_INT);

+      break;

+   case ir_unop_i2f:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT);

+      assert(ir->type->base_type == GLSL_TYPE_FLOAT);

+      break;

+   case ir_unop_f2b:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);

+      assert(ir->type->base_type == GLSL_TYPE_BOOL);

+      break;

+   case ir_unop_b2f:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);

+      assert(ir->type->base_type == GLSL_TYPE_FLOAT);

+      break;

+   case ir_unop_i2b:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT);

+      assert(ir->type->base_type == GLSL_TYPE_BOOL);

+      break;

+   case ir_unop_b2i:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);

+      assert(ir->type->base_type == GLSL_TYPE_INT);

+      break;

+   case ir_unop_u2f:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_UINT);

+      assert(ir->type->base_type == GLSL_TYPE_FLOAT);

+      break;

+

+   case ir_unop_any:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);

+      assert(ir->type == glsl_type::bool_type);

+      break;

+

+   case ir_unop_trunc:

+   case ir_unop_round_even:

+   case ir_unop_ceil:

+   case ir_unop_floor:

+   case ir_unop_fract:

+   case ir_unop_sin:

+   case ir_unop_cos:

+   case ir_unop_sin_reduced:

+   case ir_unop_cos_reduced:

+   case ir_unop_dFdx:

+   case ir_unop_dFdy:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);

+      assert(ir->operands[0]->type == ir->type);

+      break;

+

+   case ir_unop_noise:

+      /* XXX what can we assert here? */

+      break;

+

+   case ir_binop_add:

+   case ir_binop_sub:

+   case ir_binop_mul:

+   case ir_binop_div:

+   case ir_binop_mod:

+   case ir_binop_min:

+   case ir_binop_max:

+   case ir_binop_pow:

+      if (ir->operands[0]->type->is_scalar())

+	 assert(ir->operands[1]->type == ir->type);

+      else if (ir->operands[1]->type->is_scalar())

+	 assert(ir->operands[0]->type == ir->type);

+      else if (ir->operands[0]->type->is_vector() &&

+	       ir->operands[1]->type->is_vector()) {

+	 assert(ir->operands[0]->type == ir->operands[1]->type);

+	 assert(ir->operands[0]->type == ir->type);

+      }

+      break;

+

+   case ir_binop_less:

+   case ir_binop_greater:

+   case ir_binop_lequal:

+   case ir_binop_gequal:

+   case ir_binop_equal:

+   case ir_binop_nequal:

+      /* The semantics of the IR operators differ from the GLSL <, >, <=, >=,

+       * ==, and != operators.  The IR operators perform a component-wise

+       * comparison on scalar or vector types and return a boolean scalar or

+       * vector type of the same size.

+       */

+      assert(ir->type->base_type == GLSL_TYPE_BOOL);

+      assert(ir->operands[0]->type == ir->operands[1]->type);

+      assert(ir->operands[0]->type->is_vector()

+	     || ir->operands[0]->type->is_scalar());

+      assert(ir->operands[0]->type->vector_elements

+	     == ir->type->vector_elements);

+      break;

+

+   case ir_binop_all_equal:

+   case ir_binop_any_nequal:

+      /* GLSL == and != operate on scalars, vectors, matrices and arrays, and

+       * return a scalar boolean.  The IR matches that.

+       */

+      assert(ir->type == glsl_type::bool_type);

+      assert(ir->operands[0]->type == ir->operands[1]->type);

+      break;

+

+   case ir_binop_lshift:

+   case ir_binop_rshift:

+      assert(ir->operands[0]->type->is_integer() &&

+             ir->operands[1]->type->is_integer());

+      if (ir->operands[0]->type->is_scalar()) {

+          assert(ir->operands[1]->type->is_scalar());

+      }

+      if (ir->operands[0]->type->is_vector() &&

+          ir->operands[1]->type->is_vector()) {

+          assert(ir->operands[0]->type->components() ==

+                 ir->operands[1]->type->components());

+      }

+      assert(ir->type == ir->operands[0]->type);

+      break;

+

+   case ir_binop_bit_and:

+   case ir_binop_bit_xor:

+   case ir_binop_bit_or:

+       assert(ir->operands[0]->type->base_type ==

+              ir->operands[1]->type->base_type);

+       assert(ir->type->is_integer());

+       if (ir->operands[0]->type->is_vector() &&

+           ir->operands[1]->type->is_vector()) {

+           assert(ir->operands[0]->type->vector_elements ==

+                  ir->operands[1]->type->vector_elements);

+       }

+       break;

+

+   case ir_binop_logic_and:

+   case ir_binop_logic_xor:

+   case ir_binop_logic_or:

+      assert(ir->type == glsl_type::bool_type);

+      assert(ir->operands[0]->type == glsl_type::bool_type);

+      assert(ir->operands[1]->type == glsl_type::bool_type);

+      break;

+

+   case ir_binop_dot:

+      assert(ir->type == glsl_type::float_type);

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);

+      assert(ir->operands[0]->type->is_vector());

+      assert(ir->operands[0]->type == ir->operands[1]->type);

+      break;

+

+   case ir_quadop_vector:

+      /* The vector operator collects some number of scalars and generates a

+       * vector from them.

+       *

+       *  - All of the operands must be scalar.

+       *  - Number of operands must matche the size of the resulting vector.

+       *  - Base type of the operands must match the base type of the result.

+       */

+      assert(ir->type->is_vector());

+      switch (ir->type->vector_elements) {

+      case 2:

+	 assert(ir->operands[0]->type->is_scalar());

+	 assert(ir->operands[0]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[1]->type->is_scalar());

+	 assert(ir->operands[1]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[2] == NULL);

+	 assert(ir->operands[3] == NULL);

+	 break;

+      case 3:

+	 assert(ir->operands[0]->type->is_scalar());

+	 assert(ir->operands[0]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[1]->type->is_scalar());

+	 assert(ir->operands[1]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[2]->type->is_scalar());

+	 assert(ir->operands[2]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[3] == NULL);

+	 break;

+      case 4:

+	 assert(ir->operands[0]->type->is_scalar());

+	 assert(ir->operands[0]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[1]->type->is_scalar());

+	 assert(ir->operands[1]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[2]->type->is_scalar());

+	 assert(ir->operands[2]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[3]->type->is_scalar());

+	 assert(ir->operands[3]->type->base_type == ir->type->base_type);

+	 break;

+      default:

+	 /* The is_vector assertion above should prevent execution from ever

+	  * getting here.

+	  */

+	 assert(!"Should not get here.");

+	 break;

+      }

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit_leave(ir_swizzle *ir)

+{

+   int chans[4] = {ir->mask.x, ir->mask.y, ir->mask.z, ir->mask.w};

+

+   for (unsigned int i = 0; i < ir->type->vector_elements; i++) {

+      if (chans[i] >= ir->val->type->vector_elements) {

+	 printf("ir_swizzle @ %p specifies a channel not present "

+		"in the value.\n", (void *) ir);

+	 ir->print();

+	 abort();

+      }

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit(ir_variable *ir)

+{

+   /* An ir_variable is the one thing that can (and will) appear multiple times

+    * in an IR tree.  It is added to the hashtable so that it can be used

+    * in the ir_dereference_variable handler to ensure that a variable is

+    * declared before it is dereferenced.

+    */

+   if (ir->name)

+      assert(ralloc_parent(ir->name) == ir);

+

+   hash_table_insert(ht, ir, ir);

+

+

+   /* If a variable is an array, verify that the maximum array index is in

+    * bounds.  There was once an error in AST-to-HIR conversion that set this

+    * to be out of bounds.

+    */

+   if (ir->type->array_size() > 0) {

+      if (ir->max_array_access >= ir->type->length) {

+	 printf("ir_variable has maximum access out of bounds (%d vs %d)\n",

+		ir->max_array_access, ir->type->length - 1);

+	 ir->print();

+	 abort();

+      }

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit_enter(ir_assignment *ir)

+{

+   const ir_dereference *const lhs = ir->lhs;

+   if (lhs->type->is_scalar() || lhs->type->is_vector()) {

+      if (ir->write_mask == 0) {

+	 printf("Assignment LHS is %s, but write mask is 0:\n",

+		lhs->type->is_scalar() ? "scalar" : "vector");

+	 ir->print();

+	 abort();

+      }

+

+      int lhs_components = 0;

+      for (int i = 0; i < 4; i++) {

+	 if (ir->write_mask & (1 << i))

+	    lhs_components++;

+      }

+

+      if (lhs_components != ir->rhs->type->vector_elements) {

+	 printf("Assignment count of LHS write mask channels enabled not\n"

+		"matching RHS vector size (%d LHS, %d RHS).\n",

+		lhs_components, ir->rhs->type->vector_elements);

+	 ir->print();

+	 abort();

+      }

+   }

+

+   this->validate_ir(ir, this->data);

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit_enter(ir_call *ir)

+{

+   ir_function_signature *const callee = ir->get_callee();

+

+   if (callee->ir_type != ir_type_function_signature) {

+      printf("IR called by ir_call is not ir_function_signature!\n");

+      abort();

+   }

+

+   return visit_continue;

+}

+

+void

+ir_validate::validate_ir(ir_instruction *ir, void *data)

+{

+   struct hash_table *ht = (struct hash_table *) data;

+

+   if (hash_table_find(ht, ir)) {

+      printf("Instruction node present twice in ir tree:\n");

+      ir->print();

+      printf("\n");

+      abort();

+   }

+   hash_table_insert(ht, ir, ir);

+}

+

+void

+check_node_type(ir_instruction *ir, void *data)

+{

+   (void) data;

+

+   if (ir->ir_type <= ir_type_unset || ir->ir_type >= ir_type_max) {

+      printf("Instruction node with unset type\n");

+      ir->print(); printf("\n");

+   }

+   assert(ir->type != glsl_type::error_type);

+}

+

+void

+validate_ir_tree(exec_list *instructions)

+{

+   ir_validate v;

+

+   v.run(instructions);

+

+   foreach_iter(exec_list_iterator, iter, *instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+

+      visit_tree(ir, check_node_type, NULL);

+   }

+}

diff --git a/mesalib/src/glsl/ir_variable.cpp b/mesalib/src/glsl/ir_variable.cpp
index f35771756..a86f1c6ed 100644
--- a/mesalib/src/glsl/ir_variable.cpp
+++ b/mesalib/src/glsl/ir_variable.cpp
@@ -1,837 +1,837 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#include "ir.h"
-#include "glsl_parser_extras.h"
-#include "glsl_symbol_table.h"
-#include "builtin_variables.h"
-#include "main/uniforms.h"
-#include "program/prog_parameter.h"
-#include "program/prog_statevars.h"
-#include "program/prog_instruction.h"
-
-static void generate_ARB_draw_buffers_variables(exec_list *,
-						struct _mesa_glsl_parse_state *,
-						bool, _mesa_glsl_parser_targets);
-
-static void
-generate_ARB_draw_instanced_variables(exec_list *,
-                                      struct _mesa_glsl_parse_state *,
-                                      bool, _mesa_glsl_parser_targets);
-
-static struct gl_builtin_uniform_element gl_DepthRange_elements[] = {
-   {"near", {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_XXXX},
-   {"far", {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_YYYY},
-   {"diff", {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_ZZZZ},
-};
-
-static struct gl_builtin_uniform_element gl_ClipPlane_elements[] = {
-   {NULL, {STATE_CLIPPLANE, 0, 0}, SWIZZLE_XYZW}
-};
-
-static struct gl_builtin_uniform_element gl_Point_elements[] = {
-   {"size", {STATE_POINT_SIZE}, SWIZZLE_XXXX},
-   {"sizeMin", {STATE_POINT_SIZE}, SWIZZLE_YYYY},
-   {"sizeMax", {STATE_POINT_SIZE}, SWIZZLE_ZZZZ},
-   {"fadeThresholdSize", {STATE_POINT_SIZE}, SWIZZLE_WWWW},
-   {"distanceConstantAttenuation", {STATE_POINT_ATTENUATION}, SWIZZLE_XXXX},
-   {"distanceLinearAttenuation", {STATE_POINT_ATTENUATION}, SWIZZLE_YYYY},
-   {"distanceQuadraticAttenuation", {STATE_POINT_ATTENUATION}, SWIZZLE_ZZZZ},
-};
-
-static struct gl_builtin_uniform_element gl_FrontMaterial_elements[] = {
-   {"emission", {STATE_MATERIAL, 0, STATE_EMISSION}, SWIZZLE_XYZW},
-   {"ambient", {STATE_MATERIAL, 0, STATE_AMBIENT}, SWIZZLE_XYZW},
-   {"diffuse", {STATE_MATERIAL, 0, STATE_DIFFUSE}, SWIZZLE_XYZW},
-   {"specular", {STATE_MATERIAL, 0, STATE_SPECULAR}, SWIZZLE_XYZW},
-   {"shininess", {STATE_MATERIAL, 0, STATE_SHININESS}, SWIZZLE_XXXX},
-};
-
-static struct gl_builtin_uniform_element gl_BackMaterial_elements[] = {
-   {"emission", {STATE_MATERIAL, 1, STATE_EMISSION}, SWIZZLE_XYZW},
-   {"ambient", {STATE_MATERIAL, 1, STATE_AMBIENT}, SWIZZLE_XYZW},
-   {"diffuse", {STATE_MATERIAL, 1, STATE_DIFFUSE}, SWIZZLE_XYZW},
-   {"specular", {STATE_MATERIAL, 1, STATE_SPECULAR}, SWIZZLE_XYZW},
-   {"shininess", {STATE_MATERIAL, 1, STATE_SHININESS}, SWIZZLE_XXXX},
-};
-
-static struct gl_builtin_uniform_element gl_LightSource_elements[] = {
-   {"ambient", {STATE_LIGHT, 0, STATE_AMBIENT}, SWIZZLE_XYZW},
-   {"diffuse", {STATE_LIGHT, 0, STATE_DIFFUSE}, SWIZZLE_XYZW},
-   {"specular", {STATE_LIGHT, 0, STATE_SPECULAR}, SWIZZLE_XYZW},
-   {"position", {STATE_LIGHT, 0, STATE_POSITION}, SWIZZLE_XYZW},
-   {"halfVector", {STATE_LIGHT, 0, STATE_HALF_VECTOR}, SWIZZLE_XYZW},
-   {"spotDirection", {STATE_LIGHT, 0, STATE_SPOT_DIRECTION},
-    MAKE_SWIZZLE4(SWIZZLE_X,
-		  SWIZZLE_Y,
-		  SWIZZLE_Z,
-		  SWIZZLE_Z)},
-   {"spotCosCutoff", {STATE_LIGHT, 0, STATE_SPOT_DIRECTION}, SWIZZLE_WWWW},
-   {"spotCutoff", {STATE_LIGHT, 0, STATE_SPOT_CUTOFF}, SWIZZLE_XXXX},
-   {"spotExponent", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_WWWW},
-   {"constantAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_XXXX},
-   {"linearAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_YYYY},
-   {"quadraticAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_ZZZZ},
-};
-
-static struct gl_builtin_uniform_element gl_LightModel_elements[] = {
-   {"ambient", {STATE_LIGHTMODEL_AMBIENT, 0}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_FrontLightModelProduct_elements[] = {
-   {"sceneColor", {STATE_LIGHTMODEL_SCENECOLOR, 0}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_BackLightModelProduct_elements[] = {
-   {"sceneColor", {STATE_LIGHTMODEL_SCENECOLOR, 1}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_FrontLightProduct_elements[] = {
-   {"ambient", {STATE_LIGHTPROD, 0, 0, STATE_AMBIENT}, SWIZZLE_XYZW},
-   {"diffuse", {STATE_LIGHTPROD, 0, 0, STATE_DIFFUSE}, SWIZZLE_XYZW},
-   {"specular", {STATE_LIGHTPROD, 0, 0, STATE_SPECULAR}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_BackLightProduct_elements[] = {
-   {"ambient", {STATE_LIGHTPROD, 0, 1, STATE_AMBIENT}, SWIZZLE_XYZW},
-   {"diffuse", {STATE_LIGHTPROD, 0, 1, STATE_DIFFUSE}, SWIZZLE_XYZW},
-   {"specular", {STATE_LIGHTPROD, 0, 1, STATE_SPECULAR}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_TextureEnvColor_elements[] = {
-   {NULL, {STATE_TEXENV_COLOR, 0}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_EyePlaneS_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_S}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_EyePlaneT_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_T}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_EyePlaneR_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_R}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_EyePlaneQ_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_Q}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_ObjectPlaneS_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_S}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_ObjectPlaneT_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_T}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_ObjectPlaneR_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_R}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_ObjectPlaneQ_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_Q}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_Fog_elements[] = {
-   {"color", {STATE_FOG_COLOR}, SWIZZLE_XYZW},
-   {"density", {STATE_FOG_PARAMS}, SWIZZLE_XXXX},
-   {"start", {STATE_FOG_PARAMS}, SWIZZLE_YYYY},
-   {"end", {STATE_FOG_PARAMS}, SWIZZLE_ZZZZ},
-   {"scale", {STATE_FOG_PARAMS}, SWIZZLE_WWWW},
-};
-
-static struct gl_builtin_uniform_element gl_NormalScale_elements[] = {
-   {NULL, {STATE_NORMAL_SCALE}, SWIZZLE_XXXX},
-};
-
-static struct gl_builtin_uniform_element gl_MESABumpRotMatrix0_elements[] = {
-   {NULL, {STATE_INTERNAL, STATE_ROT_MATRIX_0}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_MESABumpRotMatrix1_elements[] = {
-   {NULL, {STATE_INTERNAL, STATE_ROT_MATRIX_1}, SWIZZLE_XYZW},
-};
-
-static struct gl_builtin_uniform_element gl_MESAFogParamsOptimized_elements[] = {
-   {NULL, {STATE_INTERNAL, STATE_FOG_PARAMS_OPTIMIZED}, SWIZZLE_XYZW},
-};
-
-#define MATRIX(name, statevar, modifier)				\
-   static struct gl_builtin_uniform_element name ## _elements[] = {	\
-      { NULL, { statevar, 0, 0, 0, modifier}, SWIZZLE_XYZW },		\
-      { NULL, { statevar, 0, 1, 1, modifier}, SWIZZLE_XYZW },		\
-      { NULL, { statevar, 0, 2, 2, modifier}, SWIZZLE_XYZW },		\
-      { NULL, { statevar, 0, 3, 3, modifier}, SWIZZLE_XYZW },		\
-   }
-
-MATRIX(gl_ModelViewMatrix,
-       STATE_MODELVIEW_MATRIX, STATE_MATRIX_TRANSPOSE);
-MATRIX(gl_ModelViewMatrixInverse,
-       STATE_MODELVIEW_MATRIX, STATE_MATRIX_INVTRANS);
-MATRIX(gl_ModelViewMatrixTranspose,
-       STATE_MODELVIEW_MATRIX, 0);
-MATRIX(gl_ModelViewMatrixInverseTranspose,
-       STATE_MODELVIEW_MATRIX, STATE_MATRIX_INVERSE);
-
-MATRIX(gl_ProjectionMatrix,
-       STATE_PROJECTION_MATRIX, STATE_MATRIX_TRANSPOSE);
-MATRIX(gl_ProjectionMatrixInverse,
-       STATE_PROJECTION_MATRIX, STATE_MATRIX_INVTRANS);
-MATRIX(gl_ProjectionMatrixTranspose,
-       STATE_PROJECTION_MATRIX, 0);
-MATRIX(gl_ProjectionMatrixInverseTranspose,
-       STATE_PROJECTION_MATRIX, STATE_MATRIX_INVERSE);
-
-MATRIX(gl_ModelViewProjectionMatrix,
-       STATE_MVP_MATRIX, STATE_MATRIX_TRANSPOSE);
-MATRIX(gl_ModelViewProjectionMatrixInverse,
-       STATE_MVP_MATRIX, STATE_MATRIX_INVTRANS);
-MATRIX(gl_ModelViewProjectionMatrixTranspose,
-       STATE_MVP_MATRIX, 0);
-MATRIX(gl_ModelViewProjectionMatrixInverseTranspose,
-       STATE_MVP_MATRIX, STATE_MATRIX_INVERSE);
-
-MATRIX(gl_TextureMatrix,
-       STATE_TEXTURE_MATRIX, STATE_MATRIX_TRANSPOSE);
-MATRIX(gl_TextureMatrixInverse,
-       STATE_TEXTURE_MATRIX, STATE_MATRIX_INVTRANS);
-MATRIX(gl_TextureMatrixTranspose,
-       STATE_TEXTURE_MATRIX, 0);
-MATRIX(gl_TextureMatrixInverseTranspose,
-       STATE_TEXTURE_MATRIX, STATE_MATRIX_INVERSE);
-
-static struct gl_builtin_uniform_element gl_NormalMatrix_elements[] = {
-   { NULL, { STATE_MODELVIEW_MATRIX, 0, 0, 0, STATE_MATRIX_INVERSE},
-     SWIZZLE_XYZW },
-   { NULL, { STATE_MODELVIEW_MATRIX, 0, 1, 1, STATE_MATRIX_INVERSE},
-     SWIZZLE_XYZW },
-   { NULL, { STATE_MODELVIEW_MATRIX, 0, 2, 2, STATE_MATRIX_INVERSE},
-     SWIZZLE_XYZW },
-};
-
-#undef MATRIX
-
-#define STATEVAR(name) {#name, name ## _elements, Elements(name ## _elements)}
-
-const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[] = {
-   STATEVAR(gl_DepthRange),
-   STATEVAR(gl_ClipPlane),
-   STATEVAR(gl_Point),
-   STATEVAR(gl_FrontMaterial),
-   STATEVAR(gl_BackMaterial),
-   STATEVAR(gl_LightSource),
-   STATEVAR(gl_LightModel),
-   STATEVAR(gl_FrontLightModelProduct),
-   STATEVAR(gl_BackLightModelProduct),
-   STATEVAR(gl_FrontLightProduct),
-   STATEVAR(gl_BackLightProduct),
-   STATEVAR(gl_TextureEnvColor),
-   STATEVAR(gl_EyePlaneS),
-   STATEVAR(gl_EyePlaneT),
-   STATEVAR(gl_EyePlaneR),
-   STATEVAR(gl_EyePlaneQ),
-   STATEVAR(gl_ObjectPlaneS),
-   STATEVAR(gl_ObjectPlaneT),
-   STATEVAR(gl_ObjectPlaneR),
-   STATEVAR(gl_ObjectPlaneQ),
-   STATEVAR(gl_Fog),
-
-   STATEVAR(gl_ModelViewMatrix),
-   STATEVAR(gl_ModelViewMatrixInverse),
-   STATEVAR(gl_ModelViewMatrixTranspose),
-   STATEVAR(gl_ModelViewMatrixInverseTranspose),
-
-   STATEVAR(gl_ProjectionMatrix),
-   STATEVAR(gl_ProjectionMatrixInverse),
-   STATEVAR(gl_ProjectionMatrixTranspose),
-   STATEVAR(gl_ProjectionMatrixInverseTranspose),
-
-   STATEVAR(gl_ModelViewProjectionMatrix),
-   STATEVAR(gl_ModelViewProjectionMatrixInverse),
-   STATEVAR(gl_ModelViewProjectionMatrixTranspose),
-   STATEVAR(gl_ModelViewProjectionMatrixInverseTranspose),
-
-   STATEVAR(gl_TextureMatrix),
-   STATEVAR(gl_TextureMatrixInverse),
-   STATEVAR(gl_TextureMatrixTranspose),
-   STATEVAR(gl_TextureMatrixInverseTranspose),
-
-   STATEVAR(gl_NormalMatrix),
-   STATEVAR(gl_NormalScale),
-
-   STATEVAR(gl_MESABumpRotMatrix0),
-   STATEVAR(gl_MESABumpRotMatrix1),
-   STATEVAR(gl_MESAFogParamsOptimized),
-
-   {NULL, NULL, 0}
-};
-
-static ir_variable *
-add_variable(exec_list *instructions, glsl_symbol_table *symtab,
-	     const char *name, const glsl_type *type,
-	     enum ir_variable_mode mode, int slot)
-{
-   ir_variable *var = new(symtab) ir_variable(type, name, mode);
-
-   switch (var->mode) {
-   case ir_var_auto:
-   case ir_var_in:
-   case ir_var_const_in:
-   case ir_var_uniform:
-   case ir_var_system_value:
-      var->read_only = true;
-      break;
-   case ir_var_inout:
-   case ir_var_out:
-      break;
-   default:
-      assert(0);
-      break;
-   }
-
-   var->location = slot;
-   var->explicit_location = (slot >= 0);
-
-   /* Once the variable is created an initialized, add it to the symbol table
-    * and add the declaration to the IR stream.
-    */
-   instructions->push_tail(var);
-
-   symtab->add_variable(var);
-   return var;
-}
-
-static ir_variable *
-add_uniform(exec_list *instructions, glsl_symbol_table *symtab,
-	    const char *name, const glsl_type *type)
-{
-   ir_variable *const uni =
-      add_variable(instructions, symtab, name, type, ir_var_uniform, -1);
-
-   unsigned i;
-   for (i = 0; _mesa_builtin_uniform_desc[i].name != NULL; i++) {
-      if (strcmp(_mesa_builtin_uniform_desc[i].name, name) == 0) {
-	 break;
-      }
-   }
-
-   assert(_mesa_builtin_uniform_desc[i].name != NULL);
-   const struct gl_builtin_uniform_desc* const statevar =
-      &_mesa_builtin_uniform_desc[i];
-
-   const unsigned array_count = type->is_array() ? type->length : 1;
-   uni->num_state_slots = array_count * statevar->num_elements;
-
-   ir_state_slot *slots =
-      ralloc_array(uni, ir_state_slot, uni->num_state_slots);
-
-   uni->state_slots = slots;
-
-   for (unsigned a = 0; a < array_count; a++) {
-      for (unsigned j = 0; j < statevar->num_elements; j++) {
-	 struct gl_builtin_uniform_element *element = &statevar->elements[j];
-
-	 memcpy(slots->tokens, element->tokens, sizeof(element->tokens));
-	 if (type->is_array()) {
-	    slots->tokens[1] = a;
-	 }
-
-	 slots->swizzle = element->swizzle;
-	 slots++;
-      }
-   }
-
-   return uni;
-}
-
-static void
-add_builtin_variable(exec_list *instructions, glsl_symbol_table *symtab,
-		     const builtin_variable *proto)
-{
-   /* Create a new variable declaration from the description supplied by
-    * the caller.
-    */
-   const glsl_type *const type = symtab->get_type(proto->type);
-
-   assert(type != NULL);
-
-   if (proto->mode == ir_var_uniform) {
-      add_uniform(instructions, symtab, proto->name, type);
-   } else {
-      add_variable(instructions, symtab, proto->name, type, proto->mode,
-		   proto->slot);
-   }
-}
-
-static void
-add_builtin_constant(exec_list *instructions, glsl_symbol_table *symtab,
-		     const char *name, int value)
-{
-   ir_variable *const var = add_variable(instructions, symtab,
-					 name, glsl_type::int_type,
-					 ir_var_auto, -1);
-   var->constant_value = new(var) ir_constant(value);
-}
-
-/* Several constants in GLSL ES have different names than normal desktop GLSL.
- * Therefore, this function should only be called on the ES path.
- */
-static void
-generate_100ES_uniforms(exec_list *instructions,
-		     struct _mesa_glsl_parse_state *state)
-{
-   glsl_symbol_table *const symtab = state->symbols;
-
-   add_builtin_constant(instructions, symtab, "gl_MaxVertexAttribs",
-			state->Const.MaxVertexAttribs);
-   add_builtin_constant(instructions, symtab, "gl_MaxVertexUniformVectors",
-			state->Const.MaxVertexUniformComponents);
-   add_builtin_constant(instructions, symtab, "gl_MaxVaryingVectors",
-			state->Const.MaxVaryingFloats / 4);
-   add_builtin_constant(instructions, symtab, "gl_MaxVertexTextureImageUnits",
-			state->Const.MaxVertexTextureImageUnits);
-   add_builtin_constant(instructions, symtab, "gl_MaxCombinedTextureImageUnits",
-			state->Const.MaxCombinedTextureImageUnits);
-   add_builtin_constant(instructions, symtab, "gl_MaxTextureImageUnits",
-			state->Const.MaxTextureImageUnits);
-   add_builtin_constant(instructions, symtab, "gl_MaxFragmentUniformVectors",
-			state->Const.MaxFragmentUniformComponents);
-
-   add_uniform(instructions, symtab, "gl_DepthRange",
-	       state->symbols->get_type("gl_DepthRangeParameters"));
-}
-
-static void
-generate_110_uniforms(exec_list *instructions,
-		      struct _mesa_glsl_parse_state *state)
-{
-   glsl_symbol_table *const symtab = state->symbols;
-
-   for (unsigned i = 0
-	   ; i < Elements(builtin_110_deprecated_uniforms)
-	   ; i++) {
-      add_builtin_variable(instructions, symtab,
-			   & builtin_110_deprecated_uniforms[i]);
-   }
-
-   add_builtin_constant(instructions, symtab, "gl_MaxLights",
-			state->Const.MaxLights);
-   add_builtin_constant(instructions, symtab, "gl_MaxClipPlanes",
-			state->Const.MaxClipPlanes);
-   add_builtin_constant(instructions, symtab, "gl_MaxTextureUnits",
-			state->Const.MaxTextureUnits);
-   add_builtin_constant(instructions, symtab, "gl_MaxTextureCoords",
-			state->Const.MaxTextureCoords);
-   add_builtin_constant(instructions, symtab, "gl_MaxVertexAttribs",
-			state->Const.MaxVertexAttribs);
-   add_builtin_constant(instructions, symtab, "gl_MaxVertexUniformComponents",
-			state->Const.MaxVertexUniformComponents);
-   add_builtin_constant(instructions, symtab, "gl_MaxVaryingFloats",
-			state->Const.MaxVaryingFloats);
-   add_builtin_constant(instructions, symtab, "gl_MaxVertexTextureImageUnits",
-			state->Const.MaxVertexTextureImageUnits);
-   add_builtin_constant(instructions, symtab, "gl_MaxCombinedTextureImageUnits",
-			state->Const.MaxCombinedTextureImageUnits);
-   add_builtin_constant(instructions, symtab, "gl_MaxTextureImageUnits",
-			state->Const.MaxTextureImageUnits);
-   add_builtin_constant(instructions, symtab, "gl_MaxFragmentUniformComponents",
-			state->Const.MaxFragmentUniformComponents);
-
-   const glsl_type *const mat4_array_type =
-      glsl_type::get_array_instance(glsl_type::mat4_type,
-				    state->Const.MaxTextureCoords);
-
-   add_uniform(instructions, symtab, "gl_TextureMatrix", mat4_array_type);
-   add_uniform(instructions, symtab, "gl_TextureMatrixInverse", mat4_array_type);
-   add_uniform(instructions, symtab, "gl_TextureMatrixTranspose", mat4_array_type);
-   add_uniform(instructions, symtab, "gl_TextureMatrixInverseTranspose", mat4_array_type);
-
-   add_uniform(instructions, symtab, "gl_DepthRange",
-		symtab->get_type("gl_DepthRangeParameters"));
-
-   add_uniform(instructions, symtab, "gl_ClipPlane",
-	       glsl_type::get_array_instance(glsl_type::vec4_type,
-					     state->Const.MaxClipPlanes));
-   add_uniform(instructions, symtab, "gl_Point",
-	       symtab->get_type("gl_PointParameters"));
-
-   const glsl_type *const material_parameters_type =
-      symtab->get_type("gl_MaterialParameters");
-   add_uniform(instructions, symtab, "gl_FrontMaterial", material_parameters_type);
-   add_uniform(instructions, symtab, "gl_BackMaterial", material_parameters_type);
-
-   const glsl_type *const light_source_array_type =
-      glsl_type::get_array_instance(symtab->get_type("gl_LightSourceParameters"), state->Const.MaxLights);
-
-   add_uniform(instructions, symtab, "gl_LightSource", light_source_array_type);
-
-   const glsl_type *const light_model_products_type =
-      symtab->get_type("gl_LightModelProducts");
-   add_uniform(instructions, symtab, "gl_FrontLightModelProduct",
-	       light_model_products_type);
-   add_uniform(instructions, symtab, "gl_BackLightModelProduct",
-	       light_model_products_type);
-
-   const glsl_type *const light_products_type =
-      glsl_type::get_array_instance(symtab->get_type("gl_LightProducts"),
-				    state->Const.MaxLights);
-   add_uniform(instructions, symtab, "gl_FrontLightProduct", light_products_type);
-   add_uniform(instructions, symtab, "gl_BackLightProduct", light_products_type);
-
-   add_uniform(instructions, symtab, "gl_TextureEnvColor",
-	       glsl_type::get_array_instance(glsl_type::vec4_type,
-					     state->Const.MaxTextureUnits));
-
-   const glsl_type *const texcoords_vec4 =
-      glsl_type::get_array_instance(glsl_type::vec4_type,
-				    state->Const.MaxTextureCoords);
-   add_uniform(instructions, symtab, "gl_EyePlaneS", texcoords_vec4);
-   add_uniform(instructions, symtab, "gl_EyePlaneT", texcoords_vec4);
-   add_uniform(instructions, symtab, "gl_EyePlaneR", texcoords_vec4);
-   add_uniform(instructions, symtab, "gl_EyePlaneQ", texcoords_vec4);
-   add_uniform(instructions, symtab, "gl_ObjectPlaneS", texcoords_vec4);
-   add_uniform(instructions, symtab, "gl_ObjectPlaneT", texcoords_vec4);
-   add_uniform(instructions, symtab, "gl_ObjectPlaneR", texcoords_vec4);
-   add_uniform(instructions, symtab, "gl_ObjectPlaneQ", texcoords_vec4);
-
-   add_uniform(instructions, symtab, "gl_Fog",
-	       symtab->get_type("gl_FogParameters"));
-}
-
-/* This function should only be called for ES, not desktop GL. */
-static void
-generate_100ES_vs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   for (unsigned i = 0; i < Elements(builtin_core_vs_variables); i++) {
-      add_builtin_variable(instructions, state->symbols,
-			   & builtin_core_vs_variables[i]);
-   }
-
-   generate_100ES_uniforms(instructions, state);
-
-   generate_ARB_draw_buffers_variables(instructions, state, false,
-				       vertex_shader);
-}
-
-
-static void
-generate_110_vs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   for (unsigned i = 0; i < Elements(builtin_core_vs_variables); i++) {
-      add_builtin_variable(instructions, state->symbols,
-			   & builtin_core_vs_variables[i]);
-   }
-
-   for (unsigned i = 0
-	   ; i < Elements(builtin_110_deprecated_vs_variables)
-	   ; i++) {
-      add_builtin_variable(instructions, state->symbols,
-			   & builtin_110_deprecated_vs_variables[i]);
-   }
-   generate_110_uniforms(instructions, state);
-
-   /* From page 54 (page 60 of the PDF) of the GLSL 1.20 spec:
-    *
-    *     "As with all arrays, indices used to subscript gl_TexCoord must
-    *     either be an integral constant expressions, or this array must be
-    *     re-declared by the shader with a size. The size can be at most
-    *     gl_MaxTextureCoords. Using indexes close to 0 may aid the
-    *     implementation in preserving varying resources."
-    */
-   const glsl_type *const vec4_array_type =
-      glsl_type::get_array_instance(glsl_type::vec4_type, 0);
-
-   add_variable(instructions, state->symbols,
-		"gl_TexCoord", vec4_array_type, ir_var_out, VERT_RESULT_TEX0);
-
-   generate_ARB_draw_buffers_variables(instructions, state, false,
-				       vertex_shader);
-}
-
-
-static void
-generate_120_vs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   /* GLSL version 1.20 did not add any built-in variables in the vertex
-    * shader.
-    */
-   generate_110_vs_variables(instructions, state);
-}
-
-
-static void
-generate_130_vs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   generate_120_vs_variables(instructions, state);
-
-   for (unsigned i = 0; i < Elements(builtin_130_vs_variables); i++) {
-      add_builtin_variable(instructions, state->symbols,
-			   & builtin_130_vs_variables[i]);
-   }
-
-   const glsl_type *const clip_distance_array_type =
-      glsl_type::get_array_instance(glsl_type::float_type,
-				    state->Const.MaxClipPlanes);
-
-   /* FINISHME: gl_ClipDistance needs a real location assigned. */
-   add_variable(instructions, state->symbols,
-		"gl_ClipDistance", clip_distance_array_type, ir_var_out, -1);
-
-}
-
-
-static void
-initialize_vs_variables(exec_list *instructions,
-			struct _mesa_glsl_parse_state *state)
-{
-
-   switch (state->language_version) {
-   case 100:
-      generate_100ES_vs_variables(instructions, state);
-      break;
-   case 110:
-      generate_110_vs_variables(instructions, state);
-      break;
-   case 120:
-      generate_120_vs_variables(instructions, state);
-      break;
-   case 130:
-      generate_130_vs_variables(instructions, state);
-      break;
-   }
-
-   if (state->ARB_draw_instanced_enable)
-      generate_ARB_draw_instanced_variables(instructions, state, false,
-                                            vertex_shader);
-}
-
-
-/* This function should only be called for ES, not desktop GL. */
-static void
-generate_100ES_fs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   for (unsigned i = 0; i < Elements(builtin_core_fs_variables); i++) {
-      add_builtin_variable(instructions, state->symbols,
-			   & builtin_core_fs_variables[i]);
-   }
-
-   for (unsigned i = 0; i < Elements(builtin_100ES_fs_variables); i++) {
-      add_builtin_variable(instructions, state->symbols,
-			   & builtin_100ES_fs_variables[i]);
-   }
-
-   generate_100ES_uniforms(instructions, state);
-
-   generate_ARB_draw_buffers_variables(instructions, state, false,
-				       fragment_shader);
-}
-
-static void
-generate_110_fs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   for (unsigned i = 0; i < Elements(builtin_core_fs_variables); i++) {
-      add_builtin_variable(instructions, state->symbols,
-			   & builtin_core_fs_variables[i]);
-   }
-
-   for (unsigned i = 0; i < Elements(builtin_110_fs_variables); i++) {
-      add_builtin_variable(instructions, state->symbols,
-			   & builtin_110_fs_variables[i]);
-   }
-
-   for (unsigned i = 0
-	   ; i < Elements(builtin_110_deprecated_fs_variables)
-	   ; i++) {
-      add_builtin_variable(instructions, state->symbols,
-			   & builtin_110_deprecated_fs_variables[i]);
-   }
-   generate_110_uniforms(instructions, state);
-
-   /* From page 54 (page 60 of the PDF) of the GLSL 1.20 spec:
-    *
-    *     "As with all arrays, indices used to subscript gl_TexCoord must
-    *     either be an integral constant expressions, or this array must be
-    *     re-declared by the shader with a size. The size can be at most
-    *     gl_MaxTextureCoords. Using indexes close to 0 may aid the
-    *     implementation in preserving varying resources."
-    */
-   const glsl_type *const vec4_array_type =
-      glsl_type::get_array_instance(glsl_type::vec4_type, 0);
-
-   add_variable(instructions, state->symbols,
-		"gl_TexCoord", vec4_array_type, ir_var_in, FRAG_ATTRIB_TEX0);
-
-   generate_ARB_draw_buffers_variables(instructions, state, false,
-				       fragment_shader);
-}
-
-
-static void
-generate_ARB_draw_buffers_variables(exec_list *instructions,
-				    struct _mesa_glsl_parse_state *state,
-				    bool warn, _mesa_glsl_parser_targets target)
-{
-   /* gl_MaxDrawBuffers is available in all shader stages.
-    */
-   ir_variable *const mdb =
-      add_variable(instructions, state->symbols,
-		   "gl_MaxDrawBuffers", glsl_type::int_type, ir_var_auto, -1);
-
-   if (warn)
-      mdb->warn_extension = "GL_ARB_draw_buffers";
-
-   mdb->constant_value = new(mdb)
-      ir_constant(int(state->Const.MaxDrawBuffers));
-
-
-   /* gl_FragData is only available in the fragment shader.
-    */
-   if (target == fragment_shader) {
-      const glsl_type *const vec4_array_type =
-	 glsl_type::get_array_instance(glsl_type::vec4_type,
-				       state->Const.MaxDrawBuffers);
-
-      ir_variable *const fd =
-	 add_variable(instructions, state->symbols,
-		      "gl_FragData", vec4_array_type,
-		      ir_var_out, FRAG_RESULT_DATA0);
-
-      if (warn)
-	 fd->warn_extension = "GL_ARB_draw_buffers";
-   }
-}
-
-
-static void
-generate_ARB_draw_instanced_variables(exec_list *instructions,
-                                      struct _mesa_glsl_parse_state *state,
-                                      bool warn,
-                                      _mesa_glsl_parser_targets target)
-{
-   /* gl_InstanceIDARB is only available in the vertex shader.
-    */
-   if (target == vertex_shader) {
-      ir_variable *const inst =
-         add_variable(instructions, state->symbols,
-		      "gl_InstanceIDARB", glsl_type::int_type,
-		      ir_var_system_value, SYSTEM_VALUE_INSTANCE_ID);
-
-      if (warn)
-         inst->warn_extension = "GL_ARB_draw_instanced";
-   }
-}
-
-
-static void
-generate_ARB_shader_stencil_export_variables(exec_list *instructions,
-					     struct _mesa_glsl_parse_state *state,
-					     bool warn)
-{
-   /* gl_FragStencilRefARB is only available in the fragment shader.
-    */
-   ir_variable *const fd =
-      add_variable(instructions, state->symbols,
-		   "gl_FragStencilRefARB", glsl_type::int_type,
-		   ir_var_out, FRAG_RESULT_STENCIL);
-
-   if (warn)
-      fd->warn_extension = "GL_ARB_shader_stencil_export";
-}
-
-static void
-generate_120_fs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   generate_110_fs_variables(instructions, state);
-
-   for (unsigned i = 0
-	   ; i < Elements(builtin_120_fs_variables)
-	   ; i++) {
-      add_builtin_variable(instructions, state->symbols,
-			   & builtin_120_fs_variables[i]);
-   }
-}
-
-static void
-generate_130_fs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   generate_120_fs_variables(instructions, state);
-
-   const glsl_type *const clip_distance_array_type =
-      glsl_type::get_array_instance(glsl_type::float_type,
-				    state->Const.MaxClipPlanes);
-
-   /* FINISHME: gl_ClipDistance needs a real location assigned. */
-   add_variable(instructions, state->symbols,
-		"gl_ClipDistance", clip_distance_array_type, ir_var_in, -1);
-}
-
-static void
-initialize_fs_variables(exec_list *instructions,
-			struct _mesa_glsl_parse_state *state)
-{
-
-   switch (state->language_version) {
-   case 100:
-      generate_100ES_fs_variables(instructions, state);
-      break;
-   case 110:
-      generate_110_fs_variables(instructions, state);
-      break;
-   case 120:
-      generate_120_fs_variables(instructions, state);
-      break;
-   case 130:
-      generate_130_fs_variables(instructions, state);
-      break;
-   }
-
-   if (state->ARB_shader_stencil_export_enable)
-      generate_ARB_shader_stencil_export_variables(instructions, state,
-						   state->ARB_shader_stencil_export_warn);
-}
-
-void
-_mesa_glsl_initialize_variables(exec_list *instructions,
-				struct _mesa_glsl_parse_state *state)
-{
-   switch (state->target) {
-   case vertex_shader:
-      initialize_vs_variables(instructions, state);
-      break;
-   case geometry_shader:
-      break;
-   case fragment_shader:
-      initialize_fs_variables(instructions, state);
-      break;
-   }
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#include "ir.h"

+#include "glsl_parser_extras.h"

+#include "glsl_symbol_table.h"

+#include "builtin_variables.h"

+#include "main/uniforms.h"

+#include "program/prog_parameter.h"

+#include "program/prog_statevars.h"

+#include "program/prog_instruction.h"

+

+static void generate_ARB_draw_buffers_variables(exec_list *,

+						struct _mesa_glsl_parse_state *,

+						bool, _mesa_glsl_parser_targets);

+

+static void

+generate_ARB_draw_instanced_variables(exec_list *,

+                                      struct _mesa_glsl_parse_state *,

+                                      bool, _mesa_glsl_parser_targets);

+

+static struct gl_builtin_uniform_element gl_DepthRange_elements[] = {

+   {"near", {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_XXXX},

+   {"far", {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_YYYY},

+   {"diff", {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_ZZZZ},

+};

+

+static struct gl_builtin_uniform_element gl_ClipPlane_elements[] = {

+   {NULL, {STATE_CLIPPLANE, 0, 0}, SWIZZLE_XYZW}

+};

+

+static struct gl_builtin_uniform_element gl_Point_elements[] = {

+   {"size", {STATE_POINT_SIZE}, SWIZZLE_XXXX},

+   {"sizeMin", {STATE_POINT_SIZE}, SWIZZLE_YYYY},

+   {"sizeMax", {STATE_POINT_SIZE}, SWIZZLE_ZZZZ},

+   {"fadeThresholdSize", {STATE_POINT_SIZE}, SWIZZLE_WWWW},

+   {"distanceConstantAttenuation", {STATE_POINT_ATTENUATION}, SWIZZLE_XXXX},

+   {"distanceLinearAttenuation", {STATE_POINT_ATTENUATION}, SWIZZLE_YYYY},

+   {"distanceQuadraticAttenuation", {STATE_POINT_ATTENUATION}, SWIZZLE_ZZZZ},

+};

+

+static struct gl_builtin_uniform_element gl_FrontMaterial_elements[] = {

+   {"emission", {STATE_MATERIAL, 0, STATE_EMISSION}, SWIZZLE_XYZW},

+   {"ambient", {STATE_MATERIAL, 0, STATE_AMBIENT}, SWIZZLE_XYZW},

+   {"diffuse", {STATE_MATERIAL, 0, STATE_DIFFUSE}, SWIZZLE_XYZW},

+   {"specular", {STATE_MATERIAL, 0, STATE_SPECULAR}, SWIZZLE_XYZW},

+   {"shininess", {STATE_MATERIAL, 0, STATE_SHININESS}, SWIZZLE_XXXX},

+};

+

+static struct gl_builtin_uniform_element gl_BackMaterial_elements[] = {

+   {"emission", {STATE_MATERIAL, 1, STATE_EMISSION}, SWIZZLE_XYZW},

+   {"ambient", {STATE_MATERIAL, 1, STATE_AMBIENT}, SWIZZLE_XYZW},

+   {"diffuse", {STATE_MATERIAL, 1, STATE_DIFFUSE}, SWIZZLE_XYZW},

+   {"specular", {STATE_MATERIAL, 1, STATE_SPECULAR}, SWIZZLE_XYZW},

+   {"shininess", {STATE_MATERIAL, 1, STATE_SHININESS}, SWIZZLE_XXXX},

+};

+

+static struct gl_builtin_uniform_element gl_LightSource_elements[] = {

+   {"ambient", {STATE_LIGHT, 0, STATE_AMBIENT}, SWIZZLE_XYZW},

+   {"diffuse", {STATE_LIGHT, 0, STATE_DIFFUSE}, SWIZZLE_XYZW},

+   {"specular", {STATE_LIGHT, 0, STATE_SPECULAR}, SWIZZLE_XYZW},

+   {"position", {STATE_LIGHT, 0, STATE_POSITION}, SWIZZLE_XYZW},

+   {"halfVector", {STATE_LIGHT, 0, STATE_HALF_VECTOR}, SWIZZLE_XYZW},

+   {"spotDirection", {STATE_LIGHT, 0, STATE_SPOT_DIRECTION},

+    MAKE_SWIZZLE4(SWIZZLE_X,

+		  SWIZZLE_Y,

+		  SWIZZLE_Z,

+		  SWIZZLE_Z)},

+   {"spotCosCutoff", {STATE_LIGHT, 0, STATE_SPOT_DIRECTION}, SWIZZLE_WWWW},

+   {"spotCutoff", {STATE_LIGHT, 0, STATE_SPOT_CUTOFF}, SWIZZLE_XXXX},

+   {"spotExponent", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_WWWW},

+   {"constantAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_XXXX},

+   {"linearAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_YYYY},

+   {"quadraticAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_ZZZZ},

+};

+

+static struct gl_builtin_uniform_element gl_LightModel_elements[] = {

+   {"ambient", {STATE_LIGHTMODEL_AMBIENT, 0}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_FrontLightModelProduct_elements[] = {

+   {"sceneColor", {STATE_LIGHTMODEL_SCENECOLOR, 0}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_BackLightModelProduct_elements[] = {

+   {"sceneColor", {STATE_LIGHTMODEL_SCENECOLOR, 1}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_FrontLightProduct_elements[] = {

+   {"ambient", {STATE_LIGHTPROD, 0, 0, STATE_AMBIENT}, SWIZZLE_XYZW},

+   {"diffuse", {STATE_LIGHTPROD, 0, 0, STATE_DIFFUSE}, SWIZZLE_XYZW},

+   {"specular", {STATE_LIGHTPROD, 0, 0, STATE_SPECULAR}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_BackLightProduct_elements[] = {

+   {"ambient", {STATE_LIGHTPROD, 0, 1, STATE_AMBIENT}, SWIZZLE_XYZW},

+   {"diffuse", {STATE_LIGHTPROD, 0, 1, STATE_DIFFUSE}, SWIZZLE_XYZW},

+   {"specular", {STATE_LIGHTPROD, 0, 1, STATE_SPECULAR}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_TextureEnvColor_elements[] = {

+   {NULL, {STATE_TEXENV_COLOR, 0}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_EyePlaneS_elements[] = {

+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_S}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_EyePlaneT_elements[] = {

+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_T}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_EyePlaneR_elements[] = {

+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_R}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_EyePlaneQ_elements[] = {

+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_Q}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_ObjectPlaneS_elements[] = {

+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_S}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_ObjectPlaneT_elements[] = {

+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_T}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_ObjectPlaneR_elements[] = {

+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_R}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_ObjectPlaneQ_elements[] = {

+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_Q}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_Fog_elements[] = {

+   {"color", {STATE_FOG_COLOR}, SWIZZLE_XYZW},

+   {"density", {STATE_FOG_PARAMS}, SWIZZLE_XXXX},

+   {"start", {STATE_FOG_PARAMS}, SWIZZLE_YYYY},

+   {"end", {STATE_FOG_PARAMS}, SWIZZLE_ZZZZ},

+   {"scale", {STATE_FOG_PARAMS}, SWIZZLE_WWWW},

+};

+

+static struct gl_builtin_uniform_element gl_NormalScale_elements[] = {

+   {NULL, {STATE_NORMAL_SCALE}, SWIZZLE_XXXX},

+};

+

+static struct gl_builtin_uniform_element gl_MESABumpRotMatrix0_elements[] = {

+   {NULL, {STATE_INTERNAL, STATE_ROT_MATRIX_0}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_MESABumpRotMatrix1_elements[] = {

+   {NULL, {STATE_INTERNAL, STATE_ROT_MATRIX_1}, SWIZZLE_XYZW},

+};

+

+static struct gl_builtin_uniform_element gl_MESAFogParamsOptimized_elements[] = {

+   {NULL, {STATE_INTERNAL, STATE_FOG_PARAMS_OPTIMIZED}, SWIZZLE_XYZW},

+};

+

+#define MATRIX(name, statevar, modifier)				\

+   static struct gl_builtin_uniform_element name ## _elements[] = {	\

+      { NULL, { statevar, 0, 0, 0, modifier}, SWIZZLE_XYZW },		\

+      { NULL, { statevar, 0, 1, 1, modifier}, SWIZZLE_XYZW },		\

+      { NULL, { statevar, 0, 2, 2, modifier}, SWIZZLE_XYZW },		\

+      { NULL, { statevar, 0, 3, 3, modifier}, SWIZZLE_XYZW },		\

+   }

+

+MATRIX(gl_ModelViewMatrix,

+       STATE_MODELVIEW_MATRIX, STATE_MATRIX_TRANSPOSE);

+MATRIX(gl_ModelViewMatrixInverse,

+       STATE_MODELVIEW_MATRIX, STATE_MATRIX_INVTRANS);

+MATRIX(gl_ModelViewMatrixTranspose,

+       STATE_MODELVIEW_MATRIX, 0);

+MATRIX(gl_ModelViewMatrixInverseTranspose,

+       STATE_MODELVIEW_MATRIX, STATE_MATRIX_INVERSE);

+

+MATRIX(gl_ProjectionMatrix,

+       STATE_PROJECTION_MATRIX, STATE_MATRIX_TRANSPOSE);

+MATRIX(gl_ProjectionMatrixInverse,

+       STATE_PROJECTION_MATRIX, STATE_MATRIX_INVTRANS);

+MATRIX(gl_ProjectionMatrixTranspose,

+       STATE_PROJECTION_MATRIX, 0);

+MATRIX(gl_ProjectionMatrixInverseTranspose,

+       STATE_PROJECTION_MATRIX, STATE_MATRIX_INVERSE);

+

+MATRIX(gl_ModelViewProjectionMatrix,

+       STATE_MVP_MATRIX, STATE_MATRIX_TRANSPOSE);

+MATRIX(gl_ModelViewProjectionMatrixInverse,

+       STATE_MVP_MATRIX, STATE_MATRIX_INVTRANS);

+MATRIX(gl_ModelViewProjectionMatrixTranspose,

+       STATE_MVP_MATRIX, 0);

+MATRIX(gl_ModelViewProjectionMatrixInverseTranspose,

+       STATE_MVP_MATRIX, STATE_MATRIX_INVERSE);

+

+MATRIX(gl_TextureMatrix,

+       STATE_TEXTURE_MATRIX, STATE_MATRIX_TRANSPOSE);

+MATRIX(gl_TextureMatrixInverse,

+       STATE_TEXTURE_MATRIX, STATE_MATRIX_INVTRANS);

+MATRIX(gl_TextureMatrixTranspose,

+       STATE_TEXTURE_MATRIX, 0);

+MATRIX(gl_TextureMatrixInverseTranspose,

+       STATE_TEXTURE_MATRIX, STATE_MATRIX_INVERSE);

+

+static struct gl_builtin_uniform_element gl_NormalMatrix_elements[] = {

+   { NULL, { STATE_MODELVIEW_MATRIX, 0, 0, 0, STATE_MATRIX_INVERSE},

+     SWIZZLE_XYZW },

+   { NULL, { STATE_MODELVIEW_MATRIX, 0, 1, 1, STATE_MATRIX_INVERSE},

+     SWIZZLE_XYZW },

+   { NULL, { STATE_MODELVIEW_MATRIX, 0, 2, 2, STATE_MATRIX_INVERSE},

+     SWIZZLE_XYZW },

+};

+

+#undef MATRIX

+

+#define STATEVAR(name) {#name, name ## _elements, Elements(name ## _elements)}

+

+const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[] = {

+   STATEVAR(gl_DepthRange),

+   STATEVAR(gl_ClipPlane),

+   STATEVAR(gl_Point),

+   STATEVAR(gl_FrontMaterial),

+   STATEVAR(gl_BackMaterial),

+   STATEVAR(gl_LightSource),

+   STATEVAR(gl_LightModel),

+   STATEVAR(gl_FrontLightModelProduct),

+   STATEVAR(gl_BackLightModelProduct),

+   STATEVAR(gl_FrontLightProduct),

+   STATEVAR(gl_BackLightProduct),

+   STATEVAR(gl_TextureEnvColor),

+   STATEVAR(gl_EyePlaneS),

+   STATEVAR(gl_EyePlaneT),

+   STATEVAR(gl_EyePlaneR),

+   STATEVAR(gl_EyePlaneQ),

+   STATEVAR(gl_ObjectPlaneS),

+   STATEVAR(gl_ObjectPlaneT),

+   STATEVAR(gl_ObjectPlaneR),

+   STATEVAR(gl_ObjectPlaneQ),

+   STATEVAR(gl_Fog),

+

+   STATEVAR(gl_ModelViewMatrix),

+   STATEVAR(gl_ModelViewMatrixInverse),

+   STATEVAR(gl_ModelViewMatrixTranspose),

+   STATEVAR(gl_ModelViewMatrixInverseTranspose),

+

+   STATEVAR(gl_ProjectionMatrix),

+   STATEVAR(gl_ProjectionMatrixInverse),

+   STATEVAR(gl_ProjectionMatrixTranspose),

+   STATEVAR(gl_ProjectionMatrixInverseTranspose),

+

+   STATEVAR(gl_ModelViewProjectionMatrix),

+   STATEVAR(gl_ModelViewProjectionMatrixInverse),

+   STATEVAR(gl_ModelViewProjectionMatrixTranspose),

+   STATEVAR(gl_ModelViewProjectionMatrixInverseTranspose),

+

+   STATEVAR(gl_TextureMatrix),

+   STATEVAR(gl_TextureMatrixInverse),

+   STATEVAR(gl_TextureMatrixTranspose),

+   STATEVAR(gl_TextureMatrixInverseTranspose),

+

+   STATEVAR(gl_NormalMatrix),

+   STATEVAR(gl_NormalScale),

+

+   STATEVAR(gl_MESABumpRotMatrix0),

+   STATEVAR(gl_MESABumpRotMatrix1),

+   STATEVAR(gl_MESAFogParamsOptimized),

+

+   {NULL, NULL, 0}

+};

+

+static ir_variable *

+add_variable(exec_list *instructions, glsl_symbol_table *symtab,

+	     const char *name, const glsl_type *type,

+	     enum ir_variable_mode mode, int slot)

+{

+   ir_variable *var = new(symtab) ir_variable(type, name, mode);

+

+   switch (var->mode) {

+   case ir_var_auto:

+   case ir_var_in:

+   case ir_var_const_in:

+   case ir_var_uniform:

+   case ir_var_system_value:

+      var->read_only = true;

+      break;

+   case ir_var_inout:

+   case ir_var_out:

+      break;

+   default:

+      assert(0);

+      break;

+   }

+

+   var->location = slot;

+   var->explicit_location = (slot >= 0);

+

+   /* Once the variable is created an initialized, add it to the symbol table

+    * and add the declaration to the IR stream.

+    */

+   instructions->push_tail(var);

+

+   symtab->add_variable(var);

+   return var;

+}

+

+static ir_variable *

+add_uniform(exec_list *instructions, glsl_symbol_table *symtab,

+	    const char *name, const glsl_type *type)

+{

+   ir_variable *const uni =

+      add_variable(instructions, symtab, name, type, ir_var_uniform, -1);

+

+   unsigned i;

+   for (i = 0; _mesa_builtin_uniform_desc[i].name != NULL; i++) {

+      if (strcmp(_mesa_builtin_uniform_desc[i].name, name) == 0) {

+	 break;

+      }

+   }

+

+   assert(_mesa_builtin_uniform_desc[i].name != NULL);

+   const struct gl_builtin_uniform_desc* const statevar =

+      &_mesa_builtin_uniform_desc[i];

+

+   const unsigned array_count = type->is_array() ? type->length : 1;

+   uni->num_state_slots = array_count * statevar->num_elements;

+

+   ir_state_slot *slots =

+      ralloc_array(uni, ir_state_slot, uni->num_state_slots);

+

+   uni->state_slots = slots;

+

+   for (unsigned a = 0; a < array_count; a++) {

+      for (unsigned j = 0; j < statevar->num_elements; j++) {

+	 struct gl_builtin_uniform_element *element = &statevar->elements[j];

+

+	 memcpy(slots->tokens, element->tokens, sizeof(element->tokens));

+	 if (type->is_array()) {

+	    slots->tokens[1] = a;

+	 }

+

+	 slots->swizzle = element->swizzle;

+	 slots++;

+      }

+   }

+

+   return uni;

+}

+

+static void

+add_builtin_variable(exec_list *instructions, glsl_symbol_table *symtab,

+		     const builtin_variable *proto)

+{

+   /* Create a new variable declaration from the description supplied by

+    * the caller.

+    */

+   const glsl_type *const type = symtab->get_type(proto->type);

+

+   assert(type != NULL);

+

+   if (proto->mode == ir_var_uniform) {

+      add_uniform(instructions, symtab, proto->name, type);

+   } else {

+      add_variable(instructions, symtab, proto->name, type, proto->mode,

+		   proto->slot);

+   }

+}

+

+static void

+add_builtin_constant(exec_list *instructions, glsl_symbol_table *symtab,

+		     const char *name, int value)

+{

+   ir_variable *const var = add_variable(instructions, symtab,

+					 name, glsl_type::int_type,

+					 ir_var_auto, -1);

+   var->constant_value = new(var) ir_constant(value);

+}

+

+/* Several constants in GLSL ES have different names than normal desktop GLSL.

+ * Therefore, this function should only be called on the ES path.

+ */

+static void

+generate_100ES_uniforms(exec_list *instructions,

+		     struct _mesa_glsl_parse_state *state)

+{

+   glsl_symbol_table *const symtab = state->symbols;

+

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexAttribs",

+			state->Const.MaxVertexAttribs);

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexUniformVectors",

+			state->Const.MaxVertexUniformComponents);

+   add_builtin_constant(instructions, symtab, "gl_MaxVaryingVectors",

+			state->Const.MaxVaryingFloats / 4);

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexTextureImageUnits",

+			state->Const.MaxVertexTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxCombinedTextureImageUnits",

+			state->Const.MaxCombinedTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxTextureImageUnits",

+			state->Const.MaxTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxFragmentUniformVectors",

+			state->Const.MaxFragmentUniformComponents);

+

+   add_uniform(instructions, symtab, "gl_DepthRange",

+	       state->symbols->get_type("gl_DepthRangeParameters"));

+}

+

+static void

+generate_110_uniforms(exec_list *instructions,

+		      struct _mesa_glsl_parse_state *state)

+{

+   glsl_symbol_table *const symtab = state->symbols;

+

+   for (unsigned i = 0

+	   ; i < Elements(builtin_110_deprecated_uniforms)

+	   ; i++) {

+      add_builtin_variable(instructions, symtab,

+			   & builtin_110_deprecated_uniforms[i]);

+   }

+

+   add_builtin_constant(instructions, symtab, "gl_MaxLights",

+			state->Const.MaxLights);

+   add_builtin_constant(instructions, symtab, "gl_MaxClipPlanes",

+			state->Const.MaxClipPlanes);

+   add_builtin_constant(instructions, symtab, "gl_MaxTextureUnits",

+			state->Const.MaxTextureUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxTextureCoords",

+			state->Const.MaxTextureCoords);

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexAttribs",

+			state->Const.MaxVertexAttribs);

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexUniformComponents",

+			state->Const.MaxVertexUniformComponents);

+   add_builtin_constant(instructions, symtab, "gl_MaxVaryingFloats",

+			state->Const.MaxVaryingFloats);

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexTextureImageUnits",

+			state->Const.MaxVertexTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxCombinedTextureImageUnits",

+			state->Const.MaxCombinedTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxTextureImageUnits",

+			state->Const.MaxTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxFragmentUniformComponents",

+			state->Const.MaxFragmentUniformComponents);

+

+   const glsl_type *const mat4_array_type =

+      glsl_type::get_array_instance(glsl_type::mat4_type,

+				    state->Const.MaxTextureCoords);

+

+   add_uniform(instructions, symtab, "gl_TextureMatrix", mat4_array_type);

+   add_uniform(instructions, symtab, "gl_TextureMatrixInverse", mat4_array_type);

+   add_uniform(instructions, symtab, "gl_TextureMatrixTranspose", mat4_array_type);

+   add_uniform(instructions, symtab, "gl_TextureMatrixInverseTranspose", mat4_array_type);

+

+   add_uniform(instructions, symtab, "gl_DepthRange",

+		symtab->get_type("gl_DepthRangeParameters"));

+

+   add_uniform(instructions, symtab, "gl_ClipPlane",

+	       glsl_type::get_array_instance(glsl_type::vec4_type,

+					     state->Const.MaxClipPlanes));

+   add_uniform(instructions, symtab, "gl_Point",

+	       symtab->get_type("gl_PointParameters"));

+

+   const glsl_type *const material_parameters_type =

+      symtab->get_type("gl_MaterialParameters");

+   add_uniform(instructions, symtab, "gl_FrontMaterial", material_parameters_type);

+   add_uniform(instructions, symtab, "gl_BackMaterial", material_parameters_type);

+

+   const glsl_type *const light_source_array_type =

+      glsl_type::get_array_instance(symtab->get_type("gl_LightSourceParameters"), state->Const.MaxLights);

+

+   add_uniform(instructions, symtab, "gl_LightSource", light_source_array_type);

+

+   const glsl_type *const light_model_products_type =

+      symtab->get_type("gl_LightModelProducts");

+   add_uniform(instructions, symtab, "gl_FrontLightModelProduct",

+	       light_model_products_type);

+   add_uniform(instructions, symtab, "gl_BackLightModelProduct",

+	       light_model_products_type);

+

+   const glsl_type *const light_products_type =

+      glsl_type::get_array_instance(symtab->get_type("gl_LightProducts"),

+				    state->Const.MaxLights);

+   add_uniform(instructions, symtab, "gl_FrontLightProduct", light_products_type);

+   add_uniform(instructions, symtab, "gl_BackLightProduct", light_products_type);

+

+   add_uniform(instructions, symtab, "gl_TextureEnvColor",

+	       glsl_type::get_array_instance(glsl_type::vec4_type,

+					     state->Const.MaxTextureUnits));

+

+   const glsl_type *const texcoords_vec4 =

+      glsl_type::get_array_instance(glsl_type::vec4_type,

+				    state->Const.MaxTextureCoords);

+   add_uniform(instructions, symtab, "gl_EyePlaneS", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_EyePlaneT", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_EyePlaneR", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_EyePlaneQ", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_ObjectPlaneS", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_ObjectPlaneT", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_ObjectPlaneR", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_ObjectPlaneQ", texcoords_vec4);

+

+   add_uniform(instructions, symtab, "gl_Fog",

+	       symtab->get_type("gl_FogParameters"));

+}

+

+/* This function should only be called for ES, not desktop GL. */

+static void

+generate_100ES_vs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   for (unsigned i = 0; i < Elements(builtin_core_vs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_core_vs_variables[i]);

+   }

+

+   generate_100ES_uniforms(instructions, state);

+

+   generate_ARB_draw_buffers_variables(instructions, state, false,

+				       vertex_shader);

+}

+

+

+static void

+generate_110_vs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   for (unsigned i = 0; i < Elements(builtin_core_vs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_core_vs_variables[i]);

+   }

+

+   for (unsigned i = 0

+	   ; i < Elements(builtin_110_deprecated_vs_variables)

+	   ; i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_110_deprecated_vs_variables[i]);

+   }

+   generate_110_uniforms(instructions, state);

+

+   /* From page 54 (page 60 of the PDF) of the GLSL 1.20 spec:

+    *

+    *     "As with all arrays, indices used to subscript gl_TexCoord must

+    *     either be an integral constant expressions, or this array must be

+    *     re-declared by the shader with a size. The size can be at most

+    *     gl_MaxTextureCoords. Using indexes close to 0 may aid the

+    *     implementation in preserving varying resources."

+    */

+   const glsl_type *const vec4_array_type =

+      glsl_type::get_array_instance(glsl_type::vec4_type, 0);

+

+   add_variable(instructions, state->symbols,

+		"gl_TexCoord", vec4_array_type, ir_var_out, VERT_RESULT_TEX0);

+

+   generate_ARB_draw_buffers_variables(instructions, state, false,

+				       vertex_shader);

+}

+

+

+static void

+generate_120_vs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   /* GLSL version 1.20 did not add any built-in variables in the vertex

+    * shader.

+    */

+   generate_110_vs_variables(instructions, state);

+}

+

+

+static void

+generate_130_vs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   generate_120_vs_variables(instructions, state);

+

+   for (unsigned i = 0; i < Elements(builtin_130_vs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_130_vs_variables[i]);

+   }

+

+   const glsl_type *const clip_distance_array_type =

+      glsl_type::get_array_instance(glsl_type::float_type,

+				    state->Const.MaxClipPlanes);

+

+   /* FINISHME: gl_ClipDistance needs a real location assigned. */

+   add_variable(instructions, state->symbols,

+		"gl_ClipDistance", clip_distance_array_type, ir_var_out, -1);

+

+}

+

+

+static void

+initialize_vs_variables(exec_list *instructions,

+			struct _mesa_glsl_parse_state *state)

+{

+

+   switch (state->language_version) {

+   case 100:

+      generate_100ES_vs_variables(instructions, state);

+      break;

+   case 110:

+      generate_110_vs_variables(instructions, state);

+      break;

+   case 120:

+      generate_120_vs_variables(instructions, state);

+      break;

+   case 130:

+      generate_130_vs_variables(instructions, state);

+      break;

+   }

+

+   if (state->ARB_draw_instanced_enable)

+      generate_ARB_draw_instanced_variables(instructions, state, false,

+                                            vertex_shader);

+}

+

+

+/* This function should only be called for ES, not desktop GL. */

+static void

+generate_100ES_fs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   for (unsigned i = 0; i < Elements(builtin_core_fs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_core_fs_variables[i]);

+   }

+

+   for (unsigned i = 0; i < Elements(builtin_100ES_fs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_100ES_fs_variables[i]);

+   }

+

+   generate_100ES_uniforms(instructions, state);

+

+   generate_ARB_draw_buffers_variables(instructions, state, false,

+				       fragment_shader);

+}

+

+static void

+generate_110_fs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   for (unsigned i = 0; i < Elements(builtin_core_fs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_core_fs_variables[i]);

+   }

+

+   for (unsigned i = 0; i < Elements(builtin_110_fs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_110_fs_variables[i]);

+   }

+

+   for (unsigned i = 0

+	   ; i < Elements(builtin_110_deprecated_fs_variables)

+	   ; i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_110_deprecated_fs_variables[i]);

+   }

+   generate_110_uniforms(instructions, state);

+

+   /* From page 54 (page 60 of the PDF) of the GLSL 1.20 spec:

+    *

+    *     "As with all arrays, indices used to subscript gl_TexCoord must

+    *     either be an integral constant expressions, or this array must be

+    *     re-declared by the shader with a size. The size can be at most

+    *     gl_MaxTextureCoords. Using indexes close to 0 may aid the

+    *     implementation in preserving varying resources."

+    */

+   const glsl_type *const vec4_array_type =

+      glsl_type::get_array_instance(glsl_type::vec4_type, 0);

+

+   add_variable(instructions, state->symbols,

+		"gl_TexCoord", vec4_array_type, ir_var_in, FRAG_ATTRIB_TEX0);

+

+   generate_ARB_draw_buffers_variables(instructions, state, false,

+				       fragment_shader);

+}

+

+

+static void

+generate_ARB_draw_buffers_variables(exec_list *instructions,

+				    struct _mesa_glsl_parse_state *state,

+				    bool warn, _mesa_glsl_parser_targets target)

+{

+   /* gl_MaxDrawBuffers is available in all shader stages.

+    */

+   ir_variable *const mdb =

+      add_variable(instructions, state->symbols,

+		   "gl_MaxDrawBuffers", glsl_type::int_type, ir_var_auto, -1);

+

+   if (warn)

+      mdb->warn_extension = "GL_ARB_draw_buffers";

+

+   mdb->constant_value = new(mdb)

+      ir_constant(int(state->Const.MaxDrawBuffers));

+

+

+   /* gl_FragData is only available in the fragment shader.

+    */

+   if (target == fragment_shader) {

+      const glsl_type *const vec4_array_type =

+	 glsl_type::get_array_instance(glsl_type::vec4_type,

+				       state->Const.MaxDrawBuffers);

+

+      ir_variable *const fd =

+	 add_variable(instructions, state->symbols,

+		      "gl_FragData", vec4_array_type,

+		      ir_var_out, FRAG_RESULT_DATA0);

+

+      if (warn)

+	 fd->warn_extension = "GL_ARB_draw_buffers";

+   }

+}

+

+

+static void

+generate_ARB_draw_instanced_variables(exec_list *instructions,

+                                      struct _mesa_glsl_parse_state *state,

+                                      bool warn,

+                                      _mesa_glsl_parser_targets target)

+{

+   /* gl_InstanceIDARB is only available in the vertex shader.

+    */

+   if (target == vertex_shader) {

+      ir_variable *const inst =

+         add_variable(instructions, state->symbols,

+		      "gl_InstanceIDARB", glsl_type::int_type,

+		      ir_var_system_value, SYSTEM_VALUE_INSTANCE_ID);

+

+      if (warn)

+         inst->warn_extension = "GL_ARB_draw_instanced";

+   }

+}

+

+

+static void

+generate_ARB_shader_stencil_export_variables(exec_list *instructions,

+					     struct _mesa_glsl_parse_state *state,

+					     bool warn)

+{

+   /* gl_FragStencilRefARB is only available in the fragment shader.

+    */

+   ir_variable *const fd =

+      add_variable(instructions, state->symbols,

+		   "gl_FragStencilRefARB", glsl_type::int_type,

+		   ir_var_out, FRAG_RESULT_STENCIL);

+

+   if (warn)

+      fd->warn_extension = "GL_ARB_shader_stencil_export";

+}

+

+static void

+generate_120_fs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   generate_110_fs_variables(instructions, state);

+

+   for (unsigned i = 0

+	   ; i < Elements(builtin_120_fs_variables)

+	   ; i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_120_fs_variables[i]);

+   }

+}

+

+static void

+generate_130_fs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   generate_120_fs_variables(instructions, state);

+

+   const glsl_type *const clip_distance_array_type =

+      glsl_type::get_array_instance(glsl_type::float_type,

+				    state->Const.MaxClipPlanes);

+

+   /* FINISHME: gl_ClipDistance needs a real location assigned. */

+   add_variable(instructions, state->symbols,

+		"gl_ClipDistance", clip_distance_array_type, ir_var_in, -1);

+}

+

+static void

+initialize_fs_variables(exec_list *instructions,

+			struct _mesa_glsl_parse_state *state)

+{

+

+   switch (state->language_version) {

+   case 100:

+      generate_100ES_fs_variables(instructions, state);

+      break;

+   case 110:

+      generate_110_fs_variables(instructions, state);

+      break;

+   case 120:

+      generate_120_fs_variables(instructions, state);

+      break;

+   case 130:

+      generate_130_fs_variables(instructions, state);

+      break;

+   }

+

+   if (state->ARB_shader_stencil_export_enable)

+      generate_ARB_shader_stencil_export_variables(instructions, state,

+						   state->ARB_shader_stencil_export_warn);

+}

+

+void

+_mesa_glsl_initialize_variables(exec_list *instructions,

+				struct _mesa_glsl_parse_state *state)

+{

+   switch (state->target) {

+   case vertex_shader:

+      initialize_vs_variables(instructions, state);

+      break;

+   case geometry_shader:

+      break;

+   case fragment_shader:

+      initialize_fs_variables(instructions, state);

+      break;

+   }

+}

diff --git a/mesalib/src/glsl/link_functions.cpp b/mesalib/src/glsl/link_functions.cpp
index ae8818be8..76687b6be 100644
--- a/mesalib/src/glsl/link_functions.cpp
+++ b/mesalib/src/glsl/link_functions.cpp
@@ -1,272 +1,272 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#include "main/core.h"
-#include "glsl_symbol_table.h"
-#include "glsl_parser_extras.h"
-#include "ir.h"
-#include "program.h"
-#include "program/hash_table.h"
-#include "linker.h"
-
-static ir_function_signature *
-find_matching_signature(const char *name, const exec_list *actual_parameters,
-			gl_shader **shader_list, unsigned num_shaders);
-
-class call_link_visitor : public ir_hierarchical_visitor {
-public:
-   call_link_visitor(gl_shader_program *prog, gl_shader *linked,
-		     gl_shader **shader_list, unsigned num_shaders)
-   {
-      this->prog = prog;
-      this->shader_list = shader_list;
-      this->num_shaders = num_shaders;
-      this->success = true;
-      this->linked = linked;
-
-      this->locals = hash_table_ctor(0, hash_table_pointer_hash,
-				     hash_table_pointer_compare);
-   }
-
-   ~call_link_visitor()
-   {
-      hash_table_dtor(this->locals);
-   }
-
-   virtual ir_visitor_status visit(ir_variable *ir)
-   {
-      hash_table_insert(locals, ir, ir);
-      return visit_continue;
-   }
-
-   virtual ir_visitor_status visit_enter(ir_call *ir)
-   {
-      /* If ir is an ir_call from a function that was imported from another
-       * shader callee will point to an ir_function_signature in the original
-       * shader.  In this case the function signature MUST NOT BE MODIFIED.
-       * Doing so will modify the original shader.  This may prevent that
-       * shader from being linkable in other programs.
-       */
-      const ir_function_signature *const callee = ir->get_callee();
-      assert(callee != NULL);
-      const char *const name = callee->function_name();
-
-      /* Determine if the requested function signature already exists in the
-       * final linked shader.  If it does, use it as the target of the call.
-       */
-      ir_function_signature *sig =
-	 find_matching_signature(name, &callee->parameters, &linked, 1);
-      if (sig != NULL) {
-	 ir->set_callee(sig);
-	 return visit_continue;
-      }
-
-      /* Try to find the signature in one of the other shaders that is being
-       * linked.  If it's not found there, return an error.
-       */
-      sig = find_matching_signature(name, &ir->actual_parameters, shader_list,
-				    num_shaders);
-      if (sig == NULL) {
-	 /* FINISHME: Log the full signature of unresolved function.
-	  */
-	 linker_error_printf(this->prog, "unresolved reference to function "
-			     "`%s'\n", name);
-	 this->success = false;
-	 return visit_stop;
-      }
-
-      /* Find the prototype information in the linked shader.  Generate any
-       * details that may be missing.
-       */
-      ir_function *f = linked->symbols->get_function(name);
-      if (f == NULL) {
-	 f = new(linked) ir_function(name);
-
-	 /* Add the new function to the linked IR.
-	  */
-	 linked->symbols->add_function(f);
-	 linked->ir->push_head(f);
-      }
-
-      ir_function_signature *linked_sig =
-	 f->exact_matching_signature(&callee->parameters);
-      if (linked_sig == NULL) {
-	 linked_sig = new(linked) ir_function_signature(callee->return_type);
-	 f->add_signature(linked_sig);
-      }
-
-      /* At this point linked_sig and called may be the same.  If ir is an
-       * ir_call from linked then linked_sig and callee will be
-       * ir_function_signatures that have no definitions (is_defined is false).
-       */
-      assert(!linked_sig->is_defined);
-      assert(linked_sig->body.is_empty());
-
-      /* Create an in-place clone of the function definition.  This multistep
-       * process introduces some complexity here, but it has some advantages.
-       * The parameter list and the and function body are cloned separately.
-       * The clone of the parameter list is used to prime the hashtable used
-       * to replace variable references in the cloned body.
-       *
-       * The big advantage is that the ir_function_signature does not change.
-       * This means that we don't have to process the rest of the IR tree to
-       * patch ir_call nodes.  In addition, there is no way to remove or
-       * replace signature stored in a function.  One could easily be added,
-       * but this avoids the need.
-       */
-      struct hash_table *ht = hash_table_ctor(0, hash_table_pointer_hash,
-					      hash_table_pointer_compare);
-      exec_list formal_parameters;
-      foreach_list_const(node, &sig->parameters) {
-	 const ir_instruction *const original = (ir_instruction *) node;
-	 assert(const_cast<ir_instruction *>(original)->as_variable());
-
-	 ir_instruction *copy = original->clone(linked, ht);
-	 formal_parameters.push_tail(copy);
-      }
-
-      linked_sig->replace_parameters(&formal_parameters);
-
-      foreach_list_const(node, &sig->body) {
-	 const ir_instruction *const original = (ir_instruction *) node;
-
-	 ir_instruction *copy = original->clone(linked, ht);
-	 linked_sig->body.push_tail(copy);
-      }
-
-      linked_sig->is_defined = true;
-      hash_table_dtor(ht);
-
-      /* Patch references inside the function to things outside the function
-       * (i.e., function calls and global variables).
-       */
-      linked_sig->accept(this);
-
-      ir->set_callee(linked_sig);
-
-      return visit_continue;
-   }
-
-   virtual ir_visitor_status visit(ir_dereference_variable *ir)
-   {
-      if (hash_table_find(locals, ir->var) == NULL) {
-	 /* The non-function variable must be a global, so try to find the
-	  * variable in the shader's symbol table.  If the variable is not
-	  * found, then it's a global that *MUST* be defined in the original
-	  * shader.
-	  */
-	 ir_variable *var = linked->symbols->get_variable(ir->var->name);
-	 if (var == NULL) {
-	    /* Clone the ir_variable that the dereference already has and add
-	     * it to the linked shader.
-	     */
-	    var = ir->var->clone(linked, NULL);
-	    linked->symbols->add_variable(var);
-	    linked->ir->push_head(var);
-	 } else if (var->type->is_array()) {
-	    /* It is possible to have a global array declared in multiple
-	     * shaders without a size.  The array is implicitly sized by the
-	     * maximal access to it in *any* shader.  Because of this, we
-	     * need to track the maximal access to the array as linking pulls
-	     * more functions in that access the array.
-	     */
-	    var->max_array_access =
-	       MAX2(var->max_array_access, ir->var->max_array_access);
-
-	    if (var->type->length == 0 && ir->var->type->length != 0)
-	       var->type = ir->var->type;
-	 }
-
-	 ir->var = var;
-      }
-
-      return visit_continue;
-   }
-
-   /** Was function linking successful? */
-   bool success;
-
-private:
-   /**
-    * Shader program being linked
-    *
-    * This is only used for logging error messages.
-    */
-   gl_shader_program *prog;
-
-   /** List of shaders available for linking. */
-   gl_shader **shader_list;
-
-   /** Number of shaders available for linking. */
-   unsigned num_shaders;
-
-   /**
-    * Final linked shader
-    *
-    * This is used two ways.  It is used to find global variables in the
-    * linked shader that are accessed by the function.  It is also used to add
-    * global variables from the shader where the function originated.
-    */
-   gl_shader *linked;
-
-   /**
-    * Table of variables local to the function.
-    */
-   hash_table *locals;
-};
-
-
-/**
- * Searches a list of shaders for a particular function definition
- */
-ir_function_signature *
-find_matching_signature(const char *name, const exec_list *actual_parameters,
-			gl_shader **shader_list, unsigned num_shaders)
-{
-   for (unsigned i = 0; i < num_shaders; i++) {
-      ir_function *const f = shader_list[i]->symbols->get_function(name);
-
-      if (f == NULL)
-	 continue;
-
-      ir_function_signature *sig = f->matching_signature(actual_parameters);
-
-      if ((sig == NULL) || !sig->is_defined)
-	 continue;
-
-      return sig;
-   }
-
-   return NULL;
-}
-
-
-bool
-link_function_calls(gl_shader_program *prog, gl_shader *main,
-		    gl_shader **shader_list, unsigned num_shaders)
-{
-   call_link_visitor v(prog, main, shader_list, num_shaders);
-
-   v.run(main->ir);
-   return v.success;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#include "main/core.h"

+#include "glsl_symbol_table.h"

+#include "glsl_parser_extras.h"

+#include "ir.h"

+#include "program.h"

+#include "program/hash_table.h"

+#include "linker.h"

+

+static ir_function_signature *

+find_matching_signature(const char *name, const exec_list *actual_parameters,

+			gl_shader **shader_list, unsigned num_shaders);

+

+class call_link_visitor : public ir_hierarchical_visitor {

+public:

+   call_link_visitor(gl_shader_program *prog, gl_shader *linked,

+		     gl_shader **shader_list, unsigned num_shaders)

+   {

+      this->prog = prog;

+      this->shader_list = shader_list;

+      this->num_shaders = num_shaders;

+      this->success = true;

+      this->linked = linked;

+

+      this->locals = hash_table_ctor(0, hash_table_pointer_hash,

+				     hash_table_pointer_compare);

+   }

+

+   ~call_link_visitor()

+   {

+      hash_table_dtor(this->locals);

+   }

+

+   virtual ir_visitor_status visit(ir_variable *ir)

+   {

+      hash_table_insert(locals, ir, ir);

+      return visit_continue;

+   }

+

+   virtual ir_visitor_status visit_enter(ir_call *ir)

+   {

+      /* If ir is an ir_call from a function that was imported from another

+       * shader callee will point to an ir_function_signature in the original

+       * shader.  In this case the function signature MUST NOT BE MODIFIED.

+       * Doing so will modify the original shader.  This may prevent that

+       * shader from being linkable in other programs.

+       */

+      const ir_function_signature *const callee = ir->get_callee();

+      assert(callee != NULL);

+      const char *const name = callee->function_name();

+

+      /* Determine if the requested function signature already exists in the

+       * final linked shader.  If it does, use it as the target of the call.

+       */

+      ir_function_signature *sig =

+	 find_matching_signature(name, &callee->parameters, &linked, 1);

+      if (sig != NULL) {

+	 ir->set_callee(sig);

+	 return visit_continue;

+      }

+

+      /* Try to find the signature in one of the other shaders that is being

+       * linked.  If it's not found there, return an error.

+       */

+      sig = find_matching_signature(name, &ir->actual_parameters, shader_list,

+				    num_shaders);

+      if (sig == NULL) {

+	 /* FINISHME: Log the full signature of unresolved function.

+	  */

+	 linker_error_printf(this->prog, "unresolved reference to function "

+			     "`%s'\n", name);

+	 this->success = false;

+	 return visit_stop;

+      }

+

+      /* Find the prototype information in the linked shader.  Generate any

+       * details that may be missing.

+       */

+      ir_function *f = linked->symbols->get_function(name);

+      if (f == NULL) {

+	 f = new(linked) ir_function(name);

+

+	 /* Add the new function to the linked IR.

+	  */

+	 linked->symbols->add_function(f);

+	 linked->ir->push_head(f);

+      }

+

+      ir_function_signature *linked_sig =

+	 f->exact_matching_signature(&callee->parameters);

+      if (linked_sig == NULL) {

+	 linked_sig = new(linked) ir_function_signature(callee->return_type);

+	 f->add_signature(linked_sig);

+      }

+

+      /* At this point linked_sig and called may be the same.  If ir is an

+       * ir_call from linked then linked_sig and callee will be

+       * ir_function_signatures that have no definitions (is_defined is false).

+       */

+      assert(!linked_sig->is_defined);

+      assert(linked_sig->body.is_empty());

+

+      /* Create an in-place clone of the function definition.  This multistep

+       * process introduces some complexity here, but it has some advantages.

+       * The parameter list and the and function body are cloned separately.

+       * The clone of the parameter list is used to prime the hashtable used

+       * to replace variable references in the cloned body.

+       *

+       * The big advantage is that the ir_function_signature does not change.

+       * This means that we don't have to process the rest of the IR tree to

+       * patch ir_call nodes.  In addition, there is no way to remove or

+       * replace signature stored in a function.  One could easily be added,

+       * but this avoids the need.

+       */

+      struct hash_table *ht = hash_table_ctor(0, hash_table_pointer_hash,

+					      hash_table_pointer_compare);

+      exec_list formal_parameters;

+      foreach_list_const(node, &sig->parameters) {

+	 const ir_instruction *const original = (ir_instruction *) node;

+	 assert(const_cast<ir_instruction *>(original)->as_variable());

+

+	 ir_instruction *copy = original->clone(linked, ht);

+	 formal_parameters.push_tail(copy);

+      }

+

+      linked_sig->replace_parameters(&formal_parameters);

+

+      foreach_list_const(node, &sig->body) {

+	 const ir_instruction *const original = (ir_instruction *) node;

+

+	 ir_instruction *copy = original->clone(linked, ht);

+	 linked_sig->body.push_tail(copy);

+      }

+

+      linked_sig->is_defined = true;

+      hash_table_dtor(ht);

+

+      /* Patch references inside the function to things outside the function

+       * (i.e., function calls and global variables).

+       */

+      linked_sig->accept(this);

+

+      ir->set_callee(linked_sig);

+

+      return visit_continue;

+   }

+

+   virtual ir_visitor_status visit(ir_dereference_variable *ir)

+   {

+      if (hash_table_find(locals, ir->var) == NULL) {

+	 /* The non-function variable must be a global, so try to find the

+	  * variable in the shader's symbol table.  If the variable is not

+	  * found, then it's a global that *MUST* be defined in the original

+	  * shader.

+	  */

+	 ir_variable *var = linked->symbols->get_variable(ir->var->name);

+	 if (var == NULL) {

+	    /* Clone the ir_variable that the dereference already has and add

+	     * it to the linked shader.

+	     */

+	    var = ir->var->clone(linked, NULL);

+	    linked->symbols->add_variable(var);

+	    linked->ir->push_head(var);

+	 } else if (var->type->is_array()) {

+	    /* It is possible to have a global array declared in multiple

+	     * shaders without a size.  The array is implicitly sized by the

+	     * maximal access to it in *any* shader.  Because of this, we

+	     * need to track the maximal access to the array as linking pulls

+	     * more functions in that access the array.

+	     */

+	    var->max_array_access =

+	       MAX2(var->max_array_access, ir->var->max_array_access);

+

+	    if (var->type->length == 0 && ir->var->type->length != 0)

+	       var->type = ir->var->type;

+	 }

+

+	 ir->var = var;

+      }

+

+      return visit_continue;

+   }

+

+   /** Was function linking successful? */

+   bool success;

+

+private:

+   /**

+    * Shader program being linked

+    *

+    * This is only used for logging error messages.

+    */

+   gl_shader_program *prog;

+

+   /** List of shaders available for linking. */

+   gl_shader **shader_list;

+

+   /** Number of shaders available for linking. */

+   unsigned num_shaders;

+

+   /**

+    * Final linked shader

+    *

+    * This is used two ways.  It is used to find global variables in the

+    * linked shader that are accessed by the function.  It is also used to add

+    * global variables from the shader where the function originated.

+    */

+   gl_shader *linked;

+

+   /**

+    * Table of variables local to the function.

+    */

+   hash_table *locals;

+};

+

+

+/**

+ * Searches a list of shaders for a particular function definition

+ */

+ir_function_signature *

+find_matching_signature(const char *name, const exec_list *actual_parameters,

+			gl_shader **shader_list, unsigned num_shaders)

+{

+   for (unsigned i = 0; i < num_shaders; i++) {

+      ir_function *const f = shader_list[i]->symbols->get_function(name);

+

+      if (f == NULL)

+	 continue;

+

+      ir_function_signature *sig = f->matching_signature(actual_parameters);

+

+      if ((sig == NULL) || !sig->is_defined)

+	 continue;

+

+      return sig;

+   }

+

+   return NULL;

+}

+

+

+bool

+link_function_calls(gl_shader_program *prog, gl_shader *main,

+		    gl_shader **shader_list, unsigned num_shaders)

+{

+   call_link_visitor v(prog, main, shader_list, num_shaders);

+

+   v.run(main->ir);

+   return v.success;

+}

diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index 17492357f..16894757b 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -1,1722 +1,1722 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file linker.cpp
- * GLSL linker implementation
- *
- * Given a set of shaders that are to be linked to generate a final program,
- * there are three distinct stages.
- *
- * In the first stage shaders are partitioned into groups based on the shader
- * type.  All shaders of a particular type (e.g., vertex shaders) are linked
- * together.
- *
- *   - Undefined references in each shader are resolve to definitions in
- *     another shader.
- *   - Types and qualifiers of uniforms, outputs, and global variables defined
- *     in multiple shaders with the same name are verified to be the same.
- *   - Initializers for uniforms and global variables defined
- *     in multiple shaders with the same name are verified to be the same.
- *
- * The result, in the terminology of the GLSL spec, is a set of shader
- * executables for each processing unit.
- *
- * After the first stage is complete, a series of semantic checks are performed
- * on each of the shader executables.
- *
- *   - Each shader executable must define a \c main function.
- *   - Each vertex shader executable must write to \c gl_Position.
- *   - Each fragment shader executable must write to either \c gl_FragData or
- *     \c gl_FragColor.
- *
- * In the final stage individual shader executables are linked to create a
- * complete exectuable.
- *
- *   - Types of uniforms defined in multiple shader stages with the same name
- *     are verified to be the same.
- *   - Initializers for uniforms defined in multiple shader stages with the
- *     same name are verified to be the same.
- *   - Types and qualifiers of outputs defined in one stage are verified to
- *     be the same as the types and qualifiers of inputs defined with the same
- *     name in a later stage.
- *
- * \author Ian Romanick <ian.d.romanick@intel.com>
- */
-
-#include "main/core.h"
-#include "glsl_symbol_table.h"
-#include "ir.h"
-#include "program.h"
-#include "program/hash_table.h"
-#include "linker.h"
-#include "ir_optimization.h"
-
-extern "C" {
-#include "main/shaderobj.h"
-}
-
-/**
- * Visitor that determines whether or not a variable is ever written.
- */
-class find_assignment_visitor : public ir_hierarchical_visitor {
-public:
-   find_assignment_visitor(const char *name)
-      : name(name), found(false)
-   {
-      /* empty */
-   }
-
-   virtual ir_visitor_status visit_enter(ir_assignment *ir)
-   {
-      ir_variable *const var = ir->lhs->variable_referenced();
-
-      if (strcmp(name, var->name) == 0) {
-	 found = true;
-	 return visit_stop;
-      }
-
-      return visit_continue_with_parent;
-   }
-
-   virtual ir_visitor_status visit_enter(ir_call *ir)
-   {
-      exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();
-      foreach_iter(exec_list_iterator, iter, *ir) {
-	 ir_rvalue *param_rval = (ir_rvalue *)iter.get();
-	 ir_variable *sig_param = (ir_variable *)sig_iter.get();
-
-	 if (sig_param->mode == ir_var_out ||
-	     sig_param->mode == ir_var_inout) {
-	    ir_variable *var = param_rval->variable_referenced();
-	    if (var && strcmp(name, var->name) == 0) {
-	       found = true;
-	       return visit_stop;
-	    }
-	 }
-	 sig_iter.next();
-      }
-
-      return visit_continue_with_parent;
-   }
-
-   bool variable_found()
-   {
-      return found;
-   }
-
-private:
-   const char *name;       /**< Find writes to a variable with this name. */
-   bool found;             /**< Was a write to the variable found? */
-};
-
-
-/**
- * Visitor that determines whether or not a variable is ever read.
- */
-class find_deref_visitor : public ir_hierarchical_visitor {
-public:
-   find_deref_visitor(const char *name)
-      : name(name), found(false)
-   {
-      /* empty */
-   }
-
-   virtual ir_visitor_status visit(ir_dereference_variable *ir)
-   {
-      if (strcmp(this->name, ir->var->name) == 0) {
-	 this->found = true;
-	 return visit_stop;
-      }
-
-      return visit_continue;
-   }
-
-   bool variable_found() const
-   {
-      return this->found;
-   }
-
-private:
-   const char *name;       /**< Find writes to a variable with this name. */
-   bool found;             /**< Was a write to the variable found? */
-};
-
-
-void
-linker_error_printf(gl_shader_program *prog, const char *fmt, ...)
-{
-   va_list ap;
-
-   ralloc_strcat(&prog->InfoLog, "error: ");
-   va_start(ap, fmt);
-   ralloc_vasprintf_append(&prog->InfoLog, fmt, ap);
-   va_end(ap);
-}
-
-
-void
-invalidate_variable_locations(gl_shader *sh, enum ir_variable_mode mode,
-			      int generic_base)
-{
-   foreach_list(node, sh->ir) {
-      ir_variable *const var = ((ir_instruction *) node)->as_variable();
-
-      if ((var == NULL) || (var->mode != (unsigned) mode))
-	 continue;
-
-      /* Only assign locations for generic attributes / varyings / etc.
-       */
-      if ((var->location >= generic_base) && !var->explicit_location)
-	  var->location = -1;
-   }
-}
-
-
-/**
- * Determine the number of attribute slots required for a particular type
- *
- * This code is here because it implements the language rules of a specific
- * GLSL version.  Since it's a property of the language and not a property of
- * types in general, it doesn't really belong in glsl_type.
- */
-unsigned
-count_attribute_slots(const glsl_type *t)
-{
-   /* From page 31 (page 37 of the PDF) of the GLSL 1.50 spec:
-    *
-    *     "A scalar input counts the same amount against this limit as a vec4,
-    *     so applications may want to consider packing groups of four
-    *     unrelated float inputs together into a vector to better utilize the
-    *     capabilities of the underlying hardware. A matrix input will use up
-    *     multiple locations.  The number of locations used will equal the
-    *     number of columns in the matrix."
-    *
-    * The spec does not explicitly say how arrays are counted.  However, it
-    * should be safe to assume the total number of slots consumed by an array
-    * is the number of entries in the array multiplied by the number of slots
-    * consumed by a single element of the array.
-    */
-
-   if (t->is_array())
-      return t->array_size() * count_attribute_slots(t->element_type());
-
-   if (t->is_matrix())
-      return t->matrix_columns;
-
-   return 1;
-}
-
-
-/**
- * Verify that a vertex shader executable meets all semantic requirements
- *
- * \param shader  Vertex shader executable to be verified
- */
-bool
-validate_vertex_shader_executable(struct gl_shader_program *prog,
-				  struct gl_shader *shader)
-{
-   if (shader == NULL)
-      return true;
-
-   find_assignment_visitor find("gl_Position");
-   find.run(shader->ir);
-   if (!find.variable_found()) {
-      linker_error_printf(prog,
-			  "vertex shader does not write to `gl_Position'\n");
-      return false;
-   }
-
-   return true;
-}
-
-
-/**
- * Verify that a fragment shader executable meets all semantic requirements
- *
- * \param shader  Fragment shader executable to be verified
- */
-bool
-validate_fragment_shader_executable(struct gl_shader_program *prog,
-				    struct gl_shader *shader)
-{
-   if (shader == NULL)
-      return true;
-
-   find_assignment_visitor frag_color("gl_FragColor");
-   find_assignment_visitor frag_data("gl_FragData");
-
-   frag_color.run(shader->ir);
-   frag_data.run(shader->ir);
-
-   if (frag_color.variable_found() && frag_data.variable_found()) {
-      linker_error_printf(prog,  "fragment shader writes to both "
-			  "`gl_FragColor' and `gl_FragData'\n");
-      return false;
-   }
-
-   return true;
-}
-
-
-/**
- * Generate a string describing the mode of a variable
- */
-static const char *
-mode_string(const ir_variable *var)
-{
-   switch (var->mode) {
-   case ir_var_auto:
-      return (var->read_only) ? "global constant" : "global variable";
-
-   case ir_var_uniform: return "uniform";
-   case ir_var_in:      return "shader input";
-   case ir_var_out:     return "shader output";
-   case ir_var_inout:   return "shader inout";
-
-   case ir_var_const_in:
-   case ir_var_temporary:
-   default:
-      assert(!"Should not get here.");
-      return "invalid variable";
-   }
-}
-
-
-/**
- * Perform validation of global variables used across multiple shaders
- */
-bool
-cross_validate_globals(struct gl_shader_program *prog,
-		       struct gl_shader **shader_list,
-		       unsigned num_shaders,
-		       bool uniforms_only)
-{
-   /* Examine all of the uniforms in all of the shaders and cross validate
-    * them.
-    */
-   glsl_symbol_table variables;
-   for (unsigned i = 0; i < num_shaders; i++) {
-      if (shader_list[i] == NULL)
-	 continue;
-
-      foreach_list(node, shader_list[i]->ir) {
-	 ir_variable *const var = ((ir_instruction *) node)->as_variable();
-
-	 if (var == NULL)
-	    continue;
-
-	 if (uniforms_only && (var->mode != ir_var_uniform))
-	    continue;
-
-	 /* Don't cross validate temporaries that are at global scope.  These
-	  * will eventually get pulled into the shaders 'main'.
-	  */
-	 if (var->mode == ir_var_temporary)
-	    continue;
-
-	 /* If a global with this name has already been seen, verify that the
-	  * new instance has the same type.  In addition, if the globals have
-	  * initializers, the values of the initializers must be the same.
-	  */
-	 ir_variable *const existing = variables.get_variable(var->name);
-	 if (existing != NULL) {
-	    if (var->type != existing->type) {
-	       /* Consider the types to be "the same" if both types are arrays
-		* of the same type and one of the arrays is implicitly sized.
-		* In addition, set the type of the linked variable to the
-		* explicitly sized array.
-		*/
-	       if (var->type->is_array()
-		   && existing->type->is_array()
-		   && (var->type->fields.array == existing->type->fields.array)
-		   && ((var->type->length == 0)
-		       || (existing->type->length == 0))) {
-		  if (var->type->length != 0) {
-		     existing->type = var->type;
-		  }
-	       } else {
-		  linker_error_printf(prog, "%s `%s' declared as type "
-				      "`%s' and type `%s'\n",
-				      mode_string(var),
-				      var->name, var->type->name,
-				      existing->type->name);
-		  return false;
-	       }
-	    }
-
-	    if (var->explicit_location) {
-	       if (existing->explicit_location
-		   && (var->location != existing->location)) {
-		     linker_error_printf(prog, "explicit locations for %s "
-					 "`%s' have differing values\n",
-					 mode_string(var), var->name);
-		     return false;
-	       }
-
-	       existing->location = var->location;
-	       existing->explicit_location = true;
-	    }
-
-        /* Validate layout qualifiers for gl_FragDepth.
-         *
-         * From the AMD_conservative_depth spec:
-         *    "If gl_FragDepth is redeclared in any fragment shader in
-         *    a program, it must be redeclared in all fragment shaders in that
-         *    program that have static assignments to gl_FragDepth. All
-         *    redeclarations of gl_FragDepth in all fragment shaders in
-         *    a single program must have the same set of qualifiers."
-         */
-        if (strcmp(var->name, "gl_FragDepth") == 0) {
-           bool layout_declared = var->depth_layout != ir_depth_layout_none;
-           bool layout_differs = var->depth_layout != existing->depth_layout;
-           if (layout_declared && layout_differs) {
-              linker_error_printf(prog,
-                 "All redeclarations of gl_FragDepth in all fragment shaders "
-                 "in a single program must have the same set of qualifiers.");
-           }
-           if (var->used && layout_differs) {
-              linker_error_printf(prog,
-                    "If gl_FragDepth is redeclared with a layout qualifier in"
-                    "any fragment shader, it must be redeclared with the same"
-                    "layout qualifier in all fragment shaders that have"
-                    "assignments to gl_FragDepth");
-           }
-        }
-
-	    /* FINISHME: Handle non-constant initializers.
-	     */
-	    if (var->constant_value != NULL) {
-	       if (existing->constant_value != NULL) {
-		  if (!var->constant_value->has_value(existing->constant_value)) {
-		     linker_error_printf(prog, "initializers for %s "
-					 "`%s' have differing values\n",
-					 mode_string(var), var->name);
-		     return false;
-		  }
-	       } else
-		  /* If the first-seen instance of a particular uniform did not
-		   * have an initializer but a later instance does, copy the
-		   * initializer to the version stored in the symbol table.
-		   */
-		  /* FINISHME: This is wrong.  The constant_value field should
-		   * FINISHME: not be modified!  Imagine a case where a shader
-		   * FINISHME: without an initializer is linked in two different
-		   * FINISHME: programs with shaders that have differing
-		   * FINISHME: initializers.  Linking with the first will
-		   * FINISHME: modify the shader, and linking with the second
-		   * FINISHME: will fail.
-		   */
-		  existing->constant_value =
-		     var->constant_value->clone(ralloc_parent(existing), NULL);
-	    }
-
-	    if (existing->invariant != var->invariant) {
-	       linker_error_printf(prog, "declarations for %s `%s' have "
-	                           "mismatching invariant qualifiers\n",
-	                           mode_string(var), var->name);
-	       return false;
-	    }
-            if (existing->centroid != var->centroid) {
-               linker_error_printf(prog, "declarations for %s `%s' have "
-                                   "mismatching centroid qualifiers\n",
-                                   mode_string(var), var->name);
-               return false;
-            }
-	 } else
-	    variables.add_variable(var);
-      }
-   }
-
-   return true;
-}
-
-
-/**
- * Perform validation of uniforms used across multiple shader stages
- */
-bool
-cross_validate_uniforms(struct gl_shader_program *prog)
-{
-   return cross_validate_globals(prog, prog->_LinkedShaders,
-				 MESA_SHADER_TYPES, true);
-}
-
-
-/**
- * Validate that outputs from one stage match inputs of another
- */
-bool
-cross_validate_outputs_to_inputs(struct gl_shader_program *prog,
-				 gl_shader *producer, gl_shader *consumer)
-{
-   glsl_symbol_table parameters;
-   /* FINISHME: Figure these out dynamically. */
-   const char *const producer_stage = "vertex";
-   const char *const consumer_stage = "fragment";
-
-   /* Find all shader outputs in the "producer" stage.
-    */
-   foreach_list(node, producer->ir) {
-      ir_variable *const var = ((ir_instruction *) node)->as_variable();
-
-      /* FINISHME: For geometry shaders, this should also look for inout
-       * FINISHME: variables.
-       */
-      if ((var == NULL) || (var->mode != ir_var_out))
-	 continue;
-
-      parameters.add_variable(var);
-   }
-
-
-   /* Find all shader inputs in the "consumer" stage.  Any variables that have
-    * matching outputs already in the symbol table must have the same type and
-    * qualifiers.
-    */
-   foreach_list(node, consumer->ir) {
-      ir_variable *const input = ((ir_instruction *) node)->as_variable();
-
-      /* FINISHME: For geometry shaders, this should also look for inout
-       * FINISHME: variables.
-       */
-      if ((input == NULL) || (input->mode != ir_var_in))
-	 continue;
-
-      ir_variable *const output = parameters.get_variable(input->name);
-      if (output != NULL) {
-	 /* Check that the types match between stages.
-	  */
-	 if (input->type != output->type) {
-	    /* There is a bit of a special case for gl_TexCoord.  This
-	     * built-in is unsized by default.  Appliations that variable
-	     * access it must redeclare it with a size.  There is some
-	     * language in the GLSL spec that implies the fragment shader
-	     * and vertex shader do not have to agree on this size.  Other
-	     * driver behave this way, and one or two applications seem to
-	     * rely on it.
-	     *
-	     * Neither declaration needs to be modified here because the array
-	     * sizes are fixed later when update_array_sizes is called.
-	     *
-	     * From page 48 (page 54 of the PDF) of the GLSL 1.10 spec:
-	     *
-	     *     "Unlike user-defined varying variables, the built-in
-	     *     varying variables don't have a strict one-to-one
-	     *     correspondence between the vertex language and the
-	     *     fragment language."
-	     */
-	    if (!output->type->is_array()
-		|| (strncmp("gl_", output->name, 3) != 0)) {
-	       linker_error_printf(prog,
-				   "%s shader output `%s' declared as "
-				   "type `%s', but %s shader input declared "
-				   "as type `%s'\n",
-				   producer_stage, output->name,
-				   output->type->name,
-				   consumer_stage, input->type->name);
-	       return false;
-	    }
-	 }
-
-	 /* Check that all of the qualifiers match between stages.
-	  */
-	 if (input->centroid != output->centroid) {
-	    linker_error_printf(prog,
-				"%s shader output `%s' %s centroid qualifier, "
-				"but %s shader input %s centroid qualifier\n",
-				producer_stage,
-				output->name,
-				(output->centroid) ? "has" : "lacks",
-				consumer_stage,
-				(input->centroid) ? "has" : "lacks");
-	    return false;
-	 }
-
-	 if (input->invariant != output->invariant) {
-	    linker_error_printf(prog,
-				"%s shader output `%s' %s invariant qualifier, "
-				"but %s shader input %s invariant qualifier\n",
-				producer_stage,
-				output->name,
-				(output->invariant) ? "has" : "lacks",
-				consumer_stage,
-				(input->invariant) ? "has" : "lacks");
-	    return false;
-	 }
-
-	 if (input->interpolation != output->interpolation) {
-	    linker_error_printf(prog,
-				"%s shader output `%s' specifies %s "
-				"interpolation qualifier, "
-				"but %s shader input specifies %s "
-				"interpolation qualifier\n",
-				producer_stage,
-				output->name,
-				output->interpolation_string(),
-				consumer_stage,
-				input->interpolation_string());
-	    return false;
-	 }
-      }
-   }
-
-   return true;
-}
-
-
-/**
- * Populates a shaders symbol table with all global declarations
- */
-static void
-populate_symbol_table(gl_shader *sh)
-{
-   sh->symbols = new(sh) glsl_symbol_table;
-
-   foreach_list(node, sh->ir) {
-      ir_instruction *const inst = (ir_instruction *) node;
-      ir_variable *var;
-      ir_function *func;
-
-      if ((func = inst->as_function()) != NULL) {
-	 sh->symbols->add_function(func);
-      } else if ((var = inst->as_variable()) != NULL) {
-	 sh->symbols->add_variable(var);
-      }
-   }
-}
-
-
-/**
- * Remap variables referenced in an instruction tree
- *
- * This is used when instruction trees are cloned from one shader and placed in
- * another.  These trees will contain references to \c ir_variable nodes that
- * do not exist in the target shader.  This function finds these \c ir_variable
- * references and replaces the references with matching variables in the target
- * shader.
- *
- * If there is no matching variable in the target shader, a clone of the
- * \c ir_variable is made and added to the target shader.  The new variable is
- * added to \b both the instruction stream and the symbol table.
- *
- * \param inst         IR tree that is to be processed.
- * \param symbols      Symbol table containing global scope symbols in the
- *                     linked shader.
- * \param instructions Instruction stream where new variable declarations
- *                     should be added.
- */
-void
-remap_variables(ir_instruction *inst, struct gl_shader *target,
-		hash_table *temps)
-{
-   class remap_visitor : public ir_hierarchical_visitor {
-   public:
-	 remap_visitor(struct gl_shader *target,
-		    hash_table *temps)
-      {
-	 this->target = target;
-	 this->symbols = target->symbols;
-	 this->instructions = target->ir;
-	 this->temps = temps;
-      }
-
-      virtual ir_visitor_status visit(ir_dereference_variable *ir)
-      {
-	 if (ir->var->mode == ir_var_temporary) {
-	    ir_variable *var = (ir_variable *) hash_table_find(temps, ir->var);
-
-	    assert(var != NULL);
-	    ir->var = var;
-	    return visit_continue;
-	 }
-
-	 ir_variable *const existing =
-	    this->symbols->get_variable(ir->var->name);
-	 if (existing != NULL)
-	    ir->var = existing;
-	 else {
-	    ir_variable *copy = ir->var->clone(this->target, NULL);
-
-	    this->symbols->add_variable(copy);
-	    this->instructions->push_head(copy);
-	    ir->var = copy;
-	 }
-
-	 return visit_continue;
-      }
-
-   private:
-      struct gl_shader *target;
-      glsl_symbol_table *symbols;
-      exec_list *instructions;
-      hash_table *temps;
-   };
-
-   remap_visitor v(target, temps);
-
-   inst->accept(&v);
-}
-
-
-/**
- * Move non-declarations from one instruction stream to another
- *
- * The intended usage pattern of this function is to pass the pointer to the
- * head sentinel of a list (i.e., a pointer to the list cast to an \c exec_node
- * pointer) for \c last and \c false for \c make_copies on the first
- * call.  Successive calls pass the return value of the previous call for
- * \c last and \c true for \c make_copies.
- *
- * \param instructions Source instruction stream
- * \param last         Instruction after which new instructions should be
- *                     inserted in the target instruction stream
- * \param make_copies  Flag selecting whether instructions in \c instructions
- *                     should be copied (via \c ir_instruction::clone) into the
- *                     target list or moved.
- *
- * \return
- * The new "last" instruction in the target instruction stream.  This pointer
- * is suitable for use as the \c last parameter of a later call to this
- * function.
- */
-exec_node *
-move_non_declarations(exec_list *instructions, exec_node *last,
-		      bool make_copies, gl_shader *target)
-{
-   hash_table *temps = NULL;
-
-   if (make_copies)
-      temps = hash_table_ctor(0, hash_table_pointer_hash,
-			      hash_table_pointer_compare);
-
-   foreach_list_safe(node, instructions) {
-      ir_instruction *inst = (ir_instruction *) node;
-
-      if (inst->as_function())
-	 continue;
-
-      ir_variable *var = inst->as_variable();
-      if ((var != NULL) && (var->mode != ir_var_temporary))
-	 continue;
-
-      assert(inst->as_assignment()
-	     || ((var != NULL) && (var->mode == ir_var_temporary)));
-
-      if (make_copies) {
-	 inst = inst->clone(target, NULL);
-
-	 if (var != NULL)
-	    hash_table_insert(temps, inst, var);
-	 else
-	    remap_variables(inst, target, temps);
-      } else {
-	 inst->remove();
-      }
-
-      last->insert_after(inst);
-      last = inst;
-   }
-
-   if (make_copies)
-      hash_table_dtor(temps);
-
-   return last;
-}
-
-/**
- * Get the function signature for main from a shader
- */
-static ir_function_signature *
-get_main_function_signature(gl_shader *sh)
-{
-   ir_function *const f = sh->symbols->get_function("main");
-   if (f != NULL) {
-      exec_list void_parameters;
-
-      /* Look for the 'void main()' signature and ensure that it's defined.
-       * This keeps the linker from accidentally pick a shader that just
-       * contains a prototype for main.
-       *
-       * We don't have to check for multiple definitions of main (in multiple
-       * shaders) because that would have already been caught above.
-       */
-      ir_function_signature *sig = f->matching_signature(&void_parameters);
-      if ((sig != NULL) && sig->is_defined) {
-	 return sig;
-      }
-   }
-
-   return NULL;
-}
-
-
-/**
- * Combine a group of shaders for a single stage to generate a linked shader
- *
- * \note
- * If this function is supplied a single shader, it is cloned, and the new
- * shader is returned.
- */
-static struct gl_shader *
-link_intrastage_shaders(void *mem_ctx,
-			struct gl_context *ctx,
-			struct gl_shader_program *prog,
-			struct gl_shader **shader_list,
-			unsigned num_shaders)
-{
-   /* Check that global variables defined in multiple shaders are consistent.
-    */
-   if (!cross_validate_globals(prog, shader_list, num_shaders, false))
-      return NULL;
-
-   /* Check that there is only a single definition of each function signature
-    * across all shaders.
-    */
-   for (unsigned i = 0; i < (num_shaders - 1); i++) {
-      foreach_list(node, shader_list[i]->ir) {
-	 ir_function *const f = ((ir_instruction *) node)->as_function();
-
-	 if (f == NULL)
-	    continue;
-
-	 for (unsigned j = i + 1; j < num_shaders; j++) {
-	    ir_function *const other =
-	       shader_list[j]->symbols->get_function(f->name);
-
-	    /* If the other shader has no function (and therefore no function
-	     * signatures) with the same name, skip to the next shader.
-	     */
-	    if (other == NULL)
-	       continue;
-
-	    foreach_iter (exec_list_iterator, iter, *f) {
-	       ir_function_signature *sig =
-		  (ir_function_signature *) iter.get();
-
-	       if (!sig->is_defined || sig->is_builtin)
-		  continue;
-
-	       ir_function_signature *other_sig =
-		  other->exact_matching_signature(& sig->parameters);
-
-	       if ((other_sig != NULL) && other_sig->is_defined
-		   && !other_sig->is_builtin) {
-		  linker_error_printf(prog,
-				      "function `%s' is multiply defined",
-				      f->name);
-		  return NULL;
-	       }
-	    }
-	 }
-      }
-   }
-
-   /* Find the shader that defines main, and make a clone of it.
-    *
-    * Starting with the clone, search for undefined references.  If one is
-    * found, find the shader that defines it.  Clone the reference and add
-    * it to the shader.  Repeat until there are no undefined references or
-    * until a reference cannot be resolved.
-    */
-   gl_shader *main = NULL;
-   for (unsigned i = 0; i < num_shaders; i++) {
-      if (get_main_function_signature(shader_list[i]) != NULL) {
-	 main = shader_list[i];
-	 break;
-      }
-   }
-
-   if (main == NULL) {
-      linker_error_printf(prog, "%s shader lacks `main'\n",
-			  (shader_list[0]->Type == GL_VERTEX_SHADER)
-			  ? "vertex" : "fragment");
-      return NULL;
-   }
-
-   gl_shader *linked = ctx->Driver.NewShader(NULL, 0, main->Type);
-   linked->ir = new(linked) exec_list;
-   clone_ir_list(mem_ctx, linked->ir, main->ir);
-
-   populate_symbol_table(linked);
-
-   /* The a pointer to the main function in the final linked shader (i.e., the
-    * copy of the original shader that contained the main function).
-    */
-   ir_function_signature *const main_sig = get_main_function_signature(linked);
-
-   /* Move any instructions other than variable declarations or function
-    * declarations into main.
-    */
-   exec_node *insertion_point =
-      move_non_declarations(linked->ir, (exec_node *) &main_sig->body, false,
-			    linked);
-
-   for (unsigned i = 0; i < num_shaders; i++) {
-      if (shader_list[i] == main)
-	 continue;
-
-      insertion_point = move_non_declarations(shader_list[i]->ir,
-					      insertion_point, true, linked);
-   }
-
-   /* Resolve initializers for global variables in the linked shader.
-    */
-   unsigned num_linking_shaders = num_shaders;
-   for (unsigned i = 0; i < num_shaders; i++)
-      num_linking_shaders += shader_list[i]->num_builtins_to_link;
-
-   gl_shader **linking_shaders =
-      (gl_shader **) calloc(num_linking_shaders, sizeof(gl_shader *));
-
-   memcpy(linking_shaders, shader_list,
-	  sizeof(linking_shaders[0]) * num_shaders);
-
-   unsigned idx = num_shaders;
-   for (unsigned i = 0; i < num_shaders; i++) {
-      memcpy(&linking_shaders[idx], shader_list[i]->builtins_to_link,
-	     sizeof(linking_shaders[0]) * shader_list[i]->num_builtins_to_link);
-      idx += shader_list[i]->num_builtins_to_link;
-   }
-
-   assert(idx == num_linking_shaders);
-
-   if (!link_function_calls(prog, linked, linking_shaders,
-			    num_linking_shaders)) {
-      ctx->Driver.DeleteShader(ctx, linked);
-      linked = NULL;
-   }
-
-   free(linking_shaders);
-
-   /* Make a pass over all variable declarations to ensure that arrays with
-    * unspecified sizes have a size specified.  The size is inferred from the
-    * max_array_access field.
-    */
-   if (linked != NULL) {
-      class array_sizing_visitor : public ir_hierarchical_visitor {
-      public:
-	 virtual ir_visitor_status visit(ir_variable *var)
-	 {
-	    if (var->type->is_array() && (var->type->length == 0)) {
-	       const glsl_type *type =
-		  glsl_type::get_array_instance(var->type->fields.array,
-						var->max_array_access + 1);
-
-	       assert(type != NULL);
-	       var->type = type;
-	    }
-
-	    return visit_continue;
-	 }
-      } v;
-
-      v.run(linked->ir);
-   }
-
-   return linked;
-}
-
-
-struct uniform_node {
-   exec_node link;
-   struct gl_uniform *u;
-   unsigned slots;
-};
-
-/**
- * Update the sizes of linked shader uniform arrays to the maximum
- * array index used.
- *
- * From page 81 (page 95 of the PDF) of the OpenGL 2.1 spec:
- *
- *     If one or more elements of an array are active,
- *     GetActiveUniform will return the name of the array in name,
- *     subject to the restrictions listed above. The type of the array
- *     is returned in type. The size parameter contains the highest
- *     array element index used, plus one. The compiler or linker
- *     determines the highest index used.  There will be only one
- *     active uniform reported by the GL per uniform array.
-
- */
-static void
-update_array_sizes(struct gl_shader_program *prog)
-{
-   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) {
-	 if (prog->_LinkedShaders[i] == NULL)
-	    continue;
-
-      foreach_list(node, prog->_LinkedShaders[i]->ir) {
-	 ir_variable *const var = ((ir_instruction *) node)->as_variable();
-
-	 if ((var == NULL) || (var->mode != ir_var_uniform &&
-			       var->mode != ir_var_in &&
-			       var->mode != ir_var_out) ||
-	     !var->type->is_array())
-	    continue;
-
-	 unsigned int size = var->max_array_access;
-	 for (unsigned j = 0; j < MESA_SHADER_TYPES; j++) {
-	       if (prog->_LinkedShaders[j] == NULL)
-		  continue;
-
-	    foreach_list(node2, prog->_LinkedShaders[j]->ir) {
-	       ir_variable *other_var = ((ir_instruction *) node2)->as_variable();
-	       if (!other_var)
-		  continue;
-
-	       if (strcmp(var->name, other_var->name) == 0 &&
-		   other_var->max_array_access > size) {
-		  size = other_var->max_array_access;
-	       }
-	    }
-	 }
-
-	 if (size + 1 != var->type->fields.array->length) {
-	    /* If this is a built-in uniform (i.e., it's backed by some
-	     * fixed-function state), adjust the number of state slots to
-	     * match the new array size.  The number of slots per array entry
-	     * is not known.  It seems saft to assume that the total number of
-	     * slots is an integer multiple of the number of array elements.
-	     * Determine the number of slots per array element by dividing by
-	     * the old (total) size.
-	     */
-	    if (var->num_state_slots > 0) {
-	       var->num_state_slots = (size + 1)
-		  * (var->num_state_slots / var->type->length);
-	    }
-
-	    var->type = glsl_type::get_array_instance(var->type->fields.array,
-						      size + 1);
-	    /* FINISHME: We should update the types of array
-	     * dereferences of this variable now.
-	     */
-	 }
-      }
-   }
-}
-
-static void
-add_uniform(void *mem_ctx, exec_list *uniforms, struct hash_table *ht,
-	    const char *name, const glsl_type *type, GLenum shader_type,
-	    unsigned *next_shader_pos, unsigned *total_uniforms)
-{
-   if (type->is_record()) {
-      for (unsigned int i = 0; i < type->length; i++) {
-	 const glsl_type *field_type = type->fields.structure[i].type;
-	 char *field_name = ralloc_asprintf(mem_ctx, "%s.%s", name,
-					    type->fields.structure[i].name);
-
-	 add_uniform(mem_ctx, uniforms, ht, field_name, field_type,
-		     shader_type, next_shader_pos, total_uniforms);
-      }
-   } else {
-      uniform_node *n = (uniform_node *) hash_table_find(ht, name);
-      unsigned int vec4_slots;
-      const glsl_type *array_elem_type = NULL;
-
-      if (type->is_array()) {
-	 array_elem_type = type->fields.array;
-	 /* Array of structures. */
-	 if (array_elem_type->is_record()) {
-	    for (unsigned int i = 0; i < type->length; i++) {
-	       char *elem_name = ralloc_asprintf(mem_ctx, "%s[%d]", name, i);
-	       add_uniform(mem_ctx, uniforms, ht, elem_name, array_elem_type,
-			   shader_type, next_shader_pos, total_uniforms);
-	    }
-	    return;
-	 }
-      }
-
-      /* Fix the storage size of samplers at 1 vec4 each. Be sure to pad out
-       * vectors to vec4 slots.
-       */
-      if (type->is_array()) {
-	 if (array_elem_type->is_sampler())
-	    vec4_slots = type->length;
-	 else
-	    vec4_slots = type->length * array_elem_type->matrix_columns;
-      } else if (type->is_sampler()) {
-	 vec4_slots = 1;
-      } else {
-	 vec4_slots = type->matrix_columns;
-      }
-
-      if (n == NULL) {
-	 n = (uniform_node *) calloc(1, sizeof(struct uniform_node));
-	 n->u = (gl_uniform *) calloc(1, sizeof(struct gl_uniform));
-	 n->slots = vec4_slots;
-
-	 n->u->Name = strdup(name);
-	 n->u->Type = type;
-	 n->u->VertPos = -1;
-	 n->u->FragPos = -1;
-	 n->u->GeomPos = -1;
-	 (*total_uniforms)++;
-
-	 hash_table_insert(ht, n, name);
-	 uniforms->push_tail(& n->link);
-      }
-
-      switch (shader_type) {
-      case GL_VERTEX_SHADER:
-	 n->u->VertPos = *next_shader_pos;
-	 break;
-      case GL_FRAGMENT_SHADER:
-	 n->u->FragPos = *next_shader_pos;
-	 break;
-      case GL_GEOMETRY_SHADER:
-	 n->u->GeomPos = *next_shader_pos;
-	 break;
-      }
-
-      (*next_shader_pos) += vec4_slots;
-   }
-}
-
-void
-assign_uniform_locations(struct gl_shader_program *prog)
-{
-   /* */
-   exec_list uniforms;
-   unsigned total_uniforms = 0;
-   hash_table *ht = hash_table_ctor(32, hash_table_string_hash,
-				    hash_table_string_compare);
-   void *mem_ctx = ralloc_context(NULL);
-
-   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) {
-      if (prog->_LinkedShaders[i] == NULL)
-	 continue;
-
-      unsigned next_position = 0;
-
-      foreach_list(node, prog->_LinkedShaders[i]->ir) {
-	 ir_variable *const var = ((ir_instruction *) node)->as_variable();
-
-	 if ((var == NULL) || (var->mode != ir_var_uniform))
-	    continue;
-
-	 if (strncmp(var->name, "gl_", 3) == 0) {
-	    /* At the moment, we don't allocate uniform locations for
-	     * builtin uniforms.  It's permitted by spec, and we'll
-	     * likely switch to doing that at some point, but not yet.
-	     */
-	    continue;
-	 }
-
-	 var->location = next_position;
-	 add_uniform(mem_ctx, &uniforms, ht, var->name, var->type,
-		     prog->_LinkedShaders[i]->Type,
-		     &next_position, &total_uniforms);
-      }
-   }
-
-   ralloc_free(mem_ctx);
-
-   gl_uniform_list *ul = (gl_uniform_list *)
-      calloc(1, sizeof(gl_uniform_list));
-
-   ul->Size = total_uniforms;
-   ul->NumUniforms = total_uniforms;
-   ul->Uniforms = (gl_uniform *) calloc(total_uniforms, sizeof(gl_uniform));
-
-   unsigned idx = 0;
-   uniform_node *next;
-   for (uniform_node *node = (uniform_node *) uniforms.head
-	   ; node->link.next != NULL
-	   ; node = next) {
-      next = (uniform_node *) node->link.next;
-
-      node->link.remove();
-      memcpy(&ul->Uniforms[idx], node->u, sizeof(gl_uniform));
-      idx++;
-
-      free(node->u);
-      free(node);
-   }
-
-   hash_table_dtor(ht);
-
-   prog->Uniforms = ul;
-}
-
-
-/**
- * Find a contiguous set of available bits in a bitmask
- *
- * \param used_mask     Bits representing used (1) and unused (0) locations
- * \param needed_count  Number of contiguous bits needed.
- *
- * \return
- * Base location of the available bits on success or -1 on failure.
- */
-int
-find_available_slots(unsigned used_mask, unsigned needed_count)
-{
-   unsigned needed_mask = (1 << needed_count) - 1;
-   const int max_bit_to_test = (8 * sizeof(used_mask)) - needed_count;
-
-   /* The comparison to 32 is redundant, but without it GCC emits "warning:
-    * cannot optimize possibly infinite loops" for the loop below.
-    */
-   if ((needed_count == 0) || (max_bit_to_test < 0) || (max_bit_to_test > 32))
-      return -1;
-
-   for (int i = 0; i <= max_bit_to_test; i++) {
-      if ((needed_mask & ~used_mask) == needed_mask)
-	 return i;
-
-      needed_mask <<= 1;
-   }
-
-   return -1;
-}
-
-
-bool
-assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index)
-{
-   /* Mark invalid attribute locations as being used.
-    */
-   unsigned used_locations = (max_attribute_index >= 32)
-      ? ~0 : ~((1 << max_attribute_index) - 1);
-
-   gl_shader *const sh = prog->_LinkedShaders[0];
-   assert(sh->Type == GL_VERTEX_SHADER);
-
-   /* Operate in a total of four passes.
-    *
-    * 1. Invalidate the location assignments for all vertex shader inputs.
-    *
-    * 2. Assign locations for inputs that have user-defined (via
-    *    glBindVertexAttribLocation) locatoins.
-    *
-    * 3. Sort the attributes without assigned locations by number of slots
-    *    required in decreasing order.  Fragmentation caused by attribute
-    *    locations assigned by the application may prevent large attributes
-    *    from having enough contiguous space.
-    *
-    * 4. Assign locations to any inputs without assigned locations.
-    */
-
-   invalidate_variable_locations(sh, ir_var_in, VERT_ATTRIB_GENERIC0);
-
-   if (prog->Attributes != NULL) {
-      for (unsigned i = 0; i < prog->Attributes->NumParameters; i++) {
-	 ir_variable *const var =
-	    sh->symbols->get_variable(prog->Attributes->Parameters[i].Name);
-
-	 /* Note: attributes that occupy multiple slots, such as arrays or
-	  * matrices, may appear in the attrib array multiple times.
-	  */
-	 if ((var == NULL) || (var->location != -1))
-	    continue;
-
-	 /* From page 61 of the OpenGL 4.0 spec:
-	  *
-	  *     "LinkProgram will fail if the attribute bindings assigned by
-	  *     BindAttribLocation do not leave not enough space to assign a
-	  *     location for an active matrix attribute or an active attribute
-	  *     array, both of which require multiple contiguous generic
-	  *     attributes."
-	  *
-	  * Previous versions of the spec contain similar language but omit the
-	  * bit about attribute arrays.
-	  *
-	  * Page 61 of the OpenGL 4.0 spec also says:
-	  *
-	  *     "It is possible for an application to bind more than one
-	  *     attribute name to the same location. This is referred to as
-	  *     aliasing. This will only work if only one of the aliased
-	  *     attributes is active in the executable program, or if no path
-	  *     through the shader consumes more than one attribute of a set
-	  *     of attributes aliased to the same location. A link error can
-	  *     occur if the linker determines that every path through the
-	  *     shader consumes multiple aliased attributes, but
-	  *     implementations are not required to generate an error in this
-	  *     case."
-	  *
-	  * These two paragraphs are either somewhat contradictory, or I don't
-	  * fully understand one or both of them.
-	  */
-	 /* FINISHME: The code as currently written does not support attribute
-	  * FINISHME: location aliasing (see comment above).
-	  */
-	 const int attr = prog->Attributes->Parameters[i].StateIndexes[0];
-	 const unsigned slots = count_attribute_slots(var->type);
-
-	 /* Mask representing the contiguous slots that will be used by this
-	  * attribute.
-	  */
-	 const unsigned use_mask = (1 << slots) - 1;
-
-	 /* Generate a link error if the set of bits requested for this
-	  * attribute overlaps any previously allocated bits.
-	  */
-	 if ((~(use_mask << attr) & used_locations) != used_locations) {
-	    linker_error_printf(prog,
-				"insufficient contiguous attribute locations "
-				"available for vertex shader input `%s'",
-				var->name);
-	    return false;
-	 }
-
-	 var->location = VERT_ATTRIB_GENERIC0 + attr;
-	 used_locations |= (use_mask << attr);
-      }
-   }
-
-   /* Temporary storage for the set of attributes that need locations assigned.
-    */
-   struct temp_attr {
-      unsigned slots;
-      ir_variable *var;
-
-      /* Used below in the call to qsort. */
-      static int compare(const void *a, const void *b)
-      {
-	 const temp_attr *const l = (const temp_attr *) a;
-	 const temp_attr *const r = (const temp_attr *) b;
-
-	 /* Reversed because we want a descending order sort below. */
-	 return r->slots - l->slots;
-      }
-   } to_assign[16];
-
-   unsigned num_attr = 0;
-
-   foreach_list(node, sh->ir) {
-      ir_variable *const var = ((ir_instruction *) node)->as_variable();
-
-      if ((var == NULL) || (var->mode != ir_var_in))
-	 continue;
-
-      if (var->explicit_location) {
-	 const unsigned slots = count_attribute_slots(var->type);
-	 const unsigned use_mask = (1 << slots) - 1;
-	 const int attr = var->location - VERT_ATTRIB_GENERIC0;
-
-	 if ((var->location >= (int)(max_attribute_index + VERT_ATTRIB_GENERIC0))
-	     || (var->location < 0)) {
-	    linker_error_printf(prog,
-				"invalid explicit location %d specified for "
-				"`%s'\n",
-				(var->location < 0) ? var->location : attr,
-				var->name);
-	    return false;
-	 } else if (var->location >= VERT_ATTRIB_GENERIC0) {
-	    used_locations |= (use_mask << attr);
-	 }
-      }
-
-      /* The location was explicitly assigned, nothing to do here.
-       */
-      if (var->location != -1)
-	 continue;
-
-      to_assign[num_attr].slots = count_attribute_slots(var->type);
-      to_assign[num_attr].var = var;
-      num_attr++;
-   }
-
-   /* If all of the attributes were assigned locations by the application (or
-    * are built-in attributes with fixed locations), return early.  This should
-    * be the common case.
-    */
-   if (num_attr == 0)
-      return true;
-
-   qsort(to_assign, num_attr, sizeof(to_assign[0]), temp_attr::compare);
-
-   /* VERT_ATTRIB_GENERIC0 is a psdueo-alias for VERT_ATTRIB_POS.  It can only
-    * be explicitly assigned by via glBindAttribLocation.  Mark it as reserved
-    * to prevent it from being automatically allocated below.
-    */
-   find_deref_visitor find("gl_Vertex");
-   find.run(sh->ir);
-   if (find.variable_found())
-      used_locations |= (1 << 0);
-
-   for (unsigned i = 0; i < num_attr; i++) {
-      /* Mask representing the contiguous slots that will be used by this
-       * attribute.
-       */
-      const unsigned use_mask = (1 << to_assign[i].slots) - 1;
-
-      int location = find_available_slots(used_locations, to_assign[i].slots);
-
-      if (location < 0) {
-	 linker_error_printf(prog,
-			     "insufficient contiguous attribute locations "
-			     "available for vertex shader input `%s'",
-			     to_assign[i].var->name);
-	 return false;
-      }
-
-      to_assign[i].var->location = VERT_ATTRIB_GENERIC0 + location;
-      used_locations |= (use_mask << location);
-   }
-
-   return true;
-}
-
-
-/**
- * Demote shader inputs and outputs that are not used in other stages
- */
-void
-demote_shader_inputs_and_outputs(gl_shader *sh, enum ir_variable_mode mode)
-{
-   foreach_list(node, sh->ir) {
-      ir_variable *const var = ((ir_instruction *) node)->as_variable();
-
-      if ((var == NULL) || (var->mode != int(mode)))
-	 continue;
-
-      /* A shader 'in' or 'out' variable is only really an input or output if
-       * its value is used by other shader stages.  This will cause the variable
-       * to have a location assigned.
-       */
-      if (var->location == -1) {
-	 var->mode = ir_var_auto;
-      }
-   }
-}
-
-
-void
-assign_varying_locations(struct gl_shader_program *prog,
-			 gl_shader *producer, gl_shader *consumer)
-{
-   /* FINISHME: Set dynamically when geometry shader support is added. */
-   unsigned output_index = VERT_RESULT_VAR0;
-   unsigned input_index = FRAG_ATTRIB_VAR0;
-
-   /* Operate in a total of three passes.
-    *
-    * 1. Assign locations for any matching inputs and outputs.
-    *
-    * 2. Mark output variables in the producer that do not have locations as
-    *    not being outputs.  This lets the optimizer eliminate them.
-    *
-    * 3. Mark input variables in the consumer that do not have locations as
-    *    not being inputs.  This lets the optimizer eliminate them.
-    */
-
-   invalidate_variable_locations(producer, ir_var_out, VERT_RESULT_VAR0);
-   invalidate_variable_locations(consumer, ir_var_in, FRAG_ATTRIB_VAR0);
-
-   foreach_list(node, producer->ir) {
-      ir_variable *const output_var = ((ir_instruction *) node)->as_variable();
-
-      if ((output_var == NULL) || (output_var->mode != ir_var_out)
-	  || (output_var->location != -1))
-	 continue;
-
-      ir_variable *const input_var =
-	 consumer->symbols->get_variable(output_var->name);
-
-      if ((input_var == NULL) || (input_var->mode != ir_var_in))
-	 continue;
-
-      assert(input_var->location == -1);
-
-      output_var->location = output_index;
-      input_var->location = input_index;
-
-      /* FINISHME: Support for "varying" records in GLSL 1.50. */
-      assert(!output_var->type->is_record());
-
-      if (output_var->type->is_array()) {
-	 const unsigned slots = output_var->type->length
-	    * output_var->type->fields.array->matrix_columns;
-
-	 output_index += slots;
-	 input_index += slots;
-      } else {
-	 const unsigned slots = output_var->type->matrix_columns;
-
-	 output_index += slots;
-	 input_index += slots;
-      }
-   }
-
-   foreach_list(node, consumer->ir) {
-      ir_variable *const var = ((ir_instruction *) node)->as_variable();
-
-      if ((var == NULL) || (var->mode != ir_var_in))
-	 continue;
-
-      if (var->location == -1) {
-	 if (prog->Version <= 120) {
-	    /* On page 25 (page 31 of the PDF) of the GLSL 1.20 spec:
-	     *
-	     *     Only those varying variables used (i.e. read) in
-	     *     the fragment shader executable must be written to
-	     *     by the vertex shader executable; declaring
-	     *     superfluous varying variables in a vertex shader is
-	     *     permissible.
-	     *
-	     * We interpret this text as meaning that the VS must
-	     * write the variable for the FS to read it.  See
-	     * "glsl1-varying read but not written" in piglit.
-	     */
-
-	    linker_error_printf(prog, "fragment shader varying %s not written "
-				"by vertex shader\n.", var->name);
-	    prog->LinkStatus = false;
-	 }
-
-	 /* An 'in' variable is only really a shader input if its
-	  * value is written by the previous stage.
-	  */
-	 var->mode = ir_var_auto;
-      }
-   }
-}
-
-
-void
-link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
-{
-   void *mem_ctx = ralloc_context(NULL); // temporary linker context
-
-   prog->LinkStatus = false;
-   prog->Validated = false;
-   prog->_Used = false;
-
-   if (prog->InfoLog != NULL)
-      ralloc_free(prog->InfoLog);
-
-   prog->InfoLog = ralloc_strdup(NULL, "");
-
-   /* Separate the shaders into groups based on their type.
-    */
-   struct gl_shader **vert_shader_list;
-   unsigned num_vert_shaders = 0;
-   struct gl_shader **frag_shader_list;
-   unsigned num_frag_shaders = 0;
-
-   vert_shader_list = (struct gl_shader **)
-      calloc(2 * prog->NumShaders, sizeof(struct gl_shader *));
-   frag_shader_list =  &vert_shader_list[prog->NumShaders];
-
-   unsigned min_version = UINT_MAX;
-   unsigned max_version = 0;
-   for (unsigned i = 0; i < prog->NumShaders; i++) {
-      min_version = MIN2(min_version, prog->Shaders[i]->Version);
-      max_version = MAX2(max_version, prog->Shaders[i]->Version);
-
-      switch (prog->Shaders[i]->Type) {
-      case GL_VERTEX_SHADER:
-	 vert_shader_list[num_vert_shaders] = prog->Shaders[i];
-	 num_vert_shaders++;
-	 break;
-      case GL_FRAGMENT_SHADER:
-	 frag_shader_list[num_frag_shaders] = prog->Shaders[i];
-	 num_frag_shaders++;
-	 break;
-      case GL_GEOMETRY_SHADER:
-	 /* FINISHME: Support geometry shaders. */
-	 assert(prog->Shaders[i]->Type != GL_GEOMETRY_SHADER);
-	 break;
-      }
-   }
-
-   /* Previous to GLSL version 1.30, different compilation units could mix and
-    * match shading language versions.  With GLSL 1.30 and later, the versions
-    * of all shaders must match.
-    */
-   assert(min_version >= 100);
-   assert(max_version <= 130);
-   if ((max_version >= 130 || min_version == 100)
-       && min_version != max_version) {
-      linker_error_printf(prog, "all shaders must use same shading "
-			  "language version\n");
-      goto done;
-   }
-
-   prog->Version = max_version;
-
-   for (unsigned int i = 0; i < MESA_SHADER_TYPES; i++) {
-      if (prog->_LinkedShaders[i] != NULL)
-	 ctx->Driver.DeleteShader(ctx, prog->_LinkedShaders[i]);
-
-      prog->_LinkedShaders[i] = NULL;
-   }
-
-   /* Link all shaders for a particular stage and validate the result.
-    */
-   if (num_vert_shaders > 0) {
-      gl_shader *const sh =
-	 link_intrastage_shaders(mem_ctx, ctx, prog, vert_shader_list,
-				 num_vert_shaders);
-
-      if (sh == NULL)
-	 goto done;
-
-      if (!validate_vertex_shader_executable(prog, sh))
-	 goto done;
-
-      _mesa_reference_shader(ctx, &prog->_LinkedShaders[MESA_SHADER_VERTEX],
-			     sh);
-   }
-
-   if (num_frag_shaders > 0) {
-      gl_shader *const sh =
-	 link_intrastage_shaders(mem_ctx, ctx, prog, frag_shader_list,
-				 num_frag_shaders);
-
-      if (sh == NULL)
-	 goto done;
-
-      if (!validate_fragment_shader_executable(prog, sh))
-	 goto done;
-
-      _mesa_reference_shader(ctx, &prog->_LinkedShaders[MESA_SHADER_FRAGMENT],
-			     sh);
-   }
-
-   /* Here begins the inter-stage linking phase.  Some initial validation is
-    * performed, then locations are assigned for uniforms, attributes, and
-    * varyings.
-    */
-   if (cross_validate_uniforms(prog)) {
-      unsigned prev;
-
-      for (prev = 0; prev < MESA_SHADER_TYPES; prev++) {
-	 if (prog->_LinkedShaders[prev] != NULL)
-	    break;
-      }
-
-      /* Validate the inputs of each stage with the output of the preceeding
-       * stage.
-       */
-      for (unsigned i = prev + 1; i < MESA_SHADER_TYPES; i++) {
-	 if (prog->_LinkedShaders[i] == NULL)
-	    continue;
-
-	 if (!cross_validate_outputs_to_inputs(prog,
-					       prog->_LinkedShaders[prev],
-					       prog->_LinkedShaders[i]))
-	    goto done;
-
-	 prev = i;
-      }
-
-      prog->LinkStatus = true;
-   }
-
-   /* Do common optimization before assigning storage for attributes,
-    * uniforms, and varyings.  Later optimization could possibly make
-    * some of that unused.
-    */
-   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) {
-      if (prog->_LinkedShaders[i] == NULL)
-	 continue;
-
-      while (do_common_optimization(prog->_LinkedShaders[i]->ir, true, 32))
-	 ;
-   }
-
-   update_array_sizes(prog);
-
-   assign_uniform_locations(prog);
-
-   if (prog->_LinkedShaders[MESA_SHADER_VERTEX] != NULL) {
-      /* FINISHME: The value of the max_attribute_index parameter is
-       * FINISHME: implementation dependent based on the value of
-       * FINISHME: GL_MAX_VERTEX_ATTRIBS.  GL_MAX_VERTEX_ATTRIBS must be
-       * FINISHME: at least 16, so hardcode 16 for now.
-       */
-      if (!assign_attribute_locations(prog, 16)) {
-	 prog->LinkStatus = false;
-	 goto done;
-      }
-   }
-
-   unsigned prev;
-   for (prev = 0; prev < MESA_SHADER_TYPES; prev++) {
-      if (prog->_LinkedShaders[prev] != NULL)
-	 break;
-   }
-
-   for (unsigned i = prev + 1; i < MESA_SHADER_TYPES; i++) {
-      if (prog->_LinkedShaders[i] == NULL)
-	 continue;
-
-      assign_varying_locations(prog,
-			       prog->_LinkedShaders[prev],
-			       prog->_LinkedShaders[i]);
-      prev = i;
-   }
-
-   if (prog->_LinkedShaders[MESA_SHADER_VERTEX] != NULL) {
-      demote_shader_inputs_and_outputs(prog->_LinkedShaders[MESA_SHADER_VERTEX],
-				       ir_var_out);
-   }
-
-   if (prog->_LinkedShaders[MESA_SHADER_GEOMETRY] != NULL) {
-      gl_shader *const sh = prog->_LinkedShaders[MESA_SHADER_GEOMETRY];
-
-      demote_shader_inputs_and_outputs(sh, ir_var_in);
-      demote_shader_inputs_and_outputs(sh, ir_var_inout);
-      demote_shader_inputs_and_outputs(sh, ir_var_out);
-   }
-
-   if (prog->_LinkedShaders[MESA_SHADER_FRAGMENT] != NULL) {
-      gl_shader *const sh = prog->_LinkedShaders[MESA_SHADER_FRAGMENT];
-
-      demote_shader_inputs_and_outputs(sh, ir_var_in);
-   }
-
-   /* OpenGL ES requires that a vertex shader and a fragment shader both be
-    * present in a linked program.  By checking for use of shading language
-    * version 1.00, we also catch the GL_ARB_ES2_compatibility case.
-    */
-   if (ctx->API == API_OPENGLES2 || prog->Version == 100) {
-      if (prog->_LinkedShaders[MESA_SHADER_VERTEX] == NULL) {
-	 linker_error_printf(prog, "program lacks a vertex shader\n");
-	 prog->LinkStatus = false;
-      } else if (prog->_LinkedShaders[MESA_SHADER_FRAGMENT] == NULL) {
-	 linker_error_printf(prog, "program lacks a fragment shader\n");
-	 prog->LinkStatus = false;
-      }
-   }
-
-   /* FINISHME: Assign fragment shader output locations. */
-
-done:
-   free(vert_shader_list);
-
-   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) {
-      if (prog->_LinkedShaders[i] == NULL)
-	 continue;
-
-      /* Retain any live IR, but trash the rest. */
-      reparent_ir(prog->_LinkedShaders[i]->ir, prog->_LinkedShaders[i]->ir);
-   }
-
-   ralloc_free(mem_ctx);
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file linker.cpp

+ * GLSL linker implementation

+ *

+ * Given a set of shaders that are to be linked to generate a final program,

+ * there are three distinct stages.

+ *

+ * In the first stage shaders are partitioned into groups based on the shader

+ * type.  All shaders of a particular type (e.g., vertex shaders) are linked

+ * together.

+ *

+ *   - Undefined references in each shader are resolve to definitions in

+ *     another shader.

+ *   - Types and qualifiers of uniforms, outputs, and global variables defined

+ *     in multiple shaders with the same name are verified to be the same.

+ *   - Initializers for uniforms and global variables defined

+ *     in multiple shaders with the same name are verified to be the same.

+ *

+ * The result, in the terminology of the GLSL spec, is a set of shader

+ * executables for each processing unit.

+ *

+ * After the first stage is complete, a series of semantic checks are performed

+ * on each of the shader executables.

+ *

+ *   - Each shader executable must define a \c main function.

+ *   - Each vertex shader executable must write to \c gl_Position.

+ *   - Each fragment shader executable must write to either \c gl_FragData or

+ *     \c gl_FragColor.

+ *

+ * In the final stage individual shader executables are linked to create a

+ * complete exectuable.

+ *

+ *   - Types of uniforms defined in multiple shader stages with the same name

+ *     are verified to be the same.

+ *   - Initializers for uniforms defined in multiple shader stages with the

+ *     same name are verified to be the same.

+ *   - Types and qualifiers of outputs defined in one stage are verified to

+ *     be the same as the types and qualifiers of inputs defined with the same

+ *     name in a later stage.

+ *

+ * \author Ian Romanick <ian.d.romanick@intel.com>

+ */

+

+#include "main/core.h"

+#include "glsl_symbol_table.h"

+#include "ir.h"

+#include "program.h"

+#include "program/hash_table.h"

+#include "linker.h"

+#include "ir_optimization.h"

+

+extern "C" {

+#include "main/shaderobj.h"

+}

+

+/**

+ * Visitor that determines whether or not a variable is ever written.

+ */

+class find_assignment_visitor : public ir_hierarchical_visitor {

+public:

+   find_assignment_visitor(const char *name)

+      : name(name), found(false)

+   {

+      /* empty */

+   }

+

+   virtual ir_visitor_status visit_enter(ir_assignment *ir)

+   {

+      ir_variable *const var = ir->lhs->variable_referenced();

+

+      if (strcmp(name, var->name) == 0) {

+	 found = true;

+	 return visit_stop;

+      }

+

+      return visit_continue_with_parent;

+   }

+

+   virtual ir_visitor_status visit_enter(ir_call *ir)

+   {

+      exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();

+      foreach_iter(exec_list_iterator, iter, *ir) {

+	 ir_rvalue *param_rval = (ir_rvalue *)iter.get();

+	 ir_variable *sig_param = (ir_variable *)sig_iter.get();

+

+	 if (sig_param->mode == ir_var_out ||

+	     sig_param->mode == ir_var_inout) {

+	    ir_variable *var = param_rval->variable_referenced();

+	    if (var && strcmp(name, var->name) == 0) {

+	       found = true;

+	       return visit_stop;

+	    }

+	 }

+	 sig_iter.next();

+      }

+

+      return visit_continue_with_parent;

+   }

+

+   bool variable_found()

+   {

+      return found;

+   }

+

+private:

+   const char *name;       /**< Find writes to a variable with this name. */

+   bool found;             /**< Was a write to the variable found? */

+};

+

+

+/**

+ * Visitor that determines whether or not a variable is ever read.

+ */

+class find_deref_visitor : public ir_hierarchical_visitor {

+public:

+   find_deref_visitor(const char *name)

+      : name(name), found(false)

+   {

+      /* empty */

+   }

+

+   virtual ir_visitor_status visit(ir_dereference_variable *ir)

+   {

+      if (strcmp(this->name, ir->var->name) == 0) {

+	 this->found = true;

+	 return visit_stop;

+      }

+

+      return visit_continue;

+   }

+

+   bool variable_found() const

+   {

+      return this->found;

+   }

+

+private:

+   const char *name;       /**< Find writes to a variable with this name. */

+   bool found;             /**< Was a write to the variable found? */

+};

+

+

+void

+linker_error_printf(gl_shader_program *prog, const char *fmt, ...)

+{

+   va_list ap;

+

+   ralloc_strcat(&prog->InfoLog, "error: ");

+   va_start(ap, fmt);

+   ralloc_vasprintf_append(&prog->InfoLog, fmt, ap);

+   va_end(ap);

+}

+

+

+void

+invalidate_variable_locations(gl_shader *sh, enum ir_variable_mode mode,

+			      int generic_base)

+{

+   foreach_list(node, sh->ir) {

+      ir_variable *const var = ((ir_instruction *) node)->as_variable();

+

+      if ((var == NULL) || (var->mode != (unsigned) mode))

+	 continue;

+

+      /* Only assign locations for generic attributes / varyings / etc.

+       */

+      if ((var->location >= generic_base) && !var->explicit_location)

+	  var->location = -1;

+   }

+}

+

+

+/**

+ * Determine the number of attribute slots required for a particular type

+ *

+ * This code is here because it implements the language rules of a specific

+ * GLSL version.  Since it's a property of the language and not a property of

+ * types in general, it doesn't really belong in glsl_type.

+ */

+unsigned

+count_attribute_slots(const glsl_type *t)

+{

+   /* From page 31 (page 37 of the PDF) of the GLSL 1.50 spec:

+    *

+    *     "A scalar input counts the same amount against this limit as a vec4,

+    *     so applications may want to consider packing groups of four

+    *     unrelated float inputs together into a vector to better utilize the

+    *     capabilities of the underlying hardware. A matrix input will use up

+    *     multiple locations.  The number of locations used will equal the

+    *     number of columns in the matrix."

+    *

+    * The spec does not explicitly say how arrays are counted.  However, it

+    * should be safe to assume the total number of slots consumed by an array

+    * is the number of entries in the array multiplied by the number of slots

+    * consumed by a single element of the array.

+    */

+

+   if (t->is_array())

+      return t->array_size() * count_attribute_slots(t->element_type());

+

+   if (t->is_matrix())

+      return t->matrix_columns;

+

+   return 1;

+}

+

+

+/**

+ * Verify that a vertex shader executable meets all semantic requirements

+ *

+ * \param shader  Vertex shader executable to be verified

+ */

+bool

+validate_vertex_shader_executable(struct gl_shader_program *prog,

+				  struct gl_shader *shader)

+{

+   if (shader == NULL)

+      return true;

+

+   find_assignment_visitor find("gl_Position");

+   find.run(shader->ir);

+   if (!find.variable_found()) {

+      linker_error_printf(prog,

+			  "vertex shader does not write to `gl_Position'\n");

+      return false;

+   }

+

+   return true;

+}

+

+

+/**

+ * Verify that a fragment shader executable meets all semantic requirements

+ *

+ * \param shader  Fragment shader executable to be verified

+ */

+bool

+validate_fragment_shader_executable(struct gl_shader_program *prog,

+				    struct gl_shader *shader)

+{

+   if (shader == NULL)

+      return true;

+

+   find_assignment_visitor frag_color("gl_FragColor");

+   find_assignment_visitor frag_data("gl_FragData");

+

+   frag_color.run(shader->ir);

+   frag_data.run(shader->ir);

+

+   if (frag_color.variable_found() && frag_data.variable_found()) {

+      linker_error_printf(prog,  "fragment shader writes to both "

+			  "`gl_FragColor' and `gl_FragData'\n");

+      return false;

+   }

+

+   return true;

+}

+

+

+/**

+ * Generate a string describing the mode of a variable

+ */

+static const char *

+mode_string(const ir_variable *var)

+{

+   switch (var->mode) {

+   case ir_var_auto:

+      return (var->read_only) ? "global constant" : "global variable";

+

+   case ir_var_uniform: return "uniform";

+   case ir_var_in:      return "shader input";

+   case ir_var_out:     return "shader output";

+   case ir_var_inout:   return "shader inout";

+

+   case ir_var_const_in:

+   case ir_var_temporary:

+   default:

+      assert(!"Should not get here.");

+      return "invalid variable";

+   }

+}

+

+

+/**

+ * Perform validation of global variables used across multiple shaders

+ */

+bool

+cross_validate_globals(struct gl_shader_program *prog,

+		       struct gl_shader **shader_list,

+		       unsigned num_shaders,

+		       bool uniforms_only)

+{

+   /* Examine all of the uniforms in all of the shaders and cross validate

+    * them.

+    */

+   glsl_symbol_table variables;

+   for (unsigned i = 0; i < num_shaders; i++) {

+      if (shader_list[i] == NULL)

+	 continue;

+

+      foreach_list(node, shader_list[i]->ir) {

+	 ir_variable *const var = ((ir_instruction *) node)->as_variable();

+

+	 if (var == NULL)

+	    continue;

+

+	 if (uniforms_only && (var->mode != ir_var_uniform))

+	    continue;

+

+	 /* Don't cross validate temporaries that are at global scope.  These

+	  * will eventually get pulled into the shaders 'main'.

+	  */

+	 if (var->mode == ir_var_temporary)

+	    continue;

+

+	 /* If a global with this name has already been seen, verify that the

+	  * new instance has the same type.  In addition, if the globals have

+	  * initializers, the values of the initializers must be the same.

+	  */

+	 ir_variable *const existing = variables.get_variable(var->name);

+	 if (existing != NULL) {

+	    if (var->type != existing->type) {

+	       /* Consider the types to be "the same" if both types are arrays

+		* of the same type and one of the arrays is implicitly sized.

+		* In addition, set the type of the linked variable to the

+		* explicitly sized array.

+		*/

+	       if (var->type->is_array()

+		   && existing->type->is_array()

+		   && (var->type->fields.array == existing->type->fields.array)

+		   && ((var->type->length == 0)

+		       || (existing->type->length == 0))) {

+		  if (var->type->length != 0) {

+		     existing->type = var->type;

+		  }

+	       } else {

+		  linker_error_printf(prog, "%s `%s' declared as type "

+				      "`%s' and type `%s'\n",

+				      mode_string(var),

+				      var->name, var->type->name,

+				      existing->type->name);

+		  return false;

+	       }

+	    }

+

+	    if (var->explicit_location) {

+	       if (existing->explicit_location

+		   && (var->location != existing->location)) {

+		     linker_error_printf(prog, "explicit locations for %s "

+					 "`%s' have differing values\n",

+					 mode_string(var), var->name);

+		     return false;

+	       }

+

+	       existing->location = var->location;

+	       existing->explicit_location = true;

+	    }

+

+        /* Validate layout qualifiers for gl_FragDepth.

+         *

+         * From the AMD_conservative_depth spec:

+         *    "If gl_FragDepth is redeclared in any fragment shader in

+         *    a program, it must be redeclared in all fragment shaders in that

+         *    program that have static assignments to gl_FragDepth. All

+         *    redeclarations of gl_FragDepth in all fragment shaders in

+         *    a single program must have the same set of qualifiers."

+         */

+        if (strcmp(var->name, "gl_FragDepth") == 0) {

+           bool layout_declared = var->depth_layout != ir_depth_layout_none;

+           bool layout_differs = var->depth_layout != existing->depth_layout;

+           if (layout_declared && layout_differs) {

+              linker_error_printf(prog,

+                 "All redeclarations of gl_FragDepth in all fragment shaders "

+                 "in a single program must have the same set of qualifiers.");

+           }

+           if (var->used && layout_differs) {

+              linker_error_printf(prog,

+                    "If gl_FragDepth is redeclared with a layout qualifier in"

+                    "any fragment shader, it must be redeclared with the same"

+                    "layout qualifier in all fragment shaders that have"

+                    "assignments to gl_FragDepth");

+           }

+        }

+

+	    /* FINISHME: Handle non-constant initializers.

+	     */

+	    if (var->constant_value != NULL) {

+	       if (existing->constant_value != NULL) {

+		  if (!var->constant_value->has_value(existing->constant_value)) {

+		     linker_error_printf(prog, "initializers for %s "

+					 "`%s' have differing values\n",

+					 mode_string(var), var->name);

+		     return false;

+		  }

+	       } else

+		  /* If the first-seen instance of a particular uniform did not

+		   * have an initializer but a later instance does, copy the

+		   * initializer to the version stored in the symbol table.

+		   */

+		  /* FINISHME: This is wrong.  The constant_value field should

+		   * FINISHME: not be modified!  Imagine a case where a shader

+		   * FINISHME: without an initializer is linked in two different

+		   * FINISHME: programs with shaders that have differing

+		   * FINISHME: initializers.  Linking with the first will

+		   * FINISHME: modify the shader, and linking with the second

+		   * FINISHME: will fail.

+		   */

+		  existing->constant_value =

+		     var->constant_value->clone(ralloc_parent(existing), NULL);

+	    }

+

+	    if (existing->invariant != var->invariant) {

+	       linker_error_printf(prog, "declarations for %s `%s' have "

+	                           "mismatching invariant qualifiers\n",

+	                           mode_string(var), var->name);

+	       return false;

+	    }

+            if (existing->centroid != var->centroid) {

+               linker_error_printf(prog, "declarations for %s `%s' have "

+                                   "mismatching centroid qualifiers\n",

+                                   mode_string(var), var->name);

+               return false;

+            }

+	 } else

+	    variables.add_variable(var);

+      }

+   }

+

+   return true;

+}

+

+

+/**

+ * Perform validation of uniforms used across multiple shader stages

+ */

+bool

+cross_validate_uniforms(struct gl_shader_program *prog)

+{

+   return cross_validate_globals(prog, prog->_LinkedShaders,

+				 MESA_SHADER_TYPES, true);

+}

+

+

+/**

+ * Validate that outputs from one stage match inputs of another

+ */

+bool

+cross_validate_outputs_to_inputs(struct gl_shader_program *prog,

+				 gl_shader *producer, gl_shader *consumer)

+{

+   glsl_symbol_table parameters;

+   /* FINISHME: Figure these out dynamically. */

+   const char *const producer_stage = "vertex";

+   const char *const consumer_stage = "fragment";

+

+   /* Find all shader outputs in the "producer" stage.

+    */

+   foreach_list(node, producer->ir) {

+      ir_variable *const var = ((ir_instruction *) node)->as_variable();

+

+      /* FINISHME: For geometry shaders, this should also look for inout

+       * FINISHME: variables.

+       */

+      if ((var == NULL) || (var->mode != ir_var_out))

+	 continue;

+

+      parameters.add_variable(var);

+   }

+

+

+   /* Find all shader inputs in the "consumer" stage.  Any variables that have

+    * matching outputs already in the symbol table must have the same type and

+    * qualifiers.

+    */

+   foreach_list(node, consumer->ir) {

+      ir_variable *const input = ((ir_instruction *) node)->as_variable();

+

+      /* FINISHME: For geometry shaders, this should also look for inout

+       * FINISHME: variables.

+       */

+      if ((input == NULL) || (input->mode != ir_var_in))

+	 continue;

+

+      ir_variable *const output = parameters.get_variable(input->name);

+      if (output != NULL) {

+	 /* Check that the types match between stages.

+	  */

+	 if (input->type != output->type) {

+	    /* There is a bit of a special case for gl_TexCoord.  This

+	     * built-in is unsized by default.  Appliations that variable

+	     * access it must redeclare it with a size.  There is some

+	     * language in the GLSL spec that implies the fragment shader

+	     * and vertex shader do not have to agree on this size.  Other

+	     * driver behave this way, and one or two applications seem to

+	     * rely on it.

+	     *

+	     * Neither declaration needs to be modified here because the array

+	     * sizes are fixed later when update_array_sizes is called.

+	     *

+	     * From page 48 (page 54 of the PDF) of the GLSL 1.10 spec:

+	     *

+	     *     "Unlike user-defined varying variables, the built-in

+	     *     varying variables don't have a strict one-to-one

+	     *     correspondence between the vertex language and the

+	     *     fragment language."

+	     */

+	    if (!output->type->is_array()

+		|| (strncmp("gl_", output->name, 3) != 0)) {

+	       linker_error_printf(prog,

+				   "%s shader output `%s' declared as "

+				   "type `%s', but %s shader input declared "

+				   "as type `%s'\n",

+				   producer_stage, output->name,

+				   output->type->name,

+				   consumer_stage, input->type->name);

+	       return false;

+	    }

+	 }

+

+	 /* Check that all of the qualifiers match between stages.

+	  */

+	 if (input->centroid != output->centroid) {

+	    linker_error_printf(prog,

+				"%s shader output `%s' %s centroid qualifier, "

+				"but %s shader input %s centroid qualifier\n",

+				producer_stage,

+				output->name,

+				(output->centroid) ? "has" : "lacks",

+				consumer_stage,

+				(input->centroid) ? "has" : "lacks");

+	    return false;

+	 }

+

+	 if (input->invariant != output->invariant) {

+	    linker_error_printf(prog,

+				"%s shader output `%s' %s invariant qualifier, "

+				"but %s shader input %s invariant qualifier\n",

+				producer_stage,

+				output->name,

+				(output->invariant) ? "has" : "lacks",

+				consumer_stage,

+				(input->invariant) ? "has" : "lacks");

+	    return false;

+	 }

+

+	 if (input->interpolation != output->interpolation) {

+	    linker_error_printf(prog,

+				"%s shader output `%s' specifies %s "

+				"interpolation qualifier, "

+				"but %s shader input specifies %s "

+				"interpolation qualifier\n",

+				producer_stage,

+				output->name,

+				output->interpolation_string(),

+				consumer_stage,

+				input->interpolation_string());

+	    return false;

+	 }

+      }

+   }

+

+   return true;

+}

+

+

+/**

+ * Populates a shaders symbol table with all global declarations

+ */

+static void

+populate_symbol_table(gl_shader *sh)

+{

+   sh->symbols = new(sh) glsl_symbol_table;

+

+   foreach_list(node, sh->ir) {

+      ir_instruction *const inst = (ir_instruction *) node;

+      ir_variable *var;

+      ir_function *func;

+

+      if ((func = inst->as_function()) != NULL) {

+	 sh->symbols->add_function(func);

+      } else if ((var = inst->as_variable()) != NULL) {

+	 sh->symbols->add_variable(var);

+      }

+   }

+}

+

+

+/**

+ * Remap variables referenced in an instruction tree

+ *

+ * This is used when instruction trees are cloned from one shader and placed in

+ * another.  These trees will contain references to \c ir_variable nodes that

+ * do not exist in the target shader.  This function finds these \c ir_variable

+ * references and replaces the references with matching variables in the target

+ * shader.

+ *

+ * If there is no matching variable in the target shader, a clone of the

+ * \c ir_variable is made and added to the target shader.  The new variable is

+ * added to \b both the instruction stream and the symbol table.

+ *

+ * \param inst         IR tree that is to be processed.

+ * \param symbols      Symbol table containing global scope symbols in the

+ *                     linked shader.

+ * \param instructions Instruction stream where new variable declarations

+ *                     should be added.

+ */

+void

+remap_variables(ir_instruction *inst, struct gl_shader *target,

+		hash_table *temps)

+{

+   class remap_visitor : public ir_hierarchical_visitor {

+   public:

+	 remap_visitor(struct gl_shader *target,

+		    hash_table *temps)

+      {

+	 this->target = target;

+	 this->symbols = target->symbols;

+	 this->instructions = target->ir;

+	 this->temps = temps;

+      }

+

+      virtual ir_visitor_status visit(ir_dereference_variable *ir)

+      {

+	 if (ir->var->mode == ir_var_temporary) {

+	    ir_variable *var = (ir_variable *) hash_table_find(temps, ir->var);

+

+	    assert(var != NULL);

+	    ir->var = var;

+	    return visit_continue;

+	 }

+

+	 ir_variable *const existing =

+	    this->symbols->get_variable(ir->var->name);

+	 if (existing != NULL)

+	    ir->var = existing;

+	 else {

+	    ir_variable *copy = ir->var->clone(this->target, NULL);

+

+	    this->symbols->add_variable(copy);

+	    this->instructions->push_head(copy);

+	    ir->var = copy;

+	 }

+

+	 return visit_continue;

+      }

+

+   private:

+      struct gl_shader *target;

+      glsl_symbol_table *symbols;

+      exec_list *instructions;

+      hash_table *temps;

+   };

+

+   remap_visitor v(target, temps);

+

+   inst->accept(&v);

+}

+

+

+/**

+ * Move non-declarations from one instruction stream to another

+ *

+ * The intended usage pattern of this function is to pass the pointer to the

+ * head sentinel of a list (i.e., a pointer to the list cast to an \c exec_node

+ * pointer) for \c last and \c false for \c make_copies on the first

+ * call.  Successive calls pass the return value of the previous call for

+ * \c last and \c true for \c make_copies.

+ *

+ * \param instructions Source instruction stream

+ * \param last         Instruction after which new instructions should be

+ *                     inserted in the target instruction stream

+ * \param make_copies  Flag selecting whether instructions in \c instructions

+ *                     should be copied (via \c ir_instruction::clone) into the

+ *                     target list or moved.

+ *

+ * \return

+ * The new "last" instruction in the target instruction stream.  This pointer

+ * is suitable for use as the \c last parameter of a later call to this

+ * function.

+ */

+exec_node *

+move_non_declarations(exec_list *instructions, exec_node *last,

+		      bool make_copies, gl_shader *target)

+{

+   hash_table *temps = NULL;

+

+   if (make_copies)

+      temps = hash_table_ctor(0, hash_table_pointer_hash,

+			      hash_table_pointer_compare);

+

+   foreach_list_safe(node, instructions) {

+      ir_instruction *inst = (ir_instruction *) node;

+

+      if (inst->as_function())

+	 continue;

+

+      ir_variable *var = inst->as_variable();

+      if ((var != NULL) && (var->mode != ir_var_temporary))

+	 continue;

+

+      assert(inst->as_assignment()

+	     || ((var != NULL) && (var->mode == ir_var_temporary)));

+

+      if (make_copies) {

+	 inst = inst->clone(target, NULL);

+

+	 if (var != NULL)

+	    hash_table_insert(temps, inst, var);

+	 else

+	    remap_variables(inst, target, temps);

+      } else {

+	 inst->remove();

+      }

+

+      last->insert_after(inst);

+      last = inst;

+   }

+

+   if (make_copies)

+      hash_table_dtor(temps);

+

+   return last;

+}

+

+/**

+ * Get the function signature for main from a shader

+ */

+static ir_function_signature *

+get_main_function_signature(gl_shader *sh)

+{

+   ir_function *const f = sh->symbols->get_function("main");

+   if (f != NULL) {

+      exec_list void_parameters;

+

+      /* Look for the 'void main()' signature and ensure that it's defined.

+       * This keeps the linker from accidentally pick a shader that just

+       * contains a prototype for main.

+       *

+       * We don't have to check for multiple definitions of main (in multiple

+       * shaders) because that would have already been caught above.

+       */

+      ir_function_signature *sig = f->matching_signature(&void_parameters);

+      if ((sig != NULL) && sig->is_defined) {

+	 return sig;

+      }

+   }

+

+   return NULL;

+}

+

+

+/**

+ * Combine a group of shaders for a single stage to generate a linked shader

+ *

+ * \note

+ * If this function is supplied a single shader, it is cloned, and the new

+ * shader is returned.

+ */

+static struct gl_shader *

+link_intrastage_shaders(void *mem_ctx,

+			struct gl_context *ctx,

+			struct gl_shader_program *prog,

+			struct gl_shader **shader_list,

+			unsigned num_shaders)

+{

+   /* Check that global variables defined in multiple shaders are consistent.

+    */

+   if (!cross_validate_globals(prog, shader_list, num_shaders, false))

+      return NULL;

+

+   /* Check that there is only a single definition of each function signature

+    * across all shaders.

+    */

+   for (unsigned i = 0; i < (num_shaders - 1); i++) {

+      foreach_list(node, shader_list[i]->ir) {

+	 ir_function *const f = ((ir_instruction *) node)->as_function();

+

+	 if (f == NULL)

+	    continue;

+

+	 for (unsigned j = i + 1; j < num_shaders; j++) {

+	    ir_function *const other =

+	       shader_list[j]->symbols->get_function(f->name);

+

+	    /* If the other shader has no function (and therefore no function

+	     * signatures) with the same name, skip to the next shader.

+	     */

+	    if (other == NULL)

+	       continue;

+

+	    foreach_iter (exec_list_iterator, iter, *f) {

+	       ir_function_signature *sig =

+		  (ir_function_signature *) iter.get();

+

+	       if (!sig->is_defined || sig->is_builtin)

+		  continue;

+

+	       ir_function_signature *other_sig =

+		  other->exact_matching_signature(& sig->parameters);

+

+	       if ((other_sig != NULL) && other_sig->is_defined

+		   && !other_sig->is_builtin) {

+		  linker_error_printf(prog,

+				      "function `%s' is multiply defined",

+				      f->name);

+		  return NULL;

+	       }

+	    }

+	 }

+      }

+   }

+

+   /* Find the shader that defines main, and make a clone of it.

+    *

+    * Starting with the clone, search for undefined references.  If one is

+    * found, find the shader that defines it.  Clone the reference and add

+    * it to the shader.  Repeat until there are no undefined references or

+    * until a reference cannot be resolved.

+    */

+   gl_shader *main = NULL;

+   for (unsigned i = 0; i < num_shaders; i++) {

+      if (get_main_function_signature(shader_list[i]) != NULL) {

+	 main = shader_list[i];

+	 break;

+      }

+   }

+

+   if (main == NULL) {

+      linker_error_printf(prog, "%s shader lacks `main'\n",

+			  (shader_list[0]->Type == GL_VERTEX_SHADER)

+			  ? "vertex" : "fragment");

+      return NULL;

+   }

+

+   gl_shader *linked = ctx->Driver.NewShader(NULL, 0, main->Type);

+   linked->ir = new(linked) exec_list;

+   clone_ir_list(mem_ctx, linked->ir, main->ir);

+

+   populate_symbol_table(linked);

+

+   /* The a pointer to the main function in the final linked shader (i.e., the

+    * copy of the original shader that contained the main function).

+    */

+   ir_function_signature *const main_sig = get_main_function_signature(linked);

+

+   /* Move any instructions other than variable declarations or function

+    * declarations into main.

+    */

+   exec_node *insertion_point =

+      move_non_declarations(linked->ir, (exec_node *) &main_sig->body, false,

+			    linked);

+

+   for (unsigned i = 0; i < num_shaders; i++) {

+      if (shader_list[i] == main)

+	 continue;

+

+      insertion_point = move_non_declarations(shader_list[i]->ir,

+					      insertion_point, true, linked);

+   }

+

+   /* Resolve initializers for global variables in the linked shader.

+    */

+   unsigned num_linking_shaders = num_shaders;

+   for (unsigned i = 0; i < num_shaders; i++)

+      num_linking_shaders += shader_list[i]->num_builtins_to_link;

+

+   gl_shader **linking_shaders =

+      (gl_shader **) calloc(num_linking_shaders, sizeof(gl_shader *));

+

+   memcpy(linking_shaders, shader_list,

+	  sizeof(linking_shaders[0]) * num_shaders);

+

+   unsigned idx = num_shaders;

+   for (unsigned i = 0; i < num_shaders; i++) {

+      memcpy(&linking_shaders[idx], shader_list[i]->builtins_to_link,

+	     sizeof(linking_shaders[0]) * shader_list[i]->num_builtins_to_link);

+      idx += shader_list[i]->num_builtins_to_link;

+   }

+

+   assert(idx == num_linking_shaders);

+

+   if (!link_function_calls(prog, linked, linking_shaders,

+			    num_linking_shaders)) {

+      ctx->Driver.DeleteShader(ctx, linked);

+      linked = NULL;

+   }

+

+   free(linking_shaders);

+

+   /* Make a pass over all variable declarations to ensure that arrays with

+    * unspecified sizes have a size specified.  The size is inferred from the

+    * max_array_access field.

+    */

+   if (linked != NULL) {

+      class array_sizing_visitor : public ir_hierarchical_visitor {

+      public:

+	 virtual ir_visitor_status visit(ir_variable *var)

+	 {

+	    if (var->type->is_array() && (var->type->length == 0)) {

+	       const glsl_type *type =

+		  glsl_type::get_array_instance(var->type->fields.array,

+						var->max_array_access + 1);

+

+	       assert(type != NULL);

+	       var->type = type;

+	    }

+

+	    return visit_continue;

+	 }

+      } v;

+

+      v.run(linked->ir);

+   }

+

+   return linked;

+}

+

+

+struct uniform_node {

+   exec_node link;

+   struct gl_uniform *u;

+   unsigned slots;

+};

+

+/**

+ * Update the sizes of linked shader uniform arrays to the maximum

+ * array index used.

+ *

+ * From page 81 (page 95 of the PDF) of the OpenGL 2.1 spec:

+ *

+ *     If one or more elements of an array are active,

+ *     GetActiveUniform will return the name of the array in name,

+ *     subject to the restrictions listed above. The type of the array

+ *     is returned in type. The size parameter contains the highest

+ *     array element index used, plus one. The compiler or linker

+ *     determines the highest index used.  There will be only one

+ *     active uniform reported by the GL per uniform array.

+

+ */

+static void

+update_array_sizes(struct gl_shader_program *prog)

+{

+   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) {

+	 if (prog->_LinkedShaders[i] == NULL)

+	    continue;

+

+      foreach_list(node, prog->_LinkedShaders[i]->ir) {

+	 ir_variable *const var = ((ir_instruction *) node)->as_variable();

+

+	 if ((var == NULL) || (var->mode != ir_var_uniform &&

+			       var->mode != ir_var_in &&

+			       var->mode != ir_var_out) ||

+	     !var->type->is_array())

+	    continue;

+

+	 unsigned int size = var->max_array_access;

+	 for (unsigned j = 0; j < MESA_SHADER_TYPES; j++) {

+	       if (prog->_LinkedShaders[j] == NULL)

+		  continue;

+

+	    foreach_list(node2, prog->_LinkedShaders[j]->ir) {

+	       ir_variable *other_var = ((ir_instruction *) node2)->as_variable();

+	       if (!other_var)

+		  continue;

+

+	       if (strcmp(var->name, other_var->name) == 0 &&

+		   other_var->max_array_access > size) {

+		  size = other_var->max_array_access;

+	       }

+	    }

+	 }

+

+	 if (size + 1 != var->type->fields.array->length) {

+	    /* If this is a built-in uniform (i.e., it's backed by some

+	     * fixed-function state), adjust the number of state slots to

+	     * match the new array size.  The number of slots per array entry

+	     * is not known.  It seems saft to assume that the total number of

+	     * slots is an integer multiple of the number of array elements.

+	     * Determine the number of slots per array element by dividing by

+	     * the old (total) size.

+	     */

+	    if (var->num_state_slots > 0) {

+	       var->num_state_slots = (size + 1)

+		  * (var->num_state_slots / var->type->length);

+	    }

+

+	    var->type = glsl_type::get_array_instance(var->type->fields.array,

+						      size + 1);

+	    /* FINISHME: We should update the types of array

+	     * dereferences of this variable now.

+	     */

+	 }

+      }

+   }

+}

+

+static void

+add_uniform(void *mem_ctx, exec_list *uniforms, struct hash_table *ht,

+	    const char *name, const glsl_type *type, GLenum shader_type,

+	    unsigned *next_shader_pos, unsigned *total_uniforms)

+{

+   if (type->is_record()) {

+      for (unsigned int i = 0; i < type->length; i++) {

+	 const glsl_type *field_type = type->fields.structure[i].type;

+	 char *field_name = ralloc_asprintf(mem_ctx, "%s.%s", name,

+					    type->fields.structure[i].name);

+

+	 add_uniform(mem_ctx, uniforms, ht, field_name, field_type,

+		     shader_type, next_shader_pos, total_uniforms);

+      }

+   } else {

+      uniform_node *n = (uniform_node *) hash_table_find(ht, name);

+      unsigned int vec4_slots;

+      const glsl_type *array_elem_type = NULL;

+

+      if (type->is_array()) {

+	 array_elem_type = type->fields.array;

+	 /* Array of structures. */

+	 if (array_elem_type->is_record()) {

+	    for (unsigned int i = 0; i < type->length; i++) {

+	       char *elem_name = ralloc_asprintf(mem_ctx, "%s[%d]", name, i);

+	       add_uniform(mem_ctx, uniforms, ht, elem_name, array_elem_type,

+			   shader_type, next_shader_pos, total_uniforms);

+	    }

+	    return;

+	 }

+      }

+

+      /* Fix the storage size of samplers at 1 vec4 each. Be sure to pad out

+       * vectors to vec4 slots.

+       */

+      if (type->is_array()) {

+	 if (array_elem_type->is_sampler())

+	    vec4_slots = type->length;

+	 else

+	    vec4_slots = type->length * array_elem_type->matrix_columns;

+      } else if (type->is_sampler()) {

+	 vec4_slots = 1;

+      } else {

+	 vec4_slots = type->matrix_columns;

+      }

+

+      if (n == NULL) {

+	 n = (uniform_node *) calloc(1, sizeof(struct uniform_node));

+	 n->u = (gl_uniform *) calloc(1, sizeof(struct gl_uniform));

+	 n->slots = vec4_slots;

+

+	 n->u->Name = strdup(name);

+	 n->u->Type = type;

+	 n->u->VertPos = -1;

+	 n->u->FragPos = -1;

+	 n->u->GeomPos = -1;

+	 (*total_uniforms)++;

+

+	 hash_table_insert(ht, n, name);

+	 uniforms->push_tail(& n->link);

+      }

+

+      switch (shader_type) {

+      case GL_VERTEX_SHADER:

+	 n->u->VertPos = *next_shader_pos;

+	 break;

+      case GL_FRAGMENT_SHADER:

+	 n->u->FragPos = *next_shader_pos;

+	 break;

+      case GL_GEOMETRY_SHADER:

+	 n->u->GeomPos = *next_shader_pos;

+	 break;

+      }

+

+      (*next_shader_pos) += vec4_slots;

+   }

+}

+

+void

+assign_uniform_locations(struct gl_shader_program *prog)

+{

+   /* */

+   exec_list uniforms;

+   unsigned total_uniforms = 0;

+   hash_table *ht = hash_table_ctor(32, hash_table_string_hash,

+				    hash_table_string_compare);

+   void *mem_ctx = ralloc_context(NULL);

+

+   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) {

+      if (prog->_LinkedShaders[i] == NULL)

+	 continue;

+

+      unsigned next_position = 0;

+

+      foreach_list(node, prog->_LinkedShaders[i]->ir) {

+	 ir_variable *const var = ((ir_instruction *) node)->as_variable();

+

+	 if ((var == NULL) || (var->mode != ir_var_uniform))

+	    continue;

+

+	 if (strncmp(var->name, "gl_", 3) == 0) {

+	    /* At the moment, we don't allocate uniform locations for

+	     * builtin uniforms.  It's permitted by spec, and we'll

+	     * likely switch to doing that at some point, but not yet.

+	     */

+	    continue;

+	 }

+

+	 var->location = next_position;

+	 add_uniform(mem_ctx, &uniforms, ht, var->name, var->type,

+		     prog->_LinkedShaders[i]->Type,

+		     &next_position, &total_uniforms);

+      }

+   }

+

+   ralloc_free(mem_ctx);

+

+   gl_uniform_list *ul = (gl_uniform_list *)

+      calloc(1, sizeof(gl_uniform_list));

+

+   ul->Size = total_uniforms;

+   ul->NumUniforms = total_uniforms;

+   ul->Uniforms = (gl_uniform *) calloc(total_uniforms, sizeof(gl_uniform));

+

+   unsigned idx = 0;

+   uniform_node *next;

+   for (uniform_node *node = (uniform_node *) uniforms.head

+	   ; node->link.next != NULL

+	   ; node = next) {

+      next = (uniform_node *) node->link.next;

+

+      node->link.remove();

+      memcpy(&ul->Uniforms[idx], node->u, sizeof(gl_uniform));

+      idx++;

+

+      free(node->u);

+      free(node);

+   }

+

+   hash_table_dtor(ht);

+

+   prog->Uniforms = ul;

+}

+

+

+/**

+ * Find a contiguous set of available bits in a bitmask

+ *

+ * \param used_mask     Bits representing used (1) and unused (0) locations

+ * \param needed_count  Number of contiguous bits needed.

+ *

+ * \return

+ * Base location of the available bits on success or -1 on failure.

+ */

+int

+find_available_slots(unsigned used_mask, unsigned needed_count)

+{

+   unsigned needed_mask = (1 << needed_count) - 1;

+   const int max_bit_to_test = (8 * sizeof(used_mask)) - needed_count;

+

+   /* The comparison to 32 is redundant, but without it GCC emits "warning:

+    * cannot optimize possibly infinite loops" for the loop below.

+    */

+   if ((needed_count == 0) || (max_bit_to_test < 0) || (max_bit_to_test > 32))

+      return -1;

+

+   for (int i = 0; i <= max_bit_to_test; i++) {

+      if ((needed_mask & ~used_mask) == needed_mask)

+	 return i;

+

+      needed_mask <<= 1;

+   }

+

+   return -1;

+}

+

+

+bool

+assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index)

+{

+   /* Mark invalid attribute locations as being used.

+    */

+   unsigned used_locations = (max_attribute_index >= 32)

+      ? ~0 : ~((1 << max_attribute_index) - 1);

+

+   gl_shader *const sh = prog->_LinkedShaders[0];

+   assert(sh->Type == GL_VERTEX_SHADER);

+

+   /* Operate in a total of four passes.

+    *

+    * 1. Invalidate the location assignments for all vertex shader inputs.

+    *

+    * 2. Assign locations for inputs that have user-defined (via

+    *    glBindVertexAttribLocation) locatoins.

+    *

+    * 3. Sort the attributes without assigned locations by number of slots

+    *    required in decreasing order.  Fragmentation caused by attribute

+    *    locations assigned by the application may prevent large attributes

+    *    from having enough contiguous space.

+    *

+    * 4. Assign locations to any inputs without assigned locations.

+    */

+

+   invalidate_variable_locations(sh, ir_var_in, VERT_ATTRIB_GENERIC0);

+

+   if (prog->Attributes != NULL) {

+      for (unsigned i = 0; i < prog->Attributes->NumParameters; i++) {

+	 ir_variable *const var =

+	    sh->symbols->get_variable(prog->Attributes->Parameters[i].Name);

+

+	 /* Note: attributes that occupy multiple slots, such as arrays or

+	  * matrices, may appear in the attrib array multiple times.

+	  */

+	 if ((var == NULL) || (var->location != -1))

+	    continue;

+

+	 /* From page 61 of the OpenGL 4.0 spec:

+	  *

+	  *     "LinkProgram will fail if the attribute bindings assigned by

+	  *     BindAttribLocation do not leave not enough space to assign a

+	  *     location for an active matrix attribute or an active attribute

+	  *     array, both of which require multiple contiguous generic

+	  *     attributes."

+	  *

+	  * Previous versions of the spec contain similar language but omit the

+	  * bit about attribute arrays.

+	  *

+	  * Page 61 of the OpenGL 4.0 spec also says:

+	  *

+	  *     "It is possible for an application to bind more than one

+	  *     attribute name to the same location. This is referred to as

+	  *     aliasing. This will only work if only one of the aliased

+	  *     attributes is active in the executable program, or if no path

+	  *     through the shader consumes more than one attribute of a set

+	  *     of attributes aliased to the same location. A link error can

+	  *     occur if the linker determines that every path through the

+	  *     shader consumes multiple aliased attributes, but

+	  *     implementations are not required to generate an error in this

+	  *     case."

+	  *

+	  * These two paragraphs are either somewhat contradictory, or I don't

+	  * fully understand one or both of them.

+	  */

+	 /* FINISHME: The code as currently written does not support attribute

+	  * FINISHME: location aliasing (see comment above).

+	  */

+	 const int attr = prog->Attributes->Parameters[i].StateIndexes[0];

+	 const unsigned slots = count_attribute_slots(var->type);

+

+	 /* Mask representing the contiguous slots that will be used by this

+	  * attribute.

+	  */

+	 const unsigned use_mask = (1 << slots) - 1;

+

+	 /* Generate a link error if the set of bits requested for this

+	  * attribute overlaps any previously allocated bits.

+	  */

+	 if ((~(use_mask << attr) & used_locations) != used_locations) {

+	    linker_error_printf(prog,

+				"insufficient contiguous attribute locations "

+				"available for vertex shader input `%s'",

+				var->name);

+	    return false;

+	 }

+

+	 var->location = VERT_ATTRIB_GENERIC0 + attr;

+	 used_locations |= (use_mask << attr);

+      }

+   }

+

+   /* Temporary storage for the set of attributes that need locations assigned.

+    */

+   struct temp_attr {

+      unsigned slots;

+      ir_variable *var;

+

+      /* Used below in the call to qsort. */

+      static int compare(const void *a, const void *b)

+      {

+	 const temp_attr *const l = (const temp_attr *) a;

+	 const temp_attr *const r = (const temp_attr *) b;

+

+	 /* Reversed because we want a descending order sort below. */

+	 return r->slots - l->slots;

+      }

+   } to_assign[16];

+

+   unsigned num_attr = 0;

+

+   foreach_list(node, sh->ir) {

+      ir_variable *const var = ((ir_instruction *) node)->as_variable();

+

+      if ((var == NULL) || (var->mode != ir_var_in))

+	 continue;

+

+      if (var->explicit_location) {

+	 const unsigned slots = count_attribute_slots(var->type);

+	 const unsigned use_mask = (1 << slots) - 1;

+	 const int attr = var->location - VERT_ATTRIB_GENERIC0;

+

+	 if ((var->location >= (int)(max_attribute_index + VERT_ATTRIB_GENERIC0))

+	     || (var->location < 0)) {

+	    linker_error_printf(prog,

+				"invalid explicit location %d specified for "

+				"`%s'\n",

+				(var->location < 0) ? var->location : attr,

+				var->name);

+	    return false;

+	 } else if (var->location >= VERT_ATTRIB_GENERIC0) {

+	    used_locations |= (use_mask << attr);

+	 }

+      }

+

+      /* The location was explicitly assigned, nothing to do here.

+       */

+      if (var->location != -1)

+	 continue;

+

+      to_assign[num_attr].slots = count_attribute_slots(var->type);

+      to_assign[num_attr].var = var;

+      num_attr++;

+   }

+

+   /* If all of the attributes were assigned locations by the application (or

+    * are built-in attributes with fixed locations), return early.  This should

+    * be the common case.

+    */

+   if (num_attr == 0)

+      return true;

+

+   qsort(to_assign, num_attr, sizeof(to_assign[0]), temp_attr::compare);

+

+   /* VERT_ATTRIB_GENERIC0 is a psdueo-alias for VERT_ATTRIB_POS.  It can only

+    * be explicitly assigned by via glBindAttribLocation.  Mark it as reserved

+    * to prevent it from being automatically allocated below.

+    */

+   find_deref_visitor find("gl_Vertex");

+   find.run(sh->ir);

+   if (find.variable_found())

+      used_locations |= (1 << 0);

+

+   for (unsigned i = 0; i < num_attr; i++) {

+      /* Mask representing the contiguous slots that will be used by this

+       * attribute.

+       */

+      const unsigned use_mask = (1 << to_assign[i].slots) - 1;

+

+      int location = find_available_slots(used_locations, to_assign[i].slots);

+

+      if (location < 0) {

+	 linker_error_printf(prog,

+			     "insufficient contiguous attribute locations "

+			     "available for vertex shader input `%s'",

+			     to_assign[i].var->name);

+	 return false;

+      }

+

+      to_assign[i].var->location = VERT_ATTRIB_GENERIC0 + location;

+      used_locations |= (use_mask << location);

+   }

+

+   return true;

+}

+

+

+/**

+ * Demote shader inputs and outputs that are not used in other stages

+ */

+void

+demote_shader_inputs_and_outputs(gl_shader *sh, enum ir_variable_mode mode)

+{

+   foreach_list(node, sh->ir) {

+      ir_variable *const var = ((ir_instruction *) node)->as_variable();

+

+      if ((var == NULL) || (var->mode != int(mode)))

+	 continue;

+

+      /* A shader 'in' or 'out' variable is only really an input or output if

+       * its value is used by other shader stages.  This will cause the variable

+       * to have a location assigned.

+       */

+      if (var->location == -1) {

+	 var->mode = ir_var_auto;

+      }

+   }

+}

+

+

+void

+assign_varying_locations(struct gl_shader_program *prog,

+			 gl_shader *producer, gl_shader *consumer)

+{

+   /* FINISHME: Set dynamically when geometry shader support is added. */

+   unsigned output_index = VERT_RESULT_VAR0;

+   unsigned input_index = FRAG_ATTRIB_VAR0;

+

+   /* Operate in a total of three passes.

+    *

+    * 1. Assign locations for any matching inputs and outputs.

+    *

+    * 2. Mark output variables in the producer that do not have locations as

+    *    not being outputs.  This lets the optimizer eliminate them.

+    *

+    * 3. Mark input variables in the consumer that do not have locations as

+    *    not being inputs.  This lets the optimizer eliminate them.

+    */

+

+   invalidate_variable_locations(producer, ir_var_out, VERT_RESULT_VAR0);

+   invalidate_variable_locations(consumer, ir_var_in, FRAG_ATTRIB_VAR0);

+

+   foreach_list(node, producer->ir) {

+      ir_variable *const output_var = ((ir_instruction *) node)->as_variable();

+

+      if ((output_var == NULL) || (output_var->mode != ir_var_out)

+	  || (output_var->location != -1))

+	 continue;

+

+      ir_variable *const input_var =

+	 consumer->symbols->get_variable(output_var->name);

+

+      if ((input_var == NULL) || (input_var->mode != ir_var_in))

+	 continue;

+

+      assert(input_var->location == -1);

+

+      output_var->location = output_index;

+      input_var->location = input_index;

+

+      /* FINISHME: Support for "varying" records in GLSL 1.50. */

+      assert(!output_var->type->is_record());

+

+      if (output_var->type->is_array()) {

+	 const unsigned slots = output_var->type->length

+	    * output_var->type->fields.array->matrix_columns;

+

+	 output_index += slots;

+	 input_index += slots;

+      } else {

+	 const unsigned slots = output_var->type->matrix_columns;

+

+	 output_index += slots;

+	 input_index += slots;

+      }

+   }

+

+   foreach_list(node, consumer->ir) {

+      ir_variable *const var = ((ir_instruction *) node)->as_variable();

+

+      if ((var == NULL) || (var->mode != ir_var_in))

+	 continue;

+

+      if (var->location == -1) {

+	 if (prog->Version <= 120) {

+	    /* On page 25 (page 31 of the PDF) of the GLSL 1.20 spec:

+	     *

+	     *     Only those varying variables used (i.e. read) in

+	     *     the fragment shader executable must be written to

+	     *     by the vertex shader executable; declaring

+	     *     superfluous varying variables in a vertex shader is

+	     *     permissible.

+	     *

+	     * We interpret this text as meaning that the VS must

+	     * write the variable for the FS to read it.  See

+	     * "glsl1-varying read but not written" in piglit.

+	     */

+

+	    linker_error_printf(prog, "fragment shader varying %s not written "

+				"by vertex shader\n.", var->name);

+	    prog->LinkStatus = false;

+	 }

+

+	 /* An 'in' variable is only really a shader input if its

+	  * value is written by the previous stage.

+	  */

+	 var->mode = ir_var_auto;

+      }

+   }

+}

+

+

+void

+link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)

+{

+   void *mem_ctx = ralloc_context(NULL); // temporary linker context

+

+   prog->LinkStatus = false;

+   prog->Validated = false;

+   prog->_Used = false;

+

+   if (prog->InfoLog != NULL)

+      ralloc_free(prog->InfoLog);

+

+   prog->InfoLog = ralloc_strdup(NULL, "");

+

+   /* Separate the shaders into groups based on their type.

+    */

+   struct gl_shader **vert_shader_list;

+   unsigned num_vert_shaders = 0;

+   struct gl_shader **frag_shader_list;

+   unsigned num_frag_shaders = 0;

+

+   vert_shader_list = (struct gl_shader **)

+      calloc(2 * prog->NumShaders, sizeof(struct gl_shader *));

+   frag_shader_list =  &vert_shader_list[prog->NumShaders];

+

+   unsigned min_version = UINT_MAX;

+   unsigned max_version = 0;

+   for (unsigned i = 0; i < prog->NumShaders; i++) {

+      min_version = MIN2(min_version, prog->Shaders[i]->Version);

+      max_version = MAX2(max_version, prog->Shaders[i]->Version);

+

+      switch (prog->Shaders[i]->Type) {

+      case GL_VERTEX_SHADER:

+	 vert_shader_list[num_vert_shaders] = prog->Shaders[i];

+	 num_vert_shaders++;

+	 break;

+      case GL_FRAGMENT_SHADER:

+	 frag_shader_list[num_frag_shaders] = prog->Shaders[i];

+	 num_frag_shaders++;

+	 break;

+      case GL_GEOMETRY_SHADER:

+	 /* FINISHME: Support geometry shaders. */

+	 assert(prog->Shaders[i]->Type != GL_GEOMETRY_SHADER);

+	 break;

+      }

+   }

+

+   /* Previous to GLSL version 1.30, different compilation units could mix and

+    * match shading language versions.  With GLSL 1.30 and later, the versions

+    * of all shaders must match.

+    */

+   assert(min_version >= 100);

+   assert(max_version <= 130);

+   if ((max_version >= 130 || min_version == 100)

+       && min_version != max_version) {

+      linker_error_printf(prog, "all shaders must use same shading "

+			  "language version\n");

+      goto done;

+   }

+

+   prog->Version = max_version;

+

+   for (unsigned int i = 0; i < MESA_SHADER_TYPES; i++) {

+      if (prog->_LinkedShaders[i] != NULL)

+	 ctx->Driver.DeleteShader(ctx, prog->_LinkedShaders[i]);

+

+      prog->_LinkedShaders[i] = NULL;

+   }

+

+   /* Link all shaders for a particular stage and validate the result.

+    */

+   if (num_vert_shaders > 0) {

+      gl_shader *const sh =

+	 link_intrastage_shaders(mem_ctx, ctx, prog, vert_shader_list,

+				 num_vert_shaders);

+

+      if (sh == NULL)

+	 goto done;

+

+      if (!validate_vertex_shader_executable(prog, sh))

+	 goto done;

+

+      _mesa_reference_shader(ctx, &prog->_LinkedShaders[MESA_SHADER_VERTEX],

+			     sh);

+   }

+

+   if (num_frag_shaders > 0) {

+      gl_shader *const sh =

+	 link_intrastage_shaders(mem_ctx, ctx, prog, frag_shader_list,

+				 num_frag_shaders);

+

+      if (sh == NULL)

+	 goto done;

+

+      if (!validate_fragment_shader_executable(prog, sh))

+	 goto done;

+

+      _mesa_reference_shader(ctx, &prog->_LinkedShaders[MESA_SHADER_FRAGMENT],

+			     sh);

+   }

+

+   /* Here begins the inter-stage linking phase.  Some initial validation is

+    * performed, then locations are assigned for uniforms, attributes, and

+    * varyings.

+    */

+   if (cross_validate_uniforms(prog)) {

+      unsigned prev;

+

+      for (prev = 0; prev < MESA_SHADER_TYPES; prev++) {

+	 if (prog->_LinkedShaders[prev] != NULL)

+	    break;

+      }

+

+      /* Validate the inputs of each stage with the output of the preceeding

+       * stage.

+       */

+      for (unsigned i = prev + 1; i < MESA_SHADER_TYPES; i++) {

+	 if (prog->_LinkedShaders[i] == NULL)

+	    continue;

+

+	 if (!cross_validate_outputs_to_inputs(prog,

+					       prog->_LinkedShaders[prev],

+					       prog->_LinkedShaders[i]))

+	    goto done;

+

+	 prev = i;

+      }

+

+      prog->LinkStatus = true;

+   }

+

+   /* Do common optimization before assigning storage for attributes,

+    * uniforms, and varyings.  Later optimization could possibly make

+    * some of that unused.

+    */

+   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) {

+      if (prog->_LinkedShaders[i] == NULL)

+	 continue;

+

+      while (do_common_optimization(prog->_LinkedShaders[i]->ir, true, 32))

+	 ;

+   }

+

+   update_array_sizes(prog);

+

+   assign_uniform_locations(prog);

+

+   if (prog->_LinkedShaders[MESA_SHADER_VERTEX] != NULL) {

+      /* FINISHME: The value of the max_attribute_index parameter is

+       * FINISHME: implementation dependent based on the value of

+       * FINISHME: GL_MAX_VERTEX_ATTRIBS.  GL_MAX_VERTEX_ATTRIBS must be

+       * FINISHME: at least 16, so hardcode 16 for now.

+       */

+      if (!assign_attribute_locations(prog, 16)) {

+	 prog->LinkStatus = false;

+	 goto done;

+      }

+   }

+

+   unsigned prev;

+   for (prev = 0; prev < MESA_SHADER_TYPES; prev++) {

+      if (prog->_LinkedShaders[prev] != NULL)

+	 break;

+   }

+

+   for (unsigned i = prev + 1; i < MESA_SHADER_TYPES; i++) {

+      if (prog->_LinkedShaders[i] == NULL)

+	 continue;

+

+      assign_varying_locations(prog,

+			       prog->_LinkedShaders[prev],

+			       prog->_LinkedShaders[i]);

+      prev = i;

+   }

+

+   if (prog->_LinkedShaders[MESA_SHADER_VERTEX] != NULL) {

+      demote_shader_inputs_and_outputs(prog->_LinkedShaders[MESA_SHADER_VERTEX],

+				       ir_var_out);

+   }

+

+   if (prog->_LinkedShaders[MESA_SHADER_GEOMETRY] != NULL) {

+      gl_shader *const sh = prog->_LinkedShaders[MESA_SHADER_GEOMETRY];

+

+      demote_shader_inputs_and_outputs(sh, ir_var_in);

+      demote_shader_inputs_and_outputs(sh, ir_var_inout);

+      demote_shader_inputs_and_outputs(sh, ir_var_out);

+   }

+

+   if (prog->_LinkedShaders[MESA_SHADER_FRAGMENT] != NULL) {

+      gl_shader *const sh = prog->_LinkedShaders[MESA_SHADER_FRAGMENT];

+

+      demote_shader_inputs_and_outputs(sh, ir_var_in);

+   }

+

+   /* OpenGL ES requires that a vertex shader and a fragment shader both be

+    * present in a linked program.  By checking for use of shading language

+    * version 1.00, we also catch the GL_ARB_ES2_compatibility case.

+    */

+   if (ctx->API == API_OPENGLES2 || prog->Version == 100) {

+      if (prog->_LinkedShaders[MESA_SHADER_VERTEX] == NULL) {

+	 linker_error_printf(prog, "program lacks a vertex shader\n");

+	 prog->LinkStatus = false;

+      } else if (prog->_LinkedShaders[MESA_SHADER_FRAGMENT] == NULL) {

+	 linker_error_printf(prog, "program lacks a fragment shader\n");

+	 prog->LinkStatus = false;

+      }

+   }

+

+   /* FINISHME: Assign fragment shader output locations. */

+

+done:

+   free(vert_shader_list);

+

+   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) {

+      if (prog->_LinkedShaders[i] == NULL)

+	 continue;

+

+      /* Retain any live IR, but trash the rest. */

+      reparent_ir(prog->_LinkedShaders[i]->ir, prog->_LinkedShaders[i]->ir);

+   }

+

+   ralloc_free(mem_ctx);

+}

diff --git a/mesalib/src/glsl/list.h b/mesalib/src/glsl/list.h
index 1d46365fa..fb6f0fbba 100644
--- a/mesalib/src/glsl/list.h
+++ b/mesalib/src/glsl/list.h
@@ -90,6 +90,10 @@ struct exec_node {
 
    /* If the user *does* call delete, that's OK, we will just
     * ralloc_free in that case. */
+   static void operator delete(void *node, void *ctx)
+   {
+      ralloc_free(node);
+   }
    static void operator delete(void *node)
    {
       ralloc_free(node);
@@ -299,6 +303,10 @@ struct exec_list {
 
    /* If the user *does* call delete, that's OK, we will just
     * ralloc_free in that case. */
+   static void operator delete(void *node, void *ctx)
+   {
+      ralloc_free(node);
+   }
    static void operator delete(void *node)
    {
       ralloc_free(node);
diff --git a/mesalib/src/glsl/loop_controls.cpp b/mesalib/src/glsl/loop_controls.cpp
index 9acbadc50..9b77ef460 100644
--- a/mesalib/src/glsl/loop_controls.cpp
+++ b/mesalib/src/glsl/loop_controls.cpp
@@ -1,304 +1,304 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#include <limits.h>
-#include "main/compiler.h"
-#include "glsl_types.h"
-#include "loop_analysis.h"
-#include "ir_hierarchical_visitor.h"
-
-/**
- * Find an initializer of a variable outside a loop
- *
- * Works backwards from the loop to find the pre-loop value of the variable.
- * This is used, for example, to find the initial value of loop induction
- * variables.
- *
- * \param loop  Loop where \c var is an induction variable
- * \param var   Variable whose initializer is to be found
- *
- * \return
- * The \c ir_rvalue assigned to the variable outside the loop.  May return
- * \c NULL if no initializer can be found.
- */
-ir_rvalue *
-find_initial_value(ir_loop *loop, ir_variable *var)
-{
-   for (exec_node *node = loop->prev;
-	!node->is_head_sentinel();
-	node = node->prev) {
-      ir_instruction *ir = (ir_instruction *) node;
-
-      switch (ir->ir_type) {
-      case ir_type_call:
-      case ir_type_loop:
-      case ir_type_loop_jump:
-      case ir_type_return:
-      case ir_type_if:
-	 return NULL;
-
-      case ir_type_function:
-      case ir_type_function_signature:
-	 assert(!"Should not get here.");
-	 return NULL;
-
-      case ir_type_assignment: {
-	 ir_assignment *assign = ir->as_assignment();
-	 ir_variable *assignee = assign->lhs->whole_variable_referenced();
-
-	 if (assignee == var)
-	    return (assign->condition != NULL) ? NULL : assign->rhs;
-
-	 break;
-      }
-
-      default:
-	 break;
-      }
-   }
-
-   return NULL;
-}
-
-
-int
-calculate_iterations(ir_rvalue *from, ir_rvalue *to, ir_rvalue *increment,
-		     enum ir_expression_operation op)
-{
-   if (from == NULL || to == NULL || increment == NULL)
-      return -1;
-
-   void *mem_ctx = ralloc_context(NULL);
-
-   ir_expression *const sub =
-      new(mem_ctx) ir_expression(ir_binop_sub, from->type, to, from);
-
-   ir_expression *const div =
-      new(mem_ctx) ir_expression(ir_binop_div, sub->type, sub, increment);
-
-   ir_constant *iter = div->constant_expression_value();
-
-   if (iter == NULL)
-      return -1;
-
-   if (!iter->type->is_integer()) {
-      ir_rvalue *cast =
-	 new(mem_ctx) ir_expression(ir_unop_f2i, glsl_type::int_type, iter,
-				    NULL);
-
-      iter = cast->constant_expression_value();
-   }
-
-   int iter_value = iter->get_int_component(0);
-
-   /* Make sure that the calculated number of iterations satisfies the exit
-    * condition.  This is needed to catch off-by-one errors and some types of
-    * ill-formed loops.  For example, we need to detect that the following
-    * loop does not have a maximum iteration count.
-    *
-    *    for (float x = 0.0; x != 0.9; x += 0.2)
-    *        ;
-    */
-   const int bias[] = { -1, 0, 1 };
-   bool valid_loop = false;
-
-   for (unsigned i = 0; i < Elements(bias); i++) {
-      iter = (increment->type->is_integer())
-	 ? new(mem_ctx) ir_constant(iter_value + bias[i])
-	 : new(mem_ctx) ir_constant(float(iter_value + bias[i]));
-
-      ir_expression *const mul =
-	 new(mem_ctx) ir_expression(ir_binop_mul, increment->type, iter,
-				    increment);
-
-      ir_expression *const add =
-	 new(mem_ctx) ir_expression(ir_binop_add, mul->type, mul, from);
-
-      ir_expression *const cmp =
-	 new(mem_ctx) ir_expression(op, glsl_type::bool_type, add, to);
-
-      ir_constant *const cmp_result = cmp->constant_expression_value();
-
-      assert(cmp_result != NULL);
-      if (cmp_result->get_bool_component(0)) {
-	 iter_value += bias[i];
-	 valid_loop = true;
-	 break;
-      }
-   }
-
-   ralloc_free(mem_ctx);
-   return (valid_loop) ? iter_value : -1;
-}
-
-
-class loop_control_visitor : public ir_hierarchical_visitor {
-public:
-   loop_control_visitor(loop_state *state)
-   {
-      this->state = state;
-      this->progress = false;
-   }
-
-   virtual ir_visitor_status visit_leave(ir_loop *ir);
-
-   loop_state *state;
-
-   bool progress;
-};
-
-
-ir_visitor_status
-loop_control_visitor::visit_leave(ir_loop *ir)
-{
-   loop_variable_state *const ls = this->state->get(ir);
-
-   /* If we've entered a loop that hasn't been analyzed, something really,
-    * really bad has happened.
-    */
-   if (ls == NULL) {
-      assert(ls != NULL);
-      return visit_continue;
-   }
-
-   /* Search the loop terminating conditions for one of the form 'i < c' where
-    * i is a loop induction variable, c is a constant, and < is any relative
-    * operator.
-    */
-   int max_iterations = ls->max_iterations;
-
-   if(ir->from && ir->to && ir->increment)
-      max_iterations = calculate_iterations(ir->from, ir->to, ir->increment, (ir_expression_operation)ir->cmp);
-
-   if(max_iterations < 0)
-      max_iterations = INT_MAX;
-
-   foreach_list(node, &ls->terminators) {
-      loop_terminator *t = (loop_terminator *) node;
-      ir_if *if_stmt = t->ir;
-
-      /* If-statements can be either 'if (expr)' or 'if (deref)'.  We only care
-       * about the former here.
-       */
-      ir_expression *cond = if_stmt->condition->as_expression();
-      if (cond == NULL)
-	 continue;
-
-      switch (cond->operation) {
-      case ir_binop_less:
-      case ir_binop_greater:
-      case ir_binop_lequal:
-      case ir_binop_gequal: {
-	 /* The expressions that we care about will either be of the form
-	  * 'counter < limit' or 'limit < counter'.  Figure out which is
-	  * which.
-	  */
-	 ir_rvalue *counter = cond->operands[0]->as_dereference_variable();
-	 ir_constant *limit = cond->operands[1]->as_constant();
-	 enum ir_expression_operation cmp = cond->operation;
-
-	 if (limit == NULL) {
-	    counter = cond->operands[1]->as_dereference_variable();
-	    limit = cond->operands[0]->as_constant();
-
-	    switch (cmp) {
-	    case ir_binop_less:    cmp = ir_binop_gequal;  break;
-	    case ir_binop_greater: cmp = ir_binop_lequal;  break;
-	    case ir_binop_lequal:  cmp = ir_binop_greater; break;
-	    case ir_binop_gequal:  cmp = ir_binop_less;    break;
-	    default: assert(!"Should not get here.");
-	    }
-	 }
-
-	 if ((counter == NULL) || (limit == NULL))
-	    break;
-
-	 ir_variable *var = counter->variable_referenced();
-
-	 ir_rvalue *init = find_initial_value(ir, var);
-
-	 foreach_list(iv_node, &ls->induction_variables) {
-	    loop_variable *lv = (loop_variable *) iv_node;
-
-	    if (lv->var == var) {
-	       const int iterations = calculate_iterations(init, limit,
-							   lv->increment,
-							   cmp);
-	       if (iterations >= 0) {
-		  /* If the new iteration count is lower than the previously
-		   * believed iteration count, update the loop control values.
-		   */
-		  if (iterations < max_iterations) {
-		     ir->from = init->clone(ir, NULL);
-		     ir->to = limit->clone(ir, NULL);
-		     ir->increment = lv->increment->clone(ir, NULL);
-		     ir->counter = lv->var;
-		     ir->cmp = cmp;
-
-		     max_iterations = iterations;
-		  }
-
-		  /* Remove the conditional break statement.  The loop
-		   * controls are now set such that the exit condition will be
-		   * satisfied.
-		   */
-		  if_stmt->remove();
-
-		  assert(ls->num_loop_jumps > 0);
-		  ls->num_loop_jumps--;
-
-		  this->progress = true;
-	       }
-
-	       break;
-	    }
-	 }
-	 break;
-      }
-
-      default:
-	 break;
-      }
-   }
-
-   /* If we have proven the one of the loop exit conditions is satisifed before
-    * running the loop once, remove the loop.
-    */
-   if (max_iterations == 0)
-      ir->remove();
-   else
-      ls->max_iterations = max_iterations;
-
-   return visit_continue;
-}
-
-
-bool
-set_loop_controls(exec_list *instructions, loop_state *ls)
-{
-   loop_control_visitor v(ls);
-
-   v.run(instructions);
-
-   return v.progress;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#include <limits.h>

+#include "main/compiler.h"

+#include "glsl_types.h"

+#include "loop_analysis.h"

+#include "ir_hierarchical_visitor.h"

+

+/**

+ * Find an initializer of a variable outside a loop

+ *

+ * Works backwards from the loop to find the pre-loop value of the variable.

+ * This is used, for example, to find the initial value of loop induction

+ * variables.

+ *

+ * \param loop  Loop where \c var is an induction variable

+ * \param var   Variable whose initializer is to be found

+ *

+ * \return

+ * The \c ir_rvalue assigned to the variable outside the loop.  May return

+ * \c NULL if no initializer can be found.

+ */

+ir_rvalue *

+find_initial_value(ir_loop *loop, ir_variable *var)

+{

+   for (exec_node *node = loop->prev;

+	!node->is_head_sentinel();

+	node = node->prev) {

+      ir_instruction *ir = (ir_instruction *) node;

+

+      switch (ir->ir_type) {

+      case ir_type_call:

+      case ir_type_loop:

+      case ir_type_loop_jump:

+      case ir_type_return:

+      case ir_type_if:

+	 return NULL;

+

+      case ir_type_function:

+      case ir_type_function_signature:

+	 assert(!"Should not get here.");

+	 return NULL;

+

+      case ir_type_assignment: {

+	 ir_assignment *assign = ir->as_assignment();

+	 ir_variable *assignee = assign->lhs->whole_variable_referenced();

+

+	 if (assignee == var)

+	    return (assign->condition != NULL) ? NULL : assign->rhs;

+

+	 break;

+      }

+

+      default:

+	 break;

+      }

+   }

+

+   return NULL;

+}

+

+

+int

+calculate_iterations(ir_rvalue *from, ir_rvalue *to, ir_rvalue *increment,

+		     enum ir_expression_operation op)

+{

+   if (from == NULL || to == NULL || increment == NULL)

+      return -1;

+

+   void *mem_ctx = ralloc_context(NULL);

+

+   ir_expression *const sub =

+      new(mem_ctx) ir_expression(ir_binop_sub, from->type, to, from);

+

+   ir_expression *const div =

+      new(mem_ctx) ir_expression(ir_binop_div, sub->type, sub, increment);

+

+   ir_constant *iter = div->constant_expression_value();

+

+   if (iter == NULL)

+      return -1;

+

+   if (!iter->type->is_integer()) {

+      ir_rvalue *cast =

+	 new(mem_ctx) ir_expression(ir_unop_f2i, glsl_type::int_type, iter,

+				    NULL);

+

+      iter = cast->constant_expression_value();

+   }

+

+   int iter_value = iter->get_int_component(0);

+

+   /* Make sure that the calculated number of iterations satisfies the exit

+    * condition.  This is needed to catch off-by-one errors and some types of

+    * ill-formed loops.  For example, we need to detect that the following

+    * loop does not have a maximum iteration count.

+    *

+    *    for (float x = 0.0; x != 0.9; x += 0.2)

+    *        ;

+    */

+   const int bias[] = { -1, 0, 1 };

+   bool valid_loop = false;

+

+   for (unsigned i = 0; i < Elements(bias); i++) {

+      iter = (increment->type->is_integer())

+	 ? new(mem_ctx) ir_constant(iter_value + bias[i])

+	 : new(mem_ctx) ir_constant(float(iter_value + bias[i]));

+

+      ir_expression *const mul =

+	 new(mem_ctx) ir_expression(ir_binop_mul, increment->type, iter,

+				    increment);

+

+      ir_expression *const add =

+	 new(mem_ctx) ir_expression(ir_binop_add, mul->type, mul, from);

+

+      ir_expression *const cmp =

+	 new(mem_ctx) ir_expression(op, glsl_type::bool_type, add, to);

+

+      ir_constant *const cmp_result = cmp->constant_expression_value();

+

+      assert(cmp_result != NULL);

+      if (cmp_result->get_bool_component(0)) {

+	 iter_value += bias[i];

+	 valid_loop = true;

+	 break;

+      }

+   }

+

+   ralloc_free(mem_ctx);

+   return (valid_loop) ? iter_value : -1;

+}

+

+

+class loop_control_visitor : public ir_hierarchical_visitor {

+public:

+   loop_control_visitor(loop_state *state)

+   {

+      this->state = state;

+      this->progress = false;

+   }

+

+   virtual ir_visitor_status visit_leave(ir_loop *ir);

+

+   loop_state *state;

+

+   bool progress;

+};

+

+

+ir_visitor_status

+loop_control_visitor::visit_leave(ir_loop *ir)

+{

+   loop_variable_state *const ls = this->state->get(ir);

+

+   /* If we've entered a loop that hasn't been analyzed, something really,

+    * really bad has happened.

+    */

+   if (ls == NULL) {

+      assert(ls != NULL);

+      return visit_continue;

+   }

+

+   /* Search the loop terminating conditions for one of the form 'i < c' where

+    * i is a loop induction variable, c is a constant, and < is any relative

+    * operator.

+    */

+   int max_iterations = ls->max_iterations;

+

+   if(ir->from && ir->to && ir->increment)

+      max_iterations = calculate_iterations(ir->from, ir->to, ir->increment, (ir_expression_operation)ir->cmp);

+

+   if(max_iterations < 0)

+      max_iterations = INT_MAX;

+

+   foreach_list(node, &ls->terminators) {

+      loop_terminator *t = (loop_terminator *) node;

+      ir_if *if_stmt = t->ir;

+

+      /* If-statements can be either 'if (expr)' or 'if (deref)'.  We only care

+       * about the former here.

+       */

+      ir_expression *cond = if_stmt->condition->as_expression();

+      if (cond == NULL)

+	 continue;

+

+      switch (cond->operation) {

+      case ir_binop_less:

+      case ir_binop_greater:

+      case ir_binop_lequal:

+      case ir_binop_gequal: {

+	 /* The expressions that we care about will either be of the form

+	  * 'counter < limit' or 'limit < counter'.  Figure out which is

+	  * which.

+	  */

+	 ir_rvalue *counter = cond->operands[0]->as_dereference_variable();

+	 ir_constant *limit = cond->operands[1]->as_constant();

+	 enum ir_expression_operation cmp = cond->operation;

+

+	 if (limit == NULL) {

+	    counter = cond->operands[1]->as_dereference_variable();

+	    limit = cond->operands[0]->as_constant();

+

+	    switch (cmp) {

+	    case ir_binop_less:    cmp = ir_binop_gequal;  break;

+	    case ir_binop_greater: cmp = ir_binop_lequal;  break;

+	    case ir_binop_lequal:  cmp = ir_binop_greater; break;

+	    case ir_binop_gequal:  cmp = ir_binop_less;    break;

+	    default: assert(!"Should not get here.");

+	    }

+	 }

+

+	 if ((counter == NULL) || (limit == NULL))

+	    break;

+

+	 ir_variable *var = counter->variable_referenced();

+

+	 ir_rvalue *init = find_initial_value(ir, var);

+

+	 foreach_list(iv_node, &ls->induction_variables) {

+	    loop_variable *lv = (loop_variable *) iv_node;

+

+	    if (lv->var == var) {

+	       const int iterations = calculate_iterations(init, limit,

+							   lv->increment,

+							   cmp);

+	       if (iterations >= 0) {

+		  /* If the new iteration count is lower than the previously

+		   * believed iteration count, update the loop control values.

+		   */

+		  if (iterations < max_iterations) {

+		     ir->from = init->clone(ir, NULL);

+		     ir->to = limit->clone(ir, NULL);

+		     ir->increment = lv->increment->clone(ir, NULL);

+		     ir->counter = lv->var;

+		     ir->cmp = cmp;

+

+		     max_iterations = iterations;

+		  }

+

+		  /* Remove the conditional break statement.  The loop

+		   * controls are now set such that the exit condition will be

+		   * satisfied.

+		   */

+		  if_stmt->remove();

+

+		  assert(ls->num_loop_jumps > 0);

+		  ls->num_loop_jumps--;

+

+		  this->progress = true;

+	       }

+

+	       break;

+	    }

+	 }

+	 break;

+      }

+

+      default:

+	 break;

+      }

+   }

+

+   /* If we have proven the one of the loop exit conditions is satisifed before

+    * running the loop once, remove the loop.

+    */

+   if (max_iterations == 0)

+      ir->remove();

+   else

+      ls->max_iterations = max_iterations;

+

+   return visit_continue;

+}

+

+

+bool

+set_loop_controls(exec_list *instructions, loop_state *ls)

+{

+   loop_control_visitor v(ls);

+

+   v.run(instructions);

+

+   return v.progress;

+}

diff --git a/mesalib/src/glsl/lower_mat_op_to_vec.cpp b/mesalib/src/glsl/lower_mat_op_to_vec.cpp
index 8cbbfa713..dc46ed417 100644
--- a/mesalib/src/glsl/lower_mat_op_to_vec.cpp
+++ b/mesalib/src/glsl/lower_mat_op_to_vec.cpp
@@ -1,490 +1,490 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file lower_mat_op_to_vec.cpp
- *
- * Breaks matrix operation expressions down to a series of vector operations.
- *
- * Generally this is how we have to codegen matrix operations for a
- * GPU, so this gives us the chance to constant fold operations on a
- * column or row.
- */
-
-#include "ir.h"
-#include "ir_expression_flattening.h"
-#include "glsl_types.h"
-
-class ir_mat_op_to_vec_visitor : public ir_hierarchical_visitor {
-public:
-   ir_mat_op_to_vec_visitor()
-   {
-      this->made_progress = false;
-      this->mem_ctx = NULL;
-   }
-
-   ir_visitor_status visit_leave(ir_assignment *);
-
-   ir_dereference *get_column(ir_variable *var, int col);
-   ir_rvalue *get_element(ir_variable *var, int col, int row);
-
-   void do_mul_mat_mat(ir_variable *result_var,
-		       ir_variable *a_var, ir_variable *b_var);
-   void do_mul_mat_vec(ir_variable *result_var,
-		       ir_variable *a_var, ir_variable *b_var);
-   void do_mul_vec_mat(ir_variable *result_var,
-		       ir_variable *a_var, ir_variable *b_var);
-   void do_mul_mat_scalar(ir_variable *result_var,
-			  ir_variable *a_var, ir_variable *b_var);
-   void do_equal_mat_mat(ir_variable *result_var, ir_variable *a_var,
-			 ir_variable *b_var, bool test_equal);
-
-   void *mem_ctx;
-   bool made_progress;
-};
-
-static bool
-mat_op_to_vec_predicate(ir_instruction *ir)
-{
-   ir_expression *expr = ir->as_expression();
-   unsigned int i;
-
-   if (!expr)
-      return false;
-
-   for (i = 0; i < expr->get_num_operands(); i++) {
-      if (expr->operands[i]->type->is_matrix())
-	 return true;
-   }
-
-   return false;
-}
-
-bool
-do_mat_op_to_vec(exec_list *instructions)
-{
-   ir_mat_op_to_vec_visitor v;
-
-   /* Pull out any matrix expression to a separate assignment to a
-    * temp.  This will make our handling of the breakdown to
-    * operations on the matrix's vector components much easier.
-    */
-   do_expression_flattening(instructions, mat_op_to_vec_predicate);
-
-   visit_list_elements(&v, instructions);
-
-   return v.made_progress;
-}
-
-ir_rvalue *
-ir_mat_op_to_vec_visitor::get_element(ir_variable *var, int col, int row)
-{
-   ir_dereference *deref;
-
-   deref = new(mem_ctx) ir_dereference_variable(var);
-
-   if (var->type->is_matrix()) {
-      deref = new(mem_ctx) ir_dereference_array(var,
-						new(mem_ctx) ir_constant(col));
-   } else {
-      assert(col == 0);
-   }
-
-   return new(mem_ctx) ir_swizzle(deref, row, 0, 0, 0, 1);
-}
-
-ir_dereference *
-ir_mat_op_to_vec_visitor::get_column(ir_variable *var, int row)
-{
-   ir_dereference *deref;
-
-   if (!var->type->is_matrix()) {
-      deref = new(mem_ctx) ir_dereference_variable(var);
-   } else {
-      deref = new(mem_ctx) ir_dereference_variable(var);
-      deref = new(mem_ctx) ir_dereference_array(deref,
-						new(mem_ctx) ir_constant(row));
-   }
-
-   return deref;
-}
-
-void
-ir_mat_op_to_vec_visitor::do_mul_mat_mat(ir_variable *result_var,
-					 ir_variable *a_var,
-					 ir_variable *b_var)
-{
-   int b_col, i;
-   ir_assignment *assign;
-   ir_expression *expr;
-
-   for (b_col = 0; b_col < b_var->type->matrix_columns; b_col++) {
-      ir_rvalue *a = get_column(a_var, 0);
-      ir_rvalue *b = get_element(b_var, b_col, 0);
-
-      /* first column */
-      expr = new(mem_ctx) ir_expression(ir_binop_mul,
-					a->type,
-					a,
-					b);
-
-      /* following columns */
-      for (i = 1; i < a_var->type->matrix_columns; i++) {
-	 ir_expression *mul_expr;
-
-	 a = get_column(a_var, i);
-	 b = get_element(b_var, b_col, i);
-
-	 mul_expr = new(mem_ctx) ir_expression(ir_binop_mul,
-					       a->type,
-					       a,
-					       b);
-	 expr = new(mem_ctx) ir_expression(ir_binop_add,
-					   a->type,
-					   expr,
-					   mul_expr);
-      }
-
-      ir_rvalue *result = get_column(result_var, b_col);
-      assign = new(mem_ctx) ir_assignment(result,
-					  expr,
-					  NULL);
-      base_ir->insert_before(assign);
-   }
-}
-
-void
-ir_mat_op_to_vec_visitor::do_mul_mat_vec(ir_variable *result_var,
-					 ir_variable *a_var,
-					 ir_variable *b_var)
-{
-   int i;
-   ir_rvalue *a = get_column(a_var, 0);
-   ir_rvalue *b = get_element(b_var, 0, 0);
-   ir_assignment *assign;
-   ir_expression *expr;
-
-   /* first column */
-   expr = new(mem_ctx) ir_expression(ir_binop_mul,
-				     result_var->type,
-				     a,
-				     b);
-
-   /* following columns */
-   for (i = 1; i < a_var->type->matrix_columns; i++) {
-      ir_expression *mul_expr;
-
-      a = get_column(a_var, i);
-      b = get_element(b_var, 0, i);
-
-      mul_expr = new(mem_ctx) ir_expression(ir_binop_mul,
-					    result_var->type,
-					    a,
-					    b);
-      expr = new(mem_ctx) ir_expression(ir_binop_add,
-					result_var->type,
-					expr,
-					mul_expr);
-   }
-
-   ir_rvalue *result = new(mem_ctx) ir_dereference_variable(result_var);
-   assign = new(mem_ctx) ir_assignment(result,
-				       expr,
-				       NULL);
-   base_ir->insert_before(assign);
-}
-
-void
-ir_mat_op_to_vec_visitor::do_mul_vec_mat(ir_variable *result_var,
-					 ir_variable *a_var,
-					 ir_variable *b_var)
-{
-   int i;
-
-   for (i = 0; i < b_var->type->matrix_columns; i++) {
-      ir_rvalue *a = new(mem_ctx) ir_dereference_variable(a_var);
-      ir_rvalue *b = get_column(b_var, i);
-      ir_rvalue *result;
-      ir_expression *column_expr;
-      ir_assignment *column_assign;
-
-      result = new(mem_ctx) ir_dereference_variable(result_var);
-      result = new(mem_ctx) ir_swizzle(result, i, 0, 0, 0, 1);
-
-      column_expr = new(mem_ctx) ir_expression(ir_binop_dot,
-					       result->type,
-					       a,
-					       b);
-
-      column_assign = new(mem_ctx) ir_assignment(result,
-						 column_expr,
-						 NULL);
-      base_ir->insert_before(column_assign);
-   }
-}
-
-void
-ir_mat_op_to_vec_visitor::do_mul_mat_scalar(ir_variable *result_var,
-					    ir_variable *a_var,
-					    ir_variable *b_var)
-{
-   int i;
-
-   for (i = 0; i < a_var->type->matrix_columns; i++) {
-      ir_rvalue *a = get_column(a_var, i);
-      ir_rvalue *b = new(mem_ctx) ir_dereference_variable(b_var);
-      ir_rvalue *result = get_column(result_var, i);
-      ir_expression *column_expr;
-      ir_assignment *column_assign;
-
-      column_expr = new(mem_ctx) ir_expression(ir_binop_mul,
-					       result->type,
-					       a,
-					       b);
-
-      column_assign = new(mem_ctx) ir_assignment(result,
-						 column_expr,
-						 NULL);
-      base_ir->insert_before(column_assign);
-   }
-}
-
-void
-ir_mat_op_to_vec_visitor::do_equal_mat_mat(ir_variable *result_var,
-					   ir_variable *a_var,
-					   ir_variable *b_var,
-					   bool test_equal)
-{
-   /* This essentially implements the following GLSL:
-    *
-    * bool equal(mat4 a, mat4 b)
-    * {
-    *   return !any(bvec4(a[0] != b[0],
-    *                     a[1] != b[1],
-    *                     a[2] != b[2],
-    *                     a[3] != b[3]);
-    * }
-    *
-    * bool nequal(mat4 a, mat4 b)
-    * {
-    *   return any(bvec4(a[0] != b[0],
-    *                    a[1] != b[1],
-    *                    a[2] != b[2],
-    *                    a[3] != b[3]);
-    * }
-    */
-   const unsigned columns = a_var->type->matrix_columns;
-   const glsl_type *const bvec_type =
-      glsl_type::get_instance(GLSL_TYPE_BOOL, columns, 1);
-
-   ir_variable *const tmp_bvec =
-      new(this->mem_ctx) ir_variable(bvec_type, "mat_cmp_bvec",
-				     ir_var_temporary);
-   this->base_ir->insert_before(tmp_bvec);
-
-   for (unsigned i = 0; i < columns; i++) {
-      ir_dereference *const op0 = get_column(a_var, i);
-      ir_dereference *const op1 = get_column(b_var, i);
-
-      ir_expression *const cmp =
-	 new(this->mem_ctx) ir_expression(ir_binop_any_nequal,
-					  glsl_type::bool_type, op0, op1);
-
-      ir_dereference *const lhs =
-	 new(this->mem_ctx) ir_dereference_variable(tmp_bvec);
-
-      ir_assignment *const assign =
-	 new(this->mem_ctx) ir_assignment(lhs, cmp, NULL, (1U << i));
-
-      this->base_ir->insert_before(assign);
-   }
-
-   ir_rvalue *const val =
-      new(this->mem_ctx) ir_dereference_variable(tmp_bvec);
-
-   ir_expression *any =
-      new(this->mem_ctx) ir_expression(ir_unop_any, glsl_type::bool_type,
-				       val, NULL);
-
-   if (test_equal)
-      any = new(this->mem_ctx) ir_expression(ir_unop_logic_not,
-					     glsl_type::bool_type,
-					     any, NULL);
-
-   ir_rvalue *const result =
-      new(this->mem_ctx) ir_dereference_variable(result_var);
-
-   ir_assignment *const assign =
-	 new(mem_ctx) ir_assignment(result, any, NULL);
-   base_ir->insert_before(assign);
-}
-
-static bool
-has_matrix_operand(const ir_expression *expr, unsigned &columns)
-{
-   for (unsigned i = 0; i < expr->get_num_operands(); i++) {
-      if (expr->operands[i]->type->is_matrix()) {
-	 columns = expr->operands[i]->type->matrix_columns;
-	 return true;
-      }
-   }
-
-   return false;
-}
-
-
-ir_visitor_status
-ir_mat_op_to_vec_visitor::visit_leave(ir_assignment *orig_assign)
-{
-   ir_expression *orig_expr = orig_assign->rhs->as_expression();
-   unsigned int i, matrix_columns = 1;
-   ir_variable *op_var[2];
-
-   if (!orig_expr)
-      return visit_continue;
-
-   if (!has_matrix_operand(orig_expr, matrix_columns))
-      return visit_continue;
-
-   assert(orig_expr->get_num_operands() <= 2);
-
-   mem_ctx = ralloc_parent(orig_assign);
-
-   ir_dereference_variable *lhs_deref =
-      orig_assign->lhs->as_dereference_variable();
-   assert(lhs_deref);
-
-   ir_variable *result_var = lhs_deref->var;
-
-   /* Store the expression operands in temps so we can use them
-    * multiple times.
-    */
-   for (i = 0; i < orig_expr->get_num_operands(); i++) {
-      ir_assignment *assign;
-
-      op_var[i] = new(mem_ctx) ir_variable(orig_expr->operands[i]->type,
-					   "mat_op_to_vec",
-					   ir_var_temporary);
-      base_ir->insert_before(op_var[i]);
-
-      lhs_deref = new(mem_ctx) ir_dereference_variable(op_var[i]);
-      assign = new(mem_ctx) ir_assignment(lhs_deref,
-					  orig_expr->operands[i],
-					  NULL);
-      base_ir->insert_before(assign);
-   }
-
-   /* OK, time to break down this matrix operation. */
-   switch (orig_expr->operation) {
-   case ir_unop_neg: {
-      const unsigned mask = (1U << result_var->type->vector_elements) - 1;
-
-      /* Apply the operation to each column.*/
-      for (i = 0; i < matrix_columns; i++) {
-	 ir_rvalue *op0 = get_column(op_var[0], i);
-	 ir_dereference *result = get_column(result_var, i);
-	 ir_expression *column_expr;
-	 ir_assignment *column_assign;
-
-	 column_expr = new(mem_ctx) ir_expression(orig_expr->operation,
-						  result->type,
-						  op0,
-						  NULL);
-
-	 column_assign = new(mem_ctx) ir_assignment(result,
-						    column_expr,
-						    NULL,
-						    mask);
-	 assert(column_assign->write_mask != 0);
-	 base_ir->insert_before(column_assign);
-      }
-      break;
-   }
-   case ir_binop_add:
-   case ir_binop_sub:
-   case ir_binop_div:
-   case ir_binop_mod: {
-      const unsigned mask = (1U << result_var->type->vector_elements) - 1;
-
-      /* For most operations, the matrix version is just going
-       * column-wise through and applying the operation to each column
-       * if available.
-       */
-      for (i = 0; i < matrix_columns; i++) {
-	 ir_rvalue *op0 = get_column(op_var[0], i);
-	 ir_rvalue *op1 = get_column(op_var[1], i);
-	 ir_dereference *result = get_column(result_var, i);
-	 ir_expression *column_expr;
-	 ir_assignment *column_assign;
-
-	 column_expr = new(mem_ctx) ir_expression(orig_expr->operation,
-						  result->type,
-						  op0,
-						  op1);
-
-	 column_assign = new(mem_ctx) ir_assignment(result,
-						    column_expr,
-						    NULL,
-						    mask);
-	 assert(column_assign->write_mask != 0);
-	 base_ir->insert_before(column_assign);
-      }
-      break;
-   }
-   case ir_binop_mul:
-      if (op_var[0]->type->is_matrix()) {
-	 if (op_var[1]->type->is_matrix()) {
-	    do_mul_mat_mat(result_var, op_var[0], op_var[1]);
-	 } else if (op_var[1]->type->is_vector()) {
-	    do_mul_mat_vec(result_var, op_var[0], op_var[1]);
-	 } else {
-	    assert(op_var[1]->type->is_scalar());
-	    do_mul_mat_scalar(result_var, op_var[0], op_var[1]);
-	 }
-      } else {
-	 assert(op_var[1]->type->is_matrix());
-	 if (op_var[0]->type->is_vector()) {
-	    do_mul_vec_mat(result_var, op_var[0], op_var[1]);
-	 } else {
-	    assert(op_var[0]->type->is_scalar());
-	    do_mul_mat_scalar(result_var, op_var[1], op_var[0]);
-	 }
-      }
-      break;
-
-   case ir_binop_all_equal:
-   case ir_binop_any_nequal:
-      do_equal_mat_mat(result_var, op_var[1], op_var[0],
-		       (orig_expr->operation == ir_binop_all_equal));
-      break;
-
-   default:
-      printf("FINISHME: Handle matrix operation for %s\n",
-	     orig_expr->operator_string());
-      abort();
-   }
-   orig_assign->remove();
-   this->made_progress = true;
-
-   return visit_continue;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file lower_mat_op_to_vec.cpp

+ *

+ * Breaks matrix operation expressions down to a series of vector operations.

+ *

+ * Generally this is how we have to codegen matrix operations for a

+ * GPU, so this gives us the chance to constant fold operations on a

+ * column or row.

+ */

+

+#include "ir.h"

+#include "ir_expression_flattening.h"

+#include "glsl_types.h"

+

+class ir_mat_op_to_vec_visitor : public ir_hierarchical_visitor {

+public:

+   ir_mat_op_to_vec_visitor()

+   {

+      this->made_progress = false;

+      this->mem_ctx = NULL;

+   }

+

+   ir_visitor_status visit_leave(ir_assignment *);

+

+   ir_dereference *get_column(ir_variable *var, int col);

+   ir_rvalue *get_element(ir_variable *var, int col, int row);

+

+   void do_mul_mat_mat(ir_variable *result_var,

+		       ir_variable *a_var, ir_variable *b_var);

+   void do_mul_mat_vec(ir_variable *result_var,

+		       ir_variable *a_var, ir_variable *b_var);

+   void do_mul_vec_mat(ir_variable *result_var,

+		       ir_variable *a_var, ir_variable *b_var);

+   void do_mul_mat_scalar(ir_variable *result_var,

+			  ir_variable *a_var, ir_variable *b_var);

+   void do_equal_mat_mat(ir_variable *result_var, ir_variable *a_var,

+			 ir_variable *b_var, bool test_equal);

+

+   void *mem_ctx;

+   bool made_progress;

+};

+

+static bool

+mat_op_to_vec_predicate(ir_instruction *ir)

+{

+   ir_expression *expr = ir->as_expression();

+   unsigned int i;

+

+   if (!expr)

+      return false;

+

+   for (i = 0; i < expr->get_num_operands(); i++) {

+      if (expr->operands[i]->type->is_matrix())

+	 return true;

+   }

+

+   return false;

+}

+

+bool

+do_mat_op_to_vec(exec_list *instructions)

+{

+   ir_mat_op_to_vec_visitor v;

+

+   /* Pull out any matrix expression to a separate assignment to a

+    * temp.  This will make our handling of the breakdown to

+    * operations on the matrix's vector components much easier.

+    */

+   do_expression_flattening(instructions, mat_op_to_vec_predicate);

+

+   visit_list_elements(&v, instructions);

+

+   return v.made_progress;

+}

+

+ir_rvalue *

+ir_mat_op_to_vec_visitor::get_element(ir_variable *var, int col, int row)

+{

+   ir_dereference *deref;

+

+   deref = new(mem_ctx) ir_dereference_variable(var);

+

+   if (var->type->is_matrix()) {

+      deref = new(mem_ctx) ir_dereference_array(var,

+						new(mem_ctx) ir_constant(col));

+   } else {

+      assert(col == 0);

+   }

+

+   return new(mem_ctx) ir_swizzle(deref, row, 0, 0, 0, 1);

+}

+

+ir_dereference *

+ir_mat_op_to_vec_visitor::get_column(ir_variable *var, int row)

+{

+   ir_dereference *deref;

+

+   if (!var->type->is_matrix()) {

+      deref = new(mem_ctx) ir_dereference_variable(var);

+   } else {

+      deref = new(mem_ctx) ir_dereference_variable(var);

+      deref = new(mem_ctx) ir_dereference_array(deref,

+						new(mem_ctx) ir_constant(row));

+   }

+

+   return deref;

+}

+

+void

+ir_mat_op_to_vec_visitor::do_mul_mat_mat(ir_variable *result_var,

+					 ir_variable *a_var,

+					 ir_variable *b_var)

+{

+   int b_col, i;

+   ir_assignment *assign;

+   ir_expression *expr;

+

+   for (b_col = 0; b_col < b_var->type->matrix_columns; b_col++) {

+      ir_rvalue *a = get_column(a_var, 0);

+      ir_rvalue *b = get_element(b_var, b_col, 0);

+

+      /* first column */

+      expr = new(mem_ctx) ir_expression(ir_binop_mul,

+					a->type,

+					a,

+					b);

+

+      /* following columns */

+      for (i = 1; i < a_var->type->matrix_columns; i++) {

+	 ir_expression *mul_expr;

+

+	 a = get_column(a_var, i);

+	 b = get_element(b_var, b_col, i);

+

+	 mul_expr = new(mem_ctx) ir_expression(ir_binop_mul,

+					       a->type,

+					       a,

+					       b);

+	 expr = new(mem_ctx) ir_expression(ir_binop_add,

+					   a->type,

+					   expr,

+					   mul_expr);

+      }

+

+      ir_rvalue *result = get_column(result_var, b_col);

+      assign = new(mem_ctx) ir_assignment(result,

+					  expr,

+					  NULL);

+      base_ir->insert_before(assign);

+   }

+}

+

+void

+ir_mat_op_to_vec_visitor::do_mul_mat_vec(ir_variable *result_var,

+					 ir_variable *a_var,

+					 ir_variable *b_var)

+{

+   int i;

+   ir_rvalue *a = get_column(a_var, 0);

+   ir_rvalue *b = get_element(b_var, 0, 0);

+   ir_assignment *assign;

+   ir_expression *expr;

+

+   /* first column */

+   expr = new(mem_ctx) ir_expression(ir_binop_mul,

+				     result_var->type,

+				     a,

+				     b);

+

+   /* following columns */

+   for (i = 1; i < a_var->type->matrix_columns; i++) {

+      ir_expression *mul_expr;

+

+      a = get_column(a_var, i);

+      b = get_element(b_var, 0, i);

+

+      mul_expr = new(mem_ctx) ir_expression(ir_binop_mul,

+					    result_var->type,

+					    a,

+					    b);

+      expr = new(mem_ctx) ir_expression(ir_binop_add,

+					result_var->type,

+					expr,

+					mul_expr);

+   }

+

+   ir_rvalue *result = new(mem_ctx) ir_dereference_variable(result_var);

+   assign = new(mem_ctx) ir_assignment(result,

+				       expr,

+				       NULL);

+   base_ir->insert_before(assign);

+}

+

+void

+ir_mat_op_to_vec_visitor::do_mul_vec_mat(ir_variable *result_var,

+					 ir_variable *a_var,

+					 ir_variable *b_var)

+{

+   int i;

+

+   for (i = 0; i < b_var->type->matrix_columns; i++) {

+      ir_rvalue *a = new(mem_ctx) ir_dereference_variable(a_var);

+      ir_rvalue *b = get_column(b_var, i);

+      ir_rvalue *result;

+      ir_expression *column_expr;

+      ir_assignment *column_assign;

+

+      result = new(mem_ctx) ir_dereference_variable(result_var);

+      result = new(mem_ctx) ir_swizzle(result, i, 0, 0, 0, 1);

+

+      column_expr = new(mem_ctx) ir_expression(ir_binop_dot,

+					       result->type,

+					       a,

+					       b);

+

+      column_assign = new(mem_ctx) ir_assignment(result,

+						 column_expr,

+						 NULL);

+      base_ir->insert_before(column_assign);

+   }

+}

+

+void

+ir_mat_op_to_vec_visitor::do_mul_mat_scalar(ir_variable *result_var,

+					    ir_variable *a_var,

+					    ir_variable *b_var)

+{

+   int i;

+

+   for (i = 0; i < a_var->type->matrix_columns; i++) {

+      ir_rvalue *a = get_column(a_var, i);

+      ir_rvalue *b = new(mem_ctx) ir_dereference_variable(b_var);

+      ir_rvalue *result = get_column(result_var, i);

+      ir_expression *column_expr;

+      ir_assignment *column_assign;

+

+      column_expr = new(mem_ctx) ir_expression(ir_binop_mul,

+					       result->type,

+					       a,

+					       b);

+

+      column_assign = new(mem_ctx) ir_assignment(result,

+						 column_expr,

+						 NULL);

+      base_ir->insert_before(column_assign);

+   }

+}

+

+void

+ir_mat_op_to_vec_visitor::do_equal_mat_mat(ir_variable *result_var,

+					   ir_variable *a_var,

+					   ir_variable *b_var,

+					   bool test_equal)

+{

+   /* This essentially implements the following GLSL:

+    *

+    * bool equal(mat4 a, mat4 b)

+    * {

+    *   return !any(bvec4(a[0] != b[0],

+    *                     a[1] != b[1],

+    *                     a[2] != b[2],

+    *                     a[3] != b[3]);

+    * }

+    *

+    * bool nequal(mat4 a, mat4 b)

+    * {

+    *   return any(bvec4(a[0] != b[0],

+    *                    a[1] != b[1],

+    *                    a[2] != b[2],

+    *                    a[3] != b[3]);

+    * }

+    */

+   const unsigned columns = a_var->type->matrix_columns;

+   const glsl_type *const bvec_type =

+      glsl_type::get_instance(GLSL_TYPE_BOOL, columns, 1);

+

+   ir_variable *const tmp_bvec =

+      new(this->mem_ctx) ir_variable(bvec_type, "mat_cmp_bvec",

+				     ir_var_temporary);

+   this->base_ir->insert_before(tmp_bvec);

+

+   for (unsigned i = 0; i < columns; i++) {

+      ir_dereference *const op0 = get_column(a_var, i);

+      ir_dereference *const op1 = get_column(b_var, i);

+

+      ir_expression *const cmp =

+	 new(this->mem_ctx) ir_expression(ir_binop_any_nequal,

+					  glsl_type::bool_type, op0, op1);

+

+      ir_dereference *const lhs =

+	 new(this->mem_ctx) ir_dereference_variable(tmp_bvec);

+

+      ir_assignment *const assign =

+	 new(this->mem_ctx) ir_assignment(lhs, cmp, NULL, (1U << i));

+

+      this->base_ir->insert_before(assign);

+   }

+

+   ir_rvalue *const val =

+      new(this->mem_ctx) ir_dereference_variable(tmp_bvec);

+

+   ir_expression *any =

+      new(this->mem_ctx) ir_expression(ir_unop_any, glsl_type::bool_type,

+				       val, NULL);

+

+   if (test_equal)

+      any = new(this->mem_ctx) ir_expression(ir_unop_logic_not,

+					     glsl_type::bool_type,

+					     any, NULL);

+

+   ir_rvalue *const result =

+      new(this->mem_ctx) ir_dereference_variable(result_var);

+

+   ir_assignment *const assign =

+	 new(mem_ctx) ir_assignment(result, any, NULL);

+   base_ir->insert_before(assign);

+}

+

+static bool

+has_matrix_operand(const ir_expression *expr, unsigned &columns)

+{

+   for (unsigned i = 0; i < expr->get_num_operands(); i++) {

+      if (expr->operands[i]->type->is_matrix()) {

+	 columns = expr->operands[i]->type->matrix_columns;

+	 return true;

+      }

+   }

+

+   return false;

+}

+

+

+ir_visitor_status

+ir_mat_op_to_vec_visitor::visit_leave(ir_assignment *orig_assign)

+{

+   ir_expression *orig_expr = orig_assign->rhs->as_expression();

+   unsigned int i, matrix_columns = 1;

+   ir_variable *op_var[2];

+

+   if (!orig_expr)

+      return visit_continue;

+

+   if (!has_matrix_operand(orig_expr, matrix_columns))

+      return visit_continue;

+

+   assert(orig_expr->get_num_operands() <= 2);

+

+   mem_ctx = ralloc_parent(orig_assign);

+

+   ir_dereference_variable *lhs_deref =

+      orig_assign->lhs->as_dereference_variable();

+   assert(lhs_deref);

+

+   ir_variable *result_var = lhs_deref->var;

+

+   /* Store the expression operands in temps so we can use them

+    * multiple times.

+    */

+   for (i = 0; i < orig_expr->get_num_operands(); i++) {

+      ir_assignment *assign;

+

+      op_var[i] = new(mem_ctx) ir_variable(orig_expr->operands[i]->type,

+					   "mat_op_to_vec",

+					   ir_var_temporary);

+      base_ir->insert_before(op_var[i]);

+

+      lhs_deref = new(mem_ctx) ir_dereference_variable(op_var[i]);

+      assign = new(mem_ctx) ir_assignment(lhs_deref,

+					  orig_expr->operands[i],

+					  NULL);

+      base_ir->insert_before(assign);

+   }

+

+   /* OK, time to break down this matrix operation. */

+   switch (orig_expr->operation) {

+   case ir_unop_neg: {

+      const unsigned mask = (1U << result_var->type->vector_elements) - 1;

+

+      /* Apply the operation to each column.*/

+      for (i = 0; i < matrix_columns; i++) {

+	 ir_rvalue *op0 = get_column(op_var[0], i);

+	 ir_dereference *result = get_column(result_var, i);

+	 ir_expression *column_expr;

+	 ir_assignment *column_assign;

+

+	 column_expr = new(mem_ctx) ir_expression(orig_expr->operation,

+						  result->type,

+						  op0,

+						  NULL);

+

+	 column_assign = new(mem_ctx) ir_assignment(result,

+						    column_expr,

+						    NULL,

+						    mask);

+	 assert(column_assign->write_mask != 0);

+	 base_ir->insert_before(column_assign);

+      }

+      break;

+   }

+   case ir_binop_add:

+   case ir_binop_sub:

+   case ir_binop_div:

+   case ir_binop_mod: {

+      const unsigned mask = (1U << result_var->type->vector_elements) - 1;

+

+      /* For most operations, the matrix version is just going

+       * column-wise through and applying the operation to each column

+       * if available.

+       */

+      for (i = 0; i < matrix_columns; i++) {

+	 ir_rvalue *op0 = get_column(op_var[0], i);

+	 ir_rvalue *op1 = get_column(op_var[1], i);

+	 ir_dereference *result = get_column(result_var, i);

+	 ir_expression *column_expr;

+	 ir_assignment *column_assign;

+

+	 column_expr = new(mem_ctx) ir_expression(orig_expr->operation,

+						  result->type,

+						  op0,

+						  op1);

+

+	 column_assign = new(mem_ctx) ir_assignment(result,

+						    column_expr,

+						    NULL,

+						    mask);

+	 assert(column_assign->write_mask != 0);

+	 base_ir->insert_before(column_assign);

+      }

+      break;

+   }

+   case ir_binop_mul:

+      if (op_var[0]->type->is_matrix()) {

+	 if (op_var[1]->type->is_matrix()) {

+	    do_mul_mat_mat(result_var, op_var[0], op_var[1]);

+	 } else if (op_var[1]->type->is_vector()) {

+	    do_mul_mat_vec(result_var, op_var[0], op_var[1]);

+	 } else {

+	    assert(op_var[1]->type->is_scalar());

+	    do_mul_mat_scalar(result_var, op_var[0], op_var[1]);

+	 }

+      } else {

+	 assert(op_var[1]->type->is_matrix());

+	 if (op_var[0]->type->is_vector()) {

+	    do_mul_vec_mat(result_var, op_var[0], op_var[1]);

+	 } else {

+	    assert(op_var[0]->type->is_scalar());

+	    do_mul_mat_scalar(result_var, op_var[1], op_var[0]);

+	 }

+      }

+      break;

+

+   case ir_binop_all_equal:

+   case ir_binop_any_nequal:

+      do_equal_mat_mat(result_var, op_var[1], op_var[0],

+		       (orig_expr->operation == ir_binop_all_equal));

+      break;

+

+   default:

+      printf("FINISHME: Handle matrix operation for %s\n",

+	     orig_expr->operator_string());

+      abort();

+   }

+   orig_assign->remove();

+   this->made_progress = true;

+

+   return visit_continue;

+}

diff --git a/mesalib/src/glsl/main.cpp b/mesalib/src/glsl/main.cpp
index 096da93dc..873a4fa16 100644
--- a/mesalib/src/glsl/main.cpp
+++ b/mesalib/src/glsl/main.cpp
@@ -1,334 +1,345 @@
-/*
- * Copyright © 2008, 2009 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-#include <getopt.h>
-
-#include "ast.h"
-#include "glsl_parser_extras.h"
-#include "glsl_parser.h"
-#include "ir_optimization.h"
-#include "ir_print_visitor.h"
-#include "program.h"
-#include "loop_analysis.h"
-
-extern "C" struct gl_shader *
-_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type);
-
-extern "C" void
-_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
-                       struct gl_shader *sh);
-
-/* Copied from shader_api.c for the stand-alone compiler.
- */
-void
-_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
-                       struct gl_shader *sh)
-{
-   *ptr = sh;
-}
-
-struct gl_shader *
-_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type)
-{
-   struct gl_shader *shader;
-
-   (void) ctx;
-
-   assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER);
-   shader = rzalloc(NULL, struct gl_shader);
-   if (shader) {
-      shader->Type = type;
-      shader->Name = name;
-      shader->RefCount = 1;
-   }
-   return shader;
-}
-
-static void
-initialize_context(struct gl_context *ctx, gl_api api)
-{
-   memset(ctx, 0, sizeof(*ctx));
-
-   ctx->API = api;
-
-   ctx->Extensions.ARB_ES2_compatibility = GL_TRUE;
-   ctx->Extensions.ARB_draw_buffers = GL_TRUE;
-   ctx->Extensions.ARB_draw_instanced = GL_TRUE;
-   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;
-   ctx->Extensions.EXT_texture_array = GL_TRUE;
-   ctx->Extensions.NV_texture_rectangle = GL_TRUE;
-
-   /* GLSL 1.30 isn't fully supported, but we need to advertise 1.30 so that
-    * the built-in functions for 1.30 can be built.
-    */
-   ctx->Const.GLSLVersion = 130;
-
-   /* 1.10 minimums. */
-   ctx->Const.MaxLights = 8;
-   ctx->Const.MaxClipPlanes = 8;
-   ctx->Const.MaxTextureUnits = 2;
-
-   /* More than the 1.10 minimum to appease parser tests taken from
-    * apps that (hopefully) already checked the number of coords.
-    */
-   ctx->Const.MaxTextureCoordUnits = 4;
-
-   ctx->Const.VertexProgram.MaxAttribs = 16;
-   ctx->Const.VertexProgram.MaxUniformComponents = 512;
-   ctx->Const.MaxVarying = 8;
-   ctx->Const.MaxVertexTextureImageUnits = 0;
-   ctx->Const.MaxCombinedTextureImageUnits = 2;
-   ctx->Const.MaxTextureImageUnits = 2;
-   ctx->Const.FragmentProgram.MaxUniformComponents = 64;
-
-   ctx->Const.MaxDrawBuffers = 2;
-
-   ctx->Driver.NewShader = _mesa_new_shader;
-}
-
-/* Returned string will have 'ctx' as its ralloc owner. */
-static char *
-load_text_file(void *ctx, const char *file_name)
-{
-	char *text = NULL;
-	size_t size;
-	size_t total_read = 0;
-	FILE *fp = fopen(file_name, "rb");
-
-	if (!fp) {
-		return NULL;
-	}
-
-	fseek(fp, 0L, SEEK_END);
-	size = ftell(fp);
-	fseek(fp, 0L, SEEK_SET);
-
-	text = (char *) ralloc_size(ctx, size + 1);
-	if (text != NULL) {
-		do {
-			size_t bytes = fread(text + total_read,
-					     1, size - total_read, fp);
-			if (bytes < size - total_read) {
-				free(text);
-				text = NULL;
-				break;
-			}
-
-			if (bytes == 0) {
-				break;
-			}
-
-			total_read += bytes;
-		} while (total_read < size);
-
-		text[total_read] = '\0';
-	}
-
-	fclose(fp);
-
-	return text;
-}
-
-int glsl_es = 0;
-int dump_ast = 0;
-int dump_hir = 0;
-int dump_lir = 0;
-int do_link = 0;
-
-const struct option compiler_opts[] = {
-   { "glsl-es",  0, &glsl_es,  1 },
-   { "dump-ast", 0, &dump_ast, 1 },
-   { "dump-hir", 0, &dump_hir, 1 },
-   { "dump-lir", 0, &dump_lir, 1 },
-   { "link",     0, &do_link,  1 },
-   { NULL, 0, NULL, 0 }
-};
-
-/**
- * \brief Print proper usage and exit with failure.
- */
-void
-usage_fail(const char *name)
-{
-
-   const char *header =
-      "usage: %s [options] <file.vert | file.geom | file.frag>\n"
-      "\n"
-      "Possible options are:\n";
-   printf(header, name, name);
-   for (const struct option *o = compiler_opts; o->name != 0; ++o) {
-      printf("    --%s\n", o->name);
-   }
-   exit(EXIT_FAILURE);
-}
-
-
-void
-compile_shader(struct gl_context *ctx, struct gl_shader *shader)
-{
-   struct _mesa_glsl_parse_state *state =
-      new(shader) _mesa_glsl_parse_state(ctx, shader->Type, shader);
-
-   const char *source = shader->Source;
-   state->error = preprocess(state, &source, &state->info_log,
-			     state->extensions, ctx->API) != 0;
-
-   if (!state->error) {
-      _mesa_glsl_lexer_ctor(state, source);
-      _mesa_glsl_parse(state);
-      _mesa_glsl_lexer_dtor(state);
-   }
-
-   if (dump_ast) {
-      foreach_list_const(n, &state->translation_unit) {
-	 ast_node *ast = exec_node_data(ast_node, n, link);
-	 ast->print();
-      }
-      printf("\n\n");
-   }
-
-   shader->ir = new(shader) exec_list;
-   if (!state->error && !state->translation_unit.is_empty())
-      _mesa_ast_to_hir(shader->ir, state);
-
-   /* Print out the unoptimized IR. */
-   if (!state->error && dump_hir) {
-      validate_ir_tree(shader->ir);
-      _mesa_print_ir(shader->ir, state);
-   }
-
-   /* Optimization passes */
-   if (!state->error && !shader->ir->is_empty()) {
-      bool progress;
-      do {
-	 progress = do_common_optimization(shader->ir, false, 32);
-      } while (progress);
-
-      validate_ir_tree(shader->ir);
-   }
-
-
-   /* Print out the resulting IR */
-   if (!state->error && dump_lir) {
-      _mesa_print_ir(shader->ir, state);
-   }
-
-   shader->symbols = state->symbols;
-   shader->CompileStatus = !state->error;
-   shader->Version = state->language_version;
-   memcpy(shader->builtins_to_link, state->builtins_to_link,
-	  sizeof(shader->builtins_to_link[0]) * state->num_builtins_to_link);
-   shader->num_builtins_to_link = state->num_builtins_to_link;
-
-   if (shader->InfoLog)
-      ralloc_free(shader->InfoLog);
-
-   shader->InfoLog = state->info_log;
-
-   /* Retain any live IR, but trash the rest. */
-   reparent_ir(shader->ir, shader);
-
-   ralloc_free(state);
-
-   return;
-}
-
-int
-main(int argc, char **argv)
-{
-   int status = EXIT_SUCCESS;
-   struct gl_context local_ctx;
-   struct gl_context *ctx = &local_ctx;
-
-   int c;
-   int idx = 0;
-   while ((c = getopt_long(argc, argv, "", compiler_opts, &idx)) != -1)
-      /* empty */ ;
-
-
-   if (argc <= optind)
-      usage_fail(argv[0]);
-
-   initialize_context(ctx, (glsl_es) ? API_OPENGLES2 : API_OPENGL);
-
-   struct gl_shader_program *whole_program;
-
-   whole_program = rzalloc (NULL, struct gl_shader_program);
-   assert(whole_program != NULL);
-
-   for (/* empty */; argc > optind; optind++) {
-      whole_program->Shaders =
-	 reralloc(whole_program, whole_program->Shaders,
-		  struct gl_shader *, whole_program->NumShaders + 1);
-      assert(whole_program->Shaders != NULL);
-
-      struct gl_shader *shader = rzalloc(whole_program, gl_shader);
-
-      whole_program->Shaders[whole_program->NumShaders] = shader;
-      whole_program->NumShaders++;
-
-      const unsigned len = strlen(argv[optind]);
-      if (len < 6)
-	 usage_fail(argv[0]);
-
-      const char *const ext = & argv[optind][len - 5];
-      if (strncmp(".vert", ext, 5) == 0)
-	 shader->Type = GL_VERTEX_SHADER;
-      else if (strncmp(".geom", ext, 5) == 0)
-	 shader->Type = GL_GEOMETRY_SHADER;
-      else if (strncmp(".frag", ext, 5) == 0)
-	 shader->Type = GL_FRAGMENT_SHADER;
-      else
-	 usage_fail(argv[0]);
-
-      shader->Source = load_text_file(whole_program, argv[optind]);
-      if (shader->Source == NULL) {
-	 printf("File \"%s\" does not exist.\n", argv[optind]);
-	 exit(EXIT_FAILURE);
-      }
-
-      compile_shader(ctx, shader);
-
-      if (!shader->CompileStatus) {
-	 printf("Info log for %s:\n%s\n", argv[optind], shader->InfoLog);
-	 status = EXIT_FAILURE;
-	 break;
-      }
-   }
-
-   if ((status == EXIT_SUCCESS) && do_link)  {
-      link_shaders(ctx, whole_program);
-      status = (whole_program->LinkStatus) ? EXIT_SUCCESS : EXIT_FAILURE;
-
-      if (strlen(whole_program->InfoLog) > 0)
-	 printf("Info log for linking:\n%s\n", whole_program->InfoLog);
-   }
-
-   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++)
-      ralloc_free(whole_program->_LinkedShaders[i]);
-
-   ralloc_free(whole_program);
-   _mesa_glsl_release_types();
-   _mesa_glsl_release_functions();
-
-   return status;
-}
+/*

+ * Copyright © 2008, 2009 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+#include <io.h>

+

+#ifdef _MSC_VER

+#define __STDC__ 1

+#include <getopt.h>

+#define open _open

+#define read _read

+#define fstat _fstat

+#define stat _stat

+#define close _close

+#define O_RDONLY _O_RDONLY

+#endif

+

+#include "ast.h"

+#include "glsl_parser_extras.h"

+#include "glsl_parser.h"

+#include "ir_optimization.h"

+#include "ir_print_visitor.h"

+#include "program.h"

+#include "loop_analysis.h"

+

+extern "C" struct gl_shader *

+_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type);

+

+extern "C" void

+_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,

+                       struct gl_shader *sh);

+

+/* Copied from shader_api.c for the stand-alone compiler.

+ */

+void

+_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,

+                       struct gl_shader *sh)

+{

+   *ptr = sh;

+}

+

+struct gl_shader *

+_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type)

+{

+   struct gl_shader *shader;

+

+   (void) ctx;

+

+   assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER);

+   shader = rzalloc(NULL, struct gl_shader);

+   if (shader) {

+      shader->Type = type;

+      shader->Name = name;

+      shader->RefCount = 1;

+   }

+   return shader;

+}

+

+static void

+initialize_context(struct gl_context *ctx, gl_api api)

+{

+   memset(ctx, 0, sizeof(*ctx));

+

+   ctx->API = api;

+

+   ctx->Extensions.ARB_ES2_compatibility = GL_TRUE;

+   ctx->Extensions.ARB_draw_buffers = GL_TRUE;

+   ctx->Extensions.ARB_draw_instanced = GL_TRUE;

+   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;

+   ctx->Extensions.EXT_texture_array = GL_TRUE;

+   ctx->Extensions.NV_texture_rectangle = GL_TRUE;

+

+   /* GLSL 1.30 isn't fully supported, but we need to advertise 1.30 so that

+    * the built-in functions for 1.30 can be built.

+    */

+   ctx->Const.GLSLVersion = 130;

+

+   /* 1.10 minimums. */

+   ctx->Const.MaxLights = 8;

+   ctx->Const.MaxClipPlanes = 8;

+   ctx->Const.MaxTextureUnits = 2;

+

+   /* More than the 1.10 minimum to appease parser tests taken from

+    * apps that (hopefully) already checked the number of coords.

+    */

+   ctx->Const.MaxTextureCoordUnits = 4;

+

+   ctx->Const.VertexProgram.MaxAttribs = 16;

+   ctx->Const.VertexProgram.MaxUniformComponents = 512;

+   ctx->Const.MaxVarying = 8;

+   ctx->Const.MaxVertexTextureImageUnits = 0;

+   ctx->Const.MaxCombinedTextureImageUnits = 2;

+   ctx->Const.MaxTextureImageUnits = 2;

+   ctx->Const.FragmentProgram.MaxUniformComponents = 64;

+

+   ctx->Const.MaxDrawBuffers = 2;

+

+   ctx->Driver.NewShader = _mesa_new_shader;

+}

+

+/* Returned string will have 'ctx' as its ralloc owner. */

+static char *

+load_text_file(void *ctx, const char *file_name)

+{

+	char *text = NULL;

+	size_t size;

+	size_t total_read = 0;

+	FILE *fp = fopen(file_name, "rb");

+

+	if (!fp) {

+		return NULL;

+	}

+

+	fseek(fp, 0L, SEEK_END);

+	size = ftell(fp);

+	fseek(fp, 0L, SEEK_SET);

+

+	text = (char *) ralloc_size(ctx, size + 1);

+	if (text != NULL) {

+		do {

+			size_t bytes = fread(text + total_read,

+					     1, size - total_read, fp);

+			if (bytes < size - total_read) {

+				free(text);

+				text = NULL;

+				break;

+			}

+

+			if (bytes == 0) {

+				break;

+			}

+

+			total_read += bytes;

+		} while (total_read < size);

+

+		text[total_read] = '\0';

+	}

+

+	fclose(fp);

+

+	return text;

+}

+

+int glsl_es = 0;

+int dump_ast = 0;

+int dump_hir = 0;

+int dump_lir = 0;

+int do_link = 0;

+

+const struct option compiler_opts[] = {

+   { "glsl-es",  0, &glsl_es,  1 },

+   { "dump-ast", 0, &dump_ast, 1 },

+   { "dump-hir", 0, &dump_hir, 1 },

+   { "dump-lir", 0, &dump_lir, 1 },

+   { "link",     0, &do_link,  1 },

+   { NULL, 0, NULL, 0 }

+};

+

+/**

+ * \brief Print proper usage and exit with failure.

+ */

+void

+usage_fail(const char *name)

+{

+

+   const char *header =

+      "usage: %s [options] <file.vert | file.geom | file.frag>\n"

+      "\n"

+      "Possible options are:\n";

+   printf(header, name, name);

+   for (const struct option *o = compiler_opts; o->name != 0; ++o) {

+      printf("    --%s\n", o->name);

+   }

+   exit(EXIT_FAILURE);

+}

+

+

+void

+compile_shader(struct gl_context *ctx, struct gl_shader *shader)

+{

+   struct _mesa_glsl_parse_state *state =

+      new(shader) _mesa_glsl_parse_state(ctx, shader->Type, shader);

+

+   const char *source = shader->Source;

+   state->error = preprocess(state, &source, &state->info_log,

+			     state->extensions, ctx->API) != 0;

+

+   if (!state->error) {

+      _mesa_glsl_lexer_ctor(state, source);

+      _mesa_glsl_parse(state);

+      _mesa_glsl_lexer_dtor(state);

+   }

+

+   if (dump_ast) {

+      foreach_list_const(n, &state->translation_unit) {

+	 ast_node *ast = exec_node_data(ast_node, n, link);

+	 ast->print();

+      }

+      printf("\n\n");

+   }

+

+   shader->ir = new(shader) exec_list;

+   if (!state->error && !state->translation_unit.is_empty())

+      _mesa_ast_to_hir(shader->ir, state);

+

+   /* Print out the unoptimized IR. */

+   if (!state->error && dump_hir) {

+      validate_ir_tree(shader->ir);

+      _mesa_print_ir(shader->ir, state);

+   }

+

+   /* Optimization passes */

+   if (!state->error && !shader->ir->is_empty()) {

+      bool progress;

+      do {

+	 progress = do_common_optimization(shader->ir, false, 32);

+      } while (progress);

+

+      validate_ir_tree(shader->ir);

+   }

+

+

+   /* Print out the resulting IR */

+   if (!state->error && dump_lir) {

+      _mesa_print_ir(shader->ir, state);

+   }

+

+   shader->symbols = state->symbols;

+   shader->CompileStatus = !state->error;

+   shader->Version = state->language_version;

+   memcpy(shader->builtins_to_link, state->builtins_to_link,

+	  sizeof(shader->builtins_to_link[0]) * state->num_builtins_to_link);

+   shader->num_builtins_to_link = state->num_builtins_to_link;

+

+   if (shader->InfoLog)

+      ralloc_free(shader->InfoLog);

+

+   shader->InfoLog = state->info_log;

+

+   /* Retain any live IR, but trash the rest. */

+   reparent_ir(shader->ir, shader);

+

+   ralloc_free(state);

+

+   return;

+}

+

+int

+main(int argc, char **argv)

+{

+   int status = EXIT_SUCCESS;

+   struct gl_context local_ctx;

+   struct gl_context *ctx = &local_ctx;

+

+   int c;

+   int idx = 0;

+   while ((c = getopt_long(argc, argv, "", compiler_opts, &idx)) != -1)

+      /* empty */ ;

+

+

+   if (argc <= optind)

+      usage_fail(argv[0]);

+

+   initialize_context(ctx, (glsl_es) ? API_OPENGLES2 : API_OPENGL);

+

+   struct gl_shader_program *whole_program;

+

+   whole_program = rzalloc (NULL, struct gl_shader_program);

+   assert(whole_program != NULL);

+

+   for (/* empty */; argc > optind; optind++) {

+      whole_program->Shaders =

+	 reralloc(whole_program, whole_program->Shaders,

+		  struct gl_shader *, whole_program->NumShaders + 1);

+      assert(whole_program->Shaders != NULL);

+

+      struct gl_shader *shader = rzalloc(whole_program, gl_shader);

+

+      whole_program->Shaders[whole_program->NumShaders] = shader;

+      whole_program->NumShaders++;

+

+      const unsigned len = strlen(argv[optind]);

+      if (len < 6)

+	 usage_fail(argv[0]);

+

+      const char *const ext = & argv[optind][len - 5];

+      if (strncmp(".vert", ext, 5) == 0)

+	 shader->Type = GL_VERTEX_SHADER;

+      else if (strncmp(".geom", ext, 5) == 0)

+	 shader->Type = GL_GEOMETRY_SHADER;

+      else if (strncmp(".frag", ext, 5) == 0)

+	 shader->Type = GL_FRAGMENT_SHADER;

+      else

+	 usage_fail(argv[0]);

+

+      shader->Source = load_text_file(whole_program, argv[optind]);

+      if (shader->Source == NULL) {

+	 printf("File \"%s\" does not exist.\n", argv[optind]);

+	 exit(EXIT_FAILURE);

+      }

+

+      compile_shader(ctx, shader);

+

+      if (!shader->CompileStatus) {

+	 printf("Info log for %s:\n%s\n", argv[optind], shader->InfoLog);

+	 status = EXIT_FAILURE;

+	 break;

+      }

+   }

+

+   if ((status == EXIT_SUCCESS) && do_link)  {

+      link_shaders(ctx, whole_program);

+      status = (whole_program->LinkStatus) ? EXIT_SUCCESS : EXIT_FAILURE;

+

+      if (strlen(whole_program->InfoLog) > 0)

+	 printf("Info log for linking:\n%s\n", whole_program->InfoLog);

+   }

+

+   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++)

+      ralloc_free(whole_program->_LinkedShaders[i]);

+

+   ralloc_free(whole_program);

+   _mesa_glsl_release_types();

+   _mesa_glsl_release_functions();

+

+   return status;

+}

diff --git a/mesalib/src/glsl/opt_constant_propagation.cpp b/mesalib/src/glsl/opt_constant_propagation.cpp
index 4425f4211..55c271200 100644
--- a/mesalib/src/glsl/opt_constant_propagation.cpp
+++ b/mesalib/src/glsl/opt_constant_propagation.cpp
@@ -1,434 +1,434 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * constant of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, constant, 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 constantright notice and this permission notice (including the next
- * paragraph) 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 CONSTANTRIGHT 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.
- */
-
-/**
- * \file opt_constant_propagation.cpp
- *
- * Tracks assignments of constants to channels of variables, and
- * usage of those constant channels with direct usage of the constants.
- *
- * This can lead to constant folding and algebraic optimizations in
- * those later expressions, while causing no increase in instruction
- * count (due to constants being generally free to load from a
- * constant push buffer or as instruction immediate values) and
- * possibly reducing register pressure.
- */
-
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_rvalue_visitor.h"
-#include "ir_basic_block.h"
-#include "ir_optimization.h"
-#include "glsl_types.h"
-
-class acp_entry : public exec_node
-{
-public:
-   acp_entry(ir_variable *var, unsigned write_mask, ir_constant *constant)
-   {
-      assert(var);
-      assert(constant);
-      this->var = var;
-      this->write_mask = write_mask;
-      this->constant = constant;
-   }
-
-   ir_variable *var;
-   ir_constant *constant;
-   unsigned write_mask;
-};
-
-
-class kill_entry : public exec_node
-{
-public:
-   kill_entry(ir_variable *var, unsigned write_mask)
-   {
-      assert(var);
-      this->var = var;
-      this->write_mask = write_mask;
-   }
-
-   ir_variable *var;
-   unsigned write_mask;
-};
-
-class ir_constant_propagation_visitor : public ir_rvalue_visitor {
-public:
-   ir_constant_propagation_visitor()
-   {
-      progress = false;
-      mem_ctx = ralloc_context(0);
-      this->acp = new(mem_ctx) exec_list;
-      this->kills = new(mem_ctx) exec_list;
-   }
-   ~ir_constant_propagation_visitor()
-   {
-      ralloc_free(mem_ctx);
-   }
-
-   virtual ir_visitor_status visit_enter(class ir_loop *);
-   virtual ir_visitor_status visit_enter(class ir_function_signature *);
-   virtual ir_visitor_status visit_enter(class ir_function *);
-   virtual ir_visitor_status visit_leave(class ir_assignment *);
-   virtual ir_visitor_status visit_enter(class ir_call *);
-   virtual ir_visitor_status visit_enter(class ir_if *);
-
-   void add_constant(ir_assignment *ir);
-   void kill(ir_variable *ir, unsigned write_mask);
-   void handle_if_block(exec_list *instructions);
-   void handle_rvalue(ir_rvalue **rvalue);
-
-   /** List of acp_entry: The available constants to propagate */
-   exec_list *acp;
-
-   /**
-    * List of kill_entry: The masks of variables whose values were
-    * killed in this block.
-    */
-   exec_list *kills;
-
-   bool progress;
-
-   bool killed_all;
-
-   void *mem_ctx;
-};
-
-
-void
-ir_constant_propagation_visitor::handle_rvalue(ir_rvalue **rvalue)
-{
-   if (this->in_assignee || !*rvalue)
-      return;
-
-   const glsl_type *type = (*rvalue)->type;
-   if (!type->is_scalar() && !type->is_vector())
-      return;
-
-   ir_swizzle *swiz = NULL;
-   ir_dereference_variable *deref = (*rvalue)->as_dereference_variable();
-   if (!deref) {
-      swiz = (*rvalue)->as_swizzle();
-      if (!swiz)
-	 return;
-
-      deref = swiz->val->as_dereference_variable();
-      if (!deref)
-	 return;
-   }
-
-   ir_constant_data data;
-   memset(&data, 0, sizeof(data));
-
-   for (unsigned int i = 0; i < type->components(); i++) {
-      int channel;
-      acp_entry *found = NULL;
-
-      if (swiz) {
-	 switch (i) {
-	 case 0: channel = swiz->mask.x; break;
-	 case 1: channel = swiz->mask.y; break;
-	 case 2: channel = swiz->mask.z; break;
-	 case 3: channel = swiz->mask.w; break;
-	 default: assert(!"shouldn't be reached"); channel = 0; break;
-	 }
-      } else {
-	 channel = i;
-      }
-
-      foreach_iter(exec_list_iterator, iter, *this->acp) {
-	 acp_entry *entry = (acp_entry *)iter.get();
-	 if (entry->var == deref->var && entry->write_mask & (1 << channel)) {
-	    found = entry;
-	    break;
-	 }
-      }
-
-      if (!found)
-	 return;
-
-      int rhs_channel = 0;
-      for (int j = 0; j < 4; j++) {
-	 if (j == channel)
-	    break;
-	 if (found->write_mask & (1 << j))
-	    rhs_channel++;
-      }
-
-      switch (type->base_type) {
-      case GLSL_TYPE_FLOAT:
-	 data.f[i] = found->constant->value.f[rhs_channel];
-	 break;
-      case GLSL_TYPE_INT:
-	 data.i[i] = found->constant->value.i[rhs_channel];
-	 break;
-      case GLSL_TYPE_UINT:
-	 data.u[i] = found->constant->value.u[rhs_channel];
-	 break;
-      case GLSL_TYPE_BOOL:
-	 data.b[i] = found->constant->value.b[rhs_channel];
-	 break;
-      default:
-	 assert(!"not reached");
-	 break;
-      }
-   }
-
-   *rvalue = new(ralloc_parent(deref)) ir_constant(type, &data);
-   this->progress = true;
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_enter(ir_function_signature *ir)
-{
-   /* Treat entry into a function signature as a completely separate
-    * block.  Any instructions at global scope will be shuffled into
-    * main() at link time, so they're irrelevant to us.
-    */
-   exec_list *orig_acp = this->acp;
-   exec_list *orig_kills = this->kills;
-   bool orig_killed_all = this->killed_all;
-
-   this->acp = new(mem_ctx) exec_list;
-   this->kills = new(mem_ctx) exec_list;
-   this->killed_all = false;
-
-   visit_list_elements(this, &ir->body);
-
-   this->kills = orig_kills;
-   this->acp = orig_acp;
-   this->killed_all = orig_killed_all;
-
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_leave(ir_assignment *ir)
-{
-   if (this->in_assignee)
-      return visit_continue;
-
-   kill(ir->lhs->variable_referenced(), ir->write_mask);
-
-   add_constant(ir);
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_enter(ir_function *ir)
-{
-   (void) ir;
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_enter(ir_call *ir)
-{
-   /* Do constant propagation on call parameters, but skip any out params */
-   exec_list_iterator sig_param_iter = ir->get_callee()->parameters.iterator();
-   foreach_iter(exec_list_iterator, iter, ir->actual_parameters) {
-      ir_variable *sig_param = (ir_variable *)sig_param_iter.get();
-      ir_rvalue *param = (ir_rvalue *)iter.get();
-      if (sig_param->mode != ir_var_out && sig_param->mode != ir_var_inout) {
-	 ir_rvalue *new_param = param;
-	 handle_rvalue(&new_param);
-         if (new_param != param)
-	    param->replace_with(new_param);
-	 else
-	    param->accept(this);
-      }
-      sig_param_iter.next();
-   }
-
-   /* Since we're unlinked, we don't (necssarily) know the side effects of
-    * this call.  So kill all copies.
-    */
-   acp->make_empty();
-   this->killed_all = true;
-
-   return visit_continue_with_parent;
-}
-
-void
-ir_constant_propagation_visitor::handle_if_block(exec_list *instructions)
-{
-   exec_list *orig_acp = this->acp;
-   exec_list *orig_kills = this->kills;
-   bool orig_killed_all = this->killed_all;
-
-   this->acp = new(mem_ctx) exec_list;
-   this->kills = new(mem_ctx) exec_list;
-   this->killed_all = false;
-
-   /* Populate the initial acp with a constant of the original */
-   foreach_iter(exec_list_iterator, iter, *orig_acp) {
-      acp_entry *a = (acp_entry *)iter.get();
-      this->acp->push_tail(new(this->mem_ctx) acp_entry(a->var, a->write_mask,
-							a->constant));
-   }
-
-   visit_list_elements(this, instructions);
-
-   if (this->killed_all) {
-      orig_acp->make_empty();
-   }
-
-   exec_list *new_kills = this->kills;
-   this->kills = orig_kills;
-   this->acp = orig_acp;
-   this->killed_all = this->killed_all || orig_killed_all;
-
-   foreach_iter(exec_list_iterator, iter, *new_kills) {
-      kill_entry *k = (kill_entry *)iter.get();
-      kill(k->var, k->write_mask);
-   }
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_enter(ir_if *ir)
-{
-   ir->condition->accept(this);
-   handle_rvalue(&ir->condition);
-
-   handle_if_block(&ir->then_instructions);
-   handle_if_block(&ir->else_instructions);
-
-   /* handle_if_block() already descended into the children. */
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_enter(ir_loop *ir)
-{
-   exec_list *orig_acp = this->acp;
-   exec_list *orig_kills = this->kills;
-   bool orig_killed_all = this->killed_all;
-
-   /* FINISHME: For now, the initial acp for loops is totally empty.
-    * We could go through once, then go through again with the acp
-    * cloned minus the killed entries after the first run through.
-    */
-   this->acp = new(mem_ctx) exec_list;
-   this->kills = new(mem_ctx) exec_list;
-   this->killed_all = false;
-
-   visit_list_elements(this, &ir->body_instructions);
-
-   if (this->killed_all) {
-      orig_acp->make_empty();
-   }
-
-   exec_list *new_kills = this->kills;
-   this->kills = orig_kills;
-   this->acp = orig_acp;
-   this->killed_all = this->killed_all || orig_killed_all;
-
-   foreach_iter(exec_list_iterator, iter, *new_kills) {
-      kill_entry *k = (kill_entry *)iter.get();
-      kill(k->var, k->write_mask);
-   }
-
-   /* already descended into the children. */
-   return visit_continue_with_parent;
-}
-
-void
-ir_constant_propagation_visitor::kill(ir_variable *var, unsigned write_mask)
-{
-   assert(var != NULL);
-
-   /* We don't track non-vectors. */
-   if (!var->type->is_vector() && !var->type->is_scalar())
-      return;
-
-   /* Remove any entries currently in the ACP for this kill. */
-   foreach_iter(exec_list_iterator, iter, *this->acp) {
-      acp_entry *entry = (acp_entry *)iter.get();
-
-      if (entry->var == var) {
-	 entry->write_mask &= ~write_mask;
-	 if (entry->write_mask == 0)
-	    entry->remove();
-      }
-   }
-
-   /* Add this writemask of the variable to the list of killed
-    * variables in this block.
-    */
-   foreach_iter(exec_list_iterator, iter, *this->kills) {
-      kill_entry *entry = (kill_entry *)iter.get();
-
-      if (entry->var == var) {
-	 entry->write_mask |= write_mask;
-	 return;
-      }
-   }
-   /* Not already in the list.  Make new entry. */
-   this->kills->push_tail(new(this->mem_ctx) kill_entry(var, write_mask));
-}
-
-/**
- * Adds an entry to the available constant list if it's a plain assignment
- * of a variable to a variable.
- */
-void
-ir_constant_propagation_visitor::add_constant(ir_assignment *ir)
-{
-   acp_entry *entry;
-
-   if (ir->condition)
-      return;
-
-   if (!ir->write_mask)
-      return;
-
-   ir_dereference_variable *deref = ir->lhs->as_dereference_variable();
-   ir_constant *constant = ir->rhs->as_constant();
-
-   if (!deref || !constant)
-      return;
-
-   /* Only do constant propagation on vectors.  Constant matrices,
-    * arrays, or structures would require more work elsewhere.
-    */
-   if (!deref->var->type->is_vector() && !deref->var->type->is_scalar())
-      return;
-
-   entry = new(this->mem_ctx) acp_entry(deref->var, ir->write_mask, constant);
-   this->acp->push_tail(entry);
-}
-
-/**
- * Does a constant propagation pass on the code present in the instruction stream.
- */
-bool
-do_constant_propagation(exec_list *instructions)
-{
-   ir_constant_propagation_visitor v;
-
-   visit_list_elements(&v, instructions);
-
-   return v.progress;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * constant of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, constant, 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 constantright notice and this permission notice (including the next

+ * paragraph) 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 CONSTANTRIGHT 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.

+ */

+

+/**

+ * \file opt_constant_propagation.cpp

+ *

+ * Tracks assignments of constants to channels of variables, and

+ * usage of those constant channels with direct usage of the constants.

+ *

+ * This can lead to constant folding and algebraic optimizations in

+ * those later expressions, while causing no increase in instruction

+ * count (due to constants being generally free to load from a

+ * constant push buffer or as instruction immediate values) and

+ * possibly reducing register pressure.

+ */

+

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_rvalue_visitor.h"

+#include "ir_basic_block.h"

+#include "ir_optimization.h"

+#include "glsl_types.h"

+

+class acp_entry : public exec_node

+{

+public:

+   acp_entry(ir_variable *var, unsigned write_mask, ir_constant *constant)

+   {

+      assert(var);

+      assert(constant);

+      this->var = var;

+      this->write_mask = write_mask;

+      this->constant = constant;

+   }

+

+   ir_variable *var;

+   ir_constant *constant;

+   unsigned write_mask;

+};

+

+

+class kill_entry : public exec_node

+{

+public:

+   kill_entry(ir_variable *var, unsigned write_mask)

+   {

+      assert(var);

+      this->var = var;

+      this->write_mask = write_mask;

+   }

+

+   ir_variable *var;

+   unsigned write_mask;

+};

+

+class ir_constant_propagation_visitor : public ir_rvalue_visitor {

+public:

+   ir_constant_propagation_visitor()

+   {

+      progress = false;

+      mem_ctx = ralloc_context(0);

+      this->acp = new(mem_ctx) exec_list;

+      this->kills = new(mem_ctx) exec_list;

+   }

+   ~ir_constant_propagation_visitor()

+   {

+      ralloc_free(mem_ctx);

+   }

+

+   virtual ir_visitor_status visit_enter(class ir_loop *);

+   virtual ir_visitor_status visit_enter(class ir_function_signature *);

+   virtual ir_visitor_status visit_enter(class ir_function *);

+   virtual ir_visitor_status visit_leave(class ir_assignment *);

+   virtual ir_visitor_status visit_enter(class ir_call *);

+   virtual ir_visitor_status visit_enter(class ir_if *);

+

+   void add_constant(ir_assignment *ir);

+   void kill(ir_variable *ir, unsigned write_mask);

+   void handle_if_block(exec_list *instructions);

+   void handle_rvalue(ir_rvalue **rvalue);

+

+   /** List of acp_entry: The available constants to propagate */

+   exec_list *acp;

+

+   /**

+    * List of kill_entry: The masks of variables whose values were

+    * killed in this block.

+    */

+   exec_list *kills;

+

+   bool progress;

+

+   bool killed_all;

+

+   void *mem_ctx;

+};

+

+

+void

+ir_constant_propagation_visitor::handle_rvalue(ir_rvalue **rvalue)

+{

+   if (this->in_assignee || !*rvalue)

+      return;

+

+   const glsl_type *type = (*rvalue)->type;

+   if (!type->is_scalar() && !type->is_vector())

+      return;

+

+   ir_swizzle *swiz = NULL;

+   ir_dereference_variable *deref = (*rvalue)->as_dereference_variable();

+   if (!deref) {

+      swiz = (*rvalue)->as_swizzle();

+      if (!swiz)

+	 return;

+

+      deref = swiz->val->as_dereference_variable();

+      if (!deref)

+	 return;

+   }

+

+   ir_constant_data data;

+   memset(&data, 0, sizeof(data));

+

+   for (unsigned int i = 0; i < type->components(); i++) {

+      int channel;

+      acp_entry *found = NULL;

+

+      if (swiz) {

+	 switch (i) {

+	 case 0: channel = swiz->mask.x; break;

+	 case 1: channel = swiz->mask.y; break;

+	 case 2: channel = swiz->mask.z; break;

+	 case 3: channel = swiz->mask.w; break;

+	 default: assert(!"shouldn't be reached"); channel = 0; break;

+	 }

+      } else {

+	 channel = i;

+      }

+

+      foreach_iter(exec_list_iterator, iter, *this->acp) {

+	 acp_entry *entry = (acp_entry *)iter.get();

+	 if (entry->var == deref->var && entry->write_mask & (1 << channel)) {

+	    found = entry;

+	    break;

+	 }

+      }

+

+      if (!found)

+	 return;

+

+      int rhs_channel = 0;

+      for (int j = 0; j < 4; j++) {

+	 if (j == channel)

+	    break;

+	 if (found->write_mask & (1 << j))

+	    rhs_channel++;

+      }

+

+      switch (type->base_type) {

+      case GLSL_TYPE_FLOAT:

+	 data.f[i] = found->constant->value.f[rhs_channel];

+	 break;

+      case GLSL_TYPE_INT:

+	 data.i[i] = found->constant->value.i[rhs_channel];

+	 break;

+      case GLSL_TYPE_UINT:

+	 data.u[i] = found->constant->value.u[rhs_channel];

+	 break;

+      case GLSL_TYPE_BOOL:

+	 data.b[i] = found->constant->value.b[rhs_channel];

+	 break;

+      default:

+	 assert(!"not reached");

+	 break;

+      }

+   }

+

+   *rvalue = new(ralloc_parent(deref)) ir_constant(type, &data);

+   this->progress = true;

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_enter(ir_function_signature *ir)

+{

+   /* Treat entry into a function signature as a completely separate

+    * block.  Any instructions at global scope will be shuffled into

+    * main() at link time, so they're irrelevant to us.

+    */

+   exec_list *orig_acp = this->acp;

+   exec_list *orig_kills = this->kills;

+   bool orig_killed_all = this->killed_all;

+

+   this->acp = new(mem_ctx) exec_list;

+   this->kills = new(mem_ctx) exec_list;

+   this->killed_all = false;

+

+   visit_list_elements(this, &ir->body);

+

+   this->kills = orig_kills;

+   this->acp = orig_acp;

+   this->killed_all = orig_killed_all;

+

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_leave(ir_assignment *ir)

+{

+   if (this->in_assignee)

+      return visit_continue;

+

+   kill(ir->lhs->variable_referenced(), ir->write_mask);

+

+   add_constant(ir);

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_enter(ir_function *ir)

+{

+   (void) ir;

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_enter(ir_call *ir)

+{

+   /* Do constant propagation on call parameters, but skip any out params */

+   exec_list_iterator sig_param_iter = ir->get_callee()->parameters.iterator();

+   foreach_iter(exec_list_iterator, iter, ir->actual_parameters) {

+      ir_variable *sig_param = (ir_variable *)sig_param_iter.get();

+      ir_rvalue *param = (ir_rvalue *)iter.get();

+      if (sig_param->mode != ir_var_out && sig_param->mode != ir_var_inout) {

+	 ir_rvalue *new_param = param;

+	 handle_rvalue(&new_param);

+         if (new_param != param)

+	    param->replace_with(new_param);

+	 else

+	    param->accept(this);

+      }

+      sig_param_iter.next();

+   }

+

+   /* Since we're unlinked, we don't (necssarily) know the side effects of

+    * this call.  So kill all copies.

+    */

+   acp->make_empty();

+   this->killed_all = true;

+

+   return visit_continue_with_parent;

+}

+

+void

+ir_constant_propagation_visitor::handle_if_block(exec_list *instructions)

+{

+   exec_list *orig_acp = this->acp;

+   exec_list *orig_kills = this->kills;

+   bool orig_killed_all = this->killed_all;

+

+   this->acp = new(mem_ctx) exec_list;

+   this->kills = new(mem_ctx) exec_list;

+   this->killed_all = false;

+

+   /* Populate the initial acp with a constant of the original */

+   foreach_iter(exec_list_iterator, iter, *orig_acp) {

+      acp_entry *a = (acp_entry *)iter.get();

+      this->acp->push_tail(new(this->mem_ctx) acp_entry(a->var, a->write_mask,

+							a->constant));

+   }

+

+   visit_list_elements(this, instructions);

+

+   if (this->killed_all) {

+      orig_acp->make_empty();

+   }

+

+   exec_list *new_kills = this->kills;

+   this->kills = orig_kills;

+   this->acp = orig_acp;

+   this->killed_all = this->killed_all || orig_killed_all;

+

+   foreach_iter(exec_list_iterator, iter, *new_kills) {

+      kill_entry *k = (kill_entry *)iter.get();

+      kill(k->var, k->write_mask);

+   }

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_enter(ir_if *ir)

+{

+   ir->condition->accept(this);

+   handle_rvalue(&ir->condition);

+

+   handle_if_block(&ir->then_instructions);

+   handle_if_block(&ir->else_instructions);

+

+   /* handle_if_block() already descended into the children. */

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_enter(ir_loop *ir)

+{

+   exec_list *orig_acp = this->acp;

+   exec_list *orig_kills = this->kills;

+   bool orig_killed_all = this->killed_all;

+

+   /* FINISHME: For now, the initial acp for loops is totally empty.

+    * We could go through once, then go through again with the acp

+    * cloned minus the killed entries after the first run through.

+    */

+   this->acp = new(mem_ctx) exec_list;

+   this->kills = new(mem_ctx) exec_list;

+   this->killed_all = false;

+

+   visit_list_elements(this, &ir->body_instructions);

+

+   if (this->killed_all) {

+      orig_acp->make_empty();

+   }

+

+   exec_list *new_kills = this->kills;

+   this->kills = orig_kills;

+   this->acp = orig_acp;

+   this->killed_all = this->killed_all || orig_killed_all;

+

+   foreach_iter(exec_list_iterator, iter, *new_kills) {

+      kill_entry *k = (kill_entry *)iter.get();

+      kill(k->var, k->write_mask);

+   }

+

+   /* already descended into the children. */

+   return visit_continue_with_parent;

+}

+

+void

+ir_constant_propagation_visitor::kill(ir_variable *var, unsigned write_mask)

+{

+   assert(var != NULL);

+

+   /* We don't track non-vectors. */

+   if (!var->type->is_vector() && !var->type->is_scalar())

+      return;

+

+   /* Remove any entries currently in the ACP for this kill. */

+   foreach_iter(exec_list_iterator, iter, *this->acp) {

+      acp_entry *entry = (acp_entry *)iter.get();

+

+      if (entry->var == var) {

+	 entry->write_mask &= ~write_mask;

+	 if (entry->write_mask == 0)

+	    entry->remove();

+      }

+   }

+

+   /* Add this writemask of the variable to the list of killed

+    * variables in this block.

+    */

+   foreach_iter(exec_list_iterator, iter, *this->kills) {

+      kill_entry *entry = (kill_entry *)iter.get();

+

+      if (entry->var == var) {

+	 entry->write_mask |= write_mask;

+	 return;

+      }

+   }

+   /* Not already in the list.  Make new entry. */

+   this->kills->push_tail(new(this->mem_ctx) kill_entry(var, write_mask));

+}

+

+/**

+ * Adds an entry to the available constant list if it's a plain assignment

+ * of a variable to a variable.

+ */

+void

+ir_constant_propagation_visitor::add_constant(ir_assignment *ir)

+{

+   acp_entry *entry;

+

+   if (ir->condition)

+      return;

+

+   if (!ir->write_mask)

+      return;

+

+   ir_dereference_variable *deref = ir->lhs->as_dereference_variable();

+   ir_constant *constant = ir->rhs->as_constant();

+

+   if (!deref || !constant)

+      return;

+

+   /* Only do constant propagation on vectors.  Constant matrices,

+    * arrays, or structures would require more work elsewhere.

+    */

+   if (!deref->var->type->is_vector() && !deref->var->type->is_scalar())

+      return;

+

+   entry = new(this->mem_ctx) acp_entry(deref->var, ir->write_mask, constant);

+   this->acp->push_tail(entry);

+}

+

+/**

+ * Does a constant propagation pass on the code present in the instruction stream.

+ */

+bool

+do_constant_propagation(exec_list *instructions)

+{

+   ir_constant_propagation_visitor v;

+

+   visit_list_elements(&v, instructions);

+

+   return v.progress;

+}

diff --git a/mesalib/src/glsl/opt_constant_variable.cpp b/mesalib/src/glsl/opt_constant_variable.cpp
index 3fa7c3bad..f1aeaa99a 100644
--- a/mesalib/src/glsl/opt_constant_variable.cpp
+++ b/mesalib/src/glsl/opt_constant_variable.cpp
@@ -1,195 +1,195 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file opt_constant_variable.cpp
- *
- * Marks variables assigned a single constant value over the course
- * of the program as constant.
- *
- * The goal here is to trigger further constant folding and then dead
- * code elimination.  This is common with vector/matrix constructors
- * and calls to builtin functions.
- */
-
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_optimization.h"
-#include "glsl_types.h"
-
-struct assignment_entry {
-   exec_node link;
-   int assignment_count;
-   ir_variable *var;
-   ir_constant *constval;
-   bool our_scope;
-};
-
-class ir_constant_variable_visitor : public ir_hierarchical_visitor {
-public:
-   virtual ir_visitor_status visit_enter(ir_dereference_variable *);
-   virtual ir_visitor_status visit(ir_variable *);
-   virtual ir_visitor_status visit_enter(ir_assignment *);
-   virtual ir_visitor_status visit_enter(ir_call *);
-
-   exec_list list;
-};
-
-static struct assignment_entry *
-get_assignment_entry(ir_variable *var, exec_list *list)
-{
-   struct assignment_entry *entry;
-
-   foreach_list_typed(struct assignment_entry, entry, link, list) {
-      if (entry->var == var)
-	 return entry;
-   }
-
-   entry = (struct assignment_entry *)calloc(1, sizeof(*entry));
-   entry->var = var;
-   list->push_head(&entry->link);
-   return entry;
-}
-
-ir_visitor_status
-ir_constant_variable_visitor::visit(ir_variable *ir)
-{
-   struct assignment_entry *entry = get_assignment_entry(ir, &this->list);
-   entry->our_scope = true;
-   return visit_continue;
-}
-
-/* Skip derefs of variables so that we can detect declarations. */
-ir_visitor_status
-ir_constant_variable_visitor::visit_enter(ir_dereference_variable *ir)
-{
-   (void)ir;
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_constant_variable_visitor::visit_enter(ir_assignment *ir)
-{
-   ir_constant *constval;
-   struct assignment_entry *entry;
-
-   entry = get_assignment_entry(ir->lhs->variable_referenced(), &this->list);
-   assert(entry);
-   entry->assignment_count++;
-
-   /* If it's already constant, don't do the work. */
-   if (entry->var->constant_value)
-      return visit_continue;
-
-   /* OK, now find if we actually have all the right conditions for
-    * this to be a constant value assigned to the var.
-    */
-   if (ir->condition)
-      return visit_continue;
-
-   ir_variable *var = ir->whole_variable_written();
-   if (!var)
-      return visit_continue;
-
-   constval = ir->rhs->constant_expression_value();
-   if (!constval)
-      return visit_continue;
-
-   /* Mark this entry as having a constant assignment (if the
-    * assignment count doesn't go >1).  do_constant_variable will fix
-    * up the variable with the constant value later.
-    */
-   entry->constval = constval;
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_constant_variable_visitor::visit_enter(ir_call *ir)
-{
-   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_rvalue *param_rval = (ir_rvalue *)iter.get();
-      ir_variable *param = (ir_variable *)sig_iter.get();
-
-      if (param->mode == ir_var_out ||
-	  param->mode == ir_var_inout) {
-	 ir_variable *var = param_rval->variable_referenced();
-	 struct assignment_entry *entry;
-
-	 assert(var);
-	 entry = get_assignment_entry(var, &this->list);
-	 entry->assignment_count++;
-      }
-      sig_iter.next();
-   }
-   return visit_continue;
-}
-
-/**
- * Does a copy propagation pass on the code present in the instruction stream.
- */
-bool
-do_constant_variable(exec_list *instructions)
-{
-   bool progress = false;
-   ir_constant_variable_visitor v;
-
-   v.run(instructions);
-
-   while (!v.list.is_empty()) {
-
-      struct assignment_entry *entry;
-      entry = exec_node_data(struct assignment_entry, v.list.head, link);
-
-      if (entry->assignment_count == 1 && entry->constval && entry->our_scope) {
-	 entry->var->constant_value = entry->constval;
-	 progress = true;
-      }
-      entry->link.remove();
-      free(entry);
-   }
-
-   return progress;
-}
-
-bool
-do_constant_variable_unlinked(exec_list *instructions)
-{
-   bool progress = false;
-
-   foreach_iter(exec_list_iterator, iter, *instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      ir_function *f = ir->as_function();
-      if (f) {
-	 foreach_iter(exec_list_iterator, sigiter, *f) {
-	    ir_function_signature *sig =
-	       (ir_function_signature *) sigiter.get();
-	    if (do_constant_variable(&sig->body))
-	       progress = true;
-	 }
-      }
-   }
-
-   return progress;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file opt_constant_variable.cpp

+ *

+ * Marks variables assigned a single constant value over the course

+ * of the program as constant.

+ *

+ * The goal here is to trigger further constant folding and then dead

+ * code elimination.  This is common with vector/matrix constructors

+ * and calls to builtin functions.

+ */

+

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_optimization.h"

+#include "glsl_types.h"

+

+struct assignment_entry {

+   exec_node link;

+   int assignment_count;

+   ir_variable *var;

+   ir_constant *constval;

+   bool our_scope;

+};

+

+class ir_constant_variable_visitor : public ir_hierarchical_visitor {

+public:

+   virtual ir_visitor_status visit_enter(ir_dereference_variable *);

+   virtual ir_visitor_status visit(ir_variable *);

+   virtual ir_visitor_status visit_enter(ir_assignment *);

+   virtual ir_visitor_status visit_enter(ir_call *);

+

+   exec_list list;

+};

+

+static struct assignment_entry *

+get_assignment_entry(ir_variable *var, exec_list *list)

+{

+   struct assignment_entry *entry;

+

+   foreach_list_typed(struct assignment_entry, entry, link, list) {

+      if (entry->var == var)

+	 return entry;

+   }

+

+   entry = (struct assignment_entry *)calloc(1, sizeof(*entry));

+   entry->var = var;

+   list->push_head(&entry->link);

+   return entry;

+}

+

+ir_visitor_status

+ir_constant_variable_visitor::visit(ir_variable *ir)

+{

+   struct assignment_entry *entry = get_assignment_entry(ir, &this->list);

+   entry->our_scope = true;

+   return visit_continue;

+}

+

+/* Skip derefs of variables so that we can detect declarations. */

+ir_visitor_status

+ir_constant_variable_visitor::visit_enter(ir_dereference_variable *ir)

+{

+   (void)ir;

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_constant_variable_visitor::visit_enter(ir_assignment *ir)

+{

+   ir_constant *constval;

+   struct assignment_entry *entry;

+

+   entry = get_assignment_entry(ir->lhs->variable_referenced(), &this->list);

+   assert(entry);

+   entry->assignment_count++;

+

+   /* If it's already constant, don't do the work. */

+   if (entry->var->constant_value)

+      return visit_continue;

+

+   /* OK, now find if we actually have all the right conditions for

+    * this to be a constant value assigned to the var.

+    */

+   if (ir->condition)

+      return visit_continue;

+

+   ir_variable *var = ir->whole_variable_written();

+   if (!var)

+      return visit_continue;

+

+   constval = ir->rhs->constant_expression_value();

+   if (!constval)

+      return visit_continue;

+

+   /* Mark this entry as having a constant assignment (if the

+    * assignment count doesn't go >1).  do_constant_variable will fix

+    * up the variable with the constant value later.

+    */

+   entry->constval = constval;

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_constant_variable_visitor::visit_enter(ir_call *ir)

+{

+   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();

+   foreach_iter(exec_list_iterator, iter, *ir) {

+      ir_rvalue *param_rval = (ir_rvalue *)iter.get();

+      ir_variable *param = (ir_variable *)sig_iter.get();

+

+      if (param->mode == ir_var_out ||

+	  param->mode == ir_var_inout) {

+	 ir_variable *var = param_rval->variable_referenced();

+	 struct assignment_entry *entry;

+

+	 assert(var);

+	 entry = get_assignment_entry(var, &this->list);

+	 entry->assignment_count++;

+      }

+      sig_iter.next();

+   }

+   return visit_continue;

+}

+

+/**

+ * Does a copy propagation pass on the code present in the instruction stream.

+ */

+bool

+do_constant_variable(exec_list *instructions)

+{

+   bool progress = false;

+   ir_constant_variable_visitor v;

+

+   v.run(instructions);

+

+   while (!v.list.is_empty()) {

+

+      struct assignment_entry *entry;

+      entry = exec_node_data(struct assignment_entry, v.list.head, link);

+

+      if (entry->assignment_count == 1 && entry->constval && entry->our_scope) {

+	 entry->var->constant_value = entry->constval;

+	 progress = true;

+      }

+      entry->link.remove();

+      free(entry);

+   }

+

+   return progress;

+}

+

+bool

+do_constant_variable_unlinked(exec_list *instructions)

+{

+   bool progress = false;

+

+   foreach_iter(exec_list_iterator, iter, *instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      ir_function *f = ir->as_function();

+      if (f) {

+	 foreach_iter(exec_list_iterator, sigiter, *f) {

+	    ir_function_signature *sig =

+	       (ir_function_signature *) sigiter.get();

+	    if (do_constant_variable(&sig->body))

+	       progress = true;

+	 }

+      }

+   }

+

+   return progress;

+}

diff --git a/mesalib/src/glsl/opt_dead_code.cpp b/mesalib/src/glsl/opt_dead_code.cpp
index cb500d2d1..492ba73a1 100644
--- a/mesalib/src/glsl/opt_dead_code.cpp
+++ b/mesalib/src/glsl/opt_dead_code.cpp
@@ -1,142 +1,142 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file opt_dead_code.cpp
- *
- * Eliminates dead assignments and variable declarations from the code.
- */
-
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_variable_refcount.h"
-#include "glsl_types.h"
-
-static bool debug = false;
-
-/**
- * Do a dead code pass over instructions and everything that instructions
- * references.
- *
- * Note that this will remove assignments to globals, so it is not suitable
- * for usage on an unlinked instruction stream.
- */
-bool
-do_dead_code(exec_list *instructions)
-{
-   ir_variable_refcount_visitor v;
-   bool progress = false;
-
-   v.run(instructions);
-
-   foreach_iter(exec_list_iterator, iter, v.variable_list) {
-      variable_entry *entry = (variable_entry *)iter.get();
-
-      /* Since each assignment is a reference, the refereneced count must be
-       * greater than or equal to the assignment count.  If they are equal,
-       * then all of the references are assignments, and the variable is
-       * dead.
-       *
-       * Note that if the variable is neither assigned nor referenced, both
-       * counts will be zero and will be caught by the equality test.
-       */
-      assert(entry->referenced_count >= entry->assigned_count);
-
-      if (debug) {
-	 printf("%s@%p: %d refs, %d assigns, %sdeclared in our scope\n",
-		entry->var->name, (void *) entry->var,
-		entry->referenced_count, entry->assigned_count,
-		entry->declaration ? "" : "not ");
-      }
-
-      if ((entry->referenced_count > entry->assigned_count)
-	  || !entry->declaration)
-	 continue;
-
-      if (entry->assign) {
-	 /* Remove a single dead assignment to the variable we found.
-	  * Don't do so if it's a shader output, though.
-	  */
-	 if (entry->var->mode != ir_var_out &&
-	     entry->var->mode != ir_var_inout &&
-	     !ir_has_call(entry->assign)) {
-	    entry->assign->remove();
-	    progress = true;
-
-	    if (debug) {
-	       printf("Removed assignment to %s@%p\n",
-		      entry->var->name, (void *) entry->var);
-	    }
-	 }
-      } else {
-	 /* If there are no assignments or references to the variable left,
-	  * then we can remove its declaration.
-	  */
-
-	 /* uniform initializers are precious, and could get used by another
-	  * stage.
-	  */
-	 if (entry->var->mode == ir_var_uniform &&
-	     entry->var->constant_value)
-	    continue;
-
-	 entry->var->remove();
-	 progress = true;
-
-	 if (debug) {
-	    printf("Removed declaration of %s@%p\n",
-		   entry->var->name, (void *) entry->var);
-	 }
-      }
-   }
-
-   return progress;
-}
-
-/**
- * Does a dead code pass on the functions present in the instruction stream.
- *
- * This is suitable for use while the program is not linked, as it will
- * ignore variable declarations (and the assignments to them) for variables
- * with global scope.
- */
-bool
-do_dead_code_unlinked(exec_list *instructions)
-{
-   bool progress = false;
-
-   foreach_iter(exec_list_iterator, iter, *instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      ir_function *f = ir->as_function();
-      if (f) {
-	 foreach_iter(exec_list_iterator, sigiter, *f) {
-	    ir_function_signature *sig =
-	       (ir_function_signature *) sigiter.get();
-	    if (do_dead_code(&sig->body))
-	       progress = true;
-	 }
-      }
-   }
-
-   return progress;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file opt_dead_code.cpp

+ *

+ * Eliminates dead assignments and variable declarations from the code.

+ */

+

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_variable_refcount.h"

+#include "glsl_types.h"

+

+static bool debug = false;

+

+/**

+ * Do a dead code pass over instructions and everything that instructions

+ * references.

+ *

+ * Note that this will remove assignments to globals, so it is not suitable

+ * for usage on an unlinked instruction stream.

+ */

+bool

+do_dead_code(exec_list *instructions)

+{

+   ir_variable_refcount_visitor v;

+   bool progress = false;

+

+   v.run(instructions);

+

+   foreach_iter(exec_list_iterator, iter, v.variable_list) {

+      variable_entry *entry = (variable_entry *)iter.get();

+

+      /* Since each assignment is a reference, the refereneced count must be

+       * greater than or equal to the assignment count.  If they are equal,

+       * then all of the references are assignments, and the variable is

+       * dead.

+       *

+       * Note that if the variable is neither assigned nor referenced, both

+       * counts will be zero and will be caught by the equality test.

+       */

+      assert(entry->referenced_count >= entry->assigned_count);

+

+      if (debug) {

+	 printf("%s@%p: %d refs, %d assigns, %sdeclared in our scope\n",

+		entry->var->name, (void *) entry->var,

+		entry->referenced_count, entry->assigned_count,

+		entry->declaration ? "" : "not ");

+      }

+

+      if ((entry->referenced_count > entry->assigned_count)

+	  || !entry->declaration)

+	 continue;

+

+      if (entry->assign) {

+	 /* Remove a single dead assignment to the variable we found.

+	  * Don't do so if it's a shader output, though.

+	  */

+	 if (entry->var->mode != ir_var_out &&

+	     entry->var->mode != ir_var_inout &&

+	     !ir_has_call(entry->assign)) {

+	    entry->assign->remove();

+	    progress = true;

+

+	    if (debug) {

+	       printf("Removed assignment to %s@%p\n",

+		      entry->var->name, (void *) entry->var);

+	    }

+	 }

+      } else {

+	 /* If there are no assignments or references to the variable left,

+	  * then we can remove its declaration.

+	  */

+

+	 /* uniform initializers are precious, and could get used by another

+	  * stage.

+	  */

+	 if (entry->var->mode == ir_var_uniform &&

+	     entry->var->constant_value)

+	    continue;

+

+	 entry->var->remove();

+	 progress = true;

+

+	 if (debug) {

+	    printf("Removed declaration of %s@%p\n",

+		   entry->var->name, (void *) entry->var);

+	 }

+      }

+   }

+

+   return progress;

+}

+

+/**

+ * Does a dead code pass on the functions present in the instruction stream.

+ *

+ * This is suitable for use while the program is not linked, as it will

+ * ignore variable declarations (and the assignments to them) for variables

+ * with global scope.

+ */

+bool

+do_dead_code_unlinked(exec_list *instructions)

+{

+   bool progress = false;

+

+   foreach_iter(exec_list_iterator, iter, *instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      ir_function *f = ir->as_function();

+      if (f) {

+	 foreach_iter(exec_list_iterator, sigiter, *f) {

+	    ir_function_signature *sig =

+	       (ir_function_signature *) sigiter.get();

+	    if (do_dead_code(&sig->body))

+	       progress = true;

+	 }

+      }

+   }

+

+   return progress;

+}

diff --git a/mesalib/src/glsl/opt_dead_code_local.cpp b/mesalib/src/glsl/opt_dead_code_local.cpp
index 39962bd60..42e5e94c8 100644
--- a/mesalib/src/glsl/opt_dead_code_local.cpp
+++ b/mesalib/src/glsl/opt_dead_code_local.cpp
@@ -1,222 +1,222 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file opt_dead_code_local.cpp
- *
- * Eliminates local dead assignments from the code.
- *
- * This operates on basic blocks, tracking assignments and finding if
- * they're used before the variable is completely reassigned.
- *
- * Compare this to ir_dead_code.cpp, which operates globally looking
- * for assignments to variables that are never read.
- */
-
-#include "ir.h"
-#include "ir_basic_block.h"
-#include "ir_optimization.h"
-#include "glsl_types.h"
-
-static bool debug = false;
-
-class assignment_entry : public exec_node
-{
-public:
-   assignment_entry(ir_variable *lhs, ir_instruction *ir)
-   {
-      assert(lhs);
-      assert(ir);
-      this->lhs = lhs;
-      this->ir = ir;
-   }
-
-   ir_variable *lhs;
-   ir_instruction *ir;
-};
-
-class kill_for_derefs_visitor : public ir_hierarchical_visitor {
-public:
-   kill_for_derefs_visitor(exec_list *assignments)
-   {
-      this->assignments = assignments;
-   }
-
-   virtual ir_visitor_status visit(ir_dereference_variable *ir)
-   {
-      ir_variable *const var = ir->variable_referenced();
-
-      foreach_iter(exec_list_iterator, iter, *this->assignments) {
-	 assignment_entry *entry = (assignment_entry *)iter.get();
-
-	 if (entry->lhs == var) {
-	    if (debug)
-	       printf("kill %s\n", entry->lhs->name);
-	    entry->remove();
-	 }
-      }
-
-      return visit_continue;
-   }
-
-private:
-   exec_list *assignments;
-};
-
-class array_index_visit : public ir_hierarchical_visitor {
-public:
-   array_index_visit(ir_hierarchical_visitor *v)
-   {
-      this->visitor = v;
-   }
-
-   virtual ir_visitor_status visit_enter(class ir_dereference_array *ir)
-   {
-      ir->array_index->accept(visitor);
-      return visit_continue;
-   }
-
-   static void run(ir_instruction *ir, ir_hierarchical_visitor *v)
-   {
-      array_index_visit top_visit(v);
-      ir->accept(& top_visit);
-   }
-
-   ir_hierarchical_visitor *visitor;
-};
-
-
-/**
- * Adds an entry to the available copy list if it's a plain assignment
- * of a variable to a variable.
- */
-static bool
-process_assignment(void *ctx, ir_assignment *ir, exec_list *assignments)
-{
-   ir_variable *var = NULL;
-   bool progress = false;
-   kill_for_derefs_visitor v(assignments);
-
-   /* Kill assignment entries for things used to produce this assignment. */
-   ir->rhs->accept(&v);
-   if (ir->condition) {
-      ir->condition->accept(&v);
-   }
-
-   /* Kill assignment enties used as array indices.
-    */
-   array_index_visit::run(ir->lhs, &v);
-   var = ir->lhs->variable_referenced();
-   assert(var);
-
-   /* Now, check if we did a whole-variable assignment. */
-   if (!ir->condition && (ir->whole_variable_written() != NULL)) {
-      /* We did a whole-variable assignment.  So, any instruction in
-       * the assignment list with the same LHS is dead.
-       */
-      if (debug)
-	 printf("looking for %s to remove\n", var->name);
-      foreach_iter(exec_list_iterator, iter, *assignments) {
-	 assignment_entry *entry = (assignment_entry *)iter.get();
-
-	 if (entry->lhs == var) {
-	    if (debug)
-	       printf("removing %s\n", var->name);
-	    entry->ir->remove();
-	    entry->remove();
-	    progress = true;
-	 }
-      }
-   }
-
-   /* Add this instruction to the assignment list available to be removed.
-    * But not if the assignment has other side effects.
-    */
-   if (ir_has_call(ir))
-      return progress;
-
-   assignment_entry *entry = new(ctx) assignment_entry(var, ir);
-   assignments->push_tail(entry);
-
-   if (debug) {
-      printf("add %s\n", var->name);
-
-      printf("current entries\n");
-      foreach_iter(exec_list_iterator, iter, *assignments) {
-	 assignment_entry *entry = (assignment_entry *)iter.get();
-
-	 printf("    %s\n", entry->lhs->name);
-      }
-   }
-
-   return progress;
-}
-
-static void
-dead_code_local_basic_block(ir_instruction *first,
-			     ir_instruction *last,
-			     void *data)
-{
-   ir_instruction *ir, *ir_next;
-   /* List of avaialble_copy */
-   exec_list assignments;
-   bool *out_progress = (bool *)data;
-   bool progress = false;
-
-   void *ctx = ralloc_context(NULL);
-   /* Safe looping, since process_assignment */
-   for (ir = first, ir_next = (ir_instruction *)first->next;;
-	ir = ir_next, ir_next = (ir_instruction *)ir->next) {
-      ir_assignment *ir_assign = ir->as_assignment();
-
-      if (debug) {
-	 ir->print();
-	 printf("\n");
-      }
-
-      if (ir_assign) {
-	 progress = process_assignment(ctx, ir_assign, &assignments) || progress;
-      } else {
-	 kill_for_derefs_visitor kill(&assignments);
-	 ir->accept(&kill);
-      }
-
-      if (ir == last)
-	 break;
-   }
-   *out_progress = progress;
-   ralloc_free(ctx);
-}
-
-/**
- * Does a copy propagation pass on the code present in the instruction stream.
- */
-bool
-do_dead_code_local(exec_list *instructions)
-{
-   bool progress = false;
-
-   call_for_basic_blocks(instructions, dead_code_local_basic_block, &progress);
-
-   return progress;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file opt_dead_code_local.cpp

+ *

+ * Eliminates local dead assignments from the code.

+ *

+ * This operates on basic blocks, tracking assignments and finding if

+ * they're used before the variable is completely reassigned.

+ *

+ * Compare this to ir_dead_code.cpp, which operates globally looking

+ * for assignments to variables that are never read.

+ */

+

+#include "ir.h"

+#include "ir_basic_block.h"

+#include "ir_optimization.h"

+#include "glsl_types.h"

+

+static bool debug = false;

+

+class assignment_entry : public exec_node

+{

+public:

+   assignment_entry(ir_variable *lhs, ir_instruction *ir)

+   {

+      assert(lhs);

+      assert(ir);

+      this->lhs = lhs;

+      this->ir = ir;

+   }

+

+   ir_variable *lhs;

+   ir_instruction *ir;

+};

+

+class kill_for_derefs_visitor : public ir_hierarchical_visitor {

+public:

+   kill_for_derefs_visitor(exec_list *assignments)

+   {

+      this->assignments = assignments;

+   }

+

+   virtual ir_visitor_status visit(ir_dereference_variable *ir)

+   {

+      ir_variable *const var = ir->variable_referenced();

+

+      foreach_iter(exec_list_iterator, iter, *this->assignments) {

+	 assignment_entry *entry = (assignment_entry *)iter.get();

+

+	 if (entry->lhs == var) {

+	    if (debug)

+	       printf("kill %s\n", entry->lhs->name);

+	    entry->remove();

+	 }

+      }

+

+      return visit_continue;

+   }

+

+private:

+   exec_list *assignments;

+};

+

+class array_index_visit : public ir_hierarchical_visitor {

+public:

+   array_index_visit(ir_hierarchical_visitor *v)

+   {

+      this->visitor = v;

+   }

+

+   virtual ir_visitor_status visit_enter(class ir_dereference_array *ir)

+   {

+      ir->array_index->accept(visitor);

+      return visit_continue;

+   }

+

+   static void run(ir_instruction *ir, ir_hierarchical_visitor *v)

+   {

+      array_index_visit top_visit(v);

+      ir->accept(& top_visit);

+   }

+

+   ir_hierarchical_visitor *visitor;

+};

+

+

+/**

+ * Adds an entry to the available copy list if it's a plain assignment

+ * of a variable to a variable.

+ */

+static bool

+process_assignment(void *ctx, ir_assignment *ir, exec_list *assignments)

+{

+   ir_variable *var = NULL;

+   bool progress = false;

+   kill_for_derefs_visitor v(assignments);

+

+   /* Kill assignment entries for things used to produce this assignment. */

+   ir->rhs->accept(&v);

+   if (ir->condition) {

+      ir->condition->accept(&v);

+   }

+

+   /* Kill assignment enties used as array indices.

+    */

+   array_index_visit::run(ir->lhs, &v);

+   var = ir->lhs->variable_referenced();

+   assert(var);

+

+   /* Now, check if we did a whole-variable assignment. */

+   if (!ir->condition && (ir->whole_variable_written() != NULL)) {

+      /* We did a whole-variable assignment.  So, any instruction in

+       * the assignment list with the same LHS is dead.

+       */

+      if (debug)

+	 printf("looking for %s to remove\n", var->name);

+      foreach_iter(exec_list_iterator, iter, *assignments) {

+	 assignment_entry *entry = (assignment_entry *)iter.get();

+

+	 if (entry->lhs == var) {

+	    if (debug)

+	       printf("removing %s\n", var->name);

+	    entry->ir->remove();

+	    entry->remove();

+	    progress = true;

+	 }

+      }

+   }

+

+   /* Add this instruction to the assignment list available to be removed.

+    * But not if the assignment has other side effects.

+    */

+   if (ir_has_call(ir))

+      return progress;

+

+   assignment_entry *entry = new(ctx) assignment_entry(var, ir);

+   assignments->push_tail(entry);

+

+   if (debug) {

+      printf("add %s\n", var->name);

+

+      printf("current entries\n");

+      foreach_iter(exec_list_iterator, iter, *assignments) {

+	 assignment_entry *entry = (assignment_entry *)iter.get();

+

+	 printf("    %s\n", entry->lhs->name);

+      }

+   }

+

+   return progress;

+}

+

+static void

+dead_code_local_basic_block(ir_instruction *first,

+			     ir_instruction *last,

+			     void *data)

+{

+   ir_instruction *ir, *ir_next;

+   /* List of avaialble_copy */

+   exec_list assignments;

+   bool *out_progress = (bool *)data;

+   bool progress = false;

+

+   void *ctx = ralloc_context(NULL);

+   /* Safe looping, since process_assignment */

+   for (ir = first, ir_next = (ir_instruction *)first->next;;

+	ir = ir_next, ir_next = (ir_instruction *)ir->next) {

+      ir_assignment *ir_assign = ir->as_assignment();

+

+      if (debug) {

+	 ir->print();

+	 printf("\n");

+      }

+

+      if (ir_assign) {

+	 progress = process_assignment(ctx, ir_assign, &assignments) || progress;

+      } else {

+	 kill_for_derefs_visitor kill(&assignments);

+	 ir->accept(&kill);

+      }

+

+      if (ir == last)

+	 break;

+   }

+   *out_progress = progress;

+   ralloc_free(ctx);

+}

+

+/**

+ * Does a copy propagation pass on the code present in the instruction stream.

+ */

+bool

+do_dead_code_local(exec_list *instructions)

+{

+   bool progress = false;

+

+   call_for_basic_blocks(instructions, dead_code_local_basic_block, &progress);

+

+   return progress;

+}

diff --git a/mesalib/src/glsl/opt_function_inlining.cpp b/mesalib/src/glsl/opt_function_inlining.cpp
index 8fef358cc..3cc405b95 100644
--- a/mesalib/src/glsl/opt_function_inlining.cpp
+++ b/mesalib/src/glsl/opt_function_inlining.cpp
@@ -1,422 +1,422 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file opt_function_inlining.cpp
- *
- * Replaces calls to functions with the body of the function.
- */
-
-#include <inttypes.h>
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_function_inlining.h"
-#include "ir_expression_flattening.h"
-#include "glsl_types.h"
-#include "program/hash_table.h"
-
-static void
-do_sampler_replacement(exec_list *instructions,
-		       ir_variable *sampler,
-		       ir_dereference *deref);
-
-class ir_function_inlining_visitor : public ir_hierarchical_visitor {
-public:
-   ir_function_inlining_visitor()
-   {
-      progress = false;
-   }
-
-   virtual ~ir_function_inlining_visitor()
-   {
-      /* empty */
-   }
-
-   virtual ir_visitor_status visit_enter(ir_expression *);
-   virtual ir_visitor_status visit_enter(ir_call *);
-   virtual ir_visitor_status visit_enter(ir_assignment *);
-   virtual ir_visitor_status visit_enter(ir_return *);
-   virtual ir_visitor_status visit_enter(ir_texture *);
-   virtual ir_visitor_status visit_enter(ir_swizzle *);
-
-   bool progress;
-};
-
-
-bool
-automatic_inlining_predicate(ir_instruction *ir)
-{
-   ir_call *call = ir->as_call();
-
-   if (call && can_inline(call))
-      return true;
-
-   return false;
-}
-
-bool
-do_function_inlining(exec_list *instructions)
-{
-   ir_function_inlining_visitor v;
-
-   do_expression_flattening(instructions, automatic_inlining_predicate);
-
-   v.run(instructions);
-
-   return v.progress;
-}
-
-static void
-replace_return_with_assignment(ir_instruction *ir, void *data)
-{
-   void *ctx = ralloc_parent(ir);
-   ir_variable *retval = (ir_variable *)data;
-   ir_return *ret = ir->as_return();
-
-   if (ret) {
-      if (ret->value) {
-	 ir_rvalue *lhs = new(ctx) ir_dereference_variable(retval);
-	 ret->replace_with(new(ctx) ir_assignment(lhs, ret->value, NULL));
-      } else {
-	 /* un-valued return has to be the last return, or we shouldn't
-	  * have reached here. (see can_inline()).
-	  */
-	 assert(ret->next->is_tail_sentinel());
-	 ret->remove();
-      }
-   }
-}
-
-ir_rvalue *
-ir_call::generate_inline(ir_instruction *next_ir)
-{
-   void *ctx = ralloc_parent(this);
-   ir_variable **parameters;
-   int num_parameters;
-   int i;
-   ir_variable *retval = NULL;
-   struct hash_table *ht;
-
-   ht = hash_table_ctor(0, hash_table_pointer_hash, hash_table_pointer_compare);
-
-   num_parameters = 0;
-   foreach_iter(exec_list_iterator, iter_sig, this->callee->parameters)
-      num_parameters++;
-
-   parameters = new ir_variable *[num_parameters];
-
-   /* Generate storage for the return value. */
-   if (!this->callee->return_type->is_void()) {
-      retval = new(ctx) ir_variable(this->callee->return_type, "_ret_val",
-				    ir_var_auto);
-      next_ir->insert_before(retval);
-   }
-
-   /* Generate the declarations for the parameters to our inlined code,
-    * and set up the mapping of real function body variables to ours.
-    */
-   i = 0;
-   exec_list_iterator sig_param_iter = this->callee->parameters.iterator();
-   exec_list_iterator param_iter = this->actual_parameters.iterator();
-   for (i = 0; i < num_parameters; i++) {
-      ir_variable *sig_param = (ir_variable *) sig_param_iter.get();
-      ir_rvalue *param = (ir_rvalue *) param_iter.get();
-
-      /* Generate a new variable for the parameter. */
-      if (sig_param->type->base_type == GLSL_TYPE_SAMPLER) {
-	 /* For samplers, we want the inlined sampler references
-	  * referencing the passed in sampler variable, since that
-	  * will have the location information, which an assignment of
-	  * a sampler wouldn't.  Fix it up below.
-	  */
-	 parameters[i] = NULL;
-      } else {
-	 parameters[i] = sig_param->clone(ctx, ht);
-	 parameters[i]->mode = ir_var_auto;
-
-	 /* Remove the read-only decoration becuase we're going to write
-	  * directly to this variable.  If the cloned variable is left
-	  * read-only and the inlined function is inside a loop, the loop
-	  * analysis code will get confused.
-	  */
-	 parameters[i]->read_only = false;
-	 next_ir->insert_before(parameters[i]);
-      }
-
-      /* Move the actual param into our param variable if it's an 'in' type. */
-      if (parameters[i] && (sig_param->mode == ir_var_in ||
-			    sig_param->mode == ir_var_const_in ||
-			    sig_param->mode == ir_var_inout)) {
-	 ir_assignment *assign;
-
-	 assign = new(ctx) ir_assignment(new(ctx) ir_dereference_variable(parameters[i]),
-					 param, NULL);
-	 next_ir->insert_before(assign);
-      }
-
-      sig_param_iter.next();
-      param_iter.next();
-   }
-
-   exec_list new_instructions;
-
-   /* Generate the inlined body of the function to a new list */
-   foreach_iter(exec_list_iterator, iter, callee->body) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      ir_instruction *new_ir = ir->clone(ctx, ht);
-
-      new_instructions.push_tail(new_ir);
-      visit_tree(new_ir, replace_return_with_assignment, retval);
-   }
-
-   /* If any samplers were passed in, replace any deref of the sampler
-    * with a deref of the sampler argument.
-    */
-   param_iter = this->actual_parameters.iterator();
-   sig_param_iter = this->callee->parameters.iterator();
-   for (i = 0; i < num_parameters; i++) {
-      ir_instruction *const param = (ir_instruction *) param_iter.get();
-      ir_variable *sig_param = (ir_variable *) sig_param_iter.get();
-
-      if (sig_param->type->base_type == GLSL_TYPE_SAMPLER) {
-	 ir_dereference *deref = param->as_dereference();
-
-	 assert(deref);
-	 do_sampler_replacement(&new_instructions, sig_param, deref);
-      }
-      param_iter.next();
-      sig_param_iter.next();
-   }
-
-   /* Now push those new instructions in. */
-   next_ir->insert_before(&new_instructions);
-
-   /* Copy back the value of any 'out' parameters from the function body
-    * variables to our own.
-    */
-   i = 0;
-   param_iter = this->actual_parameters.iterator();
-   sig_param_iter = this->callee->parameters.iterator();
-   for (i = 0; i < num_parameters; i++) {
-      ir_instruction *const param = (ir_instruction *) param_iter.get();
-      const ir_variable *const sig_param = (ir_variable *) sig_param_iter.get();
-
-      /* Move our param variable into the actual param if it's an 'out' type. */
-      if (parameters[i] && (sig_param->mode == ir_var_out ||
-			    sig_param->mode == ir_var_inout)) {
-	 ir_assignment *assign;
-
-	 assign = new(ctx) ir_assignment(param->clone(ctx, NULL)->as_rvalue(),
-					 new(ctx) ir_dereference_variable(parameters[i]),
-					 NULL);
-	 next_ir->insert_before(assign);
-      }
-
-      param_iter.next();
-      sig_param_iter.next();
-   }
-
-   delete [] parameters;
-
-   hash_table_dtor(ht);
-
-   if (retval)
-      return new(ctx) ir_dereference_variable(retval);
-   else
-      return NULL;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_expression *ir)
-{
-   (void) ir;
-   return visit_continue_with_parent;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_return *ir)
-{
-   (void) ir;
-   return visit_continue_with_parent;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_texture *ir)
-{
-   (void) ir;
-   return visit_continue_with_parent;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_swizzle *ir)
-{
-   (void) ir;
-   return visit_continue_with_parent;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_call *ir)
-{
-   if (can_inline(ir)) {
-      /* If the call was part of some tree, then it should have been
-       * flattened out or we shouldn't have seen it because of a
-       * visit_continue_with_parent in this visitor.
-       */
-      assert(ir == base_ir);
-
-      (void) ir->generate_inline(ir);
-      ir->remove();
-      this->progress = true;
-   }
-
-   return visit_continue;
-}
-
-
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_assignment *ir)
-{
-   ir_call *call = ir->rhs->as_call();
-   if (!call || !can_inline(call))
-      return visit_continue;
-
-   /* generates the parameter setup, function body, and returns the return
-    * value of the function
-    */
-   ir_rvalue *rhs = call->generate_inline(ir);
-   assert(rhs);
-
-   ir->rhs = rhs;
-   this->progress = true;
-
-   return visit_continue;
-}
-
-/**
- * Replaces references to the "sampler" variable with a clone of "deref."
- *
- * From the spec, samplers can appear in the tree as function
- * (non-out) parameters and as the result of array indexing and
- * structure field selection.  In our builtin implementation, they
- * also appear in the sampler field of an ir_tex instruction.
- */
-
-class ir_sampler_replacement_visitor : public ir_hierarchical_visitor {
-public:
-   ir_sampler_replacement_visitor(ir_variable *sampler, ir_dereference *deref)
-   {
-      this->sampler = sampler;
-      this->deref = deref;
-   }
-
-   virtual ~ir_sampler_replacement_visitor()
-   {
-   }
-
-   virtual ir_visitor_status visit_leave(ir_call *);
-   virtual ir_visitor_status visit_leave(ir_dereference_array *);
-   virtual ir_visitor_status visit_leave(ir_dereference_record *);
-   virtual ir_visitor_status visit_leave(ir_texture *);
-
-   void replace_deref(ir_dereference **deref);
-   void replace_rvalue(ir_rvalue **rvalue);
-
-   ir_variable *sampler;
-   ir_dereference *deref;
-};
-
-void
-ir_sampler_replacement_visitor::replace_deref(ir_dereference **deref)
-{
-   ir_dereference_variable *deref_var = (*deref)->as_dereference_variable();
-   if (deref_var && deref_var->var == this->sampler) {
-      *deref = this->deref->clone(ralloc_parent(*deref), NULL);
-   }
-}
-
-void
-ir_sampler_replacement_visitor::replace_rvalue(ir_rvalue **rvalue)
-{
-   if (!*rvalue)
-      return;
-
-   ir_dereference *deref = (*rvalue)->as_dereference();
-
-   if (!deref)
-      return;
-
-   replace_deref(&deref);
-   *rvalue = deref;
-}
-
-ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_texture *ir)
-{
-   replace_deref(&ir->sampler);
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_dereference_array *ir)
-{
-   replace_rvalue(&ir->array);
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_dereference_record *ir)
-{
-   replace_rvalue(&ir->record);
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_sampler_replacement_visitor::visit_leave(ir_call *ir)
-{
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_rvalue *param = (ir_rvalue *)iter.get();
-      ir_rvalue *new_param = param;
-      replace_rvalue(&new_param);
-
-      if (new_param != param) {
-	 param->replace_with(new_param);
-      }
-   }
-   return visit_continue;
-}
-
-static void
-do_sampler_replacement(exec_list *instructions,
-		       ir_variable *sampler,
-		       ir_dereference *deref)
-{
-   ir_sampler_replacement_visitor v(sampler, deref);
-
-   visit_list_elements(&v, instructions);
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file opt_function_inlining.cpp

+ *

+ * Replaces calls to functions with the body of the function.

+ */

+

+#include <inttypes.h>

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_function_inlining.h"

+#include "ir_expression_flattening.h"

+#include "glsl_types.h"

+#include "program/hash_table.h"

+

+static void

+do_sampler_replacement(exec_list *instructions,

+		       ir_variable *sampler,

+		       ir_dereference *deref);

+

+class ir_function_inlining_visitor : public ir_hierarchical_visitor {

+public:

+   ir_function_inlining_visitor()

+   {

+      progress = false;

+   }

+

+   virtual ~ir_function_inlining_visitor()

+   {

+      /* empty */

+   }

+

+   virtual ir_visitor_status visit_enter(ir_expression *);

+   virtual ir_visitor_status visit_enter(ir_call *);

+   virtual ir_visitor_status visit_enter(ir_assignment *);

+   virtual ir_visitor_status visit_enter(ir_return *);

+   virtual ir_visitor_status visit_enter(ir_texture *);

+   virtual ir_visitor_status visit_enter(ir_swizzle *);

+

+   bool progress;

+};

+

+

+bool

+automatic_inlining_predicate(ir_instruction *ir)

+{

+   ir_call *call = ir->as_call();

+

+   if (call && can_inline(call))

+      return true;

+

+   return false;

+}

+

+bool

+do_function_inlining(exec_list *instructions)

+{

+   ir_function_inlining_visitor v;

+

+   do_expression_flattening(instructions, automatic_inlining_predicate);

+

+   v.run(instructions);

+

+   return v.progress;

+}

+

+static void

+replace_return_with_assignment(ir_instruction *ir, void *data)

+{

+   void *ctx = ralloc_parent(ir);

+   ir_variable *retval = (ir_variable *)data;

+   ir_return *ret = ir->as_return();

+

+   if (ret) {

+      if (ret->value) {

+	 ir_rvalue *lhs = new(ctx) ir_dereference_variable(retval);

+	 ret->replace_with(new(ctx) ir_assignment(lhs, ret->value, NULL));

+      } else {

+	 /* un-valued return has to be the last return, or we shouldn't

+	  * have reached here. (see can_inline()).

+	  */

+	 assert(ret->next->is_tail_sentinel());

+	 ret->remove();

+      }

+   }

+}

+

+ir_rvalue *

+ir_call::generate_inline(ir_instruction *next_ir)

+{

+   void *ctx = ralloc_parent(this);

+   ir_variable **parameters;

+   int num_parameters;

+   int i;

+   ir_variable *retval = NULL;

+   struct hash_table *ht;

+

+   ht = hash_table_ctor(0, hash_table_pointer_hash, hash_table_pointer_compare);

+

+   num_parameters = 0;

+   foreach_iter(exec_list_iterator, iter_sig, this->callee->parameters)

+      num_parameters++;

+

+   parameters = new ir_variable *[num_parameters];

+

+   /* Generate storage for the return value. */

+   if (!this->callee->return_type->is_void()) {

+      retval = new(ctx) ir_variable(this->callee->return_type, "_ret_val",

+				    ir_var_auto);

+      next_ir->insert_before(retval);

+   }

+

+   /* Generate the declarations for the parameters to our inlined code,

+    * and set up the mapping of real function body variables to ours.

+    */

+   i = 0;

+   exec_list_iterator sig_param_iter = this->callee->parameters.iterator();

+   exec_list_iterator param_iter = this->actual_parameters.iterator();

+   for (i = 0; i < num_parameters; i++) {

+      ir_variable *sig_param = (ir_variable *) sig_param_iter.get();

+      ir_rvalue *param = (ir_rvalue *) param_iter.get();

+

+      /* Generate a new variable for the parameter. */

+      if (sig_param->type->base_type == GLSL_TYPE_SAMPLER) {

+	 /* For samplers, we want the inlined sampler references

+	  * referencing the passed in sampler variable, since that

+	  * will have the location information, which an assignment of

+	  * a sampler wouldn't.  Fix it up below.

+	  */

+	 parameters[i] = NULL;

+      } else {

+	 parameters[i] = sig_param->clone(ctx, ht);

+	 parameters[i]->mode = ir_var_auto;

+

+	 /* Remove the read-only decoration becuase we're going to write

+	  * directly to this variable.  If the cloned variable is left

+	  * read-only and the inlined function is inside a loop, the loop

+	  * analysis code will get confused.

+	  */

+	 parameters[i]->read_only = false;

+	 next_ir->insert_before(parameters[i]);

+      }

+

+      /* Move the actual param into our param variable if it's an 'in' type. */

+      if (parameters[i] && (sig_param->mode == ir_var_in ||

+			    sig_param->mode == ir_var_const_in ||

+			    sig_param->mode == ir_var_inout)) {

+	 ir_assignment *assign;

+

+	 assign = new(ctx) ir_assignment(new(ctx) ir_dereference_variable(parameters[i]),

+					 param, NULL);

+	 next_ir->insert_before(assign);

+      }

+

+      sig_param_iter.next();

+      param_iter.next();

+   }

+

+   exec_list new_instructions;

+

+   /* Generate the inlined body of the function to a new list */

+   foreach_iter(exec_list_iterator, iter, callee->body) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      ir_instruction *new_ir = ir->clone(ctx, ht);

+

+      new_instructions.push_tail(new_ir);

+      visit_tree(new_ir, replace_return_with_assignment, retval);

+   }

+

+   /* If any samplers were passed in, replace any deref of the sampler

+    * with a deref of the sampler argument.

+    */

+   param_iter = this->actual_parameters.iterator();

+   sig_param_iter = this->callee->parameters.iterator();

+   for (i = 0; i < num_parameters; i++) {

+      ir_instruction *const param = (ir_instruction *) param_iter.get();

+      ir_variable *sig_param = (ir_variable *) sig_param_iter.get();

+

+      if (sig_param->type->base_type == GLSL_TYPE_SAMPLER) {

+	 ir_dereference *deref = param->as_dereference();

+

+	 assert(deref);

+	 do_sampler_replacement(&new_instructions, sig_param, deref);

+      }

+      param_iter.next();

+      sig_param_iter.next();

+   }

+

+   /* Now push those new instructions in. */

+   next_ir->insert_before(&new_instructions);

+

+   /* Copy back the value of any 'out' parameters from the function body

+    * variables to our own.

+    */

+   i = 0;

+   param_iter = this->actual_parameters.iterator();

+   sig_param_iter = this->callee->parameters.iterator();

+   for (i = 0; i < num_parameters; i++) {

+      ir_instruction *const param = (ir_instruction *) param_iter.get();

+      const ir_variable *const sig_param = (ir_variable *) sig_param_iter.get();

+

+      /* Move our param variable into the actual param if it's an 'out' type. */

+      if (parameters[i] && (sig_param->mode == ir_var_out ||

+			    sig_param->mode == ir_var_inout)) {

+	 ir_assignment *assign;

+

+	 assign = new(ctx) ir_assignment(param->clone(ctx, NULL)->as_rvalue(),

+					 new(ctx) ir_dereference_variable(parameters[i]),

+					 NULL);

+	 next_ir->insert_before(assign);

+      }

+

+      param_iter.next();

+      sig_param_iter.next();

+   }

+

+   delete [] parameters;

+

+   hash_table_dtor(ht);

+

+   if (retval)

+      return new(ctx) ir_dereference_variable(retval);

+   else

+      return NULL;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_expression *ir)

+{

+   (void) ir;

+   return visit_continue_with_parent;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_return *ir)

+{

+   (void) ir;

+   return visit_continue_with_parent;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_texture *ir)

+{

+   (void) ir;

+   return visit_continue_with_parent;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_swizzle *ir)

+{

+   (void) ir;

+   return visit_continue_with_parent;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_call *ir)

+{

+   if (can_inline(ir)) {

+      /* If the call was part of some tree, then it should have been

+       * flattened out or we shouldn't have seen it because of a

+       * visit_continue_with_parent in this visitor.

+       */

+      assert(ir == base_ir);

+

+      (void) ir->generate_inline(ir);

+      ir->remove();

+      this->progress = true;

+   }

+

+   return visit_continue;

+}

+

+

+ir_visitor_status

+ir_function_inlining_visitor::visit_enter(ir_assignment *ir)

+{

+   ir_call *call = ir->rhs->as_call();

+   if (!call || !can_inline(call))

+      return visit_continue;

+

+   /* generates the parameter setup, function body, and returns the return

+    * value of the function

+    */

+   ir_rvalue *rhs = call->generate_inline(ir);

+   assert(rhs);

+

+   ir->rhs = rhs;

+   this->progress = true;

+

+   return visit_continue;

+}

+

+/**

+ * Replaces references to the "sampler" variable with a clone of "deref."

+ *

+ * From the spec, samplers can appear in the tree as function

+ * (non-out) parameters and as the result of array indexing and

+ * structure field selection.  In our builtin implementation, they

+ * also appear in the sampler field of an ir_tex instruction.

+ */

+

+class ir_sampler_replacement_visitor : public ir_hierarchical_visitor {

+public:

+   ir_sampler_replacement_visitor(ir_variable *sampler, ir_dereference *deref)

+   {

+      this->sampler = sampler;

+      this->deref = deref;

+   }

+

+   virtual ~ir_sampler_replacement_visitor()

+   {

+   }

+

+   virtual ir_visitor_status visit_leave(ir_call *);

+   virtual ir_visitor_status visit_leave(ir_dereference_array *);

+   virtual ir_visitor_status visit_leave(ir_dereference_record *);

+   virtual ir_visitor_status visit_leave(ir_texture *);

+

+   void replace_deref(ir_dereference **deref);

+   void replace_rvalue(ir_rvalue **rvalue);

+

+   ir_variable *sampler;

+   ir_dereference *deref;

+};

+

+void

+ir_sampler_replacement_visitor::replace_deref(ir_dereference **deref)

+{

+   ir_dereference_variable *deref_var = (*deref)->as_dereference_variable();

+   if (deref_var && deref_var->var == this->sampler) {

+      *deref = this->deref->clone(ralloc_parent(*deref), NULL);

+   }

+}

+

+void

+ir_sampler_replacement_visitor::replace_rvalue(ir_rvalue **rvalue)

+{

+   if (!*rvalue)

+      return;

+

+   ir_dereference *deref = (*rvalue)->as_dereference();

+

+   if (!deref)

+      return;

+

+   replace_deref(&deref);

+   *rvalue = deref;

+}

+

+ir_visitor_status

+ir_sampler_replacement_visitor::visit_leave(ir_texture *ir)

+{

+   replace_deref(&ir->sampler);

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_sampler_replacement_visitor::visit_leave(ir_dereference_array *ir)

+{

+   replace_rvalue(&ir->array);

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_sampler_replacement_visitor::visit_leave(ir_dereference_record *ir)

+{

+   replace_rvalue(&ir->record);

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_sampler_replacement_visitor::visit_leave(ir_call *ir)

+{

+   foreach_iter(exec_list_iterator, iter, *ir) {

+      ir_rvalue *param = (ir_rvalue *)iter.get();

+      ir_rvalue *new_param = param;

+      replace_rvalue(&new_param);

+

+      if (new_param != param) {

+	 param->replace_with(new_param);

+      }

+   }

+   return visit_continue;

+}

+

+static void

+do_sampler_replacement(exec_list *instructions,

+		       ir_variable *sampler,

+		       ir_dereference *deref)

+{

+   ir_sampler_replacement_visitor v(sampler, deref);

+

+   visit_list_elements(&v, instructions);

+}

diff --git a/mesalib/src/glsl/opt_swizzle_swizzle.cpp b/mesalib/src/glsl/opt_swizzle_swizzle.cpp
index bc442fa86..e23655240 100644
--- a/mesalib/src/glsl/opt_swizzle_swizzle.cpp
+++ b/mesalib/src/glsl/opt_swizzle_swizzle.cpp
@@ -1,93 +1,93 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file opt_swizzle_swizzle.cpp
- *
- * Eliminates the second swizzle in a swizzle chain.
- */
-
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_optimization.h"
-#include "glsl_types.h"
-
-class ir_swizzle_swizzle_visitor : public ir_hierarchical_visitor {
-public:
-   ir_swizzle_swizzle_visitor()
-   {
-      progress = false;
-   }
-
-   virtual ir_visitor_status visit_enter(ir_swizzle *);
-
-   bool progress;
-};
-
-ir_visitor_status
-ir_swizzle_swizzle_visitor::visit_enter(ir_swizzle *ir)
-{
-   int mask2[4];
-
-   ir_swizzle *swiz2 = ir->val->as_swizzle();
-   if (!swiz2)
-      return visit_continue;
-
-   memset(&mask2, 0, sizeof(mask2));
-   if (swiz2->mask.num_components >= 1)
-      mask2[0] = swiz2->mask.x;
-   if (swiz2->mask.num_components >= 2)
-      mask2[1] = swiz2->mask.y;
-   if (swiz2->mask.num_components >= 3)
-      mask2[2] = swiz2->mask.z;
-   if (swiz2->mask.num_components >= 4)
-      mask2[3] = swiz2->mask.w;
-
-   if (ir->mask.num_components >= 1)
-      ir->mask.x = mask2[ir->mask.x];
-   if (ir->mask.num_components >= 2)
-      ir->mask.y = mask2[ir->mask.y];
-   if (ir->mask.num_components >= 3)
-      ir->mask.z = mask2[ir->mask.z];
-   if (ir->mask.num_components >= 4)
-      ir->mask.w = mask2[ir->mask.w];
-
-   ir->val = swiz2->val;
-
-   this->progress = true;
-
-   return visit_continue;
-}
-
-/**
- * Does a copy propagation pass on the code present in the instruction stream.
- */
-bool
-do_swizzle_swizzle(exec_list *instructions)
-{
-   ir_swizzle_swizzle_visitor v;
-
-   v.run(instructions);
-
-   return v.progress;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file opt_swizzle_swizzle.cpp

+ *

+ * Eliminates the second swizzle in a swizzle chain.

+ */

+

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_optimization.h"

+#include "glsl_types.h"

+

+class ir_swizzle_swizzle_visitor : public ir_hierarchical_visitor {

+public:

+   ir_swizzle_swizzle_visitor()

+   {

+      progress = false;

+   }

+

+   virtual ir_visitor_status visit_enter(ir_swizzle *);

+

+   bool progress;

+};

+

+ir_visitor_status

+ir_swizzle_swizzle_visitor::visit_enter(ir_swizzle *ir)

+{

+   int mask2[4];

+

+   ir_swizzle *swiz2 = ir->val->as_swizzle();

+   if (!swiz2)

+      return visit_continue;

+

+   memset(&mask2, 0, sizeof(mask2));

+   if (swiz2->mask.num_components >= 1)

+      mask2[0] = swiz2->mask.x;

+   if (swiz2->mask.num_components >= 2)

+      mask2[1] = swiz2->mask.y;

+   if (swiz2->mask.num_components >= 3)

+      mask2[2] = swiz2->mask.z;

+   if (swiz2->mask.num_components >= 4)

+      mask2[3] = swiz2->mask.w;

+

+   if (ir->mask.num_components >= 1)

+      ir->mask.x = mask2[ir->mask.x];

+   if (ir->mask.num_components >= 2)

+      ir->mask.y = mask2[ir->mask.y];

+   if (ir->mask.num_components >= 3)

+      ir->mask.z = mask2[ir->mask.z];

+   if (ir->mask.num_components >= 4)

+      ir->mask.w = mask2[ir->mask.w];

+

+   ir->val = swiz2->val;

+

+   this->progress = true;

+

+   return visit_continue;

+}

+

+/**

+ * Does a copy propagation pass on the code present in the instruction stream.

+ */

+bool

+do_swizzle_swizzle(exec_list *instructions)

+{

+   ir_swizzle_swizzle_visitor v;

+

+   v.run(instructions);

+

+   return v.progress;

+}

diff --git a/mesalib/src/glsl/opt_tree_grafting.cpp b/mesalib/src/glsl/opt_tree_grafting.cpp
index 1ef940f9c..75bd11c09 100644
--- a/mesalib/src/glsl/opt_tree_grafting.cpp
+++ b/mesalib/src/glsl/opt_tree_grafting.cpp
@@ -1,368 +1,368 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-/**
- * \file opt_tree_grafting.cpp
- *
- * Takes assignments to variables that are dereferenced only once and
- * pastes the RHS expression into where the variable is dereferenced.
- *
- * In the process of various operations like function inlining and
- * tertiary op handling, we'll end up with our expression trees having
- * been chopped up into a series of assignments of short expressions
- * to temps.  Other passes like ir_algebraic.cpp would prefer to see
- * the deepest expression trees they can to try to optimize them.
- *
- * This is a lot like copy propagaton.  In comparison, copy
- * propagation only acts on plain copies, not arbitrary expressions on
- * the RHS.  Generally, we wouldn't want to go pasting some
- * complicated expression everywhere it got used, though, so we don't
- * handle expressions in that pass.
- *
- * The hard part is making sure we don't move an expression across
- * some other assignments that would change the value of the
- * expression.  So we split this into two passes: First, find the
- * variables in our scope which are written to once and read once, and
- * then go through basic blocks seeing if we find an opportunity to
- * move those expressions safely.
- */
-
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_variable_refcount.h"
-#include "ir_basic_block.h"
-#include "ir_optimization.h"
-#include "glsl_types.h"
-
-static bool debug = false;
-
-class ir_tree_grafting_visitor : public ir_hierarchical_visitor {
-public:
-   ir_tree_grafting_visitor(ir_assignment *graft_assign,
-			    ir_variable *graft_var)
-   {
-      this->progress = false;
-      this->graft_assign = graft_assign;
-      this->graft_var = graft_var;
-   }
-
-   virtual ir_visitor_status visit_leave(class ir_assignment *);
-   virtual ir_visitor_status visit_enter(class ir_call *);
-   virtual ir_visitor_status visit_enter(class ir_expression *);
-   virtual ir_visitor_status visit_enter(class ir_function *);
-   virtual ir_visitor_status visit_enter(class ir_function_signature *);
-   virtual ir_visitor_status visit_enter(class ir_if *);
-   virtual ir_visitor_status visit_enter(class ir_loop *);
-   virtual ir_visitor_status visit_enter(class ir_swizzle *);
-   virtual ir_visitor_status visit_enter(class ir_texture *);
-
-   bool do_graft(ir_rvalue **rvalue);
-
-   bool progress;
-   ir_variable *graft_var;
-   ir_assignment *graft_assign;
-};
-
-struct find_deref_info {
-   ir_variable *var;
-   bool found;
-};
-
-void
-dereferences_variable_callback(ir_instruction *ir, void *data)
-{
-   struct find_deref_info *info = (struct find_deref_info *)data;
-   ir_dereference_variable *deref = ir->as_dereference_variable();
-
-   if (deref && deref->var == info->var)
-      info->found = true;
-}
-
-static bool
-dereferences_variable(ir_instruction *ir, ir_variable *var)
-{
-   struct find_deref_info info;
-
-   info.var = var;
-   info.found = false;
-
-   visit_tree(ir, dereferences_variable_callback, &info);
-
-   return info.found;
-}
-
-bool
-ir_tree_grafting_visitor::do_graft(ir_rvalue **rvalue)
-{
-   if (!*rvalue)
-      return false;
-
-   ir_dereference_variable *deref = (*rvalue)->as_dereference_variable();
-
-   if (!deref || deref->var != this->graft_var)
-      return false;
-
-   if (debug) {
-      printf("GRAFTING:\n");
-      this->graft_assign->print();
-      printf("\n");
-      printf("TO:\n");
-      (*rvalue)->print();
-      printf("\n");
-   }
-
-   this->graft_assign->remove();
-   *rvalue = this->graft_assign->rhs;
-
-   this->progress = true;
-   return true;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_loop *ir)
-{
-   (void)ir;
-   /* Do not traverse into the body of the loop since that is a
-    * different basic block.
-    */
-   return visit_stop;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_leave(ir_assignment *ir)
-{
-   if (do_graft(&ir->rhs) ||
-       do_graft(&ir->condition))
-      return visit_stop;
-
-   /* If this assignment updates a variable used in the assignment
-    * we're trying to graft, then we're done.
-    */
-   if (dereferences_variable(this->graft_assign->rhs,
-			     ir->lhs->variable_referenced())) {
-      if (debug) {
-	 printf("graft killed by: ");
-	 ir->print();
-	 printf("\n");
-      }
-      return visit_stop;
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_function *ir)
-{
-   (void) ir;
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_function_signature *ir)
-{
-   (void)ir;
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_call *ir)
-{
-   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();
-   /* Reminder: iterating ir_call iterates its parameters. */
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_variable *sig_param = (ir_variable *)sig_iter.get();
-      ir_rvalue *ir = (ir_rvalue *)iter.get();
-      ir_rvalue *new_ir = ir;
-
-      if (sig_param->mode != ir_var_in && sig_param->mode != ir_var_const_in)
-	 continue;
-
-      if (do_graft(&new_ir)) {
-	 ir->replace_with(new_ir);
-	 return visit_stop;
-      }
-      sig_iter.next();
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_expression *ir)
-{
-   for (unsigned int i = 0; i < ir->get_num_operands(); i++) {
-      if (do_graft(&ir->operands[i]))
-	 return visit_stop;
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_if *ir)
-{
-   if (do_graft(&ir->condition))
-      return visit_stop;
-
-   /* Do not traverse into the body of the if-statement since that is a
-    * different basic block.
-    */
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_swizzle *ir)
-{
-   if (do_graft(&ir->val))
-      return visit_stop;
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_texture *ir)
-{
-   if (do_graft(&ir->coordinate) ||
-       do_graft(&ir->projector) ||
-       do_graft(&ir->offset) ||
-       do_graft(&ir->shadow_comparitor))
-	 return visit_stop;
-
-   switch (ir->op) {
-   case ir_tex:
-      break;
-   case ir_txb:
-      if (do_graft(&ir->lod_info.bias))
-	 return visit_stop;
-      break;
-   case ir_txf:
-   case ir_txl:
-      if (do_graft(&ir->lod_info.lod))
-	 return visit_stop;
-      break;
-   case ir_txd:
-      if (do_graft(&ir->lod_info.grad.dPdx) ||
-	  do_graft(&ir->lod_info.grad.dPdy))
-	 return visit_stop;
-      break;
-   }
-
-   return visit_continue;
-}
-
-struct tree_grafting_info {
-   ir_variable_refcount_visitor *refs;
-   bool progress;
-};
-
-static bool
-try_tree_grafting(ir_assignment *start,
-		  ir_variable *lhs_var,
-		  ir_instruction *bb_last)
-{
-   ir_tree_grafting_visitor v(start, lhs_var);
-
-   if (debug) {
-      printf("trying to graft: ");
-      lhs_var->print();
-      printf("\n");
-   }
-
-   for (ir_instruction *ir = (ir_instruction *)start->next;
-	ir != bb_last->next;
-	ir = (ir_instruction *)ir->next) {
-
-      if (debug) {
-	 printf("- ");
-	 ir->print();
-	 printf("\n");
-      }
-
-      ir_visitor_status s = ir->accept(&v);
-      if (s == visit_stop)
-	 return v.progress;
-   }
-
-   return false;
-}
-
-static void
-tree_grafting_basic_block(ir_instruction *bb_first,
-			  ir_instruction *bb_last,
-			  void *data)
-{
-   struct tree_grafting_info *info = (struct tree_grafting_info *)data;
-   ir_instruction *ir, *next;
-
-   for (ir = bb_first, next = (ir_instruction *)ir->next;
-	ir != bb_last->next;
-	ir = next, next = (ir_instruction *)ir->next) {
-      ir_assignment *assign = ir->as_assignment();
-
-      if (!assign)
-	 continue;
-
-      ir_variable *lhs_var = assign->whole_variable_written();
-      if (!lhs_var)
-	 continue;
-
-      if (lhs_var->mode == ir_var_out ||
-	  lhs_var->mode == ir_var_inout)
-	 continue;
-
-      variable_entry *entry = info->refs->get_variable_entry(lhs_var);
-
-      if (!entry->declaration ||
-	  entry->assigned_count != 1 ||
-	  entry->referenced_count != 2)
-	 continue;
-
-      assert(assign == entry->assign);
-
-      /* Found a possibly graftable assignment.  Now, walk through the
-       * rest of the BB seeing if the deref is here, and if nothing interfered with
-       * pasting its expression's values in between.
-       */
-      info->progress |= try_tree_grafting(assign, lhs_var, bb_last);
-   }
-}
-
-/**
- * Does a copy propagation pass on the code present in the instruction stream.
- */
-bool
-do_tree_grafting(exec_list *instructions)
-{
-   ir_variable_refcount_visitor refs;
-   struct tree_grafting_info info;
-
-   info.progress = false;
-   info.refs = &refs;
-
-   visit_list_elements(info.refs, instructions);
-
-   call_for_basic_blocks(instructions, tree_grafting_basic_block, &info);
-
-   return info.progress;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+/**

+ * \file opt_tree_grafting.cpp

+ *

+ * Takes assignments to variables that are dereferenced only once and

+ * pastes the RHS expression into where the variable is dereferenced.

+ *

+ * In the process of various operations like function inlining and

+ * tertiary op handling, we'll end up with our expression trees having

+ * been chopped up into a series of assignments of short expressions

+ * to temps.  Other passes like ir_algebraic.cpp would prefer to see

+ * the deepest expression trees they can to try to optimize them.

+ *

+ * This is a lot like copy propagaton.  In comparison, copy

+ * propagation only acts on plain copies, not arbitrary expressions on

+ * the RHS.  Generally, we wouldn't want to go pasting some

+ * complicated expression everywhere it got used, though, so we don't

+ * handle expressions in that pass.

+ *

+ * The hard part is making sure we don't move an expression across

+ * some other assignments that would change the value of the

+ * expression.  So we split this into two passes: First, find the

+ * variables in our scope which are written to once and read once, and

+ * then go through basic blocks seeing if we find an opportunity to

+ * move those expressions safely.

+ */

+

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_variable_refcount.h"

+#include "ir_basic_block.h"

+#include "ir_optimization.h"

+#include "glsl_types.h"

+

+static bool debug = false;

+

+class ir_tree_grafting_visitor : public ir_hierarchical_visitor {

+public:

+   ir_tree_grafting_visitor(ir_assignment *graft_assign,

+			    ir_variable *graft_var)

+   {

+      this->progress = false;

+      this->graft_assign = graft_assign;

+      this->graft_var = graft_var;

+   }

+

+   virtual ir_visitor_status visit_leave(class ir_assignment *);

+   virtual ir_visitor_status visit_enter(class ir_call *);

+   virtual ir_visitor_status visit_enter(class ir_expression *);

+   virtual ir_visitor_status visit_enter(class ir_function *);

+   virtual ir_visitor_status visit_enter(class ir_function_signature *);

+   virtual ir_visitor_status visit_enter(class ir_if *);

+   virtual ir_visitor_status visit_enter(class ir_loop *);

+   virtual ir_visitor_status visit_enter(class ir_swizzle *);

+   virtual ir_visitor_status visit_enter(class ir_texture *);

+

+   bool do_graft(ir_rvalue **rvalue);

+

+   bool progress;

+   ir_variable *graft_var;

+   ir_assignment *graft_assign;

+};

+

+struct find_deref_info {

+   ir_variable *var;

+   bool found;

+};

+

+void

+dereferences_variable_callback(ir_instruction *ir, void *data)

+{

+   struct find_deref_info *info = (struct find_deref_info *)data;

+   ir_dereference_variable *deref = ir->as_dereference_variable();

+

+   if (deref && deref->var == info->var)

+      info->found = true;

+}

+

+static bool

+dereferences_variable(ir_instruction *ir, ir_variable *var)

+{

+   struct find_deref_info info;

+

+   info.var = var;

+   info.found = false;

+

+   visit_tree(ir, dereferences_variable_callback, &info);

+

+   return info.found;

+}

+

+bool

+ir_tree_grafting_visitor::do_graft(ir_rvalue **rvalue)

+{

+   if (!*rvalue)

+      return false;

+

+   ir_dereference_variable *deref = (*rvalue)->as_dereference_variable();

+

+   if (!deref || deref->var != this->graft_var)

+      return false;

+

+   if (debug) {

+      printf("GRAFTING:\n");

+      this->graft_assign->print();

+      printf("\n");

+      printf("TO:\n");

+      (*rvalue)->print();

+      printf("\n");

+   }

+

+   this->graft_assign->remove();

+   *rvalue = this->graft_assign->rhs;

+

+   this->progress = true;

+   return true;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_loop *ir)

+{

+   (void)ir;

+   /* Do not traverse into the body of the loop since that is a

+    * different basic block.

+    */

+   return visit_stop;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_leave(ir_assignment *ir)

+{

+   if (do_graft(&ir->rhs) ||

+       do_graft(&ir->condition))

+      return visit_stop;

+

+   /* If this assignment updates a variable used in the assignment

+    * we're trying to graft, then we're done.

+    */

+   if (dereferences_variable(this->graft_assign->rhs,

+			     ir->lhs->variable_referenced())) {

+      if (debug) {

+	 printf("graft killed by: ");

+	 ir->print();

+	 printf("\n");

+      }

+      return visit_stop;

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_function *ir)

+{

+   (void) ir;

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_function_signature *ir)

+{

+   (void)ir;

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_call *ir)

+{

+   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();

+   /* Reminder: iterating ir_call iterates its parameters. */

+   foreach_iter(exec_list_iterator, iter, *ir) {

+      ir_variable *sig_param = (ir_variable *)sig_iter.get();

+      ir_rvalue *ir = (ir_rvalue *)iter.get();

+      ir_rvalue *new_ir = ir;

+

+      if (sig_param->mode != ir_var_in && sig_param->mode != ir_var_const_in)

+	 continue;

+

+      if (do_graft(&new_ir)) {

+	 ir->replace_with(new_ir);

+	 return visit_stop;

+      }

+      sig_iter.next();

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_expression *ir)

+{

+   for (unsigned int i = 0; i < ir->get_num_operands(); i++) {

+      if (do_graft(&ir->operands[i]))

+	 return visit_stop;

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_if *ir)

+{

+   if (do_graft(&ir->condition))

+      return visit_stop;

+

+   /* Do not traverse into the body of the if-statement since that is a

+    * different basic block.

+    */

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_swizzle *ir)

+{

+   if (do_graft(&ir->val))

+      return visit_stop;

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_texture *ir)

+{

+   if (do_graft(&ir->coordinate) ||

+       do_graft(&ir->projector) ||

+       do_graft(&ir->offset) ||

+       do_graft(&ir->shadow_comparitor))

+	 return visit_stop;

+

+   switch (ir->op) {

+   case ir_tex:

+      break;

+   case ir_txb:

+      if (do_graft(&ir->lod_info.bias))

+	 return visit_stop;

+      break;

+   case ir_txf:

+   case ir_txl:

+      if (do_graft(&ir->lod_info.lod))

+	 return visit_stop;

+      break;

+   case ir_txd:

+      if (do_graft(&ir->lod_info.grad.dPdx) ||

+	  do_graft(&ir->lod_info.grad.dPdy))

+	 return visit_stop;

+      break;

+   }

+

+   return visit_continue;

+}

+

+struct tree_grafting_info {

+   ir_variable_refcount_visitor *refs;

+   bool progress;

+};

+

+static bool

+try_tree_grafting(ir_assignment *start,

+		  ir_variable *lhs_var,

+		  ir_instruction *bb_last)

+{

+   ir_tree_grafting_visitor v(start, lhs_var);

+

+   if (debug) {

+      printf("trying to graft: ");

+      lhs_var->print();

+      printf("\n");

+   }

+

+   for (ir_instruction *ir = (ir_instruction *)start->next;

+	ir != bb_last->next;

+	ir = (ir_instruction *)ir->next) {

+

+      if (debug) {

+	 printf("- ");

+	 ir->print();

+	 printf("\n");

+      }

+

+      ir_visitor_status s = ir->accept(&v);

+      if (s == visit_stop)

+	 return v.progress;

+   }

+

+   return false;

+}

+

+static void

+tree_grafting_basic_block(ir_instruction *bb_first,

+			  ir_instruction *bb_last,

+			  void *data)

+{

+   struct tree_grafting_info *info = (struct tree_grafting_info *)data;

+   ir_instruction *ir, *next;

+

+   for (ir = bb_first, next = (ir_instruction *)ir->next;

+	ir != bb_last->next;

+	ir = next, next = (ir_instruction *)ir->next) {

+      ir_assignment *assign = ir->as_assignment();

+

+      if (!assign)

+	 continue;

+

+      ir_variable *lhs_var = assign->whole_variable_written();

+      if (!lhs_var)

+	 continue;

+

+      if (lhs_var->mode == ir_var_out ||

+	  lhs_var->mode == ir_var_inout)

+	 continue;

+

+      variable_entry *entry = info->refs->get_variable_entry(lhs_var);

+

+      if (!entry->declaration ||

+	  entry->assigned_count != 1 ||

+	  entry->referenced_count != 2)

+	 continue;

+

+      assert(assign == entry->assign);

+

+      /* Found a possibly graftable assignment.  Now, walk through the

+       * rest of the BB seeing if the deref is here, and if nothing interfered with

+       * pasting its expression's values in between.

+       */

+      info->progress |= try_tree_grafting(assign, lhs_var, bb_last);

+   }

+}

+

+/**

+ * Does a copy propagation pass on the code present in the instruction stream.

+ */

+bool

+do_tree_grafting(exec_list *instructions)

+{

+   ir_variable_refcount_visitor refs;

+   struct tree_grafting_info info;

+

+   info.progress = false;

+   info.refs = &refs;

+

+   visit_list_elements(info.refs, instructions);

+

+   call_for_basic_blocks(instructions, tree_grafting_basic_block, &info);

+

+   return info.progress;

+}

diff --git a/mesalib/src/glsl/s_expression.cpp b/mesalib/src/glsl/s_expression.cpp
index a922a50d3..b47b014c6 100644
--- a/mesalib/src/glsl/s_expression.cpp
+++ b/mesalib/src/glsl/s_expression.cpp
@@ -1,183 +1,183 @@
-/* -*- c++ -*- */
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#include <assert.h>
-#include "s_expression.h"
-
-s_symbol::s_symbol(const char *tmp, size_t n)
-{
-   this->str = ralloc_strndup (this, tmp, n);
-   assert(this->str != NULL);
-}
-
-s_list::s_list()
-{
-}
-
-static void
-skip_whitespace(const char *& src)
-{
-   src += strspn(src, " \v\t\r\n");
-   /* Also skip Scheme-style comments: semi-colon 'til end of line */
-   if (src[0] == ';') {
-      src += strcspn(src, "\n");
-      skip_whitespace(src);
-   }
-}
-
-static s_expression *
-read_atom(void *ctx, const char *& src)
-{
-   s_expression *expr = NULL;
-
-   skip_whitespace(src);
-
-   size_t n = strcspn(src, "( \v\t\r\n);");
-   if (n == 0)
-      return NULL; // no atom
-
-   // Check if the atom is a number.
-   char *float_end = NULL;
-   double f = glsl_strtod(src, &float_end);
-   if (float_end != src) {
-      char *int_end = NULL;
-      int i = strtol(src, &int_end, 10);
-      // If strtod matched more characters, it must have a decimal part
-      if (float_end > int_end)
-	 expr = new(ctx) s_float(f);
-      else
-	 expr = new(ctx) s_int(i);
-   } else {
-      // Not a number; return a symbol.
-      expr = new(ctx) s_symbol(src, n);
-   }
-
-   src += n;
-
-   return expr;
-}
-
-s_expression *
-s_expression::read_expression(void *ctx, const char *&src)
-{
-   assert(src != NULL);
-
-   s_expression *atom = read_atom(ctx, src);
-   if (atom != NULL)
-      return atom;
-
-   skip_whitespace(src);
-   if (src[0] == '(') {
-      ++src;
-
-      s_list *list = new(ctx) s_list;
-      s_expression *expr;
-
-      while ((expr = read_expression(ctx, src)) != NULL) {
-	 list->subexpressions.push_tail(expr);
-      }
-      skip_whitespace(src);
-      if (src[0] != ')') {
-	 printf("Unclosed expression (check your parenthesis).\n");
-	 return NULL;
-      }
-      ++src;
-      return list;
-   }
-   return NULL;
-}
-
-void s_int::print()
-{
-   printf("%d", this->val);
-}
-
-void s_float::print()
-{
-   printf("%f", this->val);
-}
-
-void s_symbol::print()
-{
-   printf("%s", this->str);
-}
-
-void s_list::print()
-{
-   printf("(");
-   foreach_iter(exec_list_iterator, it, this->subexpressions) {
-      s_expression *expr = (s_expression*) it.get();
-      expr->print();
-      if (!expr->next->is_tail_sentinel())
-	 printf(" ");
-   }
-   printf(")");
-}
-
-// --------------------------------------------------
-
-bool
-s_pattern::match(s_expression *expr)
-{
-   switch (type)
-   {
-   case EXPR:   *p_expr = expr; break;
-   case LIST:   if (expr->is_list())   *p_list   = (s_list *)   expr; break;
-   case SYMBOL: if (expr->is_symbol()) *p_symbol = (s_symbol *) expr; break;
-   case NUMBER: if (expr->is_number()) *p_number = (s_number *) expr; break;
-   case INT:    if (expr->is_int())    *p_int    = (s_int *)    expr; break;
-   case STRING:
-      s_symbol *sym = SX_AS_SYMBOL(expr);
-      if (sym != NULL && strcmp(sym->value(), literal) == 0)
-	 return true;
-      return false;
-   };
-
-   return *p_expr == expr;
-}
-
-bool
-s_match(s_expression *top, unsigned n, s_pattern *pattern, bool partial)
-{
-   s_list *list = SX_AS_LIST(top);
-   if (list == NULL)
-      return false;
-
-   unsigned i = 0;
-   foreach_iter(exec_list_iterator, it, list->subexpressions) {
-      if (i >= n)
-	 return partial; /* More actual items than the pattern expected */
-
-      s_expression *expr = (s_expression *) it.get();
-      if (expr == NULL || !pattern[i].match(expr))
-	 return false;
-
-      i++;
-   }
-
-   if (i < n)
-      return false; /* Less actual items than the pattern expected */
-
-   return true;
-}
+/* -*- c++ -*- */

+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#include <assert.h>

+#include "s_expression.h"

+

+s_symbol::s_symbol(const char *tmp, size_t n)

+{

+   this->str = ralloc_strndup (this, tmp, n);

+   assert(this->str != NULL);

+}

+

+s_list::s_list()

+{

+}

+

+static void

+skip_whitespace(const char *& src)

+{

+   src += strspn(src, " \v\t\r\n");

+   /* Also skip Scheme-style comments: semi-colon 'til end of line */

+   if (src[0] == ';') {

+      src += strcspn(src, "\n");

+      skip_whitespace(src);

+   }

+}

+

+static s_expression *

+read_atom(void *ctx, const char *& src)

+{

+   s_expression *expr = NULL;

+

+   skip_whitespace(src);

+

+   size_t n = strcspn(src, "( \v\t\r\n);");

+   if (n == 0)

+      return NULL; // no atom

+

+   // Check if the atom is a number.

+   char *float_end = NULL;

+   double f = glsl_strtod(src, &float_end);

+   if (float_end != src) {

+      char *int_end = NULL;

+      int i = strtol(src, &int_end, 10);

+      // If strtod matched more characters, it must have a decimal part

+      if (float_end > int_end)

+	 expr = new(ctx) s_float(f);

+      else

+	 expr = new(ctx) s_int(i);

+   } else {

+      // Not a number; return a symbol.

+      expr = new(ctx) s_symbol(src, n);

+   }

+

+   src += n;

+

+   return expr;

+}

+

+s_expression *

+s_expression::read_expression(void *ctx, const char *&src)

+{

+   assert(src != NULL);

+

+   s_expression *atom = read_atom(ctx, src);

+   if (atom != NULL)

+      return atom;

+

+   skip_whitespace(src);

+   if (src[0] == '(') {

+      ++src;

+

+      s_list *list = new(ctx) s_list;

+      s_expression *expr;

+

+      while ((expr = read_expression(ctx, src)) != NULL) {

+	 list->subexpressions.push_tail(expr);

+      }

+      skip_whitespace(src);

+      if (src[0] != ')') {

+	 printf("Unclosed expression (check your parenthesis).\n");

+	 return NULL;

+      }

+      ++src;

+      return list;

+   }

+   return NULL;

+}

+

+void s_int::print()

+{

+   printf("%d", this->val);

+}

+

+void s_float::print()

+{

+   printf("%f", this->val);

+}

+

+void s_symbol::print()

+{

+   printf("%s", this->str);

+}

+

+void s_list::print()

+{

+   printf("(");

+   foreach_iter(exec_list_iterator, it, this->subexpressions) {

+      s_expression *expr = (s_expression*) it.get();

+      expr->print();

+      if (!expr->next->is_tail_sentinel())

+	 printf(" ");

+   }

+   printf(")");

+}

+

+// --------------------------------------------------

+

+bool

+s_pattern::match(s_expression *expr)

+{

+   switch (type)

+   {

+   case EXPR:   *p_expr = expr; break;

+   case LIST:   if (expr->is_list())   *p_list   = (s_list *)   expr; break;

+   case SYMBOL: if (expr->is_symbol()) *p_symbol = (s_symbol *) expr; break;

+   case NUMBER: if (expr->is_number()) *p_number = (s_number *) expr; break;

+   case INT:    if (expr->is_int())    *p_int    = (s_int *)    expr; break;

+   case STRING:

+      s_symbol *sym = SX_AS_SYMBOL(expr);

+      if (sym != NULL && strcmp(sym->value(), literal) == 0)

+	 return true;

+      return false;

+   };

+

+   return *p_expr == expr;

+}

+

+bool

+s_match(s_expression *top, unsigned n, s_pattern *pattern, bool partial)

+{

+   s_list *list = SX_AS_LIST(top);

+   if (list == NULL)

+      return false;

+

+   unsigned i = 0;

+   foreach_iter(exec_list_iterator, it, list->subexpressions) {

+      if (i >= n)

+	 return partial; /* More actual items than the pattern expected */

+

+      s_expression *expr = (s_expression *) it.get();

+      if (expr == NULL || !pattern[i].match(expr))

+	 return false;

+

+      i++;

+   }

+

+   if (i < n)

+      return false; /* Less actual items than the pattern expected */

+

+   return true;

+}

diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml
index cec9c916e..148635c37 100644
--- a/mesalib/src/mapi/glapi/gen/GL3x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL3x.xml
@@ -1,589 +1,589 @@
-<?xml version="1.0"?>
-<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
-
-<!-- Note: no GLX protocol info yet. -->
-
-<OpenGLAPI>
-
-<category name="3.0">
-
-  <enum name="COMPARE_REF_TO_TEXTURE"           value="0x884E"/>
-  <enum name="CLIP_DISTANCE0"                   value="0x3000"/>
-  <enum name="CLIP_DISTANCE1"                   value="0x3001"/>
-  <enum name="CLIP_DISTANCE2"                   value="0x3002"/>
-  <enum name="CLIP_DISTANCE3"                   value="0x3003"/>
-  <enum name="CLIP_DISTANCE4"                   value="0x3004"/>
-  <enum name="CLIP_DISTANCE5"                   value="0x3005"/>
-  <enum name="CLIP_DISTANCE6"                   value="0x3006"/>
-  <enum name="CLIP_DISTANCE7"                   value="0x3007"/>
-  <enum name="MAX_CLIP_DISTANCES"               value="0x0D32"/>
-  <enum name="MAJOR_VERSION"                    value="0x821B"/>
-  <enum name="MINOR_VERSION"                    value="0x821C"/>
-  <enum name="NUM_EXTENSIONS"                   value="0x821D"/>
-  <enum name="CONTEXT_FLAGS"                    value="0x821E"/>
-  <enum name="DEPTH_BUFFER"                     value="0x8223"/>
-  <enum name="STENCIL_BUFFER"                   value="0x8224"/>
-  <enum name="COMPRESSED_RED"                   value="0x8225"/>
-  <enum name="COMPRESSED_RG"                    value="0x8226"/>
-  <enum name="CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT"  value="0x0001"/>
-  <enum name="RGBA32F"                          value="0x8814"/>
-  <enum name="RGB32F"                           value="0x8815"/>
-  <enum name="RGBA16F"                          value="0x881A"/>
-  <enum name="RGB16F"                           value="0x881B"/>
-  <enum name="VERTEX_ATTRIB_ARRAY_INTEGER"      value="0x88FD"/>
-  <enum name="MAX_ARRAY_TEXTURE_LAYERS"         value="0x88FF"/>
-  <enum name="MIN_PROGRAM_TEXEL_OFFSET"         value="0x8904"/>
-  <enum name="MAX_PROGRAM_TEXEL_OFFSET"         value="0x8905"/>
-  <enum name="CLAMP_READ_COLOR"                 value="0x891C"/>
-  <enum name="FIXED_ONLY"                       value="0x891D"/>
-  <enum name="MAX_VARYING_COMPONENTS"           value="0x8B4B"/>
-  <enum name="TEXTURE_1D_ARRAY"                 value="0x8C18"/>
-  <enum name="PROXY_TEXTURE_1D_ARRAY"           value="0x8C19"/>
-  <enum name="TEXTURE_2D_ARRAY"                 value="0x8C1A"/>
-  <enum name="PROXY_TEXTURE_2D_ARRAY"           value="0x8C1B"/>
-  <enum name="TEXTURE_BINDING_1D_ARRAY"         value="0x8C1C"/>
-  <enum name="TEXTURE_BINDING_2D_ARRAY"         value="0x8C1D"/>
-  <enum name="R11F_G11F_B10F"                   value="0x8C3A"/>
-  <enum name="UNSIGNED_INT_10F_11F_11F_REV"     value="0x8C3B"/>
-  <enum name="RGB9_E5"                          value="0x8C3D"/>
-  <enum name="UNSIGNED_INT_5_9_9_9_REV"         value="0x8C3E"/>
-  <enum name="TEXTURE_SHARED_SIZE"              value="0x8C3F"/>
-  <enum name="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH"  value="0x8C76"/>
-  <enum name="TRANSFORM_FEEDBACK_BUFFER_MODE"   value="0x8C7F"/>
-  <enum name="MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS"  value="0x8C80"/>
-  <enum name="TRANSFORM_FEEDBACK_VARYINGS"      value="0x8C83"/>
-  <enum name="TRANSFORM_FEEDBACK_BUFFER_START"  value="0x8C84"/>
-  <enum name="TRANSFORM_FEEDBACK_BUFFER_SIZE"   value="0x8C85"/>
-  <enum name="PRIMITIVES_GENERATED"             value="0x8C87"/>
-  <enum name="TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN"  value="0x8C88"/>
-  <enum name="RASTERIZER_DISCARD"               value="0x8C89"/>
-  <enum name="MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS"  value="0x8C8A"/>
-  <enum name="MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS"  value="0x8C8B"/>
-  <enum name="INTERLEAVED_ATTRIBS"              value="0x8C8C"/>
-  <enum name="SEPARATE_ATTRIBS"                 value="0x8C8D"/>
-  <enum name="TRANSFORM_FEEDBACK_BUFFER"        value="0x8C8E"/>
-  <enum name="TRANSFORM_FEEDBACK_BUFFER_BINDING"  value="0x8C8F"/>
-  <enum name="RGBA32UI"                         value="0x8D70"/>
-  <enum name="RGB32UI"                          value="0x8D71"/>
-  <enum name="RGBA16UI"                         value="0x8D76"/>
-  <enum name="RGB16UI"                          value="0x8D77"/>
-  <enum name="RGBA8UI"                          value="0x8D7C"/>
-  <enum name="RGB8UI"                           value="0x8D7D"/>
-  <enum name="RGBA32I"                          value="0x8D82"/>
-  <enum name="RGB32I"                           value="0x8D83"/>
-  <enum name="RGBA16I"                          value="0x8D88"/>
-  <enum name="RGB16I"                           value="0x8D89"/>
-  <enum name="RGBA8I"                           value="0x8D8E"/>
-  <enum name="RGB8I"                            value="0x8D8F"/>
-  <enum name="RED_INTEGER"                      value="0x8D94"/>
-  <enum name="GREEN_INTEGER"                    value="0x8D95"/>
-  <enum name="BLUE_INTEGER"                     value="0x8D96"/>
-  <enum name="RGB_INTEGER"                      value="0x8D98"/>
-  <enum name="RGBA_INTEGER"                     value="0x8D99"/>
-  <enum name="BGR_INTEGER"                      value="0x8D9A"/>
-  <enum name="BGRA_INTEGER"                     value="0x8D9B"/>
-  <enum name="SAMPLER_1D_ARRAY"                 value="0x8DC0"/>
-  <enum name="SAMPLER_2D_ARRAY"                 value="0x8DC1"/>
-  <enum name="SAMPLER_1D_ARRAY_SHADOW"          value="0x8DC3"/>
-  <enum name="SAMPLER_2D_ARRAY_SHADOW"          value="0x8DC4"/>
-  <enum name="SAMPLER_CUBE_SHADOW"              value="0x8DC5"/>
-  <enum name="UNSIGNED_INT_VEC2"                value="0x8DC6"/>
-  <enum name="UNSIGNED_INT_VEC3"                value="0x8DC7"/>
-  <enum name="UNSIGNED_INT_VEC4"                value="0x8DC8"/>
-  <enum name="INT_SAMPLER_1D"                   value="0x8DC9"/>
-  <enum name="INT_SAMPLER_2D"                   value="0x8DCA"/>
-  <enum name="INT_SAMPLER_3D"                   value="0x8DCB"/>
-  <enum name="INT_SAMPLER_CUBE"                 value="0x8DCC"/>
-  <enum name="INT_SAMPLER_1D_ARRAY"             value="0x8DCE"/>
-  <enum name="INT_SAMPLER_2D_ARRAY"             value="0x8DCF"/>
-  <enum name="UNSIGNED_INT_SAMPLER_1D"          value="0x8DD1"/>
-  <enum name="UNSIGNED_INT_SAMPLER_2D"          value="0x8DD2"/>
-  <enum name="UNSIGNED_INT_SAMPLER_3D"          value="0x8DD3"/>
-  <enum name="UNSIGNED_INT_SAMPLER_CUBE"        value="0x8DD4"/>
-  <enum name="UNSIGNED_INT_SAMPLER_1D_ARRAY"    value="0x8DD6"/>
-  <enum name="UNSIGNED_INT_SAMPLER_2D_ARRAY"    value="0x8DD7"/>
-  <enum name="QUERY_WAIT"                       value="0x8E13"/>
-  <enum name="QUERY_NO_WAIT"                    value="0x8E14"/>
-  <enum name="QUERY_BY_REGION_WAIT"             value="0x8E15"/>
-  <enum name="QUERY_BY_REGION_NO_WAIT"          value="0x8E16"/>
-  <enum name="BUFFER_ACCESS_FLAGS"              value="0x911F"/>
-  <enum name="BUFFER_MAP_LENGTH"                value="0x9120"/>
-  <enum name="BUFFER_MAP_OFFSET"                value="0x9121"/>
-
-  <!-- These functions are unique to GL3 -->
-
-  <function name="ClearBufferiv" offset="assign">
-    <param name="buffer" type="GLenum"/>
-    <param name="drawbuffer" type="GLint"/>
-    <param name="value" type="const GLint *"/>
-  </function>
-
-  <function name="ClearBufferuiv" offset="assign">
-    <param name="buffer" type="GLenum"/>
-    <param name="drawbuffer" type="GLint"/>
-    <param name="value" type="const GLuint *"/>
-  </function>
-
-  <function name="ClearBufferfv" offset="assign">
-    <param name="buffer" type="GLenum"/>
-    <param name="drawbuffer" type="GLint"/>
-    <param name="value" type="const GLfloat *"/>
-  </function>
-
-  <function name="ClearBufferfi" offset="assign">
-    <param name="buffer" type="GLenum"/>
-    <param name="drawbuffer" type="GLint"/>
-    <param name="depth" type="GLfloat"/>
-    <param name="stencil" type="GLint"/>
-  </function>
-
-  <function name="GetStringi" offset="assign">
-    <param name="name" type="GLenum"/>
-    <param name="index" type="GLuint"/>
-      <return type="const GLubyte *"/>
-  </function>
-
-  <function name="ClampColor" offset="assign">
-    <param name="target" type="GLenum"/>
-    <param name="clamp" type="GLenum"/>
-  </function>
-
-  <!-- These functions alias ones form GL_ARB_draw_buffers2 -->
-
-  <function name="ColorMaski" alias="ColorMaskIndexedEXT">
-    <param name="buf" type="GLuint"/>
-    <param name="r" type="GLboolean"/>
-    <param name="g" type="GLboolean"/>
-    <param name="b" type="GLboolean"/>
-    <param name="a" type="GLboolean"/>
-  </function>
-
-  <function name="GetBooleani_v" alias="GetBooleanIndexedvEXT">
-    <param name="value" type="GLenum"/>
-    <param name="index" type="GLuint"/>
-    <param name="data" type="GLboolean *"/>
-  </function>
-
-  <function name="GetIntegeri_v" alias="GetIntegerIndexedvEXT">
-    <param name="value" type="GLenum"/>
-    <param name="index" type="GLuint"/>
-    <param name="data" type="GLint *"/>
-  </function>
-
-  <function name="Enablei" alias="EnableIndexedEXT">
-    <param name="target" type="GLenum"/>
-    <param name="index" type="GLuint"/>
-  </function>
-
-  <function name="Disablei" alias="DisableIndexedEXT">
-    <param name="target" type="GLenum"/>
-    <param name="index" type="GLuint"/>
-  </function>
-
-  <function name="IsEnabledi" alias="IsEnabledIndexedEXT">
-    <param name="target" type="GLenum"/>
-    <param name="index" type="GLuint"/>
-      <return type="GLboolean"/>
-  </function>
-
-  <!-- These functions alias ones form GL_EXT_transform_feedback -->
-
-  <function name="GetFragDataLocation" alias="GetFragDataLocationEXT">
-    <param name="program" type="GLuint"/>
-    <param name="name" type="const GLchar *"/>
-      <return type="GLint"/>
-  </function>
-
-  <function name="BindFragDataLocation" alias="BindFragDataLocationEXT">
-    <param name="program" type="GLuint"/>
-    <param name="colorNumber" type="GLuint"/>
-    <param name="name" type="const GLchar *"/>
-  </function>
-
-  <function name="BeginTransformFeedback" alias="BeginTransformFeedbackEXT">
-    <param name="mode" type="GLenum"/>
-  </function>
-
-  <function name="EndTransformFeedback" alias="EndTransformFeedbackEXT">
-  </function>
-
-  <function name="BindBufferRange" alias="BindBufferRangeEXT">
-    <param name="target" type="GLenum"/>
-    <param name="index" type="GLuint"/>
-    <param name="buffer" type="GLuint"/>
-    <param name="offset" type="GLintptr"/>
-    <param name="size" type="GLsizeiptr"/>
-  </function>
-
-  <function name="BindBufferBase" alias="BindBufferBaseEXT">
-    <param name="target" type="GLenum"/>
-    <param name="index" type="GLuint"/>
-    <param name="buffer" type="GLuint"/>
-  </function>
-
-  <function name="TransformFeedbackVaryings" alias="TransformFeedbackVaryingsEXT">
-    <param name="program" type="GLuint"/>
-    <param name="count" type="GLsizei"/>
-    <param name="varyings" type="const GLchar* *"/>
-    <param name="bufferMode" type="GLenum"/>
-  </function>
-
-  <function name="GetTransformFeedbackVarying" alias="GetTransformFeedbackVaryingEXT">
-    <param name="program" type="GLuint"/>
-    <param name="index" type="GLuint"/>
-    <param name="bufSize" type="GLsizei"/>
-    <param name="length" type="GLsizei *"/>
-    <param name="size" type="GLsizei *"/>
-    <param name="type" type="GLenum *"/>
-    <param name="name" type="GLchar *"/>
-  </function>
-
-  <!-- These functions alias ones from GL_NV_conditional_render -->
-
-  <function name="BeginConditionalRender" alias="BeginConditionalRenderNV">
-    <param name="query" type="GLuint"/>
-    <param name="mode" type="GLenum"/>
-  </function>
-
-  <function name="EndConditionalRender" alias="EndConditionalRenderNV">
-  </function>
-
-  <!-- These functions alias ones from GL_EXT_gpu_shader4 -->
-
-  <function name="VertexAttribIPointer" alias="VertexAttribIPointerEXT">
-    <param name="index" type="GLuint"/>
-    <param name="size" type="GLint"/>
-    <param name="type" type="GLenum"/>
-    <param name="stride" type="GLsizei"/>
-    <param name="pointer" type="const GLvoid *"/>
-  </function>
-
-  <function name="GetVertexAttribIiv" alias="GetVertexAttribIivEXT">
-    <param name="index" type="GLuint"/>
-    <param name="pname" type="GLenum"/>
-    <param name="params" type="GLint *"/>
-  </function>
-
-  <function name="GetVertexAttribIuiv" alias="GetVertexAttribIuivEXT">
-    <param name="index" type="GLuint"/>
-    <param name="pname" type="GLenum"/>
-    <param name="params" type="GLuint *"/>
-  </function>
-
-  <function name="VertexAttribI1i" alias="VertexAttribI1iEXT">
-    <param name="index" type="GLuint"/>
-    <param name="x" type="GLint"/>
-  </function>
-
-  <function name="VertexAttribI2i" alias="VertexAttribI2iEXT">
-    <param name="index" type="GLuint"/>
-    <param name="x" type="GLint"/>
-    <param name="y" type="GLint"/>
-  </function>
-
-  <function name="VertexAttribI3i" alias="VertexAttribI3iEXT">
-    <param name="index" type="GLuint"/>
-    <param name="x" type="GLint"/>
-    <param name="y" type="GLint"/>
-    <param name="z" type="GLint"/>
-  </function>
-
-  <function name="VertexAttribI4i" alias="VertexAttribI4iEXT">
-    <param name="index" type="GLuint"/>
-    <param name="x" type="GLint"/>
-    <param name="y" type="GLint"/>
-    <param name="z" type="GLint"/>
-    <param name="w" type="GLint"/>
-  </function>
-
-  <function name="VertexAttribI1ui" alias="VertexAttribI1uiEXT">
-    <param name="index" type="GLuint"/>
-    <param name="x" type="GLuint"/>
-  </function>
-
-  <function name="VertexAttribI2ui" alias="VertexAttribI2uiEXT">
-    <param name="index" type="GLuint"/>
-    <param name="x" type="GLuint"/>
-    <param name="y" type="GLuint"/>
-  </function>
-
-  <function name="VertexAttribI3ui" alias="VertexAttribI3uiEXT">
-    <param name="index" type="GLuint"/>
-    <param name="x" type="GLuint"/>
-    <param name="y" type="GLuint"/>
-    <param name="z" type="GLuint"/>
-  </function>
-
-  <function name="VertexAttribI4ui" alias="VertexAttribI4uiEXT">
-    <param name="index" type="GLuint"/>
-    <param name="x" type="GLuint"/>
-    <param name="y" type="GLuint"/>
-    <param name="z" type="GLuint"/>
-    <param name="w" type="GLuint"/>
-  </function>
-
-  <function name="VertexAttribI1iv" alias="VertexAttribI1ivEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLint *"/>
-  </function>
-
-  <function name="VertexAttribI2iv" alias="VertexAttribI2ivEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLint *"/>
-  </function>
-
-  <function name="VertexAttribI3iv" alias="VertexAttribI3ivEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLint *"/>
-  </function>
-
-  <function name="VertexAttribI4iv" alias="VertexAttribI4ivEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLint *"/>
-  </function>
-
-  <function name="VertexAttribI1uiv" alias="VertexAttribI1uivEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLuint *"/>
-  </function>
-
-  <function name="VertexAttribI2uiv" alias="VertexAttribI2uivEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLuint *"/>
-  </function>
-
-  <function name="VertexAttribI3uiv" alias="VertexAttribI3uivEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLuint *"/>
-  </function>
-
-  <function name="VertexAttribI4uiv" alias="VertexAttribI4uivEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLuint *"/>
-  </function>
-
-  <function name="VertexAttribI4bv" alias="VertexAttribI4bvEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLbyte *"/>
-  </function>
-
-  <function name="VertexAttribI4sv" alias="VertexAttribI4svEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLshort *"/>
-  </function>
-
-  <function name="VertexAttribI4ubv" alias="VertexAttribI4ubvEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLubyte *"/>
-  </function>
-
-  <function name="VertexAttribI4usv" alias="VertexAttribI4usvEXT">
-    <param name="index" type="GLuint"/>
-    <param name="v" type="const GLushort *"/>
-  </function>
-
-  <function name="GetUniformuiv" alias="GetUniformuivEXT">
-    <param name="program" type="GLuint"/>
-    <param name="location" type="GLint"/>
-    <param name="params" type="GLuint *"/>
-  </function>
-
-  <function name="Uniform1ui" alias="Uniform1uiEXT">
-    <param name="location" type="GLint"/>
-    <param name="x" type="GLuint"/>
-  </function>
-
-  <function name="Uniform2ui" alias="Uniform2uiEXT">
-    <param name="location" type="GLint"/>
-    <param name="x" type="GLuint"/>
-    <param name="y" type="GLuint"/>
-  </function>
-
-  <function name="Uniform3ui" alias="Uniform3uiEXT">
-    <param name="location" type="GLint"/>
-    <param name="x" type="GLuint"/>
-    <param name="y" type="GLuint"/>
-    <param name="z" type="GLuint"/>
-  </function>
-
-  <function name="Uniform4ui" alias="Uniform4uiEXT">
-    <param name="location" type="GLint"/>
-    <param name="x" type="GLuint"/>
-    <param name="y" type="GLuint"/>
-    <param name="z" type="GLuint"/>
-    <param name="w" type="GLuint"/>
-  </function>
-
-  <function name="Uniform1uiv" alias="Uniform1uivEXT">
-    <param name="location" type="GLint"/>
-    <param name="count" type="GLsizei"/>
-    <param name="value" type="const GLuint *"/>
-  </function>
-
-  <function name="Uniform2uiv" alias="Uniform2uivEXT">
-    <param name="location" type="GLint"/>
-    <param name="count" type="GLsizei"/>
-    <param name="value" type="const GLuint *"/>
-  </function>
-
-  <function name="Uniform3uiv" alias="Uniform3uivEXT">
-    <param name="location" type="GLint"/>
-    <param name="count" type="GLsizei"/>
-    <param name="value" type="const GLuint *"/>
-  </function>
-
-  <function name="Uniform4uiv" alias="Uniform4uivEXT">
-    <param name="location" type="GLint"/>
-    <param name="count" type="GLsizei"/>
-    <param name="value" type="const GLuint *"/>
-  </function>
-
-  <!-- These functions alias ones from GL_EXT_texture_integer -->
-
-  <function name="TexParameterIiv" alias="TexParameterIivEXT">
-    <param name="target" type="GLenum"/>
-    <param name="pname" type="GLenum"/>
-    <param name="params" type="const GLint *"/>
-  </function>
-
-  <function name="TexParameterIuiv" alias="TexParameterIuivEXT">
-    <param name="target" type="GLenum"/>
-    <param name="pname" type="GLenum"/>
-    <param name="params" type="const GLuint *"/>
-  </function>
-
-  <function name="GetTexParameterIiv" alias="GetTexParameterIivEXT">
-    <param name="target" type="GLenum"/>
-    <param name="pname" type="GLenum"/>
-    <param name="params" type="GLint *"/>
-  </function>
-
-  <function name="GetTexParameterIuiv" alias="GetTexParameterIuivEXT">
-    <param name="target" type="GLenum"/>
-    <param name="pname" type="GLenum"/>
-    <param name="params" type="GLuint *"/>
-  </function>
-
-</category>
-
-
-<category name="3.1">
-
-  <enum name="SAMPLER_2D_RECT"                value="0x8B63"/>
-  <enum name="SAMPLER_2D_RECT_SHADOW"         value="0x8B64"/>
-  <enum name="SAMPLER_BUFFER"                 value="0x8DC2"/>
-  <enum name="INT_SAMPLER_2D_RECT"            value="0x8DCD"/>
-  <enum name="INT_SAMPLER_BUFFER"             value="0x8DD0"/>
-  <enum name="UNSIGNED_INT_SAMPLER_2D_RECT"   value="0x8DD5"/>
-  <enum name="UNSIGNED_INT_SAMPLER_BUFFER"    value="0x8DD8"/>
-  <enum name="TEXTURE_BUFFER"                 value="0x8C2A"/>
-  <enum name="MAX_TEXTURE_BUFFER_SIZE"        value="0x8C2B"/>
-  <enum name="TEXTURE_BINDING_BUFFER"         value="0x8C2C"/>
-  <enum name="TEXTURE_BUFFER_DATA_STORE_BINDING" value="0x8C2D"/>
-  <enum name="TEXTURE_BUFFER_FORMAT"          value="0x8C2E"/>
-  <enum name="TEXTURE_RECTANGLE"              value="0x84F5"/>
-  <enum name="TEXTURE_BINDING_RECTANGLE"      value="0x84F6"/>
-  <enum name="PROXY_TEXTURE_RECTANGLE"        value="0x84F7"/>
-  <enum name="MAX_RECTANGLE_TEXTURE_SIZE"     value="0x84F8"/>
-  <enum name="RED_SNORM"                      value="0x8F90"/>
-  <enum name="RG_SNORM"                       value="0x8F91"/>
-  <enum name="RGB_SNORM"                      value="0x8F92"/>
-  <enum name="RGBA_SNORM"                     value="0x8F93"/>
-  <enum name="R8_SNORM"                       value="0x8F94"/>
-  <enum name="RG8_SNORM"                      value="0x8F95"/>
-  <enum name="RGB8_SNORM"                     value="0x8F96"/>
-  <enum name="RGBA8_SNORM"                    value="0x8F97"/>
-  <enum name="R16_SNORM"                      value="0x8F98"/>
-  <enum name="RG16_SNORM"                     value="0x8F99"/>
-  <enum name="RGB16_SNORM"                    value="0x8F9A"/>
-  <enum name="RGBA16_SNORM"                   value="0x8F9B"/>
-  <enum name="SIGNED_NORMALIZED"              value="0x8F9C"/>
-  <enum name="PRIMITIVE_RESTART"              value="0x8F9D"/>
-  <enum name="PRIMITIVE_RESTART_INDEX"        value="0x8F9E"/>
-
-  <function name="DrawArraysInstanced" alias="DrawArraysInstancedARB">
-    <param name="mode" type="GLenum"/>
-    <param name="first" type="GLint"/>
-    <param name="count" type="GLsizei"/>
-    <param name="primcount" type="GLsizei"/>
-  </function>
-
-  <function name="DrawElementsInstanced" alias="DrawElementsInstancedARB">
-    <param name="mode" type="GLenum"/>
-    <param name="count" type="GLsizei"/>
-    <param name="type" type="GLenum"/>
-    <param name="indices" type="const GLvoid *"/>
-    <param name="primcount" type="GLsizei"/>
-  </function>
-
-  <function name="TexBuffer" offset="assign">
-    <param name="target" type="GLenum"/>
-    <param name="internalFormat" type="GLenum"/>
-    <param name="buffer" type="GLuint"/>
-  </function>
-
-  <function name="PrimitiveRestartIndex" alias="PrimitiveRestartIndexNV">
-    <param name="index" type="GLuint"/>
-  </function>
-
-</category>
-
-
-<category name="3.2">
-
-  <enum name="CONTEXT_CORE_PROFILE_BIT"             value="0x00000001"/>
-  <enum name="CONTEXT_COMPATIBILITY_PROFILE_BIT"    value="0x00000002"/>
-  <enum name="LINES_ADJACENCY"                      value="0x000A"/>
-  <enum name="LINE_STRIP_ADJACENCY"                 value="0x000B"/>
-  <enum name="TRIANGLES_ADJACENCY"                  value="0x000C"/>
-  <enum name="TRIANGLE_STRIP_ADJACENCY"             value="0x000D"/>
-  <enum name="PROGRAM_POINT_SIZE"                   value="0x8642"/>
-  <enum name="MAX_GEOMETRY_TEXTURE_IMAGE_UNITS"     value="0x8C29"/>
-  <enum name="FRAMEBUFFER_ATTACHMENT_LAYERED"       value="0x8DA7"/>
-  <enum name="FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS" value="0x8DA8"/>
-  <enum name="GEOMETRY_SHADER"                      value="0x8DD9"/>
-  <enum name="GEOMETRY_VERTICES_OUT"                value="0x8916"/>
-  <enum name="GEOMETRY_INPUT_TYPE"                  value="0x8917"/>
-  <enum name="GEOMETRY_OUTPUT_TYPE"                 value="0x8918"/>
-  <enum name="MAX_GEOMETRY_UNIFORM_COMPONENTS"      value="0x8DDF"/>
-  <enum name="MAX_GEOMETRY_OUTPUT_VERTICES"         value="0x8DE0"/>
-  <enum name="MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS" value="0x8DE1"/>
-  <enum name="MAX_VERTEX_OUTPUT_COMPONENTS"         value="0x9122"/>
-  <enum name="MAX_GEOMETRY_INPUT_COMPONENTS"        value="0x9123"/>
-  <enum name="MAX_GEOMETRY_OUTPUT_COMPONENTS"       value="0x9124"/>
-  <enum name="MAX_FRAGMENT_INPUT_COMPONENTS"        value="0x9125"/>
-  <enum name="CONTEXT_PROFILE_MASK"                 value="0x9126"/>
-
-  <function name="GetInteger64i_v" offset="assign">
-    <param name="cap" type="GLenum"/>
-    <param name="index" type="GLuint"/>
-    <param name="data" type="GLint64 *"/>
-  </function>
-
-  <function name="GetBufferParameteri64v" offset="assign">
-    <param name="target" type="GLenum"/>
-    <param name="pname" type="GLenum"/>
-    <param name="params" type="GLint64 *"/>
-  </function>
-
-  <function name="FramebufferTexture" offset="assign">
-    <param name="target" type="GLenum"/>
-    <param name="attachment" type="GLenum"/>
-    <param name="texture" type="GLuint"/>
-    <param name="level" type="GLint"/>
-  </function>
-
-</category>
-
-
-<category name="3.3">
-  <!-- There are other new functions and tokens defined by other extensions -->
-
-  <function name="VertexAttribDivisor" offset="assign">
-    <param name="index" type="GLuint"/>
-    <param name="divisor" type="GLuint"/>
-  </function>
-
-</category>
-
-</OpenGLAPI>
+<?xml version="1.0"?>

+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">

+

+<!-- Note: no GLX protocol info yet. -->

+

+<OpenGLAPI>

+

+<category name="3.0">

+

+  <enum name="COMPARE_REF_TO_TEXTURE"           value="0x884E"/>

+  <enum name="CLIP_DISTANCE0"                   value="0x3000"/>

+  <enum name="CLIP_DISTANCE1"                   value="0x3001"/>

+  <enum name="CLIP_DISTANCE2"                   value="0x3002"/>

+  <enum name="CLIP_DISTANCE3"                   value="0x3003"/>

+  <enum name="CLIP_DISTANCE4"                   value="0x3004"/>

+  <enum name="CLIP_DISTANCE5"                   value="0x3005"/>

+  <enum name="CLIP_DISTANCE6"                   value="0x3006"/>

+  <enum name="CLIP_DISTANCE7"                   value="0x3007"/>

+  <enum name="MAX_CLIP_DISTANCES"               value="0x0D32"/>

+  <enum name="MAJOR_VERSION"                    value="0x821B"/>

+  <enum name="MINOR_VERSION"                    value="0x821C"/>

+  <enum name="NUM_EXTENSIONS"                   value="0x821D"/>

+  <enum name="CONTEXT_FLAGS"                    value="0x821E"/>

+  <enum name="DEPTH_BUFFER"                     value="0x8223"/>

+  <enum name="STENCIL_BUFFER"                   value="0x8224"/>

+  <enum name="COMPRESSED_RED"                   value="0x8225"/>

+  <enum name="COMPRESSED_RG"                    value="0x8226"/>

+  <enum name="CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT"  value="0x0001"/>

+  <enum name="RGBA32F"                          value="0x8814"/>

+  <enum name="RGB32F"                           value="0x8815"/>

+  <enum name="RGBA16F"                          value="0x881A"/>

+  <enum name="RGB16F"                           value="0x881B"/>

+  <enum name="VERTEX_ATTRIB_ARRAY_INTEGER"      value="0x88FD"/>

+  <enum name="MAX_ARRAY_TEXTURE_LAYERS"         value="0x88FF"/>

+  <enum name="MIN_PROGRAM_TEXEL_OFFSET"         value="0x8904"/>

+  <enum name="MAX_PROGRAM_TEXEL_OFFSET"         value="0x8905"/>

+  <enum name="CLAMP_READ_COLOR"                 value="0x891C"/>

+  <enum name="FIXED_ONLY"                       value="0x891D"/>

+  <enum name="MAX_VARYING_COMPONENTS"           value="0x8B4B"/>

+  <enum name="TEXTURE_1D_ARRAY"                 value="0x8C18"/>

+  <enum name="PROXY_TEXTURE_1D_ARRAY"           value="0x8C19"/>

+  <enum name="TEXTURE_2D_ARRAY"                 value="0x8C1A"/>

+  <enum name="PROXY_TEXTURE_2D_ARRAY"           value="0x8C1B"/>

+  <enum name="TEXTURE_BINDING_1D_ARRAY"         value="0x8C1C"/>

+  <enum name="TEXTURE_BINDING_2D_ARRAY"         value="0x8C1D"/>

+  <enum name="R11F_G11F_B10F"                   value="0x8C3A"/>

+  <enum name="UNSIGNED_INT_10F_11F_11F_REV"     value="0x8C3B"/>

+  <enum name="RGB9_E5"                          value="0x8C3D"/>

+  <enum name="UNSIGNED_INT_5_9_9_9_REV"         value="0x8C3E"/>

+  <enum name="TEXTURE_SHARED_SIZE"              value="0x8C3F"/>

+  <enum name="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH"  value="0x8C76"/>

+  <enum name="TRANSFORM_FEEDBACK_BUFFER_MODE"   value="0x8C7F"/>

+  <enum name="MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS"  value="0x8C80"/>

+  <enum name="TRANSFORM_FEEDBACK_VARYINGS"      value="0x8C83"/>

+  <enum name="TRANSFORM_FEEDBACK_BUFFER_START"  value="0x8C84"/>

+  <enum name="TRANSFORM_FEEDBACK_BUFFER_SIZE"   value="0x8C85"/>

+  <enum name="PRIMITIVES_GENERATED"             value="0x8C87"/>

+  <enum name="TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN"  value="0x8C88"/>

+  <enum name="RASTERIZER_DISCARD"               value="0x8C89"/>

+  <enum name="MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS"  value="0x8C8A"/>

+  <enum name="MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS"  value="0x8C8B"/>

+  <enum name="INTERLEAVED_ATTRIBS"              value="0x8C8C"/>

+  <enum name="SEPARATE_ATTRIBS"                 value="0x8C8D"/>

+  <enum name="TRANSFORM_FEEDBACK_BUFFER"        value="0x8C8E"/>

+  <enum name="TRANSFORM_FEEDBACK_BUFFER_BINDING"  value="0x8C8F"/>

+  <enum name="RGBA32UI"                         value="0x8D70"/>

+  <enum name="RGB32UI"                          value="0x8D71"/>

+  <enum name="RGBA16UI"                         value="0x8D76"/>

+  <enum name="RGB16UI"                          value="0x8D77"/>

+  <enum name="RGBA8UI"                          value="0x8D7C"/>

+  <enum name="RGB8UI"                           value="0x8D7D"/>

+  <enum name="RGBA32I"                          value="0x8D82"/>

+  <enum name="RGB32I"                           value="0x8D83"/>

+  <enum name="RGBA16I"                          value="0x8D88"/>

+  <enum name="RGB16I"                           value="0x8D89"/>

+  <enum name="RGBA8I"                           value="0x8D8E"/>

+  <enum name="RGB8I"                            value="0x8D8F"/>

+  <enum name="RED_INTEGER"                      value="0x8D94"/>

+  <enum name="GREEN_INTEGER"                    value="0x8D95"/>

+  <enum name="BLUE_INTEGER"                     value="0x8D96"/>

+  <enum name="RGB_INTEGER"                      value="0x8D98"/>

+  <enum name="RGBA_INTEGER"                     value="0x8D99"/>

+  <enum name="BGR_INTEGER"                      value="0x8D9A"/>

+  <enum name="BGRA_INTEGER"                     value="0x8D9B"/>

+  <enum name="SAMPLER_1D_ARRAY"                 value="0x8DC0"/>

+  <enum name="SAMPLER_2D_ARRAY"                 value="0x8DC1"/>

+  <enum name="SAMPLER_1D_ARRAY_SHADOW"          value="0x8DC3"/>

+  <enum name="SAMPLER_2D_ARRAY_SHADOW"          value="0x8DC4"/>

+  <enum name="SAMPLER_CUBE_SHADOW"              value="0x8DC5"/>

+  <enum name="UNSIGNED_INT_VEC2"                value="0x8DC6"/>

+  <enum name="UNSIGNED_INT_VEC3"                value="0x8DC7"/>

+  <enum name="UNSIGNED_INT_VEC4"                value="0x8DC8"/>

+  <enum name="INT_SAMPLER_1D"                   value="0x8DC9"/>

+  <enum name="INT_SAMPLER_2D"                   value="0x8DCA"/>

+  <enum name="INT_SAMPLER_3D"                   value="0x8DCB"/>

+  <enum name="INT_SAMPLER_CUBE"                 value="0x8DCC"/>

+  <enum name="INT_SAMPLER_1D_ARRAY"             value="0x8DCE"/>

+  <enum name="INT_SAMPLER_2D_ARRAY"             value="0x8DCF"/>

+  <enum name="UNSIGNED_INT_SAMPLER_1D"          value="0x8DD1"/>

+  <enum name="UNSIGNED_INT_SAMPLER_2D"          value="0x8DD2"/>

+  <enum name="UNSIGNED_INT_SAMPLER_3D"          value="0x8DD3"/>

+  <enum name="UNSIGNED_INT_SAMPLER_CUBE"        value="0x8DD4"/>

+  <enum name="UNSIGNED_INT_SAMPLER_1D_ARRAY"    value="0x8DD6"/>

+  <enum name="UNSIGNED_INT_SAMPLER_2D_ARRAY"    value="0x8DD7"/>

+  <enum name="QUERY_WAIT"                       value="0x8E13"/>

+  <enum name="QUERY_NO_WAIT"                    value="0x8E14"/>

+  <enum name="QUERY_BY_REGION_WAIT"             value="0x8E15"/>

+  <enum name="QUERY_BY_REGION_NO_WAIT"          value="0x8E16"/>

+  <enum name="BUFFER_ACCESS_FLAGS"              value="0x911F"/>

+  <enum name="BUFFER_MAP_LENGTH"                value="0x9120"/>

+  <enum name="BUFFER_MAP_OFFSET"                value="0x9121"/>

+

+  <!-- These functions are unique to GL3 -->

+

+  <function name="ClearBufferiv" offset="assign">

+    <param name="buffer" type="GLenum"/>

+    <param name="drawbuffer" type="GLint"/>

+    <param name="value" type="const GLint *"/>

+  </function>

+

+  <function name="ClearBufferuiv" offset="assign">

+    <param name="buffer" type="GLenum"/>

+    <param name="drawbuffer" type="GLint"/>

+    <param name="value" type="const GLuint *"/>

+  </function>

+

+  <function name="ClearBufferfv" offset="assign">

+    <param name="buffer" type="GLenum"/>

+    <param name="drawbuffer" type="GLint"/>

+    <param name="value" type="const GLfloat *"/>

+  </function>

+

+  <function name="ClearBufferfi" offset="assign">

+    <param name="buffer" type="GLenum"/>

+    <param name="drawbuffer" type="GLint"/>

+    <param name="depth" type="GLfloat"/>

+    <param name="stencil" type="GLint"/>

+  </function>

+

+  <function name="GetStringi" offset="assign">

+    <param name="name" type="GLenum"/>

+    <param name="index" type="GLuint"/>

+      <return type="const GLubyte *"/>

+  </function>

+

+  <function name="ClampColor" offset="assign">

+    <param name="target" type="GLenum"/>

+    <param name="clamp" type="GLenum"/>

+  </function>

+

+  <!-- These functions alias ones form GL_ARB_draw_buffers2 -->

+

+  <function name="ColorMaski" alias="ColorMaskIndexedEXT">

+    <param name="buf" type="GLuint"/>

+    <param name="r" type="GLboolean"/>

+    <param name="g" type="GLboolean"/>

+    <param name="b" type="GLboolean"/>

+    <param name="a" type="GLboolean"/>

+  </function>

+

+  <function name="GetBooleani_v" alias="GetBooleanIndexedvEXT">

+    <param name="value" type="GLenum"/>

+    <param name="index" type="GLuint"/>

+    <param name="data" type="GLboolean *"/>

+  </function>

+

+  <function name="GetIntegeri_v" alias="GetIntegerIndexedvEXT">

+    <param name="value" type="GLenum"/>

+    <param name="index" type="GLuint"/>

+    <param name="data" type="GLint *"/>

+  </function>

+

+  <function name="Enablei" alias="EnableIndexedEXT">

+    <param name="target" type="GLenum"/>

+    <param name="index" type="GLuint"/>

+  </function>

+

+  <function name="Disablei" alias="DisableIndexedEXT">

+    <param name="target" type="GLenum"/>

+    <param name="index" type="GLuint"/>

+  </function>

+

+  <function name="IsEnabledi" alias="IsEnabledIndexedEXT">

+    <param name="target" type="GLenum"/>

+    <param name="index" type="GLuint"/>

+      <return type="GLboolean"/>

+  </function>

+

+  <!-- These functions alias ones form GL_EXT_transform_feedback -->

+

+  <function name="GetFragDataLocation" alias="GetFragDataLocationEXT">

+    <param name="program" type="GLuint"/>

+    <param name="name" type="const GLchar *"/>

+      <return type="GLint"/>

+  </function>

+

+  <function name="BindFragDataLocation" alias="BindFragDataLocationEXT">

+    <param name="program" type="GLuint"/>

+    <param name="colorNumber" type="GLuint"/>

+    <param name="name" type="const GLchar *"/>

+  </function>

+

+  <function name="BeginTransformFeedback" alias="BeginTransformFeedbackEXT">

+    <param name="mode" type="GLenum"/>

+  </function>

+

+  <function name="EndTransformFeedback" alias="EndTransformFeedbackEXT">

+  </function>

+

+  <function name="BindBufferRange" alias="BindBufferRangeEXT">

+    <param name="target" type="GLenum"/>

+    <param name="index" type="GLuint"/>

+    <param name="buffer" type="GLuint"/>

+    <param name="offset" type="GLintptr"/>

+    <param name="size" type="GLsizeiptr"/>

+  </function>

+

+  <function name="BindBufferBase" alias="BindBufferBaseEXT">

+    <param name="target" type="GLenum"/>

+    <param name="index" type="GLuint"/>

+    <param name="buffer" type="GLuint"/>

+  </function>

+

+  <function name="TransformFeedbackVaryings" alias="TransformFeedbackVaryingsEXT">

+    <param name="program" type="GLuint"/>

+    <param name="count" type="GLsizei"/>

+    <param name="varyings" type="const GLchar* *"/>

+    <param name="bufferMode" type="GLenum"/>

+  </function>

+

+  <function name="GetTransformFeedbackVarying" alias="GetTransformFeedbackVaryingEXT">

+    <param name="program" type="GLuint"/>

+    <param name="index" type="GLuint"/>

+    <param name="bufSize" type="GLsizei"/>

+    <param name="length" type="GLsizei *"/>

+    <param name="size" type="GLsizei *"/>

+    <param name="type" type="GLenum *"/>

+    <param name="name" type="GLchar *"/>

+  </function>

+

+  <!-- These functions alias ones from GL_NV_conditional_render -->

+

+  <function name="BeginConditionalRender" alias="BeginConditionalRenderNV">

+    <param name="query" type="GLuint"/>

+    <param name="mode" type="GLenum"/>

+  </function>

+

+  <function name="EndConditionalRender" alias="EndConditionalRenderNV">

+  </function>

+

+  <!-- These functions alias ones from GL_EXT_gpu_shader4 -->

+

+  <function name="VertexAttribIPointer" alias="VertexAttribIPointerEXT">

+    <param name="index" type="GLuint"/>

+    <param name="size" type="GLint"/>

+    <param name="type" type="GLenum"/>

+    <param name="stride" type="GLsizei"/>

+    <param name="pointer" type="const GLvoid *"/>

+  </function>

+

+  <function name="GetVertexAttribIiv" alias="GetVertexAttribIivEXT">

+    <param name="index" type="GLuint"/>

+    <param name="pname" type="GLenum"/>

+    <param name="params" type="GLint *"/>

+  </function>

+

+  <function name="GetVertexAttribIuiv" alias="GetVertexAttribIuivEXT">

+    <param name="index" type="GLuint"/>

+    <param name="pname" type="GLenum"/>

+    <param name="params" type="GLuint *"/>

+  </function>

+

+  <function name="VertexAttribI1i" alias="VertexAttribI1iEXT">

+    <param name="index" type="GLuint"/>

+    <param name="x" type="GLint"/>

+  </function>

+

+  <function name="VertexAttribI2i" alias="VertexAttribI2iEXT">

+    <param name="index" type="GLuint"/>

+    <param name="x" type="GLint"/>

+    <param name="y" type="GLint"/>

+  </function>

+

+  <function name="VertexAttribI3i" alias="VertexAttribI3iEXT">

+    <param name="index" type="GLuint"/>

+    <param name="x" type="GLint"/>

+    <param name="y" type="GLint"/>

+    <param name="z" type="GLint"/>

+  </function>

+

+  <function name="VertexAttribI4i" alias="VertexAttribI4iEXT">

+    <param name="index" type="GLuint"/>

+    <param name="x" type="GLint"/>

+    <param name="y" type="GLint"/>

+    <param name="z" type="GLint"/>

+    <param name="w" type="GLint"/>

+  </function>

+

+  <function name="VertexAttribI1ui" alias="VertexAttribI1uiEXT">

+    <param name="index" type="GLuint"/>

+    <param name="x" type="GLuint"/>

+  </function>

+

+  <function name="VertexAttribI2ui" alias="VertexAttribI2uiEXT">

+    <param name="index" type="GLuint"/>

+    <param name="x" type="GLuint"/>

+    <param name="y" type="GLuint"/>

+  </function>

+

+  <function name="VertexAttribI3ui" alias="VertexAttribI3uiEXT">

+    <param name="index" type="GLuint"/>

+    <param name="x" type="GLuint"/>

+    <param name="y" type="GLuint"/>

+    <param name="z" type="GLuint"/>

+  </function>

+

+  <function name="VertexAttribI4ui" alias="VertexAttribI4uiEXT">

+    <param name="index" type="GLuint"/>

+    <param name="x" type="GLuint"/>

+    <param name="y" type="GLuint"/>

+    <param name="z" type="GLuint"/>

+    <param name="w" type="GLuint"/>

+  </function>

+

+  <function name="VertexAttribI1iv" alias="VertexAttribI1ivEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLint *"/>

+  </function>

+

+  <function name="VertexAttribI2iv" alias="VertexAttribI2ivEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLint *"/>

+  </function>

+

+  <function name="VertexAttribI3iv" alias="VertexAttribI3ivEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLint *"/>

+  </function>

+

+  <function name="VertexAttribI4iv" alias="VertexAttribI4ivEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLint *"/>

+  </function>

+

+  <function name="VertexAttribI1uiv" alias="VertexAttribI1uivEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLuint *"/>

+  </function>

+

+  <function name="VertexAttribI2uiv" alias="VertexAttribI2uivEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLuint *"/>

+  </function>

+

+  <function name="VertexAttribI3uiv" alias="VertexAttribI3uivEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLuint *"/>

+  </function>

+

+  <function name="VertexAttribI4uiv" alias="VertexAttribI4uivEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLuint *"/>

+  </function>

+

+  <function name="VertexAttribI4bv" alias="VertexAttribI4bvEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLbyte *"/>

+  </function>

+

+  <function name="VertexAttribI4sv" alias="VertexAttribI4svEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLshort *"/>

+  </function>

+

+  <function name="VertexAttribI4ubv" alias="VertexAttribI4ubvEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLubyte *"/>

+  </function>

+

+  <function name="VertexAttribI4usv" alias="VertexAttribI4usvEXT">

+    <param name="index" type="GLuint"/>

+    <param name="v" type="const GLushort *"/>

+  </function>

+

+  <function name="GetUniformuiv" alias="GetUniformuivEXT">

+    <param name="program" type="GLuint"/>

+    <param name="location" type="GLint"/>

+    <param name="params" type="GLuint *"/>

+  </function>

+

+  <function name="Uniform1ui" alias="Uniform1uiEXT">

+    <param name="location" type="GLint"/>

+    <param name="x" type="GLuint"/>

+  </function>

+

+  <function name="Uniform2ui" alias="Uniform2uiEXT">

+    <param name="location" type="GLint"/>

+    <param name="x" type="GLuint"/>

+    <param name="y" type="GLuint"/>

+  </function>

+

+  <function name="Uniform3ui" alias="Uniform3uiEXT">

+    <param name="location" type="GLint"/>

+    <param name="x" type="GLuint"/>

+    <param name="y" type="GLuint"/>

+    <param name="z" type="GLuint"/>

+  </function>

+

+  <function name="Uniform4ui" alias="Uniform4uiEXT">

+    <param name="location" type="GLint"/>

+    <param name="x" type="GLuint"/>

+    <param name="y" type="GLuint"/>

+    <param name="z" type="GLuint"/>

+    <param name="w" type="GLuint"/>

+  </function>

+

+  <function name="Uniform1uiv" alias="Uniform1uivEXT">

+    <param name="location" type="GLint"/>

+    <param name="count" type="GLsizei"/>

+    <param name="value" type="const GLuint *"/>

+  </function>

+

+  <function name="Uniform2uiv" alias="Uniform2uivEXT">

+    <param name="location" type="GLint"/>

+    <param name="count" type="GLsizei"/>

+    <param name="value" type="const GLuint *"/>

+  </function>

+

+  <function name="Uniform3uiv" alias="Uniform3uivEXT">

+    <param name="location" type="GLint"/>

+    <param name="count" type="GLsizei"/>

+    <param name="value" type="const GLuint *"/>

+  </function>

+

+  <function name="Uniform4uiv" alias="Uniform4uivEXT">

+    <param name="location" type="GLint"/>

+    <param name="count" type="GLsizei"/>

+    <param name="value" type="const GLuint *"/>

+  </function>

+

+  <!-- These functions alias ones from GL_EXT_texture_integer -->

+

+  <function name="TexParameterIiv" alias="TexParameterIivEXT">

+    <param name="target" type="GLenum"/>

+    <param name="pname" type="GLenum"/>

+    <param name="params" type="const GLint *"/>

+  </function>

+

+  <function name="TexParameterIuiv" alias="TexParameterIuivEXT">

+    <param name="target" type="GLenum"/>

+    <param name="pname" type="GLenum"/>

+    <param name="params" type="const GLuint *"/>

+  </function>

+

+  <function name="GetTexParameterIiv" alias="GetTexParameterIivEXT">

+    <param name="target" type="GLenum"/>

+    <param name="pname" type="GLenum"/>

+    <param name="params" type="GLint *"/>

+  </function>

+

+  <function name="GetTexParameterIuiv" alias="GetTexParameterIuivEXT">

+    <param name="target" type="GLenum"/>

+    <param name="pname" type="GLenum"/>

+    <param name="params" type="GLuint *"/>

+  </function>

+

+</category>

+

+

+<category name="3.1">

+

+  <enum name="SAMPLER_2D_RECT"                value="0x8B63"/>

+  <enum name="SAMPLER_2D_RECT_SHADOW"         value="0x8B64"/>

+  <enum name="SAMPLER_BUFFER"                 value="0x8DC2"/>

+  <enum name="INT_SAMPLER_2D_RECT"            value="0x8DCD"/>

+  <enum name="INT_SAMPLER_BUFFER"             value="0x8DD0"/>

+  <enum name="UNSIGNED_INT_SAMPLER_2D_RECT"   value="0x8DD5"/>

+  <enum name="UNSIGNED_INT_SAMPLER_BUFFER"    value="0x8DD8"/>

+  <enum name="TEXTURE_BUFFER"                 value="0x8C2A"/>

+  <enum name="MAX_TEXTURE_BUFFER_SIZE"        value="0x8C2B"/>

+  <enum name="TEXTURE_BINDING_BUFFER"         value="0x8C2C"/>

+  <enum name="TEXTURE_BUFFER_DATA_STORE_BINDING" value="0x8C2D"/>

+  <enum name="TEXTURE_BUFFER_FORMAT"          value="0x8C2E"/>

+  <enum name="TEXTURE_RECTANGLE"              value="0x84F5"/>

+  <enum name="TEXTURE_BINDING_RECTANGLE"      value="0x84F6"/>

+  <enum name="PROXY_TEXTURE_RECTANGLE"        value="0x84F7"/>

+  <enum name="MAX_RECTANGLE_TEXTURE_SIZE"     value="0x84F8"/>

+  <enum name="RED_SNORM"                      value="0x8F90"/>

+  <enum name="RG_SNORM"                       value="0x8F91"/>

+  <enum name="RGB_SNORM"                      value="0x8F92"/>

+  <enum name="RGBA_SNORM"                     value="0x8F93"/>

+  <enum name="R8_SNORM"                       value="0x8F94"/>

+  <enum name="RG8_SNORM"                      value="0x8F95"/>

+  <enum name="RGB8_SNORM"                     value="0x8F96"/>

+  <enum name="RGBA8_SNORM"                    value="0x8F97"/>

+  <enum name="R16_SNORM"                      value="0x8F98"/>

+  <enum name="RG16_SNORM"                     value="0x8F99"/>

+  <enum name="RGB16_SNORM"                    value="0x8F9A"/>

+  <enum name="RGBA16_SNORM"                   value="0x8F9B"/>

+  <enum name="SIGNED_NORMALIZED"              value="0x8F9C"/>

+  <enum name="PRIMITIVE_RESTART"              value="0x8F9D"/>

+  <enum name="PRIMITIVE_RESTART_INDEX"        value="0x8F9E"/>

+

+  <function name="DrawArraysInstanced" alias="DrawArraysInstancedARB">

+    <param name="mode" type="GLenum"/>

+    <param name="first" type="GLint"/>

+    <param name="count" type="GLsizei"/>

+    <param name="primcount" type="GLsizei"/>

+  </function>

+

+  <function name="DrawElementsInstanced" alias="DrawElementsInstancedARB">

+    <param name="mode" type="GLenum"/>

+    <param name="count" type="GLsizei"/>

+    <param name="type" type="GLenum"/>

+    <param name="indices" type="const GLvoid *"/>

+    <param name="primcount" type="GLsizei"/>

+  </function>

+

+  <function name="TexBuffer" offset="assign">

+    <param name="target" type="GLenum"/>

+    <param name="internalFormat" type="GLenum"/>

+    <param name="buffer" type="GLuint"/>

+  </function>

+

+  <function name="PrimitiveRestartIndex" alias="PrimitiveRestartIndexNV">

+    <param name="index" type="GLuint"/>

+  </function>

+

+</category>

+

+

+<category name="3.2">

+

+  <enum name="CONTEXT_CORE_PROFILE_BIT"             value="0x00000001"/>

+  <enum name="CONTEXT_COMPATIBILITY_PROFILE_BIT"    value="0x00000002"/>

+  <enum name="LINES_ADJACENCY"                      value="0x000A"/>

+  <enum name="LINE_STRIP_ADJACENCY"                 value="0x000B"/>

+  <enum name="TRIANGLES_ADJACENCY"                  value="0x000C"/>

+  <enum name="TRIANGLE_STRIP_ADJACENCY"             value="0x000D"/>

+  <enum name="PROGRAM_POINT_SIZE"                   value="0x8642"/>

+  <enum name="MAX_GEOMETRY_TEXTURE_IMAGE_UNITS"     value="0x8C29"/>

+  <enum name="FRAMEBUFFER_ATTACHMENT_LAYERED"       value="0x8DA7"/>

+  <enum name="FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS" value="0x8DA8"/>

+  <enum name="GEOMETRY_SHADER"                      value="0x8DD9"/>

+  <enum name="GEOMETRY_VERTICES_OUT"                value="0x8916"/>

+  <enum name="GEOMETRY_INPUT_TYPE"                  value="0x8917"/>

+  <enum name="GEOMETRY_OUTPUT_TYPE"                 value="0x8918"/>

+  <enum name="MAX_GEOMETRY_UNIFORM_COMPONENTS"      value="0x8DDF"/>

+  <enum name="MAX_GEOMETRY_OUTPUT_VERTICES"         value="0x8DE0"/>

+  <enum name="MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS" value="0x8DE1"/>

+  <enum name="MAX_VERTEX_OUTPUT_COMPONENTS"         value="0x9122"/>

+  <enum name="MAX_GEOMETRY_INPUT_COMPONENTS"        value="0x9123"/>

+  <enum name="MAX_GEOMETRY_OUTPUT_COMPONENTS"       value="0x9124"/>

+  <enum name="MAX_FRAGMENT_INPUT_COMPONENTS"        value="0x9125"/>

+  <enum name="CONTEXT_PROFILE_MASK"                 value="0x9126"/>

+

+  <function name="GetInteger64i_v" offset="assign">

+    <param name="cap" type="GLenum"/>

+    <param name="index" type="GLuint"/>

+    <param name="data" type="GLint64 *"/>

+  </function>

+

+  <function name="GetBufferParameteri64v" offset="assign">

+    <param name="target" type="GLenum"/>

+    <param name="pname" type="GLenum"/>

+    <param name="params" type="GLint64 *"/>

+  </function>

+

+  <function name="FramebufferTexture" offset="assign">

+    <param name="target" type="GLenum"/>

+    <param name="attachment" type="GLenum"/>

+    <param name="texture" type="GLuint"/>

+    <param name="level" type="GLint"/>

+  </function>

+

+</category>

+

+

+<category name="3.3">

+  <!-- There are other new functions and tokens defined by other extensions -->

+

+  <function name="VertexAttribDivisor" offset="assign">

+    <param name="index" type="GLuint"/>

+    <param name="divisor" type="GLuint"/>

+  </function>

+

+</category>

+

+</OpenGLAPI>

diff --git a/mesalib/src/mapi/glapi/gen/gen.bat b/mesalib/src/mapi/glapi/gen/gen.bat
new file mode 100644
index 000000000..2b1826a81
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/gen.bat
@@ -0,0 +1,20 @@
+echo on
+glx_server_table.py -f gl_and_glX_API.xml > indirect_table.c
+glx_proto_size.py -m size_h --only-set -h _INDIRECT_SIZE_H_ > indirect_size.h
+glx_proto_size.py -m size_c --only-set > indirect_size.c
+glx_proto_size.py -m size_h --only-get -h _INDIRECT_SIZE_GET_H_ > indirect_size_get.h
+glx_proto_size.py -m size_c --only-get > indirect_size_get.c
+glx_proto_size.py -m reqsize_c > indirect_reqsize.c
+glx_proto_size.py -m reqsize_h --only-get -h _INDIRECT_SIZE_GET_H_ > indirect_reqsize.h
+glx_proto_recv.py -m dispatch_c > indirect_dispatch.c
+glx_proto_recv.py -m dispatch_c -s > indirect_dispatch_swap.c
+glx_proto_recv.py -m dispatch_h -f gl_and_glX_API.xml -s > indirect_dispatch.h
+gl_table.py > glapitable.h
+gl_table.py -m remap_table > dispatch.h
+rem gl_offsets.py > glapioffsets.h
+gl_apitemp.py > glapitemp.h
+gl_procs.py > glprocs.h
+
+glX_proto_send.py -m proto > indirect.c
+glX_proto_send.py -m init_h > indirect.h
+glX_proto_send.py -m init_c > indirect_init.c
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 4f49f13f3..0f30d112e 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -183,18 +183,18 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="LIGHT_MODEL_LOCAL_VIEWER"      count="1"  value="0x0B51">

-        <size name="LightModelfv"/>

-        <size name="LightModeliv"/>

+        <size name="LightModelfv" mode="get"/>

+        <size name="LightModeliv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="LIGHT_MODEL_TWO_SIDE"          count="1"  value="0x0B52">

-        <size name="LightModelfv"/>

-        <size name="LightModeliv"/>

+        <size name="LightModelfv" mode="get"/>

+        <size name="LightModeliv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="LIGHT_MODEL_AMBIENT"           count="4"  value="0x0B53">

-        <size name="LightModelfv"/>

-        <size name="LightModeliv"/>

+        <size name="LightModelfv" mode="get"/>

+        <size name="LightModeliv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="SHADE_MODEL"                   count="1"  value="0x0B54">

@@ -213,33 +213,33 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_INDEX"                     count="1"  value="0x0B61">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_DENSITY"                   count="1"  value="0x0B62">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_START"                     count="1"  value="0x0B63">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_END"                       count="1"  value="0x0B64">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_MODE"                      count="1"  value="0x0B65">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_COLOR"                     count="4"  value="0x0B66">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="DEPTH_RANGE"                   count="2"  value="0x0B70">

@@ -531,8 +531,8 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="ALPHA_SCALE"                   count="1"  value="0x0D1C">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

         <size name="Get" mode="get"/>

@@ -625,93 +625,93 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="MAP1_COLOR_4"                  count="4"  value="0x0D90">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_INDEX"                    count="1"  value="0x0D91">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_NORMAL"                   count="3"  value="0x0D92">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_TEXTURE_COORD_1"          count="1"  value="0x0D93">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_TEXTURE_COORD_2"          count="2"  value="0x0D94">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_TEXTURE_COORD_3"          count="3"  value="0x0D95">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_TEXTURE_COORD_4"          count="4"  value="0x0D96">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_VERTEX_3"                 count="3"  value="0x0D97">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_VERTEX_4"                 count="4"  value="0x0D98">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_COLOR_4"                  count="4"  value="0x0DB0">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_INDEX"                    count="1"  value="0x0DB1">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_NORMAL"                   count="3"  value="0x0DB2">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_TEXTURE_COORD_1"          count="1"  value="0x0DB3">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_TEXTURE_COORD_2"          count="2"  value="0x0DB4">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_TEXTURE_COORD_3"          count="3"  value="0x0DB5">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_TEXTURE_COORD_4"          count="4"  value="0x0DB6">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_VERTEX_3"                 count="3"  value="0x0DB7">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_VERTEX_4"                 count="4"  value="0x0DB8">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_GRID_DOMAIN"              count="2"  value="0x0DD0">

@@ -754,8 +754,8 @@
         <size name="GetTexLevelParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_BORDER_COLOR"          count="4"  value="0x1004">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -763,111 +763,111 @@
     <enum name="FASTEST"                                  value="0x1101"/>

     <enum name="NICEST"                                   value="0x1102"/>

     <enum name="AMBIENT"                       count="4"  value="0x1200">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="DIFFUSE"                       count="4"  value="0x1201">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="SPECULAR"                      count="4"  value="0x1202">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="POSITION"                      count="4"  value="0x1203">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="SPOT_DIRECTION"                count="3"  value="0x1204">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="SPOT_EXPONENT"                 count="1"  value="0x1205">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="SPOT_CUTOFF"                   count="1"  value="0x1206">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="CONSTANT_ATTENUATION"          count="1"  value="0x1207">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="LINEAR_ATTENUATION"            count="1"  value="0x1208">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="QUADRATIC_ATTENUATION"         count="1"  value="0x1209">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="COMPILE"                                  value="0x1300"/>

     <enum name="COMPILE_AND_EXECUTE"                      value="0x1301"/>

     <enum name="BYTE"                          count="1"  value="0x1400">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="UNSIGNED_BYTE"                 count="1"  value="0x1401">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="SHORT"                         count="2"  value="0x1402">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="UNSIGNED_SHORT"                count="2"  value="0x1403">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="INT"                           count="4"  value="0x1404">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="UNSIGNED_INT"                  count="4"  value="0x1405">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="FLOAT"                         count="4"  value="0x1406">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="2_BYTES"                       count="2"  value="0x1407">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="3_BYTES"                       count="3"  value="0x1408">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="4_BYTES"                       count="4"  value="0x1409">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="HALF_FLOAT"                    count="2"  value="0x140B">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="CLEAR"                                    value="0x1500"/>

     <enum name="AND"                                      value="0x1501"/>

@@ -886,26 +886,26 @@
     <enum name="NAND"                                     value="0x150E"/>

     <enum name="SET"                                      value="0x150F"/>

     <enum name="EMISSION"                      count="4"  value="0x1600">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

     </enum>

     <enum name="SHININESS"                     count="1"  value="0x1601">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

     </enum>

     <enum name="AMBIENT_AND_DIFFUSE"           count="4"  value="0x1602">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

     </enum>

     <enum name="COLOR_INDEXES"                 count="3"  value="0x1603">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

     </enum>

@@ -950,14 +950,14 @@
     <enum name="MODULATE"                                 value="0x2100"/>

     <enum name="DECAL"                                    value="0x2101"/>

     <enum name="TEXTURE_ENV_MODE"              count="1"  value="0x2200">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="TEXTURE_ENV_COLOR"             count="4"  value="0x2201">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

@@ -966,25 +966,25 @@
     <enum name="OBJECT_LINEAR"                            value="0x2401"/>

     <enum name="SPHERE_MAP"                               value="0x2402"/>

     <enum name="TEXTURE_GEN_MODE"              count="1"  value="0x2500">

-        <size name="TexGendv"/>

-        <size name="TexGenfv"/>

-        <size name="TexGeniv"/>

+        <size name="TexGendv" mode="get"/>

+        <size name="TexGenfv" mode="get"/>

+        <size name="TexGeniv" mode="get"/>

         <size name="GetTexGendv" mode="get"/>

         <size name="GetTexGenfv" mode="get"/>

         <size name="GetTexGeniv" mode="get"/>

     </enum>

     <enum name="OBJECT_PLANE"                  count="4"  value="0x2501">

-        <size name="TexGendv"/>

-        <size name="TexGenfv"/>

-        <size name="TexGeniv"/>

+        <size name="TexGendv" mode="get"/>

+        <size name="TexGenfv" mode="get"/>

+        <size name="TexGeniv" mode="get"/>

         <size name="GetTexGendv" mode="get"/>

         <size name="GetTexGenfv" mode="get"/>

         <size name="GetTexGeniv" mode="get"/>

     </enum>

     <enum name="EYE_PLANE"                     count="4"  value="0x2502">

-        <size name="TexGendv"/>

-        <size name="TexGenfv"/>

-        <size name="TexGeniv"/>

+        <size name="TexGendv" mode="get"/>

+        <size name="TexGenfv" mode="get"/>

+        <size name="TexGeniv" mode="get"/>

         <size name="GetTexGendv" mode="get"/>

         <size name="GetTexGenfv" mode="get"/>

         <size name="GetTexGeniv" mode="get"/>

@@ -996,26 +996,26 @@
     <enum name="NEAREST_MIPMAP_LINEAR"                    value="0x2702"/>

     <enum name="LINEAR_MIPMAP_LINEAR"                     value="0x2703"/>

     <enum name="TEXTURE_MAG_FILTER"            count="1"  value="0x2800">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_MIN_FILTER"            count="1"  value="0x2801">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_WRAP_S"                count="1"  value="0x2802">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_WRAP_T"                count="1"  value="0x2803">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -3039,8 +3039,8 @@
     <enum name="PROXY_TEXTURE_1D"                         value="0x8063"/>

     <enum name="PROXY_TEXTURE_2D"                         value="0x8064"/>

     <enum name="TEXTURE_PRIORITY"              count="1"  value="0x8066">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -3380,8 +3380,8 @@
         <size name="GetTexLevelParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_WRAP_R"                count="1"  value="0x8072">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -3405,32 +3405,32 @@
     </enum>

     <enum name="CLAMP_TO_EDGE"                            value="0x812F"/>

     <enum name="TEXTURE_MIN_LOD"               count="1"  value="0x813A">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_MAX_LOD"               count="1"  value="0x813B">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_BASE_LEVEL"            count="1"  value="0x813C">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_MAX_LEVEL"             count="1"  value="0x813D">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="LIGHT_MODEL_COLOR_CONTROL"     count="1"  value="0x81F8">

-        <size name="LightModelfv"/>

-        <size name="LightModeliv"/>

+        <size name="LightModelfv" mode="get"/>

+        <size name="LightModeliv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="SINGLE_COLOR"                             value="0x81F9"/>

@@ -3482,26 +3482,26 @@
     </enum>

 

     <enum name="CONVOLUTION_BORDER_MODE"       count="1"  value="0x8013">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

     <enum name="CONVOLUTION_BORDER_COLOR"      count="4"  value="0x8154">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

     <enum name="CONVOLUTION_FILTER_SCALE"      count="4"  value="0x8014">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

     <enum name="CONVOLUTION_FILTER_BIAS"       count="4"  value="0x8015">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

@@ -3649,14 +3649,14 @@
     <enum name="PROXY_POST_COLOR_MATRIX_COLOR_TABLE"            value="0x80D5"/>

 

     <enum name="COLOR_TABLE_SCALE"             count="4"  value="0x80D6">

-        <size name="ColorTableParameterfv"/>

-        <size name="ColorTableParameteriv"/>

+        <size name="ColorTableParameterfv" mode="get"/>

+        <size name="ColorTableParameteriv" mode="get"/>

         <size name="GetColorTableParameterfv" mode="get"/>

         <size name="GetColorTableParameteriv" mode="get"/>

     </enum>

     <enum name="COLOR_TABLE_BIAS"              count="4"  value="0x80D7">

-        <size name="ColorTableParameterfv"/>

-        <size name="ColorTableParameteriv"/>

+        <size name="ColorTableParameterfv" mode="get"/>

+        <size name="ColorTableParameteriv" mode="get"/>

         <size name="GetColorTableParameterfv" mode="get"/>

         <size name="GetColorTableParameteriv" mode="get"/>

     </enum>

@@ -4133,92 +4133,92 @@
     <enum name="CLAMP_TO_BORDER"                          value="0x812D"/>

     <enum name="COMBINE"                                  value="0x8570"/>

     <enum name="COMBINE_RGB"                   count="1"  value="0x8571">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="COMBINE_ALPHA"                 count="1"  value="0x8572">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE0_RGB"                   count="1"  value="0x8580">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE1_RGB"                   count="1"  value="0x8581">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE2_RGB"                   count="1"  value="0x8582">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE0_ALPHA"                 count="1"  value="0x8588">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE1_ALPHA"                 count="1"  value="0x8589">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE2_ALPHA"                 count="1"  value="0x858A">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND0_RGB"                  count="1"  value="0x8590">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND1_RGB"                  count="1"  value="0x8591">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND2_RGB"                  count="1"  value="0x8592">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND0_ALPHA"                count="1"  value="0x8598">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND1_ALPHA"                count="1"  value="0x8599">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND2_ALPHA"                count="1"  value="0x859A">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="RGB_SCALE"                     count="1"  value="0x8573">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

@@ -4534,24 +4534,24 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MIN"                count="1"  value="0x8126">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MAX"                count="1"  value="0x8127">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="POINT_FADE_THRESHOLD_SIZE"     count="1"  value="0x8128">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="POINT_DISTANCE_ATTENUATION"    count="3"  value="0x8129">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="GENERATE_MIPMAP"               count="1"  value="0x8191">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -4600,10 +4600,10 @@
     </enum>

     <enum name="TEXTURE_FILTER_CONTROL"                   value="0x8500"/>

     <enum name="TEXTURE_LOD_BIAS"              count="1"  value="0x8501">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

@@ -4616,20 +4616,20 @@
         <size name="GetTexLevelParameteriv" mode="get"/>

     </enum>

     <enum name="DEPTH_TEXTURE_MODE"            count="1"  value="0x884B">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_COMPARE_MODE"          count="1"  value="0x884C">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_COMPARE_FUNC"          count="1"  value="0x884D">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -5121,8 +5121,8 @@
     <enum name="SHADING_LANGUAGE_VERSION"         value="0x8B8C"/>

     <enum name="CURRENT_PROGRAM"                  value="0x8B8D"/>

     <enum name="POINT_SPRITE_COORD_ORIGIN" count="1"  value="0x8CA0">

-        <size name="PointParameterfvEXT"/>

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterfvEXT" mode="get"/>

+        <size name="PointParameterivNV" mode="get"/>

     </enum>

     <enum name="LOWER_LEFT"                       value="0x8CA1"/>

     <enum name="UPPER_LEFT"                       value="0x8CA2"/>

@@ -6226,16 +6226,16 @@
 

 <category name="GL_ARB_point_parameters" number="14">

     <enum name="POINT_SIZE_MIN_ARB"            count="1"  value="0x8126">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MAX_ARB"            count="1"  value="0x8127">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_FADE_THRESHOLD_SIZE_ARB" count="1"  value="0x8128">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_DISTANCE_ATTENUATION_ARB" count="3" value="0x8129">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

 

     <function name="PointParameterfARB" alias="PointParameterfEXT">

@@ -6541,8 +6541,8 @@
         <size name="GetTexLevelParameteriv" mode="get"/>

     </enum>

     <enum name="DEPTH_TEXTURE_MODE_ARB"        count="1"  value="0x884B">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -6550,14 +6550,14 @@
 

 <category name="GL_ARB_shadow" number="23">

     <enum name="TEXTURE_COMPARE_MODE_ARB"      count="1"  value="0x884C">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_COMPARE_FUNC_ARB"      count="1"  value="0x884D">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -6566,8 +6566,8 @@
 

 <category name="GL_ARB_shadow_ambient" number="24">

     <enum name="TEXTURE_COMPARE_FAIL_VALUE_ARB" count="1" value="0x80BF">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -7865,8 +7865,8 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="COORD_REPLACE_ARB"             count="1"  value="0x8862">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

@@ -8320,20 +8320,20 @@
 

 <category name="GL_EXT_convolution" number="12">

     <enum name="CONVOLUTION_BORDER_MODE_EXT"   count="1"  value="0x8013">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

     <enum name="CONVOLUTION_FILTER_SCALE_EXT"  count="4"  value="0x8014">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

     <enum name="CONVOLUTION_FILTER_BIAS_EXT"   count="4"  value="0x8015">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

@@ -8843,8 +8843,8 @@
 

 <category name="GL_SGIS_generate_mipmap" number="32">

     <enum name="GENERATE_MIPMAP_SGIS"          count="1"  value="0x8191">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -8854,26 +8854,26 @@
 <category name="GL_SGIX_clipmap" number="33">

     <enum name="LINEAR_CLIPMAP_LINEAR_SGIX"               value="0x8170"/>

     <enum name="TEXTURE_CLIPMAP_CENTER_SGIX"   count="2"  value="0x8171">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_CLIPMAP_FRAME_SGIX"    count="1"  value="0x8172">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_CLIPMAP_OFFSET_SGIX"   count="2"  value="0x8173">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX" count="3" value="0x8174">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -8888,14 +8888,14 @@
 

 <category name="GL_SGIX_shadow" number="34">

     <enum name="TEXTURE_COMPARE_SGIX"          count="1"  value="0x819A">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_COMPARE_OPERATOR_SGIX" count="1"  value="0x819B">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -8972,16 +8972,16 @@
 

 <category name="GL_EXT_point_parameters" number="54">

     <enum name="POINT_SIZE_MIN_EXT"            count="1"  value="0x8126">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MAX_EXT"            count="1"  value="0x8127">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_FADE_THRESHOLD_SIZE_EXT" count="1"  value="0x8128">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_DISTANCE_ATTENUATION_EXT" count="3" value="0x8129">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

 

     <function name="PointParameterfEXT" offset="assign">

@@ -9032,14 +9032,14 @@
 

 <category name="GL_SGIX_texture_scale_bias" number="56">

     <enum name="POST_TEXTURE_FILTER_BIAS_SGIX"  count="4" value="0x8179">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="POST_TEXTURE_FILTER_SCALE_SGIX" count="4" value="0x817A">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -9099,8 +9099,8 @@
 <category name="GL_SGIX_fog_offset" number="65">

     <enum name="FOG_OFFSET_SGIX"                          value="0x8198"/>

     <enum name="FOG_OFFSET_VALUE_SGIX"         count="1"  value="0x8199">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

     </enum>

 </category>

 

@@ -9147,8 +9147,8 @@
     <enum name="CONSTANT_BORDER_HP"                       value="0x8151"/>

     <enum name="REPLICATE_BORDER_HP"                      value="0x8153"/>

     <enum name="CONVOLUTION_BORDER_COLOR_HP"   count="4"  value="0x8154">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

@@ -9314,20 +9314,20 @@
 

 <category name="GL_SGIX_texture_lod_bias" number="84">

     <enum name="TEXTURE_LOD_BIAS_S_SGIX"       count="1"  value="0x818E">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_LOD_BIAS_T_SGIX"       count="1"  value="0x818F">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_LOD_BIAS_R_SGIX"       count="1"  value="0x8190">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -9342,8 +9342,8 @@
 

 <category name="GL_SGIX_shadow_ambient" number="90">

     <enum name="SHADOW_AMBIENT_SGIX"           count="1"  value="0x80BF">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -9687,8 +9687,8 @@
 

 <category name="GL_EXT_separate_specular_color" number="144">

     <enum name="LIGHT_MODEL_COLOR_CONTROL_EXT" count="1"  value="0x81F8">

-        <size name="LightModelfv"/>

-        <size name="LightModeliv"/>

+        <size name="LightModelfv" mode="get"/>

+        <size name="LightModeliv" mode="get"/>

     </enum>

     <enum name="SINGLE_COLOR_EXT"                         value="0x81F9"/>

     <enum name="SEPARATE_SPECULAR_COLOR_EXT"              value="0x81FA"/>

@@ -10461,8 +10461,8 @@
 

 <category name="GL_EXT_texture_lod_bias" number="186">

     <enum name="TEXTURE_LOD_BIAS_EXT"          count="1"  value="0x8501">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -10470,8 +10470,8 @@
 

 <category name="GL_EXT_texture_filter_anisotropic" number="187">

     <enum name="TEXTURE_MAX_ANISOTROPY_EXT"    count="1"  value="0x84FE">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -10629,8 +10629,8 @@
 

 <category name="GL_NV_fog_distance" number="192">

     <enum name="FOG_DISTANCE_MODE_NV"          count="1"  value="0x855A">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="EYE_RADIAL_NV"                            value="0x855B"/>

@@ -10644,26 +10644,26 @@
 <category name="GL_NV_texture_env_combine4" number="195">

     <enum name="COMBINE4"                                 value="0x8503"/>

     <enum name="SOURCE3_RGB_NV"                count="1"  value="0x8583">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE3_ALPHA_NV"              count="1"  value="0x858B">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND3_RGB_NV"               count="1"  value="0x8593">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND3_ALPHA_NV"             count="1"  value="0x859B">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

@@ -11684,20 +11684,20 @@
 

 <category name="GL_SGIX_texture_coordinate_clamp" number="235">

     <enum name="TEXTURE_MAX_CLAMP_S_SGIX"      count="1"  value="0x8369">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_MAX_CLAMP_T_SGIX"      count="1"  value="0x836A">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_MAX_CLAMP_R_SGIX"      count="1"  value="0x836B">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -11736,8 +11736,8 @@
     <enum name="DU8DV8_ATI"                               value="0x877A"/>

     <enum name="BUMP_ENVMAP_ATI"                          value="0x877B"/>

     <enum name="BUMP_TARGET_ATI"              count="1"   value="0x877C">

-        <size name="TexEnviv"/>

-        <size name="TexEnvfv"/>

+        <size name="TexEnviv" mode="get"/>

+        <size name="TexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

     </enum>

@@ -11930,30 +11930,30 @@
          added for this extension. -->

 

     <enum name="POINT_SIZE_MIN_EXT"            count="1"  value="0x8126">

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterivNV" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MAX_EXT"            count="1"  value="0x8127">

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterivNV" mode="get"/>

     </enum>

     <enum name="POINT_FADE_THRESHOLD_SIZE_EXT" count="1"  value="0x8128">

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterivNV" mode="get"/>

     </enum>

     <enum name="POINT_DISTANCE_ATTENUATION_EXT" count="3" value="0x8129">

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterivNV" mode="get"/>

     </enum>

 

     <enum name="POINT_SPRITE_NV"               count="1"  value="0x8861">

         <size name="Get" mode="get"/>

     </enum>

     <enum name="COORD_REPLACE_NV"              count="1"  value="0x8862">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="POINT_SPRITE_R_MODE_NV"        count="1"  value="0x8863">

-        <size name="PointParameterfvEXT"/>

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterfvEXT" mode="get"/>

+        <size name="PointParameterivNV"  mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

 

@@ -12132,8 +12132,8 @@
 

 <category name="GL_NV_texture_expand_normal" number="286">

     <enum name="TEXTURE_UNSIGNED_REMAP_MODE_NV" count="1" value="0x888F">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -12287,22 +12287,22 @@
 

 <category name="GL_APPLE_texture_range" number="367">

     <enum name="TEXTURE_STORAGE_HINT_APPLE" count="1" value="0x85BC">

-        <size name="TexParameteriv"/>

-        <size name="TexParameterfv"/>

+        <size name="TexParameteriv" mode="get"/>

+        <size name="TexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

     </enum>

     <enum name="STORAGE_PRIVATE_APPLE" count="1" value="0x85BD">

-        <size name="TexParameteriv"/>

-        <size name="TexParameterfv"/>

+        <size name="TexParameteriv" mode="get"/>

+        <size name="TexParameterfv" mode="get"/>

     </enum>

     <enum name="STORAGE_CACHED_APPLE" count="1" value="0x85BE">

-        <size name="TexParameteriv"/>

-        <size name="TexParameterfv"/>

+        <size name="TexParameteriv" mode="get"/>

+        <size name="TexParameterfv" mode="get"/>

     </enum>

     <enum name="STORAGE_SHARED_APPLE" count="1" value="0x85BF">

-        <size name="TexParameteriv"/>

-        <size name="TexParameterfv"/>

+        <size name="TexParameteriv" mode="get"/>

+        <size name="TexParameterfv" mode="get"/>

     </enum>

     <enum name="TEXTURE_RANGE_LENGTH_APPLE" count="1" value="0x85B7">

         <size name="GetTexParameteriv" mode="get"/>

@@ -12445,16 +12445,16 @@
 

 <category name="GL_SGIS_point_parameters">

     <enum name="POINT_SIZE_MIN_SGIS"           count="1"  value="0x8126">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MAX_SGIS"           count="1"  value="0x8127">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_FADE_THRESHOLD_SIZE_SGIS" count="1" value="0x8128">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_DISTANCE_ATTENUATION_SGIS" count="3" value="0x8129">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

 

     <function name="PointParameterfSGIS" alias="PointParameterfEXT" static_dispatch="false">

diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h
index 1d4ac4674..98f3913a9 100644
--- a/mesalib/src/mapi/glapi/glapi.h
+++ b/mesalib/src/mapi/glapi/glapi.h
@@ -44,7 +44,6 @@
 #ifndef _GLAPI_H

 #define _GLAPI_H

 

-

 #ifdef _GLAPI_NO_EXPORTS

 #  define _GLAPI_EXPORT

 #else /* _GLAPI_NO_EXPORTS */

@@ -61,117 +60,120 @@
 #  endif

 #endif /* _GLAPI_NO_EXPORTS */

 

+#include "GL/gl.h"

+#include "GL/glext.h"

+#include "glthread.h"

+

+

+struct _glapi_table;

+

+typedef void (*_glapi_proc)(void); /* generic function pointer */

+

+typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);

 

-/* Is this needed?  It is incomplete anyway. */

-#ifdef USE_MGL_NAMESPACE

+

+#if defined(USE_MGL_NAMESPACE)

 #define _glapi_set_dispatch _mglapi_set_dispatch

 #define _glapi_get_dispatch _mglapi_get_dispatch

 #define _glapi_set_context _mglapi_set_context

 #define _glapi_get_context _mglapi_get_context

-#define _glapi_Dispatch _mglapi_Dispatch

 #define _glapi_Context _mglapi_Context

+#define _glapi_Dispatch _mglapi_Dispatch

 #endif

 

-#include "glapi/glthread.h"

 

-typedef void (*_glapi_proc)(void);

-struct _glapi_table;

+/*

+ * Number of extension functions which we can dynamically add at runtime.

+ */

+#define MAX_EXTENSION_FUNCS 300

 

 

+/**

+ ** Define the GET_CURRENT_CONTEXT() macro.

+ ** \param C local variable which will hold the current context.

+ **/

 #if defined (GLX_USE_TLS)

 

 _GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch

     __attribute__((tls_model("initial-exec")));

 

+_GLAPI_EXPORT extern const void *_glapi_Context;

+_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;

+

 _GLAPI_EXPORT extern __thread void * _glapi_tls_Context

     __attribute__((tls_model("initial-exec")));

 

-_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;

-_GLAPI_EXPORT extern const void *_glapi_Context;

-

 # define GET_DISPATCH() _glapi_tls_Dispatch

 # define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_tls_Context

 

 #else

 

-_GLAPI_EXPORT extern struct _glapi_table *_glapi_Dispatch;

-_GLAPI_EXPORT extern void *_glapi_Context;

+#ifdef INSERVER

+#define SERVEXTERN _declspec(dllimport)

+#else

+#define SERVEXTERN _declspec(dllexport)

+#endif

+

+SERVEXTERN void *_glapi_Context;

+SERVEXTERN struct _glapi_table *_glapi_Dispatch;

 

 # ifdef THREADS

 

 #  define GET_DISPATCH() \

      (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch())

 

+

 #  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) \

      (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context())

-

 # else

-

 #  define GET_DISPATCH() _glapi_Dispatch

 #  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_Context

-

 # endif

 

 #endif /* defined (GLX_USE_TLS) */

 

 

-void

-_glapi_destroy_multithread(void);

-

+/**

+ ** GL API public functions

+ **/

 

-_GLAPI_EXPORT void

+SERVEXTERN void

 _glapi_check_multithread(void);

 

 

-_GLAPI_EXPORT void

+SERVEXTERN void

 _glapi_set_context(void *context);

 

 

-_GLAPI_EXPORT void *

+SERVEXTERN void *

 _glapi_get_context(void);

 

 

-_GLAPI_EXPORT void

+SERVEXTERN void

 _glapi_set_dispatch(struct _glapi_table *dispatch);

 

 

-_GLAPI_EXPORT struct _glapi_table *

+SERVEXTERN struct _glapi_table *

 _glapi_get_dispatch(void);

 

+SERVEXTERN int

+_glapi_begin_dispatch_override(struct _glapi_table *override);

 

-_GLAPI_EXPORT unsigned int

+SERVEXTERN void

+_glapi_end_dispatch_override(int layer);

+

+struct _glapi_table *

+_glapi_get_override_dispatch(int layer);

+

+SERVEXTERN GLuint

 _glapi_get_dispatch_table_size(void);

 

 

-_GLAPI_EXPORT int

+SERVEXTERN int

 _glapi_add_dispatch( const char * const * function_names,

 		     const char * parameter_signature );

 

-_GLAPI_EXPORT int

-_glapi_get_proc_offset(const char *funcName);

-

-

 _GLAPI_EXPORT _glapi_proc

 _glapi_get_proc_address(const char *funcName);

 

-

-_GLAPI_EXPORT const char *

-_glapi_get_proc_name(unsigned int offset);

-

-

-_GLAPI_EXPORT unsigned long

-_glthread_GetID(void);

-

-

-/*

- * These stubs are kept so that the old DRI drivers still load.

- */

-_GLAPI_EXPORT void

-_glapi_noop_enable_warnings(unsigned char enable);

-

-

-_GLAPI_EXPORT void

-_glapi_set_warning_func(_glapi_proc func);

-

-

-#endif /* _GLAPI_H */

+#endif

diff --git a/mesalib/src/mapi/glapi/glapi_getproc.c b/mesalib/src/mapi/glapi/glapi_getproc.c
index 21380ea41..d5c72f29b 100644
--- a/mesalib/src/mapi/glapi/glapi_getproc.c
+++ b/mesalib/src/mapi/glapi/glapi_getproc.c
@@ -369,6 +369,7 @@ set_entry_info( struct _glapi_function * entry, const char * signature, unsigned
  * the parameter signature of a static function.

  */

 

+#ifndef INSERVER

 int

 _glapi_add_dispatch( const char * const * function_names,

 		     const char * parameter_signature )

@@ -478,12 +479,12 @@ _glapi_add_dispatch( const char * const * function_names,
 

    return offset;

 }

-

+#endif

 

 /**

  * Return offset of entrypoint for named function within dispatch table.

  */

-GLint

+GLint _GLAPI_EXPORT

 _glapi_get_proc_offset(const char *funcName)

 {

    GLint offset;

@@ -504,7 +505,7 @@ _glapi_get_proc_offset(const char *funcName)
  * in the name of static functions, try generating a new API entrypoint on

  * the fly with assembly language.

  */

-_glapi_proc

+_glapi_proc _GLAPI_EXPORT

 _glapi_get_proc_address(const char *funcName)

 {

    _glapi_proc func;

@@ -545,7 +546,7 @@ _glapi_get_proc_address(const char *funcName)
  * Return the name of the function at the given dispatch offset.

  * This is only intended for debugging.

  */

-const char *

+const char * _GLAPI_EXPORT

 _glapi_get_proc_name(GLuint offset)

 {

    const char * n;

@@ -571,7 +572,7 @@ _glapi_get_proc_name(GLuint offset)
  * Return size of dispatch table struct as number of functions (or

  * slots).

  */

-GLuint

+GLuint _GLAPI_EXPORT

 _glapi_get_dispatch_table_size(void)

 {

    /*

diff --git a/mesalib/src/mapi/glapi/glapi_nop.c b/mesalib/src/mapi/glapi/glapi_nop.c
index 9b0929715..365a6e1c8 100644
--- a/mesalib/src/mapi/glapi/glapi_nop.c
+++ b/mesalib/src/mapi/glapi/glapi_nop.c
@@ -41,12 +41,12 @@
 #include "glapi/glapi_priv.h"
 
 
-void
+void _GLAPI_EXPORT
 _glapi_noop_enable_warnings(unsigned char enable)
 {
 }
 
-void
+void _GLAPI_EXPORT
 _glapi_set_warning_func(_glapi_proc func)
 {
 }
diff --git a/mesalib/src/mapi/glapi/glthread.c b/mesalib/src/mapi/glapi/glthread.c
index 00915380f..239090ecf 100644
--- a/mesalib/src/mapi/glapi/glthread.c
+++ b/mesalib/src/mapi/glapi/glthread.c
@@ -1,6 +1,6 @@
 #include "glapi/glapi.h"
 
-unsigned long
+unsigned long _GLAPI_EXPORT
 _glthread_GetID(void)
 {
    return u_thread_self();
diff --git a/mesalib/src/mapi/mapi/u_current.c b/mesalib/src/mapi/mapi/u_current.c
index 21a07abba..8fc7096a3 100644
--- a/mesalib/src/mapi/mapi/u_current.c
+++ b/mesalib/src/mapi/mapi/u_current.c
@@ -1,266 +1,266 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/*
- * This file manages the OpenGL API dispatch layer.
- * The dispatch table (struct _glapi_table) is basically just a list
- * of function pointers.
- * There are functions to set/get the current dispatch table for the
- * current thread and to manage registration/dispatch of dynamically
- * added extension functions.
- *
- * It's intended that this file and the other glapi*.[ch] files are
- * flexible enough to be reused in several places:  XFree86, DRI-
- * based libGL.so, and perhaps the SGI SI.
- *
- * NOTE: There are no dependencies on Mesa in this code.
- *
- * Versions (API changes):
- *   2000/02/23  - original version for Mesa 3.3 and XFree86 4.0
- *   2001/01/16  - added dispatch override feature for Mesa 3.5
- *   2002/06/28  - added _glapi_set_warning_func(), Mesa 4.1.
- *   2002/10/01  - _glapi_get_proc_address() will now generate new entrypoints
- *                 itself (using offset ~0).  _glapi_add_entrypoint() can be
- *                 called afterward and it'll fill in the correct dispatch
- *                 offset.  This allows DRI libGL to avoid probing for DRI
- *                 drivers!  No changes to the public glapi interface.
- */
-
-#include "u_current.h"
-#include "u_thread.h"
-
-#ifndef MAPI_MODE_UTIL
-
-#include "table.h"
-#include "stub.h"
-
-#else
-
-extern void init_glapi_relocs_once(void);
-extern void (*__glapi_noop_table[])(void);
-
-#define table_noop_array __glapi_noop_table
-#define stub_init_once() init_glapi_relocs_once()
-
-#endif
-
-/**
- * \name Current dispatch and current context control variables
- *
- * Depending on whether or not multithreading is support, and the type of
- * support available, several variables are used to store the current context
- * pointer and the current dispatch table pointer.  In the non-threaded case,
- * the variables \c _glapi_Dispatch and \c _glapi_Context are used for this
- * purpose.
- *
- * In the "normal" threaded case, the variables \c _glapi_Dispatch and
- * \c _glapi_Context will be \c NULL if an application is detected as being
- * multithreaded.  Single-threaded applications will use \c _glapi_Dispatch
- * and \c _glapi_Context just like the case without any threading support.
- * When \c _glapi_Dispatch and \c _glapi_Context are \c NULL, the thread state
- * data \c _gl_DispatchTSD and \c ContextTSD are used.  Drivers and the
- * static dispatch functions access these variables via \c _glapi_get_dispatch
- * and \c _glapi_get_context.
- *
- * There is a race condition in setting \c _glapi_Dispatch to \c NULL.  It is
- * possible for the original thread to be setting it at the same instant a new
- * thread, perhaps running on a different processor, is clearing it.  Because
- * of that, \c ThreadSafe, which can only ever be changed to \c GL_TRUE, is
- * used to determine whether or not the application is multithreaded.
- * 
- * In the TLS case, the variables \c _glapi_Dispatch and \c _glapi_Context are
- * hardcoded to \c NULL.  Instead the TLS variables \c _glapi_tls_Dispatch and
- * \c _glapi_tls_Context are used.  Having \c _glapi_Dispatch and
- * \c _glapi_Context be hardcoded to \c NULL maintains binary compatability
- * between TLS enabled loaders and non-TLS DRI drivers.
- */
-/*@{*/
-#if defined(GLX_USE_TLS)
-
-__thread struct mapi_table *u_current_table
-    __attribute__((tls_model("initial-exec")))
-    = (struct mapi_table *) table_noop_array;
-
-__thread void *u_current_user
-    __attribute__((tls_model("initial-exec")));
-
-#else
-
-struct mapi_table *u_current_table =
-   (struct mapi_table *) table_noop_array;
-void *u_current_user;
-
-#ifdef THREADS
-struct u_tsd u_current_table_tsd;
-static struct u_tsd u_current_user_tsd;
-static int ThreadSafe;
-#endif /* THREADS */
-
-#endif /* defined(GLX_USE_TLS) */
-/*@}*/
-
-
-void
-u_current_destroy(void)
-{
-#if defined(THREADS) && defined(WIN32)
-   u_tsd_destroy(&u_current_table_tsd);
-   u_tsd_destroy(&u_current_user_tsd);
-#endif
-}
-
-
-#if defined(THREADS) && !defined(GLX_USE_TLS)
-
-static void
-u_current_init_tsd(void)
-{
-   u_tsd_init(&u_current_table_tsd);
-   u_tsd_init(&u_current_user_tsd);
-}
-
-/**
- * Mutex for multithread check.
- */
-u_mutex_declare_static(ThreadCheckMutex);
-
-/**
- * We should call this periodically from a function such as glXMakeCurrent
- * in order to test if multiple threads are being used.
- */
-void
-u_current_init(void)
-{
-   static unsigned long knownID;
-   static int firstCall = 1;
-
-   if (ThreadSafe)
-      return;
-
-   u_mutex_lock(ThreadCheckMutex);
-   if (firstCall) {
-      u_current_init_tsd();
-
-      knownID = u_thread_self();
-      firstCall = 0;
-   }
-   else if (knownID != u_thread_self()) {
-      ThreadSafe = 1;
-      u_current_set(NULL);
-      u_current_set_user(NULL);
-   }
-   u_mutex_unlock(ThreadCheckMutex);
-}
-
-#else
-
-void
-u_current_init(void)
-{
-}
-
-#endif
-
-
-
-/**
- * Set the current context pointer for this thread.
- * The context pointer is an opaque type which should be cast to
- * void from the real context pointer type.
- */
-void
-u_current_set_user(const void *ptr)
-{
-   u_current_init();
-
-#if defined(GLX_USE_TLS)
-   u_current_user = (void *) ptr;
-#elif defined(THREADS)
-   u_tsd_set(&u_current_user_tsd, (void *) ptr);
-   u_current_user = (ThreadSafe) ? NULL : (void *) ptr;
-#else
-   u_current_user = (void *) ptr;
-#endif
-}
-
-/**
- * Get the current context pointer for this thread.
- * The context pointer is an opaque type which should be cast from
- * void to the real context pointer type.
- */
-void *
-u_current_get_user_internal(void)
-{
-#if defined(GLX_USE_TLS)
-   return u_current_user;
-#elif defined(THREADS)
-   return (ThreadSafe)
-      ? u_tsd_get(&u_current_user_tsd)
-      : u_current_user;
-#else
-   return u_current_user;
-#endif
-}
-
-/**
- * Set the global or per-thread dispatch table pointer.
- * If the dispatch parameter is NULL we'll plug in the no-op dispatch
- * table (__glapi_noop_table).
- */
-void
-u_current_set(const struct mapi_table *tbl)
-{
-   u_current_init();
-
-   stub_init_once();
-
-   if (!tbl)
-      tbl = (const struct mapi_table *) table_noop_array;
-
-#if defined(GLX_USE_TLS)
-   u_current_table = (struct mapi_table *) tbl;
-#elif defined(THREADS)
-   u_tsd_set(&u_current_table_tsd, (void *) tbl);
-   u_current_table = (ThreadSafe) ? NULL : (void *) tbl;
-#else
-   u_current_table = (struct mapi_table *) tbl;
-#endif
-}
-
-/**
- * Return pointer to current dispatch table for calling thread.
- */
-struct mapi_table *
-u_current_get_internal(void)
-{
-#if defined(GLX_USE_TLS)
-   return u_current_table;
-#elif defined(THREADS)
-   return (struct mapi_table *) ((ThreadSafe) ?
-         u_tsd_get(&u_current_table_tsd) : (void *) u_current_table);
-#else
-   return u_current_table;
-#endif
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/*

+ * This file manages the OpenGL API dispatch layer.

+ * The dispatch table (struct _glapi_table) is basically just a list

+ * of function pointers.

+ * There are functions to set/get the current dispatch table for the

+ * current thread and to manage registration/dispatch of dynamically

+ * added extension functions.

+ *

+ * It's intended that this file and the other glapi*.[ch] files are

+ * flexible enough to be reused in several places:  XFree86, DRI-

+ * based libGL.so, and perhaps the SGI SI.

+ *

+ * NOTE: There are no dependencies on Mesa in this code.

+ *

+ * Versions (API changes):

+ *   2000/02/23  - original version for Mesa 3.3 and XFree86 4.0

+ *   2001/01/16  - added dispatch override feature for Mesa 3.5

+ *   2002/06/28  - added _glapi_set_warning_func(), Mesa 4.1.

+ *   2002/10/01  - _glapi_get_proc_address() will now generate new entrypoints

+ *                 itself (using offset ~0).  _glapi_add_entrypoint() can be

+ *                 called afterward and it'll fill in the correct dispatch

+ *                 offset.  This allows DRI libGL to avoid probing for DRI

+ *                 drivers!  No changes to the public glapi interface.

+ */

+

+#include "u_current.h"

+#include "u_thread.h"

+

+#ifndef MAPI_MODE_UTIL

+

+#include "table.h"

+#include "stub.h"

+

+#else

+

+extern void init_glapi_relocs_once(void);

+extern void (*__glapi_noop_table[])(void);

+

+#define table_noop_array __glapi_noop_table

+#define stub_init_once() init_glapi_relocs_once()

+

+#endif

+

+/**

+ * \name Current dispatch and current context control variables

+ *

+ * Depending on whether or not multithreading is support, and the type of

+ * support available, several variables are used to store the current context

+ * pointer and the current dispatch table pointer.  In the non-threaded case,

+ * the variables \c _glapi_Dispatch and \c _glapi_Context are used for this

+ * purpose.

+ *

+ * In the "normal" threaded case, the variables \c _glapi_Dispatch and

+ * \c _glapi_Context will be \c NULL if an application is detected as being

+ * multithreaded.  Single-threaded applications will use \c _glapi_Dispatch

+ * and \c _glapi_Context just like the case without any threading support.

+ * When \c _glapi_Dispatch and \c _glapi_Context are \c NULL, the thread state

+ * data \c _gl_DispatchTSD and \c ContextTSD are used.  Drivers and the

+ * static dispatch functions access these variables via \c _glapi_get_dispatch

+ * and \c _glapi_get_context.

+ *

+ * There is a race condition in setting \c _glapi_Dispatch to \c NULL.  It is

+ * possible for the original thread to be setting it at the same instant a new

+ * thread, perhaps running on a different processor, is clearing it.  Because

+ * of that, \c ThreadSafe, which can only ever be changed to \c GL_TRUE, is

+ * used to determine whether or not the application is multithreaded.

+ * 

+ * In the TLS case, the variables \c _glapi_Dispatch and \c _glapi_Context are

+ * hardcoded to \c NULL.  Instead the TLS variables \c _glapi_tls_Dispatch and

+ * \c _glapi_tls_Context are used.  Having \c _glapi_Dispatch and

+ * \c _glapi_Context be hardcoded to \c NULL maintains binary compatability

+ * between TLS enabled loaders and non-TLS DRI drivers.

+ */

+/*@{*/

+#if defined(GLX_USE_TLS)

+

+__thread struct mapi_table *u_current_table

+    __attribute__((tls_model("initial-exec")))

+    = (struct mapi_table *) table_noop_array;

+

+__thread void *u_current_user

+    __attribute__((tls_model("initial-exec")));

+

+#else

+

+struct mapi_table *u_current_table =

+   (struct mapi_table *) table_noop_array;

+void *u_current_user;

+

+#ifdef THREADS

+struct u_tsd u_current_table_tsd;

+static struct u_tsd u_current_user_tsd;

+static int ThreadSafe;

+#endif /* THREADS */

+

+#endif /* defined(GLX_USE_TLS) */

+/*@}*/

+

+

+void

+u_current_destroy(void)

+{

+#if defined(THREADS) && defined(WIN32)

+   u_tsd_destroy(&u_current_table_tsd);

+   u_tsd_destroy(&u_current_user_tsd);

+#endif

+}

+

+

+#if defined(THREADS) && !defined(GLX_USE_TLS)

+

+static void

+u_current_init_tsd(void)

+{

+   u_tsd_init(&u_current_table_tsd);

+   u_tsd_init(&u_current_user_tsd);

+}

+

+/**

+ * Mutex for multithread check.

+ */

+u_mutex_declare_static(ThreadCheckMutex);

+

+/**

+ * We should call this periodically from a function such as glXMakeCurrent

+ * in order to test if multiple threads are being used.

+ */

+void

+u_current_init(void)

+{

+   static unsigned long knownID;

+   static int firstCall = 1;

+

+   if (ThreadSafe)

+      return;

+

+   u_mutex_lock(ThreadCheckMutex);

+   if (firstCall) {

+      u_current_init_tsd();

+

+      knownID = u_thread_self();

+      firstCall = 0;

+   }

+   else if (knownID != u_thread_self()) {

+      ThreadSafe = 1;

+      u_current_set(NULL);

+      u_current_set_user(NULL);

+   }

+   u_mutex_unlock(ThreadCheckMutex);

+}

+

+#else

+

+void

+u_current_init(void)

+{

+}

+

+#endif

+

+

+

+/**

+ * Set the current context pointer for this thread.

+ * The context pointer is an opaque type which should be cast to

+ * void from the real context pointer type.

+ */

+void

+u_current_set_user(const void *ptr)

+{

+   u_current_init();

+

+#if defined(GLX_USE_TLS)

+   u_current_user = (void *) ptr;

+#elif defined(THREADS)

+   u_tsd_set(&u_current_user_tsd, (void *) ptr);

+   u_current_user = (ThreadSafe) ? NULL : (void *) ptr;

+#else

+   u_current_user = (void *) ptr;

+#endif

+}

+

+/**

+ * Get the current context pointer for this thread.

+ * The context pointer is an opaque type which should be cast from

+ * void to the real context pointer type.

+ */

+void *

+u_current_get_user_internal(void)

+{

+#if defined(GLX_USE_TLS)

+   return u_current_user;

+#elif defined(THREADS)

+   return (ThreadSafe)

+      ? u_tsd_get(&u_current_user_tsd)

+      : u_current_user;

+#else

+   return u_current_user;

+#endif

+}

+

+/**

+ * Set the global or per-thread dispatch table pointer.

+ * If the dispatch parameter is NULL we'll plug in the no-op dispatch

+ * table (__glapi_noop_table).

+ */

+void

+u_current_set(const struct mapi_table *tbl)

+{

+   u_current_init();

+

+   stub_init_once();

+

+   if (!tbl)

+      tbl = (const struct mapi_table *) table_noop_array;

+

+#if defined(GLX_USE_TLS)

+   u_current_table = (struct mapi_table *) tbl;

+#elif defined(THREADS)

+   u_tsd_set(&u_current_table_tsd, (void *) tbl);

+   u_current_table = (ThreadSafe) ? NULL : (void *) tbl;

+#else

+   u_current_table = (struct mapi_table *) tbl;

+#endif

+}

+

+/**

+ * Return pointer to current dispatch table for calling thread.

+ */

+struct mapi_table *

+u_current_get_internal(void)

+{

+#if defined(GLX_USE_TLS)

+   return u_current_table;

+#elif defined(THREADS)

+   return (struct mapi_table *) ((ThreadSafe) ?

+         u_tsd_get(&u_current_table_tsd) : (void *) u_current_table);

+#else

+   return u_current_table;

+#endif

+}

diff --git a/mesalib/src/mapi/mapi/u_thread.c b/mesalib/src/mapi/mapi/u_thread.c
index 12e748fe8..3154b89de 100644
--- a/mesalib/src/mapi/mapi/u_thread.c
+++ b/mesalib/src/mapi/mapi/u_thread.c
@@ -1,249 +1,249 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.1
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "u_compiler.h"
-#include "u_thread.h"
-
-
-/*
- * This file should still compile even when THREADS is not defined.
- * This is to make things easier to deal with on the makefile scene..
- */
-#ifdef THREADS
-#include <errno.h>
-
-/*
- * Error messages
- */
-#define INIT_TSD_ERROR "_glthread_: failed to allocate key for thread specific data"
-#define GET_TSD_ERROR "_glthread_: failed to get thread specific data"
-#define SET_TSD_ERROR "_glthread_: thread failed to set thread specific data"
-
-
-/*
- * Magic number to determine if a TSD object has been initialized.
- * Kind of a hack but there doesn't appear to be a better cross-platform
- * solution.
- */
-#define INIT_MAGIC 0xff8adc98
-
-
-
-/*
- * POSIX Threads -- The best way to go if your platform supports them.
- *                  Solaris >= 2.5 have POSIX threads, IRIX >= 6.4 reportedly
- *                  has them, and many of the free Unixes now have them.
- *                  Be sure to use appropriate -mt or -D_REENTRANT type
- *                  compile flags when building.
- */
-#ifdef PTHREADS
-
-unsigned long
-u_thread_self(void)
-{
-   return (unsigned long) pthread_self();
-}
-
-
-void
-u_tsd_init(struct u_tsd *tsd)
-{
-   if (pthread_key_create(&tsd->key, NULL/*free*/) != 0) {
-      perror(INIT_TSD_ERROR);
-      exit(-1);
-   }
-   tsd->initMagic = INIT_MAGIC;
-}
-
-
-void *
-u_tsd_get(struct u_tsd *tsd)
-{
-   if (tsd->initMagic != (int) INIT_MAGIC) {
-      u_tsd_init(tsd);
-   }
-   return pthread_getspecific(tsd->key);
-}
-
-
-void
-u_tsd_set(struct u_tsd *tsd, void *ptr)
-{
-   if (tsd->initMagic != (int) INIT_MAGIC) {
-      u_tsd_init(tsd);
-   }
-   if (pthread_setspecific(tsd->key, ptr) != 0) {
-      perror(SET_TSD_ERROR);
-      exit(-1);
-   }
-}
-
-#endif /* PTHREADS */
-
-
-
-/*
- * Win32 Threads.  The only available option for Windows 95/NT.
- * Be sure that you compile using the Multithreaded runtime, otherwise
- * bad things will happen.
- */
-#ifdef WIN32
-
-unsigned long
-u_thread_self(void)
-{
-   return GetCurrentThreadId();
-}
-
-
-void
-u_tsd_init(struct u_tsd *tsd)
-{
-   tsd->key = TlsAlloc();
-   if (tsd->key == TLS_OUT_OF_INDEXES) {
-      perror(INIT_TSD_ERROR);
-      exit(-1);
-   }
-   tsd->initMagic = INIT_MAGIC;
-}
-
-
-void
-u_tsd_destroy(struct u_tsd *tsd)
-{
-   if (tsd->initMagic != INIT_MAGIC) {
-      return;
-   }
-   TlsFree(tsd->key);
-   tsd->initMagic = 0x0;
-}
-
-
-void *
-u_tsd_get(struct u_tsd *tsd)
-{
-   if (tsd->initMagic != INIT_MAGIC) {
-      u_tsd_init(tsd);
-   }
-   return TlsGetValue(tsd->key);
-}
-
-
-void
-u_tsd_set(struct u_tsd *tsd, void *ptr)
-{
-   /* the following code assumes that the struct u_tsd has been initialized
-      to zero at creation */
-   if (tsd->initMagic != INIT_MAGIC) {
-      u_tsd_init(tsd);
-   }
-   if (TlsSetValue(tsd->key, ptr) == 0) {
-      perror(SET_TSD_ERROR);
-      exit(-1);
-   }
-}
-
-#endif /* WIN32 */
-
-/*
- * BeOS threads
- */
-#ifdef BEOS_THREADS
-
-unsigned long
-u_thread_self(void)
-{
-   return (unsigned long) find_thread(NULL);
-}
-
-void
-u_tsd_init(struct u_tsd *tsd)
-{
-   tsd->key = tls_allocate();
-   tsd->initMagic = INIT_MAGIC;
-}
-
-void *
-u_tsd_get(struct u_tsd *tsd)
-{
-   if (tsd->initMagic != (int) INIT_MAGIC) {
-      u_tsd_init(tsd);
-   }
-   return tls_get(tsd->key);
-}
-
-void
-u_tsd_set(struct u_tsd *tsd, void *ptr)
-{
-   if (tsd->initMagic != (int) INIT_MAGIC) {
-      u_tsd_init(tsd);
-   }
-   tls_set(tsd->key, ptr);
-}
-
-#endif /* BEOS_THREADS */
-
-
-
-#else  /* THREADS */
-
-
-/*
- * no-op functions
- */
-
-unsigned long
-u_thread_self(void)
-{
-   return 0;
-}
-
-
-void
-u_tsd_init(struct u_tsd *tsd)
-{
-   (void) tsd;
-}
-
-
-void *
-u_tsd_get(struct u_tsd *tsd)
-{
-   (void) tsd;
-   return NULL;
-}
-
-
-void
-u_tsd_set(struct u_tsd *tsd, void *ptr)
-{
-   (void) tsd;
-   (void) ptr;
-}
-
-
-#endif /* THREADS */
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.1

+ *

+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include <stdio.h>

+#include <stdlib.h>

+#include "u_compiler.h"

+#include "u_thread.h"

+

+

+/*

+ * This file should still compile even when THREADS is not defined.

+ * This is to make things easier to deal with on the makefile scene..

+ */

+#ifdef THREADS

+#include <errno.h>

+

+/*

+ * Error messages

+ */

+#define INIT_TSD_ERROR "_glthread_: failed to allocate key for thread specific data"

+#define GET_TSD_ERROR "_glthread_: failed to get thread specific data"

+#define SET_TSD_ERROR "_glthread_: thread failed to set thread specific data"

+

+

+/*

+ * Magic number to determine if a TSD object has been initialized.

+ * Kind of a hack but there doesn't appear to be a better cross-platform

+ * solution.

+ */

+#define INIT_MAGIC 0xff8adc98

+

+

+

+/*

+ * POSIX Threads -- The best way to go if your platform supports them.

+ *                  Solaris >= 2.5 have POSIX threads, IRIX >= 6.4 reportedly

+ *                  has them, and many of the free Unixes now have them.

+ *                  Be sure to use appropriate -mt or -D_REENTRANT type

+ *                  compile flags when building.

+ */

+#ifdef PTHREADS

+

+unsigned long

+u_thread_self(void)

+{

+   return (unsigned long) pthread_self();

+}

+

+

+void

+u_tsd_init(struct u_tsd *tsd)

+{

+   if (pthread_key_create(&tsd->key, NULL/*free*/) != 0) {

+      perror(INIT_TSD_ERROR);

+      exit(-1);

+   }

+   tsd->initMagic = INIT_MAGIC;

+}

+

+

+void *

+u_tsd_get(struct u_tsd *tsd)

+{

+   if (tsd->initMagic != (int) INIT_MAGIC) {

+      u_tsd_init(tsd);

+   }

+   return pthread_getspecific(tsd->key);

+}

+

+

+void

+u_tsd_set(struct u_tsd *tsd, void *ptr)

+{

+   if (tsd->initMagic != (int) INIT_MAGIC) {

+      u_tsd_init(tsd);

+   }

+   if (pthread_setspecific(tsd->key, ptr) != 0) {

+      perror(SET_TSD_ERROR);

+      exit(-1);

+   }

+}

+

+#endif /* PTHREADS */

+

+

+

+/*

+ * Win32 Threads.  The only available option for Windows 95/NT.

+ * Be sure that you compile using the Multithreaded runtime, otherwise

+ * bad things will happen.

+ */

+#ifdef WIN32

+

+unsigned long

+u_thread_self(void)

+{

+   return GetCurrentThreadId();

+}

+

+

+void

+u_tsd_init(struct u_tsd *tsd)

+{

+   tsd->key = TlsAlloc();

+   if (tsd->key == TLS_OUT_OF_INDEXES) {

+      perror(INIT_TSD_ERROR);

+      exit(-1);

+   }

+   tsd->initMagic = INIT_MAGIC;

+}

+

+

+void

+u_tsd_destroy(struct u_tsd *tsd)

+{

+   if (tsd->initMagic != INIT_MAGIC) {

+      return;

+   }

+   TlsFree(tsd->key);

+   tsd->initMagic = 0x0;

+}

+

+

+void *

+u_tsd_get(struct u_tsd *tsd)

+{

+   if (tsd->initMagic != INIT_MAGIC) {

+      u_tsd_init(tsd);

+   }

+   return TlsGetValue(tsd->key);

+}

+

+

+void

+u_tsd_set(struct u_tsd *tsd, void *ptr)

+{

+   /* the following code assumes that the struct u_tsd has been initialized

+      to zero at creation */

+   if (tsd->initMagic != INIT_MAGIC) {

+      u_tsd_init(tsd);

+   }

+   if (TlsSetValue(tsd->key, ptr) == 0) {

+      perror(SET_TSD_ERROR);

+      exit(-1);

+   }

+}

+

+#endif /* WIN32 */

+

+/*

+ * BeOS threads

+ */

+#ifdef BEOS_THREADS

+

+unsigned long

+u_thread_self(void)

+{

+   return (unsigned long) find_thread(NULL);

+}

+

+void

+u_tsd_init(struct u_tsd *tsd)

+{

+   tsd->key = tls_allocate();

+   tsd->initMagic = INIT_MAGIC;

+}

+

+void *

+u_tsd_get(struct u_tsd *tsd)

+{

+   if (tsd->initMagic != (int) INIT_MAGIC) {

+      u_tsd_init(tsd);

+   }

+   return tls_get(tsd->key);

+}

+

+void

+u_tsd_set(struct u_tsd *tsd, void *ptr)

+{

+   if (tsd->initMagic != (int) INIT_MAGIC) {

+      u_tsd_init(tsd);

+   }

+   tls_set(tsd->key, ptr);

+}

+

+#endif /* BEOS_THREADS */

+

+

+

+#else  /* THREADS */

+

+

+/*

+ * no-op functions

+ */

+

+unsigned long

+u_thread_self(void)

+{

+   return 0;

+}

+

+

+void

+u_tsd_init(struct u_tsd *tsd)

+{

+   (void) tsd;

+}

+

+

+void *

+u_tsd_get(struct u_tsd *tsd)

+{

+   (void) tsd;

+   return NULL;

+}

+

+

+void

+u_tsd_set(struct u_tsd *tsd, void *ptr)

+{

+   (void) tsd;

+   (void) ptr;

+}

+

+

+#endif /* THREADS */

diff --git a/mesalib/src/mapi/mapi/u_thread.h b/mesalib/src/mapi/mapi/u_thread.h
index 1cc8be3fa..290066d16 100644
--- a/mesalib/src/mapi/mapi/u_thread.h
+++ b/mesalib/src/mapi/mapi/u_thread.h
@@ -1,201 +1,201 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.2
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/*
- * Thread support for gl dispatch.
- *
- * Initial version by John Stone (j.stone@acm.org) (johns@cs.umr.edu)
- *                and Christoph Poliwoda (poliwoda@volumegraphics.com)
- * Revised by Keith Whitwell
- * Adapted for new gl dispatcher by Brian Paul
- * Modified for use in mapi by Chia-I Wu
- */
-
-/*
- * If this file is accidentally included by a non-threaded build,
- * it should not cause the build to fail, or otherwise cause problems.
- * In general, it should only be included when needed however.
- */
-
-#ifndef _U_THREAD_H_
-#define _U_THREAD_H_
-
-#include "u_compiler.h"
-
-#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS)
-#ifndef THREADS
-#define THREADS
-#endif
-#endif
-
-/*
- * POSIX threads. This should be your choice in the Unix world
- * whenever possible.  When building with POSIX threads, be sure
- * to enable any compiler flags which will cause the MT-safe
- * libc (if one exists) to be used when linking, as well as any
- * header macros for MT-safe errno, etc.  For Solaris, this is the -mt
- * compiler flag.  On Solaris with gcc, use -D_REENTRANT to enable
- * proper compiling for MT-safe libc etc.
- */
-#if defined(PTHREADS)
-#include <pthread.h> /* POSIX threads headers */
-
-struct u_tsd {
-   pthread_key_t key;
-   int initMagic;
-};
-
-typedef pthread_mutex_t u_mutex;
-
-#define u_mutex_declare_static(name) \
-   static u_mutex name = PTHREAD_MUTEX_INITIALIZER
-
-#define u_mutex_init(name)    pthread_mutex_init(&(name), NULL)
-#define u_mutex_destroy(name) pthread_mutex_destroy(&(name))
-#define u_mutex_lock(name)    (void) pthread_mutex_lock(&(name))
-#define u_mutex_unlock(name)  (void) pthread_mutex_unlock(&(name))
-
-#endif /* PTHREADS */
-
-
-/*
- * Windows threads. Should work with Windows NT and 95.
- * IMPORTANT: Link with multithreaded runtime library when THREADS are
- * used!
- */
-#ifdef WIN32
-#include <windows.h>
-
-struct u_tsd {
-   DWORD key;
-   int   initMagic;
-};
-
-typedef CRITICAL_SECTION u_mutex;
-
-/* http://locklessinc.com/articles/pthreads_on_windows/ */
-#define u_mutex_declare_static(name) \
-   static u_mutex name = {(PCRITICAL_SECTION_DEBUG)-1, -1, 0, 0, 0, 0}
-
-#define u_mutex_init(name)    InitializeCriticalSection(&name)
-#define u_mutex_destroy(name) DeleteCriticalSection(&name)
-#define u_mutex_lock(name)    EnterCriticalSection(&name)
-#define u_mutex_unlock(name)  LeaveCriticalSection(&name)
-
-#endif /* WIN32 */
-
-
-/*
- * BeOS threads. R5.x required.
- */
-#ifdef BEOS_THREADS
-
-/* Problem with OS.h and this file on haiku */
-#ifndef __HAIKU__
-#include <kernel/OS.h>
-#endif
-
-#include <support/TLS.h>
-
-/* The only two typedefs required here
- * this is cause of the OS.h problem
- */
-#ifdef __HAIKU__
-typedef int32 thread_id;
-typedef int32 sem_id;
-#endif
-
-struct u_tsd {
-   int32        key;
-   int          initMagic;
-};
-
-/* Use Benaphore, aka speeder semaphore */
-typedef struct {
-    int32   lock;
-    sem_id  sem;
-} benaphore;
-typedef benaphore u_mutex;
-
-#define u_mutex_declare_static(name) \
-   static u_mutex name = { 0, 0 }
-
-#define u_mutex_init(name) \
-   name.sem = create_sem(0, #name"_benaphore"), \
-   name.lock = 0
-
-#define u_mutex_destroy(name) \
-   delete_sem(name.sem), \
-   name.lock = 0
-
-#define u_mutex_lock(name) \
-   if (name.sem == 0) \
-      u_mutex_init(name); \
-   if (atomic_add(&(name.lock), 1) >= 1) \
-      acquire_sem(name.sem)
-
-#define u_mutex_unlock(name) \
-   if (atomic_add(&(name.lock), -1) > 1) \
-      release_sem(name.sem)
-
-#endif /* BEOS_THREADS */
-
-
-/*
- * THREADS not defined
- */
-#ifndef THREADS
-
-struct u_tsd {
-   int initMagic; 
-};
-
-typedef unsigned u_mutex;
-
-#define u_mutex_declare_static(name)   static u_mutex name = 0
-#define u_mutex_init(name)             (void) name
-#define u_mutex_destroy(name)          (void) name
-#define u_mutex_lock(name)             (void) name
-#define u_mutex_unlock(name)           (void) name
-
-#endif /* THREADS */
-
-
-unsigned long
-u_thread_self(void);
-
-void
-u_tsd_init(struct u_tsd *tsd);
-
-void
-u_tsd_destroy(struct u_tsd *tsd); /* WIN32 only */
-
-void *
-u_tsd_get(struct u_tsd *tsd);
-
-void
-u_tsd_set(struct u_tsd *tsd, void *ptr);
-
-#endif /* _U_THREAD_H_ */
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.2

+ *

+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/*

+ * Thread support for gl dispatch.

+ *

+ * Initial version by John Stone (j.stone@acm.org) (johns@cs.umr.edu)

+ *                and Christoph Poliwoda (poliwoda@volumegraphics.com)

+ * Revised by Keith Whitwell

+ * Adapted for new gl dispatcher by Brian Paul

+ * Modified for use in mapi by Chia-I Wu

+ */

+

+/*

+ * If this file is accidentally included by a non-threaded build,

+ * it should not cause the build to fail, or otherwise cause problems.

+ * In general, it should only be included when needed however.

+ */

+

+#ifndef _U_THREAD_H_

+#define _U_THREAD_H_

+

+#include "u_compiler.h"

+

+#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS)

+#ifndef THREADS

+#define THREADS

+#endif

+#endif

+

+/*

+ * POSIX threads. This should be your choice in the Unix world

+ * whenever possible.  When building with POSIX threads, be sure

+ * to enable any compiler flags which will cause the MT-safe

+ * libc (if one exists) to be used when linking, as well as any

+ * header macros for MT-safe errno, etc.  For Solaris, this is the -mt

+ * compiler flag.  On Solaris with gcc, use -D_REENTRANT to enable

+ * proper compiling for MT-safe libc etc.

+ */

+#if defined(PTHREADS)

+#include <pthread.h> /* POSIX threads headers */

+

+struct u_tsd {

+   pthread_key_t key;

+   int initMagic;

+};

+

+typedef pthread_mutex_t u_mutex;

+

+#define u_mutex_declare_static(name) \

+   static u_mutex name = PTHREAD_MUTEX_INITIALIZER

+

+#define u_mutex_init(name)    pthread_mutex_init(&(name), NULL)

+#define u_mutex_destroy(name) pthread_mutex_destroy(&(name))

+#define u_mutex_lock(name)    (void) pthread_mutex_lock(&(name))

+#define u_mutex_unlock(name)  (void) pthread_mutex_unlock(&(name))

+

+#endif /* PTHREADS */

+

+

+/*

+ * Windows threads. Should work with Windows NT and 95.

+ * IMPORTANT: Link with multithreaded runtime library when THREADS are

+ * used!

+ */

+#ifdef WIN32

+#include <windows.h>

+

+struct u_tsd {

+   DWORD key;

+   int   initMagic;

+};

+

+typedef CRITICAL_SECTION u_mutex;

+

+/* http://locklessinc.com/articles/pthreads_on_windows/ */

+#define u_mutex_declare_static(name) \

+   static u_mutex name = {(PCRITICAL_SECTION_DEBUG)-1, -1, 0, 0, 0, 0}

+

+#define u_mutex_init(name)    InitializeCriticalSection(&name)

+#define u_mutex_destroy(name) DeleteCriticalSection(&name)

+#define u_mutex_lock(name)    EnterCriticalSection(&name)

+#define u_mutex_unlock(name)  LeaveCriticalSection(&name)

+

+#endif /* WIN32 */

+

+

+/*

+ * BeOS threads. R5.x required.

+ */

+#ifdef BEOS_THREADS

+

+/* Problem with OS.h and this file on haiku */

+#ifndef __HAIKU__

+#include <kernel/OS.h>

+#endif

+

+#include <support/TLS.h>

+

+/* The only two typedefs required here

+ * this is cause of the OS.h problem

+ */

+#ifdef __HAIKU__

+typedef int32 thread_id;

+typedef int32 sem_id;

+#endif

+

+struct u_tsd {

+   int32        key;

+   int          initMagic;

+};

+

+/* Use Benaphore, aka speeder semaphore */

+typedef struct {

+    int32   lock;

+    sem_id  sem;

+} benaphore;

+typedef benaphore u_mutex;

+

+#define u_mutex_declare_static(name) \

+   static u_mutex name = { 0, 0 }

+

+#define u_mutex_init(name) \

+   name.sem = create_sem(0, #name"_benaphore"), \

+   name.lock = 0

+

+#define u_mutex_destroy(name) \

+   delete_sem(name.sem), \

+   name.lock = 0

+

+#define u_mutex_lock(name) \

+   if (name.sem == 0) \

+      u_mutex_init(name); \

+   if (atomic_add(&(name.lock), 1) >= 1) \

+      acquire_sem(name.sem)

+

+#define u_mutex_unlock(name) \

+   if (atomic_add(&(name.lock), -1) > 1) \

+      release_sem(name.sem)

+

+#endif /* BEOS_THREADS */

+

+

+/*

+ * THREADS not defined

+ */

+#ifndef THREADS

+

+struct u_tsd {

+   int initMagic; 

+};

+

+typedef unsigned u_mutex;

+

+#define u_mutex_declare_static(name)   static u_mutex name = 0

+#define u_mutex_init(name)             (void) name

+#define u_mutex_destroy(name)          (void) name

+#define u_mutex_lock(name)             (void) name

+#define u_mutex_unlock(name)           (void) name

+

+#endif /* THREADS */

+

+

+unsigned long

+u_thread_self(void);

+

+void

+u_tsd_init(struct u_tsd *tsd);

+

+void

+u_tsd_destroy(struct u_tsd *tsd); /* WIN32 only */

+

+void *

+u_tsd_get(struct u_tsd *tsd);

+

+void

+u_tsd_set(struct u_tsd *tsd, void *ptr);

+

+#endif /* _U_THREAD_H_ */

diff --git a/mesalib/src/mesa/Makefile b/mesalib/src/mesa/Makefile
index 03962e9c1..eaba09dcf 100644
--- a/mesalib/src/mesa/Makefile
+++ b/mesalib/src/mesa/Makefile
@@ -1,230 +1,230 @@
-# src/mesa/Makefile
-
-TOP = ../..
-include $(TOP)/configs/current
-
-MESA_LIBS := libmesa.a libmesagallium.a
-DEPENDS := depend
-
-MESA_OBJ_DIR := .
-DRICORE_OBJ_DIR := objs-dricore
-
-include sources.mak
-
-# adjust object dirs
-MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))
-MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
-
-DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS))
-
-# define preprocessor flags
-MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)
-
-# append include dirs
-MESA_CPPFLAGS += $(INCLUDE_DIRS)
-
-DRICORE_CPPFLAGS = $(MESA_CPPFLAGS)
-
-# tidy compiler flags
-CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))
-CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))
-
-# LLVM is needed for the state tracker
-MESA_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS)
-DRICORE_CFLAGS := $(LLVM_CFLAGS) $(DRI_CFLAGS)
-
-MESA_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS)
-DRICORE_CXXFLAGS := $(LLVM_CFLAGS) $(DRI_CXXFLAGS)
-
-define mesa-cc-c
-	@mkdir -p $(dir $@)
-	$(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS)
-endef
-
-define mesa-cxx-c
-	@mkdir -p $(dir $@)
-	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CXXFLAGS)
-endef
-
-$(MESA_OBJ_DIR)/%.o: %.c
-	$(call mesa-cc-c,MESA)
-
-$(MESA_OBJ_DIR)/%.o: %.cpp
-	$(call mesa-cxx-c,MESA)
-
-$(MESA_OBJ_DIR)/%.o: %.S
-	$(call mesa-cc-c,MESA)
-
-$(DRICORE_OBJ_DIR)/%.o: %.c
-	$(call mesa-cc-c,DRICORE)
-
-$(DRICORE_OBJ_DIR)/%.o: %.cpp
-	$(call mesa-cxx-c,DRICORE)
-
-$(DRICORE_OBJ_DIR)/%.o: %.S
-	$(call mesa-cc-c,DRICORE)
-
-# Default: build dependencies, then asm_subdirs, GLSL built-in lib,
-# then convenience libs (.a) and finally the device drivers:
-default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs
-
-main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
-	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES1.1 > $@
-
-main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
-	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@
-
-program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
-	bison -v -d --output=program/program_parse.tab.c $<
-
-program/lex.yy.c: program/program_lexer.l
-	flex --never-interactive --outfile=$@ $<
-
-######################################################################
-# Helper libraries used by many drivers:
-
-# Make archive of core mesa object files
-libmesa.a: $(MESA_OBJECTS) $(GLSL_LIBS)
-	@ $(MKLIB) -o mesa -static $(MESA_OBJECTS) $(GLSL_LIBS)
-
-# Shared dricore library for classic DRI drivers
-$(TOP)/$(LIB_DIR)/libdricore.so: $(DRICORE_OBJECTS) $(DRICORE_GLSL_LIBS)
-	@$(MKLIB) -o $@ -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
-		-cplusplus -noprefix \
-		-install $(TOP)/$(LIB_DIR) -id $(DRI_DRIVER_INSTALL_DIR)/$@.dylib \
-		$(DRICORE_LIB_DEPS) $(DRICORE_OBJECTS)
-
-# Make archive of subset of core mesa object files for gallium
-libmesagallium.a: $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)
-	@ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)
-
-######################################################################
-# Device drivers
-driver_subdirs: $(MESA_LIBS) $(DRICORE_LIBS)
-	@ (cd drivers && $(MAKE))
-
-
-######################################################################
-# Assembly subdirs
-asm_subdirs:
-	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \
-		(cd x86 && $(MAKE)) || exit 1 ; \
-	fi
-	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \
-		(cd x86 && $(MAKE)) || exit 1 ; \
-		(cd x86-64 && $(MAKE)) || exit 1 ; \
-	fi
-
-
-######################################################################
-# Dependency generation
-
-depend: $(ALL_SOURCES)
-	@ echo "running $(MKDEP)"
-	@ touch depend
-	@$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \
-		$(ALL_SOURCES) > /dev/null 2>/dev/null
-
-######################################################################
-# Installation rules
-
-# this isn't fleshed out yet but is probably the way to go in the future
-new_install:
-	(cd drivers && $(MAKE) install)
-
-ifneq (,$(DRICORE_LIBS))
-DRICORE_INSTALL_TARGET = install-dricore
-endif
-
-# XXX replace this with new_install above someday
-install: default $(DRICORE_INSTALL_TARGET)
-	@for driver in $(DRIVER_DIRS) ; do \
-	  case "$$driver" in \
-	    osmesa) if [ "$(DRIVER_DIRS)" = osmesa ]; then \
-	              $(MAKE) install-headers install-osmesa || exit 1 ; \
-	            else \
-	              $(MAKE) install-osmesa || exit 1 ; \
-	            fi ;; \
-	    dri)    $(MAKE) install-libgl install-dri || exit 1 ;; \
-	    *)      $(MAKE) install-libgl || exit 1 ;; \
-	  esac ; \
-	done
-
-pcedit = \
-	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
-	-e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
-	-e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
-	-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
-
-
-gl_pcedit = sed \
-	$(pcedit) \
-	-e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \
-	-e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \
-	-e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \
-	-e 's,@GLX_TLS@,$(GLX_TLS),' \
-	-e 's,@GL_LIB@,$(GL_LIB),'
-
-gl.pc: gl.pc.in
-	$(gl_pcedit) $< > $@
-
-osmesa_pcedit = sed \
-	$(pcedit) \
-	-e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \
-	-e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \
-	-e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),'
-
-osmesa.pc: osmesa.pc.in
-	$(osmesa_pcedit) $< > $@
-
-install-headers:
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
-	$(INSTALL) -m 644 $(TOP)/include/GL/*.h \
-		$(DESTDIR)$(INSTALL_INC_DIR)/GL
-
-install-libgl: default gl.pc install-headers
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
-		$(DESTDIR)$(INSTALL_LIB_DIR)
-	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-
-install-osmesa: default osmesa.pc
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
-		$(DESTDIR)$(INSTALL_LIB_DIR)
-	$(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-
-install-dri: default
-	cd drivers/dri && $(MAKE) install
-
-# We don't need MINSTALL here because we're not installing symbolic links
-install-dricore: default
-	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-	$(INSTALL) -m 755 $(DRICORE_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-
-
-# Emacs tags
-tags:
-	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
-
-clean-dricore:
-	-rm -f libdricore.so
-	-rm -f $(DRICORE_LIBS)
-	-rm -rf $(DRICORE_OBJ_DIR)
-
-clean: clean-dricore
-	-rm -f */*.o
-	-rm -f */*/*.o
-	-rm -f depend depend.bak libmesa.a libmesagallium.a
-	-rm -f drivers/*/*.o
-	-rm -f *.pc
-	-@cd drivers/dri && $(MAKE) clean
-	-@cd drivers/x11 && $(MAKE) clean
-	-@cd drivers/osmesa && $(MAKE) clean
-	-@cd x86 && $(MAKE) clean
-	-@cd x86-64 && $(MAKE) clean
-
-
--include $(DEPENDS)
+# src/mesa/Makefile

+

+TOP = ../..

+include $(TOP)/configs/current

+

+MESA_LIBS := libmesa.a libmesagallium.a

+DEPENDS := depend

+

+MESA_OBJ_DIR := .

+DRICORE_OBJ_DIR := objs-dricore

+

+include sources.mak

+

+# adjust object dirs

+MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))

+MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))

+

+DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS))

+

+# define preprocessor flags

+MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)

+

+# append include dirs

+MESA_CPPFLAGS += $(INCLUDE_DIRS)

+

+DRICORE_CPPFLAGS = $(MESA_CPPFLAGS)

+

+# tidy compiler flags

+CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))

+CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))

+

+# LLVM is needed for the state tracker

+MESA_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS)

+DRICORE_CFLAGS := $(LLVM_CFLAGS) $(DRI_CFLAGS)

+

+MESA_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS)

+DRICORE_CXXFLAGS := $(LLVM_CFLAGS) $(DRI_CXXFLAGS)

+

+define mesa-cc-c

+	@mkdir -p $(dir $@)

+	$(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS)

+endef

+

+define mesa-cxx-c

+	@mkdir -p $(dir $@)

+	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CXXFLAGS)

+endef

+

+$(MESA_OBJ_DIR)/%.o: %.c

+	$(call mesa-cc-c,MESA)

+

+$(MESA_OBJ_DIR)/%.o: %.cpp

+	$(call mesa-cxx-c,MESA)

+

+$(MESA_OBJ_DIR)/%.o: %.S

+	$(call mesa-cc-c,MESA)

+

+$(DRICORE_OBJ_DIR)/%.o: %.c

+	$(call mesa-cc-c,DRICORE)

+

+$(DRICORE_OBJ_DIR)/%.o: %.cpp

+	$(call mesa-cxx-c,DRICORE)

+

+$(DRICORE_OBJ_DIR)/%.o: %.S

+	$(call mesa-cc-c,DRICORE)

+

+# Default: build dependencies, then asm_subdirs, GLSL built-in lib,

+# then convenience libs (.a) and finally the device drivers:

+default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs

+

+main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py

+	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES1.1 > $@

+

+main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py

+	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@

+

+program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y

+	bison -v -d --output=program/program_parse.tab.c $<

+

+program/lex.yy.c: program/program_lexer.l

+	flex --never-interactive --outfile=$@ $<

+

+######################################################################

+# Helper libraries used by many drivers:

+

+# Make archive of core mesa object files

+libmesa.a: $(MESA_OBJECTS) $(GLSL_LIBS)

+	@ $(MKLIB) -o mesa -static $(MESA_OBJECTS) $(GLSL_LIBS)

+

+# Shared dricore library for classic DRI drivers

+$(TOP)/$(LIB_DIR)/libdricore.so: $(DRICORE_OBJECTS) $(DRICORE_GLSL_LIBS)

+	@$(MKLIB) -o $@ -linker '$(CXX)' -ldflags '$(LDFLAGS)' \

+		-cplusplus -noprefix \

+		-install $(TOP)/$(LIB_DIR) -id $(DRI_DRIVER_INSTALL_DIR)/$@.dylib \

+		$(DRICORE_LIB_DEPS) $(DRICORE_OBJECTS)

+

+# Make archive of subset of core mesa object files for gallium

+libmesagallium.a: $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)

+	@ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)

+

+######################################################################

+# Device drivers

+driver_subdirs: $(MESA_LIBS) $(DRICORE_LIBS)

+	@ (cd drivers && $(MAKE))

+

+

+######################################################################

+# Assembly subdirs

+asm_subdirs:

+	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \

+		(cd x86 && $(MAKE)) || exit 1 ; \

+	fi

+	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \

+		(cd x86 && $(MAKE)) || exit 1 ; \

+		(cd x86-64 && $(MAKE)) || exit 1 ; \

+	fi

+

+

+######################################################################

+# Dependency generation

+

+depend: $(ALL_SOURCES)

+	@ echo "running $(MKDEP)"

+	@ touch depend

+	@$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \

+		$(ALL_SOURCES) > /dev/null 2>/dev/null

+

+######################################################################

+# Installation rules

+

+# this isn't fleshed out yet but is probably the way to go in the future

+new_install:

+	(cd drivers && $(MAKE) install)

+

+ifneq (,$(DRICORE_LIBS))

+DRICORE_INSTALL_TARGET = install-dricore

+endif

+

+# XXX replace this with new_install above someday

+install: default $(DRICORE_INSTALL_TARGET)

+	@for driver in $(DRIVER_DIRS) ; do \

+	  case "$$driver" in \

+	    osmesa) if [ "$(DRIVER_DIRS)" = osmesa ]; then \

+	              $(MAKE) install-headers install-osmesa || exit 1 ; \

+	            else \

+	              $(MAKE) install-osmesa || exit 1 ; \

+	            fi ;; \

+	    dri)    $(MAKE) install-libgl install-dri || exit 1 ;; \

+	    *)      $(MAKE) install-libgl || exit 1 ;; \

+	  esac ; \

+	done

+

+pcedit = \

+	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \

+	-e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \

+	-e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \

+	-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \

+

+

+gl_pcedit = sed \

+	$(pcedit) \

+	-e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \

+	-e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \

+	-e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \

+	-e 's,@GLX_TLS@,$(GLX_TLS),' \

+	-e 's,@GL_LIB@,$(GL_LIB),'

+

+gl.pc: gl.pc.in

+	$(gl_pcedit) $< > $@

+

+osmesa_pcedit = sed \

+	$(pcedit) \

+	-e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \

+	-e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \

+	-e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),'

+

+osmesa.pc: osmesa.pc.in

+	$(osmesa_pcedit) $< > $@

+

+install-headers:

+	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL

+	$(INSTALL) -m 644 $(TOP)/include/GL/*.h \

+		$(DESTDIR)$(INSTALL_INC_DIR)/GL

+

+install-libgl: default gl.pc install-headers

+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)

+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

+	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \

+		$(DESTDIR)$(INSTALL_LIB_DIR)

+	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

+

+install-osmesa: default osmesa.pc

+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)

+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

+	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \

+		$(DESTDIR)$(INSTALL_LIB_DIR)

+	$(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

+

+install-dri: default

+	cd drivers/dri && $(MAKE) install

+

+# We don't need MINSTALL here because we're not installing symbolic links

+install-dricore: default

+	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

+	$(INSTALL) -m 755 $(DRICORE_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

+

+

+# Emacs tags

+tags:

+	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h

+

+clean-dricore:

+	-rm -f libdricore.so

+	-rm -f $(DRICORE_LIBS)

+	-rm -rf $(DRICORE_OBJ_DIR)

+

+clean: clean-dricore

+	-rm -f */*.o

+	-rm -f */*/*.o

+	-rm -f depend depend.bak libmesa.a libmesagallium.a

+	-rm -f drivers/*/*.o

+	-rm -f *.pc

+	-@cd drivers/dri && $(MAKE) clean

+	-@cd drivers/x11 && $(MAKE) clean

+	-@cd drivers/osmesa && $(MAKE) clean

+	-@cd x86 && $(MAKE) clean

+	-@cd x86-64 && $(MAKE) clean

+

+

+-include $(DEPENDS)

diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index 2b00e8979..a3720a24d 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -1,2852 +1,2852 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.6
- *
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-/**
- * Meta operations.  Some GL operations can be expressed in terms of
- * other GL operations.  For example, glBlitFramebuffer() can be done
- * with texture mapping and glClear() can be done with polygon rendering.
- *
- * \author Brian Paul
- */
-
-
-#include "main/glheader.h"
-#include "main/mtypes.h"
-#include "main/imports.h"
-#include "main/arbprogram.h"
-#include "main/arrayobj.h"
-#include "main/blend.h"
-#include "main/bufferobj.h"
-#include "main/buffers.h"
-#include "main/colortab.h"
-#include "main/depth.h"
-#include "main/enable.h"
-#include "main/fbobject.h"
-#include "main/formats.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/matrix.h"
-#include "main/mipmap.h"
-#include "main/pbo.h"
-#include "main/polygon.h"
-#include "main/readpix.h"
-#include "main/scissor.h"
-#include "main/shaderapi.h"
-#include "main/shaderobj.h"
-#include "main/state.h"
-#include "main/stencil.h"
-#include "main/texobj.h"
-#include "main/texenv.h"
-#include "main/teximage.h"
-#include "main/texparam.h"
-#include "main/texstate.h"
-#include "main/varray.h"
-#include "main/viewport.h"
-#include "program/program.h"
-#include "swrast/swrast.h"
-#include "drivers/common/meta.h"
-
-
-/** Return offset in bytes of the field within a vertex struct */
-#define OFFSET(FIELD) ((void *) offsetof(struct vertex, FIELD))
-
-
-/**
- * Flags passed to _mesa_meta_begin().
- */
-/*@{*/
-#define META_ALL              ~0x0
-#define META_ALPHA_TEST        0x1
-#define META_BLEND             0x2  /**< includes logicop */
-#define META_COLOR_MASK        0x4
-#define META_DEPTH_TEST        0x8
-#define META_FOG              0x10
-#define META_PIXEL_STORE      0x20
-#define META_PIXEL_TRANSFER   0x40
-#define META_RASTERIZATION    0x80
-#define META_SCISSOR         0x100
-#define META_SHADER          0x200
-#define META_STENCIL_TEST    0x400
-#define META_TRANSFORM       0x800 /**< modelview, projection, clip planes */
-#define META_TEXTURE        0x1000
-#define META_VERTEX         0x2000
-#define META_VIEWPORT       0x4000
-/*@}*/
-
-
-/**
- * State which we may save/restore across meta ops.
- * XXX this may be incomplete...
- */
-struct save_state
-{
-   GLbitfield SavedState;  /**< bitmask of META_* flags */
-
-   /** META_ALPHA_TEST */
-   GLboolean AlphaEnabled;
-   GLenum AlphaFunc;
-   GLclampf AlphaRef;
-
-   /** META_BLEND */
-   GLbitfield BlendEnabled;
-   GLboolean ColorLogicOpEnabled;
-
-   /** META_COLOR_MASK */
-   GLubyte ColorMask[MAX_DRAW_BUFFERS][4];
-
-   /** META_DEPTH_TEST */
-   struct gl_depthbuffer_attrib Depth;
-
-   /** META_FOG */
-   GLboolean Fog;
-
-   /** META_PIXEL_STORE */
-   struct gl_pixelstore_attrib Pack, Unpack;
-
-   /** META_PIXEL_TRANSFER */
-   GLfloat RedBias, RedScale;
-   GLfloat GreenBias, GreenScale;
-   GLfloat BlueBias, BlueScale;
-   GLfloat AlphaBias, AlphaScale;
-   GLfloat DepthBias, DepthScale;
-   GLboolean MapColorFlag;
-
-   /** META_RASTERIZATION */
-   GLenum FrontPolygonMode, BackPolygonMode;
-   GLboolean PolygonOffset;
-   GLboolean PolygonSmooth;
-   GLboolean PolygonStipple;
-   GLboolean PolygonCull;
-
-   /** META_SCISSOR */
-   struct gl_scissor_attrib Scissor;
-
-   /** META_SHADER */
-   GLboolean VertexProgramEnabled;
-   struct gl_vertex_program *VertexProgram;
-   GLboolean FragmentProgramEnabled;
-   struct gl_fragment_program *FragmentProgram;
-   struct gl_shader_program *VertexShader;
-   struct gl_shader_program *GeometryShader;
-   struct gl_shader_program *FragmentShader;
-   struct gl_shader_program *ActiveShader;
-
-   /** META_STENCIL_TEST */
-   struct gl_stencil_attrib Stencil;
-
-   /** META_TRANSFORM */
-   GLenum MatrixMode;
-   GLfloat ModelviewMatrix[16];
-   GLfloat ProjectionMatrix[16];
-   GLfloat TextureMatrix[16];
-   GLbitfield ClipPlanesEnabled;
-
-   /** META_TEXTURE */
-   GLuint ActiveUnit;
-   GLuint ClientActiveUnit;
-   /** for unit[0] only */
-   struct gl_texture_object *CurrentTexture[NUM_TEXTURE_TARGETS];
-   /** mask of TEXTURE_2D_BIT, etc */
-   GLbitfield TexEnabled[MAX_TEXTURE_UNITS];
-   GLbitfield TexGenEnabled[MAX_TEXTURE_UNITS];
-   GLuint EnvMode;  /* unit[0] only */
-
-   /** META_VERTEX */
-   struct gl_array_object *ArrayObj;
-   struct gl_buffer_object *ArrayBufferObj;
-
-   /** META_VIEWPORT */
-   GLint ViewportX, ViewportY, ViewportW, ViewportH;
-   GLclampd DepthNear, DepthFar;
-
-   /** Miscellaneous (always disabled) */
-   GLboolean Lighting;
-};
-
-
-/**
- * Temporary texture used for glBlitFramebuffer, glDrawPixels, etc.
- * This is currently shared by all the meta ops.  But we could create a
- * separate one for each of glDrawPixel, glBlitFramebuffer, glCopyPixels, etc.
- */
-struct temp_texture
-{
-   GLuint TexObj;
-   GLenum Target;         /**< GL_TEXTURE_2D or GL_TEXTURE_RECTANGLE */
-   GLsizei MinSize;       /**< Min texture size to allocate */
-   GLsizei MaxSize;       /**< Max possible texture size */
-   GLboolean NPOT;        /**< Non-power of two size OK? */
-   GLsizei Width, Height; /**< Current texture size */
-   GLenum IntFormat;
-   GLfloat Sright, Ttop;  /**< right, top texcoords */
-};
-
-
-/**
- * State for glBlitFramebufer()
- */
-struct blit_state
-{
-   GLuint ArrayObj;
-   GLuint VBO;
-   GLuint DepthFP;
-};
-
-
-/**
- * State for glClear()
- */
-struct clear_state
-{
-   GLuint ArrayObj;
-   GLuint VBO;
-};
-
-
-/**
- * State for glCopyPixels()
- */
-struct copypix_state
-{
-   GLuint ArrayObj;
-   GLuint VBO;
-};
-
-
-/**
- * State for glDrawPixels()
- */
-struct drawpix_state
-{
-   GLuint ArrayObj;
-
-   GLuint StencilFP;  /**< Fragment program for drawing stencil images */
-   GLuint DepthFP;  /**< Fragment program for drawing depth images */
-};
-
-
-/**
- * State for glBitmap()
- */
-struct bitmap_state
-{
-   GLuint ArrayObj;
-   GLuint VBO;
-   struct temp_texture Tex;  /**< separate texture from other meta ops */
-};
-
-
-/**
- * State for _mesa_meta_generate_mipmap()
- */
-struct gen_mipmap_state
-{
-   GLuint ArrayObj;
-   GLuint VBO;
-   GLuint FBO;
-};
-
-#define MAX_META_OPS_DEPTH      2
-/**
- * All per-context meta state.
- */
-struct gl_meta_state
-{
-   /** Stack of state saved during meta-ops */
-   struct save_state Save[MAX_META_OPS_DEPTH];
-   /** Save stack depth */
-   GLuint SaveStackDepth;
-
-   struct temp_texture TempTex;
-
-   struct blit_state Blit;    /**< For _mesa_meta_BlitFramebuffer() */
-   struct clear_state Clear;  /**< For _mesa_meta_Clear() */
-   struct copypix_state CopyPix;  /**< For _mesa_meta_CopyPixels() */
-   struct drawpix_state DrawPix;  /**< For _mesa_meta_DrawPixels() */
-   struct bitmap_state Bitmap;    /**< For _mesa_meta_Bitmap() */
-   struct gen_mipmap_state Mipmap;    /**< For _mesa_meta_GenerateMipmap() */
-};
-
-
-/**
- * Initialize meta-ops for a context.
- * To be called once during context creation.
- */
-void
-_mesa_meta_init(struct gl_context *ctx)
-{
-   ASSERT(!ctx->Meta);
-
-   ctx->Meta = CALLOC_STRUCT(gl_meta_state);
-}
-
-
-/**
- * Free context meta-op state.
- * To be called once during context destruction.
- */
-void
-_mesa_meta_free(struct gl_context *ctx)
-{
-   /* Note: Any textures, VBOs, etc, that we allocate should get
-    * freed by the normal context destruction code.  But this would be
-    * the place to free other meta data someday.
-    */
-   free(ctx->Meta);
-   ctx->Meta = NULL;
-}
-
-
-/**
- * Enter meta state.  This is like a light-weight version of glPushAttrib
- * but it also resets most GL state back to default values.
- *
- * \param state  bitmask of META_* flags indicating which attribute groups
- *               to save and reset to their defaults
- */
-static void
-_mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
-{
-   struct save_state *save;
-
-   /* hope MAX_META_OPS_DEPTH is large enough */
-   assert(ctx->Meta->SaveStackDepth < MAX_META_OPS_DEPTH);
-
-   save = &ctx->Meta->Save[ctx->Meta->SaveStackDepth++];
-   memset(save, 0, sizeof(*save));
-   save->SavedState = state;
-
-   if (state & META_ALPHA_TEST) {
-      save->AlphaEnabled = ctx->Color.AlphaEnabled;
-      save->AlphaFunc = ctx->Color.AlphaFunc;
-      save->AlphaRef = ctx->Color.AlphaRef;
-      if (ctx->Color.AlphaEnabled)
-         _mesa_set_enable(ctx, GL_ALPHA_TEST, GL_FALSE);
-   }
-
-   if (state & META_BLEND) {
-      save->BlendEnabled = ctx->Color.BlendEnabled;
-      if (ctx->Color.BlendEnabled) {
-         if (ctx->Extensions.EXT_draw_buffers2) {
-            GLuint i;
-            for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
-               _mesa_set_enablei(ctx, GL_BLEND, i, GL_FALSE);
-            }
-         }
-         else {
-            _mesa_set_enable(ctx, GL_BLEND, GL_FALSE);
-         }
-      }
-      save->ColorLogicOpEnabled = ctx->Color.ColorLogicOpEnabled;
-      if (ctx->Color.ColorLogicOpEnabled)
-         _mesa_set_enable(ctx, GL_COLOR_LOGIC_OP, GL_FALSE);
-   }
-
-   if (state & META_COLOR_MASK) {
-      memcpy(save->ColorMask, ctx->Color.ColorMask,
-             sizeof(ctx->Color.ColorMask));
-      if (!ctx->Color.ColorMask[0][0] ||
-          !ctx->Color.ColorMask[0][1] ||
-          !ctx->Color.ColorMask[0][2] ||
-          !ctx->Color.ColorMask[0][3])
-         _mesa_ColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-   }
-
-   if (state & META_DEPTH_TEST) {
-      save->Depth = ctx->Depth; /* struct copy */
-      if (ctx->Depth.Test)
-         _mesa_set_enable(ctx, GL_DEPTH_TEST, GL_FALSE);
-   }
-
-   if (state & META_FOG) {
-      save->Fog = ctx->Fog.Enabled;
-      if (ctx->Fog.Enabled)
-         _mesa_set_enable(ctx, GL_FOG, GL_FALSE);
-   }
-
-   if (state & META_PIXEL_STORE) {
-      save->Pack = ctx->Pack;
-      save->Unpack = ctx->Unpack;
-      ctx->Pack = ctx->DefaultPacking;
-      ctx->Unpack = ctx->DefaultPacking;
-   }
-
-   if (state & META_PIXEL_TRANSFER) {
-      save->RedScale = ctx->Pixel.RedScale;
-      save->RedBias = ctx->Pixel.RedBias;
-      save->GreenScale = ctx->Pixel.GreenScale;
-      save->GreenBias = ctx->Pixel.GreenBias;
-      save->BlueScale = ctx->Pixel.BlueScale;
-      save->BlueBias = ctx->Pixel.BlueBias;
-      save->AlphaScale = ctx->Pixel.AlphaScale;
-      save->AlphaBias = ctx->Pixel.AlphaBias;
-      save->MapColorFlag = ctx->Pixel.MapColorFlag;
-      ctx->Pixel.RedScale = 1.0F;
-      ctx->Pixel.RedBias = 0.0F;
-      ctx->Pixel.GreenScale = 1.0F;
-      ctx->Pixel.GreenBias = 0.0F;
-      ctx->Pixel.BlueScale = 1.0F;
-      ctx->Pixel.BlueBias = 0.0F;
-      ctx->Pixel.AlphaScale = 1.0F;
-      ctx->Pixel.AlphaBias = 0.0F;
-      ctx->Pixel.MapColorFlag = GL_FALSE;
-      /* XXX more state */
-      ctx->NewState |=_NEW_PIXEL;
-   }
-
-   if (state & META_RASTERIZATION) {
-      save->FrontPolygonMode = ctx->Polygon.FrontMode;
-      save->BackPolygonMode = ctx->Polygon.BackMode;
-      save->PolygonOffset = ctx->Polygon.OffsetFill;
-      save->PolygonSmooth = ctx->Polygon.SmoothFlag;
-      save->PolygonStipple = ctx->Polygon.StippleFlag;
-      save->PolygonCull = ctx->Polygon.CullFlag;
-      _mesa_PolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-      _mesa_set_enable(ctx, GL_POLYGON_OFFSET_FILL, GL_FALSE);
-      _mesa_set_enable(ctx, GL_POLYGON_SMOOTH, GL_FALSE);
-      _mesa_set_enable(ctx, GL_POLYGON_STIPPLE, GL_FALSE);
-      _mesa_set_enable(ctx, GL_CULL_FACE, GL_FALSE);
-   }
-
-   if (state & META_SCISSOR) {
-      save->Scissor = ctx->Scissor; /* struct copy */
-      _mesa_set_enable(ctx, GL_SCISSOR_TEST, GL_FALSE);
-   }
-
-   if (state & META_SHADER) {
-      if (ctx->Extensions.ARB_vertex_program) {
-         save->VertexProgramEnabled = ctx->VertexProgram.Enabled;
-         _mesa_reference_vertprog(ctx, &save->VertexProgram,
-				  ctx->VertexProgram.Current);
-         _mesa_set_enable(ctx, GL_VERTEX_PROGRAM_ARB, GL_FALSE);
-      }
-
-      if (ctx->Extensions.ARB_fragment_program) {
-         save->FragmentProgramEnabled = ctx->FragmentProgram.Enabled;
-         _mesa_reference_fragprog(ctx, &save->FragmentProgram,
-				  ctx->FragmentProgram.Current);
-         _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_FALSE);
-      }
-
-      if (ctx->Extensions.ARB_shader_objects) {
-	 _mesa_reference_shader_program(ctx, &save->VertexShader,
-					ctx->Shader.CurrentVertexProgram);
-	 _mesa_reference_shader_program(ctx, &save->GeometryShader,
-					ctx->Shader.CurrentGeometryProgram);
-	 _mesa_reference_shader_program(ctx, &save->FragmentShader,
-					ctx->Shader.CurrentFragmentProgram);
-	 _mesa_reference_shader_program(ctx, &save->ActiveShader,
-					ctx->Shader.CurrentFragmentProgram);
-
-         _mesa_UseProgramObjectARB(0);
-      }
-   }
-
-   if (state & META_STENCIL_TEST) {
-      save->Stencil = ctx->Stencil; /* struct copy */
-      if (ctx->Stencil.Enabled)
-         _mesa_set_enable(ctx, GL_STENCIL_TEST, GL_FALSE);
-      /* NOTE: other stencil state not reset */
-   }
-
-   if (state & META_TEXTURE) {
-      GLuint u, tgt;
-
-      save->ActiveUnit = ctx->Texture.CurrentUnit;
-      save->ClientActiveUnit = ctx->Array.ActiveTexture;
-      save->EnvMode = ctx->Texture.Unit[0].EnvMode;
-
-      /* Disable all texture units */
-      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
-         save->TexEnabled[u] = ctx->Texture.Unit[u].Enabled;
-         save->TexGenEnabled[u] = ctx->Texture.Unit[u].TexGenEnabled;
-         if (ctx->Texture.Unit[u].Enabled ||
-             ctx->Texture.Unit[u].TexGenEnabled) {
-            _mesa_ActiveTextureARB(GL_TEXTURE0 + u);
-            _mesa_set_enable(ctx, GL_TEXTURE_1D, GL_FALSE);
-            _mesa_set_enable(ctx, GL_TEXTURE_2D, GL_FALSE);
-            _mesa_set_enable(ctx, GL_TEXTURE_3D, GL_FALSE);
-            if (ctx->Extensions.ARB_texture_cube_map)
-               _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE);
-            _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE, GL_FALSE);
-            _mesa_set_enable(ctx, GL_TEXTURE_GEN_S, GL_FALSE);
-            _mesa_set_enable(ctx, GL_TEXTURE_GEN_T, GL_FALSE);
-            _mesa_set_enable(ctx, GL_TEXTURE_GEN_R, GL_FALSE);
-            _mesa_set_enable(ctx, GL_TEXTURE_GEN_Q, GL_FALSE);
-         }
-      }
-
-      /* save current texture objects for unit[0] only */
-      for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
-         _mesa_reference_texobj(&save->CurrentTexture[tgt],
-                                ctx->Texture.Unit[0].CurrentTex[tgt]);
-      }
-
-      /* set defaults for unit[0] */
-      _mesa_ActiveTextureARB(GL_TEXTURE0);
-      _mesa_ClientActiveTextureARB(GL_TEXTURE0);
-      _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-   }
-
-   if (state & META_TRANSFORM) {
-      GLuint activeTexture = ctx->Texture.CurrentUnit;
-      memcpy(save->ModelviewMatrix, ctx->ModelviewMatrixStack.Top->m,
-             16 * sizeof(GLfloat));
-      memcpy(save->ProjectionMatrix, ctx->ProjectionMatrixStack.Top->m,
-             16 * sizeof(GLfloat));
-      memcpy(save->TextureMatrix, ctx->TextureMatrixStack[0].Top->m,
-             16 * sizeof(GLfloat));
-      save->MatrixMode = ctx->Transform.MatrixMode;
-      /* set 1:1 vertex:pixel coordinate transform */
-      _mesa_ActiveTextureARB(GL_TEXTURE0);
-      _mesa_MatrixMode(GL_TEXTURE);
-      _mesa_LoadIdentity();
-      _mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture);
-      _mesa_MatrixMode(GL_MODELVIEW);
-      _mesa_LoadIdentity();
-      _mesa_MatrixMode(GL_PROJECTION);
-      _mesa_LoadIdentity();
-      _mesa_Ortho(0.0, ctx->DrawBuffer->Width,
-                  0.0, ctx->DrawBuffer->Height,
-                  -1.0, 1.0);
-      save->ClipPlanesEnabled = ctx->Transform.ClipPlanesEnabled;
-      if (ctx->Transform.ClipPlanesEnabled) {
-         GLuint i;
-         for (i = 0; i < ctx->Const.MaxClipPlanes; i++) {
-            _mesa_set_enable(ctx, GL_CLIP_PLANE0 + i, GL_FALSE);
-         }
-      }
-   }
-
-   if (state & META_VERTEX) {
-      /* save vertex array object state */
-      _mesa_reference_array_object(ctx, &save->ArrayObj,
-                                   ctx->Array.ArrayObj);
-      _mesa_reference_buffer_object(ctx, &save->ArrayBufferObj,
-                                    ctx->Array.ArrayBufferObj);
-      /* set some default state? */
-   }
-
-   if (state & META_VIEWPORT) {
-      /* save viewport state */
-      save->ViewportX = ctx->Viewport.X;
-      save->ViewportY = ctx->Viewport.Y;
-      save->ViewportW = ctx->Viewport.Width;
-      save->ViewportH = ctx->Viewport.Height;
-      /* set viewport to match window size */
-      if (ctx->Viewport.X != 0 ||
-          ctx->Viewport.Y != 0 ||
-          ctx->Viewport.Width != ctx->DrawBuffer->Width ||
-          ctx->Viewport.Height != ctx->DrawBuffer->Height) {
-         _mesa_set_viewport(ctx, 0, 0,
-                            ctx->DrawBuffer->Width, ctx->DrawBuffer->Height);
-      }
-      /* save depth range state */
-      save->DepthNear = ctx->Viewport.Near;
-      save->DepthFar = ctx->Viewport.Far;
-      /* set depth range to default */
-      _mesa_DepthRange(0.0, 1.0);
-   }
-
-   /* misc */
-   {
-      save->Lighting = ctx->Light.Enabled;
-      if (ctx->Light.Enabled)
-         _mesa_set_enable(ctx, GL_LIGHTING, GL_FALSE);
-   }
-}
-
-
-/**
- * Leave meta state.  This is like a light-weight version of glPopAttrib().
- */
-static void
-_mesa_meta_end(struct gl_context *ctx)
-{
-   struct save_state *save = &ctx->Meta->Save[--ctx->Meta->SaveStackDepth];
-   const GLbitfield state = save->SavedState;
-
-   if (state & META_ALPHA_TEST) {
-      if (ctx->Color.AlphaEnabled != save->AlphaEnabled)
-         _mesa_set_enable(ctx, GL_ALPHA_TEST, save->AlphaEnabled);
-      _mesa_AlphaFunc(save->AlphaFunc, save->AlphaRef);
-   }
-
-   if (state & META_BLEND) {
-      if (ctx->Color.BlendEnabled != save->BlendEnabled) {
-         if (ctx->Extensions.EXT_draw_buffers2) {
-            GLuint i;
-            for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
-               _mesa_set_enablei(ctx, GL_BLEND, i, (save->BlendEnabled >> i) & 1);
-            }
-         }
-         else {
-            _mesa_set_enable(ctx, GL_BLEND, (save->BlendEnabled & 1));
-         }
-      }
-      if (ctx->Color.ColorLogicOpEnabled != save->ColorLogicOpEnabled)
-         _mesa_set_enable(ctx, GL_COLOR_LOGIC_OP, save->ColorLogicOpEnabled);
-   }
-
-   if (state & META_COLOR_MASK) {
-      GLuint i;
-      for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
-         if (!TEST_EQ_4V(ctx->Color.ColorMask[i], save->ColorMask[i])) {
-            if (i == 0) {
-               _mesa_ColorMask(save->ColorMask[i][0], save->ColorMask[i][1],
-                               save->ColorMask[i][2], save->ColorMask[i][3]);
-            }
-            else {
-               _mesa_ColorMaskIndexed(i,
-                                      save->ColorMask[i][0],
-                                      save->ColorMask[i][1],
-                                      save->ColorMask[i][2],
-                                      save->ColorMask[i][3]);
-            }
-         }
-      }
-   }
-
-   if (state & META_DEPTH_TEST) {
-      if (ctx->Depth.Test != save->Depth.Test)
-         _mesa_set_enable(ctx, GL_DEPTH_TEST, save->Depth.Test);
-      _mesa_DepthFunc(save->Depth.Func);
-      _mesa_DepthMask(save->Depth.Mask);
-   }
-
-   if (state & META_FOG) {
-      _mesa_set_enable(ctx, GL_FOG, save->Fog);
-   }
-
-   if (state & META_PIXEL_STORE) {
-      ctx->Pack = save->Pack;
-      ctx->Unpack = save->Unpack;
-   }
-
-   if (state & META_PIXEL_TRANSFER) {
-      ctx->Pixel.RedScale = save->RedScale;
-      ctx->Pixel.RedBias = save->RedBias;
-      ctx->Pixel.GreenScale = save->GreenScale;
-      ctx->Pixel.GreenBias = save->GreenBias;
-      ctx->Pixel.BlueScale = save->BlueScale;
-      ctx->Pixel.BlueBias = save->BlueBias;
-      ctx->Pixel.AlphaScale = save->AlphaScale;
-      ctx->Pixel.AlphaBias = save->AlphaBias;
-      ctx->Pixel.MapColorFlag = save->MapColorFlag;
-      /* XXX more state */
-      ctx->NewState |=_NEW_PIXEL;
-   }
-
-   if (state & META_RASTERIZATION) {
-      _mesa_PolygonMode(GL_FRONT, save->FrontPolygonMode);
-      _mesa_PolygonMode(GL_BACK, save->BackPolygonMode);
-      _mesa_set_enable(ctx, GL_POLYGON_STIPPLE, save->PolygonStipple);
-      _mesa_set_enable(ctx, GL_POLYGON_OFFSET_FILL, save->PolygonOffset);
-      _mesa_set_enable(ctx, GL_POLYGON_SMOOTH, save->PolygonSmooth);
-      _mesa_set_enable(ctx, GL_CULL_FACE, save->PolygonCull);
-   }
-
-   if (state & META_SCISSOR) {
-      _mesa_set_enable(ctx, GL_SCISSOR_TEST, save->Scissor.Enabled);
-      _mesa_Scissor(save->Scissor.X, save->Scissor.Y,
-                    save->Scissor.Width, save->Scissor.Height);
-   }
-
-   if (state & META_SHADER) {
-      if (ctx->Extensions.ARB_vertex_program) {
-         _mesa_set_enable(ctx, GL_VERTEX_PROGRAM_ARB,
-                          save->VertexProgramEnabled);
-         _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, 
-                                  save->VertexProgram);
-	 _mesa_reference_vertprog(ctx, &save->VertexProgram, NULL);
-      }
-
-      if (ctx->Extensions.ARB_fragment_program) {
-         _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB,
-                          save->FragmentProgramEnabled);
-         _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
-                                  save->FragmentProgram);
-	 _mesa_reference_fragprog(ctx, &save->FragmentProgram, NULL);
-      }
-
-      if (ctx->Extensions.ARB_vertex_shader)
-	 _mesa_use_shader_program(ctx, GL_VERTEX_SHADER, save->VertexShader);
-
-      if (ctx->Extensions.ARB_geometry_shader4)
-	 _mesa_use_shader_program(ctx, GL_GEOMETRY_SHADER_ARB,
-				  save->GeometryShader);
-
-      if (ctx->Extensions.ARB_fragment_shader)
-	 _mesa_use_shader_program(ctx, GL_FRAGMENT_SHADER,
-				  save->FragmentShader);
-
-      _mesa_reference_shader_program(ctx, &ctx->Shader.ActiveProgram,
-				     save->ActiveShader);
-   }
-
-   if (state & META_STENCIL_TEST) {
-      const struct gl_stencil_attrib *stencil = &save->Stencil;
-
-      _mesa_set_enable(ctx, GL_STENCIL_TEST, stencil->Enabled);
-      _mesa_ClearStencil(stencil->Clear);
-      if (ctx->Extensions.EXT_stencil_two_side) {
-         _mesa_set_enable(ctx, GL_STENCIL_TEST_TWO_SIDE_EXT,
-                          stencil->TestTwoSide);
-         _mesa_ActiveStencilFaceEXT(stencil->ActiveFace
-                                    ? GL_BACK : GL_FRONT);
-      }
-      /* front state */
-      _mesa_StencilFuncSeparate(GL_FRONT,
-                                stencil->Function[0],
-                                stencil->Ref[0],
-                                stencil->ValueMask[0]);
-      _mesa_StencilMaskSeparate(GL_FRONT, stencil->WriteMask[0]);
-      _mesa_StencilOpSeparate(GL_FRONT, stencil->FailFunc[0],
-                              stencil->ZFailFunc[0],
-                              stencil->ZPassFunc[0]);
-      /* back state */
-      _mesa_StencilFuncSeparate(GL_BACK,
-                                stencil->Function[1],
-                                stencil->Ref[1],
-                                stencil->ValueMask[1]);
-      _mesa_StencilMaskSeparate(GL_BACK, stencil->WriteMask[1]);
-      _mesa_StencilOpSeparate(GL_BACK, stencil->FailFunc[1],
-                              stencil->ZFailFunc[1],
-                              stencil->ZPassFunc[1]);
-   }
-
-   if (state & META_TEXTURE) {
-      GLuint u, tgt;
-
-      ASSERT(ctx->Texture.CurrentUnit == 0);
-
-      /* restore texenv for unit[0] */
-      _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, save->EnvMode);
-
-      /* restore texture objects for unit[0] only */
-      for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
-         _mesa_reference_texobj(&ctx->Texture.Unit[0].CurrentTex[tgt],
-                                save->CurrentTexture[tgt]);
-         _mesa_reference_texobj(&save->CurrentTexture[tgt], NULL);
-      }
-
-      /* Re-enable textures, texgen */
-      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
-         if (save->TexEnabled[u]) {
-            _mesa_ActiveTextureARB(GL_TEXTURE0 + u);
-
-            if (save->TexEnabled[u] & TEXTURE_1D_BIT)
-               _mesa_set_enable(ctx, GL_TEXTURE_1D, GL_TRUE);
-            if (save->TexEnabled[u] & TEXTURE_2D_BIT)
-               _mesa_set_enable(ctx, GL_TEXTURE_2D, GL_TRUE);
-            if (save->TexEnabled[u] & TEXTURE_3D_BIT)
-               _mesa_set_enable(ctx, GL_TEXTURE_3D, GL_TRUE);
-            if (save->TexEnabled[u] & TEXTURE_CUBE_BIT)
-               _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_TRUE);
-            if (save->TexEnabled[u] & TEXTURE_RECT_BIT)
-               _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE, GL_TRUE);
-         }
-
-         if (save->TexGenEnabled[u]) {
-            _mesa_ActiveTextureARB(GL_TEXTURE0 + u);
-
-            if (save->TexGenEnabled[u] & S_BIT)
-               _mesa_set_enable(ctx, GL_TEXTURE_GEN_S, GL_TRUE);
-            if (save->TexGenEnabled[u] & T_BIT)
-               _mesa_set_enable(ctx, GL_TEXTURE_GEN_T, GL_TRUE);
-            if (save->TexGenEnabled[u] & R_BIT)
-               _mesa_set_enable(ctx, GL_TEXTURE_GEN_R, GL_TRUE);
-            if (save->TexGenEnabled[u] & Q_BIT)
-               _mesa_set_enable(ctx, GL_TEXTURE_GEN_Q, GL_TRUE);
-         }
-      }
-
-      /* restore current unit state */
-      _mesa_ActiveTextureARB(GL_TEXTURE0 + save->ActiveUnit);
-      _mesa_ClientActiveTextureARB(GL_TEXTURE0 + save->ClientActiveUnit);
-   }
-
-   if (state & META_TRANSFORM) {
-      GLuint activeTexture = ctx->Texture.CurrentUnit;
-      _mesa_ActiveTextureARB(GL_TEXTURE0);
-      _mesa_MatrixMode(GL_TEXTURE);
-      _mesa_LoadMatrixf(save->TextureMatrix);
-      _mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture);
-
-      _mesa_MatrixMode(GL_MODELVIEW);
-      _mesa_LoadMatrixf(save->ModelviewMatrix);
-
-      _mesa_MatrixMode(GL_PROJECTION);
-      _mesa_LoadMatrixf(save->ProjectionMatrix);
-
-      _mesa_MatrixMode(save->MatrixMode);
-
-      if (save->ClipPlanesEnabled) {
-         GLuint i;
-         for (i = 0; i < ctx->Const.MaxClipPlanes; i++) {
-            if (save->ClipPlanesEnabled & (1 << i)) {
-               _mesa_set_enable(ctx, GL_CLIP_PLANE0 + i, GL_TRUE);
-            }
-         }
-      }
-   }
-
-   if (state & META_VERTEX) {
-      /* restore vertex buffer object */
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, save->ArrayBufferObj->Name);
-      _mesa_reference_buffer_object(ctx, &save->ArrayBufferObj, NULL);
-
-      /* restore vertex array object */
-      _mesa_BindVertexArray(save->ArrayObj->Name);
-      _mesa_reference_array_object(ctx, &save->ArrayObj, NULL);
-   }
-
-   if (state & META_VIEWPORT) {
-      if (save->ViewportX != ctx->Viewport.X ||
-          save->ViewportY != ctx->Viewport.Y ||
-          save->ViewportW != ctx->Viewport.Width ||
-          save->ViewportH != ctx->Viewport.Height) {
-         _mesa_set_viewport(ctx, save->ViewportX, save->ViewportY,
-                            save->ViewportW, save->ViewportH);
-      }
-      _mesa_DepthRange(save->DepthNear, save->DepthFar);
-   }
-
-   /* misc */
-   if (save->Lighting) {
-      _mesa_set_enable(ctx, GL_LIGHTING, GL_TRUE);
-   }
-}
-
-
-/**
- * Convert Z from a normalized value in the range [0, 1] to an object-space
- * Z coordinate in [-1, +1] so that drawing at the new Z position with the
- * default/identity ortho projection results in the original Z value.
- * Used by the meta-Clear, Draw/CopyPixels and Bitmap functions where the Z
- * value comes from the clear value or raster position.
- */
-static INLINE GLfloat
-invert_z(GLfloat normZ)
-{
-   GLfloat objZ = 1.0 - 2.0 * normZ;
-   return objZ;
-}
-
-
-/**
- * One-time init for a temp_texture object.
- * Choose tex target, compute max tex size, etc.
- */
-static void
-init_temp_texture(struct gl_context *ctx, struct temp_texture *tex)
-{
-   /* prefer texture rectangle */
-   if (ctx->Extensions.NV_texture_rectangle) {
-      tex->Target = GL_TEXTURE_RECTANGLE;
-      tex->MaxSize = ctx->Const.MaxTextureRectSize;
-      tex->NPOT = GL_TRUE;
-   }
-   else {
-      /* use 2D texture, NPOT if possible */
-      tex->Target = GL_TEXTURE_2D;
-      tex->MaxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-      tex->NPOT = ctx->Extensions.ARB_texture_non_power_of_two;
-   }
-   tex->MinSize = 16;  /* 16 x 16 at least */
-   assert(tex->MaxSize > 0);
-
-   _mesa_GenTextures(1, &tex->TexObj);
-}
-
-
-/**
- * Return pointer to temp_texture info for non-bitmap ops.
- * This does some one-time init if needed.
- */
-static struct temp_texture *
-get_temp_texture(struct gl_context *ctx)
-{
-   struct temp_texture *tex = &ctx->Meta->TempTex;
-
-   if (!tex->TexObj) {
-      init_temp_texture(ctx, tex);
-   }
-
-   return tex;
-}
-
-
-/**
- * Return pointer to temp_texture info for _mesa_meta_bitmap().
- * We use a separate texture for bitmaps to reduce texture
- * allocation/deallocation.
- */
-static struct temp_texture *
-get_bitmap_temp_texture(struct gl_context *ctx)
-{
-   struct temp_texture *tex = &ctx->Meta->Bitmap.Tex;
-
-   if (!tex->TexObj) {
-      init_temp_texture(ctx, tex);
-   }
-
-   return tex;
-}
-
-
-/**
- * Compute the width/height of texture needed to draw an image of the
- * given size.  Return a flag indicating whether the current texture
- * can be re-used (glTexSubImage2D) or if a new texture needs to be
- * allocated (glTexImage2D).
- * Also, compute s/t texcoords for drawing.
- *
- * \return GL_TRUE if new texture is needed, GL_FALSE otherwise
- */
-static GLboolean
-alloc_texture(struct temp_texture *tex,
-              GLsizei width, GLsizei height, GLenum intFormat)
-{
-   GLboolean newTex = GL_FALSE;
-
-   ASSERT(width <= tex->MaxSize);
-   ASSERT(height <= tex->MaxSize);
-
-   if (width > tex->Width ||
-       height > tex->Height ||
-       intFormat != tex->IntFormat) {
-      /* alloc new texture (larger or different format) */
-
-      if (tex->NPOT) {
-         /* use non-power of two size */
-         tex->Width = MAX2(tex->MinSize, width);
-         tex->Height = MAX2(tex->MinSize, height);
-      }
-      else {
-         /* find power of two size */
-         GLsizei w, h;
-         w = h = tex->MinSize;
-         while (w < width)
-            w *= 2;
-         while (h < height)
-            h *= 2;
-         tex->Width = w;
-         tex->Height = h;
-      }
-
-      tex->IntFormat = intFormat;
-
-      newTex = GL_TRUE;
-   }
-
-   /* compute texcoords */
-   if (tex->Target == GL_TEXTURE_RECTANGLE) {
-      tex->Sright = (GLfloat) width;
-      tex->Ttop = (GLfloat) height;
-   }
-   else {
-      tex->Sright = (GLfloat) width / tex->Width;
-      tex->Ttop = (GLfloat) height / tex->Height;
-   }
-
-   return newTex;
-}
-
-
-/**
- * Setup/load texture for glCopyPixels or glBlitFramebuffer.
- */
-static void
-setup_copypix_texture(struct temp_texture *tex,
-                      GLboolean newTex,
-                      GLint srcX, GLint srcY,
-                      GLsizei width, GLsizei height, GLenum intFormat,
-                      GLenum filter)
-{
-   _mesa_BindTexture(tex->Target, tex->TexObj);
-   _mesa_TexParameteri(tex->Target, GL_TEXTURE_MIN_FILTER, filter);
-   _mesa_TexParameteri(tex->Target, GL_TEXTURE_MAG_FILTER, filter);
-   _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-   /* copy framebuffer image to texture */
-   if (newTex) {
-      /* create new tex image */
-      if (tex->Width == width && tex->Height == height) {
-         /* create new tex with framebuffer data */
-         _mesa_CopyTexImage2D(tex->Target, 0, tex->IntFormat,
-                              srcX, srcY, width, height, 0);
-      }
-      else {
-         /* create empty texture */
-         _mesa_TexImage2D(tex->Target, 0, tex->IntFormat,
-                          tex->Width, tex->Height, 0,
-                          intFormat, GL_UNSIGNED_BYTE, NULL);
-         /* load image */
-         _mesa_CopyTexSubImage2D(tex->Target, 0,
-                                 0, 0, srcX, srcY, width, height);
-      }
-   }
-   else {
-      /* replace existing tex image */
-      _mesa_CopyTexSubImage2D(tex->Target, 0,
-                              0, 0, srcX, srcY, width, height);
-   }
-}
-
-
-/**
- * Setup/load texture for glDrawPixels.
- */
-static void
-setup_drawpix_texture(struct gl_context *ctx,
-		      struct temp_texture *tex,
-                      GLboolean newTex,
-                      GLenum texIntFormat,
-                      GLsizei width, GLsizei height,
-                      GLenum format, GLenum type,
-                      const GLvoid *pixels)
-{
-   _mesa_BindTexture(tex->Target, tex->TexObj);
-   _mesa_TexParameteri(tex->Target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-   _mesa_TexParameteri(tex->Target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-   _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-   /* copy pixel data to texture */
-   if (newTex) {
-      /* create new tex image */
-      if (tex->Width == width && tex->Height == height) {
-         /* create new tex and load image data */
-         _mesa_TexImage2D(tex->Target, 0, tex->IntFormat,
-                          tex->Width, tex->Height, 0, format, type, pixels);
-      }
-      else {
-	 struct gl_buffer_object *save_unpack_obj = NULL;
-
-	 _mesa_reference_buffer_object(ctx, &save_unpack_obj,
-				       ctx->Unpack.BufferObj);
-	 _mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-         /* create empty texture */
-         _mesa_TexImage2D(tex->Target, 0, tex->IntFormat,
-                          tex->Width, tex->Height, 0, format, type, NULL);
-	 if (save_unpack_obj != NULL)
-	    _mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB,
-				save_unpack_obj->Name);
-         /* load image */
-         _mesa_TexSubImage2D(tex->Target, 0,
-                             0, 0, width, height, format, type, pixels);
-      }
-   }
-   else {
-      /* replace existing tex image */
-      _mesa_TexSubImage2D(tex->Target, 0,
-                          0, 0, width, height, format, type, pixels);
-   }
-}
-
-
-
-/**
- * One-time init for drawing depth pixels.
- */
-static void
-init_blit_depth_pixels(struct gl_context *ctx)
-{
-   static const char *program =
-      "!!ARBfp1.0\n"
-      "TEX result.depth, fragment.texcoord[0], texture[0], %s; \n"
-      "END \n";
-   char program2[200];
-   struct blit_state *blit = &ctx->Meta->Blit;
-   struct temp_texture *tex = get_temp_texture(ctx);
-   const char *texTarget;
-
-   assert(blit->DepthFP == 0);
-
-   /* replace %s with "RECT" or "2D" */
-   assert(strlen(program) + 4 < sizeof(program2));
-   if (tex->Target == GL_TEXTURE_RECTANGLE)
-      texTarget = "RECT";
-   else
-      texTarget = "2D";
-   _mesa_snprintf(program2, sizeof(program2), program, texTarget);
-
-   _mesa_GenPrograms(1, &blit->DepthFP);
-   _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
-   _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
-                          strlen(program2), (const GLubyte *) program2);
-}
-
-
-/**
- * Try to do a glBlitFramebuffer using no-copy texturing.
- * We can do this when the src renderbuffer is actually a texture.
- * But if the src buffer == dst buffer we cannot do this.
- *
- * \return new buffer mask indicating the buffers left to blit using the
- *         normal path.
- */
-static GLbitfield
-blitframebuffer_texture(struct gl_context *ctx,
-                        GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                        GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                        GLbitfield mask, GLenum filter)
-{
-   if (mask & GL_COLOR_BUFFER_BIT) {
-      const struct gl_framebuffer *drawFb = ctx->DrawBuffer;
-      const struct gl_framebuffer *readFb = ctx->ReadBuffer;
-      const struct gl_renderbuffer_attachment *drawAtt =
-         &drawFb->Attachment[drawFb->_ColorDrawBufferIndexes[0]];
-      const struct gl_renderbuffer_attachment *readAtt =
-         &readFb->Attachment[readFb->_ColorReadBufferIndex];
-
-      if (readAtt && readAtt->Texture) {
-         const struct gl_texture_object *texObj = readAtt->Texture;
-         const GLuint srcLevel = readAtt->TextureLevel;
-         const GLenum minFilterSave = texObj->MinFilter;
-         const GLenum magFilterSave = texObj->MagFilter;
-         const GLint baseLevelSave = texObj->BaseLevel;
-         const GLint maxLevelSave = texObj->MaxLevel;
-         const GLenum wrapSSave = texObj->WrapS;
-         const GLenum wrapTSave = texObj->WrapT;
-         const GLenum target = texObj->Target;
-
-         if (drawAtt->Texture == readAtt->Texture) {
-            /* Can't use same texture as both the source and dest.  We need
-             * to handle overlapping blits and besides, some hw may not
-             * support this.
-             */
-            return mask;
-         }
-
-         if (target != GL_TEXTURE_2D && target != GL_TEXTURE_RECTANGLE_ARB) {
-            /* Can't handle other texture types at this time */
-            return mask;
-         }
-
-         /*
-         printf("Blit from texture!\n");
-         printf("  srcAtt %p  dstAtt %p\n", readAtt, drawAtt);
-         printf("  srcTex %p  dstText %p\n", texObj, drawAtt->Texture);
-         */
-
-         /* Prepare src texture state */
-         _mesa_BindTexture(target, texObj->Name);
-         _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, filter);
-         _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, filter);
-         if (target != GL_TEXTURE_RECTANGLE_ARB) {
-            _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, srcLevel);
-            _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, srcLevel);
-         }
-         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-         _mesa_set_enable(ctx, target, GL_TRUE);
-
-         /* Prepare vertex data (the VBO was previously created and bound) */
-         {
-            struct vertex {
-               GLfloat x, y, s, t;
-            };
-            struct vertex verts[4];
-            GLfloat s0, t0, s1, t1;
-
-            if (target == GL_TEXTURE_2D) {
-               const struct gl_texture_image *texImage
-                   = _mesa_select_tex_image(ctx, texObj, target, srcLevel);
-               s0 = srcX0 / (float) texImage->Width;
-               s1 = srcX1 / (float) texImage->Width;
-               t0 = srcY0 / (float) texImage->Height;
-               t1 = srcY1 / (float) texImage->Height;
-            }
-            else {
-               assert(target == GL_TEXTURE_RECTANGLE_ARB);
-               s0 = srcX0;
-               s1 = srcX1;
-               t0 = srcY0;
-               t1 = srcY1;
-            }
-
-            verts[0].x = (GLfloat) dstX0;
-            verts[0].y = (GLfloat) dstY0;
-            verts[1].x = (GLfloat) dstX1;
-            verts[1].y = (GLfloat) dstY0;
-            verts[2].x = (GLfloat) dstX1;
-            verts[2].y = (GLfloat) dstY1;
-            verts[3].x = (GLfloat) dstX0;
-            verts[3].y = (GLfloat) dstY1;
-
-            verts[0].s = s0;
-            verts[0].t = t0;
-            verts[1].s = s1;
-            verts[1].t = t0;
-            verts[2].s = s1;
-            verts[2].t = t1;
-            verts[3].s = s0;
-            verts[3].t = t1;
-
-            _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
-         }
-
-         _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-         /* Restore texture object state, the texture binding will
-          * be restored by _mesa_meta_end().
-          */
-         _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, minFilterSave);
-         _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, magFilterSave);
-         if (target != GL_TEXTURE_RECTANGLE_ARB) {
-            _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, baseLevelSave);
-            _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, maxLevelSave);
-         }
-         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, wrapSSave);
-         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, wrapTSave);
-
-         /* Done with color buffer */
-         mask &= ~GL_COLOR_BUFFER_BIT;
-      }
-   }
-
-   return mask;
-}
-
-
-/**
- * Meta implementation of ctx->Driver.BlitFramebuffer() in terms
- * of texture mapping and polygon rendering.
- */
-void
-_mesa_meta_BlitFramebuffer(struct gl_context *ctx,
-                           GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                           GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                           GLbitfield mask, GLenum filter)
-{
-   struct blit_state *blit = &ctx->Meta->Blit;
-   struct temp_texture *tex = get_temp_texture(ctx);
-   const GLsizei maxTexSize = tex->MaxSize;
-   const GLint srcX = MIN2(srcX0, srcX1);
-   const GLint srcY = MIN2(srcY0, srcY1);
-   const GLint srcW = abs(srcX1 - srcX0);
-   const GLint srcH = abs(srcY1 - srcY0);
-   const GLboolean srcFlipX = srcX1 < srcX0;
-   const GLboolean srcFlipY = srcY1 < srcY0;
-   struct vertex {
-      GLfloat x, y, s, t;
-   };
-   struct vertex verts[4];
-   GLboolean newTex;
-
-   if (srcW > maxTexSize || srcH > maxTexSize) {
-      /* XXX avoid this fallback */
-      _swrast_BlitFramebuffer(ctx, srcX0, srcY0, srcX1, srcY1,
-                              dstX0, dstY0, dstX1, dstY1, mask, filter);
-      return;
-   }
-
-   if (srcFlipX) {
-      GLint tmp = dstX0;
-      dstX0 = dstX1;
-      dstX1 = tmp;
-   }
-
-   if (srcFlipY) {
-      GLint tmp = dstY0;
-      dstY0 = dstY1;
-      dstY1 = tmp;
-   }
-
-   /* only scissor effects blit so save/clear all other relevant state */
-   _mesa_meta_begin(ctx, ~META_SCISSOR);
-
-   if (blit->ArrayObj == 0) {
-      /* one-time setup */
-
-      /* create vertex array object */
-      _mesa_GenVertexArrays(1, &blit->ArrayObj);
-      _mesa_BindVertexArray(blit->ArrayObj);
-
-      /* create vertex array buffer */
-      _mesa_GenBuffersARB(1, &blit->VBO);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO);
-      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
-                          NULL, GL_DYNAMIC_DRAW_ARB);
-
-      /* setup vertex arrays */
-      _mesa_VertexPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
-      _mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(s));
-      _mesa_EnableClientState(GL_VERTEX_ARRAY);
-      _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);
-   }
-   else {
-      _mesa_BindVertexArray(blit->ArrayObj);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO);
-   }
-
-   /* Try faster, direct texture approach first */
-   mask = blitframebuffer_texture(ctx, srcX0, srcY0, srcX1, srcY1,
-                                  dstX0, dstY0, dstX1, dstY1, mask, filter);
-   if (mask == 0x0) {
-      _mesa_meta_end(ctx);
-      return;
-   }
-
-   /* Continue with "normal" approach which involves copying the src rect
-    * into a temporary texture and is "blitted" by drawing a textured quad.
-    */
-
-   newTex = alloc_texture(tex, srcW, srcH, GL_RGBA);
-
-   /* vertex positions/texcoords (after texture allocation!) */
-   {
-      verts[0].x = (GLfloat) dstX0;
-      verts[0].y = (GLfloat) dstY0;
-      verts[1].x = (GLfloat) dstX1;
-      verts[1].y = (GLfloat) dstY0;
-      verts[2].x = (GLfloat) dstX1;
-      verts[2].y = (GLfloat) dstY1;
-      verts[3].x = (GLfloat) dstX0;
-      verts[3].y = (GLfloat) dstY1;
-
-      verts[0].s = 0.0F;
-      verts[0].t = 0.0F;
-      verts[1].s = tex->Sright;
-      verts[1].t = 0.0F;
-      verts[2].s = tex->Sright;
-      verts[2].t = tex->Ttop;
-      verts[3].s = 0.0F;
-      verts[3].t = tex->Ttop;
-
-      /* upload new vertex data */
-      _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
-   }
-
-   _mesa_set_enable(ctx, tex->Target, GL_TRUE);
-
-   if (mask & GL_COLOR_BUFFER_BIT) {
-      setup_copypix_texture(tex, newTex, srcX, srcY, srcW, srcH,
-                            GL_RGBA, filter);
-      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-      mask &= ~GL_COLOR_BUFFER_BIT;
-   }
-
-   if (mask & GL_DEPTH_BUFFER_BIT) {
-      GLuint *tmp = (GLuint *) malloc(srcW * srcH * sizeof(GLuint));
-      if (tmp) {
-         if (!blit->DepthFP)
-            init_blit_depth_pixels(ctx);
-
-         /* maybe change tex format here */
-         newTex = alloc_texture(tex, srcW, srcH, GL_DEPTH_COMPONENT);
-
-         _mesa_ReadPixels(srcX, srcY, srcW, srcH,
-                          GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp);
-
-         setup_drawpix_texture(ctx, tex, newTex, GL_DEPTH_COMPONENT, srcW, srcH,
-                               GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp);
-
-         _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
-         _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);
-         _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-         _mesa_set_enable(ctx, GL_DEPTH_TEST, GL_TRUE);
-         _mesa_DepthFunc(GL_ALWAYS);
-         _mesa_DepthMask(GL_TRUE);
-
-         _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-         mask &= ~GL_DEPTH_BUFFER_BIT;
-
-         free(tmp);
-      }
-   }
-
-   if (mask & GL_STENCIL_BUFFER_BIT) {
-      /* XXX can't easily do stencil */
-   }
-
-   _mesa_set_enable(ctx, tex->Target, GL_FALSE);
-
-   _mesa_meta_end(ctx);
-
-   if (mask) {
-      _swrast_BlitFramebuffer(ctx, srcX0, srcY0, srcX1, srcY1,
-                              dstX0, dstY0, dstX1, dstY1, mask, filter);
-   }
-}
-
-
-/**
- * Meta implementation of ctx->Driver.Clear() in terms of polygon rendering.
- */
-void
-_mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers)
-{
-   struct clear_state *clear = &ctx->Meta->Clear;
-   struct vertex {
-      GLfloat x, y, z, r, g, b, a;
-   };
-   struct vertex verts[4];
-   /* save all state but scissor, pixel pack/unpack */
-   GLbitfield metaSave = META_ALL - META_SCISSOR - META_PIXEL_STORE;
-   const GLuint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;
-
-   if (buffers & BUFFER_BITS_COLOR) {
-      /* if clearing color buffers, don't save/restore colormask */
-      metaSave -= META_COLOR_MASK;
-   }
-
-   _mesa_meta_begin(ctx, metaSave);
-
-   if (clear->ArrayObj == 0) {
-      /* one-time setup */
-
-      /* create vertex array object */
-      _mesa_GenVertexArrays(1, &clear->ArrayObj);
-      _mesa_BindVertexArray(clear->ArrayObj);
-
-      /* create vertex array buffer */
-      _mesa_GenBuffersARB(1, &clear->VBO);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
-
-      /* setup vertex arrays */
-      _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
-      _mesa_ColorPointer(4, GL_FLOAT, sizeof(struct vertex), OFFSET(r));
-      _mesa_EnableClientState(GL_VERTEX_ARRAY);
-      _mesa_EnableClientState(GL_COLOR_ARRAY);
-   }
-   else {
-      _mesa_BindVertexArray(clear->ArrayObj);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
-   }
-
-   /* GL_COLOR_BUFFER_BIT */
-   if (buffers & BUFFER_BITS_COLOR) {
-      /* leave colormask, glDrawBuffer state as-is */
-   }
-   else {
-      ASSERT(metaSave & META_COLOR_MASK);
-      _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-   }
-
-   /* GL_DEPTH_BUFFER_BIT */
-   if (buffers & BUFFER_BIT_DEPTH) {
-      _mesa_set_enable(ctx, GL_DEPTH_TEST, GL_TRUE);
-      _mesa_DepthFunc(GL_ALWAYS);
-      _mesa_DepthMask(GL_TRUE);
-   }
-   else {
-      assert(!ctx->Depth.Test);
-   }
-
-   /* GL_STENCIL_BUFFER_BIT */
-   if (buffers & BUFFER_BIT_STENCIL) {
-      _mesa_set_enable(ctx, GL_STENCIL_TEST, GL_TRUE);
-      _mesa_StencilOpSeparate(GL_FRONT_AND_BACK,
-                              GL_REPLACE, GL_REPLACE, GL_REPLACE);
-      _mesa_StencilFuncSeparate(GL_FRONT_AND_BACK, GL_ALWAYS,
-                                ctx->Stencil.Clear & stencilMax,
-                                ctx->Stencil.WriteMask[0]);
-   }
-   else {
-      assert(!ctx->Stencil.Enabled);
-   }
-
-   /* vertex positions/colors */
-   {
-      const GLfloat x0 = (GLfloat) ctx->DrawBuffer->_Xmin;
-      const GLfloat y0 = (GLfloat) ctx->DrawBuffer->_Ymin;
-      const GLfloat x1 = (GLfloat) ctx->DrawBuffer->_Xmax;
-      const GLfloat y1 = (GLfloat) ctx->DrawBuffer->_Ymax;
-      const GLfloat z = invert_z(ctx->Depth.Clear);
-      GLuint i;
-
-      verts[0].x = x0;
-      verts[0].y = y0;
-      verts[0].z = z;
-      verts[1].x = x1;
-      verts[1].y = y0;
-      verts[1].z = z;
-      verts[2].x = x1;
-      verts[2].y = y1;
-      verts[2].z = z;
-      verts[3].x = x0;
-      verts[3].y = y1;
-      verts[3].z = z;
-
-      /* vertex colors */
-      for (i = 0; i < 4; i++) {
-         verts[i].r = ctx->Color.ClearColor[0];
-         verts[i].g = ctx->Color.ClearColor[1];
-         verts[i].b = ctx->Color.ClearColor[2];
-         verts[i].a = ctx->Color.ClearColor[3];
-      }
-
-      /* upload new vertex data */
-      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts,
-			  GL_DYNAMIC_DRAW_ARB);
-   }
-
-   /* draw quad */
-   _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-   _mesa_meta_end(ctx);
-}
-
-
-/**
- * Meta implementation of ctx->Driver.CopyPixels() in terms
- * of texture mapping and polygon rendering.
- */
-void
-_mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY,
-                      GLsizei width, GLsizei height,
-                      GLint dstX, GLint dstY, GLenum type)
-{
-   struct copypix_state *copypix = &ctx->Meta->CopyPix;
-   struct temp_texture *tex = get_temp_texture(ctx);
-   struct vertex {
-      GLfloat x, y, z, s, t;
-   };
-   struct vertex verts[4];
-   GLboolean newTex;
-   GLenum intFormat = GL_RGBA;
-
-   if (type != GL_COLOR ||
-       ctx->_ImageTransferState ||
-       ctx->Fog.Enabled ||
-       width > tex->MaxSize ||
-       height > tex->MaxSize) {
-      /* XXX avoid this fallback */
-      _swrast_CopyPixels(ctx, srcX, srcY, width, height, dstX, dstY, type);
-      return;
-   }
-
-   /* Most GL state applies to glCopyPixels, but a there's a few things
-    * we need to override:
-    */
-   _mesa_meta_begin(ctx, (META_RASTERIZATION |
-                          META_SHADER |
-                          META_TEXTURE |
-                          META_TRANSFORM |
-                          META_VERTEX |
-                          META_VIEWPORT));
-
-   if (copypix->ArrayObj == 0) {
-      /* one-time setup */
-
-      /* create vertex array object */
-      _mesa_GenVertexArrays(1, &copypix->ArrayObj);
-      _mesa_BindVertexArray(copypix->ArrayObj);
-
-      /* create vertex array buffer */
-      _mesa_GenBuffersARB(1, &copypix->VBO);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO);
-      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
-                          NULL, GL_DYNAMIC_DRAW_ARB);
-
-      /* setup vertex arrays */
-      _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
-      _mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(s));
-      _mesa_EnableClientState(GL_VERTEX_ARRAY);
-      _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);
-   }
-   else {
-      _mesa_BindVertexArray(copypix->ArrayObj);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO);
-   }
-
-   newTex = alloc_texture(tex, width, height, intFormat);
-
-   /* vertex positions, texcoords (after texture allocation!) */
-   {
-      const GLfloat dstX0 = (GLfloat) dstX;
-      const GLfloat dstY0 = (GLfloat) dstY;
-      const GLfloat dstX1 = dstX + width * ctx->Pixel.ZoomX;
-      const GLfloat dstY1 = dstY + height * ctx->Pixel.ZoomY;
-      const GLfloat z = invert_z(ctx->Current.RasterPos[2]);
-
-      verts[0].x = dstX0;
-      verts[0].y = dstY0;
-      verts[0].z = z;
-      verts[0].s = 0.0F;
-      verts[0].t = 0.0F;
-      verts[1].x = dstX1;
-      verts[1].y = dstY0;
-      verts[1].z = z;
-      verts[1].s = tex->Sright;
-      verts[1].t = 0.0F;
-      verts[2].x = dstX1;
-      verts[2].y = dstY1;
-      verts[2].z = z;
-      verts[2].s = tex->Sright;
-      verts[2].t = tex->Ttop;
-      verts[3].x = dstX0;
-      verts[3].y = dstY1;
-      verts[3].z = z;
-      verts[3].s = 0.0F;
-      verts[3].t = tex->Ttop;
-
-      /* upload new vertex data */
-      _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
-   }
-
-   /* Alloc/setup texture */
-   setup_copypix_texture(tex, newTex, srcX, srcY, width, height,
-                         GL_RGBA, GL_NEAREST);
-
-   _mesa_set_enable(ctx, tex->Target, GL_TRUE);
-
-   /* draw textured quad */
-   _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-   _mesa_set_enable(ctx, tex->Target, GL_FALSE);
-
-   _mesa_meta_end(ctx);
-}
-
-
-
-/**
- * When the glDrawPixels() image size is greater than the max rectangle
- * texture size we use this function to break the glDrawPixels() image
- * into tiles which fit into the max texture size.
- */
-static void
-tiled_draw_pixels(struct gl_context *ctx,
-                  GLint tileSize,
-                  GLint x, GLint y, GLsizei width, GLsizei height,
-                  GLenum format, GLenum type,
-                  const struct gl_pixelstore_attrib *unpack,
-                  const GLvoid *pixels)
-{
-   struct gl_pixelstore_attrib tileUnpack = *unpack;
-   GLint i, j;
-
-   if (tileUnpack.RowLength == 0)
-      tileUnpack.RowLength = width;
-
-   for (i = 0; i < width; i += tileSize) {
-      const GLint tileWidth = MIN2(tileSize, width - i);
-      const GLint tileX = (GLint) (x + i * ctx->Pixel.ZoomX);
-
-      tileUnpack.SkipPixels = unpack->SkipPixels + i;
-
-      for (j = 0; j < height; j += tileSize) {
-         const GLint tileHeight = MIN2(tileSize, height - j);
-         const GLint tileY = (GLint) (y + j * ctx->Pixel.ZoomY);
-
-         tileUnpack.SkipRows = unpack->SkipRows + j;
-
-         _mesa_meta_DrawPixels(ctx, tileX, tileY, tileWidth, tileHeight,
-                               format, type, &tileUnpack, pixels);
-      }
-   }
-}
-
-
-/**
- * One-time init for drawing stencil pixels.
- */
-static void
-init_draw_stencil_pixels(struct gl_context *ctx)
-{
-   /* This program is run eight times, once for each stencil bit.
-    * The stencil values to draw are found in an 8-bit alpha texture.
-    * We read the texture/stencil value and test if bit 'b' is set.
-    * If the bit is not set, use KIL to kill the fragment.
-    * Finally, we use the stencil test to update the stencil buffer.
-    *
-    * The basic algorithm for checking if a bit is set is:
-    *   if (is_odd(value / (1 << bit)))
-    *      result is one (or non-zero).
-    *   else
-    *      result is zero.
-    * The program parameter contains three values:
-    *   parm.x = 255 / (1 << bit)
-    *   parm.y = 0.5
-    *   parm.z = 0.0
-    */
-   static const char *program =
-      "!!ARBfp1.0\n"
-      "PARAM parm = program.local[0]; \n"
-      "TEMP t; \n"
-      "TEX t, fragment.texcoord[0], texture[0], %s; \n"   /* NOTE %s here! */
-      "# t = t * 255 / bit \n"
-      "MUL t.x, t.a, parm.x; \n"
-      "# t = (int) t \n"
-      "FRC t.y, t.x; \n"
-      "SUB t.x, t.x, t.y; \n"
-      "# t = t * 0.5 \n"
-      "MUL t.x, t.x, parm.y; \n"
-      "# t = fract(t.x) \n"
-      "FRC t.x, t.x; # if t.x != 0, then the bit is set \n"
-      "# t.x = (t.x == 0 ? 1 : 0) \n"
-      "SGE t.x, -t.x, parm.z; \n"
-      "KIL -t.x; \n"
-      "# for debug only \n"
-      "#MOV result.color, t.x; \n"
-      "END \n";
-   char program2[1000];
-   struct drawpix_state *drawpix = &ctx->Meta->DrawPix;
-   struct temp_texture *tex = get_temp_texture(ctx);
-   const char *texTarget;
-
-   assert(drawpix->StencilFP == 0);
-
-   /* replace %s with "RECT" or "2D" */
-   assert(strlen(program) + 4 < sizeof(program2));
-   if (tex->Target == GL_TEXTURE_RECTANGLE)
-      texTarget = "RECT";
-   else
-      texTarget = "2D";
-   _mesa_snprintf(program2, sizeof(program2), program, texTarget);
-
-   _mesa_GenPrograms(1, &drawpix->StencilFP);
-   _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
-   _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
-                          strlen(program2), (const GLubyte *) program2);
-}
-
-
-/**
- * One-time init for drawing depth pixels.
- */
-static void
-init_draw_depth_pixels(struct gl_context *ctx)
-{
-   static const char *program =
-      "!!ARBfp1.0\n"
-      "PARAM color = program.local[0]; \n"
-      "TEX result.depth, fragment.texcoord[0], texture[0], %s; \n"
-      "MOV result.color, color; \n"
-      "END \n";
-   char program2[200];
-   struct drawpix_state *drawpix = &ctx->Meta->DrawPix;
-   struct temp_texture *tex = get_temp_texture(ctx);
-   const char *texTarget;
-
-   assert(drawpix->DepthFP == 0);
-
-   /* replace %s with "RECT" or "2D" */
-   assert(strlen(program) + 4 < sizeof(program2));
-   if (tex->Target == GL_TEXTURE_RECTANGLE)
-      texTarget = "RECT";
-   else
-      texTarget = "2D";
-   _mesa_snprintf(program2, sizeof(program2), program, texTarget);
-
-   _mesa_GenPrograms(1, &drawpix->DepthFP);
-   _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
-   _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
-                          strlen(program2), (const GLubyte *) program2);
-}
-
-
-/**
- * Meta implementation of ctx->Driver.DrawPixels() in terms
- * of texture mapping and polygon rendering.
- */
-void
-_mesa_meta_DrawPixels(struct gl_context *ctx,
-                      GLint x, GLint y, GLsizei width, GLsizei height,
-                      GLenum format, GLenum type,
-                      const struct gl_pixelstore_attrib *unpack,
-                      const GLvoid *pixels)
-{
-   struct drawpix_state *drawpix = &ctx->Meta->DrawPix;
-   struct temp_texture *tex = get_temp_texture(ctx);
-   const struct gl_pixelstore_attrib unpackSave = ctx->Unpack;
-   const GLuint origStencilMask = ctx->Stencil.WriteMask[0];
-   struct vertex {
-      GLfloat x, y, z, s, t;
-   };
-   struct vertex verts[4];
-   GLenum texIntFormat;
-   GLboolean fallback, newTex;
-   GLbitfield metaExtraSave = 0x0;
-   GLuint vbo;
-
-   /*
-    * Determine if we can do the glDrawPixels with texture mapping.
-    */
-   fallback = GL_FALSE;
-   if (ctx->_ImageTransferState ||
-       ctx->Fog.Enabled) {
-      fallback = GL_TRUE;
-   }
-
-   if (_mesa_is_color_format(format)) {
-      /* use more compact format when possible */
-      /* XXX disable special case for GL_LUMINANCE for now to work around
-       * apparent i965 driver bug (see bug #23670).
-       */
-      if (/*format == GL_LUMINANCE ||*/ format == GL_LUMINANCE_ALPHA)
-         texIntFormat = format;
-      else
-         texIntFormat = GL_RGBA;
-   }
-   else if (_mesa_is_stencil_format(format)) {
-      if (ctx->Extensions.ARB_fragment_program &&
-          ctx->Pixel.IndexShift == 0 &&
-          ctx->Pixel.IndexOffset == 0 &&
-          type == GL_UNSIGNED_BYTE) {
-         /* We'll store stencil as alpha.  This only works for GLubyte
-          * image data because of how incoming values are mapped to alpha
-          * in [0,1].
-          */
-         texIntFormat = GL_ALPHA;
-         metaExtraSave = (META_COLOR_MASK |
-                          META_DEPTH_TEST |
-                          META_SHADER |
-                          META_STENCIL_TEST);
-      }
-      else {
-         fallback = GL_TRUE;
-      }
-   }
-   else if (_mesa_is_depth_format(format)) {
-      if (ctx->Extensions.ARB_depth_texture &&
-          ctx->Extensions.ARB_fragment_program) {
-         texIntFormat = GL_DEPTH_COMPONENT;
-         metaExtraSave = (META_SHADER);
-      }
-      else {
-         fallback = GL_TRUE;
-      }
-   }
-   else {
-      fallback = GL_TRUE;
-   }
-
-   if (fallback) {
-      _swrast_DrawPixels(ctx, x, y, width, height,
-                         format, type, unpack, pixels);
-      return;
-   }
-
-   /*
-    * Check image size against max texture size, draw as tiles if needed.
-    */
-   if (width > tex->MaxSize || height > tex->MaxSize) {
-      tiled_draw_pixels(ctx, tex->MaxSize, x, y, width, height,
-                        format, type, unpack, pixels);
-      return;
-   }
-
-   /* Most GL state applies to glDrawPixels (like blending, stencil, etc),
-    * but a there's a few things we need to override:
-    */
-   _mesa_meta_begin(ctx, (META_RASTERIZATION |
-                          META_SHADER |
-                          META_TEXTURE |
-                          META_TRANSFORM |
-                          META_VERTEX |
-                          META_VIEWPORT |
-                          metaExtraSave));
-
-   newTex = alloc_texture(tex, width, height, texIntFormat);
-
-   /* vertex positions, texcoords (after texture allocation!) */
-   {
-      const GLfloat x0 = (GLfloat) x;
-      const GLfloat y0 = (GLfloat) y;
-      const GLfloat x1 = x + width * ctx->Pixel.ZoomX;
-      const GLfloat y1 = y + height * ctx->Pixel.ZoomY;
-      const GLfloat z = invert_z(ctx->Current.RasterPos[2]);
-
-      verts[0].x = x0;
-      verts[0].y = y0;
-      verts[0].z = z;
-      verts[0].s = 0.0F;
-      verts[0].t = 0.0F;
-      verts[1].x = x1;
-      verts[1].y = y0;
-      verts[1].z = z;
-      verts[1].s = tex->Sright;
-      verts[1].t = 0.0F;
-      verts[2].x = x1;
-      verts[2].y = y1;
-      verts[2].z = z;
-      verts[2].s = tex->Sright;
-      verts[2].t = tex->Ttop;
-      verts[3].x = x0;
-      verts[3].y = y1;
-      verts[3].z = z;
-      verts[3].s = 0.0F;
-      verts[3].t = tex->Ttop;
-   }
-
-   if (drawpix->ArrayObj == 0) {
-      /* one-time setup: create vertex array object */
-      _mesa_GenVertexArrays(1, &drawpix->ArrayObj);
-   }
-   _mesa_BindVertexArray(drawpix->ArrayObj);
-
-   /* create vertex array buffer */
-   _mesa_GenBuffersARB(1, &vbo);
-   _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, vbo);
-   _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
-                       verts, GL_DYNAMIC_DRAW_ARB);
-
-   /* setup vertex arrays */
-   _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
-   _mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(s));
-   _mesa_EnableClientState(GL_VERTEX_ARRAY);
-   _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);
-
-   /* set given unpack params */
-   ctx->Unpack = *unpack;
-
-   _mesa_set_enable(ctx, tex->Target, GL_TRUE);
-
-   if (_mesa_is_stencil_format(format)) {
-      /* Drawing stencil */
-      GLint bit;
-
-      if (!drawpix->StencilFP)
-         init_draw_stencil_pixels(ctx);
-
-      setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,
-                            GL_ALPHA, type, pixels);
-
-      _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-
-      _mesa_set_enable(ctx, GL_STENCIL_TEST, GL_TRUE);
-
-      /* set all stencil bits to 0 */
-      _mesa_StencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);
-      _mesa_StencilFunc(GL_ALWAYS, 0, 255);
-      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-  
-      /* set stencil bits to 1 where needed */
-      _mesa_StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
-
-      _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
-      _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);
-
-      for (bit = 0; bit < ctx->DrawBuffer->Visual.stencilBits; bit++) {
-         const GLuint mask = 1 << bit;
-         if (mask & origStencilMask) {
-            _mesa_StencilFunc(GL_ALWAYS, mask, mask);
-            _mesa_StencilMask(mask);
-
-            _mesa_ProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, 0,
-                                             255.0 / mask, 0.5, 0.0, 0.0);
-
-            _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-         }
-      }
-   }
-   else if (_mesa_is_depth_format(format)) {
-      /* Drawing depth */
-      if (!drawpix->DepthFP)
-         init_draw_depth_pixels(ctx);
-
-      _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
-      _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);
-
-      /* polygon color = current raster color */
-      _mesa_ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, 0,
-                                        ctx->Current.RasterColor);
-
-      setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,
-                            format, type, pixels);
-
-      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-   }
-   else {
-      /* Drawing RGBA */
-      setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,
-                            format, type, pixels);
-      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-   }
-
-   _mesa_set_enable(ctx, tex->Target, GL_FALSE);
-
-   _mesa_DeleteBuffersARB(1, &vbo);
-
-   /* restore unpack params */
-   ctx->Unpack = unpackSave;
-
-   _mesa_meta_end(ctx);
-}
-
-static GLboolean
-alpha_test_raster_color(struct gl_context *ctx)
-{
-   GLfloat alpha = ctx->Current.RasterColor[ACOMP];
-   GLfloat ref = ctx->Color.AlphaRef;
-
-   switch (ctx->Color.AlphaFunc) {
-      case GL_NEVER:
-	 return GL_FALSE;
-      case GL_LESS:
-	 return alpha < ref;
-      case GL_EQUAL:
-	 return alpha == ref;
-      case GL_LEQUAL:
-	 return alpha <= ref;
-      case GL_GREATER:
-	 return alpha > ref;
-      case GL_NOTEQUAL:
-	 return alpha != ref;
-      case GL_GEQUAL:
-	 return alpha >= ref;
-      case GL_ALWAYS:
-	 return GL_TRUE;
-      default:
-	 assert(0);
-	 return GL_FALSE;
-   }
-}
-
-/**
- * Do glBitmap with a alpha texture quad.  Use the alpha test to cull
- * the 'off' bits.  A bitmap cache as in the gallium/mesa state
- * tracker would improve performance a lot.
- */
-void
-_mesa_meta_Bitmap(struct gl_context *ctx,
-                  GLint x, GLint y, GLsizei width, GLsizei height,
-                  const struct gl_pixelstore_attrib *unpack,
-                  const GLubyte *bitmap1)
-{
-   struct bitmap_state *bitmap = &ctx->Meta->Bitmap;
-   struct temp_texture *tex = get_bitmap_temp_texture(ctx);
-   const GLenum texIntFormat = GL_ALPHA;
-   const struct gl_pixelstore_attrib unpackSave = *unpack;
-   GLubyte fg, bg;
-   struct vertex {
-      GLfloat x, y, z, s, t, r, g, b, a;
-   };
-   struct vertex verts[4];
-   GLboolean newTex;
-   GLubyte *bitmap8;
-
-   /*
-    * Check if swrast fallback is needed.
-    */
-   if (ctx->_ImageTransferState ||
-       ctx->FragmentProgram._Enabled ||
-       ctx->Fog.Enabled ||
-       ctx->Texture._EnabledUnits ||
-       width > tex->MaxSize ||
-       height > tex->MaxSize) {
-      _swrast_Bitmap(ctx, x, y, width, height, unpack, bitmap1);
-      return;
-   }
-
-   if (ctx->Color.AlphaEnabled && !alpha_test_raster_color(ctx))
-      return;
-
-   /* Most GL state applies to glBitmap (like blending, stencil, etc),
-    * but a there's a few things we need to override:
-    */
-   _mesa_meta_begin(ctx, (META_ALPHA_TEST |
-                          META_PIXEL_STORE |
-                          META_RASTERIZATION |
-                          META_SHADER |
-                          META_TEXTURE |
-                          META_TRANSFORM |
-                          META_VERTEX |
-                          META_VIEWPORT));
-
-   if (bitmap->ArrayObj == 0) {
-      /* one-time setup */
-
-      /* create vertex array object */
-      _mesa_GenVertexArraysAPPLE(1, &bitmap->ArrayObj);
-      _mesa_BindVertexArrayAPPLE(bitmap->ArrayObj);
-
-      /* create vertex array buffer */
-      _mesa_GenBuffersARB(1, &bitmap->VBO);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO);
-      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
-                          NULL, GL_DYNAMIC_DRAW_ARB);
-
-      /* setup vertex arrays */
-      _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
-      _mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(s));
-      _mesa_ColorPointer(4, GL_FLOAT, sizeof(struct vertex), OFFSET(r));
-      _mesa_EnableClientState(GL_VERTEX_ARRAY);
-      _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);
-      _mesa_EnableClientState(GL_COLOR_ARRAY);
-   }
-   else {
-      _mesa_BindVertexArray(bitmap->ArrayObj);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO);
-   }
-
-   newTex = alloc_texture(tex, width, height, texIntFormat);
-
-   /* vertex positions, texcoords, colors (after texture allocation!) */
-   {
-      const GLfloat x0 = (GLfloat) x;
-      const GLfloat y0 = (GLfloat) y;
-      const GLfloat x1 = (GLfloat) (x + width);
-      const GLfloat y1 = (GLfloat) (y + height);
-      const GLfloat z = invert_z(ctx->Current.RasterPos[2]);
-      GLuint i;
-
-      verts[0].x = x0;
-      verts[0].y = y0;
-      verts[0].z = z;
-      verts[0].s = 0.0F;
-      verts[0].t = 0.0F;
-      verts[1].x = x1;
-      verts[1].y = y0;
-      verts[1].z = z;
-      verts[1].s = tex->Sright;
-      verts[1].t = 0.0F;
-      verts[2].x = x1;
-      verts[2].y = y1;
-      verts[2].z = z;
-      verts[2].s = tex->Sright;
-      verts[2].t = tex->Ttop;
-      verts[3].x = x0;
-      verts[3].y = y1;
-      verts[3].z = z;
-      verts[3].s = 0.0F;
-      verts[3].t = tex->Ttop;
-
-      for (i = 0; i < 4; i++) {
-         verts[i].r = ctx->Current.RasterColor[0];
-         verts[i].g = ctx->Current.RasterColor[1];
-         verts[i].b = ctx->Current.RasterColor[2];
-         verts[i].a = ctx->Current.RasterColor[3];
-      }
-
-      /* upload new vertex data */
-      _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
-   }
-
-   /* choose different foreground/background alpha values */
-   CLAMPED_FLOAT_TO_UBYTE(fg, ctx->Current.RasterColor[ACOMP]);
-   bg = (fg > 127 ? 0 : 255);
-
-   bitmap1 = _mesa_map_pbo_source(ctx, &unpackSave, bitmap1);
-   if (!bitmap1) {
-      _mesa_meta_end(ctx);
-      return;
-   }
-
-   bitmap8 = (GLubyte *) malloc(width * height);
-   if (bitmap8) {
-      memset(bitmap8, bg, width * height);
-      _mesa_expand_bitmap(width, height, &unpackSave, bitmap1,
-                          bitmap8, width, fg);
-
-      _mesa_set_enable(ctx, tex->Target, GL_TRUE);
-
-      _mesa_set_enable(ctx, GL_ALPHA_TEST, GL_TRUE);
-      _mesa_AlphaFunc(GL_NOTEQUAL, UBYTE_TO_FLOAT(bg));
-
-      setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,
-                            GL_ALPHA, GL_UNSIGNED_BYTE, bitmap8);
-
-      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-      _mesa_set_enable(ctx, tex->Target, GL_FALSE);
-
-      free(bitmap8);
-   }
-
-   _mesa_unmap_pbo_source(ctx, &unpackSave);
-
-   _mesa_meta_end(ctx);
-}
-
-
-/**
- * Check if the call to _mesa_meta_GenerateMipmap() will require a
- * software fallback.  The fallback path will require that the texture
- * images are mapped.
- * \return GL_TRUE if a fallback is needed, GL_FALSE otherwise
- */
-GLboolean
-_mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,
-                                          struct gl_texture_object *texObj)
-{
-   const GLuint fboSave = ctx->DrawBuffer->Name;
-   struct gen_mipmap_state *mipmap = &ctx->Meta->Mipmap;
-   struct gl_texture_image *baseImage;
-   GLuint srcLevel;
-   GLenum status;
-
-   /* check for fallbacks */
-   if (!ctx->Extensions.EXT_framebuffer_object ||
-       target == GL_TEXTURE_3D) {
-      return GL_TRUE;
-   }
-
-   srcLevel = texObj->BaseLevel;
-   baseImage = _mesa_select_tex_image(ctx, texObj, target, srcLevel);
-   if (!baseImage || _mesa_is_format_compressed(baseImage->TexFormat)) {
-      return GL_TRUE;
-   }
-
-   /*
-    * Test that we can actually render in the texture's format.
-    */
-   if (!mipmap->FBO)
-      _mesa_GenFramebuffersEXT(1, &mipmap->FBO);
-   _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO);
-
-   if (target == GL_TEXTURE_1D) {
-      _mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT,
-                                    GL_COLOR_ATTACHMENT0_EXT,
-                                    target, texObj->Name, srcLevel);
-   }
-#if 0
-   /* other work is needed to enable 3D mipmap generation */
-   else if (target == GL_TEXTURE_3D) {
-      GLint zoffset = 0;
-      _mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT,
-                                    GL_COLOR_ATTACHMENT0_EXT,
-                                    target, texObj->Name, srcLevel, zoffset);
-   }
-#endif
-   else {
-      /* 2D / cube */
-      _mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
-                                    GL_COLOR_ATTACHMENT0_EXT,
-                                    target, texObj->Name, srcLevel);
-   }
-
-   status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-
-   _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave);
-
-   if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      return GL_TRUE;
-   }
-
-   return GL_FALSE;
-}
-
-
-/**
- * Called via ctx->Driver.GenerateMipmap()
- * Note: texture borders and 3D texture support not yet complete.
- */
-void
-_mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
-                          struct gl_texture_object *texObj)
-{
-   struct gen_mipmap_state *mipmap = &ctx->Meta->Mipmap;
-   struct vertex {
-      GLfloat x, y, s, t, r;
-   };
-   struct vertex verts[4];
-   const GLuint baseLevel = texObj->BaseLevel;
-   const GLuint maxLevel = texObj->MaxLevel;
-   const GLenum minFilterSave = texObj->MinFilter;
-   const GLenum magFilterSave = texObj->MagFilter;
-   const GLint maxLevelSave = texObj->MaxLevel;
-   const GLboolean genMipmapSave = texObj->GenerateMipmap;
-   const GLenum wrapSSave = texObj->WrapS;
-   const GLenum wrapTSave = texObj->WrapT;
-   const GLenum wrapRSave = texObj->WrapR;
-   const GLuint fboSave = ctx->DrawBuffer->Name;
-   const GLuint original_active_unit = ctx->Texture.CurrentUnit;
-   GLenum faceTarget;
-   GLuint dstLevel;
-   GLuint border = 0;
-
-   if (_mesa_meta_check_generate_mipmap_fallback(ctx, target, texObj)) {
-      _mesa_generate_mipmap(ctx, target, texObj);
-      return;
-   }
-
-   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&
-       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z) {
-      faceTarget = target;
-      target = GL_TEXTURE_CUBE_MAP;
-   }
-   else {
-      faceTarget = target;
-   }
-
-   _mesa_meta_begin(ctx, META_ALL);
-
-   if (original_active_unit != 0)
-      _mesa_BindTexture(target, texObj->Name);
-
-   if (mipmap->ArrayObj == 0) {
-      /* one-time setup */
-
-      /* create vertex array object */
-      _mesa_GenVertexArraysAPPLE(1, &mipmap->ArrayObj);
-      _mesa_BindVertexArrayAPPLE(mipmap->ArrayObj);
-
-      /* create vertex array buffer */
-      _mesa_GenBuffersARB(1, &mipmap->VBO);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
-      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
-                          NULL, GL_DYNAMIC_DRAW_ARB);
-
-      /* setup vertex arrays */
-      _mesa_VertexPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
-      _mesa_TexCoordPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(s));
-      _mesa_EnableClientState(GL_VERTEX_ARRAY);
-      _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);
-   }
-   else {
-      _mesa_BindVertexArray(mipmap->ArrayObj);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
-   }
-
-   if (!mipmap->FBO) {
-      _mesa_GenFramebuffersEXT(1, &mipmap->FBO);
-   }
-   _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO);
-
-   _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-   _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-   _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE);
-   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-
-   _mesa_set_enable(ctx, target, GL_TRUE);
-
-   /* setup texcoords once (XXX what about border?) */
-   switch (faceTarget) {
-   case GL_TEXTURE_1D:
-   case GL_TEXTURE_2D:
-      verts[0].s = 0.0F;
-      verts[0].t = 0.0F;
-      verts[0].r = 0.0F;
-      verts[1].s = 1.0F;
-      verts[1].t = 0.0F;
-      verts[1].r = 0.0F;
-      verts[2].s = 1.0F;
-      verts[2].t = 1.0F;
-      verts[2].r = 0.0F;
-      verts[3].s = 0.0F;
-      verts[3].t = 1.0F;
-      verts[3].r = 0.0F;
-      break;
-   case GL_TEXTURE_3D:
-      abort();
-      break;
-   default:
-      /* cube face */
-      {
-         static const GLfloat st[4][2] = {
-            {0.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 1.0f}
-         };
-         GLuint i;
-
-         /* loop over quad verts */
-         for (i = 0; i < 4; i++) {
-            /* Compute sc = +/-scale and tc = +/-scale.
-             * Not +/-1 to avoid cube face selection ambiguity near the edges,
-             * though that can still sometimes happen with this scale factor...
-             */
-            const GLfloat scale = 0.9999f;
-            const GLfloat sc = (2.0f * st[i][0] - 1.0f) * scale;
-            const GLfloat tc = (2.0f * st[i][1] - 1.0f) * scale;
-
-            switch (faceTarget) {
-            case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
-               verts[i].s = 1.0f;
-               verts[i].t = -tc;
-               verts[i].r = -sc;
-               break;
-            case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
-               verts[i].s = -1.0f;
-               verts[i].t = -tc;
-               verts[i].r = sc;
-               break;
-            case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
-               verts[i].s = sc;
-               verts[i].t = 1.0f;
-               verts[i].r = tc;
-               break;
-            case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
-               verts[i].s = sc;
-               verts[i].t = -1.0f;
-               verts[i].r = -tc;
-               break;
-            case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
-               verts[i].s = sc;
-               verts[i].t = -tc;
-               verts[i].r = 1.0f;
-               break;
-            case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
-               verts[i].s = -sc;
-               verts[i].t = -tc;
-               verts[i].r = -1.0f;
-               break;
-            default:
-               assert(0);
-            }
-         }
-      }
-   }
-
-   _mesa_set_enable(ctx, target, GL_TRUE);
-
-   /* setup vertex positions */
-   {
-      verts[0].x = 0.0F;
-      verts[0].y = 0.0F;
-      verts[1].x = 1.0F;
-      verts[1].y = 0.0F;
-      verts[2].x = 1.0F;
-      verts[2].y = 1.0F;
-      verts[3].x = 0.0F;
-      verts[3].y = 1.0F;
-      
-      /* upload new vertex data */
-      _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
-   }
-
-   /* setup projection matrix */
-   _mesa_MatrixMode(GL_PROJECTION);
-   _mesa_LoadIdentity();
-   _mesa_Ortho(0.0, 1.0, 0.0, 1.0, -1.0, 1.0);
-
-   /* texture is already locked, unlock now */
-   _mesa_unlock_texture(ctx, texObj);
-
-   for (dstLevel = baseLevel + 1; dstLevel <= maxLevel; dstLevel++) {
-      const struct gl_texture_image *srcImage;
-      const GLuint srcLevel = dstLevel - 1;
-      GLsizei srcWidth, srcHeight, srcDepth;
-      GLsizei dstWidth, dstHeight, dstDepth;
-      GLenum status;
-
-      srcImage = _mesa_select_tex_image(ctx, texObj, faceTarget, srcLevel);
-      assert(srcImage->Border == 0); /* XXX we can fix this */
-
-      /* src size w/out border */
-      srcWidth = srcImage->Width - 2 * border;
-      srcHeight = srcImage->Height - 2 * border;
-      srcDepth = srcImage->Depth - 2 * border;
-
-      /* new dst size w/ border */
-      dstWidth = MAX2(1, srcWidth / 2) + 2 * border;
-      dstHeight = MAX2(1, srcHeight / 2) + 2 * border;
-      dstDepth = MAX2(1, srcDepth / 2) + 2 * border;
-
-      if (dstWidth == srcImage->Width &&
-          dstHeight == srcImage->Height &&
-          dstDepth == srcImage->Depth) {
-         /* all done */
-         break;
-      }
-
-      /* Set MaxLevel large enough to hold the new level when we allocate it  */
-      _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, dstLevel);
-
-      /* Create empty dest image */
-      if (target == GL_TEXTURE_1D) {
-         _mesa_TexImage1D(target, dstLevel, srcImage->InternalFormat,
-                          dstWidth, border,
-                          GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-      }
-      else if (target == GL_TEXTURE_3D) {
-         _mesa_TexImage3D(target, dstLevel, srcImage->InternalFormat,
-                          dstWidth, dstHeight, dstDepth, border,
-                          GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-      }
-      else {
-         /* 2D or cube */
-         _mesa_TexImage2D(faceTarget, dstLevel, srcImage->InternalFormat,
-                          dstWidth, dstHeight, border,
-                          GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-
-         if (target == GL_TEXTURE_CUBE_MAP) {
-            /* If texturing from a cube, we need to make sure all src faces
-             * have been defined (even if we're not sampling from them.)
-             * Otherwise the texture object will be 'incomplete' and
-             * texturing from it will not be allowed.
-             */
-            GLuint face;
-            for (face = 0; face < 6; face++) {
-               if (!texObj->Image[face][srcLevel] ||
-                   texObj->Image[face][srcLevel]->Width != srcWidth) {
-                  _mesa_TexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face,
-                                   srcLevel, srcImage->InternalFormat,
-                                   srcWidth, srcHeight, border,
-                                   GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-               }
-            }
-         }
-      }
-
-      /* limit minification to src level */
-      _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, srcLevel);
-
-      /* Set to draw into the current dstLevel */
-      if (target == GL_TEXTURE_1D) {
-         _mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT,
-                                       GL_COLOR_ATTACHMENT0_EXT,
-                                       target,
-                                       texObj->Name,
-                                       dstLevel);
-      }
-      else if (target == GL_TEXTURE_3D) {
-         GLint zoffset = 0; /* XXX unfinished */
-         _mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT,
-                                       GL_COLOR_ATTACHMENT0_EXT,
-                                       target,
-                                       texObj->Name,
-                                       dstLevel, zoffset);
-      }
-      else {
-         /* 2D / cube */
-         _mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
-                                       GL_COLOR_ATTACHMENT0_EXT,
-                                       faceTarget,
-                                       texObj->Name,
-                                       dstLevel);
-      }
-
-      _mesa_DrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
-
-      /* sanity check */
-      status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-      if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-         abort();
-         break;
-      }
-
-      assert(dstWidth == ctx->DrawBuffer->Width);
-      assert(dstHeight == ctx->DrawBuffer->Height);
-
-      /* setup viewport */
-      _mesa_set_viewport(ctx, 0, 0, dstWidth, dstHeight);
-
-      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-   }
-
-   _mesa_lock_texture(ctx, texObj); /* relock */
-
-   _mesa_meta_end(ctx);
-
-   _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, minFilterSave);
-   _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, magFilterSave);
-   _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, maxLevelSave);
-   _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, genMipmapSave);
-   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, wrapSSave);
-   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, wrapTSave);
-   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_R, wrapRSave);
-
-   _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave);
-}
-
-
-/**
- * Determine the GL data type to use for the temporary image read with
- * ReadPixels() and passed to Tex[Sub]Image().
- */
-static GLenum
-get_temp_image_type(struct gl_context *ctx, GLenum baseFormat)
-{
-   switch (baseFormat) {
-   case GL_RGBA:
-   case GL_RGB:
-   case GL_ALPHA:
-   case GL_LUMINANCE:
-   case GL_LUMINANCE_ALPHA:
-   case GL_INTENSITY:
-      if (ctx->DrawBuffer->Visual.redBits <= 8)
-         return GL_UNSIGNED_BYTE;
-      else if (ctx->DrawBuffer->Visual.redBits <= 8)
-         return GL_UNSIGNED_SHORT;
-      else
-         return GL_FLOAT;
-   case GL_DEPTH_COMPONENT:
-      return GL_UNSIGNED_INT;
-   case GL_DEPTH_STENCIL:
-      return GL_UNSIGNED_INT_24_8;
-   default:
-      _mesa_problem(ctx, "Unexpected format in get_temp_image_type()");
-      return 0;
-   }
-}
-
-
-/**
- * Helper for _mesa_meta_CopyTexImage1/2D() functions.
- * Have to be careful with locking and meta state for pixel transfer.
- */
-static void
-copy_tex_image(struct gl_context *ctx, GLuint dims, GLenum target, GLint level,
-               GLenum internalFormat, GLint x, GLint y,
-               GLsizei width, GLsizei height, GLint border)
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GLenum format, type;
-   GLint bpp;
-   void *buf;
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-   texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-
-   /* Choose format/type for temporary image buffer */
-   format = _mesa_base_tex_format(ctx, internalFormat);
-   type = get_temp_image_type(ctx, format);
-   bpp = _mesa_bytes_per_pixel(format, type);
-   if (bpp <= 0) {
-      _mesa_problem(ctx, "Bad bpp in meta copy_tex_image()");
-      return;
-   }
-
-   /*
-    * Alloc image buffer (XXX could use a PBO)
-    */
-   buf = malloc(width * height * bpp);
-   if (!buf) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage%uD", dims);
-      return;
-   }
-
-   _mesa_unlock_texture(ctx, texObj); /* need to unlock first */
-
-   /*
-    * Read image from framebuffer (disable pixel transfer ops)
-    */
-   _mesa_meta_begin(ctx, META_PIXEL_STORE | META_PIXEL_TRANSFER);
-   ctx->Driver.ReadPixels(ctx, x, y, width, height,
-			  format, type, &ctx->Pack, buf);
-   _mesa_meta_end(ctx);
-
-   if (texImage->Data) {
-      ctx->Driver.FreeTexImageData(ctx, texImage);
-   }
-
-   /* The texture's format was already chosen in _mesa_CopyTexImage() */
-   ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
-
-   /*
-    * Store texture data (with pixel transfer ops)
-    */
-   _mesa_meta_begin(ctx, META_PIXEL_STORE);
-
-   _mesa_update_state(ctx); /* to update pixel transfer state */
-
-   if (target == GL_TEXTURE_1D) {
-      ctx->Driver.TexImage1D(ctx, target, level, internalFormat,
-                             width, border, format, type,
-                             buf, &ctx->Unpack, texObj, texImage);
-   }
-   else {
-      ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
-                             width, height, border, format, type,
-                             buf, &ctx->Unpack, texObj, texImage);
-   }
-   _mesa_meta_end(ctx);
-
-   _mesa_lock_texture(ctx, texObj); /* re-lock */
-
-   free(buf);
-}
-
-
-void
-_mesa_meta_CopyTexImage1D(struct gl_context *ctx, GLenum target, GLint level,
-                          GLenum internalFormat, GLint x, GLint y,
-                          GLsizei width, GLint border)
-{
-   copy_tex_image(ctx, 1, target, level, internalFormat, x, y,
-                  width, 1, border);
-}
-
-
-void
-_mesa_meta_CopyTexImage2D(struct gl_context *ctx, GLenum target, GLint level,
-                          GLenum internalFormat, GLint x, GLint y,
-                          GLsizei width, GLsizei height, GLint border)
-{
-   copy_tex_image(ctx, 2, target, level, internalFormat, x, y,
-                  width, height, border);
-}
-
-
-
-/**
- * Helper for _mesa_meta_CopyTexSubImage1/2/3D() functions.
- * Have to be careful with locking and meta state for pixel transfer.
- */
-static void
-copy_tex_sub_image(struct gl_context *ctx,
-                   GLuint dims, GLenum target, GLint level,
-                   GLint xoffset, GLint yoffset, GLint zoffset,
-                   GLint x, GLint y,
-                   GLsizei width, GLsizei height)
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GLenum format, type;
-   GLint bpp;
-   void *buf;
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-   texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-
-   /* Choose format/type for temporary image buffer */
-   format = _mesa_get_format_base_format(texImage->TexFormat);
-   type = get_temp_image_type(ctx, format);
-   bpp = _mesa_bytes_per_pixel(format, type);
-   if (bpp <= 0) {
-      _mesa_problem(ctx, "Bad bpp in meta copy_tex_sub_image()");
-      return;
-   }
-
-   /*
-    * Alloc image buffer (XXX could use a PBO)
-    */
-   buf = malloc(width * height * bpp);
-   if (!buf) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage%uD", dims);
-      return;
-   }
-
-   _mesa_unlock_texture(ctx, texObj); /* need to unlock first */
-
-   /*
-    * Read image from framebuffer (disable pixel transfer ops)
-    */
-   _mesa_meta_begin(ctx, META_PIXEL_STORE | META_PIXEL_TRANSFER);
-   ctx->Driver.ReadPixels(ctx, x, y, width, height,
-			  format, type, &ctx->Pack, buf);
-   _mesa_meta_end(ctx);
-
-   _mesa_update_state(ctx); /* to update pixel transfer state */
-
-   /*
-    * Store texture data (with pixel transfer ops)
-    */
-   _mesa_meta_begin(ctx, META_PIXEL_STORE);
-   if (target == GL_TEXTURE_1D) {
-      ctx->Driver.TexSubImage1D(ctx, target, level, xoffset,
-                                width, format, type, buf,
-                                &ctx->Unpack, texObj, texImage);
-   }
-   else if (target == GL_TEXTURE_3D) {
-      ctx->Driver.TexSubImage3D(ctx, target, level, xoffset, yoffset, zoffset,
-                                width, height, 1, format, type, buf,
-                                &ctx->Unpack, texObj, texImage);
-   }
-   else {
-      ctx->Driver.TexSubImage2D(ctx, target, level, xoffset, yoffset,
-                                width, height, format, type, buf,
-                                &ctx->Unpack, texObj, texImage);
-   }
-   _mesa_meta_end(ctx);
-
-   _mesa_lock_texture(ctx, texObj); /* re-lock */
-
-   free(buf);
-}
-
-
-void
-_mesa_meta_CopyTexSubImage1D(struct gl_context *ctx, GLenum target, GLint level,
-                             GLint xoffset,
-                             GLint x, GLint y, GLsizei width)
-{
-   copy_tex_sub_image(ctx, 1, target, level, xoffset, 0, 0,
-                      x, y, width, 1);
-}
-
-
-void
-_mesa_meta_CopyTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,
-                             GLint xoffset, GLint yoffset,
-                             GLint x, GLint y,
-                             GLsizei width, GLsizei height)
-{
-   copy_tex_sub_image(ctx, 2, target, level, xoffset, yoffset, 0,
-                      x, y, width, height);
-}
-
-
-void
-_mesa_meta_CopyTexSubImage3D(struct gl_context *ctx, GLenum target, GLint level,
-                             GLint xoffset, GLint yoffset, GLint zoffset,
-                             GLint x, GLint y,
-                             GLsizei width, GLsizei height)
-{
-   copy_tex_sub_image(ctx, 3, target, level, xoffset, yoffset, zoffset,
-                      x, y, width, height);
-}
-
-
-void
-_mesa_meta_CopyColorTable(struct gl_context *ctx,
-                          GLenum target, GLenum internalformat,
-                          GLint x, GLint y, GLsizei width)
-{
-   GLfloat *buf;
-
-   buf = (GLfloat *) malloc(width * 4 * sizeof(GLfloat));
-   if (!buf) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyColorTable");
-      return;
-   }
-
-   /*
-    * Read image from framebuffer (disable pixel transfer ops)
-    */
-   _mesa_meta_begin(ctx, META_PIXEL_STORE | META_PIXEL_TRANSFER);
-   ctx->Driver.ReadPixels(ctx, x, y, width, 1,
-                          GL_RGBA, GL_FLOAT, &ctx->Pack, buf);
-
-   _mesa_ColorTable(target, internalformat, width, GL_RGBA, GL_FLOAT, buf);
-
-   _mesa_meta_end(ctx);
-
-   free(buf);
-}
-
-
-void
-_mesa_meta_CopyColorSubTable(struct gl_context *ctx,GLenum target, GLsizei start,
-                             GLint x, GLint y, GLsizei width)
-{
-   GLfloat *buf;
-
-   buf = (GLfloat *) malloc(width * 4 * sizeof(GLfloat));
-   if (!buf) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyColorSubTable");
-      return;
-   }
-
-   /*
-    * Read image from framebuffer (disable pixel transfer ops)
-    */
-   _mesa_meta_begin(ctx, META_PIXEL_STORE | META_PIXEL_TRANSFER);
-   ctx->Driver.ReadPixels(ctx, x, y, width, 1,
-                          GL_RGBA, GL_FLOAT, &ctx->Pack, buf);
-
-   _mesa_ColorSubTable(target, start, width, GL_RGBA, GL_FLOAT, buf);
-
-   _mesa_meta_end(ctx);
-
-   free(buf);
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.6

+ *

+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+/**

+ * Meta operations.  Some GL operations can be expressed in terms of

+ * other GL operations.  For example, glBlitFramebuffer() can be done

+ * with texture mapping and glClear() can be done with polygon rendering.

+ *

+ * \author Brian Paul

+ */

+

+

+#include "main/glheader.h"

+#include "main/mtypes.h"

+#include "main/imports.h"

+#include "main/arbprogram.h"

+#include "main/arrayobj.h"

+#include "main/blend.h"

+#include "main/bufferobj.h"

+#include "main/buffers.h"

+#include "main/colortab.h"

+#include "main/depth.h"

+#include "main/enable.h"

+#include "main/fbobject.h"

+#include "main/formats.h"

+#include "main/image.h"

+#include "main/macros.h"

+#include "main/matrix.h"

+#include "main/mipmap.h"

+#include "main/pbo.h"

+#include "main/polygon.h"

+#include "main/readpix.h"

+#include "main/scissor.h"

+#include "main/shaderapi.h"

+#include "main/shaderobj.h"

+#include "main/state.h"

+#include "main/stencil.h"

+#include "main/texobj.h"

+#include "main/texenv.h"

+#include "main/teximage.h"

+#include "main/texparam.h"

+#include "main/texstate.h"

+#include "main/varray.h"

+#include "main/viewport.h"

+#include "program/program.h"

+#include "swrast/swrast.h"

+#include "drivers/common/meta.h"

+

+

+/** Return offset in bytes of the field within a vertex struct */

+#define OFFSET(FIELD) ((void *) offsetof(struct vertex, FIELD))

+

+

+/**

+ * Flags passed to _mesa_meta_begin().

+ */

+/*@{*/

+#define META_ALL              ~0x0

+#define META_ALPHA_TEST        0x1

+#define META_BLEND             0x2  /**< includes logicop */

+#define META_COLOR_MASK        0x4

+#define META_DEPTH_TEST        0x8

+#define META_FOG              0x10

+#define META_PIXEL_STORE      0x20

+#define META_PIXEL_TRANSFER   0x40

+#define META_RASTERIZATION    0x80

+#define META_SCISSOR         0x100

+#define META_SHADER          0x200

+#define META_STENCIL_TEST    0x400

+#define META_TRANSFORM       0x800 /**< modelview, projection, clip planes */

+#define META_TEXTURE        0x1000

+#define META_VERTEX         0x2000

+#define META_VIEWPORT       0x4000

+/*@}*/

+

+

+/**

+ * State which we may save/restore across meta ops.

+ * XXX this may be incomplete...

+ */

+struct save_state

+{

+   GLbitfield SavedState;  /**< bitmask of META_* flags */

+

+   /** META_ALPHA_TEST */

+   GLboolean AlphaEnabled;

+   GLenum AlphaFunc;

+   GLclampf AlphaRef;

+

+   /** META_BLEND */

+   GLbitfield BlendEnabled;

+   GLboolean ColorLogicOpEnabled;

+

+   /** META_COLOR_MASK */

+   GLubyte ColorMask[MAX_DRAW_BUFFERS][4];

+

+   /** META_DEPTH_TEST */

+   struct gl_depthbuffer_attrib Depth;

+

+   /** META_FOG */

+   GLboolean Fog;

+

+   /** META_PIXEL_STORE */

+   struct gl_pixelstore_attrib Pack, Unpack;

+

+   /** META_PIXEL_TRANSFER */

+   GLfloat RedBias, RedScale;

+   GLfloat GreenBias, GreenScale;

+   GLfloat BlueBias, BlueScale;

+   GLfloat AlphaBias, AlphaScale;

+   GLfloat DepthBias, DepthScale;

+   GLboolean MapColorFlag;

+

+   /** META_RASTERIZATION */

+   GLenum FrontPolygonMode, BackPolygonMode;

+   GLboolean PolygonOffset;

+   GLboolean PolygonSmooth;

+   GLboolean PolygonStipple;

+   GLboolean PolygonCull;

+

+   /** META_SCISSOR */

+   struct gl_scissor_attrib Scissor;

+

+   /** META_SHADER */

+   GLboolean VertexProgramEnabled;

+   struct gl_vertex_program *VertexProgram;

+   GLboolean FragmentProgramEnabled;

+   struct gl_fragment_program *FragmentProgram;

+   struct gl_shader_program *VertexShader;

+   struct gl_shader_program *GeometryShader;

+   struct gl_shader_program *FragmentShader;

+   struct gl_shader_program *ActiveShader;

+

+   /** META_STENCIL_TEST */

+   struct gl_stencil_attrib Stencil;

+

+   /** META_TRANSFORM */

+   GLenum MatrixMode;

+   GLfloat ModelviewMatrix[16];

+   GLfloat ProjectionMatrix[16];

+   GLfloat TextureMatrix[16];

+   GLbitfield ClipPlanesEnabled;

+

+   /** META_TEXTURE */

+   GLuint ActiveUnit;

+   GLuint ClientActiveUnit;

+   /** for unit[0] only */

+   struct gl_texture_object *CurrentTexture[NUM_TEXTURE_TARGETS];

+   /** mask of TEXTURE_2D_BIT, etc */

+   GLbitfield TexEnabled[MAX_TEXTURE_UNITS];

+   GLbitfield TexGenEnabled[MAX_TEXTURE_UNITS];

+   GLuint EnvMode;  /* unit[0] only */

+

+   /** META_VERTEX */

+   struct gl_array_object *ArrayObj;

+   struct gl_buffer_object *ArrayBufferObj;

+

+   /** META_VIEWPORT */

+   GLint ViewportX, ViewportY, ViewportW, ViewportH;

+   GLclampd DepthNear, DepthFar;

+

+   /** Miscellaneous (always disabled) */

+   GLboolean Lighting;

+};

+

+

+/**

+ * Temporary texture used for glBlitFramebuffer, glDrawPixels, etc.

+ * This is currently shared by all the meta ops.  But we could create a

+ * separate one for each of glDrawPixel, glBlitFramebuffer, glCopyPixels, etc.

+ */

+struct temp_texture

+{

+   GLuint TexObj;

+   GLenum Target;         /**< GL_TEXTURE_2D or GL_TEXTURE_RECTANGLE */

+   GLsizei MinSize;       /**< Min texture size to allocate */

+   GLsizei MaxSize;       /**< Max possible texture size */

+   GLboolean NPOT;        /**< Non-power of two size OK? */

+   GLsizei Width, Height; /**< Current texture size */

+   GLenum IntFormat;

+   GLfloat Sright, Ttop;  /**< right, top texcoords */

+};

+

+

+/**

+ * State for glBlitFramebufer()

+ */

+struct blit_state

+{

+   GLuint ArrayObj;

+   GLuint VBO;

+   GLuint DepthFP;

+};

+

+

+/**

+ * State for glClear()

+ */

+struct clear_state

+{

+   GLuint ArrayObj;

+   GLuint VBO;

+};

+

+

+/**

+ * State for glCopyPixels()

+ */

+struct copypix_state

+{

+   GLuint ArrayObj;

+   GLuint VBO;

+};

+

+

+/**

+ * State for glDrawPixels()

+ */

+struct drawpix_state

+{

+   GLuint ArrayObj;

+

+   GLuint StencilFP;  /**< Fragment program for drawing stencil images */

+   GLuint DepthFP;  /**< Fragment program for drawing depth images */

+};

+

+

+/**

+ * State for glBitmap()

+ */

+struct bitmap_state

+{

+   GLuint ArrayObj;

+   GLuint VBO;

+   struct temp_texture Tex;  /**< separate texture from other meta ops */

+};

+

+

+/**

+ * State for _mesa_meta_generate_mipmap()

+ */

+struct gen_mipmap_state

+{

+   GLuint ArrayObj;

+   GLuint VBO;

+   GLuint FBO;

+};

+

+#define MAX_META_OPS_DEPTH      2

+/**

+ * All per-context meta state.

+ */

+struct gl_meta_state

+{

+   /** Stack of state saved during meta-ops */

+   struct save_state Save[MAX_META_OPS_DEPTH];

+   /** Save stack depth */

+   GLuint SaveStackDepth;

+

+   struct temp_texture TempTex;

+

+   struct blit_state Blit;    /**< For _mesa_meta_BlitFramebuffer() */

+   struct clear_state Clear;  /**< For _mesa_meta_Clear() */

+   struct copypix_state CopyPix;  /**< For _mesa_meta_CopyPixels() */

+   struct drawpix_state DrawPix;  /**< For _mesa_meta_DrawPixels() */

+   struct bitmap_state Bitmap;    /**< For _mesa_meta_Bitmap() */

+   struct gen_mipmap_state Mipmap;    /**< For _mesa_meta_GenerateMipmap() */

+};

+

+

+/**

+ * Initialize meta-ops for a context.

+ * To be called once during context creation.

+ */

+void

+_mesa_meta_init(struct gl_context *ctx)

+{

+   ASSERT(!ctx->Meta);

+

+   ctx->Meta = CALLOC_STRUCT(gl_meta_state);

+}

+

+

+/**

+ * Free context meta-op state.

+ * To be called once during context destruction.

+ */

+void

+_mesa_meta_free(struct gl_context *ctx)

+{

+   /* Note: Any textures, VBOs, etc, that we allocate should get

+    * freed by the normal context destruction code.  But this would be

+    * the place to free other meta data someday.

+    */

+   free(ctx->Meta);

+   ctx->Meta = NULL;

+}

+

+

+/**

+ * Enter meta state.  This is like a light-weight version of glPushAttrib

+ * but it also resets most GL state back to default values.

+ *

+ * \param state  bitmask of META_* flags indicating which attribute groups

+ *               to save and reset to their defaults

+ */

+static void

+_mesa_meta_begin(struct gl_context *ctx, GLbitfield state)

+{

+   struct save_state *save;

+

+   /* hope MAX_META_OPS_DEPTH is large enough */

+   assert(ctx->Meta->SaveStackDepth < MAX_META_OPS_DEPTH);

+

+   save = &ctx->Meta->Save[ctx->Meta->SaveStackDepth++];

+   memset(save, 0, sizeof(*save));

+   save->SavedState = state;

+

+   if (state & META_ALPHA_TEST) {

+      save->AlphaEnabled = ctx->Color.AlphaEnabled;

+      save->AlphaFunc = ctx->Color.AlphaFunc;

+      save->AlphaRef = ctx->Color.AlphaRef;

+      if (ctx->Color.AlphaEnabled)

+         _mesa_set_enable(ctx, GL_ALPHA_TEST, GL_FALSE);

+   }

+

+   if (state & META_BLEND) {

+      save->BlendEnabled = ctx->Color.BlendEnabled;

+      if (ctx->Color.BlendEnabled) {

+         if (ctx->Extensions.EXT_draw_buffers2) {

+            GLuint i;

+            for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {

+               _mesa_set_enablei(ctx, GL_BLEND, i, GL_FALSE);

+            }

+         }

+         else {

+            _mesa_set_enable(ctx, GL_BLEND, GL_FALSE);

+         }

+      }

+      save->ColorLogicOpEnabled = ctx->Color.ColorLogicOpEnabled;

+      if (ctx->Color.ColorLogicOpEnabled)

+         _mesa_set_enable(ctx, GL_COLOR_LOGIC_OP, GL_FALSE);

+   }

+

+   if (state & META_COLOR_MASK) {

+      memcpy(save->ColorMask, ctx->Color.ColorMask,

+             sizeof(ctx->Color.ColorMask));

+      if (!ctx->Color.ColorMask[0][0] ||

+          !ctx->Color.ColorMask[0][1] ||

+          !ctx->Color.ColorMask[0][2] ||

+          !ctx->Color.ColorMask[0][3])

+         _mesa_ColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);

+   }

+

+   if (state & META_DEPTH_TEST) {

+      save->Depth = ctx->Depth; /* struct copy */

+      if (ctx->Depth.Test)

+         _mesa_set_enable(ctx, GL_DEPTH_TEST, GL_FALSE);

+   }

+

+   if (state & META_FOG) {

+      save->Fog = ctx->Fog.Enabled;

+      if (ctx->Fog.Enabled)

+         _mesa_set_enable(ctx, GL_FOG, GL_FALSE);

+   }

+

+   if (state & META_PIXEL_STORE) {

+      save->Pack = ctx->Pack;

+      save->Unpack = ctx->Unpack;

+      ctx->Pack = ctx->DefaultPacking;

+      ctx->Unpack = ctx->DefaultPacking;

+   }

+

+   if (state & META_PIXEL_TRANSFER) {

+      save->RedScale = ctx->Pixel.RedScale;

+      save->RedBias = ctx->Pixel.RedBias;

+      save->GreenScale = ctx->Pixel.GreenScale;

+      save->GreenBias = ctx->Pixel.GreenBias;

+      save->BlueScale = ctx->Pixel.BlueScale;

+      save->BlueBias = ctx->Pixel.BlueBias;

+      save->AlphaScale = ctx->Pixel.AlphaScale;

+      save->AlphaBias = ctx->Pixel.AlphaBias;

+      save->MapColorFlag = ctx->Pixel.MapColorFlag;

+      ctx->Pixel.RedScale = 1.0F;

+      ctx->Pixel.RedBias = 0.0F;

+      ctx->Pixel.GreenScale = 1.0F;

+      ctx->Pixel.GreenBias = 0.0F;

+      ctx->Pixel.BlueScale = 1.0F;

+      ctx->Pixel.BlueBias = 0.0F;

+      ctx->Pixel.AlphaScale = 1.0F;

+      ctx->Pixel.AlphaBias = 0.0F;

+      ctx->Pixel.MapColorFlag = GL_FALSE;

+      /* XXX more state */

+      ctx->NewState |=_NEW_PIXEL;

+   }

+

+   if (state & META_RASTERIZATION) {

+      save->FrontPolygonMode = ctx->Polygon.FrontMode;

+      save->BackPolygonMode = ctx->Polygon.BackMode;

+      save->PolygonOffset = ctx->Polygon.OffsetFill;

+      save->PolygonSmooth = ctx->Polygon.SmoothFlag;

+      save->PolygonStipple = ctx->Polygon.StippleFlag;

+      save->PolygonCull = ctx->Polygon.CullFlag;

+      _mesa_PolygonMode(GL_FRONT_AND_BACK, GL_FILL);

+      _mesa_set_enable(ctx, GL_POLYGON_OFFSET_FILL, GL_FALSE);

+      _mesa_set_enable(ctx, GL_POLYGON_SMOOTH, GL_FALSE);

+      _mesa_set_enable(ctx, GL_POLYGON_STIPPLE, GL_FALSE);

+      _mesa_set_enable(ctx, GL_CULL_FACE, GL_FALSE);

+   }

+

+   if (state & META_SCISSOR) {

+      save->Scissor = ctx->Scissor; /* struct copy */

+      _mesa_set_enable(ctx, GL_SCISSOR_TEST, GL_FALSE);

+   }

+

+   if (state & META_SHADER) {

+      if (ctx->Extensions.ARB_vertex_program) {

+         save->VertexProgramEnabled = ctx->VertexProgram.Enabled;

+         _mesa_reference_vertprog(ctx, &save->VertexProgram,

+				  ctx->VertexProgram.Current);

+         _mesa_set_enable(ctx, GL_VERTEX_PROGRAM_ARB, GL_FALSE);

+      }

+

+      if (ctx->Extensions.ARB_fragment_program) {

+         save->FragmentProgramEnabled = ctx->FragmentProgram.Enabled;

+         _mesa_reference_fragprog(ctx, &save->FragmentProgram,

+				  ctx->FragmentProgram.Current);

+         _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_FALSE);

+      }

+

+      if (ctx->Extensions.ARB_shader_objects) {

+	 _mesa_reference_shader_program(ctx, &save->VertexShader,

+					ctx->Shader.CurrentVertexProgram);

+	 _mesa_reference_shader_program(ctx, &save->GeometryShader,

+					ctx->Shader.CurrentGeometryProgram);

+	 _mesa_reference_shader_program(ctx, &save->FragmentShader,

+					ctx->Shader.CurrentFragmentProgram);

+	 _mesa_reference_shader_program(ctx, &save->ActiveShader,

+					ctx->Shader.CurrentFragmentProgram);

+

+         _mesa_UseProgramObjectARB(0);

+      }

+   }

+

+   if (state & META_STENCIL_TEST) {

+      save->Stencil = ctx->Stencil; /* struct copy */

+      if (ctx->Stencil.Enabled)

+         _mesa_set_enable(ctx, GL_STENCIL_TEST, GL_FALSE);

+      /* NOTE: other stencil state not reset */

+   }

+

+   if (state & META_TEXTURE) {

+      GLuint u, tgt;

+

+      save->ActiveUnit = ctx->Texture.CurrentUnit;

+      save->ClientActiveUnit = ctx->Array.ActiveTexture;

+      save->EnvMode = ctx->Texture.Unit[0].EnvMode;

+

+      /* Disable all texture units */

+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {

+         save->TexEnabled[u] = ctx->Texture.Unit[u].Enabled;

+         save->TexGenEnabled[u] = ctx->Texture.Unit[u].TexGenEnabled;

+         if (ctx->Texture.Unit[u].Enabled ||

+             ctx->Texture.Unit[u].TexGenEnabled) {

+            _mesa_ActiveTextureARB(GL_TEXTURE0 + u);

+            _mesa_set_enable(ctx, GL_TEXTURE_1D, GL_FALSE);

+            _mesa_set_enable(ctx, GL_TEXTURE_2D, GL_FALSE);

+            _mesa_set_enable(ctx, GL_TEXTURE_3D, GL_FALSE);

+            if (ctx->Extensions.ARB_texture_cube_map)

+               _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE);

+            _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE, GL_FALSE);

+            _mesa_set_enable(ctx, GL_TEXTURE_GEN_S, GL_FALSE);

+            _mesa_set_enable(ctx, GL_TEXTURE_GEN_T, GL_FALSE);

+            _mesa_set_enable(ctx, GL_TEXTURE_GEN_R, GL_FALSE);

+            _mesa_set_enable(ctx, GL_TEXTURE_GEN_Q, GL_FALSE);

+         }

+      }

+

+      /* save current texture objects for unit[0] only */

+      for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {

+         _mesa_reference_texobj(&save->CurrentTexture[tgt],

+                                ctx->Texture.Unit[0].CurrentTex[tgt]);

+      }

+

+      /* set defaults for unit[0] */

+      _mesa_ActiveTextureARB(GL_TEXTURE0);

+      _mesa_ClientActiveTextureARB(GL_TEXTURE0);

+      _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);

+   }

+

+   if (state & META_TRANSFORM) {

+      GLuint activeTexture = ctx->Texture.CurrentUnit;

+      memcpy(save->ModelviewMatrix, ctx->ModelviewMatrixStack.Top->m,

+             16 * sizeof(GLfloat));

+      memcpy(save->ProjectionMatrix, ctx->ProjectionMatrixStack.Top->m,

+             16 * sizeof(GLfloat));

+      memcpy(save->TextureMatrix, ctx->TextureMatrixStack[0].Top->m,

+             16 * sizeof(GLfloat));

+      save->MatrixMode = ctx->Transform.MatrixMode;

+      /* set 1:1 vertex:pixel coordinate transform */

+      _mesa_ActiveTextureARB(GL_TEXTURE0);

+      _mesa_MatrixMode(GL_TEXTURE);

+      _mesa_LoadIdentity();

+      _mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture);

+      _mesa_MatrixMode(GL_MODELVIEW);

+      _mesa_LoadIdentity();

+      _mesa_MatrixMode(GL_PROJECTION);

+      _mesa_LoadIdentity();

+      _mesa_Ortho(0.0, ctx->DrawBuffer->Width,

+                  0.0, ctx->DrawBuffer->Height,

+                  -1.0, 1.0);

+      save->ClipPlanesEnabled = ctx->Transform.ClipPlanesEnabled;

+      if (ctx->Transform.ClipPlanesEnabled) {

+         GLuint i;

+         for (i = 0; i < ctx->Const.MaxClipPlanes; i++) {

+            _mesa_set_enable(ctx, GL_CLIP_PLANE0 + i, GL_FALSE);

+         }

+      }

+   }

+

+   if (state & META_VERTEX) {

+      /* save vertex array object state */

+      _mesa_reference_array_object(ctx, &save->ArrayObj,

+                                   ctx->Array.ArrayObj);

+      _mesa_reference_buffer_object(ctx, &save->ArrayBufferObj,

+                                    ctx->Array.ArrayBufferObj);

+      /* set some default state? */

+   }

+

+   if (state & META_VIEWPORT) {

+      /* save viewport state */

+      save->ViewportX = ctx->Viewport.X;

+      save->ViewportY = ctx->Viewport.Y;

+      save->ViewportW = ctx->Viewport.Width;

+      save->ViewportH = ctx->Viewport.Height;

+      /* set viewport to match window size */

+      if (ctx->Viewport.X != 0 ||

+          ctx->Viewport.Y != 0 ||

+          ctx->Viewport.Width != ctx->DrawBuffer->Width ||

+          ctx->Viewport.Height != ctx->DrawBuffer->Height) {

+         _mesa_set_viewport(ctx, 0, 0,

+                            ctx->DrawBuffer->Width, ctx->DrawBuffer->Height);

+      }

+      /* save depth range state */

+      save->DepthNear = ctx->Viewport.Near;

+      save->DepthFar = ctx->Viewport.Far;

+      /* set depth range to default */

+      _mesa_DepthRange(0.0, 1.0);

+   }

+

+   /* misc */

+   {

+      save->Lighting = ctx->Light.Enabled;

+      if (ctx->Light.Enabled)

+         _mesa_set_enable(ctx, GL_LIGHTING, GL_FALSE);

+   }

+}

+

+

+/**

+ * Leave meta state.  This is like a light-weight version of glPopAttrib().

+ */

+static void

+_mesa_meta_end(struct gl_context *ctx)

+{

+   struct save_state *save = &ctx->Meta->Save[--ctx->Meta->SaveStackDepth];

+   const GLbitfield state = save->SavedState;

+

+   if (state & META_ALPHA_TEST) {

+      if (ctx->Color.AlphaEnabled != save->AlphaEnabled)

+         _mesa_set_enable(ctx, GL_ALPHA_TEST, save->AlphaEnabled);

+      _mesa_AlphaFunc(save->AlphaFunc, save->AlphaRef);

+   }

+

+   if (state & META_BLEND) {

+      if (ctx->Color.BlendEnabled != save->BlendEnabled) {

+         if (ctx->Extensions.EXT_draw_buffers2) {

+            GLuint i;

+            for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {

+               _mesa_set_enablei(ctx, GL_BLEND, i, (save->BlendEnabled >> i) & 1);

+            }

+         }

+         else {

+            _mesa_set_enable(ctx, GL_BLEND, (save->BlendEnabled & 1));

+         }

+      }

+      if (ctx->Color.ColorLogicOpEnabled != save->ColorLogicOpEnabled)

+         _mesa_set_enable(ctx, GL_COLOR_LOGIC_OP, save->ColorLogicOpEnabled);

+   }

+

+   if (state & META_COLOR_MASK) {

+      GLuint i;

+      for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {

+         if (!TEST_EQ_4V(ctx->Color.ColorMask[i], save->ColorMask[i])) {

+            if (i == 0) {

+               _mesa_ColorMask(save->ColorMask[i][0], save->ColorMask[i][1],

+                               save->ColorMask[i][2], save->ColorMask[i][3]);

+            }

+            else {

+               _mesa_ColorMaskIndexed(i,

+                                      save->ColorMask[i][0],

+                                      save->ColorMask[i][1],

+                                      save->ColorMask[i][2],

+                                      save->ColorMask[i][3]);

+            }

+         }

+      }

+   }

+

+   if (state & META_DEPTH_TEST) {

+      if (ctx->Depth.Test != save->Depth.Test)

+         _mesa_set_enable(ctx, GL_DEPTH_TEST, save->Depth.Test);

+      _mesa_DepthFunc(save->Depth.Func);

+      _mesa_DepthMask(save->Depth.Mask);

+   }

+

+   if (state & META_FOG) {

+      _mesa_set_enable(ctx, GL_FOG, save->Fog);

+   }

+

+   if (state & META_PIXEL_STORE) {

+      ctx->Pack = save->Pack;

+      ctx->Unpack = save->Unpack;

+   }

+

+   if (state & META_PIXEL_TRANSFER) {

+      ctx->Pixel.RedScale = save->RedScale;

+      ctx->Pixel.RedBias = save->RedBias;

+      ctx->Pixel.GreenScale = save->GreenScale;

+      ctx->Pixel.GreenBias = save->GreenBias;

+      ctx->Pixel.BlueScale = save->BlueScale;

+      ctx->Pixel.BlueBias = save->BlueBias;

+      ctx->Pixel.AlphaScale = save->AlphaScale;

+      ctx->Pixel.AlphaBias = save->AlphaBias;

+      ctx->Pixel.MapColorFlag = save->MapColorFlag;

+      /* XXX more state */

+      ctx->NewState |=_NEW_PIXEL;

+   }

+

+   if (state & META_RASTERIZATION) {

+      _mesa_PolygonMode(GL_FRONT, save->FrontPolygonMode);

+      _mesa_PolygonMode(GL_BACK, save->BackPolygonMode);

+      _mesa_set_enable(ctx, GL_POLYGON_STIPPLE, save->PolygonStipple);

+      _mesa_set_enable(ctx, GL_POLYGON_OFFSET_FILL, save->PolygonOffset);

+      _mesa_set_enable(ctx, GL_POLYGON_SMOOTH, save->PolygonSmooth);

+      _mesa_set_enable(ctx, GL_CULL_FACE, save->PolygonCull);

+   }

+

+   if (state & META_SCISSOR) {

+      _mesa_set_enable(ctx, GL_SCISSOR_TEST, save->Scissor.Enabled);

+      _mesa_Scissor(save->Scissor.X, save->Scissor.Y,

+                    save->Scissor.Width, save->Scissor.Height);

+   }

+

+   if (state & META_SHADER) {

+      if (ctx->Extensions.ARB_vertex_program) {

+         _mesa_set_enable(ctx, GL_VERTEX_PROGRAM_ARB,

+                          save->VertexProgramEnabled);

+         _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, 

+                                  save->VertexProgram);

+	 _mesa_reference_vertprog(ctx, &save->VertexProgram, NULL);

+      }

+

+      if (ctx->Extensions.ARB_fragment_program) {

+         _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB,

+                          save->FragmentProgramEnabled);

+         _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,

+                                  save->FragmentProgram);

+	 _mesa_reference_fragprog(ctx, &save->FragmentProgram, NULL);

+      }

+

+      if (ctx->Extensions.ARB_vertex_shader)

+	 _mesa_use_shader_program(ctx, GL_VERTEX_SHADER, save->VertexShader);

+

+      if (ctx->Extensions.ARB_geometry_shader4)

+	 _mesa_use_shader_program(ctx, GL_GEOMETRY_SHADER_ARB,

+				  save->GeometryShader);

+

+      if (ctx->Extensions.ARB_fragment_shader)

+	 _mesa_use_shader_program(ctx, GL_FRAGMENT_SHADER,

+				  save->FragmentShader);

+

+      _mesa_reference_shader_program(ctx, &ctx->Shader.ActiveProgram,

+				     save->ActiveShader);

+   }

+

+   if (state & META_STENCIL_TEST) {

+      const struct gl_stencil_attrib *stencil = &save->Stencil;

+

+      _mesa_set_enable(ctx, GL_STENCIL_TEST, stencil->Enabled);

+      _mesa_ClearStencil(stencil->Clear);

+      if (ctx->Extensions.EXT_stencil_two_side) {

+         _mesa_set_enable(ctx, GL_STENCIL_TEST_TWO_SIDE_EXT,

+                          stencil->TestTwoSide);

+         _mesa_ActiveStencilFaceEXT(stencil->ActiveFace

+                                    ? GL_BACK : GL_FRONT);

+      }

+      /* front state */

+      _mesa_StencilFuncSeparate(GL_FRONT,

+                                stencil->Function[0],

+                                stencil->Ref[0],

+                                stencil->ValueMask[0]);

+      _mesa_StencilMaskSeparate(GL_FRONT, stencil->WriteMask[0]);

+      _mesa_StencilOpSeparate(GL_FRONT, stencil->FailFunc[0],

+                              stencil->ZFailFunc[0],

+                              stencil->ZPassFunc[0]);

+      /* back state */

+      _mesa_StencilFuncSeparate(GL_BACK,

+                                stencil->Function[1],

+                                stencil->Ref[1],

+                                stencil->ValueMask[1]);

+      _mesa_StencilMaskSeparate(GL_BACK, stencil->WriteMask[1]);

+      _mesa_StencilOpSeparate(GL_BACK, stencil->FailFunc[1],

+                              stencil->ZFailFunc[1],

+                              stencil->ZPassFunc[1]);

+   }

+

+   if (state & META_TEXTURE) {

+      GLuint u, tgt;

+

+      ASSERT(ctx->Texture.CurrentUnit == 0);

+

+      /* restore texenv for unit[0] */

+      _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, save->EnvMode);

+

+      /* restore texture objects for unit[0] only */

+      for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {

+         _mesa_reference_texobj(&ctx->Texture.Unit[0].CurrentTex[tgt],

+                                save->CurrentTexture[tgt]);

+         _mesa_reference_texobj(&save->CurrentTexture[tgt], NULL);

+      }

+

+      /* Re-enable textures, texgen */

+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {

+         if (save->TexEnabled[u]) {

+            _mesa_ActiveTextureARB(GL_TEXTURE0 + u);

+

+            if (save->TexEnabled[u] & TEXTURE_1D_BIT)

+               _mesa_set_enable(ctx, GL_TEXTURE_1D, GL_TRUE);

+            if (save->TexEnabled[u] & TEXTURE_2D_BIT)

+               _mesa_set_enable(ctx, GL_TEXTURE_2D, GL_TRUE);

+            if (save->TexEnabled[u] & TEXTURE_3D_BIT)

+               _mesa_set_enable(ctx, GL_TEXTURE_3D, GL_TRUE);

+            if (save->TexEnabled[u] & TEXTURE_CUBE_BIT)

+               _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_TRUE);

+            if (save->TexEnabled[u] & TEXTURE_RECT_BIT)

+               _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE, GL_TRUE);

+         }

+

+         if (save->TexGenEnabled[u]) {

+            _mesa_ActiveTextureARB(GL_TEXTURE0 + u);

+

+            if (save->TexGenEnabled[u] & S_BIT)

+               _mesa_set_enable(ctx, GL_TEXTURE_GEN_S, GL_TRUE);

+            if (save->TexGenEnabled[u] & T_BIT)

+               _mesa_set_enable(ctx, GL_TEXTURE_GEN_T, GL_TRUE);

+            if (save->TexGenEnabled[u] & R_BIT)

+               _mesa_set_enable(ctx, GL_TEXTURE_GEN_R, GL_TRUE);

+            if (save->TexGenEnabled[u] & Q_BIT)

+               _mesa_set_enable(ctx, GL_TEXTURE_GEN_Q, GL_TRUE);

+         }

+      }

+

+      /* restore current unit state */

+      _mesa_ActiveTextureARB(GL_TEXTURE0 + save->ActiveUnit);

+      _mesa_ClientActiveTextureARB(GL_TEXTURE0 + save->ClientActiveUnit);

+   }

+

+   if (state & META_TRANSFORM) {

+      GLuint activeTexture = ctx->Texture.CurrentUnit;

+      _mesa_ActiveTextureARB(GL_TEXTURE0);

+      _mesa_MatrixMode(GL_TEXTURE);

+      _mesa_LoadMatrixf(save->TextureMatrix);

+      _mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture);

+

+      _mesa_MatrixMode(GL_MODELVIEW);

+      _mesa_LoadMatrixf(save->ModelviewMatrix);

+

+      _mesa_MatrixMode(GL_PROJECTION);

+      _mesa_LoadMatrixf(save->ProjectionMatrix);

+

+      _mesa_MatrixMode(save->MatrixMode);

+

+      if (save->ClipPlanesEnabled) {

+         GLuint i;

+         for (i = 0; i < ctx->Const.MaxClipPlanes; i++) {

+            if (save->ClipPlanesEnabled & (1 << i)) {

+               _mesa_set_enable(ctx, GL_CLIP_PLANE0 + i, GL_TRUE);

+            }

+         }

+      }

+   }

+

+   if (state & META_VERTEX) {

+      /* restore vertex buffer object */

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, save->ArrayBufferObj->Name);

+      _mesa_reference_buffer_object(ctx, &save->ArrayBufferObj, NULL);

+

+      /* restore vertex array object */

+      _mesa_BindVertexArray(save->ArrayObj->Name);

+      _mesa_reference_array_object(ctx, &save->ArrayObj, NULL);

+   }

+

+   if (state & META_VIEWPORT) {

+      if (save->ViewportX != ctx->Viewport.X ||

+          save->ViewportY != ctx->Viewport.Y ||

+          save->ViewportW != ctx->Viewport.Width ||

+          save->ViewportH != ctx->Viewport.Height) {

+         _mesa_set_viewport(ctx, save->ViewportX, save->ViewportY,

+                            save->ViewportW, save->ViewportH);

+      }

+      _mesa_DepthRange(save->DepthNear, save->DepthFar);

+   }

+

+   /* misc */

+   if (save->Lighting) {

+      _mesa_set_enable(ctx, GL_LIGHTING, GL_TRUE);

+   }

+}

+

+

+/**

+ * Convert Z from a normalized value in the range [0, 1] to an object-space

+ * Z coordinate in [-1, +1] so that drawing at the new Z position with the

+ * default/identity ortho projection results in the original Z value.

+ * Used by the meta-Clear, Draw/CopyPixels and Bitmap functions where the Z

+ * value comes from the clear value or raster position.

+ */

+static INLINE GLfloat

+invert_z(GLfloat normZ)

+{

+   GLfloat objZ = 1.0 - 2.0 * normZ;

+   return objZ;

+}

+

+

+/**

+ * One-time init for a temp_texture object.

+ * Choose tex target, compute max tex size, etc.

+ */

+static void

+init_temp_texture(struct gl_context *ctx, struct temp_texture *tex)

+{

+   /* prefer texture rectangle */

+   if (ctx->Extensions.NV_texture_rectangle) {

+      tex->Target = GL_TEXTURE_RECTANGLE;

+      tex->MaxSize = ctx->Const.MaxTextureRectSize;

+      tex->NPOT = GL_TRUE;

+   }

+   else {

+      /* use 2D texture, NPOT if possible */

+      tex->Target = GL_TEXTURE_2D;

+      tex->MaxSize = 1 << (ctx->Const.MaxTextureLevels - 1);

+      tex->NPOT = ctx->Extensions.ARB_texture_non_power_of_two;

+   }

+   tex->MinSize = 16;  /* 16 x 16 at least */

+   assert(tex->MaxSize > 0);

+

+   _mesa_GenTextures(1, &tex->TexObj);

+}

+

+

+/**

+ * Return pointer to temp_texture info for non-bitmap ops.

+ * This does some one-time init if needed.

+ */

+static struct temp_texture *

+get_temp_texture(struct gl_context *ctx)

+{

+   struct temp_texture *tex = &ctx->Meta->TempTex;

+

+   if (!tex->TexObj) {

+      init_temp_texture(ctx, tex);

+   }

+

+   return tex;

+}

+

+

+/**

+ * Return pointer to temp_texture info for _mesa_meta_bitmap().

+ * We use a separate texture for bitmaps to reduce texture

+ * allocation/deallocation.

+ */

+static struct temp_texture *

+get_bitmap_temp_texture(struct gl_context *ctx)

+{

+   struct temp_texture *tex = &ctx->Meta->Bitmap.Tex;

+

+   if (!tex->TexObj) {

+      init_temp_texture(ctx, tex);

+   }

+

+   return tex;

+}

+

+

+/**

+ * Compute the width/height of texture needed to draw an image of the

+ * given size.  Return a flag indicating whether the current texture

+ * can be re-used (glTexSubImage2D) or if a new texture needs to be

+ * allocated (glTexImage2D).

+ * Also, compute s/t texcoords for drawing.

+ *

+ * \return GL_TRUE if new texture is needed, GL_FALSE otherwise

+ */

+static GLboolean

+alloc_texture(struct temp_texture *tex,

+              GLsizei width, GLsizei height, GLenum intFormat)

+{

+   GLboolean newTex = GL_FALSE;

+

+   ASSERT(width <= tex->MaxSize);

+   ASSERT(height <= tex->MaxSize);

+

+   if (width > tex->Width ||

+       height > tex->Height ||

+       intFormat != tex->IntFormat) {

+      /* alloc new texture (larger or different format) */

+

+      if (tex->NPOT) {

+         /* use non-power of two size */

+         tex->Width = MAX2(tex->MinSize, width);

+         tex->Height = MAX2(tex->MinSize, height);

+      }

+      else {

+         /* find power of two size */

+         GLsizei w, h;

+         w = h = tex->MinSize;

+         while (w < width)

+            w *= 2;

+         while (h < height)

+            h *= 2;

+         tex->Width = w;

+         tex->Height = h;

+      }

+

+      tex->IntFormat = intFormat;

+

+      newTex = GL_TRUE;

+   }

+

+   /* compute texcoords */

+   if (tex->Target == GL_TEXTURE_RECTANGLE) {

+      tex->Sright = (GLfloat) width;

+      tex->Ttop = (GLfloat) height;

+   }

+   else {

+      tex->Sright = (GLfloat) width / tex->Width;

+      tex->Ttop = (GLfloat) height / tex->Height;

+   }

+

+   return newTex;

+}

+

+

+/**

+ * Setup/load texture for glCopyPixels or glBlitFramebuffer.

+ */

+static void

+setup_copypix_texture(struct temp_texture *tex,

+                      GLboolean newTex,

+                      GLint srcX, GLint srcY,

+                      GLsizei width, GLsizei height, GLenum intFormat,

+                      GLenum filter)

+{

+   _mesa_BindTexture(tex->Target, tex->TexObj);

+   _mesa_TexParameteri(tex->Target, GL_TEXTURE_MIN_FILTER, filter);

+   _mesa_TexParameteri(tex->Target, GL_TEXTURE_MAG_FILTER, filter);

+   _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);

+

+   /* copy framebuffer image to texture */

+   if (newTex) {

+      /* create new tex image */

+      if (tex->Width == width && tex->Height == height) {

+         /* create new tex with framebuffer data */

+         _mesa_CopyTexImage2D(tex->Target, 0, tex->IntFormat,

+                              srcX, srcY, width, height, 0);

+      }

+      else {

+         /* create empty texture */

+         _mesa_TexImage2D(tex->Target, 0, tex->IntFormat,

+                          tex->Width, tex->Height, 0,

+                          intFormat, GL_UNSIGNED_BYTE, NULL);

+         /* load image */

+         _mesa_CopyTexSubImage2D(tex->Target, 0,

+                                 0, 0, srcX, srcY, width, height);

+      }

+   }

+   else {

+      /* replace existing tex image */

+      _mesa_CopyTexSubImage2D(tex->Target, 0,

+                              0, 0, srcX, srcY, width, height);

+   }

+}

+

+

+/**

+ * Setup/load texture for glDrawPixels.

+ */

+static void

+setup_drawpix_texture(struct gl_context *ctx,

+		      struct temp_texture *tex,

+                      GLboolean newTex,

+                      GLenum texIntFormat,

+                      GLsizei width, GLsizei height,

+                      GLenum format, GLenum type,

+                      const GLvoid *pixels)

+{

+   _mesa_BindTexture(tex->Target, tex->TexObj);

+   _mesa_TexParameteri(tex->Target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

+   _mesa_TexParameteri(tex->Target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

+   _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);

+

+   /* copy pixel data to texture */

+   if (newTex) {

+      /* create new tex image */

+      if (tex->Width == width && tex->Height == height) {

+         /* create new tex and load image data */

+         _mesa_TexImage2D(tex->Target, 0, tex->IntFormat,

+                          tex->Width, tex->Height, 0, format, type, pixels);

+      }

+      else {

+	 struct gl_buffer_object *save_unpack_obj = NULL;

+

+	 _mesa_reference_buffer_object(ctx, &save_unpack_obj,

+				       ctx->Unpack.BufferObj);

+	 _mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);

+         /* create empty texture */

+         _mesa_TexImage2D(tex->Target, 0, tex->IntFormat,

+                          tex->Width, tex->Height, 0, format, type, NULL);

+	 if (save_unpack_obj != NULL)

+	    _mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB,

+				save_unpack_obj->Name);

+         /* load image */

+         _mesa_TexSubImage2D(tex->Target, 0,

+                             0, 0, width, height, format, type, pixels);

+      }

+   }

+   else {

+      /* replace existing tex image */

+      _mesa_TexSubImage2D(tex->Target, 0,

+                          0, 0, width, height, format, type, pixels);

+   }

+}

+

+

+

+/**

+ * One-time init for drawing depth pixels.

+ */

+static void

+init_blit_depth_pixels(struct gl_context *ctx)

+{

+   static const char *program =

+      "!!ARBfp1.0\n"

+      "TEX result.depth, fragment.texcoord[0], texture[0], %s; \n"

+      "END \n";

+   char program2[200];

+   struct blit_state *blit = &ctx->Meta->Blit;

+   struct temp_texture *tex = get_temp_texture(ctx);

+   const char *texTarget;

+

+   assert(blit->DepthFP == 0);

+

+   /* replace %s with "RECT" or "2D" */

+   assert(strlen(program) + 4 < sizeof(program2));

+   if (tex->Target == GL_TEXTURE_RECTANGLE)

+      texTarget = "RECT";

+   else

+      texTarget = "2D";

+   _mesa_snprintf(program2, sizeof(program2), program, texTarget);

+

+   _mesa_GenPrograms(1, &blit->DepthFP);

+   _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);

+   _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,

+                          strlen(program2), (const GLubyte *) program2);

+}

+

+

+/**

+ * Try to do a glBlitFramebuffer using no-copy texturing.

+ * We can do this when the src renderbuffer is actually a texture.

+ * But if the src buffer == dst buffer we cannot do this.

+ *

+ * \return new buffer mask indicating the buffers left to blit using the

+ *         normal path.

+ */

+static GLbitfield

+blitframebuffer_texture(struct gl_context *ctx,

+                        GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

+                        GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

+                        GLbitfield mask, GLenum filter)

+{

+   if (mask & GL_COLOR_BUFFER_BIT) {

+      const struct gl_framebuffer *drawFb = ctx->DrawBuffer;

+      const struct gl_framebuffer *readFb = ctx->ReadBuffer;

+      const struct gl_renderbuffer_attachment *drawAtt =

+         &drawFb->Attachment[drawFb->_ColorDrawBufferIndexes[0]];

+      const struct gl_renderbuffer_attachment *readAtt =

+         &readFb->Attachment[readFb->_ColorReadBufferIndex];

+

+      if (readAtt && readAtt->Texture) {

+         const struct gl_texture_object *texObj = readAtt->Texture;

+         const GLuint srcLevel = readAtt->TextureLevel;

+         const GLenum minFilterSave = texObj->MinFilter;

+         const GLenum magFilterSave = texObj->MagFilter;

+         const GLint baseLevelSave = texObj->BaseLevel;

+         const GLint maxLevelSave = texObj->MaxLevel;

+         const GLenum wrapSSave = texObj->WrapS;

+         const GLenum wrapTSave = texObj->WrapT;

+         const GLenum target = texObj->Target;

+

+         if (drawAtt->Texture == readAtt->Texture) {

+            /* Can't use same texture as both the source and dest.  We need

+             * to handle overlapping blits and besides, some hw may not

+             * support this.

+             */

+            return mask;

+         }

+

+         if (target != GL_TEXTURE_2D && target != GL_TEXTURE_RECTANGLE_ARB) {

+            /* Can't handle other texture types at this time */

+            return mask;

+         }

+

+         /*

+         printf("Blit from texture!\n");

+         printf("  srcAtt %p  dstAtt %p\n", readAtt, drawAtt);

+         printf("  srcTex %p  dstText %p\n", texObj, drawAtt->Texture);

+         */

+

+         /* Prepare src texture state */

+         _mesa_BindTexture(target, texObj->Name);

+         _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, filter);

+         _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, filter);

+         if (target != GL_TEXTURE_RECTANGLE_ARB) {

+            _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, srcLevel);

+            _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, srcLevel);

+         }

+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);

+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);

+         _mesa_set_enable(ctx, target, GL_TRUE);

+

+         /* Prepare vertex data (the VBO was previously created and bound) */

+         {

+            struct vertex {

+               GLfloat x, y, s, t;

+            };

+            struct vertex verts[4];

+            GLfloat s0, t0, s1, t1;

+

+            if (target == GL_TEXTURE_2D) {

+               const struct gl_texture_image *texImage

+                   = _mesa_select_tex_image(ctx, texObj, target, srcLevel);

+               s0 = srcX0 / (float) texImage->Width;

+               s1 = srcX1 / (float) texImage->Width;

+               t0 = srcY0 / (float) texImage->Height;

+               t1 = srcY1 / (float) texImage->Height;

+            }

+            else {

+               assert(target == GL_TEXTURE_RECTANGLE_ARB);

+               s0 = srcX0;

+               s1 = srcX1;

+               t0 = srcY0;

+               t1 = srcY1;

+            }

+

+            verts[0].x = (GLfloat) dstX0;

+            verts[0].y = (GLfloat) dstY0;

+            verts[1].x = (GLfloat) dstX1;

+            verts[1].y = (GLfloat) dstY0;

+            verts[2].x = (GLfloat) dstX1;

+            verts[2].y = (GLfloat) dstY1;

+            verts[3].x = (GLfloat) dstX0;

+            verts[3].y = (GLfloat) dstY1;

+

+            verts[0].s = s0;

+            verts[0].t = t0;

+            verts[1].s = s1;

+            verts[1].t = t0;

+            verts[2].s = s1;

+            verts[2].t = t1;

+            verts[3].s = s0;

+            verts[3].t = t1;

+

+            _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);

+         }

+

+         _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

+

+         /* Restore texture object state, the texture binding will

+          * be restored by _mesa_meta_end().

+          */

+         _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, minFilterSave);

+         _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, magFilterSave);

+         if (target != GL_TEXTURE_RECTANGLE_ARB) {

+            _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, baseLevelSave);

+            _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, maxLevelSave);

+         }

+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, wrapSSave);

+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, wrapTSave);

+

+         /* Done with color buffer */

+         mask &= ~GL_COLOR_BUFFER_BIT;

+      }

+   }

+

+   return mask;

+}

+

+

+/**

+ * Meta implementation of ctx->Driver.BlitFramebuffer() in terms

+ * of texture mapping and polygon rendering.

+ */

+void

+_mesa_meta_BlitFramebuffer(struct gl_context *ctx,

+                           GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

+                           GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

+                           GLbitfield mask, GLenum filter)

+{

+   struct blit_state *blit = &ctx->Meta->Blit;

+   struct temp_texture *tex = get_temp_texture(ctx);

+   const GLsizei maxTexSize = tex->MaxSize;

+   const GLint srcX = MIN2(srcX0, srcX1);

+   const GLint srcY = MIN2(srcY0, srcY1);

+   const GLint srcW = abs(srcX1 - srcX0);

+   const GLint srcH = abs(srcY1 - srcY0);

+   const GLboolean srcFlipX = srcX1 < srcX0;

+   const GLboolean srcFlipY = srcY1 < srcY0;

+   struct vertex {

+      GLfloat x, y, s, t;

+   };

+   struct vertex verts[4];

+   GLboolean newTex;

+

+   if (srcW > maxTexSize || srcH > maxTexSize) {

+      /* XXX avoid this fallback */

+      _swrast_BlitFramebuffer(ctx, srcX0, srcY0, srcX1, srcY1,

+                              dstX0, dstY0, dstX1, dstY1, mask, filter);

+      return;

+   }

+

+   if (srcFlipX) {

+      GLint tmp = dstX0;

+      dstX0 = dstX1;

+      dstX1 = tmp;

+   }

+

+   if (srcFlipY) {

+      GLint tmp = dstY0;

+      dstY0 = dstY1;

+      dstY1 = tmp;

+   }

+

+   /* only scissor effects blit so save/clear all other relevant state */

+   _mesa_meta_begin(ctx, ~META_SCISSOR);

+

+   if (blit->ArrayObj == 0) {

+      /* one-time setup */

+

+      /* create vertex array object */

+      _mesa_GenVertexArrays(1, &blit->ArrayObj);

+      _mesa_BindVertexArray(blit->ArrayObj);

+

+      /* create vertex array buffer */

+      _mesa_GenBuffersARB(1, &blit->VBO);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO);

+      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),

+                          NULL, GL_DYNAMIC_DRAW_ARB);

+

+      /* setup vertex arrays */

+      _mesa_VertexPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(x));

+      _mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(s));

+      _mesa_EnableClientState(GL_VERTEX_ARRAY);

+      _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);

+   }

+   else {

+      _mesa_BindVertexArray(blit->ArrayObj);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO);

+   }

+

+   /* Try faster, direct texture approach first */

+   mask = blitframebuffer_texture(ctx, srcX0, srcY0, srcX1, srcY1,

+                                  dstX0, dstY0, dstX1, dstY1, mask, filter);

+   if (mask == 0x0) {

+      _mesa_meta_end(ctx);

+      return;

+   }

+

+   /* Continue with "normal" approach which involves copying the src rect

+    * into a temporary texture and is "blitted" by drawing a textured quad.

+    */

+

+   newTex = alloc_texture(tex, srcW, srcH, GL_RGBA);

+

+   /* vertex positions/texcoords (after texture allocation!) */

+   {

+      verts[0].x = (GLfloat) dstX0;

+      verts[0].y = (GLfloat) dstY0;

+      verts[1].x = (GLfloat) dstX1;

+      verts[1].y = (GLfloat) dstY0;

+      verts[2].x = (GLfloat) dstX1;

+      verts[2].y = (GLfloat) dstY1;

+      verts[3].x = (GLfloat) dstX0;

+      verts[3].y = (GLfloat) dstY1;

+

+      verts[0].s = 0.0F;

+      verts[0].t = 0.0F;

+      verts[1].s = tex->Sright;

+      verts[1].t = 0.0F;

+      verts[2].s = tex->Sright;

+      verts[2].t = tex->Ttop;

+      verts[3].s = 0.0F;

+      verts[3].t = tex->Ttop;

+

+      /* upload new vertex data */

+      _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);

+   }

+

+   _mesa_set_enable(ctx, tex->Target, GL_TRUE);

+

+   if (mask & GL_COLOR_BUFFER_BIT) {

+      setup_copypix_texture(tex, newTex, srcX, srcY, srcW, srcH,

+                            GL_RGBA, filter);

+      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

+      mask &= ~GL_COLOR_BUFFER_BIT;

+   }

+

+   if (mask & GL_DEPTH_BUFFER_BIT) {

+      GLuint *tmp = (GLuint *) malloc(srcW * srcH * sizeof(GLuint));

+      if (tmp) {

+         if (!blit->DepthFP)

+            init_blit_depth_pixels(ctx);

+

+         /* maybe change tex format here */

+         newTex = alloc_texture(tex, srcW, srcH, GL_DEPTH_COMPONENT);

+

+         _mesa_ReadPixels(srcX, srcY, srcW, srcH,

+                          GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp);

+

+         setup_drawpix_texture(ctx, tex, newTex, GL_DEPTH_COMPONENT, srcW, srcH,

+                               GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp);

+

+         _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);

+         _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);

+         _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);

+         _mesa_set_enable(ctx, GL_DEPTH_TEST, GL_TRUE);

+         _mesa_DepthFunc(GL_ALWAYS);

+         _mesa_DepthMask(GL_TRUE);

+

+         _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

+         mask &= ~GL_DEPTH_BUFFER_BIT;

+

+         free(tmp);

+      }

+   }

+

+   if (mask & GL_STENCIL_BUFFER_BIT) {

+      /* XXX can't easily do stencil */

+   }

+

+   _mesa_set_enable(ctx, tex->Target, GL_FALSE);

+

+   _mesa_meta_end(ctx);

+

+   if (mask) {

+      _swrast_BlitFramebuffer(ctx, srcX0, srcY0, srcX1, srcY1,

+                              dstX0, dstY0, dstX1, dstY1, mask, filter);

+   }

+}

+

+

+/**

+ * Meta implementation of ctx->Driver.Clear() in terms of polygon rendering.

+ */

+void

+_mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers)

+{

+   struct clear_state *clear = &ctx->Meta->Clear;

+   struct vertex {

+      GLfloat x, y, z, r, g, b, a;

+   };

+   struct vertex verts[4];

+   /* save all state but scissor, pixel pack/unpack */

+   GLbitfield metaSave = META_ALL - META_SCISSOR - META_PIXEL_STORE;

+   const GLuint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;

+

+   if (buffers & BUFFER_BITS_COLOR) {

+      /* if clearing color buffers, don't save/restore colormask */

+      metaSave -= META_COLOR_MASK;

+   }

+

+   _mesa_meta_begin(ctx, metaSave);

+

+   if (clear->ArrayObj == 0) {

+      /* one-time setup */

+

+      /* create vertex array object */

+      _mesa_GenVertexArrays(1, &clear->ArrayObj);

+      _mesa_BindVertexArray(clear->ArrayObj);

+

+      /* create vertex array buffer */

+      _mesa_GenBuffersARB(1, &clear->VBO);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);

+

+      /* setup vertex arrays */

+      _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));

+      _mesa_ColorPointer(4, GL_FLOAT, sizeof(struct vertex), OFFSET(r));

+      _mesa_EnableClientState(GL_VERTEX_ARRAY);

+      _mesa_EnableClientState(GL_COLOR_ARRAY);

+   }

+   else {

+      _mesa_BindVertexArray(clear->ArrayObj);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);

+   }

+

+   /* GL_COLOR_BUFFER_BIT */

+   if (buffers & BUFFER_BITS_COLOR) {

+      /* leave colormask, glDrawBuffer state as-is */

+   }

+   else {

+      ASSERT(metaSave & META_COLOR_MASK);

+      _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);

+   }

+

+   /* GL_DEPTH_BUFFER_BIT */

+   if (buffers & BUFFER_BIT_DEPTH) {

+      _mesa_set_enable(ctx, GL_DEPTH_TEST, GL_TRUE);

+      _mesa_DepthFunc(GL_ALWAYS);

+      _mesa_DepthMask(GL_TRUE);

+   }

+   else {

+      assert(!ctx->Depth.Test);

+   }

+

+   /* GL_STENCIL_BUFFER_BIT */

+   if (buffers & BUFFER_BIT_STENCIL) {

+      _mesa_set_enable(ctx, GL_STENCIL_TEST, GL_TRUE);

+      _mesa_StencilOpSeparate(GL_FRONT_AND_BACK,

+                              GL_REPLACE, GL_REPLACE, GL_REPLACE);

+      _mesa_StencilFuncSeparate(GL_FRONT_AND_BACK, GL_ALWAYS,

+                                ctx->Stencil.Clear & stencilMax,

+                                ctx->Stencil.WriteMask[0]);

+   }

+   else {

+      assert(!ctx->Stencil.Enabled);

+   }

+

+   /* vertex positions/colors */

+   {

+      const GLfloat x0 = (GLfloat) ctx->DrawBuffer->_Xmin;

+      const GLfloat y0 = (GLfloat) ctx->DrawBuffer->_Ymin;

+      const GLfloat x1 = (GLfloat) ctx->DrawBuffer->_Xmax;

+      const GLfloat y1 = (GLfloat) ctx->DrawBuffer->_Ymax;

+      const GLfloat z = invert_z(ctx->Depth.Clear);

+      GLuint i;

+

+      verts[0].x = x0;

+      verts[0].y = y0;

+      verts[0].z = z;

+      verts[1].x = x1;

+      verts[1].y = y0;

+      verts[1].z = z;

+      verts[2].x = x1;

+      verts[2].y = y1;

+      verts[2].z = z;

+      verts[3].x = x0;

+      verts[3].y = y1;

+      verts[3].z = z;

+

+      /* vertex colors */

+      for (i = 0; i < 4; i++) {

+         verts[i].r = ctx->Color.ClearColor[0];

+         verts[i].g = ctx->Color.ClearColor[1];

+         verts[i].b = ctx->Color.ClearColor[2];

+         verts[i].a = ctx->Color.ClearColor[3];

+      }

+

+      /* upload new vertex data */

+      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts,

+			  GL_DYNAMIC_DRAW_ARB);

+   }

+

+   /* draw quad */

+   _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

+

+   _mesa_meta_end(ctx);

+}

+

+

+/**

+ * Meta implementation of ctx->Driver.CopyPixels() in terms

+ * of texture mapping and polygon rendering.

+ */

+void

+_mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY,

+                      GLsizei width, GLsizei height,

+                      GLint dstX, GLint dstY, GLenum type)

+{

+   struct copypix_state *copypix = &ctx->Meta->CopyPix;

+   struct temp_texture *tex = get_temp_texture(ctx);

+   struct vertex {

+      GLfloat x, y, z, s, t;

+   };

+   struct vertex verts[4];

+   GLboolean newTex;

+   GLenum intFormat = GL_RGBA;

+

+   if (type != GL_COLOR ||

+       ctx->_ImageTransferState ||

+       ctx->Fog.Enabled ||

+       width > tex->MaxSize ||

+       height > tex->MaxSize) {

+      /* XXX avoid this fallback */

+      _swrast_CopyPixels(ctx, srcX, srcY, width, height, dstX, dstY, type);

+      return;

+   }

+

+   /* Most GL state applies to glCopyPixels, but a there's a few things

+    * we need to override:

+    */

+   _mesa_meta_begin(ctx, (META_RASTERIZATION |

+                          META_SHADER |

+                          META_TEXTURE |

+                          META_TRANSFORM |

+                          META_VERTEX |

+                          META_VIEWPORT));

+

+   if (copypix->ArrayObj == 0) {

+      /* one-time setup */

+

+      /* create vertex array object */

+      _mesa_GenVertexArrays(1, &copypix->ArrayObj);

+      _mesa_BindVertexArray(copypix->ArrayObj);

+

+      /* create vertex array buffer */

+      _mesa_GenBuffersARB(1, &copypix->VBO);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO);

+      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),

+                          NULL, GL_DYNAMIC_DRAW_ARB);

+

+      /* setup vertex arrays */

+      _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));

+      _mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(s));

+      _mesa_EnableClientState(GL_VERTEX_ARRAY);

+      _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);

+   }

+   else {

+      _mesa_BindVertexArray(copypix->ArrayObj);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO);

+   }

+

+   newTex = alloc_texture(tex, width, height, intFormat);

+

+   /* vertex positions, texcoords (after texture allocation!) */

+   {

+      const GLfloat dstX0 = (GLfloat) dstX;

+      const GLfloat dstY0 = (GLfloat) dstY;

+      const GLfloat dstX1 = dstX + width * ctx->Pixel.ZoomX;

+      const GLfloat dstY1 = dstY + height * ctx->Pixel.ZoomY;

+      const GLfloat z = invert_z(ctx->Current.RasterPos[2]);

+

+      verts[0].x = dstX0;

+      verts[0].y = dstY0;

+      verts[0].z = z;

+      verts[0].s = 0.0F;

+      verts[0].t = 0.0F;

+      verts[1].x = dstX1;

+      verts[1].y = dstY0;

+      verts[1].z = z;

+      verts[1].s = tex->Sright;

+      verts[1].t = 0.0F;

+      verts[2].x = dstX1;

+      verts[2].y = dstY1;

+      verts[2].z = z;

+      verts[2].s = tex->Sright;

+      verts[2].t = tex->Ttop;

+      verts[3].x = dstX0;

+      verts[3].y = dstY1;

+      verts[3].z = z;

+      verts[3].s = 0.0F;

+      verts[3].t = tex->Ttop;

+

+      /* upload new vertex data */

+      _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);

+   }

+

+   /* Alloc/setup texture */

+   setup_copypix_texture(tex, newTex, srcX, srcY, width, height,

+                         GL_RGBA, GL_NEAREST);

+

+   _mesa_set_enable(ctx, tex->Target, GL_TRUE);

+

+   /* draw textured quad */

+   _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

+

+   _mesa_set_enable(ctx, tex->Target, GL_FALSE);

+

+   _mesa_meta_end(ctx);

+}

+

+

+

+/**

+ * When the glDrawPixels() image size is greater than the max rectangle

+ * texture size we use this function to break the glDrawPixels() image

+ * into tiles which fit into the max texture size.

+ */

+static void

+tiled_draw_pixels(struct gl_context *ctx,

+                  GLint tileSize,

+                  GLint x, GLint y, GLsizei width, GLsizei height,

+                  GLenum format, GLenum type,

+                  const struct gl_pixelstore_attrib *unpack,

+                  const GLvoid *pixels)

+{

+   struct gl_pixelstore_attrib tileUnpack = *unpack;

+   GLint i, j;

+

+   if (tileUnpack.RowLength == 0)

+      tileUnpack.RowLength = width;

+

+   for (i = 0; i < width; i += tileSize) {

+      const GLint tileWidth = MIN2(tileSize, width - i);

+      const GLint tileX = (GLint) (x + i * ctx->Pixel.ZoomX);

+

+      tileUnpack.SkipPixels = unpack->SkipPixels + i;

+

+      for (j = 0; j < height; j += tileSize) {

+         const GLint tileHeight = MIN2(tileSize, height - j);

+         const GLint tileY = (GLint) (y + j * ctx->Pixel.ZoomY);

+

+         tileUnpack.SkipRows = unpack->SkipRows + j;

+

+         _mesa_meta_DrawPixels(ctx, tileX, tileY, tileWidth, tileHeight,

+                               format, type, &tileUnpack, pixels);

+      }

+   }

+}

+

+

+/**

+ * One-time init for drawing stencil pixels.

+ */

+static void

+init_draw_stencil_pixels(struct gl_context *ctx)

+{

+   /* This program is run eight times, once for each stencil bit.

+    * The stencil values to draw are found in an 8-bit alpha texture.

+    * We read the texture/stencil value and test if bit 'b' is set.

+    * If the bit is not set, use KIL to kill the fragment.

+    * Finally, we use the stencil test to update the stencil buffer.

+    *

+    * The basic algorithm for checking if a bit is set is:

+    *   if (is_odd(value / (1 << bit)))

+    *      result is one (or non-zero).

+    *   else

+    *      result is zero.

+    * The program parameter contains three values:

+    *   parm.x = 255 / (1 << bit)

+    *   parm.y = 0.5

+    *   parm.z = 0.0

+    */

+   static const char *program =

+      "!!ARBfp1.0\n"

+      "PARAM parm = program.local[0]; \n"

+      "TEMP t; \n"

+      "TEX t, fragment.texcoord[0], texture[0], %s; \n"   /* NOTE %s here! */

+      "# t = t * 255 / bit \n"

+      "MUL t.x, t.a, parm.x; \n"

+      "# t = (int) t \n"

+      "FRC t.y, t.x; \n"

+      "SUB t.x, t.x, t.y; \n"

+      "# t = t * 0.5 \n"

+      "MUL t.x, t.x, parm.y; \n"

+      "# t = fract(t.x) \n"

+      "FRC t.x, t.x; # if t.x != 0, then the bit is set \n"

+      "# t.x = (t.x == 0 ? 1 : 0) \n"

+      "SGE t.x, -t.x, parm.z; \n"

+      "KIL -t.x; \n"

+      "# for debug only \n"

+      "#MOV result.color, t.x; \n"

+      "END \n";

+   char program2[1000];

+   struct drawpix_state *drawpix = &ctx->Meta->DrawPix;

+   struct temp_texture *tex = get_temp_texture(ctx);

+   const char *texTarget;

+

+   assert(drawpix->StencilFP == 0);

+

+   /* replace %s with "RECT" or "2D" */

+   assert(strlen(program) + 4 < sizeof(program2));

+   if (tex->Target == GL_TEXTURE_RECTANGLE)

+      texTarget = "RECT";

+   else

+      texTarget = "2D";

+   _mesa_snprintf(program2, sizeof(program2), program, texTarget);

+

+   _mesa_GenPrograms(1, &drawpix->StencilFP);

+   _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);

+   _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,

+                          strlen(program2), (const GLubyte *) program2);

+}

+

+

+/**

+ * One-time init for drawing depth pixels.

+ */

+static void

+init_draw_depth_pixels(struct gl_context *ctx)

+{

+   static const char *program =

+      "!!ARBfp1.0\n"

+      "PARAM color = program.local[0]; \n"

+      "TEX result.depth, fragment.texcoord[0], texture[0], %s; \n"

+      "MOV result.color, color; \n"

+      "END \n";

+   char program2[200];

+   struct drawpix_state *drawpix = &ctx->Meta->DrawPix;

+   struct temp_texture *tex = get_temp_texture(ctx);

+   const char *texTarget;

+

+   assert(drawpix->DepthFP == 0);

+

+   /* replace %s with "RECT" or "2D" */

+   assert(strlen(program) + 4 < sizeof(program2));

+   if (tex->Target == GL_TEXTURE_RECTANGLE)

+      texTarget = "RECT";

+   else

+      texTarget = "2D";

+   _mesa_snprintf(program2, sizeof(program2), program, texTarget);

+

+   _mesa_GenPrograms(1, &drawpix->DepthFP);

+   _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);

+   _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,

+                          strlen(program2), (const GLubyte *) program2);

+}

+

+

+/**

+ * Meta implementation of ctx->Driver.DrawPixels() in terms

+ * of texture mapping and polygon rendering.

+ */

+void

+_mesa_meta_DrawPixels(struct gl_context *ctx,

+                      GLint x, GLint y, GLsizei width, GLsizei height,

+                      GLenum format, GLenum type,

+                      const struct gl_pixelstore_attrib *unpack,

+                      const GLvoid *pixels)

+{

+   struct drawpix_state *drawpix = &ctx->Meta->DrawPix;

+   struct temp_texture *tex = get_temp_texture(ctx);

+   const struct gl_pixelstore_attrib unpackSave = ctx->Unpack;

+   const GLuint origStencilMask = ctx->Stencil.WriteMask[0];

+   struct vertex {

+      GLfloat x, y, z, s, t;

+   };

+   struct vertex verts[4];

+   GLenum texIntFormat;

+   GLboolean fallback, newTex;

+   GLbitfield metaExtraSave = 0x0;

+   GLuint vbo;

+

+   /*

+    * Determine if we can do the glDrawPixels with texture mapping.

+    */

+   fallback = GL_FALSE;

+   if (ctx->_ImageTransferState ||

+       ctx->Fog.Enabled) {

+      fallback = GL_TRUE;

+   }

+

+   if (_mesa_is_color_format(format)) {

+      /* use more compact format when possible */

+      /* XXX disable special case for GL_LUMINANCE for now to work around

+       * apparent i965 driver bug (see bug #23670).

+       */

+      if (/*format == GL_LUMINANCE ||*/ format == GL_LUMINANCE_ALPHA)

+         texIntFormat = format;

+      else

+         texIntFormat = GL_RGBA;

+   }

+   else if (_mesa_is_stencil_format(format)) {

+      if (ctx->Extensions.ARB_fragment_program &&

+          ctx->Pixel.IndexShift == 0 &&

+          ctx->Pixel.IndexOffset == 0 &&

+          type == GL_UNSIGNED_BYTE) {

+         /* We'll store stencil as alpha.  This only works for GLubyte

+          * image data because of how incoming values are mapped to alpha

+          * in [0,1].

+          */

+         texIntFormat = GL_ALPHA;

+         metaExtraSave = (META_COLOR_MASK |

+                          META_DEPTH_TEST |

+                          META_SHADER |

+                          META_STENCIL_TEST);

+      }

+      else {

+         fallback = GL_TRUE;

+      }

+   }

+   else if (_mesa_is_depth_format(format)) {

+      if (ctx->Extensions.ARB_depth_texture &&

+          ctx->Extensions.ARB_fragment_program) {

+         texIntFormat = GL_DEPTH_COMPONENT;

+         metaExtraSave = (META_SHADER);

+      }

+      else {

+         fallback = GL_TRUE;

+      }

+   }

+   else {

+      fallback = GL_TRUE;

+   }

+

+   if (fallback) {

+      _swrast_DrawPixels(ctx, x, y, width, height,

+                         format, type, unpack, pixels);

+      return;

+   }

+

+   /*

+    * Check image size against max texture size, draw as tiles if needed.

+    */

+   if (width > tex->MaxSize || height > tex->MaxSize) {

+      tiled_draw_pixels(ctx, tex->MaxSize, x, y, width, height,

+                        format, type, unpack, pixels);

+      return;

+   }

+

+   /* Most GL state applies to glDrawPixels (like blending, stencil, etc),

+    * but a there's a few things we need to override:

+    */

+   _mesa_meta_begin(ctx, (META_RASTERIZATION |

+                          META_SHADER |

+                          META_TEXTURE |

+                          META_TRANSFORM |

+                          META_VERTEX |

+                          META_VIEWPORT |

+                          metaExtraSave));

+

+   newTex = alloc_texture(tex, width, height, texIntFormat);

+

+   /* vertex positions, texcoords (after texture allocation!) */

+   {

+      const GLfloat x0 = (GLfloat) x;

+      const GLfloat y0 = (GLfloat) y;

+      const GLfloat x1 = x + width * ctx->Pixel.ZoomX;

+      const GLfloat y1 = y + height * ctx->Pixel.ZoomY;

+      const GLfloat z = invert_z(ctx->Current.RasterPos[2]);

+

+      verts[0].x = x0;

+      verts[0].y = y0;

+      verts[0].z = z;

+      verts[0].s = 0.0F;

+      verts[0].t = 0.0F;

+      verts[1].x = x1;

+      verts[1].y = y0;

+      verts[1].z = z;

+      verts[1].s = tex->Sright;

+      verts[1].t = 0.0F;

+      verts[2].x = x1;

+      verts[2].y = y1;

+      verts[2].z = z;

+      verts[2].s = tex->Sright;

+      verts[2].t = tex->Ttop;

+      verts[3].x = x0;

+      verts[3].y = y1;

+      verts[3].z = z;

+      verts[3].s = 0.0F;

+      verts[3].t = tex->Ttop;

+   }

+

+   if (drawpix->ArrayObj == 0) {

+      /* one-time setup: create vertex array object */

+      _mesa_GenVertexArrays(1, &drawpix->ArrayObj);

+   }

+   _mesa_BindVertexArray(drawpix->ArrayObj);

+

+   /* create vertex array buffer */

+   _mesa_GenBuffersARB(1, &vbo);

+   _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, vbo);

+   _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),

+                       verts, GL_DYNAMIC_DRAW_ARB);

+

+   /* setup vertex arrays */

+   _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));

+   _mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(s));

+   _mesa_EnableClientState(GL_VERTEX_ARRAY);

+   _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);

+

+   /* set given unpack params */

+   ctx->Unpack = *unpack;

+

+   _mesa_set_enable(ctx, tex->Target, GL_TRUE);

+

+   if (_mesa_is_stencil_format(format)) {

+      /* Drawing stencil */

+      GLint bit;

+

+      if (!drawpix->StencilFP)

+         init_draw_stencil_pixels(ctx);

+

+      setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,

+                            GL_ALPHA, type, pixels);

+

+      _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);

+

+      _mesa_set_enable(ctx, GL_STENCIL_TEST, GL_TRUE);

+

+      /* set all stencil bits to 0 */

+      _mesa_StencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);

+      _mesa_StencilFunc(GL_ALWAYS, 0, 255);

+      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

+  

+      /* set stencil bits to 1 where needed */

+      _mesa_StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);

+

+      _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);

+      _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);

+

+      for (bit = 0; bit < ctx->DrawBuffer->Visual.stencilBits; bit++) {

+         const GLuint mask = 1 << bit;

+         if (mask & origStencilMask) {

+            _mesa_StencilFunc(GL_ALWAYS, mask, mask);

+            _mesa_StencilMask(mask);

+

+            _mesa_ProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, 0,

+                                             255.0 / mask, 0.5, 0.0, 0.0);

+

+            _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

+         }

+      }

+   }

+   else if (_mesa_is_depth_format(format)) {

+      /* Drawing depth */

+      if (!drawpix->DepthFP)

+         init_draw_depth_pixels(ctx);

+

+      _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);

+      _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);

+

+      /* polygon color = current raster color */

+      _mesa_ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, 0,

+                                        ctx->Current.RasterColor);

+

+      setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,

+                            format, type, pixels);

+

+      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

+   }

+   else {

+      /* Drawing RGBA */

+      setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,

+                            format, type, pixels);

+      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

+   }

+

+   _mesa_set_enable(ctx, tex->Target, GL_FALSE);

+

+   _mesa_DeleteBuffersARB(1, &vbo);

+

+   /* restore unpack params */

+   ctx->Unpack = unpackSave;

+

+   _mesa_meta_end(ctx);

+}

+

+static GLboolean

+alpha_test_raster_color(struct gl_context *ctx)

+{

+   GLfloat alpha = ctx->Current.RasterColor[ACOMP];

+   GLfloat ref = ctx->Color.AlphaRef;

+

+   switch (ctx->Color.AlphaFunc) {

+      case GL_NEVER:

+	 return GL_FALSE;

+      case GL_LESS:

+	 return alpha < ref;

+      case GL_EQUAL:

+	 return alpha == ref;

+      case GL_LEQUAL:

+	 return alpha <= ref;

+      case GL_GREATER:

+	 return alpha > ref;

+      case GL_NOTEQUAL:

+	 return alpha != ref;

+      case GL_GEQUAL:

+	 return alpha >= ref;

+      case GL_ALWAYS:

+	 return GL_TRUE;

+      default:

+	 assert(0);

+	 return GL_FALSE;

+   }

+}

+

+/**

+ * Do glBitmap with a alpha texture quad.  Use the alpha test to cull

+ * the 'off' bits.  A bitmap cache as in the gallium/mesa state

+ * tracker would improve performance a lot.

+ */

+void

+_mesa_meta_Bitmap(struct gl_context *ctx,

+                  GLint x, GLint y, GLsizei width, GLsizei height,

+                  const struct gl_pixelstore_attrib *unpack,

+                  const GLubyte *bitmap1)

+{

+   struct bitmap_state *bitmap = &ctx->Meta->Bitmap;

+   struct temp_texture *tex = get_bitmap_temp_texture(ctx);

+   const GLenum texIntFormat = GL_ALPHA;

+   const struct gl_pixelstore_attrib unpackSave = *unpack;

+   GLubyte fg, bg;

+   struct vertex {

+      GLfloat x, y, z, s, t, r, g, b, a;

+   };

+   struct vertex verts[4];

+   GLboolean newTex;

+   GLubyte *bitmap8;

+

+   /*

+    * Check if swrast fallback is needed.

+    */

+   if (ctx->_ImageTransferState ||

+       ctx->FragmentProgram._Enabled ||

+       ctx->Fog.Enabled ||

+       ctx->Texture._EnabledUnits ||

+       width > tex->MaxSize ||

+       height > tex->MaxSize) {

+      _swrast_Bitmap(ctx, x, y, width, height, unpack, bitmap1);

+      return;

+   }

+

+   if (ctx->Color.AlphaEnabled && !alpha_test_raster_color(ctx))

+      return;

+

+   /* Most GL state applies to glBitmap (like blending, stencil, etc),

+    * but a there's a few things we need to override:

+    */

+   _mesa_meta_begin(ctx, (META_ALPHA_TEST |

+                          META_PIXEL_STORE |

+                          META_RASTERIZATION |

+                          META_SHADER |

+                          META_TEXTURE |

+                          META_TRANSFORM |

+                          META_VERTEX |

+                          META_VIEWPORT));

+

+   if (bitmap->ArrayObj == 0) {

+      /* one-time setup */

+

+      /* create vertex array object */

+      _mesa_GenVertexArraysAPPLE(1, &bitmap->ArrayObj);

+      _mesa_BindVertexArrayAPPLE(bitmap->ArrayObj);

+

+      /* create vertex array buffer */

+      _mesa_GenBuffersARB(1, &bitmap->VBO);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO);

+      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),

+                          NULL, GL_DYNAMIC_DRAW_ARB);

+

+      /* setup vertex arrays */

+      _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));

+      _mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(s));

+      _mesa_ColorPointer(4, GL_FLOAT, sizeof(struct vertex), OFFSET(r));

+      _mesa_EnableClientState(GL_VERTEX_ARRAY);

+      _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);

+      _mesa_EnableClientState(GL_COLOR_ARRAY);

+   }

+   else {

+      _mesa_BindVertexArray(bitmap->ArrayObj);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO);

+   }

+

+   newTex = alloc_texture(tex, width, height, texIntFormat);

+

+   /* vertex positions, texcoords, colors (after texture allocation!) */

+   {

+      const GLfloat x0 = (GLfloat) x;

+      const GLfloat y0 = (GLfloat) y;

+      const GLfloat x1 = (GLfloat) (x + width);

+      const GLfloat y1 = (GLfloat) (y + height);

+      const GLfloat z = invert_z(ctx->Current.RasterPos[2]);

+      GLuint i;

+

+      verts[0].x = x0;

+      verts[0].y = y0;

+      verts[0].z = z;

+      verts[0].s = 0.0F;

+      verts[0].t = 0.0F;

+      verts[1].x = x1;

+      verts[1].y = y0;

+      verts[1].z = z;

+      verts[1].s = tex->Sright;

+      verts[1].t = 0.0F;

+      verts[2].x = x1;

+      verts[2].y = y1;

+      verts[2].z = z;

+      verts[2].s = tex->Sright;

+      verts[2].t = tex->Ttop;

+      verts[3].x = x0;

+      verts[3].y = y1;

+      verts[3].z = z;

+      verts[3].s = 0.0F;

+      verts[3].t = tex->Ttop;

+

+      for (i = 0; i < 4; i++) {

+         verts[i].r = ctx->Current.RasterColor[0];

+         verts[i].g = ctx->Current.RasterColor[1];

+         verts[i].b = ctx->Current.RasterColor[2];

+         verts[i].a = ctx->Current.RasterColor[3];

+      }

+

+      /* upload new vertex data */

+      _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);

+   }

+

+   /* choose different foreground/background alpha values */

+   CLAMPED_FLOAT_TO_UBYTE(fg, ctx->Current.RasterColor[ACOMP]);

+   bg = (fg > 127 ? 0 : 255);

+

+   bitmap1 = _mesa_map_pbo_source(ctx, &unpackSave, bitmap1);

+   if (!bitmap1) {

+      _mesa_meta_end(ctx);

+      return;

+   }

+

+   bitmap8 = (GLubyte *) malloc(width * height);

+   if (bitmap8) {

+      memset(bitmap8, bg, width * height);

+      _mesa_expand_bitmap(width, height, &unpackSave, bitmap1,

+                          bitmap8, width, fg);

+

+      _mesa_set_enable(ctx, tex->Target, GL_TRUE);

+

+      _mesa_set_enable(ctx, GL_ALPHA_TEST, GL_TRUE);

+      _mesa_AlphaFunc(GL_NOTEQUAL, UBYTE_TO_FLOAT(bg));

+

+      setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,

+                            GL_ALPHA, GL_UNSIGNED_BYTE, bitmap8);

+

+      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

+

+      _mesa_set_enable(ctx, tex->Target, GL_FALSE);

+

+      free(bitmap8);

+   }

+

+   _mesa_unmap_pbo_source(ctx, &unpackSave);

+

+   _mesa_meta_end(ctx);

+}

+

+

+/**

+ * Check if the call to _mesa_meta_GenerateMipmap() will require a

+ * software fallback.  The fallback path will require that the texture

+ * images are mapped.

+ * \return GL_TRUE if a fallback is needed, GL_FALSE otherwise

+ */

+GLboolean

+_mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,

+                                          struct gl_texture_object *texObj)

+{

+   const GLuint fboSave = ctx->DrawBuffer->Name;

+   struct gen_mipmap_state *mipmap = &ctx->Meta->Mipmap;

+   struct gl_texture_image *baseImage;

+   GLuint srcLevel;

+   GLenum status;

+

+   /* check for fallbacks */

+   if (!ctx->Extensions.EXT_framebuffer_object ||

+       target == GL_TEXTURE_3D) {

+      return GL_TRUE;

+   }

+

+   srcLevel = texObj->BaseLevel;

+   baseImage = _mesa_select_tex_image(ctx, texObj, target, srcLevel);

+   if (!baseImage || _mesa_is_format_compressed(baseImage->TexFormat)) {

+      return GL_TRUE;

+   }

+

+   /*

+    * Test that we can actually render in the texture's format.

+    */

+   if (!mipmap->FBO)

+      _mesa_GenFramebuffersEXT(1, &mipmap->FBO);

+   _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO);

+

+   if (target == GL_TEXTURE_1D) {

+      _mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT,

+                                    GL_COLOR_ATTACHMENT0_EXT,

+                                    target, texObj->Name, srcLevel);

+   }

+#if 0

+   /* other work is needed to enable 3D mipmap generation */

+   else if (target == GL_TEXTURE_3D) {

+      GLint zoffset = 0;

+      _mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT,

+                                    GL_COLOR_ATTACHMENT0_EXT,

+                                    target, texObj->Name, srcLevel, zoffset);

+   }

+#endif

+   else {

+      /* 2D / cube */

+      _mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,

+                                    GL_COLOR_ATTACHMENT0_EXT,

+                                    target, texObj->Name, srcLevel);

+   }

+

+   status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);

+

+   _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave);

+

+   if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+      return GL_TRUE;

+   }

+

+   return GL_FALSE;

+}

+

+

+/**

+ * Called via ctx->Driver.GenerateMipmap()

+ * Note: texture borders and 3D texture support not yet complete.

+ */

+void

+_mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,

+                          struct gl_texture_object *texObj)

+{

+   struct gen_mipmap_state *mipmap = &ctx->Meta->Mipmap;

+   struct vertex {

+      GLfloat x, y, s, t, r;

+   };

+   struct vertex verts[4];

+   const GLuint baseLevel = texObj->BaseLevel;

+   const GLuint maxLevel = texObj->MaxLevel;

+   const GLenum minFilterSave = texObj->MinFilter;

+   const GLenum magFilterSave = texObj->MagFilter;

+   const GLint maxLevelSave = texObj->MaxLevel;

+   const GLboolean genMipmapSave = texObj->GenerateMipmap;

+   const GLenum wrapSSave = texObj->WrapS;

+   const GLenum wrapTSave = texObj->WrapT;

+   const GLenum wrapRSave = texObj->WrapR;

+   const GLuint fboSave = ctx->DrawBuffer->Name;

+   const GLuint original_active_unit = ctx->Texture.CurrentUnit;

+   GLenum faceTarget;

+   GLuint dstLevel;

+   GLuint border = 0;

+

+   if (_mesa_meta_check_generate_mipmap_fallback(ctx, target, texObj)) {

+      _mesa_generate_mipmap(ctx, target, texObj);

+      return;

+   }

+

+   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&

+       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z) {

+      faceTarget = target;

+      target = GL_TEXTURE_CUBE_MAP;

+   }

+   else {

+      faceTarget = target;

+   }

+

+   _mesa_meta_begin(ctx, META_ALL);

+

+   if (original_active_unit != 0)

+      _mesa_BindTexture(target, texObj->Name);

+

+   if (mipmap->ArrayObj == 0) {

+      /* one-time setup */

+

+      /* create vertex array object */

+      _mesa_GenVertexArraysAPPLE(1, &mipmap->ArrayObj);

+      _mesa_BindVertexArrayAPPLE(mipmap->ArrayObj);

+

+      /* create vertex array buffer */

+      _mesa_GenBuffersARB(1, &mipmap->VBO);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO);

+      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),

+                          NULL, GL_DYNAMIC_DRAW_ARB);

+

+      /* setup vertex arrays */

+      _mesa_VertexPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(x));

+      _mesa_TexCoordPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(s));

+      _mesa_EnableClientState(GL_VERTEX_ARRAY);

+      _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);

+   }

+   else {

+      _mesa_BindVertexArray(mipmap->ArrayObj);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO);

+   }

+

+   if (!mipmap->FBO) {

+      _mesa_GenFramebuffersEXT(1, &mipmap->FBO);

+   }

+   _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO);

+

+   _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);

+   _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

+   _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE);

+   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);

+   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);

+   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);

+

+   _mesa_set_enable(ctx, target, GL_TRUE);

+

+   /* setup texcoords once (XXX what about border?) */

+   switch (faceTarget) {

+   case GL_TEXTURE_1D:

+   case GL_TEXTURE_2D:

+      verts[0].s = 0.0F;

+      verts[0].t = 0.0F;

+      verts[0].r = 0.0F;

+      verts[1].s = 1.0F;

+      verts[1].t = 0.0F;

+      verts[1].r = 0.0F;

+      verts[2].s = 1.0F;

+      verts[2].t = 1.0F;

+      verts[2].r = 0.0F;

+      verts[3].s = 0.0F;

+      verts[3].t = 1.0F;

+      verts[3].r = 0.0F;

+      break;

+   case GL_TEXTURE_3D:

+      abort();

+      break;

+   default:

+      /* cube face */

+      {

+         static const GLfloat st[4][2] = {

+            {0.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 1.0f}

+         };

+         GLuint i;

+

+         /* loop over quad verts */

+         for (i = 0; i < 4; i++) {

+            /* Compute sc = +/-scale and tc = +/-scale.

+             * Not +/-1 to avoid cube face selection ambiguity near the edges,

+             * though that can still sometimes happen with this scale factor...

+             */

+            const GLfloat scale = 0.9999f;

+            const GLfloat sc = (2.0f * st[i][0] - 1.0f) * scale;

+            const GLfloat tc = (2.0f * st[i][1] - 1.0f) * scale;

+

+            switch (faceTarget) {

+            case GL_TEXTURE_CUBE_MAP_POSITIVE_X:

+               verts[i].s = 1.0f;

+               verts[i].t = -tc;

+               verts[i].r = -sc;

+               break;

+            case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:

+               verts[i].s = -1.0f;

+               verts[i].t = -tc;

+               verts[i].r = sc;

+               break;

+            case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:

+               verts[i].s = sc;

+               verts[i].t = 1.0f;

+               verts[i].r = tc;

+               break;

+            case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:

+               verts[i].s = sc;

+               verts[i].t = -1.0f;

+               verts[i].r = -tc;

+               break;

+            case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:

+               verts[i].s = sc;

+               verts[i].t = -tc;

+               verts[i].r = 1.0f;

+               break;

+            case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:

+               verts[i].s = -sc;

+               verts[i].t = -tc;

+               verts[i].r = -1.0f;

+               break;

+            default:

+               assert(0);

+            }

+         }

+      }

+   }

+

+   _mesa_set_enable(ctx, target, GL_TRUE);

+

+   /* setup vertex positions */

+   {

+      verts[0].x = 0.0F;

+      verts[0].y = 0.0F;

+      verts[1].x = 1.0F;

+      verts[1].y = 0.0F;

+      verts[2].x = 1.0F;

+      verts[2].y = 1.0F;

+      verts[3].x = 0.0F;

+      verts[3].y = 1.0F;

+      

+      /* upload new vertex data */

+      _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);

+   }

+

+   /* setup projection matrix */

+   _mesa_MatrixMode(GL_PROJECTION);

+   _mesa_LoadIdentity();

+   _mesa_Ortho(0.0, 1.0, 0.0, 1.0, -1.0, 1.0);

+

+   /* texture is already locked, unlock now */

+   _mesa_unlock_texture(ctx, texObj);

+

+   for (dstLevel = baseLevel + 1; dstLevel <= maxLevel; dstLevel++) {

+      const struct gl_texture_image *srcImage;

+      const GLuint srcLevel = dstLevel - 1;

+      GLsizei srcWidth, srcHeight, srcDepth;

+      GLsizei dstWidth, dstHeight, dstDepth;

+      GLenum status;

+

+      srcImage = _mesa_select_tex_image(ctx, texObj, faceTarget, srcLevel);

+      assert(srcImage->Border == 0); /* XXX we can fix this */

+

+      /* src size w/out border */

+      srcWidth = srcImage->Width - 2 * border;

+      srcHeight = srcImage->Height - 2 * border;

+      srcDepth = srcImage->Depth - 2 * border;

+

+      /* new dst size w/ border */

+      dstWidth = MAX2(1, srcWidth / 2) + 2 * border;

+      dstHeight = MAX2(1, srcHeight / 2) + 2 * border;

+      dstDepth = MAX2(1, srcDepth / 2) + 2 * border;

+

+      if (dstWidth == srcImage->Width &&

+          dstHeight == srcImage->Height &&

+          dstDepth == srcImage->Depth) {

+         /* all done */

+         break;

+      }

+

+      /* Set MaxLevel large enough to hold the new level when we allocate it  */

+      _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, dstLevel);

+

+      /* Create empty dest image */

+      if (target == GL_TEXTURE_1D) {

+         _mesa_TexImage1D(target, dstLevel, srcImage->InternalFormat,

+                          dstWidth, border,

+                          GL_RGBA, GL_UNSIGNED_BYTE, NULL);

+      }

+      else if (target == GL_TEXTURE_3D) {

+         _mesa_TexImage3D(target, dstLevel, srcImage->InternalFormat,

+                          dstWidth, dstHeight, dstDepth, border,

+                          GL_RGBA, GL_UNSIGNED_BYTE, NULL);

+      }

+      else {

+         /* 2D or cube */

+         _mesa_TexImage2D(faceTarget, dstLevel, srcImage->InternalFormat,

+                          dstWidth, dstHeight, border,

+                          GL_RGBA, GL_UNSIGNED_BYTE, NULL);

+

+         if (target == GL_TEXTURE_CUBE_MAP) {

+            /* If texturing from a cube, we need to make sure all src faces

+             * have been defined (even if we're not sampling from them.)

+             * Otherwise the texture object will be 'incomplete' and

+             * texturing from it will not be allowed.

+             */

+            GLuint face;

+            for (face = 0; face < 6; face++) {

+               if (!texObj->Image[face][srcLevel] ||

+                   texObj->Image[face][srcLevel]->Width != srcWidth) {

+                  _mesa_TexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face,

+                                   srcLevel, srcImage->InternalFormat,

+                                   srcWidth, srcHeight, border,

+                                   GL_RGBA, GL_UNSIGNED_BYTE, NULL);

+               }

+            }

+         }

+      }

+

+      /* limit minification to src level */

+      _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, srcLevel);

+

+      /* Set to draw into the current dstLevel */

+      if (target == GL_TEXTURE_1D) {

+         _mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT,

+                                       GL_COLOR_ATTACHMENT0_EXT,

+                                       target,

+                                       texObj->Name,

+                                       dstLevel);

+      }

+      else if (target == GL_TEXTURE_3D) {

+         GLint zoffset = 0; /* XXX unfinished */

+         _mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT,

+                                       GL_COLOR_ATTACHMENT0_EXT,

+                                       target,

+                                       texObj->Name,

+                                       dstLevel, zoffset);

+      }

+      else {

+         /* 2D / cube */

+         _mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,

+                                       GL_COLOR_ATTACHMENT0_EXT,

+                                       faceTarget,

+                                       texObj->Name,

+                                       dstLevel);

+      }

+

+      _mesa_DrawBuffer(GL_COLOR_ATTACHMENT0_EXT);

+

+      /* sanity check */

+      status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);

+      if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+         abort();

+         break;

+      }

+

+      assert(dstWidth == ctx->DrawBuffer->Width);

+      assert(dstHeight == ctx->DrawBuffer->Height);

+

+      /* setup viewport */

+      _mesa_set_viewport(ctx, 0, 0, dstWidth, dstHeight);

+

+      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

+   }

+

+   _mesa_lock_texture(ctx, texObj); /* relock */

+

+   _mesa_meta_end(ctx);

+

+   _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, minFilterSave);

+   _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, magFilterSave);

+   _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, maxLevelSave);

+   _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, genMipmapSave);

+   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, wrapSSave);

+   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, wrapTSave);

+   _mesa_TexParameteri(target, GL_TEXTURE_WRAP_R, wrapRSave);

+

+   _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave);

+}

+

+

+/**

+ * Determine the GL data type to use for the temporary image read with

+ * ReadPixels() and passed to Tex[Sub]Image().

+ */

+static GLenum

+get_temp_image_type(struct gl_context *ctx, GLenum baseFormat)

+{

+   switch (baseFormat) {

+   case GL_RGBA:

+   case GL_RGB:

+   case GL_ALPHA:

+   case GL_LUMINANCE:

+   case GL_LUMINANCE_ALPHA:

+   case GL_INTENSITY:

+      if (ctx->DrawBuffer->Visual.redBits <= 8)

+         return GL_UNSIGNED_BYTE;

+      else if (ctx->DrawBuffer->Visual.redBits <= 8)

+         return GL_UNSIGNED_SHORT;

+      else

+         return GL_FLOAT;

+   case GL_DEPTH_COMPONENT:

+      return GL_UNSIGNED_INT;

+   case GL_DEPTH_STENCIL:

+      return GL_UNSIGNED_INT_24_8;

+   default:

+      _mesa_problem(ctx, "Unexpected format in get_temp_image_type()");

+      return 0;

+   }

+}

+

+

+/**

+ * Helper for _mesa_meta_CopyTexImage1/2D() functions.

+ * Have to be careful with locking and meta state for pixel transfer.

+ */

+static void

+copy_tex_image(struct gl_context *ctx, GLuint dims, GLenum target, GLint level,

+               GLenum internalFormat, GLint x, GLint y,

+               GLsizei width, GLsizei height, GLint border)

+{

+   struct gl_texture_object *texObj;

+   struct gl_texture_image *texImage;

+   GLenum format, type;

+   GLint bpp;

+   void *buf;

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+   texImage = _mesa_get_tex_image(ctx, texObj, target, level);

+

+   /* Choose format/type for temporary image buffer */

+   format = _mesa_base_tex_format(ctx, internalFormat);

+   type = get_temp_image_type(ctx, format);

+   bpp = _mesa_bytes_per_pixel(format, type);

+   if (bpp <= 0) {

+      _mesa_problem(ctx, "Bad bpp in meta copy_tex_image()");

+      return;

+   }

+

+   /*

+    * Alloc image buffer (XXX could use a PBO)

+    */

+   buf = malloc(width * height * bpp);

+   if (!buf) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage%uD", dims);

+      return;

+   }

+

+   _mesa_unlock_texture(ctx, texObj); /* need to unlock first */

+

+   /*

+    * Read image from framebuffer (disable pixel transfer ops)

+    */

+   _mesa_meta_begin(ctx, META_PIXEL_STORE | META_PIXEL_TRANSFER);

+   ctx->Driver.ReadPixels(ctx, x, y, width, height,

+			  format, type, &ctx->Pack, buf);

+   _mesa_meta_end(ctx);

+

+   if (texImage->Data) {

+      ctx->Driver.FreeTexImageData(ctx, texImage);

+   }

+

+   /* The texture's format was already chosen in _mesa_CopyTexImage() */

+   ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);

+

+   /*

+    * Store texture data (with pixel transfer ops)

+    */

+   _mesa_meta_begin(ctx, META_PIXEL_STORE);

+

+   _mesa_update_state(ctx); /* to update pixel transfer state */

+

+   if (target == GL_TEXTURE_1D) {

+      ctx->Driver.TexImage1D(ctx, target, level, internalFormat,

+                             width, border, format, type,

+                             buf, &ctx->Unpack, texObj, texImage);

+   }

+   else {

+      ctx->Driver.TexImage2D(ctx, target, level, internalFormat,

+                             width, height, border, format, type,

+                             buf, &ctx->Unpack, texObj, texImage);

+   }

+   _mesa_meta_end(ctx);

+

+   _mesa_lock_texture(ctx, texObj); /* re-lock */

+

+   free(buf);

+}

+

+

+void

+_mesa_meta_CopyTexImage1D(struct gl_context *ctx, GLenum target, GLint level,

+                          GLenum internalFormat, GLint x, GLint y,

+                          GLsizei width, GLint border)

+{

+   copy_tex_image(ctx, 1, target, level, internalFormat, x, y,

+                  width, 1, border);

+}

+

+

+void

+_mesa_meta_CopyTexImage2D(struct gl_context *ctx, GLenum target, GLint level,

+                          GLenum internalFormat, GLint x, GLint y,

+                          GLsizei width, GLsizei height, GLint border)

+{

+   copy_tex_image(ctx, 2, target, level, internalFormat, x, y,

+                  width, height, border);

+}

+

+

+

+/**

+ * Helper for _mesa_meta_CopyTexSubImage1/2/3D() functions.

+ * Have to be careful with locking and meta state for pixel transfer.

+ */

+static void

+copy_tex_sub_image(struct gl_context *ctx,

+                   GLuint dims, GLenum target, GLint level,

+                   GLint xoffset, GLint yoffset, GLint zoffset,

+                   GLint x, GLint y,

+                   GLsizei width, GLsizei height)

+{

+   struct gl_texture_object *texObj;

+   struct gl_texture_image *texImage;

+   GLenum format, type;

+   GLint bpp;

+   void *buf;

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+   texImage = _mesa_select_tex_image(ctx, texObj, target, level);

+

+   /* Choose format/type for temporary image buffer */

+   format = _mesa_get_format_base_format(texImage->TexFormat);

+   type = get_temp_image_type(ctx, format);

+   bpp = _mesa_bytes_per_pixel(format, type);

+   if (bpp <= 0) {

+      _mesa_problem(ctx, "Bad bpp in meta copy_tex_sub_image()");

+      return;

+   }

+

+   /*

+    * Alloc image buffer (XXX could use a PBO)

+    */

+   buf = malloc(width * height * bpp);

+   if (!buf) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage%uD", dims);

+      return;

+   }

+

+   _mesa_unlock_texture(ctx, texObj); /* need to unlock first */

+

+   /*

+    * Read image from framebuffer (disable pixel transfer ops)

+    */

+   _mesa_meta_begin(ctx, META_PIXEL_STORE | META_PIXEL_TRANSFER);

+   ctx->Driver.ReadPixels(ctx, x, y, width, height,

+			  format, type, &ctx->Pack, buf);

+   _mesa_meta_end(ctx);

+

+   _mesa_update_state(ctx); /* to update pixel transfer state */

+

+   /*

+    * Store texture data (with pixel transfer ops)

+    */

+   _mesa_meta_begin(ctx, META_PIXEL_STORE);

+   if (target == GL_TEXTURE_1D) {

+      ctx->Driver.TexSubImage1D(ctx, target, level, xoffset,

+                                width, format, type, buf,

+                                &ctx->Unpack, texObj, texImage);

+   }

+   else if (target == GL_TEXTURE_3D) {

+      ctx->Driver.TexSubImage3D(ctx, target, level, xoffset, yoffset, zoffset,

+                                width, height, 1, format, type, buf,

+                                &ctx->Unpack, texObj, texImage);

+   }

+   else {

+      ctx->Driver.TexSubImage2D(ctx, target, level, xoffset, yoffset,

+                                width, height, format, type, buf,

+                                &ctx->Unpack, texObj, texImage);

+   }

+   _mesa_meta_end(ctx);

+

+   _mesa_lock_texture(ctx, texObj); /* re-lock */

+

+   free(buf);

+}

+

+

+void

+_mesa_meta_CopyTexSubImage1D(struct gl_context *ctx, GLenum target, GLint level,

+                             GLint xoffset,

+                             GLint x, GLint y, GLsizei width)

+{

+   copy_tex_sub_image(ctx, 1, target, level, xoffset, 0, 0,

+                      x, y, width, 1);

+}

+

+

+void

+_mesa_meta_CopyTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,

+                             GLint xoffset, GLint yoffset,

+                             GLint x, GLint y,

+                             GLsizei width, GLsizei height)

+{

+   copy_tex_sub_image(ctx, 2, target, level, xoffset, yoffset, 0,

+                      x, y, width, height);

+}

+

+

+void

+_mesa_meta_CopyTexSubImage3D(struct gl_context *ctx, GLenum target, GLint level,

+                             GLint xoffset, GLint yoffset, GLint zoffset,

+                             GLint x, GLint y,

+                             GLsizei width, GLsizei height)

+{

+   copy_tex_sub_image(ctx, 3, target, level, xoffset, yoffset, zoffset,

+                      x, y, width, height);

+}

+

+

+void

+_mesa_meta_CopyColorTable(struct gl_context *ctx,

+                          GLenum target, GLenum internalformat,

+                          GLint x, GLint y, GLsizei width)

+{

+   GLfloat *buf;

+

+   buf = (GLfloat *) malloc(width * 4 * sizeof(GLfloat));

+   if (!buf) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyColorTable");

+      return;

+   }

+

+   /*

+    * Read image from framebuffer (disable pixel transfer ops)

+    */

+   _mesa_meta_begin(ctx, META_PIXEL_STORE | META_PIXEL_TRANSFER);

+   ctx->Driver.ReadPixels(ctx, x, y, width, 1,

+                          GL_RGBA, GL_FLOAT, &ctx->Pack, buf);

+

+   _mesa_ColorTable(target, internalformat, width, GL_RGBA, GL_FLOAT, buf);

+

+   _mesa_meta_end(ctx);

+

+   free(buf);

+}

+

+

+void

+_mesa_meta_CopyColorSubTable(struct gl_context *ctx,GLenum target, GLsizei start,

+                             GLint x, GLint y, GLsizei width)

+{

+   GLfloat *buf;

+

+   buf = (GLfloat *) malloc(width * 4 * sizeof(GLfloat));

+   if (!buf) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyColorSubTable");

+      return;

+   }

+

+   /*

+    * Read image from framebuffer (disable pixel transfer ops)

+    */

+   _mesa_meta_begin(ctx, META_PIXEL_STORE | META_PIXEL_TRANSFER);

+   ctx->Driver.ReadPixels(ctx, x, y, width, 1,

+                          GL_RGBA, GL_FLOAT, &ctx->Pack, buf);

+

+   _mesa_ColorSubTable(target, start, width, GL_RGBA, GL_FLOAT, buf);

+

+   _mesa_meta_end(ctx);

+

+   free(buf);

+}

diff --git a/mesalib/src/mesa/drivers/dri/Makefile.template b/mesalib/src/mesa/drivers/dri/Makefile.template
index d1a119379..195d60a9c 100644
--- a/mesalib/src/mesa/drivers/dri/Makefile.template
+++ b/mesalib/src/mesa/drivers/dri/Makefile.template
@@ -1,111 +1,111 @@
-# -*-makefile-*-
-
-COMMON_GALLIUM_SOURCES = \
-        ../common/utils.c \
-        ../common/vblank.c \
-        ../common/dri_util.c \
-        ../common/xmlconfig.c
-
-COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
-        ../../common/driverfuncs.c \
-        ../common/texmem.c \
-        ../common/drirenderbuffer.c
-
-INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
-
-OBJECTS = $(C_SOURCES:.c=.o) \
-	  $(CXX_SOURCES:.cpp=.o) \
-	  $(ASM_SOURCES:.S=.o) 
-
-
-### Include directories
-SHARED_INCLUDES = \
-	-I. \
-	-I$(TOP)/src/mesa/drivers/dri/common \
-	-Iserver \
-	-I$(TOP)/include \
-	-I$(TOP)/src/mapi \
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/egl/main \
-	-I$(TOP)/src/egl/drivers/dri \
-	$(LIBDRM_CFLAGS)
-
-CFLAGS += $(API_DEFINES)
-CXXFLAGS += $(API_DEFINES)
-
-##### RULES #####
-
-.c.o:
-	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@
-
-.cpp.o:
-	$(CC) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DRIVER_DEFINES) $< -o $@
-
-.S.o:
-	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@
-
-
-##### TARGETS #####
-
-default: subdirs lib
-
-
-.PHONY: lib
-lib: symlinks subdirs depend
-	@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
-
-$(LIBNAME): $(OBJECTS) $(EXTRA_MODULES) $(MESA_MODULES) Makefile \
-		$(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/src/mesa/drivers/dri/common/dri_test.o
-	$(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
-		$(OBJECTS) $(EXTRA_MODULES) $(DRI_LIB_DEPS)
-	$(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
-	@rm -f $@.test
-	mv -f $@.tmp $@
-
-
-$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) 
-
-
-# If the Makefile defined SUBDIRS, run make in each
-.PHONY: subdirs
-subdirs:
-	@if test -n "$(SUBDIRS)" ; then \
-		for dir in $(SUBDIRS) ; do \
-			if [ -d $$dir ] ; then \
-				(cd $$dir && $(MAKE)) || exit 1; \
-			fi \
-		done \
-	fi
-
-
-.PHONY: symlinks
-symlinks:
-
-
-depend: $(C_SOURCES) $(CXX_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
-	@ echo "running $(MKDEP)"
-	@ rm -f depend
-	@ touch depend
-	@ $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) \
-		$(C_SOURCES) $(CXX_SOURCES) \
-		$(ASM_SOURCES) > /dev/null 2>/dev/null
-
-
-# Emacs tags
-tags:
-	etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-	-rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS)
-	-rm -f depend depend.bak
-
-
-install: $(LIBNAME)
-	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-	$(MINSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-
-
--include depend
+# -*-makefile-*-

+

+COMMON_GALLIUM_SOURCES = \

+        ../common/utils.c \

+        ../common/vblank.c \

+        ../common/dri_util.c \

+        ../common/xmlconfig.c

+

+COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \

+        ../../common/driverfuncs.c \

+        ../common/texmem.c \

+        ../common/drirenderbuffer.c

+

+INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)

+

+OBJECTS = $(C_SOURCES:.c=.o) \

+	  $(CXX_SOURCES:.cpp=.o) \

+	  $(ASM_SOURCES:.S=.o) 

+

+

+### Include directories

+SHARED_INCLUDES = \

+	-I. \

+	-I$(TOP)/src/mesa/drivers/dri/common \

+	-Iserver \

+	-I$(TOP)/include \

+	-I$(TOP)/src/mapi \

+	-I$(TOP)/src/mesa \

+	-I$(TOP)/src/egl/main \

+	-I$(TOP)/src/egl/drivers/dri \

+	$(LIBDRM_CFLAGS)

+

+CFLAGS += $(API_DEFINES)

+CXXFLAGS += $(API_DEFINES)

+

+##### RULES #####

+

+.c.o:

+	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@

+

+.cpp.o:

+	$(CC) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DRIVER_DEFINES) $< -o $@

+

+.S.o:

+	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@

+

+

+##### TARGETS #####

+

+default: subdirs lib

+

+

+.PHONY: lib

+lib: symlinks subdirs depend

+	@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)

+

+$(LIBNAME): $(OBJECTS) $(EXTRA_MODULES) $(MESA_MODULES) Makefile \

+		$(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/src/mesa/drivers/dri/common/dri_test.o

+	$(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \

+		$(OBJECTS) $(EXTRA_MODULES) $(DRI_LIB_DEPS)

+	$(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)

+	@rm -f $@.test

+	mv -f $@.tmp $@

+

+

+$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)

+	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) 

+

+

+# If the Makefile defined SUBDIRS, run make in each

+.PHONY: subdirs

+subdirs:

+	@if test -n "$(SUBDIRS)" ; then \

+		for dir in $(SUBDIRS) ; do \

+			if [ -d $$dir ] ; then \

+				(cd $$dir && $(MAKE)) || exit 1; \

+			fi \

+		done \

+	fi

+

+

+.PHONY: symlinks

+symlinks:

+

+

+depend: $(C_SOURCES) $(CXX_SOURCES) $(ASM_SOURCES) $(SYMLINKS)

+	@ echo "running $(MKDEP)"

+	@ rm -f depend

+	@ touch depend

+	@ $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) \

+		$(C_SOURCES) $(CXX_SOURCES) \

+		$(ASM_SOURCES) > /dev/null 2>/dev/null

+

+

+# Emacs tags

+tags:

+	etags `find . -name \*.[ch]` `find ../include`

+

+

+# Remove .o and backup files

+clean:

+	-rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS)

+	-rm -f depend depend.bak

+

+

+install: $(LIBNAME)

+	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

+	$(MINSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

+

+

+-include depend

diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c
index 82638fa72..6d3dd0a2c 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c
@@ -1,1030 +1,1030 @@
-/**
- * \file dri_util.c
- * DRI utility functions.
- *
- * This module acts as glue between GLX and the actual hardware driver.  A DRI
- * driver doesn't really \e have to use any of this - it's optional.  But, some
- * useful stuff is done here that otherwise would have to be duplicated in most
- * drivers.
- * 
- * Basically, these utility functions take care of some of the dirty details of
- * screen initialization, context creation, context binding, DRM setup, etc.
- *
- * These functions are compiled into each DRI driver so libGL.so knows nothing
- * about them.
- */
-
-
-#include <assert.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <stdio.h>
-
-#ifndef MAP_FAILED
-#define MAP_FAILED ((void *)-1)
-#endif
-
-#include "main/imports.h"
-#define None 0
-
-#include "dri_util.h"
-#include "drm_sarea.h"
-#include "utils.h"
-#include "xmlpool.h"
-#include "../glsl/glsl_parser_extras.h"
-
-PUBLIC const char __dri2ConfigOptions[] =
-   DRI_CONF_BEGIN
-      DRI_CONF_SECTION_PERFORMANCE
-         DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_1)
-      DRI_CONF_SECTION_END
-   DRI_CONF_END;
-
-static const uint __dri2NConfigOptions = 1;
-
-#ifndef GLX_OML_sync_control
-typedef GLboolean ( * PFNGLXGETMSCRATEOMLPROC) (__DRIdrawable *drawable, int32_t *numerator, int32_t *denominator);
-#endif
-
-static void dri_get_drawable(__DRIdrawable *pdp);
-static void dri_put_drawable(__DRIdrawable *pdp);
-
-/**
- * This is just a token extension used to signal that the driver
- * supports setting a read drawable.
- */
-const __DRIextension driReadDrawableExtension = {
-    __DRI_READ_DRAWABLE, __DRI_READ_DRAWABLE_VERSION
-};
-
-GLint
-driIntersectArea( drm_clip_rect_t rect1, drm_clip_rect_t rect2 )
-{
-   if (rect2.x1 > rect1.x1) rect1.x1 = rect2.x1;
-   if (rect2.x2 < rect1.x2) rect1.x2 = rect2.x2;
-   if (rect2.y1 > rect1.y1) rect1.y1 = rect2.y1;
-   if (rect2.y2 < rect1.y2) rect1.y2 = rect2.y2;
-
-   if (rect1.x1 > rect1.x2 || rect1.y1 > rect1.y2) return 0;
-
-   return (rect1.x2 - rect1.x1) * (rect1.y2 - rect1.y1);
-}
-
-/*****************************************************************/
-/** \name Context (un)binding functions                          */
-/*****************************************************************/
-/*@{*/
-
-/**
- * Unbind context.
- * 
- * \param scrn the screen.
- * \param gc context.
- *
- * \return \c GL_TRUE on success, or \c GL_FALSE on failure.
- * 
- * \internal
- * This function calls __DriverAPIRec::UnbindContext, and then decrements
- * __DRIdrawableRec::refcount which must be non-zero for a successful
- * return.
- * 
- * While casting the opaque private pointers associated with the parameters
- * into their respective real types it also assures they are not \c NULL. 
- */
-static int driUnbindContext(__DRIcontext *pcp)
-{
-    __DRIscreen *psp;
-    __DRIdrawable *pdp;
-    __DRIdrawable *prp;
-
-    /*
-    ** Assume error checking is done properly in glXMakeCurrent before
-    ** calling driUnbindContext.
-    */
-
-    if (pcp == NULL)
-        return GL_FALSE;
-
-    psp = pcp->driScreenPriv;
-    pdp = pcp->driDrawablePriv;
-    prp = pcp->driReadablePriv;
-
-    /* already unbound */
-    if (!pdp && !prp)
-      return GL_TRUE;
-    /* Let driver unbind drawable from context */
-    (*psp->DriverAPI.UnbindContext)(pcp);
-
-    assert(pdp);
-    if (pdp->refcount == 0) {
-	/* ERROR!!! */
-	return GL_FALSE;
-    }
-
-    dri_put_drawable(pdp);
-
-    if (prp != pdp) {
-        if (prp->refcount == 0) {
-	    /* ERROR!!! */
-	    return GL_FALSE;
-	}
-
-    	dri_put_drawable(prp);
-    }
-
-
-    /* XXX this is disabled so that if we call SwapBuffers on an unbound
-     * window we can determine the last context bound to the window and
-     * use that context's lock. (BrianP, 2-Dec-2000)
-     */
-    pcp->driDrawablePriv = pcp->driReadablePriv = NULL;
-
-    return GL_TRUE;
-}
-
-/**
- * This function takes both a read buffer and a draw buffer.  This is needed
- * for \c glXMakeCurrentReadSGI or GLX 1.3's \c glXMakeContextCurrent
- * function.
- */
-static int driBindContext(__DRIcontext *pcp,
-			  __DRIdrawable *pdp,
-			  __DRIdrawable *prp)
-{
-    __DRIscreen *psp = NULL;
-
-    /*
-    ** Assume error checking is done properly in glXMakeCurrent before
-    ** calling driUnbindContext.
-    */
-
-    if (!pcp)
-	return GL_FALSE;
-
-    /* Bind the drawable to the context */
-    psp = pcp->driScreenPriv;
-    pcp->driDrawablePriv = pdp;
-    pcp->driReadablePriv = prp;
-    if (pdp) {
-	pdp->driContextPriv = pcp;
-	dri_get_drawable(pdp);
-    }
-    if (prp && pdp != prp) {
-	dri_get_drawable(prp);
-    }
-
-    /*
-    ** Now that we have a context associated with this drawable, we can
-    ** initialize the drawable information if has not been done before.
-    */
-
-    if (!psp->dri2.enabled) {
-	if (pdp && !pdp->pStamp) {
-	    DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);
-	    __driUtilUpdateDrawableInfo(pdp);
-	    DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);
-	}
-	if (prp && pdp != prp && !prp->pStamp) {
-	    DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);
-	    __driUtilUpdateDrawableInfo(prp);
-	    DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);
-        }
-    }
-
-    /* Call device-specific MakeCurrent */
-    return (*psp->DriverAPI.MakeCurrent)(pcp, pdp, prp);
-}
-
-/*@}*/
-
-
-/*****************************************************************/
-/** \name Drawable handling functions                            */
-/*****************************************************************/
-/*@{*/
-
-/**
- * Update private drawable information.
- *
- * \param pdp pointer to the private drawable information to update.
- * 
- * This function basically updates the __DRIdrawable struct's
- * cliprect information by calling \c __DRIinterfaceMethods::getDrawableInfo.
- * This is usually called by the DRI_VALIDATE_DRAWABLE_INFO macro which
- * compares the __DRIdrwablePrivate pStamp and lastStamp values.  If
- * the values are different that means we have to update the clipping
- * info.
- */
-void
-__driUtilUpdateDrawableInfo(__DRIdrawable *pdp)
-{
-    __DRIscreen *psp = pdp->driScreenPriv;
-    __DRIcontext *pcp = pdp->driContextPriv;
-    
-    if (!pcp 
-	|| ((pdp != pcp->driDrawablePriv) && (pdp != pcp->driReadablePriv))) {
-	/* ERROR!!! 
-	 * ...but we must ignore it. There can be many contexts bound to a
-	 * drawable.
-	 */
-    }
-
-    if (pdp->pClipRects) {
-	free(pdp->pClipRects); 
-	pdp->pClipRects = NULL;
-    }
-
-    if (pdp->pBackClipRects) {
-	free(pdp->pBackClipRects); 
-	pdp->pBackClipRects = NULL;
-    }
-
-    DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);
-
-    if (! (*psp->getDrawableInfo->getDrawableInfo)(pdp,
-			  &pdp->index, &pdp->lastStamp,
-			  &pdp->x, &pdp->y, &pdp->w, &pdp->h,
-			  &pdp->numClipRects, &pdp->pClipRects,
-			  &pdp->backX,
-			  &pdp->backY,
-			  &pdp->numBackClipRects,
-			  &pdp->pBackClipRects,
-			  pdp->loaderPrivate)) {
-	/* Error -- eg the window may have been destroyed.  Keep going
-	 * with no cliprects.
-	 */
-        pdp->pStamp = &pdp->lastStamp; /* prevent endless loop */
-	pdp->numClipRects = 0;
-	pdp->pClipRects = NULL;
-	pdp->numBackClipRects = 0;
-	pdp->pBackClipRects = NULL;
-    }
-    else
-       pdp->pStamp = &(psp->pSAREA->drawableTable[pdp->index].stamp);
-
-    DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);
-}
-
-/*@}*/
-
-/*****************************************************************/
-/** \name GLX callbacks                                          */
-/*****************************************************************/
-/*@{*/
-
-static void driReportDamage(__DRIdrawable *pdp,
-			    struct drm_clip_rect *pClipRects, int numClipRects)
-{
-    __DRIscreen *psp = pdp->driScreenPriv;
-
-    /* Check that we actually have the new damage report method */
-    if (psp->damage) {
-	/* Report the damage.  Currently, all our drivers draw
-	 * directly to the front buffer, so we report the damage there
-	 * rather than to the backing storein (if any).
-	 */
-	(*psp->damage->reportDamage)(pdp,
-				     pdp->x, pdp->y,
-				     pClipRects, numClipRects,
-				     GL_TRUE, pdp->loaderPrivate);
-    }
-}
-
-
-/**
- * Swap buffers.
- *
- * \param drawablePrivate opaque pointer to the per-drawable private info.
- * 
- * \internal
- * This function calls __DRIdrawable::swapBuffers.
- * 
- * Is called directly from glXSwapBuffers().
- */
-static void driSwapBuffers(__DRIdrawable *dPriv)
-{
-    __DRIscreen *psp = dPriv->driScreenPriv;
-    drm_clip_rect_t *rects;
-    int i;
-
-    psp->DriverAPI.SwapBuffers(dPriv);
-
-    if (!dPriv->numClipRects)
-        return;
-
-    rects = malloc(sizeof(*rects) * dPriv->numClipRects);
-
-    if (!rects)
-        return;
-
-    for (i = 0; i < dPriv->numClipRects; i++) {
-        rects[i].x1 = dPriv->pClipRects[i].x1 - dPriv->x;
-        rects[i].y1 = dPriv->pClipRects[i].y1 - dPriv->y;
-        rects[i].x2 = dPriv->pClipRects[i].x2 - dPriv->x;
-        rects[i].y2 = dPriv->pClipRects[i].y2 - dPriv->y;
-    }
-
-    driReportDamage(dPriv, rects, dPriv->numClipRects);
-    free(rects);
-}
-
-static int driDrawableGetMSC( __DRIscreen *sPriv, __DRIdrawable *dPriv,
-			      int64_t *msc )
-{
-    return sPriv->DriverAPI.GetDrawableMSC(sPriv, dPriv, msc);
-}
-
-
-static int driWaitForMSC(__DRIdrawable *dPriv, int64_t target_msc,
-			 int64_t divisor, int64_t remainder,
-			 int64_t * msc, int64_t * sbc)
-{
-    __DRIswapInfo  sInfo;
-    int  status;
-
-    status = dPriv->driScreenPriv->DriverAPI.WaitForMSC( dPriv, target_msc,
-                                                         divisor, remainder,
-                                                         msc );
-
-    /* GetSwapInfo() may not be provided by the driver if GLX_SGI_video_sync
-     * is supported but GLX_OML_sync_control is not.  Therefore, don't return
-     * an error value if GetSwapInfo() is not implemented.
-    */
-    if ( status == 0
-         && dPriv->driScreenPriv->DriverAPI.GetSwapInfo ) {
-        status = dPriv->driScreenPriv->DriverAPI.GetSwapInfo( dPriv, & sInfo );
-        *sbc = sInfo.swap_count;
-    }
-
-    return status;
-}
-
-
-const __DRImediaStreamCounterExtension driMediaStreamCounterExtension = {
-    { __DRI_MEDIA_STREAM_COUNTER, __DRI_MEDIA_STREAM_COUNTER_VERSION },
-    driWaitForMSC,
-    driDrawableGetMSC,
-};
-
-
-static void driCopySubBuffer(__DRIdrawable *dPriv,
-			      int x, int y, int w, int h)
-{
-    drm_clip_rect_t rect;
-
-    rect.x1 = x;
-    rect.y1 = dPriv->h - y - h;
-    rect.x2 = x + w;
-    rect.y2 = rect.y1 + h;
-    driReportDamage(dPriv, &rect, 1);
-
-    dPriv->driScreenPriv->DriverAPI.CopySubBuffer(dPriv, x, y, w, h);
-}
-
-const __DRIcopySubBufferExtension driCopySubBufferExtension = {
-    { __DRI_COPY_SUB_BUFFER, __DRI_COPY_SUB_BUFFER_VERSION },
-    driCopySubBuffer
-};
-
-static void driSetSwapInterval(__DRIdrawable *dPriv, unsigned int interval)
-{
-    dPriv->swap_interval = interval;
-}
-
-static unsigned int driGetSwapInterval(__DRIdrawable *dPriv)
-{
-    return dPriv->swap_interval;
-}
-
-const __DRIswapControlExtension driSwapControlExtension = {
-    { __DRI_SWAP_CONTROL, __DRI_SWAP_CONTROL_VERSION },
-    driSetSwapInterval,
-    driGetSwapInterval
-};
-
-
-/**
- * This is called via __DRIscreenRec's createNewDrawable pointer.
- */
-static __DRIdrawable *
-driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
-		     drm_drawable_t hwDrawable, int renderType,
-		     const int *attrs, void *data)
-{
-    __DRIdrawable *pdp;
-
-    /* Since pbuffers are not yet supported, no drawable attributes are
-     * supported either.
-     */
-    (void) attrs;
-
-    pdp = malloc(sizeof *pdp);
-    if (!pdp) {
-	return NULL;
-    }
-
-    pdp->driContextPriv = NULL;
-    pdp->loaderPrivate = data;
-    pdp->hHWDrawable = hwDrawable;
-    pdp->refcount = 1;
-    pdp->pStamp = NULL;
-    pdp->lastStamp = 0;
-    pdp->index = 0;
-    pdp->x = 0;
-    pdp->y = 0;
-    pdp->w = 0;
-    pdp->h = 0;
-    pdp->numClipRects = 0;
-    pdp->numBackClipRects = 0;
-    pdp->pClipRects = NULL;
-    pdp->pBackClipRects = NULL;
-    pdp->vblSeq = 0;
-    pdp->vblFlags = 0;
-
-    pdp->driScreenPriv = psp;
-
-    if (!(*psp->DriverAPI.CreateBuffer)(psp, pdp, &config->modes, 0)) {
-       free(pdp);
-       return NULL;
-    }
-
-    pdp->msc_base = 0;
-
-    /* This special default value is replaced with the configured
-     * default value when the drawable is first bound to a direct
-     * rendering context. 
-     */
-    pdp->swap_interval = (unsigned)-1;
-
-    return pdp;
-}
-
-
-static __DRIdrawable *
-dri2CreateNewDrawable(__DRIscreen *screen,
-		      const __DRIconfig *config,
-		      void *loaderPrivate)
-{
-    __DRIdrawable *pdraw;
-
-    pdraw = driCreateNewDrawable(screen, config, 0, 0, NULL, loaderPrivate);
-    if (!pdraw)
-    	return NULL;
-
-    pdraw->pClipRects = &pdraw->dri2.clipRect;
-    pdraw->pBackClipRects = &pdraw->dri2.clipRect;
-
-    pdraw->pStamp = &pdraw->dri2.stamp;
-    *pdraw->pStamp = pdraw->lastStamp + 1;
-
-    return pdraw;
-}
-
-static __DRIbuffer *
-dri2AllocateBuffer(__DRIscreen *screen,
-		   unsigned int attachment, unsigned int format,
-		   int width, int height)
-{
-    return (*screen->DriverAPI.AllocateBuffer)(screen, attachment, format,
-					       width, height);
-}
-
-static void
-dri2ReleaseBuffer(__DRIscreen *screen, __DRIbuffer *buffer)
-{
-   (*screen->DriverAPI.ReleaseBuffer)(screen, buffer);
-}
-
-
-static int
-dri2ConfigQueryb(__DRIscreen *screen, const char *var, GLboolean *val)
-{
-   if (!driCheckOption(&screen->optionCache, var, DRI_BOOL))
-      return -1;
-
-   *val = driQueryOptionb(&screen->optionCache, var);
-
-   return 0;
-}
-
-static int
-dri2ConfigQueryi(__DRIscreen *screen, const char *var, GLint *val)
-{
-   if (!driCheckOption(&screen->optionCache, var, DRI_INT) &&
-       !driCheckOption(&screen->optionCache, var, DRI_ENUM))
-      return -1;
-
-    *val = driQueryOptioni(&screen->optionCache, var);
-
-    return 0;
-}
-
-static int
-dri2ConfigQueryf(__DRIscreen *screen, const char *var, GLfloat *val)
-{
-   if (!driCheckOption(&screen->optionCache, var, DRI_FLOAT))
-      return -1;
-
-    *val = driQueryOptionf(&screen->optionCache, var);
-
-    return 0;
-}
-
-
-static void dri_get_drawable(__DRIdrawable *pdp)
-{
-    pdp->refcount++;
-}
-	
-static void dri_put_drawable(__DRIdrawable *pdp)
-{
-    __DRIscreen *psp;
-
-    if (pdp) {
-	pdp->refcount--;
-	if (pdp->refcount)
-	    return;
-
-	psp = pdp->driScreenPriv;
-        (*psp->DriverAPI.DestroyBuffer)(pdp);
-	if (pdp->pClipRects && pdp->pClipRects != &pdp->dri2.clipRect) {
-	    free(pdp->pClipRects);
-	    pdp->pClipRects = NULL;
-	}
-	if (pdp->pBackClipRects && pdp->pClipRects != &pdp->dri2.clipRect) {
-	    free(pdp->pBackClipRects);
-	    pdp->pBackClipRects = NULL;
-	}
-	free(pdp);
-    }
-}
-
-static void
-driDestroyDrawable(__DRIdrawable *pdp)
-{
-    dri_put_drawable(pdp);
-}
-
-/*@}*/
-
-
-/*****************************************************************/
-/** \name Context handling functions                             */
-/*****************************************************************/
-/*@{*/
-
-/**
- * Destroy the per-context private information.
- * 
- * \internal
- * This function calls __DriverAPIRec::DestroyContext on \p contextPrivate, calls
- * drmDestroyContext(), and finally frees \p contextPrivate.
- */
-static void
-driDestroyContext(__DRIcontext *pcp)
-{
-    if (pcp) {
-	(*pcp->driScreenPriv->DriverAPI.DestroyContext)(pcp);
-	free(pcp);
-    }
-}
-
-
-/**
- * Create the per-drawable private driver information.
- * 
- * \param render_type   Type of rendering target.  \c GLX_RGBA is the only
- *                      type likely to ever be supported for direct-rendering.
- * \param shared        Context with which to share textures, etc. or NULL
- *
- * \returns An opaque pointer to the per-context private information on
- *          success, or \c NULL on failure.
- * 
- * \internal
- * This function allocates and fills a __DRIcontextRec structure.  It
- * performs some device independent initialization and passes all the
- * relevent information to __DriverAPIRec::CreateContext to create the
- * context.
- *
- */
-static __DRIcontext *
-driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,
-		    int render_type, __DRIcontext *shared, 
-		    drm_context_t hwContext, void *data)
-{
-    __DRIcontext *pcp;
-    void * const shareCtx = (shared != NULL) ? shared->driverPrivate : NULL;
-
-    pcp = malloc(sizeof *pcp);
-    if (!pcp)
-	return NULL;
-
-    pcp->driScreenPriv = psp;
-    pcp->driDrawablePriv = NULL;
-    pcp->loaderPrivate = data;
-    
-    pcp->dri2.draw_stamp = 0;
-    pcp->dri2.read_stamp = 0;
-
-    pcp->hHWContext = hwContext;
-
-    if ( !(*psp->DriverAPI.CreateContext)(API_OPENGL,
-					  &config->modes, pcp, shareCtx) ) {
-        free(pcp);
-        return NULL;
-    }
-
-    return pcp;
-}
-
-static unsigned int
-dri2GetAPIMask(__DRIscreen *screen)
-{
-    return screen->api_mask;
-}
-
-static __DRIcontext *
-dri2CreateNewContextForAPI(__DRIscreen *screen, int api,
-			   const __DRIconfig *config,
-			   __DRIcontext *shared, void *data)
-{
-    __DRIcontext *context;
-    const struct gl_config *modes = (config != NULL) ? &config->modes : NULL;
-    void *shareCtx = (shared != NULL) ? shared->driverPrivate : NULL;
-    gl_api mesa_api;
-
-    if (!(screen->api_mask & (1 << api)))
-	return NULL;
-
-    switch (api) {
-    case __DRI_API_OPENGL:
-	    mesa_api = API_OPENGL;
-	    break;
-    case __DRI_API_GLES:
-	    mesa_api = API_OPENGLES;
-	    break;
-    case __DRI_API_GLES2:
-	    mesa_api = API_OPENGLES2;
-	    break;
-    default:
-	    return NULL;
-    }
-
-    context = malloc(sizeof *context);
-    if (!context)
-	return NULL;
-
-    context->driScreenPriv = screen;
-    context->driDrawablePriv = NULL;
-    context->loaderPrivate = data;
-    
-    if (!(*screen->DriverAPI.CreateContext)(mesa_api, modes,
-					    context, shareCtx) ) {
-        free(context);
-        return NULL;
-    }
-
-    return context;
-}
-
-
-static __DRIcontext *
-dri2CreateNewContext(__DRIscreen *screen, const __DRIconfig *config,
-		      __DRIcontext *shared, void *data)
-{
-   return dri2CreateNewContextForAPI(screen, __DRI_API_OPENGL,
-				     config, shared, data);
-}
-
-static int
-driCopyContext(__DRIcontext *dest, __DRIcontext *src, unsigned long mask)
-{
-    return GL_FALSE;
-}
-
-/*@}*/
-
-
-/*****************************************************************/
-/** \name Screen handling functions                              */
-/*****************************************************************/
-/*@{*/
-
-/**
- * Destroy the per-screen private information.
- * 
- * \internal
- * This function calls __DriverAPIRec::DestroyScreen on \p screenPrivate, calls
- * drmClose(), and finally frees \p screenPrivate.
- */
-static void driDestroyScreen(__DRIscreen *psp)
-{
-    if (psp) {
-	/* No interaction with the X-server is possible at this point.  This
-	 * routine is called after XCloseDisplay, so there is no protocol
-	 * stream open to the X-server anymore.
-	 */
-
-       _mesa_destroy_shader_compiler();
-
-	if (psp->DriverAPI.DestroyScreen)
-	    (*psp->DriverAPI.DestroyScreen)(psp);
-
-	if (!psp->dri2.enabled) {
-	   (void)drmUnmap((drmAddress)psp->pSAREA, SAREA_MAX);
-	   (void)drmUnmap((drmAddress)psp->pFB, psp->fbSize);
-	   (void)drmCloseOnce(psp->fd);
-	} else {
-	   driDestroyOptionCache(&psp->optionCache);
-	   driDestroyOptionInfo(&psp->optionInfo);
-	}
-
-	free(psp);
-    }
-}
-
-static void
-setupLoaderExtensions(__DRIscreen *psp,
-		      const __DRIextension **extensions)
-{
-    int i;
-
-    for (i = 0; extensions[i]; i++) {
-	if (strcmp(extensions[i]->name, __DRI_GET_DRAWABLE_INFO) == 0)
-	    psp->getDrawableInfo = (__DRIgetDrawableInfoExtension *) extensions[i];
-	if (strcmp(extensions[i]->name, __DRI_DAMAGE) == 0)
-	    psp->damage = (__DRIdamageExtension *) extensions[i];
-	if (strcmp(extensions[i]->name, __DRI_SYSTEM_TIME) == 0)
-	    psp->systemTime = (__DRIsystemTimeExtension *) extensions[i];
-	if (strcmp(extensions[i]->name, __DRI_DRI2_LOADER) == 0)
-	    psp->dri2.loader = (__DRIdri2LoaderExtension *) extensions[i];
-	if (strcmp(extensions[i]->name, __DRI_IMAGE_LOOKUP) == 0)
-	    psp->dri2.image = (__DRIimageLookupExtension *) extensions[i];
-	if (strcmp(extensions[i]->name, __DRI_USE_INVALIDATE) == 0)
-	    psp->dri2.useInvalidate = (__DRIuseInvalidateExtension *) extensions[i];
-    }
-}
-
-/**
- * This is the bootstrap function for the driver.  libGL supplies all of the
- * requisite information about the system, and the driver initializes itself.
- * This routine also fills in the linked list pointed to by \c driver_modes
- * with the \c struct gl_config that the driver can support for windows or
- * pbuffers.
- *
- * For legacy DRI.
- * 
- * \param scrn  Index of the screen
- * \param ddx_version Version of the 2D DDX.  This may not be meaningful for
- *                    all drivers.
- * \param dri_version Version of the "server-side" DRI.
- * \param drm_version Version of the kernel DRM.
- * \param frame_buffer Data describing the location and layout of the
- *                     framebuffer.
- * \param pSAREA       Pointer to the SAREA.
- * \param fd           Device handle for the DRM.
- * \param extensions   ??
- * \param driver_modes  Returns modes suppoted by the driver
- * \param loaderPrivate  ??
- * 
- * \note There is no need to check the minimum API version in this
- * function.  Since the name of this function is versioned, it is
- * impossible for a loader that is too old to even load this driver.
- */
-static __DRIscreen *
-driCreateNewScreen(int scrn,
-		   const __DRIversion *ddx_version,
-		   const __DRIversion *dri_version,
-		   const __DRIversion *drm_version,
-		   const __DRIframebuffer *frame_buffer,
-		   drmAddress pSAREA, int fd, 
-		   const __DRIextension **extensions,
-		   const __DRIconfig ***driver_modes,
-		   void *loaderPrivate)
-{
-    static const __DRIextension *emptyExtensionList[] = { NULL };
-    __DRIscreen *psp;
-
-    if (driDriverAPI.InitScreen == NULL)
-	return NULL;
-
-    psp = calloc(1, sizeof *psp);
-    if (!psp)
-	return NULL;
-
-    setupLoaderExtensions(psp, extensions);
-
-    /*
-    ** NOT_DONE: This is used by the X server to detect when the client
-    ** has died while holding the drawable lock.  The client sets the
-    ** drawable lock to this value.
-    */
-    psp->drawLockID = 1;
-
-    psp->drm_version = *drm_version;
-    psp->ddx_version = *ddx_version;
-    psp->dri_version = *dri_version;
-
-    psp->pSAREA = pSAREA;
-    psp->lock = (drmLock *) &psp->pSAREA->lock;
-
-    psp->pFB = frame_buffer->base;
-    psp->fbSize = frame_buffer->size;
-    psp->fbStride = frame_buffer->stride;
-    psp->fbWidth = frame_buffer->width;
-    psp->fbHeight = frame_buffer->height;
-    psp->devPrivSize = frame_buffer->dev_priv_size;
-    psp->pDevPriv = frame_buffer->dev_priv;
-    psp->fbBPP = psp->fbStride * 8 / frame_buffer->width;
-
-    psp->extensions = emptyExtensionList;
-    psp->fd = fd;
-    psp->myNum = scrn;
-    psp->dri2.enabled = GL_FALSE;
-
-    psp->DriverAPI = driDriverAPI;
-    psp->api_mask = (1 << __DRI_API_OPENGL);
-
-    *driver_modes = driDriverAPI.InitScreen(psp);
-    if (*driver_modes == NULL) {
-	free(psp);
-	return NULL;
-    }
-
-    return psp;
-}
-
-/**
- * DRI2
- */
-static __DRIscreen *
-dri2CreateNewScreen(int scrn, int fd,
-		    const __DRIextension **extensions,
-		    const __DRIconfig ***driver_configs, void *data)
-{
-    static const __DRIextension *emptyExtensionList[] = { NULL };
-    __DRIscreen *psp;
-    drmVersionPtr version;
-
-    if (driDriverAPI.InitScreen2 == NULL)
-        return NULL;
-
-    psp = calloc(1, sizeof(*psp));
-    if (!psp)
-	return NULL;
-
-    setupLoaderExtensions(psp, extensions);
-
-    version = drmGetVersion(fd);
-    if (version) {
-	psp->drm_version.major = version->version_major;
-	psp->drm_version.minor = version->version_minor;
-	psp->drm_version.patch = version->version_patchlevel;
-	drmFreeVersion(version);
-    }
-
-    psp->extensions = emptyExtensionList;
-    psp->fd = fd;
-    psp->myNum = scrn;
-    psp->dri2.enabled = GL_TRUE;
-
-    psp->DriverAPI = driDriverAPI;
-    psp->api_mask = (1 << __DRI_API_OPENGL);
-    *driver_configs = driDriverAPI.InitScreen2(psp);
-    if (*driver_configs == NULL) {
-	free(psp);
-	return NULL;
-    }
-
-    psp->DriverAPI = driDriverAPI;
-    psp->loaderPrivate = data;
-
-    driParseOptionInfo(&psp->optionInfo, __dri2ConfigOptions,
-		       __dri2NConfigOptions);
-    driParseConfigFiles(&psp->optionCache, &psp->optionInfo, psp->myNum,
-			"dri2");
-
-    return psp;
-}
-
-static const __DRIextension **driGetExtensions(__DRIscreen *psp)
-{
-    return psp->extensions;
-}
-
-/** Core interface */
-const __DRIcoreExtension driCoreExtension = {
-    { __DRI_CORE, __DRI_CORE_VERSION },
-    NULL,
-    driDestroyScreen,
-    driGetExtensions,
-    driGetConfigAttrib,
-    driIndexConfigAttrib,
-    NULL,
-    driDestroyDrawable,
-    driSwapBuffers,
-    NULL,
-    driCopyContext,
-    driDestroyContext,
-    driBindContext,
-    driUnbindContext
-};
-
-/** Legacy DRI interface */
-const __DRIlegacyExtension driLegacyExtension = {
-    { __DRI_LEGACY, __DRI_LEGACY_VERSION },
-    driCreateNewScreen,
-    driCreateNewDrawable,
-    driCreateNewContext,
-};
-
-/** DRI2 interface */
-const __DRIdri2Extension driDRI2Extension = {
-    { __DRI_DRI2, __DRI_DRI2_VERSION },
-    dri2CreateNewScreen,
-    dri2CreateNewDrawable,
-    dri2CreateNewContext,
-    dri2GetAPIMask,
-    dri2CreateNewContextForAPI,
-    dri2AllocateBuffer,
-    dri2ReleaseBuffer
-};
-
-const __DRI2configQueryExtension dri2ConfigQueryExtension = {
-   { __DRI2_CONFIG_QUERY, __DRI2_CONFIG_QUERY_VERSION },
-   dri2ConfigQueryb,
-   dri2ConfigQueryi,
-   dri2ConfigQueryf,
-};
-
-/**
- * Calculate amount of swap interval used between GLX buffer swaps.
- * 
- * The usage value, on the range [0,max], is the fraction of total swap
- * interval time used between GLX buffer swaps is calculated.
- *
- *            \f$p = t_d / (i * t_r)\f$
- * 
- * Where \f$t_d\f$ is the time since the last GLX buffer swap, \f$i\f$ is the
- * swap interval (as set by \c glXSwapIntervalSGI), and \f$t_r\f$ time
- * required for a single vertical refresh period (as returned by \c
- * glXGetMscRateOML).
- * 
- * See the documentation for the GLX_MESA_swap_frame_usage extension for more
- * details.
- *
- * \param   dPriv  Pointer to the private drawable structure.
- * \return  If less than a single swap interval time period was required
- *          between GLX buffer swaps, a number greater than 0 and less than
- *          1.0 is returned.  If exactly one swap interval time period is
- *          required, 1.0 is returned, and if more than one is required then
- *          a number greater than 1.0 will be returned.
- *
- * \sa glXSwapIntervalSGI glXGetMscRateOML
- * 
- * \todo Instead of caching the \c glXGetMscRateOML function pointer, would it
- *       be possible to cache the sync rate?
- */
-float
-driCalculateSwapUsage( __DRIdrawable *dPriv, int64_t last_swap_ust,
-		       int64_t current_ust )
-{
-   int32_t   n;
-   int32_t   d;
-   int       interval;
-   float     usage = 1.0;
-   __DRIscreen *psp = dPriv->driScreenPriv;
-
-   if ( (*psp->systemTime->getMSCRate)(dPriv, &n, &d, dPriv->loaderPrivate) ) {
-      interval = (dPriv->swap_interval != 0) ? dPriv->swap_interval : 1;
-
-
-      /* We want to calculate
-       * (current_UST - last_swap_UST) / (interval * us_per_refresh).  We get
-       * current_UST by calling __glXGetUST.  last_swap_UST is stored in
-       * dPriv->swap_ust.  interval has already been calculated.
-       *
-       * The only tricky part is us_per_refresh.  us_per_refresh is
-       * 1000000 / MSC_rate.  We know the MSC_rate is n / d.  We can flip it
-       * around and say us_per_refresh = 1000000 * d / n.  Since this goes in
-       * the denominator of the final calculation, we calculate
-       * (interval * 1000000 * d) and move n into the numerator.
-       */
-
-      usage = (current_ust - last_swap_ust);
-      usage *= n;
-      usage /= (interval * d);
-      usage /= 1000000.0;
-   }
-   
-   return usage;
-}
-
-void
-dri2InvalidateDrawable(__DRIdrawable *drawable)
-{
-    drawable->dri2.stamp++;
-}
-
-/*@}*/
+/**

+ * \file dri_util.c

+ * DRI utility functions.

+ *

+ * This module acts as glue between GLX and the actual hardware driver.  A DRI

+ * driver doesn't really \e have to use any of this - it's optional.  But, some

+ * useful stuff is done here that otherwise would have to be duplicated in most

+ * drivers.

+ * 

+ * Basically, these utility functions take care of some of the dirty details of

+ * screen initialization, context creation, context binding, DRM setup, etc.

+ *

+ * These functions are compiled into each DRI driver so libGL.so knows nothing

+ * about them.

+ */

+

+

+#include <assert.h>

+#include <stdarg.h>

+#include <unistd.h>

+#include <sys/mman.h>

+#include <stdio.h>

+

+#ifndef MAP_FAILED

+#define MAP_FAILED ((void *)-1)

+#endif

+

+#include "main/imports.h"

+#define None 0

+

+#include "dri_util.h"

+#include "drm_sarea.h"

+#include "utils.h"

+#include "xmlpool.h"

+#include "../glsl/glsl_parser_extras.h"

+

+PUBLIC const char __dri2ConfigOptions[] =

+   DRI_CONF_BEGIN

+      DRI_CONF_SECTION_PERFORMANCE

+         DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_1)

+      DRI_CONF_SECTION_END

+   DRI_CONF_END;

+

+static const uint __dri2NConfigOptions = 1;

+

+#ifndef GLX_OML_sync_control

+typedef GLboolean ( * PFNGLXGETMSCRATEOMLPROC) (__DRIdrawable *drawable, int32_t *numerator, int32_t *denominator);

+#endif

+

+static void dri_get_drawable(__DRIdrawable *pdp);

+static void dri_put_drawable(__DRIdrawable *pdp);

+

+/**

+ * This is just a token extension used to signal that the driver

+ * supports setting a read drawable.

+ */

+const __DRIextension driReadDrawableExtension = {

+    __DRI_READ_DRAWABLE, __DRI_READ_DRAWABLE_VERSION

+};

+

+GLint

+driIntersectArea( drm_clip_rect_t rect1, drm_clip_rect_t rect2 )

+{

+   if (rect2.x1 > rect1.x1) rect1.x1 = rect2.x1;

+   if (rect2.x2 < rect1.x2) rect1.x2 = rect2.x2;

+   if (rect2.y1 > rect1.y1) rect1.y1 = rect2.y1;

+   if (rect2.y2 < rect1.y2) rect1.y2 = rect2.y2;

+

+   if (rect1.x1 > rect1.x2 || rect1.y1 > rect1.y2) return 0;

+

+   return (rect1.x2 - rect1.x1) * (rect1.y2 - rect1.y1);

+}

+

+/*****************************************************************/

+/** \name Context (un)binding functions                          */

+/*****************************************************************/

+/*@{*/

+

+/**

+ * Unbind context.

+ * 

+ * \param scrn the screen.

+ * \param gc context.

+ *

+ * \return \c GL_TRUE on success, or \c GL_FALSE on failure.

+ * 

+ * \internal

+ * This function calls __DriverAPIRec::UnbindContext, and then decrements

+ * __DRIdrawableRec::refcount which must be non-zero for a successful

+ * return.

+ * 

+ * While casting the opaque private pointers associated with the parameters

+ * into their respective real types it also assures they are not \c NULL. 

+ */

+static int driUnbindContext(__DRIcontext *pcp)

+{

+    __DRIscreen *psp;

+    __DRIdrawable *pdp;

+    __DRIdrawable *prp;

+

+    /*

+    ** Assume error checking is done properly in glXMakeCurrent before

+    ** calling driUnbindContext.

+    */

+

+    if (pcp == NULL)

+        return GL_FALSE;

+

+    psp = pcp->driScreenPriv;

+    pdp = pcp->driDrawablePriv;

+    prp = pcp->driReadablePriv;

+

+    /* already unbound */

+    if (!pdp && !prp)

+      return GL_TRUE;

+    /* Let driver unbind drawable from context */

+    (*psp->DriverAPI.UnbindContext)(pcp);

+

+    assert(pdp);

+    if (pdp->refcount == 0) {

+	/* ERROR!!! */

+	return GL_FALSE;

+    }

+

+    dri_put_drawable(pdp);

+

+    if (prp != pdp) {

+        if (prp->refcount == 0) {

+	    /* ERROR!!! */

+	    return GL_FALSE;

+	}

+

+    	dri_put_drawable(prp);

+    }

+

+

+    /* XXX this is disabled so that if we call SwapBuffers on an unbound

+     * window we can determine the last context bound to the window and

+     * use that context's lock. (BrianP, 2-Dec-2000)

+     */

+    pcp->driDrawablePriv = pcp->driReadablePriv = NULL;

+

+    return GL_TRUE;

+}

+

+/**

+ * This function takes both a read buffer and a draw buffer.  This is needed

+ * for \c glXMakeCurrentReadSGI or GLX 1.3's \c glXMakeContextCurrent

+ * function.

+ */

+static int driBindContext(__DRIcontext *pcp,

+			  __DRIdrawable *pdp,

+			  __DRIdrawable *prp)

+{

+    __DRIscreen *psp = NULL;

+

+    /*

+    ** Assume error checking is done properly in glXMakeCurrent before

+    ** calling driUnbindContext.

+    */

+

+    if (!pcp)

+	return GL_FALSE;

+

+    /* Bind the drawable to the context */

+    psp = pcp->driScreenPriv;

+    pcp->driDrawablePriv = pdp;

+    pcp->driReadablePriv = prp;

+    if (pdp) {

+	pdp->driContextPriv = pcp;

+	dri_get_drawable(pdp);

+    }

+    if (prp && pdp != prp) {

+	dri_get_drawable(prp);

+    }

+

+    /*

+    ** Now that we have a context associated with this drawable, we can

+    ** initialize the drawable information if has not been done before.

+    */

+

+    if (!psp->dri2.enabled) {

+	if (pdp && !pdp->pStamp) {

+	    DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);

+	    __driUtilUpdateDrawableInfo(pdp);

+	    DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);

+	}

+	if (prp && pdp != prp && !prp->pStamp) {

+	    DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);

+	    __driUtilUpdateDrawableInfo(prp);

+	    DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);

+        }

+    }

+

+    /* Call device-specific MakeCurrent */

+    return (*psp->DriverAPI.MakeCurrent)(pcp, pdp, prp);

+}

+

+/*@}*/

+

+

+/*****************************************************************/

+/** \name Drawable handling functions                            */

+/*****************************************************************/

+/*@{*/

+

+/**

+ * Update private drawable information.

+ *

+ * \param pdp pointer to the private drawable information to update.

+ * 

+ * This function basically updates the __DRIdrawable struct's

+ * cliprect information by calling \c __DRIinterfaceMethods::getDrawableInfo.

+ * This is usually called by the DRI_VALIDATE_DRAWABLE_INFO macro which

+ * compares the __DRIdrwablePrivate pStamp and lastStamp values.  If

+ * the values are different that means we have to update the clipping

+ * info.

+ */

+void

+__driUtilUpdateDrawableInfo(__DRIdrawable *pdp)

+{

+    __DRIscreen *psp = pdp->driScreenPriv;

+    __DRIcontext *pcp = pdp->driContextPriv;

+    

+    if (!pcp 

+	|| ((pdp != pcp->driDrawablePriv) && (pdp != pcp->driReadablePriv))) {

+	/* ERROR!!! 

+	 * ...but we must ignore it. There can be many contexts bound to a

+	 * drawable.

+	 */

+    }

+

+    if (pdp->pClipRects) {

+	free(pdp->pClipRects); 

+	pdp->pClipRects = NULL;

+    }

+

+    if (pdp->pBackClipRects) {

+	free(pdp->pBackClipRects); 

+	pdp->pBackClipRects = NULL;

+    }

+

+    DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);

+

+    if (! (*psp->getDrawableInfo->getDrawableInfo)(pdp,

+			  &pdp->index, &pdp->lastStamp,

+			  &pdp->x, &pdp->y, &pdp->w, &pdp->h,

+			  &pdp->numClipRects, &pdp->pClipRects,

+			  &pdp->backX,

+			  &pdp->backY,

+			  &pdp->numBackClipRects,

+			  &pdp->pBackClipRects,

+			  pdp->loaderPrivate)) {

+	/* Error -- eg the window may have been destroyed.  Keep going

+	 * with no cliprects.

+	 */

+        pdp->pStamp = &pdp->lastStamp; /* prevent endless loop */

+	pdp->numClipRects = 0;

+	pdp->pClipRects = NULL;

+	pdp->numBackClipRects = 0;

+	pdp->pBackClipRects = NULL;

+    }

+    else

+       pdp->pStamp = &(psp->pSAREA->drawableTable[pdp->index].stamp);

+

+    DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);

+}

+

+/*@}*/

+

+/*****************************************************************/

+/** \name GLX callbacks                                          */

+/*****************************************************************/

+/*@{*/

+

+static void driReportDamage(__DRIdrawable *pdp,

+			    struct drm_clip_rect *pClipRects, int numClipRects)

+{

+    __DRIscreen *psp = pdp->driScreenPriv;

+

+    /* Check that we actually have the new damage report method */

+    if (psp->damage) {

+	/* Report the damage.  Currently, all our drivers draw

+	 * directly to the front buffer, so we report the damage there

+	 * rather than to the backing storein (if any).

+	 */

+	(*psp->damage->reportDamage)(pdp,

+				     pdp->x, pdp->y,

+				     pClipRects, numClipRects,

+				     GL_TRUE, pdp->loaderPrivate);

+    }

+}

+

+

+/**

+ * Swap buffers.

+ *

+ * \param drawablePrivate opaque pointer to the per-drawable private info.

+ * 

+ * \internal

+ * This function calls __DRIdrawable::swapBuffers.

+ * 

+ * Is called directly from glXSwapBuffers().

+ */

+static void driSwapBuffers(__DRIdrawable *dPriv)

+{

+    __DRIscreen *psp = dPriv->driScreenPriv;

+    drm_clip_rect_t *rects;

+    int i;

+

+    psp->DriverAPI.SwapBuffers(dPriv);

+

+    if (!dPriv->numClipRects)

+        return;

+

+    rects = malloc(sizeof(*rects) * dPriv->numClipRects);

+

+    if (!rects)

+        return;

+

+    for (i = 0; i < dPriv->numClipRects; i++) {

+        rects[i].x1 = dPriv->pClipRects[i].x1 - dPriv->x;

+        rects[i].y1 = dPriv->pClipRects[i].y1 - dPriv->y;

+        rects[i].x2 = dPriv->pClipRects[i].x2 - dPriv->x;

+        rects[i].y2 = dPriv->pClipRects[i].y2 - dPriv->y;

+    }

+

+    driReportDamage(dPriv, rects, dPriv->numClipRects);

+    free(rects);

+}

+

+static int driDrawableGetMSC( __DRIscreen *sPriv, __DRIdrawable *dPriv,

+			      int64_t *msc )

+{

+    return sPriv->DriverAPI.GetDrawableMSC(sPriv, dPriv, msc);

+}

+

+

+static int driWaitForMSC(__DRIdrawable *dPriv, int64_t target_msc,

+			 int64_t divisor, int64_t remainder,

+			 int64_t * msc, int64_t * sbc)

+{

+    __DRIswapInfo  sInfo;

+    int  status;

+

+    status = dPriv->driScreenPriv->DriverAPI.WaitForMSC( dPriv, target_msc,

+                                                         divisor, remainder,

+                                                         msc );

+

+    /* GetSwapInfo() may not be provided by the driver if GLX_SGI_video_sync

+     * is supported but GLX_OML_sync_control is not.  Therefore, don't return

+     * an error value if GetSwapInfo() is not implemented.

+    */

+    if ( status == 0

+         && dPriv->driScreenPriv->DriverAPI.GetSwapInfo ) {

+        status = dPriv->driScreenPriv->DriverAPI.GetSwapInfo( dPriv, & sInfo );

+        *sbc = sInfo.swap_count;

+    }

+

+    return status;

+}

+

+

+const __DRImediaStreamCounterExtension driMediaStreamCounterExtension = {

+    { __DRI_MEDIA_STREAM_COUNTER, __DRI_MEDIA_STREAM_COUNTER_VERSION },

+    driWaitForMSC,

+    driDrawableGetMSC,

+};

+

+

+static void driCopySubBuffer(__DRIdrawable *dPriv,

+			      int x, int y, int w, int h)

+{

+    drm_clip_rect_t rect;

+

+    rect.x1 = x;

+    rect.y1 = dPriv->h - y - h;

+    rect.x2 = x + w;

+    rect.y2 = rect.y1 + h;

+    driReportDamage(dPriv, &rect, 1);

+

+    dPriv->driScreenPriv->DriverAPI.CopySubBuffer(dPriv, x, y, w, h);

+}

+

+const __DRIcopySubBufferExtension driCopySubBufferExtension = {

+    { __DRI_COPY_SUB_BUFFER, __DRI_COPY_SUB_BUFFER_VERSION },

+    driCopySubBuffer

+};

+

+static void driSetSwapInterval(__DRIdrawable *dPriv, unsigned int interval)

+{

+    dPriv->swap_interval = interval;

+}

+

+static unsigned int driGetSwapInterval(__DRIdrawable *dPriv)

+{

+    return dPriv->swap_interval;

+}

+

+const __DRIswapControlExtension driSwapControlExtension = {

+    { __DRI_SWAP_CONTROL, __DRI_SWAP_CONTROL_VERSION },

+    driSetSwapInterval,

+    driGetSwapInterval

+};

+

+

+/**

+ * This is called via __DRIscreenRec's createNewDrawable pointer.

+ */

+static __DRIdrawable *

+driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,

+		     drm_drawable_t hwDrawable, int renderType,

+		     const int *attrs, void *data)

+{

+    __DRIdrawable *pdp;

+

+    /* Since pbuffers are not yet supported, no drawable attributes are

+     * supported either.

+     */

+    (void) attrs;

+

+    pdp = malloc(sizeof *pdp);

+    if (!pdp) {

+	return NULL;

+    }

+

+    pdp->driContextPriv = NULL;

+    pdp->loaderPrivate = data;

+    pdp->hHWDrawable = hwDrawable;

+    pdp->refcount = 1;

+    pdp->pStamp = NULL;

+    pdp->lastStamp = 0;

+    pdp->index = 0;

+    pdp->x = 0;

+    pdp->y = 0;

+    pdp->w = 0;

+    pdp->h = 0;

+    pdp->numClipRects = 0;

+    pdp->numBackClipRects = 0;

+    pdp->pClipRects = NULL;

+    pdp->pBackClipRects = NULL;

+    pdp->vblSeq = 0;

+    pdp->vblFlags = 0;

+

+    pdp->driScreenPriv = psp;

+

+    if (!(*psp->DriverAPI.CreateBuffer)(psp, pdp, &config->modes, 0)) {

+       free(pdp);

+       return NULL;

+    }

+

+    pdp->msc_base = 0;

+

+    /* This special default value is replaced with the configured

+     * default value when the drawable is first bound to a direct

+     * rendering context. 

+     */

+    pdp->swap_interval = (unsigned)-1;

+

+    return pdp;

+}

+

+

+static __DRIdrawable *

+dri2CreateNewDrawable(__DRIscreen *screen,

+		      const __DRIconfig *config,

+		      void *loaderPrivate)

+{

+    __DRIdrawable *pdraw;

+

+    pdraw = driCreateNewDrawable(screen, config, 0, 0, NULL, loaderPrivate);

+    if (!pdraw)

+    	return NULL;

+

+    pdraw->pClipRects = &pdraw->dri2.clipRect;

+    pdraw->pBackClipRects = &pdraw->dri2.clipRect;

+

+    pdraw->pStamp = &pdraw->dri2.stamp;

+    *pdraw->pStamp = pdraw->lastStamp + 1;

+

+    return pdraw;

+}

+

+static __DRIbuffer *

+dri2AllocateBuffer(__DRIscreen *screen,

+		   unsigned int attachment, unsigned int format,

+		   int width, int height)

+{

+    return (*screen->DriverAPI.AllocateBuffer)(screen, attachment, format,

+					       width, height);

+}

+

+static void

+dri2ReleaseBuffer(__DRIscreen *screen, __DRIbuffer *buffer)

+{

+   (*screen->DriverAPI.ReleaseBuffer)(screen, buffer);

+}

+

+

+static int

+dri2ConfigQueryb(__DRIscreen *screen, const char *var, GLboolean *val)

+{

+   if (!driCheckOption(&screen->optionCache, var, DRI_BOOL))

+      return -1;

+

+   *val = driQueryOptionb(&screen->optionCache, var);

+

+   return 0;

+}

+

+static int

+dri2ConfigQueryi(__DRIscreen *screen, const char *var, GLint *val)

+{

+   if (!driCheckOption(&screen->optionCache, var, DRI_INT) &&

+       !driCheckOption(&screen->optionCache, var, DRI_ENUM))

+      return -1;

+

+    *val = driQueryOptioni(&screen->optionCache, var);

+

+    return 0;

+}

+

+static int

+dri2ConfigQueryf(__DRIscreen *screen, const char *var, GLfloat *val)

+{

+   if (!driCheckOption(&screen->optionCache, var, DRI_FLOAT))

+      return -1;

+

+    *val = driQueryOptionf(&screen->optionCache, var);

+

+    return 0;

+}

+

+

+static void dri_get_drawable(__DRIdrawable *pdp)

+{

+    pdp->refcount++;

+}

+	

+static void dri_put_drawable(__DRIdrawable *pdp)

+{

+    __DRIscreen *psp;

+

+    if (pdp) {

+	pdp->refcount--;

+	if (pdp->refcount)

+	    return;

+

+	psp = pdp->driScreenPriv;

+        (*psp->DriverAPI.DestroyBuffer)(pdp);

+	if (pdp->pClipRects && pdp->pClipRects != &pdp->dri2.clipRect) {

+	    free(pdp->pClipRects);

+	    pdp->pClipRects = NULL;

+	}

+	if (pdp->pBackClipRects && pdp->pClipRects != &pdp->dri2.clipRect) {

+	    free(pdp->pBackClipRects);

+	    pdp->pBackClipRects = NULL;

+	}

+	free(pdp);

+    }

+}

+

+static void

+driDestroyDrawable(__DRIdrawable *pdp)

+{

+    dri_put_drawable(pdp);

+}

+

+/*@}*/

+

+

+/*****************************************************************/

+/** \name Context handling functions                             */

+/*****************************************************************/

+/*@{*/

+

+/**

+ * Destroy the per-context private information.

+ * 

+ * \internal

+ * This function calls __DriverAPIRec::DestroyContext on \p contextPrivate, calls

+ * drmDestroyContext(), and finally frees \p contextPrivate.

+ */

+static void

+driDestroyContext(__DRIcontext *pcp)

+{

+    if (pcp) {

+	(*pcp->driScreenPriv->DriverAPI.DestroyContext)(pcp);

+	free(pcp);

+    }

+}

+

+

+/**

+ * Create the per-drawable private driver information.

+ * 

+ * \param render_type   Type of rendering target.  \c GLX_RGBA is the only

+ *                      type likely to ever be supported for direct-rendering.

+ * \param shared        Context with which to share textures, etc. or NULL

+ *

+ * \returns An opaque pointer to the per-context private information on

+ *          success, or \c NULL on failure.

+ * 

+ * \internal

+ * This function allocates and fills a __DRIcontextRec structure.  It

+ * performs some device independent initialization and passes all the

+ * relevent information to __DriverAPIRec::CreateContext to create the

+ * context.

+ *

+ */

+static __DRIcontext *

+driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,

+		    int render_type, __DRIcontext *shared, 

+		    drm_context_t hwContext, void *data)

+{

+    __DRIcontext *pcp;

+    void * const shareCtx = (shared != NULL) ? shared->driverPrivate : NULL;

+

+    pcp = malloc(sizeof *pcp);

+    if (!pcp)

+	return NULL;

+

+    pcp->driScreenPriv = psp;

+    pcp->driDrawablePriv = NULL;

+    pcp->loaderPrivate = data;

+    

+    pcp->dri2.draw_stamp = 0;

+    pcp->dri2.read_stamp = 0;

+

+    pcp->hHWContext = hwContext;

+

+    if ( !(*psp->DriverAPI.CreateContext)(API_OPENGL,

+					  &config->modes, pcp, shareCtx) ) {

+        free(pcp);

+        return NULL;

+    }

+

+    return pcp;

+}

+

+static unsigned int

+dri2GetAPIMask(__DRIscreen *screen)

+{

+    return screen->api_mask;

+}

+

+static __DRIcontext *

+dri2CreateNewContextForAPI(__DRIscreen *screen, int api,

+			   const __DRIconfig *config,

+			   __DRIcontext *shared, void *data)

+{

+    __DRIcontext *context;

+    const struct gl_config *modes = (config != NULL) ? &config->modes : NULL;

+    void *shareCtx = (shared != NULL) ? shared->driverPrivate : NULL;

+    gl_api mesa_api;

+

+    if (!(screen->api_mask & (1 << api)))

+	return NULL;

+

+    switch (api) {

+    case __DRI_API_OPENGL:

+	    mesa_api = API_OPENGL;

+	    break;

+    case __DRI_API_GLES:

+	    mesa_api = API_OPENGLES;

+	    break;

+    case __DRI_API_GLES2:

+	    mesa_api = API_OPENGLES2;

+	    break;

+    default:

+	    return NULL;

+    }

+

+    context = malloc(sizeof *context);

+    if (!context)

+	return NULL;

+

+    context->driScreenPriv = screen;

+    context->driDrawablePriv = NULL;

+    context->loaderPrivate = data;

+    

+    if (!(*screen->DriverAPI.CreateContext)(mesa_api, modes,

+					    context, shareCtx) ) {

+        free(context);

+        return NULL;

+    }

+

+    return context;

+}

+

+

+static __DRIcontext *

+dri2CreateNewContext(__DRIscreen *screen, const __DRIconfig *config,

+		      __DRIcontext *shared, void *data)

+{

+   return dri2CreateNewContextForAPI(screen, __DRI_API_OPENGL,

+				     config, shared, data);

+}

+

+static int

+driCopyContext(__DRIcontext *dest, __DRIcontext *src, unsigned long mask)

+{

+    return GL_FALSE;

+}

+

+/*@}*/

+

+

+/*****************************************************************/

+/** \name Screen handling functions                              */

+/*****************************************************************/

+/*@{*/

+

+/**

+ * Destroy the per-screen private information.

+ * 

+ * \internal

+ * This function calls __DriverAPIRec::DestroyScreen on \p screenPrivate, calls

+ * drmClose(), and finally frees \p screenPrivate.

+ */

+static void driDestroyScreen(__DRIscreen *psp)

+{

+    if (psp) {

+	/* No interaction with the X-server is possible at this point.  This

+	 * routine is called after XCloseDisplay, so there is no protocol

+	 * stream open to the X-server anymore.

+	 */

+

+       _mesa_destroy_shader_compiler();

+

+	if (psp->DriverAPI.DestroyScreen)

+	    (*psp->DriverAPI.DestroyScreen)(psp);

+

+	if (!psp->dri2.enabled) {

+	   (void)drmUnmap((drmAddress)psp->pSAREA, SAREA_MAX);

+	   (void)drmUnmap((drmAddress)psp->pFB, psp->fbSize);

+	   (void)drmCloseOnce(psp->fd);

+	} else {

+	   driDestroyOptionCache(&psp->optionCache);

+	   driDestroyOptionInfo(&psp->optionInfo);

+	}

+

+	free(psp);

+    }

+}

+

+static void

+setupLoaderExtensions(__DRIscreen *psp,

+		      const __DRIextension **extensions)

+{

+    int i;

+

+    for (i = 0; extensions[i]; i++) {

+	if (strcmp(extensions[i]->name, __DRI_GET_DRAWABLE_INFO) == 0)

+	    psp->getDrawableInfo = (__DRIgetDrawableInfoExtension *) extensions[i];

+	if (strcmp(extensions[i]->name, __DRI_DAMAGE) == 0)

+	    psp->damage = (__DRIdamageExtension *) extensions[i];

+	if (strcmp(extensions[i]->name, __DRI_SYSTEM_TIME) == 0)

+	    psp->systemTime = (__DRIsystemTimeExtension *) extensions[i];

+	if (strcmp(extensions[i]->name, __DRI_DRI2_LOADER) == 0)

+	    psp->dri2.loader = (__DRIdri2LoaderExtension *) extensions[i];

+	if (strcmp(extensions[i]->name, __DRI_IMAGE_LOOKUP) == 0)

+	    psp->dri2.image = (__DRIimageLookupExtension *) extensions[i];

+	if (strcmp(extensions[i]->name, __DRI_USE_INVALIDATE) == 0)

+	    psp->dri2.useInvalidate = (__DRIuseInvalidateExtension *) extensions[i];

+    }

+}

+

+/**

+ * This is the bootstrap function for the driver.  libGL supplies all of the

+ * requisite information about the system, and the driver initializes itself.

+ * This routine also fills in the linked list pointed to by \c driver_modes

+ * with the \c struct gl_config that the driver can support for windows or

+ * pbuffers.

+ *

+ * For legacy DRI.

+ * 

+ * \param scrn  Index of the screen

+ * \param ddx_version Version of the 2D DDX.  This may not be meaningful for

+ *                    all drivers.

+ * \param dri_version Version of the "server-side" DRI.

+ * \param drm_version Version of the kernel DRM.

+ * \param frame_buffer Data describing the location and layout of the

+ *                     framebuffer.

+ * \param pSAREA       Pointer to the SAREA.

+ * \param fd           Device handle for the DRM.

+ * \param extensions   ??

+ * \param driver_modes  Returns modes suppoted by the driver

+ * \param loaderPrivate  ??

+ * 

+ * \note There is no need to check the minimum API version in this

+ * function.  Since the name of this function is versioned, it is

+ * impossible for a loader that is too old to even load this driver.

+ */

+static __DRIscreen *

+driCreateNewScreen(int scrn,

+		   const __DRIversion *ddx_version,

+		   const __DRIversion *dri_version,

+		   const __DRIversion *drm_version,

+		   const __DRIframebuffer *frame_buffer,

+		   drmAddress pSAREA, int fd, 

+		   const __DRIextension **extensions,

+		   const __DRIconfig ***driver_modes,

+		   void *loaderPrivate)

+{

+    static const __DRIextension *emptyExtensionList[] = { NULL };

+    __DRIscreen *psp;

+

+    if (driDriverAPI.InitScreen == NULL)

+	return NULL;

+

+    psp = calloc(1, sizeof *psp);

+    if (!psp)

+	return NULL;

+

+    setupLoaderExtensions(psp, extensions);

+

+    /*

+    ** NOT_DONE: This is used by the X server to detect when the client

+    ** has died while holding the drawable lock.  The client sets the

+    ** drawable lock to this value.

+    */

+    psp->drawLockID = 1;

+

+    psp->drm_version = *drm_version;

+    psp->ddx_version = *ddx_version;

+    psp->dri_version = *dri_version;

+

+    psp->pSAREA = pSAREA;

+    psp->lock = (drmLock *) &psp->pSAREA->lock;

+

+    psp->pFB = frame_buffer->base;

+    psp->fbSize = frame_buffer->size;

+    psp->fbStride = frame_buffer->stride;

+    psp->fbWidth = frame_buffer->width;

+    psp->fbHeight = frame_buffer->height;

+    psp->devPrivSize = frame_buffer->dev_priv_size;

+    psp->pDevPriv = frame_buffer->dev_priv;

+    psp->fbBPP = psp->fbStride * 8 / frame_buffer->width;

+

+    psp->extensions = emptyExtensionList;

+    psp->fd = fd;

+    psp->myNum = scrn;

+    psp->dri2.enabled = GL_FALSE;

+

+    psp->DriverAPI = driDriverAPI;

+    psp->api_mask = (1 << __DRI_API_OPENGL);

+

+    *driver_modes = driDriverAPI.InitScreen(psp);

+    if (*driver_modes == NULL) {

+	free(psp);

+	return NULL;

+    }

+

+    return psp;

+}

+

+/**

+ * DRI2

+ */

+static __DRIscreen *

+dri2CreateNewScreen(int scrn, int fd,

+		    const __DRIextension **extensions,

+		    const __DRIconfig ***driver_configs, void *data)

+{

+    static const __DRIextension *emptyExtensionList[] = { NULL };

+    __DRIscreen *psp;

+    drmVersionPtr version;

+

+    if (driDriverAPI.InitScreen2 == NULL)

+        return NULL;

+

+    psp = calloc(1, sizeof(*psp));

+    if (!psp)

+	return NULL;

+

+    setupLoaderExtensions(psp, extensions);

+

+    version = drmGetVersion(fd);

+    if (version) {

+	psp->drm_version.major = version->version_major;

+	psp->drm_version.minor = version->version_minor;

+	psp->drm_version.patch = version->version_patchlevel;

+	drmFreeVersion(version);

+    }

+

+    psp->extensions = emptyExtensionList;

+    psp->fd = fd;

+    psp->myNum = scrn;

+    psp->dri2.enabled = GL_TRUE;

+

+    psp->DriverAPI = driDriverAPI;

+    psp->api_mask = (1 << __DRI_API_OPENGL);

+    *driver_configs = driDriverAPI.InitScreen2(psp);

+    if (*driver_configs == NULL) {

+	free(psp);

+	return NULL;

+    }

+

+    psp->DriverAPI = driDriverAPI;

+    psp->loaderPrivate = data;

+

+    driParseOptionInfo(&psp->optionInfo, __dri2ConfigOptions,

+		       __dri2NConfigOptions);

+    driParseConfigFiles(&psp->optionCache, &psp->optionInfo, psp->myNum,

+			"dri2");

+

+    return psp;

+}

+

+static const __DRIextension **driGetExtensions(__DRIscreen *psp)

+{

+    return psp->extensions;

+}

+

+/** Core interface */

+const __DRIcoreExtension driCoreExtension = {

+    { __DRI_CORE, __DRI_CORE_VERSION },

+    NULL,

+    driDestroyScreen,

+    driGetExtensions,

+    driGetConfigAttrib,

+    driIndexConfigAttrib,

+    NULL,

+    driDestroyDrawable,

+    driSwapBuffers,

+    NULL,

+    driCopyContext,

+    driDestroyContext,

+    driBindContext,

+    driUnbindContext

+};

+

+/** Legacy DRI interface */

+const __DRIlegacyExtension driLegacyExtension = {

+    { __DRI_LEGACY, __DRI_LEGACY_VERSION },

+    driCreateNewScreen,

+    driCreateNewDrawable,

+    driCreateNewContext,

+};

+

+/** DRI2 interface */

+const __DRIdri2Extension driDRI2Extension = {

+    { __DRI_DRI2, __DRI_DRI2_VERSION },

+    dri2CreateNewScreen,

+    dri2CreateNewDrawable,

+    dri2CreateNewContext,

+    dri2GetAPIMask,

+    dri2CreateNewContextForAPI,

+    dri2AllocateBuffer,

+    dri2ReleaseBuffer

+};

+

+const __DRI2configQueryExtension dri2ConfigQueryExtension = {

+   { __DRI2_CONFIG_QUERY, __DRI2_CONFIG_QUERY_VERSION },

+   dri2ConfigQueryb,

+   dri2ConfigQueryi,

+   dri2ConfigQueryf,

+};

+

+/**

+ * Calculate amount of swap interval used between GLX buffer swaps.

+ * 

+ * The usage value, on the range [0,max], is the fraction of total swap

+ * interval time used between GLX buffer swaps is calculated.

+ *

+ *            \f$p = t_d / (i * t_r)\f$

+ * 

+ * Where \f$t_d\f$ is the time since the last GLX buffer swap, \f$i\f$ is the

+ * swap interval (as set by \c glXSwapIntervalSGI), and \f$t_r\f$ time

+ * required for a single vertical refresh period (as returned by \c

+ * glXGetMscRateOML).

+ * 

+ * See the documentation for the GLX_MESA_swap_frame_usage extension for more

+ * details.

+ *

+ * \param   dPriv  Pointer to the private drawable structure.

+ * \return  If less than a single swap interval time period was required

+ *          between GLX buffer swaps, a number greater than 0 and less than

+ *          1.0 is returned.  If exactly one swap interval time period is

+ *          required, 1.0 is returned, and if more than one is required then

+ *          a number greater than 1.0 will be returned.

+ *

+ * \sa glXSwapIntervalSGI glXGetMscRateOML

+ * 

+ * \todo Instead of caching the \c glXGetMscRateOML function pointer, would it

+ *       be possible to cache the sync rate?

+ */

+float

+driCalculateSwapUsage( __DRIdrawable *dPriv, int64_t last_swap_ust,

+		       int64_t current_ust )

+{

+   int32_t   n;

+   int32_t   d;

+   int       interval;

+   float     usage = 1.0;

+   __DRIscreen *psp = dPriv->driScreenPriv;

+

+   if ( (*psp->systemTime->getMSCRate)(dPriv, &n, &d, dPriv->loaderPrivate) ) {

+      interval = (dPriv->swap_interval != 0) ? dPriv->swap_interval : 1;

+

+

+      /* We want to calculate

+       * (current_UST - last_swap_UST) / (interval * us_per_refresh).  We get

+       * current_UST by calling __glXGetUST.  last_swap_UST is stored in

+       * dPriv->swap_ust.  interval has already been calculated.

+       *

+       * The only tricky part is us_per_refresh.  us_per_refresh is

+       * 1000000 / MSC_rate.  We know the MSC_rate is n / d.  We can flip it

+       * around and say us_per_refresh = 1000000 * d / n.  Since this goes in

+       * the denominator of the final calculation, we calculate

+       * (interval * 1000000 * d) and move n into the numerator.

+       */

+

+      usage = (current_ust - last_swap_ust);

+      usage *= n;

+      usage /= (interval * d);

+      usage /= 1000000.0;

+   }

+   

+   return usage;

+}

+

+void

+dri2InvalidateDrawable(__DRIdrawable *drawable)

+{

+    drawable->dri2.stamp++;

+}

+

+/*@}*/

diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.h b/mesalib/src/mesa/drivers/dri/common/dri_util.h
index 3d3d5c9cd..8d2a38524 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.h
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.h
@@ -1,563 +1,563 @@
-/*
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
- */
-
-/**
- * \file dri_util.h
- * DRI utility functions definitions.
- *
- * This module acts as glue between GLX and the actual hardware driver.  A DRI
- * driver doesn't really \e have to use any of this - it's optional.  But, some
- * useful stuff is done here that otherwise would have to be duplicated in most
- * drivers.
- * 
- * Basically, these utility functions take care of some of the dirty details of
- * screen initialization, context creation, context binding, DRM setup, etc.
- *
- * These functions are compiled into each DRI driver so libGL.so knows nothing
- * about them.
- *
- * \sa dri_util.c.
- * 
- * \author Kevin E. Martin <kevin@precisioninsight.com>
- * \author Brian Paul <brian@precisioninsight.com>
- */
-
-#ifndef _DRI_UTIL_H_
-#define _DRI_UTIL_H_
-
-#include <GL/gl.h>
-#include <drm.h>
-#include <drm_sarea.h>
-#include <xf86drm.h>
-#include "xmlconfig.h"
-#include "main/glheader.h"
-#include "main/mtypes.h"
-#include "GL/internal/dri_interface.h"
-
-#define GLX_BAD_CONTEXT                    5
-
-typedef struct __DRIswapInfoRec        __DRIswapInfo;
-
-/**
- * Extensions.
- */
-extern const __DRIlegacyExtension driLegacyExtension;
-extern const __DRIcoreExtension driCoreExtension;
-extern const __DRIdri2Extension driDRI2Extension;
-extern const __DRIextension driReadDrawableExtension;
-extern const __DRIcopySubBufferExtension driCopySubBufferExtension;
-extern const __DRIswapControlExtension driSwapControlExtension;
-extern const __DRImediaStreamCounterExtension driMediaStreamCounterExtension;
-extern const __DRI2configQueryExtension dri2ConfigQueryExtension;
-
-/**
- * Used by DRI_VALIDATE_DRAWABLE_INFO
- */
-#define DRI_VALIDATE_DRAWABLE_INFO_ONCE(pDrawPriv)              \
-    do {                                                        \
-	if (*(pDrawPriv->pStamp) != pDrawPriv->lastStamp) {     \
-	    __driUtilUpdateDrawableInfo(pDrawPriv);             \
-	}                                                       \
-    } while (0)
-
-
-/**
- * Utility macro to validate the drawable information.
- *
- * See __DRIdrawable::pStamp and __DRIdrawable::lastStamp.
- */
-#define DRI_VALIDATE_DRAWABLE_INFO(psp, pdp)                            \
-do {                                                                    \
-    while (*(pdp->pStamp) != pdp->lastStamp) {                          \
-        register unsigned int hwContext = psp->pSAREA->lock.lock &      \
-		     ~(DRM_LOCK_HELD | DRM_LOCK_CONT);                  \
-	DRM_UNLOCK(psp->fd, &psp->pSAREA->lock, hwContext);             \
-                                                                        \
-	DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);     \
-	DRI_VALIDATE_DRAWABLE_INFO_ONCE(pdp);                           \
-	DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);   \
-                                                                        \
-	DRM_LIGHT_LOCK(psp->fd, &psp->pSAREA->lock, hwContext);         \
-    }                                                                   \
-} while (0)
-
-/**
- * Same as above, but for two drawables simultaneously.
- *
- */
-
-#define DRI_VALIDATE_TWO_DRAWABLES_INFO(psp, pdp, prp)			\
-do {								\
-    while (*((pdp)->pStamp) != (pdp)->lastStamp ||			\
-	   *((prp)->pStamp) != (prp)->lastStamp) {			\
-        register unsigned int hwContext = (psp)->pSAREA->lock.lock &	\
-	    ~(DRM_LOCK_HELD | DRM_LOCK_CONT);				\
-	DRM_UNLOCK((psp)->fd, &(psp)->pSAREA->lock, hwContext);		\
-									\
-	DRM_SPINLOCK(&(psp)->pSAREA->drawable_lock, (psp)->drawLockID);	\
-	DRI_VALIDATE_DRAWABLE_INFO_ONCE(pdp);                           \
-	DRI_VALIDATE_DRAWABLE_INFO_ONCE(prp);				\
-	DRM_SPINUNLOCK(&(psp)->pSAREA->drawable_lock, (psp)->drawLockID); \
-									\
-	DRM_LIGHT_LOCK((psp)->fd, &(psp)->pSAREA->lock, hwContext);	\
-    }                                                                   \
-} while (0)
-
-
-/**
- * Driver callback functions.
- *
- * Each DRI driver must have one of these structures with all the pointers set
- * to appropriate functions within the driver.
- * 
- * When glXCreateContext() is called, for example, it'll call a helper function
- * dri_util.c which in turn will jump through the \a CreateContext pointer in
- * this structure.
- */
-struct __DriverAPIRec {
-    const __DRIconfig **(*InitScreen) (__DRIscreen * priv);
-
-    /**
-     * Screen destruction callback
-     */
-    void (*DestroyScreen)(__DRIscreen *driScrnPriv);
-
-    /**
-     * Context creation callback
-     */	    	    
-    GLboolean (*CreateContext)(gl_api api,
-			       const struct gl_config *glVis,
-			       __DRIcontext *driContextPriv,
-                               void *sharedContextPrivate);
-
-    /**
-     * Context destruction callback
-     */
-    void (*DestroyContext)(__DRIcontext *driContextPriv);
-
-    /**
-     * Buffer (drawable) creation callback
-     */
-    GLboolean (*CreateBuffer)(__DRIscreen *driScrnPriv,
-                              __DRIdrawable *driDrawPriv,
-                              const struct gl_config *glVis,
-                              GLboolean pixmapBuffer);
-    
-    /**
-     * Buffer (drawable) destruction callback
-     */
-    void (*DestroyBuffer)(__DRIdrawable *driDrawPriv);
-
-    /**
-     * Buffer swapping callback 
-     */
-    void (*SwapBuffers)(__DRIdrawable *driDrawPriv);
-
-    /**
-     * Context activation callback
-     */
-    GLboolean (*MakeCurrent)(__DRIcontext *driContextPriv,
-                             __DRIdrawable *driDrawPriv,
-                             __DRIdrawable *driReadPriv);
-
-    /**
-     * Context unbinding callback
-     */
-    GLboolean (*UnbindContext)(__DRIcontext *driContextPriv);
-  
-    /**
-     * Retrieves statistics about buffer swap operations.  Required if
-     * GLX_OML_sync_control or GLX_MESA_swap_frame_usage is supported.
-     */
-    int (*GetSwapInfo)( __DRIdrawable *dPriv, __DRIswapInfo * sInfo );
-
-
-    /**
-     * These are required if GLX_OML_sync_control is supported.
-     */
-    /*@{*/
-    int (*WaitForMSC)( __DRIdrawable *priv, int64_t target_msc, 
-		       int64_t divisor, int64_t remainder,
-		       int64_t * msc );
-    int (*WaitForSBC)( __DRIdrawable *priv, int64_t target_sbc,
-		       int64_t * msc, int64_t * sbc );
-
-    int64_t (*SwapBuffersMSC)( __DRIdrawable *priv, int64_t target_msc,
-			       int64_t divisor, int64_t remainder );
-    /*@}*/
-    void (*CopySubBuffer)(__DRIdrawable *driDrawPriv,
-			  int x, int y, int w, int h);
-
-    /**
-     * New version of GetMSC so we can pass drawable data to the low
-     * level DRM driver (e.g. pipe info).  Required if
-     * GLX_SGI_video_sync or GLX_OML_sync_control is supported.
-     */
-    int (*GetDrawableMSC) ( __DRIscreen * priv,
-			    __DRIdrawable *drawablePrivate,
-			    int64_t *count);
-
-
-
-    /* DRI2 Entry point */
-    const __DRIconfig **(*InitScreen2) (__DRIscreen * priv);
-
-    __DRIbuffer *(*AllocateBuffer) (__DRIscreen *screenPrivate,
-				    unsigned int attachment,
-				    unsigned int format,
-				    int width, int height);
-    void (*ReleaseBuffer) (__DRIscreen *screenPrivate, __DRIbuffer *buffer);
-};
-
-extern const struct __DriverAPIRec driDriverAPI;
-
-
-struct __DRIswapInfoRec {
-    /** 
-     * Number of swapBuffers operations that have been *completed*. 
-     */
-    uint64_t swap_count;
-
-    /**
-     * Unadjusted system time of the last buffer swap.  This is the time
-     * when the swap completed, not the time when swapBuffers was called.
-     */
-    int64_t   swap_ust;
-
-    /**
-     * Number of swap operations that occurred after the swap deadline.  That
-     * is if a swap happens more than swap_interval frames after the previous
-     * swap, it has missed its deadline.  If swap_interval is 0, then the
-     * swap deadline is 1 frame after the previous swap.
-     */
-    uint64_t swap_missed_count;
-
-    /**
-     * Amount of time used by the last swap that missed its deadline.  This
-     * is calculated as (__glXGetUST() - swap_ust) / (swap_interval * 
-     * time_for_single_vrefresh)).  If the actual value of swap_interval is
-     * 0, then 1 is used instead.  If swap_missed_count is non-zero, this
-     * should be greater-than 1.0.
-     */
-    float     swap_missed_usage;
-};
-
-
-/**
- * Per-drawable private DRI driver information.
- */
-struct __DRIdrawableRec {
-    /**
-     * Kernel drawable handle
-     */
-    drm_drawable_t hHWDrawable;
-
-    /**
-     * Driver's private drawable information.  
-     *
-     * This structure is opaque.
-     */
-    void *driverPrivate;
-
-    /**
-     * Private data from the loader.  We just hold on to it and pass
-     * it back when calling into loader provided functions.
-     */
-    void *loaderPrivate;
-
-    /**
-     * Reference count for number of context's currently bound to this
-     * drawable.  
-     *
-     * Once it reaches zero, the drawable can be destroyed.
-     *
-     * \note This behavior will change with GLX 1.3.
-     */
-    int refcount;
-
-    /**
-     * Index of this drawable information in the SAREA.
-     */
-    unsigned int index;
-
-    /**
-     * Pointer to the "drawable has changed ID" stamp in the SAREA (or
-     * to dri2.stamp if DRI2 is being used).
-     */
-    unsigned int *pStamp;
-
-    /**
-     * Last value of the stamp.
-     *
-     * If this differs from the value stored at __DRIdrawable::pStamp,
-     * then the drawable information has been modified by the X server, and the
-     * drawable information (below) should be retrieved from the X server.
-     */
-    unsigned int lastStamp;
-
-    /**
-     * \name Drawable 
-     *
-     * Drawable information used in software fallbacks.
-     */
-    /*@{*/
-    int x;
-    int y;
-    int w;
-    int h;
-    int numClipRects;
-    drm_clip_rect_t *pClipRects;
-    /*@}*/
-
-    /**
-     * \name Back and depthbuffer
-     *
-     * Information about the back and depthbuffer where different from above.
-     */
-    /*@{*/
-    int backX;
-    int backY;
-    int backClipRectType;
-    int numBackClipRects;
-    drm_clip_rect_t *pBackClipRects;
-    /*@}*/
-
-    /**
-     * \name Vertical blank tracking information
-     * Used for waiting on vertical blank events.
-     */
-    /*@{*/
-    unsigned int vblSeq;
-    unsigned int vblFlags;
-    /*@}*/
-
-    /**
-     * \name Monotonic MSC tracking
-     *
-     * Low level driver is responsible for updating msc_base and
-     * vblSeq values so that higher level code can calculate
-     * a new msc value or msc target for a WaitMSC call.  The new value
-     * will be:
-     *   msc = msc_base + get_vblank_count() - vblank_base;
-     *
-     * And for waiting on a value, core code will use:
-     *   actual_target = target_msc - msc_base + vblank_base;
-     */
-    /*@{*/
-    int64_t vblank_base;
-    int64_t msc_base;
-    /*@}*/
-
-    /**
-     * Pointer to context to which this drawable is currently bound.
-     */
-    __DRIcontext *driContextPriv;
-
-    /**
-     * Pointer to screen on which this drawable was created.
-     */
-    __DRIscreen *driScreenPriv;
-
-    /**
-     * Controls swap interval as used by GLX_SGI_swap_control and
-     * GLX_MESA_swap_control.
-     */
-    unsigned int swap_interval;
-
-    struct {
-	unsigned int stamp;
-	drm_clip_rect_t clipRect;
-    } dri2;
-};
-
-/**
- * Per-context private driver information.
- */
-struct __DRIcontextRec {
-    /**
-     * Kernel context handle used to access the device lock.
-     */
-    drm_context_t hHWContext;
-
-    /**
-     * Device driver's private context data.  This structure is opaque.
-     */
-    void *driverPrivate;
-
-    /**
-     * Pointer to drawable currently bound to this context for drawing.
-     */
-    __DRIdrawable *driDrawablePriv;
-
-    /**
-     * Pointer to drawable currently bound to this context for reading.
-     */
-    __DRIdrawable *driReadablePriv;
-
-    /**
-     * Pointer to screen on which this context was created.
-     */
-    __DRIscreen *driScreenPriv;
-
-    /**
-     * The loaders's private context data.  This structure is opaque.
-     */
-    void *loaderPrivate;
-
-    struct {
-	int draw_stamp;
-	int read_stamp;
-    } dri2;
-};
-
-/**
- * Per-screen private driver information.
- */
-struct __DRIscreenRec {
-    /**
-     * Current screen's number
-     */
-    int myNum;
-
-    /**
-     * Callback functions into the hardware-specific DRI driver code.
-     */
-    struct __DriverAPIRec DriverAPI;
-
-    const __DRIextension **extensions;
-    /**
-     * DDX / 2D driver version information.
-     */
-    __DRIversion ddx_version;
-
-    /**
-     * DRI X extension version information.
-     */
-    __DRIversion dri_version;
-
-    /**
-     * DRM (kernel module) version information.
-     */
-    __DRIversion drm_version;
-
-    /**
-     * ID used when the client sets the drawable lock.
-     *
-     * The X server uses this value to detect if the client has died while
-     * holding the drawable lock.
-     */
-    int drawLockID;
-
-    /**
-     * File descriptor returned when the kernel device driver is opened.
-     * 
-     * Used to:
-     *   - authenticate client to kernel
-     *   - map the frame buffer, SAREA, etc.
-     *   - close the kernel device driver
-     */
-    int fd;
-
-    /**
-     * SAREA pointer 
-     *
-     * Used to access:
-     *   - the device lock
-     *   - the device-independent per-drawable and per-context(?) information
-     */
-    drm_sarea_t *pSAREA;
-
-    /**
-     * \name Direct frame buffer access information 
-     * Used for software fallbacks.
-     */
-    /*@{*/
-    unsigned char *pFB;
-    int fbSize;
-    int fbOrigin;
-    int fbStride;
-    int fbWidth;
-    int fbHeight;
-    int fbBPP;
-    /*@}*/
-
-    /**
-     * \name Device-dependent private information (stored in the SAREA).
-     *
-     * This data is accessed by the client driver only.
-     */
-    /*@{*/
-    void *pDevPriv;
-    int devPrivSize;
-    /*@}*/
-
-    /**
-     * Device-dependent private information (not stored in the SAREA).
-     * 
-     * This pointer is never touched by the DRI layer.
-     */
-#ifdef __cplusplus
-    void *priv;
-#else
-    void *private;
-#endif
-
-    /* Extensions provided by the loader. */
-    const __DRIgetDrawableInfoExtension *getDrawableInfo;
-    const __DRIsystemTimeExtension *systemTime;
-    const __DRIdamageExtension *damage;
-
-    struct {
-	/* Flag to indicate that this is a DRI2 screen.  Many of the above
-	 * fields will not be valid or initializaed in that case. */
-	int enabled;
-	__DRIdri2LoaderExtension *loader;
-	__DRIimageLookupExtension *image;
-	__DRIuseInvalidateExtension *useInvalidate;
-    } dri2;
-
-    /* The lock actually in use, old sarea or DRI2 */
-    drmLock *lock;
-
-    driOptionCache optionInfo;
-    driOptionCache optionCache;
-   unsigned int api_mask;
-   void *loaderPrivate;
-};
-
-extern void
-__driUtilUpdateDrawableInfo(__DRIdrawable *pdp);
-
-extern float
-driCalculateSwapUsage( __DRIdrawable *dPriv,
-		       int64_t last_swap_ust, int64_t current_ust );
-
-extern GLint
-driIntersectArea( drm_clip_rect_t rect1, drm_clip_rect_t rect2 );
-
-extern void
-dri2InvalidateDrawable(__DRIdrawable *drawable);
-
-#endif /* _DRI_UTIL_H_ */
+/*

+ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.

+ */

+

+/**

+ * \file dri_util.h

+ * DRI utility functions definitions.

+ *

+ * This module acts as glue between GLX and the actual hardware driver.  A DRI

+ * driver doesn't really \e have to use any of this - it's optional.  But, some

+ * useful stuff is done here that otherwise would have to be duplicated in most

+ * drivers.

+ * 

+ * Basically, these utility functions take care of some of the dirty details of

+ * screen initialization, context creation, context binding, DRM setup, etc.

+ *

+ * These functions are compiled into each DRI driver so libGL.so knows nothing

+ * about them.

+ *

+ * \sa dri_util.c.

+ * 

+ * \author Kevin E. Martin <kevin@precisioninsight.com>

+ * \author Brian Paul <brian@precisioninsight.com>

+ */

+

+#ifndef _DRI_UTIL_H_

+#define _DRI_UTIL_H_

+

+#include <GL/gl.h>

+#include <drm.h>

+#include <drm_sarea.h>

+#include <xf86drm.h>

+#include "xmlconfig.h"

+#include "main/glheader.h"

+#include "main/mtypes.h"

+#include "GL/internal/dri_interface.h"

+

+#define GLX_BAD_CONTEXT                    5

+

+typedef struct __DRIswapInfoRec        __DRIswapInfo;

+

+/**

+ * Extensions.

+ */

+extern const __DRIlegacyExtension driLegacyExtension;

+extern const __DRIcoreExtension driCoreExtension;

+extern const __DRIdri2Extension driDRI2Extension;

+extern const __DRIextension driReadDrawableExtension;

+extern const __DRIcopySubBufferExtension driCopySubBufferExtension;

+extern const __DRIswapControlExtension driSwapControlExtension;

+extern const __DRImediaStreamCounterExtension driMediaStreamCounterExtension;

+extern const __DRI2configQueryExtension dri2ConfigQueryExtension;

+

+/**

+ * Used by DRI_VALIDATE_DRAWABLE_INFO

+ */

+#define DRI_VALIDATE_DRAWABLE_INFO_ONCE(pDrawPriv)              \

+    do {                                                        \

+	if (*(pDrawPriv->pStamp) != pDrawPriv->lastStamp) {     \

+	    __driUtilUpdateDrawableInfo(pDrawPriv);             \

+	}                                                       \

+    } while (0)

+

+

+/**

+ * Utility macro to validate the drawable information.

+ *

+ * See __DRIdrawable::pStamp and __DRIdrawable::lastStamp.

+ */

+#define DRI_VALIDATE_DRAWABLE_INFO(psp, pdp)                            \

+do {                                                                    \

+    while (*(pdp->pStamp) != pdp->lastStamp) {                          \

+        register unsigned int hwContext = psp->pSAREA->lock.lock &      \

+		     ~(DRM_LOCK_HELD | DRM_LOCK_CONT);                  \

+	DRM_UNLOCK(psp->fd, &psp->pSAREA->lock, hwContext);             \

+                                                                        \

+	DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);     \

+	DRI_VALIDATE_DRAWABLE_INFO_ONCE(pdp);                           \

+	DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);   \

+                                                                        \

+	DRM_LIGHT_LOCK(psp->fd, &psp->pSAREA->lock, hwContext);         \

+    }                                                                   \

+} while (0)

+

+/**

+ * Same as above, but for two drawables simultaneously.

+ *

+ */

+

+#define DRI_VALIDATE_TWO_DRAWABLES_INFO(psp, pdp, prp)			\

+do {								\

+    while (*((pdp)->pStamp) != (pdp)->lastStamp ||			\

+	   *((prp)->pStamp) != (prp)->lastStamp) {			\

+        register unsigned int hwContext = (psp)->pSAREA->lock.lock &	\

+	    ~(DRM_LOCK_HELD | DRM_LOCK_CONT);				\

+	DRM_UNLOCK((psp)->fd, &(psp)->pSAREA->lock, hwContext);		\

+									\

+	DRM_SPINLOCK(&(psp)->pSAREA->drawable_lock, (psp)->drawLockID);	\

+	DRI_VALIDATE_DRAWABLE_INFO_ONCE(pdp);                           \

+	DRI_VALIDATE_DRAWABLE_INFO_ONCE(prp);				\

+	DRM_SPINUNLOCK(&(psp)->pSAREA->drawable_lock, (psp)->drawLockID); \

+									\

+	DRM_LIGHT_LOCK((psp)->fd, &(psp)->pSAREA->lock, hwContext);	\

+    }                                                                   \

+} while (0)

+

+

+/**

+ * Driver callback functions.

+ *

+ * Each DRI driver must have one of these structures with all the pointers set

+ * to appropriate functions within the driver.

+ * 

+ * When glXCreateContext() is called, for example, it'll call a helper function

+ * dri_util.c which in turn will jump through the \a CreateContext pointer in

+ * this structure.

+ */

+struct __DriverAPIRec {

+    const __DRIconfig **(*InitScreen) (__DRIscreen * priv);

+

+    /**

+     * Screen destruction callback

+     */

+    void (*DestroyScreen)(__DRIscreen *driScrnPriv);

+

+    /**

+     * Context creation callback

+     */	    	    

+    GLboolean (*CreateContext)(gl_api api,

+			       const struct gl_config *glVis,

+			       __DRIcontext *driContextPriv,

+                               void *sharedContextPrivate);

+

+    /**

+     * Context destruction callback

+     */

+    void (*DestroyContext)(__DRIcontext *driContextPriv);

+

+    /**

+     * Buffer (drawable) creation callback

+     */

+    GLboolean (*CreateBuffer)(__DRIscreen *driScrnPriv,

+                              __DRIdrawable *driDrawPriv,

+                              const struct gl_config *glVis,

+                              GLboolean pixmapBuffer);

+    

+    /**

+     * Buffer (drawable) destruction callback

+     */

+    void (*DestroyBuffer)(__DRIdrawable *driDrawPriv);

+

+    /**

+     * Buffer swapping callback 

+     */

+    void (*SwapBuffers)(__DRIdrawable *driDrawPriv);

+

+    /**

+     * Context activation callback

+     */

+    GLboolean (*MakeCurrent)(__DRIcontext *driContextPriv,

+                             __DRIdrawable *driDrawPriv,

+                             __DRIdrawable *driReadPriv);

+

+    /**

+     * Context unbinding callback

+     */

+    GLboolean (*UnbindContext)(__DRIcontext *driContextPriv);

+  

+    /**

+     * Retrieves statistics about buffer swap operations.  Required if

+     * GLX_OML_sync_control or GLX_MESA_swap_frame_usage is supported.

+     */

+    int (*GetSwapInfo)( __DRIdrawable *dPriv, __DRIswapInfo * sInfo );

+

+

+    /**

+     * These are required if GLX_OML_sync_control is supported.

+     */

+    /*@{*/

+    int (*WaitForMSC)( __DRIdrawable *priv, int64_t target_msc, 

+		       int64_t divisor, int64_t remainder,

+		       int64_t * msc );

+    int (*WaitForSBC)( __DRIdrawable *priv, int64_t target_sbc,

+		       int64_t * msc, int64_t * sbc );

+

+    int64_t (*SwapBuffersMSC)( __DRIdrawable *priv, int64_t target_msc,

+			       int64_t divisor, int64_t remainder );

+    /*@}*/

+    void (*CopySubBuffer)(__DRIdrawable *driDrawPriv,

+			  int x, int y, int w, int h);

+

+    /**

+     * New version of GetMSC so we can pass drawable data to the low

+     * level DRM driver (e.g. pipe info).  Required if

+     * GLX_SGI_video_sync or GLX_OML_sync_control is supported.

+     */

+    int (*GetDrawableMSC) ( __DRIscreen * priv,

+			    __DRIdrawable *drawablePrivate,

+			    int64_t *count);

+

+

+

+    /* DRI2 Entry point */

+    const __DRIconfig **(*InitScreen2) (__DRIscreen * priv);

+

+    __DRIbuffer *(*AllocateBuffer) (__DRIscreen *screenPrivate,

+				    unsigned int attachment,

+				    unsigned int format,

+				    int width, int height);

+    void (*ReleaseBuffer) (__DRIscreen *screenPrivate, __DRIbuffer *buffer);

+};

+

+extern const struct __DriverAPIRec driDriverAPI;

+

+

+struct __DRIswapInfoRec {

+    /** 

+     * Number of swapBuffers operations that have been *completed*. 

+     */

+    uint64_t swap_count;

+

+    /**

+     * Unadjusted system time of the last buffer swap.  This is the time

+     * when the swap completed, not the time when swapBuffers was called.

+     */

+    int64_t   swap_ust;

+

+    /**

+     * Number of swap operations that occurred after the swap deadline.  That

+     * is if a swap happens more than swap_interval frames after the previous

+     * swap, it has missed its deadline.  If swap_interval is 0, then the

+     * swap deadline is 1 frame after the previous swap.

+     */

+    uint64_t swap_missed_count;

+

+    /**

+     * Amount of time used by the last swap that missed its deadline.  This

+     * is calculated as (__glXGetUST() - swap_ust) / (swap_interval * 

+     * time_for_single_vrefresh)).  If the actual value of swap_interval is

+     * 0, then 1 is used instead.  If swap_missed_count is non-zero, this

+     * should be greater-than 1.0.

+     */

+    float     swap_missed_usage;

+};

+

+

+/**

+ * Per-drawable private DRI driver information.

+ */

+struct __DRIdrawableRec {

+    /**

+     * Kernel drawable handle

+     */

+    drm_drawable_t hHWDrawable;

+

+    /**

+     * Driver's private drawable information.  

+     *

+     * This structure is opaque.

+     */

+    void *driverPrivate;

+

+    /**

+     * Private data from the loader.  We just hold on to it and pass

+     * it back when calling into loader provided functions.

+     */

+    void *loaderPrivate;

+

+    /**

+     * Reference count for number of context's currently bound to this

+     * drawable.  

+     *

+     * Once it reaches zero, the drawable can be destroyed.

+     *

+     * \note This behavior will change with GLX 1.3.

+     */

+    int refcount;

+

+    /**

+     * Index of this drawable information in the SAREA.

+     */

+    unsigned int index;

+

+    /**

+     * Pointer to the "drawable has changed ID" stamp in the SAREA (or

+     * to dri2.stamp if DRI2 is being used).

+     */

+    unsigned int *pStamp;

+

+    /**

+     * Last value of the stamp.

+     *

+     * If this differs from the value stored at __DRIdrawable::pStamp,

+     * then the drawable information has been modified by the X server, and the

+     * drawable information (below) should be retrieved from the X server.

+     */

+    unsigned int lastStamp;

+

+    /**

+     * \name Drawable 

+     *

+     * Drawable information used in software fallbacks.

+     */

+    /*@{*/

+    int x;

+    int y;

+    int w;

+    int h;

+    int numClipRects;

+    drm_clip_rect_t *pClipRects;

+    /*@}*/

+

+    /**

+     * \name Back and depthbuffer

+     *

+     * Information about the back and depthbuffer where different from above.

+     */

+    /*@{*/

+    int backX;

+    int backY;

+    int backClipRectType;

+    int numBackClipRects;

+    drm_clip_rect_t *pBackClipRects;

+    /*@}*/

+

+    /**

+     * \name Vertical blank tracking information

+     * Used for waiting on vertical blank events.

+     */

+    /*@{*/

+    unsigned int vblSeq;

+    unsigned int vblFlags;

+    /*@}*/

+

+    /**

+     * \name Monotonic MSC tracking

+     *

+     * Low level driver is responsible for updating msc_base and

+     * vblSeq values so that higher level code can calculate

+     * a new msc value or msc target for a WaitMSC call.  The new value

+     * will be:

+     *   msc = msc_base + get_vblank_count() - vblank_base;

+     *

+     * And for waiting on a value, core code will use:

+     *   actual_target = target_msc - msc_base + vblank_base;

+     */

+    /*@{*/

+    int64_t vblank_base;

+    int64_t msc_base;

+    /*@}*/

+

+    /**

+     * Pointer to context to which this drawable is currently bound.

+     */

+    __DRIcontext *driContextPriv;

+

+    /**

+     * Pointer to screen on which this drawable was created.

+     */

+    __DRIscreen *driScreenPriv;

+

+    /**

+     * Controls swap interval as used by GLX_SGI_swap_control and

+     * GLX_MESA_swap_control.

+     */

+    unsigned int swap_interval;

+

+    struct {

+	unsigned int stamp;

+	drm_clip_rect_t clipRect;

+    } dri2;

+};

+

+/**

+ * Per-context private driver information.

+ */

+struct __DRIcontextRec {

+    /**

+     * Kernel context handle used to access the device lock.

+     */

+    drm_context_t hHWContext;

+

+    /**

+     * Device driver's private context data.  This structure is opaque.

+     */

+    void *driverPrivate;

+

+    /**

+     * Pointer to drawable currently bound to this context for drawing.

+     */

+    __DRIdrawable *driDrawablePriv;

+

+    /**

+     * Pointer to drawable currently bound to this context for reading.

+     */

+    __DRIdrawable *driReadablePriv;

+

+    /**

+     * Pointer to screen on which this context was created.

+     */

+    __DRIscreen *driScreenPriv;

+

+    /**

+     * The loaders's private context data.  This structure is opaque.

+     */

+    void *loaderPrivate;

+

+    struct {

+	int draw_stamp;

+	int read_stamp;

+    } dri2;

+};

+

+/**

+ * Per-screen private driver information.

+ */

+struct __DRIscreenRec {

+    /**

+     * Current screen's number

+     */

+    int myNum;

+

+    /**

+     * Callback functions into the hardware-specific DRI driver code.

+     */

+    struct __DriverAPIRec DriverAPI;

+

+    const __DRIextension **extensions;

+    /**

+     * DDX / 2D driver version information.

+     */

+    __DRIversion ddx_version;

+

+    /**

+     * DRI X extension version information.

+     */

+    __DRIversion dri_version;

+

+    /**

+     * DRM (kernel module) version information.

+     */

+    __DRIversion drm_version;

+

+    /**

+     * ID used when the client sets the drawable lock.

+     *

+     * The X server uses this value to detect if the client has died while

+     * holding the drawable lock.

+     */

+    int drawLockID;

+

+    /**

+     * File descriptor returned when the kernel device driver is opened.

+     * 

+     * Used to:

+     *   - authenticate client to kernel

+     *   - map the frame buffer, SAREA, etc.

+     *   - close the kernel device driver

+     */

+    int fd;

+

+    /**

+     * SAREA pointer 

+     *

+     * Used to access:

+     *   - the device lock

+     *   - the device-independent per-drawable and per-context(?) information

+     */

+    drm_sarea_t *pSAREA;

+

+    /**

+     * \name Direct frame buffer access information 

+     * Used for software fallbacks.

+     */

+    /*@{*/

+    unsigned char *pFB;

+    int fbSize;

+    int fbOrigin;

+    int fbStride;

+    int fbWidth;

+    int fbHeight;

+    int fbBPP;

+    /*@}*/

+

+    /**

+     * \name Device-dependent private information (stored in the SAREA).

+     *

+     * This data is accessed by the client driver only.

+     */

+    /*@{*/

+    void *pDevPriv;

+    int devPrivSize;

+    /*@}*/

+

+    /**

+     * Device-dependent private information (not stored in the SAREA).

+     * 

+     * This pointer is never touched by the DRI layer.

+     */

+#ifdef __cplusplus

+    void *priv;

+#else

+    void *private;

+#endif

+

+    /* Extensions provided by the loader. */

+    const __DRIgetDrawableInfoExtension *getDrawableInfo;

+    const __DRIsystemTimeExtension *systemTime;

+    const __DRIdamageExtension *damage;

+

+    struct {

+	/* Flag to indicate that this is a DRI2 screen.  Many of the above

+	 * fields will not be valid or initializaed in that case. */

+	int enabled;

+	__DRIdri2LoaderExtension *loader;

+	__DRIimageLookupExtension *image;

+	__DRIuseInvalidateExtension *useInvalidate;

+    } dri2;

+

+    /* The lock actually in use, old sarea or DRI2 */

+    drmLock *lock;

+

+    driOptionCache optionInfo;

+    driOptionCache optionCache;

+   unsigned int api_mask;

+   void *loaderPrivate;

+};

+

+extern void

+__driUtilUpdateDrawableInfo(__DRIdrawable *pdp);

+

+extern float

+driCalculateSwapUsage( __DRIdrawable *dPriv,

+		       int64_t last_swap_ust, int64_t current_ust );

+

+extern GLint

+driIntersectArea( drm_clip_rect_t rect1, drm_clip_rect_t rect2 );

+

+extern void

+dri2InvalidateDrawable(__DRIdrawable *drawable);

+

+#endif /* _DRI_UTIL_H_ */

diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c
index 539296d1a..2df2386ff 100644
--- a/mesalib/src/mesa/drivers/dri/common/utils.c
+++ b/mesalib/src/mesa/drivers/dri/common/utils.c
@@ -218,7 +218,9 @@ void driInitExtensions( struct gl_context * ctx,
       /* Map the static functions.  Together with those mapped by remap

        * table, this should cover everything mesa core knows.

        */

+#ifdef _GLAPI_USE_REMAP_TABLE

       _mesa_map_static_functions();

+#endif

       return;

    }

 

diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index 719b406ec..e6d1ab741 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -1,806 +1,811 @@
-/*
- * Copyright 2008, 2010 George Sapountzis <gsapountzis@gmail.com>
- *
- * 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
- * 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.
- */
-
-/*
- * DRI software rasterizer
- *
- * This is the mesa swrast module packaged into a DRI driver structure.
- *
- * The front-buffer is allocated by the loader. The loader provides read/write
- * callbacks for access to the front-buffer. The driver uses a scratch row for
- * front-buffer rendering to avoid repeated calls to the loader.
- *
- * The back-buffer is allocated by the driver and is private.
- */
-
-#include "main/context.h"
-#include "main/extensions.h"
-#include "main/formats.h"
-#include "main/framebuffer.h"
-#include "main/imports.h"
-#include "main/renderbuffer.h"
-#include "swrast/swrast.h"
-#include "swrast_setup/swrast_setup.h"
-#include "tnl/tnl.h"
-#include "tnl/t_context.h"
-#include "tnl/t_pipeline.h"
-#include "vbo/vbo.h"
-#include "drivers/common/driverfuncs.h"
-#include "drivers/common/meta.h"
-#include "utils.h"
-
-#include "main/teximage.h"
-#include "main/texformat.h"
-#include "main/texstate.h"
-
-#include "swrast_priv.h"
-
-
-/**
- * Screen and config-related functions
- */
-
-static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
-				GLint texture_format, __DRIdrawable *dPriv)
-{
-    struct dri_context *dri_ctx;
-    int x, y, w, h;
-    __DRIscreen *sPriv = dPriv->driScreenPriv;
-    struct gl_texture_unit *texUnit;
-    struct gl_texture_object *texObj;
-    struct gl_texture_image *texImage;
-    uint32_t internalFormat;
-    gl_format texFormat;
-
-    dri_ctx = pDRICtx->driverPrivate;
-
-    internalFormat = (texture_format == __DRI_TEXTURE_FORMAT_RGB ? 3 : 4);
-
-    texUnit = _mesa_get_current_tex_unit(&dri_ctx->Base);
-    texObj = _mesa_select_tex_object(&dri_ctx->Base, texUnit, target);
-    texImage = _mesa_get_tex_image(&dri_ctx->Base, texObj, target, 0);
-
-    _mesa_lock_texture(&dri_ctx->Base, texObj);
-
-    sPriv->swrast_loader->getDrawableInfo(dPriv, &x, &y, &w, &h, dPriv->loaderPrivate);
-
-    if (texture_format == __DRI_TEXTURE_FORMAT_RGB)
-	texFormat = MESA_FORMAT_XRGB8888;
-    else
-	texFormat = MESA_FORMAT_ARGB8888;
-
-    _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage,
-			       w, h, 1, 0, internalFormat, texFormat);
-
-    sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data,
-				   dPriv->loaderPrivate);
-
-    _mesa_unlock_texture(&dri_ctx->Base, texObj);
-}
-
-static void swrastSetTexBuffer(__DRIcontext *pDRICtx, GLint target,
-			       __DRIdrawable *dPriv)
-{
-    swrastSetTexBuffer2(pDRICtx, target, __DRI_TEXTURE_FORMAT_RGBA, dPriv);
-}
-
-static const __DRItexBufferExtension swrastTexBufferExtension = {
-    { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
-    swrastSetTexBuffer,
-    swrastSetTexBuffer2,
-};
-
-static const __DRIextension *dri_screen_extensions[] = {
-    &swrastTexBufferExtension.base,
-    NULL
-};
-
-static __DRIconfig **
-swrastFillInModes(__DRIscreen *psp,
-		  unsigned pixel_bits, unsigned depth_bits,
-		  unsigned stencil_bits, GLboolean have_back_buffer)
-{
-    __DRIconfig **configs;
-    unsigned depth_buffer_factor;
-    unsigned back_buffer_factor;
-    GLenum fb_format;
-    GLenum fb_type;
-
-    /* GLX_SWAP_COPY_OML is only supported because the Intel driver doesn't
-     * support pageflipping at all.
-     */
-    static const GLenum back_buffer_modes[] = {
-	GLX_NONE, GLX_SWAP_UNDEFINED_OML
-    };
-
-    uint8_t depth_bits_array[4];
-    uint8_t stencil_bits_array[4];
-    uint8_t msaa_samples_array[1];
-
-    depth_bits_array[0] = 0;
-    depth_bits_array[1] = 0;
-    depth_bits_array[2] = depth_bits;
-    depth_bits_array[3] = depth_bits;
-
-    /* Just like with the accumulation buffer, always provide some modes
-     * with a stencil buffer.
-     */
-    stencil_bits_array[0] = 0;
-    stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits;
-    stencil_bits_array[2] = 0;
-    stencil_bits_array[3] = (stencil_bits == 0) ? 8 : stencil_bits;
-
-    msaa_samples_array[0] = 0;
-
-    depth_buffer_factor = 4;
-    back_buffer_factor = 2;
-
-    switch (pixel_bits) {
-    case 8:
-	fb_format = GL_RGB;
-	fb_type = GL_UNSIGNED_BYTE_2_3_3_REV;
-	break;
-    case 16:
-	fb_format = GL_RGB;
-	fb_type = GL_UNSIGNED_SHORT_5_6_5;
-	break;
-    case 24:
-	fb_format = GL_BGR;
-	fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;
-	break;
-    case 32:
-	fb_format = GL_BGRA;
-	fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;
-	break;
-    default:
-	fprintf(stderr, "[%s:%u] bad depth %d\n", __func__, __LINE__,
-		pixel_bits);
-	return NULL;
-    }
-
-    configs = driCreateConfigs(fb_format, fb_type,
-			       depth_bits_array, stencil_bits_array,
-			       depth_buffer_factor, back_buffer_modes,
-			       back_buffer_factor, msaa_samples_array, 1,
-			       GL_TRUE);
-    if (configs == NULL) {
-	fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__,
-		__LINE__);
-	return NULL;
-    }
-
-    return configs;
-}
-
-static const __DRIconfig **
-dri_init_screen(__DRIscreen * psp)
-{
-    __DRIconfig **configs8, **configs16, **configs24, **configs32;
-
-    TRACE;
-
-    psp->extensions = dri_screen_extensions;
-
-    configs8  = swrastFillInModes(psp,  8,  8, 0, 1);
-    configs16 = swrastFillInModes(psp, 16, 16, 0, 1);
-    configs24 = swrastFillInModes(psp, 24, 24, 8, 1);
-    configs32 = swrastFillInModes(psp, 32, 24, 8, 1);
-
-    configs16 = driConcatConfigs(configs8, configs16);
-    configs24 = driConcatConfigs(configs16, configs24);
-    configs32 = driConcatConfigs(configs24, configs32);
-
-    return (const __DRIconfig **)configs32;
-}
-
-static void
-dri_destroy_screen(__DRIscreen * sPriv)
-{
-    TRACE;
-}
-
-
-/**
- * Framebuffer and renderbuffer-related functions.
- */
-
-static GLuint
-choose_pixel_format(const struct gl_config *v)
-{
-    int depth = v->rgbBits;
-
-    if (depth == 32
-	&& v->redMask   == 0xff0000
-	&& v->greenMask == 0x00ff00
-	&& v->blueMask  == 0x0000ff)
-	return PF_A8R8G8B8;
-    else if (depth == 24
-	     && v->redMask   == 0xff0000
-	     && v->greenMask == 0x00ff00
-	     && v->blueMask  == 0x0000ff)
-	return PF_X8R8G8B8;
-    else if (depth == 16
-	     && v->redMask   == 0xf800
-	     && v->greenMask == 0x07e0
-	     && v->blueMask  == 0x001f)
-	return PF_R5G6B5;
-    else if (depth == 8
-	     && v->redMask   == 0x07
-	     && v->greenMask == 0x38
-	     && v->blueMask  == 0xc0)
-	return PF_R3G3B2;
-
-    _mesa_problem( NULL, "unexpected format in %s", __FUNCTION__ );
-    return 0;
-}
-
-static void
-swrast_delete_renderbuffer(struct gl_renderbuffer *rb)
-{
-    TRACE;
-
-    free(rb->Data);
-    free(rb);
-}
-
-/* see bytes_per_line in libGL */
-static INLINE int
-bytes_per_line(unsigned pitch_bits, unsigned mul)
-{
-   unsigned mask = mul - 1;
-
-   return ((pitch_bits + mask) & ~mask) / 8;
-}
-
-static GLboolean
-swrast_alloc_front_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
-			   GLenum internalFormat, GLuint width, GLuint height)
-{
-    struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);
-
-    TRACE;
-
-    rb->Data = NULL;
-    rb->Width = width;
-    rb->Height = height;
-
-    xrb->pitch = bytes_per_line(width * xrb->bpp, 32);
-
-    return GL_TRUE;
-}
-
-static GLboolean
-swrast_alloc_back_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
-			  GLenum internalFormat, GLuint width, GLuint height)
-{
-    struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);
-
-    TRACE;
-
-    free(rb->Data);
-
-    swrast_alloc_front_storage(ctx, rb, internalFormat, width, height);
-
-    rb->Data = malloc(height * xrb->pitch);
-
-    return GL_TRUE;
-}
-
-static struct swrast_renderbuffer *
-swrast_new_renderbuffer(const struct gl_config *visual, GLboolean front)
-{
-    struct swrast_renderbuffer *xrb = calloc(1, sizeof *xrb);
-    GLuint pixel_format;
-
-    TRACE;
-
-    if (!xrb)
-	return NULL;
-
-    _mesa_init_renderbuffer(&xrb->Base, 0);
-
-    pixel_format = choose_pixel_format(visual);
-
-    xrb->Base.Delete = swrast_delete_renderbuffer;
-    if (front) {
-	xrb->Base.AllocStorage = swrast_alloc_front_storage;
-	swrast_set_span_funcs_front(xrb, pixel_format);
-    }
-    else {
-	xrb->Base.AllocStorage = swrast_alloc_back_storage;
-	swrast_set_span_funcs_back(xrb, pixel_format);
-    }
-
-    switch (pixel_format) {
-    case PF_A8R8G8B8:
-	xrb->Base.Format = MESA_FORMAT_ARGB8888;
-	xrb->Base.InternalFormat = GL_RGBA;
-	xrb->Base._BaseFormat = GL_RGBA;
-	xrb->Base.DataType = GL_UNSIGNED_BYTE;
-	xrb->bpp = 32;
-	break;
-    case PF_X8R8G8B8:
-	xrb->Base.Format = MESA_FORMAT_ARGB8888; /* XXX */
-	xrb->Base.InternalFormat = GL_RGB;
-	xrb->Base._BaseFormat = GL_RGB;
-	xrb->Base.DataType = GL_UNSIGNED_BYTE;
-	xrb->bpp = 32;
-	break;
-    case PF_R5G6B5:
-	xrb->Base.Format = MESA_FORMAT_RGB565;
-	xrb->Base.InternalFormat = GL_RGB;
-	xrb->Base._BaseFormat = GL_RGB;
-	xrb->Base.DataType = GL_UNSIGNED_BYTE;
-	xrb->bpp = 16;
-	break;
-    case PF_R3G3B2:
-	xrb->Base.Format = MESA_FORMAT_RGB332;
-	xrb->Base.InternalFormat = GL_RGB;
-	xrb->Base._BaseFormat = GL_RGB;
-	xrb->Base.DataType = GL_UNSIGNED_BYTE;
-	xrb->bpp = 8;
-	break;
-    default:
-	return NULL;
-    }
-
-    return xrb;
-}
-
-static GLboolean
-dri_create_buffer(__DRIscreen * sPriv,
-		  __DRIdrawable * dPriv,
-		  const struct gl_config * visual, GLboolean isPixmap)
-{
-    struct dri_drawable *drawable = NULL;
-    struct gl_framebuffer *fb;
-    struct swrast_renderbuffer *frontrb, *backrb;
-
-    TRACE;
-
-    drawable = CALLOC_STRUCT(dri_drawable);
-    if (drawable == NULL)
-	goto drawable_fail;
-
-    dPriv->driverPrivate = drawable;
-    drawable->dPriv = dPriv;
-
-    drawable->row = malloc(MAX_WIDTH * 4);
-    if (drawable->row == NULL)
-	goto drawable_fail;
-
-    fb = &drawable->Base;
-
-    /* basic framebuffer setup */
-    _mesa_initialize_window_framebuffer(fb, visual);
-
-    /* add front renderbuffer */
-    frontrb = swrast_new_renderbuffer(visual, GL_TRUE);
-    _mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, &frontrb->Base);
-
-    /* add back renderbuffer */
-    if (visual->doubleBufferMode) {
-	backrb = swrast_new_renderbuffer(visual, GL_FALSE);
-	_mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &backrb->Base);
-    }
-
-    /* add software renderbuffers */
-    _mesa_add_soft_renderbuffers(fb,
-				 GL_FALSE, /* color */
-				 visual->haveDepthBuffer,
-				 visual->haveStencilBuffer,
-				 visual->haveAccumBuffer,
-				 GL_FALSE, /* alpha */
-				 GL_FALSE /* aux bufs */);
-
-    return GL_TRUE;
-
-drawable_fail:
-
-    if (drawable)
-	free(drawable->row);
-
-    FREE(drawable);
-
-    return GL_FALSE;
-}
-
-static void
-dri_destroy_buffer(__DRIdrawable * dPriv)
-{
-    TRACE;
-
-    if (dPriv) {
-	struct dri_drawable *drawable = dri_drawable(dPriv);
-	struct gl_framebuffer *fb;
-
-	free(drawable->row);
-
-	fb = &drawable->Base;
-
-	fb->DeletePending = GL_TRUE;
-	_mesa_reference_framebuffer(&fb, NULL);
-    }
-}
-
-static void
-dri_swap_buffers(__DRIdrawable * dPriv)
-{
-    __DRIscreen *sPriv = dPriv->driScreenPriv;
-
-    GET_CURRENT_CONTEXT(ctx);
-
-    struct dri_drawable *drawable = dri_drawable(dPriv);
-    struct gl_framebuffer *fb;
-    struct swrast_renderbuffer *frontrb, *backrb;
-
-    TRACE;
-
-    fb = &drawable->Base;
-
-    frontrb =
-	swrast_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);
-    backrb =
-	swrast_renderbuffer(fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer);
-
-    /* check for signle-buffered */
-    if (backrb == NULL)
-	return;
-
-    /* check if swapping currently bound buffer */
-    if (ctx && ctx->DrawBuffer == fb) {
-	/* flush pending rendering */
-	_mesa_notifySwapBuffers(ctx);
-    }
-
-    sPriv->swrast_loader->putImage(dPriv, __DRI_SWRAST_IMAGE_OP_SWAP,
-				   0, 0,
-				   frontrb->Base.Width,
-				   frontrb->Base.Height,
-				   backrb->Base.Data,
-				   dPriv->loaderPrivate);
-}
-
-
-/**
- * General device driver functions.
- */
-
-static void
-get_window_size( struct gl_framebuffer *fb, GLsizei *w, GLsizei *h )
-{
-    __DRIdrawable *dPriv = swrast_drawable(fb)->dPriv;
-    __DRIscreen *sPriv = dPriv->driScreenPriv;
-    int x, y;
-
-    sPriv->swrast_loader->getDrawableInfo(dPriv,
-					  &x, &y, w, h,
-					  dPriv->loaderPrivate);
-}
-
-static void
-swrast_check_and_update_window_size( struct gl_context *ctx, struct gl_framebuffer *fb )
-{
-    GLsizei width, height;
-
-    get_window_size(fb, &width, &height);
-    if (fb->Width != width || fb->Height != height) {
-	_mesa_resize_framebuffer(ctx, fb, width, height);
-    }
-}
-
-static const GLubyte *
-get_string(struct gl_context *ctx, GLenum pname)
-{
-    (void) ctx;
-    switch (pname) {
-	case GL_VENDOR:
-	    return (const GLubyte *) "Mesa Project";
-	case GL_RENDERER:
-	    return (const GLubyte *) "Software Rasterizer";
-	default:
-	    return NULL;
-    }
-}
-
-static void
-update_state( struct gl_context *ctx, GLuint new_state )
-{
-    /* not much to do here - pass it on */
-    _swrast_InvalidateState( ctx, new_state );
-    _swsetup_InvalidateState( ctx, new_state );
-    _vbo_InvalidateState( ctx, new_state );
-    _tnl_InvalidateState( ctx, new_state );
-}
-
-static void
-viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
-{
-    struct gl_framebuffer *draw = ctx->WinSysDrawBuffer;
-    struct gl_framebuffer *read = ctx->WinSysReadBuffer;
-
-    swrast_check_and_update_window_size(ctx, draw);
-    swrast_check_and_update_window_size(ctx, read);
-}
-
-static gl_format swrastChooseTextureFormat(struct gl_context * ctx,
-					   GLint internalFormat,
-					   GLenum format,
-					   GLenum type)
-{
-    if (internalFormat == GL_RGB)
-	return MESA_FORMAT_XRGB8888;
-    return _mesa_choose_tex_format(ctx, internalFormat, format, type);
-}
-
-static void
-swrast_init_driver_functions(struct dd_function_table *driver)
-{
-    driver->GetString = get_string;
-    driver->UpdateState = update_state;
-    driver->GetBufferSize = NULL;
-    driver->Viewport = viewport;
-    driver->ChooseTextureFormat = swrastChooseTextureFormat;
-}
-
-static const char *es2_extensions[] = {
-   /* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */
-   "GL_ARB_draw_buffers",
-   "GL_ARB_multisample",
-   "GL_ARB_texture_compression",
-   "GL_ARB_transpose_matrix",
-   "GL_ARB_vertex_buffer_object",
-   "GL_ARB_window_pos",
-   "GL_EXT_blend_func_separate",
-   "GL_EXT_compiled_vertex_array",
-   "GL_EXT_framebuffer_blit",
-   "GL_EXT_multi_draw_arrays",
-   "GL_EXT_polygon_offset",
-   "GL_EXT_texture_object",
-   "GL_EXT_vertex_array",
-   "GL_IBM_multimode_draw_arrays",
-   "GL_MESA_window_pos",
-   "GL_NV_vertex_program",
-
-   /* Required by GLES2 */
-   "GL_ARB_fragment_program",
-   "GL_ARB_fragment_shader",
-   "GL_ARB_multitexture",
-   "GL_ARB_shader_objects",
-   "GL_ARB_texture_cube_map",
-   "GL_ARB_texture_mirrored_repeat",
-   "GL_ARB_texture_non_power_of_two",
-   "GL_ARB_vertex_shader",
-   "GL_EXT_blend_color",
-   "GL_EXT_blend_equation_separate",
-   "GL_EXT_blend_minmax",
-   "GL_EXT_blend_subtract",
-   "GL_EXT_stencil_wrap",
-
-   /* Optional GLES2 */
-   "GL_ARB_framebuffer_object",
-   "GL_EXT_texture_filter_anisotropic",
-   "GL_ARB_depth_texture",
-   "GL_EXT_packed_depth_stencil",
-   "GL_EXT_framebuffer_object",
-   NULL,
-};
-
-static void
-InitExtensionsES2(struct gl_context *ctx)
-{
-   int i;
-
-   /* Can't use driInitExtensions() since it uses extensions from
-    * main/remap_helper.h when called the first time. */
-
-   for (i = 0; es2_extensions[i]; i++)
-      _mesa_enable_extension(ctx, es2_extensions[i]);
-}
-
-/**
- * Context-related functions.
- */
-
-static GLboolean
-dri_create_context(gl_api api,
-		   const struct gl_config * visual,
-		   __DRIcontext * cPriv, void *sharedContextPrivate)
-{
-    struct dri_context *ctx = NULL;
-    struct dri_context *share = (struct dri_context *)sharedContextPrivate;
-    struct gl_context *mesaCtx = NULL;
-    struct gl_context *sharedCtx = NULL;
-    struct dd_function_table functions;
-
-    TRACE;
-
-    ctx = CALLOC_STRUCT(dri_context);
-    if (ctx == NULL)
-	goto context_fail;
-
-    cPriv->driverPrivate = ctx;
-    ctx->cPriv = cPriv;
-
-    /* build table of device driver functions */
-    _mesa_init_driver_functions(&functions);
-    swrast_init_driver_functions(&functions);
-
-    if (share) {
-	sharedCtx = &share->Base;
-    }
-
-    mesaCtx = &ctx->Base;
-
-    /* basic context setup */
-    if (!_mesa_initialize_context(mesaCtx, api, visual, sharedCtx, &functions, (void *) cPriv)) {
-	goto context_fail;
-    }
-
-    /* do bounds checking to prevent segfaults and server crashes! */
-    mesaCtx->Const.CheckArrayBounds = GL_TRUE;
-
-    /* create module contexts */
-    _swrast_CreateContext( mesaCtx );
-    _vbo_CreateContext( mesaCtx );
-    _tnl_CreateContext( mesaCtx );
-    _swsetup_CreateContext( mesaCtx );
-    _swsetup_Wakeup( mesaCtx );
-
-    /* use default TCL pipeline */
-    {
-       TNLcontext *tnl = TNL_CONTEXT(mesaCtx);
-       tnl->Driver.RunPipeline = _tnl_run_pipeline;
-    }
-
-    _mesa_meta_init(mesaCtx);
-    _mesa_enable_sw_extensions(mesaCtx);
-
-    switch (api) {
-    case API_OPENGL:
-        _mesa_enable_1_3_extensions(mesaCtx);
-        _mesa_enable_1_4_extensions(mesaCtx);
-        _mesa_enable_1_5_extensions(mesaCtx);
-        _mesa_enable_2_0_extensions(mesaCtx);
-        _mesa_enable_2_1_extensions(mesaCtx);
-
-        driInitExtensions( mesaCtx, NULL, GL_FALSE );
-        break;
-    case API_OPENGLES:
-        _mesa_enable_1_3_extensions(mesaCtx);
-        _mesa_enable_1_4_extensions(mesaCtx);
-        _mesa_enable_1_5_extensions(mesaCtx);
-
-        break;
-    case API_OPENGLES2:
-        InitExtensionsES2( mesaCtx);
-        break;
-    }
-
-    return GL_TRUE;
-
-context_fail:
-
-    FREE(ctx);
-
-    return GL_FALSE;
-}
-
-static void
-dri_destroy_context(__DRIcontext * cPriv)
-{
-    TRACE;
-
-    if (cPriv) {
-	struct dri_context *ctx = dri_context(cPriv);
-	struct gl_context *mesaCtx;
-
-	mesaCtx = &ctx->Base;
-
-        _mesa_meta_free(mesaCtx);
-	_swsetup_DestroyContext( mesaCtx );
-	_swrast_DestroyContext( mesaCtx );
-	_tnl_DestroyContext( mesaCtx );
-	_vbo_DestroyContext( mesaCtx );
-	_mesa_destroy_context( mesaCtx );
-    }
-}
-
-static GLboolean
-dri_make_current(__DRIcontext * cPriv,
-		 __DRIdrawable * driDrawPriv,
-		 __DRIdrawable * driReadPriv)
-{
-    struct gl_context *mesaCtx;
-    struct gl_framebuffer *mesaDraw;
-    struct gl_framebuffer *mesaRead;
-    TRACE;
-
-    if (cPriv) {
-	struct dri_context *ctx = dri_context(cPriv);
-	struct dri_drawable *draw;
-	struct dri_drawable *read;
-
-	if (!driDrawPriv || !driReadPriv)
-	    return GL_FALSE;
-
-	draw = dri_drawable(driDrawPriv);
-	read = dri_drawable(driReadPriv);
-	mesaCtx = &ctx->Base;
-	mesaDraw = &draw->Base;
-	mesaRead = &read->Base;
-
-	/* check for same context and buffer */
-	if (mesaCtx == _mesa_get_current_context()
-	    && mesaCtx->DrawBuffer == mesaDraw
-	    && mesaCtx->ReadBuffer == mesaRead) {
-	    return GL_TRUE;
-	}
-
-	_glapi_check_multithread();
-
-	swrast_check_and_update_window_size(mesaCtx, mesaDraw);
-	if (mesaRead != mesaDraw)
-	    swrast_check_and_update_window_size(mesaCtx, mesaRead);
-
-	_mesa_make_current( mesaCtx,
-			    mesaDraw,
-			    mesaRead );
-    }
-    else {
-	/* unbind */
-	_mesa_make_current( NULL, NULL, NULL );
-    }
-
-    return GL_TRUE;
-}
-
-static GLboolean
-dri_unbind_context(__DRIcontext * cPriv)
-{
-    TRACE;
-    (void) cPriv;
-
-    /* Unset current context and dispath table */
-    _mesa_make_current(NULL, NULL, NULL);
-
-    return GL_TRUE;
-}
-
-
-const struct __DriverAPIRec driDriverAPI = {
-    .InitScreen = dri_init_screen,
-    .DestroyScreen = dri_destroy_screen,
-    .CreateContext = dri_create_context,
-    .DestroyContext = dri_destroy_context,
-    .CreateBuffer = dri_create_buffer,
-    .DestroyBuffer = dri_destroy_buffer,
-    .SwapBuffers = dri_swap_buffers,
-    .MakeCurrent = dri_make_current,
-    .UnbindContext = dri_unbind_context,
-};
-
-/* This is the table of extensions that the loader will dlsym() for. */
-PUBLIC const __DRIextension *__driDriverExtensions[] = {
-    &driCoreExtension.base,
-    &driSWRastExtension.base,
-    NULL
-};
+/*

+ * Copyright 2008, 2010 George Sapountzis <gsapountzis@gmail.com>

+ *

+ * 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

+ * 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.

+ */

+

+/*

+ * DRI software rasterizer

+ *

+ * This is the mesa swrast module packaged into a DRI driver structure.

+ *

+ * The front-buffer is allocated by the loader. The loader provides read/write

+ * callbacks for access to the front-buffer. The driver uses a scratch row for

+ * front-buffer rendering to avoid repeated calls to the loader.

+ *

+ * The back-buffer is allocated by the driver and is private.

+ */

+

+#ifdef _MSC_VER

+#define WIN32_LEAN_AND_MEAN 1

+#include <windows.h>

+#endif

+

+#include "main/context.h"

+#include "main/extensions.h"

+#include "main/formats.h"

+#include "main/framebuffer.h"

+#include "main/imports.h"

+#include "main/renderbuffer.h"

+#include "swrast/swrast.h"

+#include "swrast_setup/swrast_setup.h"

+#include "tnl/tnl.h"

+#include "tnl/t_context.h"

+#include "tnl/t_pipeline.h"

+#include "vbo/vbo.h"

+#include "drivers/common/driverfuncs.h"

+#include "drivers/common/meta.h"

+#include "utils.h"

+

+#include "main/teximage.h"

+#include "main/texformat.h"

+#include "main/texstate.h"

+

+#include "swrast_priv.h"

+

+

+/**

+ * Screen and config-related functions

+ */

+

+static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,

+				GLint texture_format, __DRIdrawable *dPriv)

+{

+    struct dri_context *dri_ctx;

+    int x, y, w, h;

+    __DRIscreen *sPriv = dPriv->driScreenPriv;

+    struct gl_texture_unit *texUnit;

+    struct gl_texture_object *texObj;

+    struct gl_texture_image *texImage;

+    uint32_t internalFormat;

+    gl_format texFormat;

+

+    dri_ctx = pDRICtx->driverPrivate;

+

+    internalFormat = (texture_format == __DRI_TEXTURE_FORMAT_RGB ? 3 : 4);

+

+    texUnit = _mesa_get_current_tex_unit(&dri_ctx->Base);

+    texObj = _mesa_select_tex_object(&dri_ctx->Base, texUnit, target);

+    texImage = _mesa_get_tex_image(&dri_ctx->Base, texObj, target, 0);

+

+    _mesa_lock_texture(&dri_ctx->Base, texObj);

+

+    sPriv->swrast_loader->getDrawableInfo(dPriv, &x, &y, &w, &h, dPriv->loaderPrivate);

+

+    if (texture_format == __DRI_TEXTURE_FORMAT_RGB)

+	texFormat = MESA_FORMAT_XRGB8888;

+    else

+	texFormat = MESA_FORMAT_ARGB8888;

+

+    _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage,

+			       w, h, 1, 0, internalFormat, texFormat);

+

+    sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data,

+				   dPriv->loaderPrivate);

+

+    _mesa_unlock_texture(&dri_ctx->Base, texObj);

+}

+

+static void swrastSetTexBuffer(__DRIcontext *pDRICtx, GLint target,

+			       __DRIdrawable *dPriv)

+{

+    swrastSetTexBuffer2(pDRICtx, target, __DRI_TEXTURE_FORMAT_RGBA, dPriv);

+}

+

+static const __DRItexBufferExtension swrastTexBufferExtension = {

+    { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },

+    swrastSetTexBuffer,

+    swrastSetTexBuffer2,

+};

+

+static const __DRIextension *dri_screen_extensions[] = {

+    &swrastTexBufferExtension.base,

+    NULL

+};

+

+static __DRIconfig **

+swrastFillInModes(__DRIscreen *psp,

+		  unsigned pixel_bits, unsigned depth_bits,

+		  unsigned stencil_bits, GLboolean have_back_buffer)

+{

+    __DRIconfig **configs;

+    unsigned depth_buffer_factor;

+    unsigned back_buffer_factor;

+    GLenum fb_format;

+    GLenum fb_type;

+

+    /* GLX_SWAP_COPY_OML is only supported because the Intel driver doesn't

+     * support pageflipping at all.

+     */

+    static const GLenum back_buffer_modes[] = {

+	GLX_NONE, GLX_SWAP_UNDEFINED_OML

+    };

+

+    uint8_t depth_bits_array[4];

+    uint8_t stencil_bits_array[4];

+    uint8_t msaa_samples_array[1];

+

+    depth_bits_array[0] = 0;

+    depth_bits_array[1] = 0;

+    depth_bits_array[2] = depth_bits;

+    depth_bits_array[3] = depth_bits;

+

+    /* Just like with the accumulation buffer, always provide some modes

+     * with a stencil buffer.

+     */

+    stencil_bits_array[0] = 0;

+    stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits;

+    stencil_bits_array[2] = 0;

+    stencil_bits_array[3] = (stencil_bits == 0) ? 8 : stencil_bits;

+

+    msaa_samples_array[0] = 0;

+

+    depth_buffer_factor = 4;

+    back_buffer_factor = 2;

+

+    switch (pixel_bits) {

+    case 8:

+	fb_format = GL_RGB;

+	fb_type = GL_UNSIGNED_BYTE_2_3_3_REV;

+	break;

+    case 16:

+	fb_format = GL_RGB;

+	fb_type = GL_UNSIGNED_SHORT_5_6_5;

+	break;

+    case 24:

+	fb_format = GL_BGR;

+	fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;

+	break;

+    case 32:

+	fb_format = GL_BGRA;

+	fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;

+	break;

+    default:

+	fprintf(stderr, "[%s:%u] bad depth %d\n", __FUNCTION__, __LINE__,

+		pixel_bits);

+	return NULL;

+    }

+

+    configs = driCreateConfigs(fb_format, fb_type,

+			       depth_bits_array, stencil_bits_array,

+			       depth_buffer_factor, back_buffer_modes,

+			       back_buffer_factor, msaa_samples_array, 1,

+			       GL_TRUE);

+    if (configs == NULL) {

+	fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __FUNCTION__,

+		__LINE__);

+	return NULL;

+    }

+

+    return configs;

+}

+

+static const __DRIconfig **

+dri_init_screen(__DRIscreen * psp)

+{

+    __DRIconfig **configs8, **configs16, **configs24, **configs32;

+

+    TRACE;

+

+    psp->extensions = dri_screen_extensions;

+

+    configs8  = swrastFillInModes(psp,  8,  8, 0, 1);

+    configs16 = swrastFillInModes(psp, 16, 16, 0, 1);

+    configs24 = swrastFillInModes(psp, 24, 24, 8, 1);

+    configs32 = swrastFillInModes(psp, 32, 24, 8, 1);

+

+    configs16 = driConcatConfigs(configs8, configs16);

+    configs24 = driConcatConfigs(configs16, configs24);

+    configs32 = driConcatConfigs(configs24, configs32);

+

+    return (const __DRIconfig **)configs32;

+}

+

+static void

+dri_destroy_screen(__DRIscreen * sPriv)

+{

+    TRACE;

+}

+

+

+/**

+ * Framebuffer and renderbuffer-related functions.

+ */

+

+static GLuint

+choose_pixel_format(const struct gl_config *v)

+{

+    int depth = v->rgbBits;

+

+    if (depth == 32

+	&& v->redMask   == 0xff0000

+	&& v->greenMask == 0x00ff00

+	&& v->blueMask  == 0x0000ff)

+	return PF_A8R8G8B8;

+    else if (depth == 24

+	     && v->redMask   == 0xff0000

+	     && v->greenMask == 0x00ff00

+	     && v->blueMask  == 0x0000ff)

+	return PF_X8R8G8B8;

+    else if (depth == 16

+	     && v->redMask   == 0xf800

+	     && v->greenMask == 0x07e0

+	     && v->blueMask  == 0x001f)

+	return PF_R5G6B5;

+    else if (depth == 8

+	     && v->redMask   == 0x07

+	     && v->greenMask == 0x38

+	     && v->blueMask  == 0xc0)

+	return PF_R3G3B2;

+

+    _mesa_problem( NULL, "unexpected format in %s", __FUNCTION__ );

+    return 0;

+}

+

+static void

+swrast_delete_renderbuffer(struct gl_renderbuffer *rb)

+{

+    TRACE;

+

+    free(rb->Data);

+    free(rb);

+}

+

+/* see bytes_per_line in libGL */

+static INLINE int

+bytes_per_line(unsigned pitch_bits, unsigned mul)

+{

+   unsigned mask = mul - 1;

+

+   return ((pitch_bits + mask) & ~mask) / 8;

+}

+

+static GLboolean

+swrast_alloc_front_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,

+			   GLenum internalFormat, GLuint width, GLuint height)

+{

+    struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);

+

+    TRACE;

+

+    rb->Data = NULL;

+    rb->Width = width;

+    rb->Height = height;

+

+    xrb->pitch = bytes_per_line(width * xrb->bpp, 32);

+

+    return GL_TRUE;

+}

+

+static GLboolean

+swrast_alloc_back_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,

+			  GLenum internalFormat, GLuint width, GLuint height)

+{

+    struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);

+

+    TRACE;

+

+    free(rb->Data);

+

+    swrast_alloc_front_storage(ctx, rb, internalFormat, width, height);

+

+    rb->Data = malloc(height * xrb->pitch);

+

+    return GL_TRUE;

+}

+

+static struct swrast_renderbuffer *

+swrast_new_renderbuffer(const struct gl_config *visual, GLboolean front)

+{

+    struct swrast_renderbuffer *xrb = calloc(1, sizeof *xrb);

+    GLuint pixel_format;

+

+    TRACE;

+

+    if (!xrb)

+	return NULL;

+

+    _mesa_init_renderbuffer(&xrb->Base, 0);

+

+    pixel_format = choose_pixel_format(visual);

+

+    xrb->Base.Delete = swrast_delete_renderbuffer;

+    if (front) {

+	xrb->Base.AllocStorage = swrast_alloc_front_storage;

+	swrast_set_span_funcs_front(xrb, pixel_format);

+    }

+    else {

+	xrb->Base.AllocStorage = swrast_alloc_back_storage;

+	swrast_set_span_funcs_back(xrb, pixel_format);

+    }

+

+    switch (pixel_format) {

+    case PF_A8R8G8B8:

+	xrb->Base.Format = MESA_FORMAT_ARGB8888;

+	xrb->Base.InternalFormat = GL_RGBA;

+	xrb->Base._BaseFormat = GL_RGBA;

+	xrb->Base.DataType = GL_UNSIGNED_BYTE;

+	xrb->bpp = 32;

+	break;

+    case PF_X8R8G8B8:

+	xrb->Base.Format = MESA_FORMAT_ARGB8888; /* XXX */

+	xrb->Base.InternalFormat = GL_RGB;

+	xrb->Base._BaseFormat = GL_RGB;

+	xrb->Base.DataType = GL_UNSIGNED_BYTE;

+	xrb->bpp = 32;

+	break;

+    case PF_R5G6B5:

+	xrb->Base.Format = MESA_FORMAT_RGB565;

+	xrb->Base.InternalFormat = GL_RGB;

+	xrb->Base._BaseFormat = GL_RGB;

+	xrb->Base.DataType = GL_UNSIGNED_BYTE;

+	xrb->bpp = 16;

+	break;

+    case PF_R3G3B2:

+	xrb->Base.Format = MESA_FORMAT_RGB332;

+	xrb->Base.InternalFormat = GL_RGB;

+	xrb->Base._BaseFormat = GL_RGB;

+	xrb->Base.DataType = GL_UNSIGNED_BYTE;

+	xrb->bpp = 8;

+	break;

+    default:

+	return NULL;

+    }

+

+    return xrb;

+}

+

+static GLboolean

+dri_create_buffer(__DRIscreen * sPriv,

+		  __DRIdrawable * dPriv,

+		  const struct gl_config * visual, GLboolean isPixmap)

+{

+    struct dri_drawable *drawable = NULL;

+    struct gl_framebuffer *fb;

+    struct swrast_renderbuffer *frontrb, *backrb;

+

+    TRACE;

+

+    drawable = CALLOC_STRUCT(dri_drawable);

+    if (drawable == NULL)

+	goto drawable_fail;

+

+    dPriv->driverPrivate = drawable;

+    drawable->dPriv = dPriv;

+

+    drawable->row = malloc(MAX_WIDTH * 4);

+    if (drawable->row == NULL)

+	goto drawable_fail;

+

+    fb = &drawable->Base;

+

+    /* basic framebuffer setup */

+    _mesa_initialize_window_framebuffer(fb, visual);

+

+    /* add front renderbuffer */

+    frontrb = swrast_new_renderbuffer(visual, GL_TRUE);

+    _mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, &frontrb->Base);

+

+    /* add back renderbuffer */

+    if (visual->doubleBufferMode) {

+	backrb = swrast_new_renderbuffer(visual, GL_FALSE);

+	_mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &backrb->Base);

+    }

+

+    /* add software renderbuffers */

+    _mesa_add_soft_renderbuffers(fb,

+				 GL_FALSE, /* color */

+				 visual->haveDepthBuffer,

+				 visual->haveStencilBuffer,

+				 visual->haveAccumBuffer,

+				 GL_FALSE, /* alpha */

+				 GL_FALSE /* aux bufs */);

+

+    return GL_TRUE;

+

+drawable_fail:

+

+    if (drawable)

+	free(drawable->row);

+

+    FREE(drawable);

+

+    return GL_FALSE;

+}

+

+static void

+dri_destroy_buffer(__DRIdrawable * dPriv)

+{

+    TRACE;

+

+    if (dPriv) {

+	struct dri_drawable *drawable = dri_drawable(dPriv);

+	struct gl_framebuffer *fb;

+

+	free(drawable->row);

+

+	fb = &drawable->Base;

+

+	fb->DeletePending = GL_TRUE;

+	_mesa_reference_framebuffer(&fb, NULL);

+    }

+}

+

+static void

+dri_swap_buffers(__DRIdrawable * dPriv)

+{

+    __DRIscreen *sPriv = dPriv->driScreenPriv;

+

+    GET_CURRENT_CONTEXT(ctx);

+

+    struct dri_drawable *drawable = dri_drawable(dPriv);

+    struct gl_framebuffer *fb;

+    struct swrast_renderbuffer *frontrb, *backrb;

+

+    TRACE;

+

+    fb = &drawable->Base;

+

+    frontrb =

+	swrast_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);

+    backrb =

+	swrast_renderbuffer(fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer);

+

+    /* check for signle-buffered */

+    if (backrb == NULL)

+	return;

+

+    /* check if swapping currently bound buffer */

+    if (ctx && ctx->DrawBuffer == fb) {

+	/* flush pending rendering */

+	_mesa_notifySwapBuffers(ctx);

+    }

+

+    sPriv->swrast_loader->putImage(dPriv, __DRI_SWRAST_IMAGE_OP_SWAP,

+				   0, 0,

+				   frontrb->Base.Width,

+				   frontrb->Base.Height,

+				   backrb->Base.Data,

+				   dPriv->loaderPrivate);

+}

+

+

+/**

+ * General device driver functions.

+ */

+

+static void

+get_window_size( struct gl_framebuffer *fb, GLsizei *w, GLsizei *h )

+{

+    __DRIdrawable *dPriv = swrast_drawable(fb)->dPriv;

+    __DRIscreen *sPriv = dPriv->driScreenPriv;

+    int x, y;

+

+    sPriv->swrast_loader->getDrawableInfo(dPriv,

+					  &x, &y, w, h,

+					  dPriv->loaderPrivate);

+}

+

+static void

+swrast_check_and_update_window_size( struct gl_context *ctx, struct gl_framebuffer *fb )

+{

+    GLsizei width, height;

+

+    get_window_size(fb, &width, &height);

+    if (fb->Width != width || fb->Height != height) {

+	_mesa_resize_framebuffer(ctx, fb, width, height);

+    }

+}

+

+static const GLubyte *

+get_string(struct gl_context *ctx, GLenum pname)

+{

+    (void) ctx;

+    switch (pname) {

+	case GL_VENDOR:

+	    return (const GLubyte *) "Mesa Project";

+	case GL_RENDERER:

+	    return (const GLubyte *) "Software Rasterizer";

+	default:

+	    return NULL;

+    }

+}

+

+static void

+update_state( struct gl_context *ctx, GLuint new_state )

+{

+    /* not much to do here - pass it on */

+    _swrast_InvalidateState( ctx, new_state );

+    _swsetup_InvalidateState( ctx, new_state );

+    _vbo_InvalidateState( ctx, new_state );

+    _tnl_InvalidateState( ctx, new_state );

+}

+

+static void

+viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)

+{

+    struct gl_framebuffer *draw = ctx->WinSysDrawBuffer;

+    struct gl_framebuffer *read = ctx->WinSysReadBuffer;

+

+    swrast_check_and_update_window_size(ctx, draw);

+    swrast_check_and_update_window_size(ctx, read);

+}

+

+static gl_format swrastChooseTextureFormat(struct gl_context * ctx,

+					   GLint internalFormat,

+					   GLenum format,

+					   GLenum type)

+{

+    if (internalFormat == GL_RGB)

+	return MESA_FORMAT_XRGB8888;

+    return _mesa_choose_tex_format(ctx, internalFormat, format, type);

+}

+

+static void

+swrast_init_driver_functions(struct dd_function_table *driver)

+{

+    driver->GetString = get_string;

+    driver->UpdateState = update_state;

+    driver->GetBufferSize = NULL;

+    driver->Viewport = viewport;

+    driver->ChooseTextureFormat = swrastChooseTextureFormat;

+}

+

+static const char *es2_extensions[] = {

+   /* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */

+   "GL_ARB_draw_buffers",

+   "GL_ARB_multisample",

+   "GL_ARB_texture_compression",

+   "GL_ARB_transpose_matrix",

+   "GL_ARB_vertex_buffer_object",

+   "GL_ARB_window_pos",

+   "GL_EXT_blend_func_separate",

+   "GL_EXT_compiled_vertex_array",

+   "GL_EXT_framebuffer_blit",

+   "GL_EXT_multi_draw_arrays",

+   "GL_EXT_polygon_offset",

+   "GL_EXT_texture_object",

+   "GL_EXT_vertex_array",

+   "GL_IBM_multimode_draw_arrays",

+   "GL_MESA_window_pos",

+   "GL_NV_vertex_program",

+

+   /* Required by GLES2 */

+   "GL_ARB_fragment_program",

+   "GL_ARB_fragment_shader",

+   "GL_ARB_multitexture",

+   "GL_ARB_shader_objects",

+   "GL_ARB_texture_cube_map",

+   "GL_ARB_texture_mirrored_repeat",

+   "GL_ARB_texture_non_power_of_two",

+   "GL_ARB_vertex_shader",

+   "GL_EXT_blend_color",

+   "GL_EXT_blend_equation_separate",

+   "GL_EXT_blend_minmax",

+   "GL_EXT_blend_subtract",

+   "GL_EXT_stencil_wrap",

+

+   /* Optional GLES2 */

+   "GL_ARB_framebuffer_object",

+   "GL_EXT_texture_filter_anisotropic",

+   "GL_ARB_depth_texture",

+   "GL_EXT_packed_depth_stencil",

+   "GL_EXT_framebuffer_object",

+   NULL,

+};

+

+static void

+InitExtensionsES2(struct gl_context *ctx)

+{

+   int i;

+

+   /* Can't use driInitExtensions() since it uses extensions from

+    * main/remap_helper.h when called the first time. */

+

+   for (i = 0; es2_extensions[i]; i++)

+      _mesa_enable_extension(ctx, es2_extensions[i]);

+}

+

+/**

+ * Context-related functions.

+ */

+

+static GLboolean

+dri_create_context(gl_api api,

+		   const struct gl_config * visual,

+		   __DRIcontext * cPriv, void *sharedContextPrivate)

+{

+    struct dri_context *ctx = NULL;

+    struct dri_context *share = (struct dri_context *)sharedContextPrivate;

+    struct gl_context *mesaCtx = NULL;

+    struct gl_context *sharedCtx = NULL;

+    struct dd_function_table functions;

+

+    TRACE;

+

+    ctx = CALLOC_STRUCT(dri_context);

+    if (ctx == NULL)

+	goto context_fail;

+

+    cPriv->driverPrivate = ctx;

+    ctx->cPriv = cPriv;

+

+    /* build table of device driver functions */

+    _mesa_init_driver_functions(&functions);

+    swrast_init_driver_functions(&functions);

+

+    if (share) {

+	sharedCtx = &share->Base;

+    }

+

+    mesaCtx = &ctx->Base;

+

+    /* basic context setup */

+    if (!_mesa_initialize_context(mesaCtx, api, visual, sharedCtx, &functions, (void *) cPriv)) {

+	goto context_fail;

+    }

+

+    /* do bounds checking to prevent segfaults and server crashes! */

+    mesaCtx->Const.CheckArrayBounds = GL_TRUE;

+

+    /* create module contexts */

+    _swrast_CreateContext( mesaCtx );

+    _vbo_CreateContext( mesaCtx );

+    _tnl_CreateContext( mesaCtx );

+    _swsetup_CreateContext( mesaCtx );

+    _swsetup_Wakeup( mesaCtx );

+

+    /* use default TCL pipeline */

+    {

+       TNLcontext *tnl = TNL_CONTEXT(mesaCtx);

+       tnl->Driver.RunPipeline = _tnl_run_pipeline;

+    }

+

+    _mesa_meta_init(mesaCtx);

+    _mesa_enable_sw_extensions(mesaCtx);

+

+    switch (api) {

+    case API_OPENGL:

+        _mesa_enable_1_3_extensions(mesaCtx);

+        _mesa_enable_1_4_extensions(mesaCtx);

+        _mesa_enable_1_5_extensions(mesaCtx);

+        _mesa_enable_2_0_extensions(mesaCtx);

+        _mesa_enable_2_1_extensions(mesaCtx);

+

+        driInitExtensions( mesaCtx, NULL, GL_FALSE );

+        break;

+    case API_OPENGLES:

+        _mesa_enable_1_3_extensions(mesaCtx);

+        _mesa_enable_1_4_extensions(mesaCtx);

+        _mesa_enable_1_5_extensions(mesaCtx);

+

+        break;

+    case API_OPENGLES2:

+        InitExtensionsES2( mesaCtx);

+        break;

+    }

+

+    return GL_TRUE;

+

+context_fail:

+

+    FREE(ctx);

+

+    return GL_FALSE;

+}

+

+static void

+dri_destroy_context(__DRIcontext * cPriv)

+{

+    TRACE;

+

+    if (cPriv) {

+	struct dri_context *ctx = dri_context(cPriv);

+	struct gl_context *mesaCtx;

+

+	mesaCtx = &ctx->Base;

+

+        _mesa_meta_free(mesaCtx);

+	_swsetup_DestroyContext( mesaCtx );

+	_swrast_DestroyContext( mesaCtx );

+	_tnl_DestroyContext( mesaCtx );

+	_vbo_DestroyContext( mesaCtx );

+	_mesa_destroy_context( mesaCtx );

+    }

+}

+

+static GLboolean

+dri_make_current(__DRIcontext * cPriv,

+		 __DRIdrawable * driDrawPriv,

+		 __DRIdrawable * driReadPriv)

+{

+    struct gl_context *mesaCtx;

+    struct gl_framebuffer *mesaDraw;

+    struct gl_framebuffer *mesaRead;

+    TRACE;

+

+    if (cPriv) {

+	struct dri_context *ctx = dri_context(cPriv);

+	struct dri_drawable *draw;

+	struct dri_drawable *read;

+

+	if (!driDrawPriv || !driReadPriv)

+	    return GL_FALSE;

+

+	draw = dri_drawable(driDrawPriv);

+	read = dri_drawable(driReadPriv);

+	mesaCtx = &ctx->Base;

+	mesaDraw = &draw->Base;

+	mesaRead = &read->Base;

+

+	/* check for same context and buffer */

+	if (mesaCtx == _mesa_get_current_context()

+	    && mesaCtx->DrawBuffer == mesaDraw

+	    && mesaCtx->ReadBuffer == mesaRead) {

+	    return GL_TRUE;

+	}

+

+	_glapi_check_multithread();

+

+	swrast_check_and_update_window_size(mesaCtx, mesaDraw);

+	if (mesaRead != mesaDraw)

+	    swrast_check_and_update_window_size(mesaCtx, mesaRead);

+

+	_mesa_make_current( mesaCtx,

+			    mesaDraw,

+			    mesaRead );

+    }

+    else {

+	/* unbind */

+	_mesa_make_current( NULL, NULL, NULL );

+    }

+

+    return GL_TRUE;

+}

+

+static GLboolean

+dri_unbind_context(__DRIcontext * cPriv)

+{

+    TRACE;

+    (void) cPriv;

+

+    /* Unset current context and dispath table */

+    _mesa_make_current(NULL, NULL, NULL);

+

+    return GL_TRUE;

+}

+

+

+const struct __DriverAPIRec driDriverAPI = {

+    /*.InitScreen = */dri_init_screen,

+    /*.DestroyScreen = */dri_destroy_screen,

+    /*.CreateContext = */dri_create_context,

+    /*.DestroyContext = */dri_destroy_context,

+    /*.CreateBuffer = */dri_create_buffer,

+    /*.DestroyBuffer = */dri_destroy_buffer,

+    /*.SwapBuffers = */dri_swap_buffers,

+    /*.MakeCurrent = */dri_make_current,

+    /*.UnbindContext = */dri_unbind_context,

+};

+

+/* This is the table of extensions that the loader will dlsym() for. */

+PUBLIC const __DRIextension *__driDriverExtensions[] = {

+    &driCoreExtension.base,

+    &driSWRastExtension.base,

+    NULL

+};

diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
index 4c3c9830f..e61965147 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
@@ -32,6 +32,13 @@
 #include "main/mtypes.h"

 #include "drisw_util.h"

 

+#ifdef _MSC_VER

+#ifdef PUBLIC

+#undef PUBLIC

+#endif

+#define PUBLIC __declspec(dllexport)

+#endif

+

 

 /**

  * Debugging

diff --git a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
index 4a8b1b283..1a13e9f5c 100644
--- a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
@@ -1,1662 +1,1662 @@
-/*
- * Windows (Win32/Win64) device driver for Mesa
- *
- */
-
-#include "wmesadef.h"
-#include "colors.h"
-#include <GL/wmesa.h>
-#include <winuser.h>
-#include "context.h"
-#include "extensions.h"
-#include "framebuffer.h"
-#include "renderbuffer.h"
-#include "drivers/common/driverfuncs.h"
-#include "drivers/common/meta.h"
-#include "vbo/vbo.h"
-#include "swrast/swrast.h"
-#include "swrast_setup/swrast_setup.h"
-#include "tnl/tnl.h"
-#include "tnl/t_context.h"
-#include "tnl/t_pipeline.h"
-
-
-/* linked list of our Framebuffers (windows) */
-static WMesaFramebuffer FirstFramebuffer = NULL;
-
-
-/**
- * Create a new WMesaFramebuffer object which will correspond to the
- * given HDC (Window handle).
- */
-WMesaFramebuffer
-wmesa_new_framebuffer(HDC hdc, struct gl_config *visual)
-{
-    WMesaFramebuffer pwfb
-        = (WMesaFramebuffer) malloc(sizeof(struct wmesa_framebuffer));
-    if (pwfb) {
-        _mesa_initialize_window_framebuffer(&pwfb->Base, visual);
-        pwfb->hDC = hdc;
-        /* insert at head of list */
-        pwfb->next = FirstFramebuffer;
-        FirstFramebuffer = pwfb;
-    }
-    return pwfb;
-}
-
-/**
- * Given an hdc, free the corresponding WMesaFramebuffer
- */
-void
-wmesa_free_framebuffer(HDC hdc)
-{
-    WMesaFramebuffer pwfb, prev;
-    for (pwfb = FirstFramebuffer; pwfb; pwfb = pwfb->next) {
-        if (pwfb->hDC == hdc)
-            break;
-	prev = pwfb;
-    }
-    if (pwfb) {
-        struct gl_framebuffer *fb;
-	if (pwfb == FirstFramebuffer)
-	    FirstFramebuffer = pwfb->next;
-	else
-	    prev->next = pwfb->next;
-        fb = &pwfb->Base;
-        _mesa_reference_framebuffer(&fb, NULL); 
-    }
-}
-
-/**
- * Given an hdc, return the corresponding WMesaFramebuffer
- */
-WMesaFramebuffer
-wmesa_lookup_framebuffer(HDC hdc)
-{
-    WMesaFramebuffer pwfb;
-    for (pwfb = FirstFramebuffer; pwfb; pwfb = pwfb->next) {
-        if (pwfb->hDC == hdc)
-            return pwfb;
-    }
-    return NULL;
-}
-
-
-/**
- * Given a struct gl_framebuffer, return the corresponding WMesaFramebuffer.
- */
-static WMesaFramebuffer wmesa_framebuffer(struct gl_framebuffer *fb)
-{
-    return (WMesaFramebuffer) fb;
-}
-
-
-/**
- * Given a struct gl_context, return the corresponding WMesaContext.
- */
-static WMesaContext wmesa_context(const struct gl_context *ctx)
-{
-    return (WMesaContext) ctx;
-}
-
-
-/*
- * Every driver should implement a GetString function in order to
- * return a meaningful GL_RENDERER string.
- */
-static const GLubyte *wmesa_get_string(struct gl_context *ctx, GLenum name)
-{
-    return (name == GL_RENDERER) ? 
-	(GLubyte *) "Mesa Windows GDI Driver" : NULL;
-}
-
-
-/*
- * Determine the pixel format based on the pixel size.
- */
-static void wmSetPixelFormat(WMesaFramebuffer pwfb, HDC hDC)
-{
-    pwfb->cColorBits = GetDeviceCaps(hDC, BITSPIXEL);
-
-    /* Only 16 and 32 bit targets are supported now */
-    assert(pwfb->cColorBits == 0 ||
-	   pwfb->cColorBits == 16 || 
-	   pwfb->cColorBits == 24 || 
-	   pwfb->cColorBits == 32);
-
-    switch(pwfb->cColorBits){
-    case 8:
-	pwfb->pixelformat = PF_INDEX8;
-	break;
-    case 16:
-	pwfb->pixelformat = PF_5R6G5B;
-	break;
-    case 24:
-    case 32:
-	pwfb->pixelformat = PF_8R8G8B;
-	break;
-    default:
-	pwfb->pixelformat = PF_BADFORMAT;
-    }
-}
-
-
-/**
- * Create DIB for back buffer.
- * We write into this memory with the span routines and then blit it
- * to the window on a buffer swap.
- */
-BOOL wmCreateBackingStore(WMesaFramebuffer pwfb, long lxSize, long lySize)
-{
-    HDC          hdc = pwfb->hDC;
-    LPBITMAPINFO pbmi = &(pwfb->bmi);
-    HDC          hic;
-
-    pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-    pbmi->bmiHeader.biWidth = lxSize;
-    pbmi->bmiHeader.biHeight= -lySize;
-    pbmi->bmiHeader.biPlanes = 1;
-    pbmi->bmiHeader.biBitCount = GetDeviceCaps(pwfb->hDC, BITSPIXEL);
-    pbmi->bmiHeader.biCompression = BI_RGB;
-    pbmi->bmiHeader.biSizeImage = 0;
-    pbmi->bmiHeader.biXPelsPerMeter = 0;
-    pbmi->bmiHeader.biYPelsPerMeter = 0;
-    pbmi->bmiHeader.biClrUsed = 0;
-    pbmi->bmiHeader.biClrImportant = 0;
-    
-    pwfb->cColorBits = pbmi->bmiHeader.biBitCount;
-    pwfb->ScanWidth = (lxSize * (pwfb->cColorBits / 8) + 3) & ~3;
-    
-    hic = CreateIC("display", NULL, NULL, NULL);
-    pwfb->dib_hDC = CreateCompatibleDC(hic);
-    
-    pwfb->hbmDIB = CreateDIBSection(hic,
-				   &pwfb->bmi,
-				   DIB_RGB_COLORS,
-				   (void **)&(pwfb->pbPixels),
-				   0,
-				   0);
-    pwfb->hOldBitmap = SelectObject(pwfb->dib_hDC, pwfb->hbmDIB);
-    
-    DeleteDC(hic);
-
-    wmSetPixelFormat(pwfb, pwfb->hDC);
-    return TRUE;
-}
-
-
-static wmDeleteBackingStore(WMesaFramebuffer pwfb)
-{
-    if (pwfb->hbmDIB) {
-	SelectObject(pwfb->dib_hDC, pwfb->hOldBitmap);
-	DeleteDC(pwfb->dib_hDC);
-	DeleteObject(pwfb->hbmDIB);
-    }
-}
-
-
-/**
- * Find the width and height of the window named by hdc.
- */
-static void
-get_window_size(HDC hdc, GLuint *width, GLuint *height)
-{
-    if (WindowFromDC(hdc)) {
-        RECT rect;
-        GetClientRect(WindowFromDC(hdc), &rect);
-        *width = rect.right - rect.left;
-        *height = rect.bottom - rect.top;
-    }
-    else { /* Memory context */
-        /* From contributed code - use the size of the desktop
-         * for the size of a memory context (?) */
-        *width = GetDeviceCaps(hdc, HORZRES);
-        *height = GetDeviceCaps(hdc, VERTRES);
-    }
-}
-
-
-static void
-wmesa_get_buffer_size(struct gl_framebuffer *buffer, GLuint *width, GLuint *height)
-{
-    WMesaFramebuffer pwfb = wmesa_framebuffer(buffer);
-    get_window_size(pwfb->hDC, width, height);
-}
-
-
-static void wmesa_flush(struct gl_context *ctx)
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->WinSysDrawBuffer);
-
-    if (ctx->Visual.doubleBufferMode == 1) {
-	BitBlt(pwfb->hDC, 0, 0, pwfb->Base.Width, pwfb->Base.Height,
-	       pwfb->dib_hDC, 0, 0, SRCCOPY);
-    }
-    else {
-	/* Do nothing for single buffer */
-    }
-}
-
-
-/**********************************************************************/
-/*****                   CLEAR Functions                          *****/
-/**********************************************************************/
-
-/* If we do not implement these, Mesa clears the buffers via the pixel
- * span writing interface, which is very slow for a clear operation.
- */
-
-/*
- * Set the color used to clear the color buffer.
- */
-static void clear_color(struct gl_context *ctx, const GLfloat color[4])
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    GLubyte col[3];
-    UINT    bytesPerPixel = pwfb->cColorBits / 8; 
-
-    CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);
-    CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);
-    CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);
-    pwc->clearColorRef = RGB(col[0], col[1], col[2]);
-    DeleteObject(pwc->clearPen);
-    DeleteObject(pwc->clearBrush);
-    pwc->clearPen = CreatePen(PS_SOLID, 1, pwc->clearColorRef); 
-    pwc->clearBrush = CreateSolidBrush(pwc->clearColorRef); 
-}
-
-
-/* 
- * Clear the specified region of the color buffer using the clear color 
- * or index as specified by one of the two functions above. 
- * 
- * This procedure clears either the front and/or the back COLOR buffers. 
- * Only the "left" buffer is cleared since we are not stereo. 
- * Clearing of the other non-color buffers is left to the swrast. 
- */ 
-
-static void clear(struct gl_context *ctx, GLbitfield mask)
-{
-#define FLIP(Y)  (ctx->DrawBuffer->Height - (Y) - 1)
-    const GLint x = ctx->DrawBuffer->_Xmin;
-    const GLint y = ctx->DrawBuffer->_Ymin;
-    const GLint height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
-    const GLint width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
-
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    int done = 0;
-
-    /* Let swrast do all the work if the masks are not set to
-     * clear all channels. */
-    if (!ctx->Color.ColorMask[0][0] ||
-	!ctx->Color.ColorMask[0][1] ||
-	!ctx->Color.ColorMask[0][2] ||
-	!ctx->Color.ColorMask[0][3]) {
-	_swrast_Clear(ctx, mask);
-	return;
-    }
-
-    /* Back buffer */
-    if (mask & BUFFER_BIT_BACK_LEFT) { 
-	
-	int     i, rowSize; 
-	UINT    bytesPerPixel = pwfb->cColorBits / 8; 
-	LPBYTE  lpb, clearRow;
-	LPWORD  lpw;
-	BYTE    bColor; 
-	WORD    wColor; 
-	BYTE    r, g, b; 
-	DWORD   dwColor; 
-	LPDWORD lpdw; 
-	
-	/* Try for a fast clear - clearing entire buffer with a single
-	 * byte value. */
-	if (width == ctx->DrawBuffer->Width &&
-            height == ctx->DrawBuffer->Height) { /* entire buffer */
-	    /* Now check for an easy clear value */
-	    switch (bytesPerPixel) {
-	    case 1:
-		bColor = BGR8(GetRValue(pwc->clearColorRef), 
-			      GetGValue(pwc->clearColorRef), 
-			      GetBValue(pwc->clearColorRef));
-		memset(pwfb->pbPixels, bColor, 
-		       pwfb->ScanWidth * height);
-		done = 1;
-		break;
-	    case 2:
-		wColor = BGR16(GetRValue(pwc->clearColorRef), 
-			       GetGValue(pwc->clearColorRef), 
-			       GetBValue(pwc->clearColorRef)); 
-		if (((wColor >> 8) & 0xff) == (wColor & 0xff)) {
-		    memset(pwfb->pbPixels, wColor & 0xff, 
-			   pwfb->ScanWidth * height);
-		    done = 1;
-		}
-		break;
-	    case 3:
-		/* fall through */
-	    case 4:
-		if (GetRValue(pwc->clearColorRef) == 
-		    GetGValue(pwc->clearColorRef) &&
-		    GetRValue(pwc->clearColorRef) == 
-		    GetBValue(pwc->clearColorRef)) {
-		    memset(pwfb->pbPixels, 
-			   GetRValue(pwc->clearColorRef), 
-			   pwfb->ScanWidth * height);
-		    done = 1;
-		}
-		break;
-	    default:
-		break;
-	    }
-	} /* all */
-
-	if (!done) {
-	    /* Need to clear a row at a time.  Begin by setting the first
-	     * row in the area to be cleared to the clear color. */
-	    
-	    clearRow = pwfb->pbPixels + 
-		pwfb->ScanWidth * FLIP(y) +
-		bytesPerPixel * x; 
-	    switch (bytesPerPixel) {
-	    case 1:
-		lpb = clearRow;
-		bColor = BGR8(GetRValue(pwc->clearColorRef), 
-			      GetGValue(pwc->clearColorRef), 
-			      GetBValue(pwc->clearColorRef));
-		memset(lpb, bColor, width);
-		break;
-	    case 2:
-		lpw = (LPWORD)clearRow;
-		wColor = BGR16(GetRValue(pwc->clearColorRef), 
-			       GetGValue(pwc->clearColorRef), 
-			       GetBValue(pwc->clearColorRef)); 
-		for (i=0; i<width; i++)
-		    *lpw++ = wColor;
-		break;
-	    case 3: 
-		lpb = clearRow;
-		r = GetRValue(pwc->clearColorRef); 
-		g = GetGValue(pwc->clearColorRef); 
-		b = GetBValue(pwc->clearColorRef); 
-		for (i=0; i<width; i++) {
-		    *lpb++ = b; 
-		    *lpb++ = g; 
-		    *lpb++ = r; 
-		} 
-		break;
-	    case 4: 
-		lpdw = (LPDWORD)clearRow; 
-		dwColor = BGR32(GetRValue(pwc->clearColorRef), 
-				GetGValue(pwc->clearColorRef), 
-				GetBValue(pwc->clearColorRef)); 
-		for (i=0; i<width; i++)
-		    *lpdw++ = dwColor;
-		break;
-	    default:
-		break;
-	    } /* switch */
-	    
-	    /* copy cleared row to other rows in buffer */
-	    lpb = clearRow - pwfb->ScanWidth;
-	    rowSize = width * bytesPerPixel;
-	    for (i=1; i<height; i++) { 
-		memcpy(lpb, clearRow, rowSize); 
-		lpb -= pwfb->ScanWidth; 
-	    } 
-	} /* not done */
-	mask &= ~BUFFER_BIT_BACK_LEFT;
-    } /* back buffer */ 
-
-    /* front buffer */
-    if (mask & BUFFER_BIT_FRONT_LEFT) { 
-	HDC DC = pwc->hDC; 
-	HPEN Old_Pen = SelectObject(DC, pwc->clearPen); 
-	HBRUSH Old_Brush = SelectObject(DC, pwc->clearBrush);
-	Rectangle(DC,
-		  x,
-		  FLIP(y) + 1,
-		  x + width + 1,
-		  FLIP(y) - height + 1);
-	SelectObject(DC, Old_Pen); 
-	SelectObject(DC, Old_Brush); 
-	mask &= ~BUFFER_BIT_FRONT_LEFT;
-    } /* front buffer */ 
-    
-    /* Call swrast if there is anything left to clear (like DEPTH) */ 
-    if (mask) 
-	_swrast_Clear(ctx, mask);
-  
-#undef FLIP
-} 
-
-
-/**********************************************************************/
-/*****                   PIXEL Functions                          *****/
-/**********************************************************************/
-
-#define FLIP(Y)  (rb->Height - (Y) - 1)
-
-
-/**
- ** Front Buffer reading/writing
- ** These are slow, but work with all non-indexed visual types.
- **/
-
-/* Write a horizontal span of RGBA color pixels with a boolean mask. */
-static void write_rgba_span_front(const struct gl_context *ctx, 
-				   struct gl_renderbuffer *rb, 
-				   GLuint n, GLint x, GLint y,
-				   const GLubyte rgba[][4], 
-				   const GLubyte mask[] )
-{
-   WMesaContext pwc = wmesa_context(ctx);
-   WMesaFramebuffer pwfb = wmesa_lookup_framebuffer(pwc->hDC);
-   CONST BITMAPINFO bmi=
-   {
-      {
-         sizeof(BITMAPINFOHEADER),
-         n, 1, 1, 32, BI_RGB, 0, 1, 1, 0, 0
-      }
-   };
-   HBITMAP bmp=0;
-   HDC mdc=0;
-   typedef union
-   {
-      unsigned i;
-      struct {
-         unsigned b:8, g:8, r:8, a:8;
-      };
-   } BGRA;
-   BGRA *bgra, c;
-   GLuint i;
-
-   if (n < 16) {   // the value 16 is just guessed
-      y=FLIP(y);
-      if (mask) {
-         for (i=0; i<n; i++)
-            if (mask[i])
-               SetPixel(pwc->hDC, x+i, y,
-                        RGB(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]));
-      }
-      else {
-         for (i=0; i<n; i++)
-            SetPixel(pwc->hDC, x+i, y,
-                     RGB(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]));
-      }
-   }
-   else {
-      if (!pwfb) {
-         _mesa_problem(NULL, "wmesa: write_rgba_span_front on unknown hdc");
-         return;
-      }
-      bgra=malloc(n*sizeof(BGRA));
-      if (!bgra) {
-         _mesa_problem(NULL, "wmesa: write_rgba_span_front: out of memory");
-         return;
-      }
-      c.a=0;
-      if (mask) {
-         for (i=0; i<n; i++) {
-            if (mask[i]) {
-               c.r=rgba[i][RCOMP];
-               c.g=rgba[i][GCOMP];
-               c.b=rgba[i][BCOMP];
-               c.a=rgba[i][ACOMP];
-               bgra[i]=c;
-            }
-            else
-               bgra[i].i=0;
-         }
-      }
-      else {
-         for (i=0; i<n; i++) {
-            c.r=rgba[i][RCOMP];
-            c.g=rgba[i][GCOMP];
-            c.b=rgba[i][BCOMP];
-            c.a=rgba[i][ACOMP];
-            bgra[i]=c;
-         }
-      }
-      bmp=CreateBitmap(n, 1,  1, 32, bgra);
-      mdc=CreateCompatibleDC(pwfb->hDC);
-      SelectObject(mdc, bmp);
-      y=FLIP(y);
-      BitBlt(pwfb->hDC, x, y, n, 1, mdc, 0, 0, SRCCOPY);
-      SelectObject(mdc, 0);
-      DeleteObject(bmp);
-      DeleteDC(mdc);
-      free(bgra);
-   }
-}
-
-/* Write a horizontal span of RGB color pixels with a boolean mask. */
-static void write_rgb_span_front(const struct gl_context *ctx, 
-				  struct gl_renderbuffer *rb, 
-				  GLuint n, GLint x, GLint y,
-				  const GLubyte rgb[][3], 
-				  const GLubyte mask[] )
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    GLuint i;
-    
-    (void) ctx;
-    y=FLIP(y);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-		SetPixel(pwc->hDC, x+i, y, RGB(rgb[i][RCOMP], rgb[i][GCOMP], 
-					       rgb[i][BCOMP]));
-    }
-    else {
-	for (i=0; i<n; i++)
-	    SetPixel(pwc->hDC, x+i, y, RGB(rgb[i][RCOMP], rgb[i][GCOMP], 
-					   rgb[i][BCOMP]));
-    }
-    
-}
-
-/*
- * Write a horizontal span of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_span_front(const struct gl_context *ctx, 
-					struct gl_renderbuffer *rb,
-					GLuint n, GLint x, GLint y,
-					const GLchan color[4], 
-					const GLubyte mask[])
-{
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    COLORREF colorref;
-
-    (void) ctx;
-    colorref = RGB(color[RCOMP], color[GCOMP], color[BCOMP]);
-    y=FLIP(y);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-		SetPixel(pwc->hDC, x+i, y, colorref);
-    }
-    else
-	for (i=0; i<n; i++)
-	    SetPixel(pwc->hDC, x+i, y, colorref);
-
-}
-
-/* Write an array of RGBA pixels with a boolean mask. */
-static void write_rgba_pixels_front(const struct gl_context *ctx, 
-				     struct gl_renderbuffer *rb,
-				     GLuint n, 
-				     const GLint x[], const GLint y[],
-				     const GLubyte rgba[][4], 
-				     const GLubyte mask[] )
-{
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    (void) ctx;
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    SetPixel(pwc->hDC, x[i], FLIP(y[i]), 
-		     RGB(rgba[i][RCOMP], rgba[i][GCOMP], 
-			 rgba[i][BCOMP]));
-}
-
-
-
-/*
- * Write an array of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_pixels_front(const struct gl_context *ctx, 
-					  struct gl_renderbuffer *rb,
-					  GLuint n,
-					  const GLint x[], const GLint y[],
-					  const GLchan color[4],
-					  const GLubyte mask[] )
-{
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    COLORREF colorref;
-    (void) ctx;
-    colorref = RGB(color[RCOMP], color[GCOMP], color[BCOMP]);
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    SetPixel(pwc->hDC, x[i], FLIP(y[i]), colorref);
-}
-
-/* Read a horizontal span of color pixels. */
-static void read_rgba_span_front(const struct gl_context *ctx, 
-				  struct gl_renderbuffer *rb,
-				  GLuint n, GLint x, GLint y,
-				  GLubyte rgba[][4] )
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    GLuint i;
-    COLORREF Color;
-    y = FLIP(y);
-    for (i=0; i<n; i++) {
-	Color = GetPixel(pwc->hDC, x+i, y);
-	rgba[i][RCOMP] = GetRValue(Color);
-	rgba[i][GCOMP] = GetGValue(Color);
-	rgba[i][BCOMP] = GetBValue(Color);
-	rgba[i][ACOMP] = 255;
-    }
-}
-
-
-/* Read an array of color pixels. */
-static void read_rgba_pixels_front(const struct gl_context *ctx, 
-				    struct gl_renderbuffer *rb,
-				    GLuint n, const GLint x[], const GLint y[],
-				    GLubyte rgba[][4])
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    GLuint i;
-    COLORREF Color;
-    for (i=0; i<n; i++) {
-        GLint y2 = FLIP(y[i]);
-        Color = GetPixel(pwc->hDC, x[i], y2);
-        rgba[i][RCOMP] = GetRValue(Color);
-        rgba[i][GCOMP] = GetGValue(Color);
-        rgba[i][BCOMP] = GetBValue(Color);
-        rgba[i][ACOMP] = 255;
-    }
-}
-
-/*********************************************************************/
-
-/* DOUBLE BUFFER 32-bit */
-
-#define WMSETPIXEL32(pwc, y, x, r, g, b) { \
-LPDWORD lpdw = ((LPDWORD)((pwc)->pbPixels + (pwc)->ScanWidth * (y)) + (x)); \
-*lpdw = BGR32((r),(g),(b)); }
-
-
-
-/* Write a horizontal span of RGBA color pixels with a boolean mask. */
-static void write_rgba_span_32(const struct gl_context *ctx, 
-			       struct gl_renderbuffer *rb, 
-			       GLuint n, GLint x, GLint y,
-			       const GLubyte rgba[][4], 
-			       const GLubyte mask[] )
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    GLuint i;
-    LPDWORD lpdw;
-
-    (void) ctx;
-    
-    y=FLIP(y);
-    lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-                lpdw[i] = BGR32(rgba[i][RCOMP], rgba[i][GCOMP], 
-				rgba[i][BCOMP]);
-    }
-    else {
-	for (i=0; i<n; i++)
-                *lpdw++ = BGR32(rgba[i][RCOMP], rgba[i][GCOMP], 
-				rgba[i][BCOMP]);
-    }
-}
-
-
-/* Write a horizontal span of RGB color pixels with a boolean mask. */
-static void write_rgb_span_32(const struct gl_context *ctx, 
-			      struct gl_renderbuffer *rb, 
-			      GLuint n, GLint x, GLint y,
-			      const GLubyte rgb[][3], 
-			      const GLubyte mask[] )
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    GLuint i;
-    LPDWORD lpdw;
-
-    (void) ctx;
-    
-    y=FLIP(y);
-    lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-                lpdw[i] = BGR32(rgb[i][RCOMP], rgb[i][GCOMP], 
-				rgb[i][BCOMP]);
-    }
-    else {
-	for (i=0; i<n; i++)
-                *lpdw++ = BGR32(rgb[i][RCOMP], rgb[i][GCOMP], 
-				rgb[i][BCOMP]);
-    }
-}
-
-/*
- * Write a horizontal span of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_span_32(const struct gl_context *ctx, 
-				    struct gl_renderbuffer *rb,
-				    GLuint n, GLint x, GLint y,
-				    const GLchan color[4], 
-				    const GLubyte mask[])
-{
-    LPDWORD lpdw;
-    DWORD pixel;
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    y=FLIP(y);
-    pixel = BGR32(color[RCOMP], color[GCOMP], color[BCOMP]);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-                lpdw[i] = pixel;
-    }
-    else
-	for (i=0; i<n; i++)
-                *lpdw++ = pixel;
-
-}
-
-/* Write an array of RGBA pixels with a boolean mask. */
-static void write_rgba_pixels_32(const struct gl_context *ctx, 
-				 struct gl_renderbuffer *rb,
-				 GLuint n, const GLint x[], const GLint y[],
-				 const GLubyte rgba[][4], 
-				 const GLubyte mask[])
-{
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    WMSETPIXEL32(pwfb, FLIP(y[i]), x[i],
-			 rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
-}
-
-/*
- * Write an array of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_pixels_32(const struct gl_context *ctx, 
-				      struct gl_renderbuffer *rb,
-				      GLuint n,
-				      const GLint x[], const GLint y[],
-				      const GLchan color[4],
-				      const GLubyte mask[])
-{
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    WMSETPIXEL32(pwfb, FLIP(y[i]),x[i],color[RCOMP],
-			 color[GCOMP], color[BCOMP]);
-}
-
-/* Read a horizontal span of color pixels. */
-static void read_rgba_span_32(const struct gl_context *ctx, 
-			      struct gl_renderbuffer *rb,
-			      GLuint n, GLint x, GLint y,
-			      GLubyte rgba[][4] )
-{
-    GLuint i;
-    DWORD pixel;
-    LPDWORD lpdw;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    
-    y = FLIP(y);
-    lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    for (i=0; i<n; i++) {
-	pixel = lpdw[i];
-	rgba[i][RCOMP] = (GLubyte)((pixel & 0x00ff0000) >> 16);
-	rgba[i][GCOMP] = (GLubyte)((pixel & 0x0000ff00) >> 8);
-	rgba[i][BCOMP] = (GLubyte)(pixel & 0x000000ff);
-	rgba[i][ACOMP] = 255;
-    }
-}
-
-
-/* Read an array of color pixels. */
-static void read_rgba_pixels_32(const struct gl_context *ctx, 
-				struct gl_renderbuffer *rb,
-				GLuint n, const GLint x[], const GLint y[],
-				GLubyte rgba[][4])
-{
-    GLuint i;
-    DWORD pixel;
-    LPDWORD lpdw;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-
-    for (i=0; i<n; i++) {
-	GLint y2 = FLIP(y[i]);
-	lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y2)) + x[i];
-	pixel = *lpdw;
-	rgba[i][RCOMP] = (GLubyte)((pixel & 0x00ff0000) >> 16);
-	rgba[i][GCOMP] = (GLubyte)((pixel & 0x0000ff00) >> 8);
-	rgba[i][BCOMP] = (GLubyte)(pixel & 0x000000ff);
-	rgba[i][ACOMP] = 255;
-  }
-}
-
-
-/*********************************************************************/
-
-/* DOUBLE BUFFER 24-bit */
-
-#define WMSETPIXEL24(pwc, y, x, r, g, b) { \
-LPBYTE lpb = ((LPBYTE)((pwc)->pbPixels + (pwc)->ScanWidth * (y)) + (3 * x)); \
-lpb[0] = (b); \
-lpb[1] = (g); \
-lpb[2] = (r); }
-
-/* Write a horizontal span of RGBA color pixels with a boolean mask. */
-static void write_rgba_span_24(const struct gl_context *ctx, 
-			       struct gl_renderbuffer *rb, 
-			       GLuint n, GLint x, GLint y,
-			       const GLubyte rgba[][4], 
-			       const GLubyte mask[] )
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    GLuint i;
-    LPBYTE lpb;
-
-    (void) ctx;
-    
-    y=FLIP(y);
-    lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y)) + (3 * x);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i]) {
-                lpb[3*i] = rgba[i][BCOMP];
-                lpb[3*i+1] = rgba[i][GCOMP];
-                lpb[3*i+2] = rgba[i][RCOMP];
-	    }
-    }
-    else {
-	    for (i=0; i<n; i++) {
-            *lpb++ = rgba[i][BCOMP];
-            *lpb++ = rgba[i][GCOMP];
-            *lpb++ = rgba[i][RCOMP];
-	    }
-    }
-}
-
-
-/* Write a horizontal span of RGB color pixels with a boolean mask. */
-static void write_rgb_span_24(const struct gl_context *ctx, 
-			      struct gl_renderbuffer *rb, 
-			      GLuint n, GLint x, GLint y,
-			      const GLubyte rgb[][3], 
-			      const GLubyte mask[] )
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    GLuint i;
-    LPBYTE lpb;
-
-    (void) ctx;
-    
-    y=FLIP(y);
-    lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y)) + (3 * x);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i]) {
-            lpb[3*i] = rgb[i][BCOMP];
-            lpb[3*i+1] = rgb[i][GCOMP];
-            lpb[3*i+2] = rgb[i][RCOMP];
-	    }
-    }
-    else {
-    	for (i=0; i<n; i++) {
-    		*lpb++ = rgb[i][BCOMP];
-    		*lpb++ = rgb[i][GCOMP];
-    		*lpb++ = rgb[i][RCOMP];
-    	}
-    }
-}
-
-/*
- * Write a horizontal span of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_span_24(const struct gl_context *ctx, 
-				    struct gl_renderbuffer *rb,
-				    GLuint n, GLint x, GLint y,
-				    const GLchan color[4], 
-				    const GLubyte mask[])
-{
-    LPBYTE lpb;
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y)) + (3 * x);
-    y=FLIP(y);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i]) {
-	    	lpb[3*i] = color[BCOMP];
-	    	lpb[3*i+1] = color[GCOMP];
-	    	lpb[3*i+2] = color[RCOMP];
-	    }
-    }
-    else
-	for (i=0; i<n; i++) {
-		*lpb++ = color[BCOMP];
-		*lpb++ = color[GCOMP];
-		*lpb++ = color[RCOMP];		
-	}
-}
-
-/* Write an array of RGBA pixels with a boolean mask. */
-static void write_rgba_pixels_24(const struct gl_context *ctx, 
-				 struct gl_renderbuffer *rb,
-				 GLuint n, const GLint x[], const GLint y[],
-				 const GLubyte rgba[][4], 
-				 const GLubyte mask[])
-{
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    WMSETPIXEL24(pwfb, FLIP(y[i]), x[i],
-			 rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
-}
-
-/*
- * Write an array of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_pixels_24(const struct gl_context *ctx, 
-				      struct gl_renderbuffer *rb,
-				      GLuint n,
-				      const GLint x[], const GLint y[],
-				      const GLchan color[4],
-				      const GLubyte mask[])
-{
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    WMSETPIXEL24(pwfb, FLIP(y[i]),x[i],color[RCOMP],
-			 color[GCOMP], color[BCOMP]);
-}
-
-/* Read a horizontal span of color pixels. */
-static void read_rgba_span_24(const struct gl_context *ctx, 
-			      struct gl_renderbuffer *rb,
-			      GLuint n, GLint x, GLint y,
-			      GLubyte rgba[][4] )
-{
-    GLuint i;
-    LPBYTE lpb;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    
-    y = FLIP(y);
-    lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y)) + (3 * x);
-    for (i=0; i<n; i++) {
-	rgba[i][RCOMP] = lpb[3*i+2];
-	rgba[i][GCOMP] = lpb[3*i+1];
-	rgba[i][BCOMP] = lpb[3*i];
-	rgba[i][ACOMP] = 255;
-    }
-}
-
-
-/* Read an array of color pixels. */
-static void read_rgba_pixels_24(const struct gl_context *ctx, 
-				struct gl_renderbuffer *rb,
-				GLuint n, const GLint x[], const GLint y[],
-				GLubyte rgba[][4])
-{
-    GLuint i;
-    LPBYTE lpb;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-
-    for (i=0; i<n; i++) {
-	GLint y2 = FLIP(y[i]);
-	lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y2)) + (3 * x[i]);
-	rgba[i][RCOMP] = lpb[3*i+2];
-	rgba[i][GCOMP] = lpb[3*i+1];
-	rgba[i][BCOMP] = lpb[3*i];
-	rgba[i][ACOMP] = 255;
-  }
-}
-
-
-/*********************************************************************/
-
-/* DOUBLE BUFFER 16-bit */
-
-#define WMSETPIXEL16(pwc, y, x, r, g, b) { \
-LPWORD lpw = ((LPWORD)((pwc)->pbPixels + (pwc)->ScanWidth * (y)) + (x)); \
-*lpw = BGR16((r),(g),(b)); }
-
-
-
-/* Write a horizontal span of RGBA color pixels with a boolean mask. */
-static void write_rgba_span_16(const struct gl_context *ctx, 
-			       struct gl_renderbuffer *rb, 
-			       GLuint n, GLint x, GLint y,
-			       const GLubyte rgba[][4], 
-			       const GLubyte mask[] )
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    GLuint i;
-    LPWORD lpw;
-
-    (void) ctx;
-    
-    y=FLIP(y);
-    lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-                lpw[i] = BGR16(rgba[i][RCOMP], rgba[i][GCOMP], 
-			       rgba[i][BCOMP]);
-    }
-    else {
-	for (i=0; i<n; i++)
-                *lpw++ = BGR16(rgba[i][RCOMP], rgba[i][GCOMP], 
-			       rgba[i][BCOMP]);
-    }
-}
-
-
-/* Write a horizontal span of RGB color pixels with a boolean mask. */
-static void write_rgb_span_16(const struct gl_context *ctx, 
-			      struct gl_renderbuffer *rb, 
-			      GLuint n, GLint x, GLint y,
-			      const GLubyte rgb[][3], 
-			      const GLubyte mask[] )
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    GLuint i;
-    LPWORD lpw;
-
-    (void) ctx;
-    
-    y=FLIP(y);
-    lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-                lpw[i] = BGR16(rgb[i][RCOMP], rgb[i][GCOMP], 
-			       rgb[i][BCOMP]);
-    }
-    else {
-	for (i=0; i<n; i++)
-                *lpw++ = BGR16(rgb[i][RCOMP], rgb[i][GCOMP], 
-			       rgb[i][BCOMP]);
-    }
-}
-
-/*
- * Write a horizontal span of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_span_16(const struct gl_context *ctx, 
-				    struct gl_renderbuffer *rb,
-				    GLuint n, GLint x, GLint y,
-				    const GLchan color[4], 
-				    const GLubyte mask[])
-{
-    LPWORD lpw;
-    WORD pixel;
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    (void) ctx;
-    lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    y=FLIP(y);
-    pixel = BGR16(color[RCOMP], color[GCOMP], color[BCOMP]);
-    if (mask) {
-	for (i=0; i<n; i++)
-	    if (mask[i])
-                lpw[i] = pixel;
-    }
-    else
-	for (i=0; i<n; i++)
-                *lpw++ = pixel;
-
-}
-
-/* Write an array of RGBA pixels with a boolean mask. */
-static void write_rgba_pixels_16(const struct gl_context *ctx, 
-				 struct gl_renderbuffer *rb,
-				 GLuint n, const GLint x[], const GLint y[],
-				 const GLubyte rgba[][4], 
-				 const GLubyte mask[])
-{
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    (void) ctx;
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    WMSETPIXEL16(pwfb, FLIP(y[i]), x[i],
-			 rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
-}
-
-/*
- * Write an array of pixels with a boolean mask.  The current color
- * is used for all pixels.
- */
-static void write_mono_rgba_pixels_16(const struct gl_context *ctx, 
-				      struct gl_renderbuffer *rb,
-				      GLuint n,
-				      const GLint x[], const GLint y[],
-				      const GLchan color[4],
-				      const GLubyte mask[])
-{
-    GLuint i;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    (void) ctx;
-    for (i=0; i<n; i++)
-	if (mask[i])
-	    WMSETPIXEL16(pwfb, FLIP(y[i]),x[i],color[RCOMP],
-			 color[GCOMP], color[BCOMP]);
-}
-
-/* Read a horizontal span of color pixels. */
-static void read_rgba_span_16(const struct gl_context *ctx, 
-			      struct gl_renderbuffer *rb,
-			      GLuint n, GLint x, GLint y,
-			      GLubyte rgba[][4] )
-{
-    GLuint i, pixel;
-    LPWORD lpw;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-    
-    y = FLIP(y);
-    lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;
-    for (i=0; i<n; i++) {
-	pixel = lpw[i];
-	/* Windows uses 5,5,5 for 16-bit */
-	rgba[i][RCOMP] = (pixel & 0x7c00) >> 7;
-	rgba[i][GCOMP] = (pixel & 0x03e0) >> 2;
-	rgba[i][BCOMP] = (pixel & 0x001f) << 3;
-	rgba[i][ACOMP] = 255;
-    }
-}
-
-
-/* Read an array of color pixels. */
-static void read_rgba_pixels_16(const struct gl_context *ctx, 
-				struct gl_renderbuffer *rb,
-				GLuint n, const GLint x[], const GLint y[],
-				GLubyte rgba[][4])
-{
-    GLuint i, pixel;
-    LPWORD lpw;
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);
-
-    for (i=0; i<n; i++) {
-	GLint y2 = FLIP(y[i]);
-	lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y2)) + x[i];
-	pixel = *lpw;
-	/* Windows uses 5,5,5 for 16-bit */
-	rgba[i][RCOMP] = (pixel & 0x7c00) >> 7;
-	rgba[i][GCOMP] = (pixel & 0x03e0) >> 2;
-	rgba[i][BCOMP] = (pixel & 0x001f) << 3;
-	rgba[i][ACOMP] = 255;
-  }
-}
-
-
-
-
-/**********************************************************************/
-/*****                   BUFFER Functions                         *****/
-/**********************************************************************/
-
-
-
-
-static void
-wmesa_delete_renderbuffer(struct gl_renderbuffer *rb)
-{
-    free(rb);
-}
-
-
-/**
- * This is called by Mesa whenever it determines that the window size
- * has changed.  Do whatever's needed to cope with that.
- */
-static GLboolean
-wmesa_renderbuffer_storage(struct gl_context *ctx, 
-			   struct gl_renderbuffer *rb,
-			   GLenum internalFormat, 
-			   GLuint width, 
-			   GLuint height)
-{
-    rb->Width = width;
-    rb->Height = height;
-    return GL_TRUE;
-}
-
-
-/**
- * Plug in the Get/PutRow/Values functions for a renderbuffer depending
- * on if we're drawing to the front or back color buffer.
- */
-void wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,
-                                  int cColorBits, int double_buffer)
-{
-    if (double_buffer) {
-        /* back buffer */
-	/* Picking the correct span functions is important because
-	 * the DIB was allocated with the indicated depth. */
-	switch(pixelformat) {
-	case PF_5R6G5B:
-	    rb->PutRow = write_rgba_span_16;
-	    rb->PutRowRGB = write_rgb_span_16;
-	    rb->PutMonoRow = write_mono_rgba_span_16;
-	    rb->PutValues = write_rgba_pixels_16;
-	    rb->PutMonoValues = write_mono_rgba_pixels_16;
-	    rb->GetRow = read_rgba_span_16;
-	    rb->GetValues = read_rgba_pixels_16;
-	    break;
-	case PF_8R8G8B:
-		if (cColorBits == 24)
-		{
-		    rb->PutRow = write_rgba_span_24;
-		    rb->PutRowRGB = write_rgb_span_24;
-		    rb->PutMonoRow = write_mono_rgba_span_24;
-		    rb->PutValues = write_rgba_pixels_24;
-		    rb->PutMonoValues = write_mono_rgba_pixels_24;
-		    rb->GetRow = read_rgba_span_24;
-		    rb->GetValues = read_rgba_pixels_24;
-		}
-		else
-		{
-	        rb->PutRow = write_rgba_span_32;
-	        rb->PutRowRGB = write_rgb_span_32;
-	        rb->PutMonoRow = write_mono_rgba_span_32;
-	        rb->PutValues = write_rgba_pixels_32;
-	        rb->PutMonoValues = write_mono_rgba_pixels_32;
-	        rb->GetRow = read_rgba_span_32;
-	        rb->GetValues = read_rgba_pixels_32;
-		}
-	    break;
-	default:
-	    break;
-	}
-    }
-    else {
-        /* front buffer (actual Windows window) */
-	rb->PutRow = write_rgba_span_front;
-	rb->PutRowRGB = write_rgb_span_front;
-	rb->PutMonoRow = write_mono_rgba_span_front;
-	rb->PutValues = write_rgba_pixels_front;
-	rb->PutMonoValues = write_mono_rgba_pixels_front;
-	rb->GetRow = read_rgba_span_front;
-	rb->GetValues = read_rgba_pixels_front;
-    }
-}
-
-/**
- * Called by ctx->Driver.ResizeBuffers()
- * Resize the front/back colorbuffers to match the latest window size.
- */
-static void
-wmesa_resize_buffers(struct gl_context *ctx, struct gl_framebuffer *buffer,
-                     GLuint width, GLuint height)
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_framebuffer(buffer);
-
-    if (pwfb->Base.Width != width || pwfb->Base.Height != height) {
-	/* Realloc back buffer */
-	if (ctx->Visual.doubleBufferMode == 1) {
-	    wmDeleteBackingStore(pwfb);
-	    wmCreateBackingStore(pwfb, width, height);
-	}
-    }
-    _mesa_resize_framebuffer(ctx, buffer, width, height);
-}
-
-
-/**
- * Called by glViewport.
- * This is a good time for us to poll the current window size and adjust
- * our renderbuffers to match the current window size.
- * Remember, we have no opportunity to respond to conventional
- * resize events since the driver has no event loop.
- * Thus, we poll.
- * MakeCurrent also ends up making a call here, so that ensures
- * we get the viewport set correctly, even if the app does not call
- * glViewport and relies on the defaults.
- */
-static void wmesa_viewport(struct gl_context *ctx, 
-			   GLint x, GLint y, 
-			   GLsizei width, GLsizei height)
-{
-    WMesaContext pwc = wmesa_context(ctx);
-    GLuint new_width, new_height;
-
-    wmesa_get_buffer_size(ctx->WinSysDrawBuffer, &new_width, &new_height);
-
-    /**
-     * Resize buffers if the window size changed.
-     */
-    wmesa_resize_buffers(ctx, ctx->WinSysDrawBuffer, new_width, new_height);
-    ctx->NewState |= _NEW_BUFFERS;  /* to update scissor / window bounds */
-}
-
-
-
-
-/**
- * Called when the driver should update it's state, based on the new_state
- * flags.
- */
-static void wmesa_update_state(struct gl_context *ctx, GLuint new_state)
-{
-    _swrast_InvalidateState(ctx, new_state);
-    _swsetup_InvalidateState(ctx, new_state);
-    _vbo_InvalidateState(ctx, new_state);
-    _tnl_InvalidateState(ctx, new_state);
-
-    /* TODO - This code is not complete yet because I 
-     * don't know what to do for all state updates.
-     */
-
-    if (new_state & _NEW_BUFFERS) {
-    }
-}
-
-
-
-
-
-/**********************************************************************/
-/*****                   WMESA Functions                          *****/
-/**********************************************************************/
-
-WMesaContext WMesaCreateContext(HDC hDC, 
-				HPALETTE* Pal,
-				GLboolean rgb_flag,
-				GLboolean db_flag,
-				GLboolean alpha_flag)
-{
-    WMesaContext c;
-    struct dd_function_table functions;
-    GLint red_bits, green_bits, blue_bits, alpha_bits;
-    struct gl_context *ctx;
-    struct gl_config *visual;
-
-    (void) Pal;
-    
-    /* Indexed mode not supported */
-    if (!rgb_flag)
-	return NULL;
-
-    /* Allocate wmesa context */
-    c = CALLOC_STRUCT(wmesa_context);
-    if (!c)
-	return NULL;
-
-#if 0
-    /* I do not understand this contributed code */
-    /* Support memory and device contexts */
-    if(WindowFromDC(hDC) != NULL) {
-	c->hDC = GetDC(WindowFromDC(hDC)); /* huh ???? */
-    }
-    else {
-	c->hDC = hDC;
-    }
-#else
-    c->hDC = hDC;
-#endif
-
-    /* Get data for visual */
-    /* Dealing with this is actually a bit of overkill because Mesa will end
-     * up treating all color component size requests less than 8 by using 
-     * a single byte per channel.  In addition, the interface to the span
-     * routines passes colors as an entire byte per channel anyway, so there
-     * is nothing to be saved by telling the visual to be 16 bits if the device
-     * is 16 bits.  That is, Mesa is going to compute colors down to 8 bits per
-     * channel anyway.
-     * But we go through the motions here anyway.
-     */
-    switch (GetDeviceCaps(c->hDC, BITSPIXEL)) {
-    case 16:
-	red_bits = green_bits = blue_bits = 5;
-	alpha_bits = 0;
-	break;
-    default:
-	red_bits = green_bits = blue_bits = 8;
-	alpha_bits = 8;
-	break;
-    }
-    /* Create visual based on flags */
-    visual = _mesa_create_visual(db_flag,    /* db_flag */
-                                 GL_FALSE,   /* stereo */
-                                 red_bits, green_bits, blue_bits, /* color RGB */
-                                 alpha_flag ? alpha_bits : 0, /* color A */
-                                 DEFAULT_SOFTWARE_DEPTH_BITS, /* depth_bits */
-                                 8,          /* stencil_bits */
-                                 16,16,16,   /* accum RGB */
-                                 alpha_flag ? 16 : 0, /* accum A */
-                                 1);         /* num samples */
-    
-    if (!visual) {
-	free(c);
-	return NULL;
-    }
-
-    /* Set up driver functions */
-    _mesa_init_driver_functions(&functions);
-    functions.GetString = wmesa_get_string;
-    functions.UpdateState = wmesa_update_state;
-    functions.GetBufferSize = wmesa_get_buffer_size;
-    functions.Flush = wmesa_flush;
-    functions.Clear = clear;
-    functions.ClearColor = clear_color;
-    functions.ResizeBuffers = wmesa_resize_buffers;
-    functions.Viewport = wmesa_viewport;
-
-    /* initialize the Mesa context data */
-    ctx = &c->gl_ctx;
-    _mesa_initialize_context(ctx, API_OPENGL, visual,
-                             NULL, &functions, (void *)c);
-
-    /* visual no longer needed - it was copied by _mesa_initialize_context() */
-    _mesa_destroy_visual(visual);
-
-    _mesa_enable_sw_extensions(ctx);
-    _mesa_enable_1_3_extensions(ctx);
-    _mesa_enable_1_4_extensions(ctx);
-    _mesa_enable_1_5_extensions(ctx);
-    _mesa_enable_2_0_extensions(ctx);
-    _mesa_enable_2_1_extensions(ctx);
-  
-    _mesa_meta_init(ctx);
-
-    /* Initialize the software rasterizer and helper modules. */
-    if (!_swrast_CreateContext(ctx) ||
-        !_vbo_CreateContext(ctx) ||
-        !_tnl_CreateContext(ctx) ||
-	!_swsetup_CreateContext(ctx)) {
-	_mesa_free_context_data(ctx);
-	free(c);
-	return NULL;
-    }
-    _swsetup_Wakeup(ctx);
-    TNL_CONTEXT(ctx)->Driver.RunPipeline = _tnl_run_pipeline;
-
-    return c;
-}
-
-
-void WMesaDestroyContext( WMesaContext pwc )
-{
-    struct gl_context *ctx = &pwc->gl_ctx;
-    WMesaFramebuffer pwfb;
-    GET_CURRENT_CONTEXT(cur_ctx);
-
-    if (cur_ctx == ctx) {
-        /* unbind current if deleting current context */
-        WMesaMakeCurrent(NULL, NULL);
-    }
-
-    /* clean up frame buffer resources */
-    pwfb = wmesa_lookup_framebuffer(pwc->hDC);
-    if (pwfb) {
-	if (ctx->Visual.doubleBufferMode == 1)
-	    wmDeleteBackingStore(pwfb);
-	wmesa_free_framebuffer(pwc->hDC);
-    }
-
-    /* Release for device, not memory contexts */
-    if (WindowFromDC(pwc->hDC) != NULL)
-    {
-      ReleaseDC(WindowFromDC(pwc->hDC), pwc->hDC);
-    }
-    DeleteObject(pwc->clearPen); 
-    DeleteObject(pwc->clearBrush); 
-    
-    _mesa_meta_free(ctx);
-
-    _swsetup_DestroyContext(ctx);
-    _tnl_DestroyContext(ctx);
-    _vbo_DestroyContext(ctx);
-    _swrast_DestroyContext(ctx);
-    
-    _mesa_free_context_data(ctx);
-    free(pwc);
-}
-
-
-/**
- * Create a new color renderbuffer.
- */
-struct gl_renderbuffer *
-wmesa_new_renderbuffer(void)
-{
-    struct gl_renderbuffer *rb = CALLOC_STRUCT(gl_renderbuffer);
-    if (!rb)
-        return NULL;
-
-    _mesa_init_renderbuffer(rb, (GLuint)0);
-    
-    rb->_BaseFormat = GL_RGBA;
-    rb->InternalFormat = GL_RGBA;
-    rb->DataType = CHAN_TYPE;
-    rb->Delete = wmesa_delete_renderbuffer;
-    rb->AllocStorage = wmesa_renderbuffer_storage;
-    return rb;
-}
-
-
-void WMesaMakeCurrent(WMesaContext c, HDC hdc)
-{
-    WMesaFramebuffer pwfb;
-
-    {
-        /* return if already current */
-        GET_CURRENT_CONTEXT(ctx);
-        WMesaContext pwc = wmesa_context(ctx);
-        if (pwc && c == pwc && pwc->hDC == hdc)
-            return;
-    }
-
-    pwfb = wmesa_lookup_framebuffer(hdc);
-
-    /* Lazy creation of framebuffers */
-    if (c && !pwfb && hdc) {
-        struct gl_renderbuffer *rb;
-        struct gl_config *visual = &c->gl_ctx.Visual;
-        GLuint width, height;
-
-        get_window_size(hdc, &width, &height);
-
-	c->clearPen = CreatePen(PS_SOLID, 1, 0); 
-	c->clearBrush = CreateSolidBrush(0); 
-
-        pwfb = wmesa_new_framebuffer(hdc, visual);
-
-	/* Create back buffer if double buffered */
-	if (visual->doubleBufferMode == 1) {
-	    wmCreateBackingStore(pwfb, width, height);
-	}
-	
-        /* make render buffers */
-        if (visual->doubleBufferMode == 1) {
-            rb = wmesa_new_renderbuffer();
-            _mesa_add_renderbuffer(&pwfb->Base, BUFFER_BACK_LEFT, rb);
-            wmesa_set_renderbuffer_funcs(rb, pwfb->pixelformat, pwfb->cColorBits, 1);
-	}
-        rb = wmesa_new_renderbuffer();
-        _mesa_add_renderbuffer(&pwfb->Base, BUFFER_FRONT_LEFT, rb);
-        wmesa_set_renderbuffer_funcs(rb, pwfb->pixelformat, pwfb->cColorBits, 0);
-
-	/* Let Mesa own the Depth, Stencil, and Accum buffers */
-        _mesa_add_soft_renderbuffers(&pwfb->Base,
-                                     GL_FALSE, /* color */
-                                     visual->depthBits > 0,
-                                     visual->stencilBits > 0,
-                                     visual->accumRedBits > 0,
-                                     visual->alphaBits >0, 
-                                     GL_FALSE);
-    }
-
-    if (c && pwfb)
-	_mesa_make_current(&c->gl_ctx, &pwfb->Base, &pwfb->Base);
-    else
-        _mesa_make_current(NULL, NULL, NULL);
-}
-
-
-void WMesaSwapBuffers( HDC hdc )
-{
-    GET_CURRENT_CONTEXT(ctx);
-    WMesaContext pwc = wmesa_context(ctx);
-    WMesaFramebuffer pwfb = wmesa_lookup_framebuffer(hdc);
-
-    if (!pwfb) {
-        _mesa_problem(NULL, "wmesa: swapbuffers on unknown hdc");
-        return;
-    }
-
-    /* If we're swapping the buffer associated with the current context
-     * we have to flush any pending rendering commands first.
-     */
-    if (pwc->hDC == hdc) {
-	_mesa_notifySwapBuffers(ctx);
-
-	BitBlt(pwfb->hDC, 0, 0, pwfb->Base.Width, pwfb->Base.Height,
-	       pwfb->dib_hDC, 0, 0, SRCCOPY);
-    }
-    else {
-        /* XXX for now only allow swapping current window */
-        _mesa_problem(NULL, "wmesa: can't swap non-current window");
-    }
-}
-
-void WMesaShareLists(WMesaContext ctx_to_share, WMesaContext ctx)
-{
-	_mesa_share_state(&ctx->gl_ctx, &ctx_to_share->gl_ctx);	
-}
-
+/*

+ * Windows (Win32/Win64) device driver for Mesa

+ *

+ */

+

+#include "wmesadef.h"

+#include "colors.h"

+#include <GL/wmesa.h>

+#include <winuser.h>

+#include "context.h"

+#include "extensions.h"

+#include "framebuffer.h"

+#include "renderbuffer.h"

+#include "drivers/common/driverfuncs.h"

+#include "drivers/common/meta.h"

+#include "vbo/vbo.h"

+#include "swrast/swrast.h"

+#include "swrast_setup/swrast_setup.h"

+#include "tnl/tnl.h"

+#include "tnl/t_context.h"

+#include "tnl/t_pipeline.h"

+

+

+/* linked list of our Framebuffers (windows) */

+static WMesaFramebuffer FirstFramebuffer = NULL;

+

+

+/**

+ * Create a new WMesaFramebuffer object which will correspond to the

+ * given HDC (Window handle).

+ */

+WMesaFramebuffer

+wmesa_new_framebuffer(HDC hdc, struct gl_config *visual)

+{

+    WMesaFramebuffer pwfb

+        = (WMesaFramebuffer) malloc(sizeof(struct wmesa_framebuffer));

+    if (pwfb) {

+        _mesa_initialize_window_framebuffer(&pwfb->Base, visual);

+        pwfb->hDC = hdc;

+        /* insert at head of list */

+        pwfb->next = FirstFramebuffer;

+        FirstFramebuffer = pwfb;

+    }

+    return pwfb;

+}

+

+/**

+ * Given an hdc, free the corresponding WMesaFramebuffer

+ */

+void

+wmesa_free_framebuffer(HDC hdc)

+{

+    WMesaFramebuffer pwfb, prev;

+    for (pwfb = FirstFramebuffer; pwfb; pwfb = pwfb->next) {

+        if (pwfb->hDC == hdc)

+            break;

+	prev = pwfb;

+    }

+    if (pwfb) {

+        struct gl_framebuffer *fb;

+	if (pwfb == FirstFramebuffer)

+	    FirstFramebuffer = pwfb->next;

+	else

+	    prev->next = pwfb->next;

+        fb = &pwfb->Base;

+        _mesa_reference_framebuffer(&fb, NULL); 

+    }

+}

+

+/**

+ * Given an hdc, return the corresponding WMesaFramebuffer

+ */

+WMesaFramebuffer

+wmesa_lookup_framebuffer(HDC hdc)

+{

+    WMesaFramebuffer pwfb;

+    for (pwfb = FirstFramebuffer; pwfb; pwfb = pwfb->next) {

+        if (pwfb->hDC == hdc)

+            return pwfb;

+    }

+    return NULL;

+}

+

+

+/**

+ * Given a struct gl_framebuffer, return the corresponding WMesaFramebuffer.

+ */

+static WMesaFramebuffer wmesa_framebuffer(struct gl_framebuffer *fb)

+{

+    return (WMesaFramebuffer) fb;

+}

+

+

+/**

+ * Given a struct gl_context, return the corresponding WMesaContext.

+ */

+static WMesaContext wmesa_context(const struct gl_context *ctx)

+{

+    return (WMesaContext) ctx;

+}

+

+

+/*

+ * Every driver should implement a GetString function in order to

+ * return a meaningful GL_RENDERER string.

+ */

+static const GLubyte *wmesa_get_string(struct gl_context *ctx, GLenum name)

+{

+    return (name == GL_RENDERER) ? 

+	(GLubyte *) "Mesa Windows GDI Driver" : NULL;

+}

+

+

+/*

+ * Determine the pixel format based on the pixel size.

+ */

+static void wmSetPixelFormat(WMesaFramebuffer pwfb, HDC hDC)

+{

+    pwfb->cColorBits = GetDeviceCaps(hDC, BITSPIXEL);

+

+    /* Only 16 and 32 bit targets are supported now */

+    assert(pwfb->cColorBits == 0 ||

+	   pwfb->cColorBits == 16 || 

+	   pwfb->cColorBits == 24 || 

+	   pwfb->cColorBits == 32);

+

+    switch(pwfb->cColorBits){

+    case 8:

+	pwfb->pixelformat = PF_INDEX8;

+	break;

+    case 16:

+	pwfb->pixelformat = PF_5R6G5B;

+	break;

+    case 24:

+    case 32:

+	pwfb->pixelformat = PF_8R8G8B;

+	break;

+    default:

+	pwfb->pixelformat = PF_BADFORMAT;

+    }

+}

+

+

+/**

+ * Create DIB for back buffer.

+ * We write into this memory with the span routines and then blit it

+ * to the window on a buffer swap.

+ */

+BOOL wmCreateBackingStore(WMesaFramebuffer pwfb, long lxSize, long lySize)

+{

+    HDC          hdc = pwfb->hDC;

+    LPBITMAPINFO pbmi = &(pwfb->bmi);

+    HDC          hic;

+

+    pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

+    pbmi->bmiHeader.biWidth = lxSize;

+    pbmi->bmiHeader.biHeight= -lySize;

+    pbmi->bmiHeader.biPlanes = 1;

+    pbmi->bmiHeader.biBitCount = GetDeviceCaps(pwfb->hDC, BITSPIXEL);

+    pbmi->bmiHeader.biCompression = BI_RGB;

+    pbmi->bmiHeader.biSizeImage = 0;

+    pbmi->bmiHeader.biXPelsPerMeter = 0;

+    pbmi->bmiHeader.biYPelsPerMeter = 0;

+    pbmi->bmiHeader.biClrUsed = 0;

+    pbmi->bmiHeader.biClrImportant = 0;

+    

+    pwfb->cColorBits = pbmi->bmiHeader.biBitCount;

+    pwfb->ScanWidth = (lxSize * (pwfb->cColorBits / 8) + 3) & ~3;

+    

+    hic = CreateIC("display", NULL, NULL, NULL);

+    pwfb->dib_hDC = CreateCompatibleDC(hic);

+    

+    pwfb->hbmDIB = CreateDIBSection(hic,

+				   &pwfb->bmi,

+				   DIB_RGB_COLORS,

+				   (void **)&(pwfb->pbPixels),

+				   0,

+				   0);

+    pwfb->hOldBitmap = SelectObject(pwfb->dib_hDC, pwfb->hbmDIB);

+    

+    DeleteDC(hic);

+

+    wmSetPixelFormat(pwfb, pwfb->hDC);

+    return TRUE;

+}

+

+

+static wmDeleteBackingStore(WMesaFramebuffer pwfb)

+{

+    if (pwfb->hbmDIB) {

+	SelectObject(pwfb->dib_hDC, pwfb->hOldBitmap);

+	DeleteDC(pwfb->dib_hDC);

+	DeleteObject(pwfb->hbmDIB);

+    }

+}

+

+

+/**

+ * Find the width and height of the window named by hdc.

+ */

+static void

+get_window_size(HDC hdc, GLuint *width, GLuint *height)

+{

+    if (WindowFromDC(hdc)) {

+        RECT rect;

+        GetClientRect(WindowFromDC(hdc), &rect);

+        *width = rect.right - rect.left;

+        *height = rect.bottom - rect.top;

+    }

+    else { /* Memory context */

+        /* From contributed code - use the size of the desktop

+         * for the size of a memory context (?) */

+        *width = GetDeviceCaps(hdc, HORZRES);

+        *height = GetDeviceCaps(hdc, VERTRES);

+    }

+}

+

+

+static void

+wmesa_get_buffer_size(struct gl_framebuffer *buffer, GLuint *width, GLuint *height)

+{

+    WMesaFramebuffer pwfb = wmesa_framebuffer(buffer);

+    get_window_size(pwfb->hDC, width, height);

+}

+

+

+static void wmesa_flush(struct gl_context *ctx)

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->WinSysDrawBuffer);

+

+    if (ctx->Visual.doubleBufferMode == 1) {

+	BitBlt(pwfb->hDC, 0, 0, pwfb->Base.Width, pwfb->Base.Height,

+	       pwfb->dib_hDC, 0, 0, SRCCOPY);

+    }

+    else {

+	/* Do nothing for single buffer */

+    }

+}

+

+

+/**********************************************************************/

+/*****                   CLEAR Functions                          *****/

+/**********************************************************************/

+

+/* If we do not implement these, Mesa clears the buffers via the pixel

+ * span writing interface, which is very slow for a clear operation.

+ */

+

+/*

+ * Set the color used to clear the color buffer.

+ */

+static void clear_color(struct gl_context *ctx, const GLfloat color[4])

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    GLubyte col[3];

+    UINT    bytesPerPixel = pwfb->cColorBits / 8; 

+

+    CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);

+    CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);

+    CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);

+    pwc->clearColorRef = RGB(col[0], col[1], col[2]);

+    DeleteObject(pwc->clearPen);

+    DeleteObject(pwc->clearBrush);

+    pwc->clearPen = CreatePen(PS_SOLID, 1, pwc->clearColorRef); 

+    pwc->clearBrush = CreateSolidBrush(pwc->clearColorRef); 

+}

+

+

+/* 

+ * Clear the specified region of the color buffer using the clear color 

+ * or index as specified by one of the two functions above. 

+ * 

+ * This procedure clears either the front and/or the back COLOR buffers. 

+ * Only the "left" buffer is cleared since we are not stereo. 

+ * Clearing of the other non-color buffers is left to the swrast. 

+ */ 

+

+static void clear(struct gl_context *ctx, GLbitfield mask)

+{

+#define FLIP(Y)  (ctx->DrawBuffer->Height - (Y) - 1)

+    const GLint x = ctx->DrawBuffer->_Xmin;

+    const GLint y = ctx->DrawBuffer->_Ymin;

+    const GLint height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;

+    const GLint width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;

+

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    int done = 0;

+

+    /* Let swrast do all the work if the masks are not set to

+     * clear all channels. */

+    if (!ctx->Color.ColorMask[0][0] ||

+	!ctx->Color.ColorMask[0][1] ||

+	!ctx->Color.ColorMask[0][2] ||

+	!ctx->Color.ColorMask[0][3]) {

+	_swrast_Clear(ctx, mask);

+	return;

+    }

+

+    /* Back buffer */

+    if (mask & BUFFER_BIT_BACK_LEFT) { 

+	

+	int     i, rowSize; 

+	UINT    bytesPerPixel = pwfb->cColorBits / 8; 

+	LPBYTE  lpb, clearRow;

+	LPWORD  lpw;

+	BYTE    bColor; 

+	WORD    wColor; 

+	BYTE    r, g, b; 

+	DWORD   dwColor; 

+	LPDWORD lpdw; 

+	

+	/* Try for a fast clear - clearing entire buffer with a single

+	 * byte value. */

+	if (width == ctx->DrawBuffer->Width &&

+            height == ctx->DrawBuffer->Height) { /* entire buffer */

+	    /* Now check for an easy clear value */

+	    switch (bytesPerPixel) {

+	    case 1:

+		bColor = BGR8(GetRValue(pwc->clearColorRef), 

+			      GetGValue(pwc->clearColorRef), 

+			      GetBValue(pwc->clearColorRef));

+		memset(pwfb->pbPixels, bColor, 

+		       pwfb->ScanWidth * height);

+		done = 1;

+		break;

+	    case 2:

+		wColor = BGR16(GetRValue(pwc->clearColorRef), 

+			       GetGValue(pwc->clearColorRef), 

+			       GetBValue(pwc->clearColorRef)); 

+		if (((wColor >> 8) & 0xff) == (wColor & 0xff)) {

+		    memset(pwfb->pbPixels, wColor & 0xff, 

+			   pwfb->ScanWidth * height);

+		    done = 1;

+		}

+		break;

+	    case 3:

+		/* fall through */

+	    case 4:

+		if (GetRValue(pwc->clearColorRef) == 

+		    GetGValue(pwc->clearColorRef) &&

+		    GetRValue(pwc->clearColorRef) == 

+		    GetBValue(pwc->clearColorRef)) {

+		    memset(pwfb->pbPixels, 

+			   GetRValue(pwc->clearColorRef), 

+			   pwfb->ScanWidth * height);

+		    done = 1;

+		}

+		break;

+	    default:

+		break;

+	    }

+	} /* all */

+

+	if (!done) {

+	    /* Need to clear a row at a time.  Begin by setting the first

+	     * row in the area to be cleared to the clear color. */

+	    

+	    clearRow = pwfb->pbPixels + 

+		pwfb->ScanWidth * FLIP(y) +

+		bytesPerPixel * x; 

+	    switch (bytesPerPixel) {

+	    case 1:

+		lpb = clearRow;

+		bColor = BGR8(GetRValue(pwc->clearColorRef), 

+			      GetGValue(pwc->clearColorRef), 

+			      GetBValue(pwc->clearColorRef));

+		memset(lpb, bColor, width);

+		break;

+	    case 2:

+		lpw = (LPWORD)clearRow;

+		wColor = BGR16(GetRValue(pwc->clearColorRef), 

+			       GetGValue(pwc->clearColorRef), 

+			       GetBValue(pwc->clearColorRef)); 

+		for (i=0; i<width; i++)

+		    *lpw++ = wColor;

+		break;

+	    case 3: 

+		lpb = clearRow;

+		r = GetRValue(pwc->clearColorRef); 

+		g = GetGValue(pwc->clearColorRef); 

+		b = GetBValue(pwc->clearColorRef); 

+		for (i=0; i<width; i++) {

+		    *lpb++ = b; 

+		    *lpb++ = g; 

+		    *lpb++ = r; 

+		} 

+		break;

+	    case 4: 

+		lpdw = (LPDWORD)clearRow; 

+		dwColor = BGR32(GetRValue(pwc->clearColorRef), 

+				GetGValue(pwc->clearColorRef), 

+				GetBValue(pwc->clearColorRef)); 

+		for (i=0; i<width; i++)

+		    *lpdw++ = dwColor;

+		break;

+	    default:

+		break;

+	    } /* switch */

+	    

+	    /* copy cleared row to other rows in buffer */

+	    lpb = clearRow - pwfb->ScanWidth;

+	    rowSize = width * bytesPerPixel;

+	    for (i=1; i<height; i++) { 

+		memcpy(lpb, clearRow, rowSize); 

+		lpb -= pwfb->ScanWidth; 

+	    } 

+	} /* not done */

+	mask &= ~BUFFER_BIT_BACK_LEFT;

+    } /* back buffer */ 

+

+    /* front buffer */

+    if (mask & BUFFER_BIT_FRONT_LEFT) { 

+	HDC DC = pwc->hDC; 

+	HPEN Old_Pen = SelectObject(DC, pwc->clearPen); 

+	HBRUSH Old_Brush = SelectObject(DC, pwc->clearBrush);

+	Rectangle(DC,

+		  x,

+		  FLIP(y) + 1,

+		  x + width + 1,

+		  FLIP(y) - height + 1);

+	SelectObject(DC, Old_Pen); 

+	SelectObject(DC, Old_Brush); 

+	mask &= ~BUFFER_BIT_FRONT_LEFT;

+    } /* front buffer */ 

+    

+    /* Call swrast if there is anything left to clear (like DEPTH) */ 

+    if (mask) 

+	_swrast_Clear(ctx, mask);

+  

+#undef FLIP

+} 

+

+

+/**********************************************************************/

+/*****                   PIXEL Functions                          *****/

+/**********************************************************************/

+

+#define FLIP(Y)  (rb->Height - (Y) - 1)

+

+

+/**

+ ** Front Buffer reading/writing

+ ** These are slow, but work with all non-indexed visual types.

+ **/

+

+/* Write a horizontal span of RGBA color pixels with a boolean mask. */

+static void write_rgba_span_front(const struct gl_context *ctx, 

+				   struct gl_renderbuffer *rb, 

+				   GLuint n, GLint x, GLint y,

+				   const GLubyte rgba[][4], 

+				   const GLubyte mask[] )

+{

+   WMesaContext pwc = wmesa_context(ctx);

+   WMesaFramebuffer pwfb = wmesa_lookup_framebuffer(pwc->hDC);

+   CONST BITMAPINFO bmi=

+   {

+      {

+         sizeof(BITMAPINFOHEADER),

+         n, 1, 1, 32, BI_RGB, 0, 1, 1, 0, 0

+      }

+   };

+   HBITMAP bmp=0;

+   HDC mdc=0;

+   typedef union

+   {

+      unsigned i;

+      struct {

+         unsigned b:8, g:8, r:8, a:8;

+      };

+   } BGRA;

+   BGRA *bgra, c;

+   GLuint i;

+

+   if (n < 16) {   // the value 16 is just guessed

+      y=FLIP(y);

+      if (mask) {

+         for (i=0; i<n; i++)

+            if (mask[i])

+               SetPixel(pwc->hDC, x+i, y,

+                        RGB(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]));

+      }

+      else {

+         for (i=0; i<n; i++)

+            SetPixel(pwc->hDC, x+i, y,

+                     RGB(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]));

+      }

+   }

+   else {

+      if (!pwfb) {

+         _mesa_problem(NULL, "wmesa: write_rgba_span_front on unknown hdc");

+         return;

+      }

+      bgra=malloc(n*sizeof(BGRA));

+      if (!bgra) {

+         _mesa_problem(NULL, "wmesa: write_rgba_span_front: out of memory");

+         return;

+      }

+      c.a=0;

+      if (mask) {

+         for (i=0; i<n; i++) {

+            if (mask[i]) {

+               c.r=rgba[i][RCOMP];

+               c.g=rgba[i][GCOMP];

+               c.b=rgba[i][BCOMP];

+               c.a=rgba[i][ACOMP];

+               bgra[i]=c;

+            }

+            else

+               bgra[i].i=0;

+         }

+      }

+      else {

+         for (i=0; i<n; i++) {

+            c.r=rgba[i][RCOMP];

+            c.g=rgba[i][GCOMP];

+            c.b=rgba[i][BCOMP];

+            c.a=rgba[i][ACOMP];

+            bgra[i]=c;

+         }

+      }

+      bmp=CreateBitmap(n, 1,  1, 32, bgra);

+      mdc=CreateCompatibleDC(pwfb->hDC);

+      SelectObject(mdc, bmp);

+      y=FLIP(y);

+      BitBlt(pwfb->hDC, x, y, n, 1, mdc, 0, 0, SRCCOPY);

+      SelectObject(mdc, 0);

+      DeleteObject(bmp);

+      DeleteDC(mdc);

+      free(bgra);

+   }

+}

+

+/* Write a horizontal span of RGB color pixels with a boolean mask. */

+static void write_rgb_span_front(const struct gl_context *ctx, 

+				  struct gl_renderbuffer *rb, 

+				  GLuint n, GLint x, GLint y,

+				  const GLubyte rgb[][3], 

+				  const GLubyte mask[] )

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    GLuint i;

+    

+    (void) ctx;

+    y=FLIP(y);

+    if (mask) {

+	for (i=0; i<n; i++)

+	    if (mask[i])

+		SetPixel(pwc->hDC, x+i, y, RGB(rgb[i][RCOMP], rgb[i][GCOMP], 

+					       rgb[i][BCOMP]));

+    }

+    else {

+	for (i=0; i<n; i++)

+	    SetPixel(pwc->hDC, x+i, y, RGB(rgb[i][RCOMP], rgb[i][GCOMP], 

+					   rgb[i][BCOMP]));

+    }

+    

+}

+

+/*

+ * Write a horizontal span of pixels with a boolean mask.  The current color

+ * is used for all pixels.

+ */

+static void write_mono_rgba_span_front(const struct gl_context *ctx, 

+					struct gl_renderbuffer *rb,

+					GLuint n, GLint x, GLint y,

+					const GLchan color[4], 

+					const GLubyte mask[])

+{

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    COLORREF colorref;

+

+    (void) ctx;

+    colorref = RGB(color[RCOMP], color[GCOMP], color[BCOMP]);

+    y=FLIP(y);

+    if (mask) {

+	for (i=0; i<n; i++)

+	    if (mask[i])

+		SetPixel(pwc->hDC, x+i, y, colorref);

+    }

+    else

+	for (i=0; i<n; i++)

+	    SetPixel(pwc->hDC, x+i, y, colorref);

+

+}

+

+/* Write an array of RGBA pixels with a boolean mask. */

+static void write_rgba_pixels_front(const struct gl_context *ctx, 

+				     struct gl_renderbuffer *rb,

+				     GLuint n, 

+				     const GLint x[], const GLint y[],

+				     const GLubyte rgba[][4], 

+				     const GLubyte mask[] )

+{

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    (void) ctx;

+    for (i=0; i<n; i++)

+	if (mask[i])

+	    SetPixel(pwc->hDC, x[i], FLIP(y[i]), 

+		     RGB(rgba[i][RCOMP], rgba[i][GCOMP], 

+			 rgba[i][BCOMP]));

+}

+

+

+

+/*

+ * Write an array of pixels with a boolean mask.  The current color

+ * is used for all pixels.

+ */

+static void write_mono_rgba_pixels_front(const struct gl_context *ctx, 

+					  struct gl_renderbuffer *rb,

+					  GLuint n,

+					  const GLint x[], const GLint y[],

+					  const GLchan color[4],

+					  const GLubyte mask[] )

+{

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    COLORREF colorref;

+    (void) ctx;

+    colorref = RGB(color[RCOMP], color[GCOMP], color[BCOMP]);

+    for (i=0; i<n; i++)

+	if (mask[i])

+	    SetPixel(pwc->hDC, x[i], FLIP(y[i]), colorref);

+}

+

+/* Read a horizontal span of color pixels. */

+static void read_rgba_span_front(const struct gl_context *ctx, 

+				  struct gl_renderbuffer *rb,

+				  GLuint n, GLint x, GLint y,

+				  GLubyte rgba[][4] )

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    GLuint i;

+    COLORREF Color;

+    y = FLIP(y);

+    for (i=0; i<n; i++) {

+	Color = GetPixel(pwc->hDC, x+i, y);

+	rgba[i][RCOMP] = GetRValue(Color);

+	rgba[i][GCOMP] = GetGValue(Color);

+	rgba[i][BCOMP] = GetBValue(Color);

+	rgba[i][ACOMP] = 255;

+    }

+}

+

+

+/* Read an array of color pixels. */

+static void read_rgba_pixels_front(const struct gl_context *ctx, 

+				    struct gl_renderbuffer *rb,

+				    GLuint n, const GLint x[], const GLint y[],

+				    GLubyte rgba[][4])

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    GLuint i;

+    COLORREF Color;

+    for (i=0; i<n; i++) {

+        GLint y2 = FLIP(y[i]);

+        Color = GetPixel(pwc->hDC, x[i], y2);

+        rgba[i][RCOMP] = GetRValue(Color);

+        rgba[i][GCOMP] = GetGValue(Color);

+        rgba[i][BCOMP] = GetBValue(Color);

+        rgba[i][ACOMP] = 255;

+    }

+}

+

+/*********************************************************************/

+

+/* DOUBLE BUFFER 32-bit */

+

+#define WMSETPIXEL32(pwc, y, x, r, g, b) { \

+LPDWORD lpdw = ((LPDWORD)((pwc)->pbPixels + (pwc)->ScanWidth * (y)) + (x)); \

+*lpdw = BGR32((r),(g),(b)); }

+

+

+

+/* Write a horizontal span of RGBA color pixels with a boolean mask. */

+static void write_rgba_span_32(const struct gl_context *ctx, 

+			       struct gl_renderbuffer *rb, 

+			       GLuint n, GLint x, GLint y,

+			       const GLubyte rgba[][4], 

+			       const GLubyte mask[] )

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    GLuint i;

+    LPDWORD lpdw;

+

+    (void) ctx;

+    

+    y=FLIP(y);

+    lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;

+    if (mask) {

+	for (i=0; i<n; i++)

+	    if (mask[i])

+                lpdw[i] = BGR32(rgba[i][RCOMP], rgba[i][GCOMP], 

+				rgba[i][BCOMP]);

+    }

+    else {

+	for (i=0; i<n; i++)

+                *lpdw++ = BGR32(rgba[i][RCOMP], rgba[i][GCOMP], 

+				rgba[i][BCOMP]);

+    }

+}

+

+

+/* Write a horizontal span of RGB color pixels with a boolean mask. */

+static void write_rgb_span_32(const struct gl_context *ctx, 

+			      struct gl_renderbuffer *rb, 

+			      GLuint n, GLint x, GLint y,

+			      const GLubyte rgb[][3], 

+			      const GLubyte mask[] )

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    GLuint i;

+    LPDWORD lpdw;

+

+    (void) ctx;

+    

+    y=FLIP(y);

+    lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;

+    if (mask) {

+	for (i=0; i<n; i++)

+	    if (mask[i])

+                lpdw[i] = BGR32(rgb[i][RCOMP], rgb[i][GCOMP], 

+				rgb[i][BCOMP]);

+    }

+    else {

+	for (i=0; i<n; i++)

+                *lpdw++ = BGR32(rgb[i][RCOMP], rgb[i][GCOMP], 

+				rgb[i][BCOMP]);

+    }

+}

+

+/*

+ * Write a horizontal span of pixels with a boolean mask.  The current color

+ * is used for all pixels.

+ */

+static void write_mono_rgba_span_32(const struct gl_context *ctx, 

+				    struct gl_renderbuffer *rb,

+				    GLuint n, GLint x, GLint y,

+				    const GLchan color[4], 

+				    const GLubyte mask[])

+{

+    LPDWORD lpdw;

+    DWORD pixel;

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;

+    y=FLIP(y);

+    pixel = BGR32(color[RCOMP], color[GCOMP], color[BCOMP]);

+    if (mask) {

+	for (i=0; i<n; i++)

+	    if (mask[i])

+                lpdw[i] = pixel;

+    }

+    else

+	for (i=0; i<n; i++)

+                *lpdw++ = pixel;

+

+}

+

+/* Write an array of RGBA pixels with a boolean mask. */

+static void write_rgba_pixels_32(const struct gl_context *ctx, 

+				 struct gl_renderbuffer *rb,

+				 GLuint n, const GLint x[], const GLint y[],

+				 const GLubyte rgba[][4], 

+				 const GLubyte mask[])

+{

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    for (i=0; i<n; i++)

+	if (mask[i])

+	    WMSETPIXEL32(pwfb, FLIP(y[i]), x[i],

+			 rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);

+}

+

+/*

+ * Write an array of pixels with a boolean mask.  The current color

+ * is used for all pixels.

+ */

+static void write_mono_rgba_pixels_32(const struct gl_context *ctx, 

+				      struct gl_renderbuffer *rb,

+				      GLuint n,

+				      const GLint x[], const GLint y[],

+				      const GLchan color[4],

+				      const GLubyte mask[])

+{

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    for (i=0; i<n; i++)

+	if (mask[i])

+	    WMSETPIXEL32(pwfb, FLIP(y[i]),x[i],color[RCOMP],

+			 color[GCOMP], color[BCOMP]);

+}

+

+/* Read a horizontal span of color pixels. */

+static void read_rgba_span_32(const struct gl_context *ctx, 

+			      struct gl_renderbuffer *rb,

+			      GLuint n, GLint x, GLint y,

+			      GLubyte rgba[][4] )

+{

+    GLuint i;

+    DWORD pixel;

+    LPDWORD lpdw;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    

+    y = FLIP(y);

+    lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;

+    for (i=0; i<n; i++) {

+	pixel = lpdw[i];

+	rgba[i][RCOMP] = (GLubyte)((pixel & 0x00ff0000) >> 16);

+	rgba[i][GCOMP] = (GLubyte)((pixel & 0x0000ff00) >> 8);

+	rgba[i][BCOMP] = (GLubyte)(pixel & 0x000000ff);

+	rgba[i][ACOMP] = 255;

+    }

+}

+

+

+/* Read an array of color pixels. */

+static void read_rgba_pixels_32(const struct gl_context *ctx, 

+				struct gl_renderbuffer *rb,

+				GLuint n, const GLint x[], const GLint y[],

+				GLubyte rgba[][4])

+{

+    GLuint i;

+    DWORD pixel;

+    LPDWORD lpdw;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+

+    for (i=0; i<n; i++) {

+	GLint y2 = FLIP(y[i]);

+	lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y2)) + x[i];

+	pixel = *lpdw;

+	rgba[i][RCOMP] = (GLubyte)((pixel & 0x00ff0000) >> 16);

+	rgba[i][GCOMP] = (GLubyte)((pixel & 0x0000ff00) >> 8);

+	rgba[i][BCOMP] = (GLubyte)(pixel & 0x000000ff);

+	rgba[i][ACOMP] = 255;

+  }

+}

+

+

+/*********************************************************************/

+

+/* DOUBLE BUFFER 24-bit */

+

+#define WMSETPIXEL24(pwc, y, x, r, g, b) { \

+LPBYTE lpb = ((LPBYTE)((pwc)->pbPixels + (pwc)->ScanWidth * (y)) + (3 * x)); \

+lpb[0] = (b); \

+lpb[1] = (g); \

+lpb[2] = (r); }

+

+/* Write a horizontal span of RGBA color pixels with a boolean mask. */

+static void write_rgba_span_24(const struct gl_context *ctx, 

+			       struct gl_renderbuffer *rb, 

+			       GLuint n, GLint x, GLint y,

+			       const GLubyte rgba[][4], 

+			       const GLubyte mask[] )

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    GLuint i;

+    LPBYTE lpb;

+

+    (void) ctx;

+    

+    y=FLIP(y);

+    lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y)) + (3 * x);

+    if (mask) {

+	for (i=0; i<n; i++)

+	    if (mask[i]) {

+                lpb[3*i] = rgba[i][BCOMP];

+                lpb[3*i+1] = rgba[i][GCOMP];

+                lpb[3*i+2] = rgba[i][RCOMP];

+	    }

+    }

+    else {

+	    for (i=0; i<n; i++) {

+            *lpb++ = rgba[i][BCOMP];

+            *lpb++ = rgba[i][GCOMP];

+            *lpb++ = rgba[i][RCOMP];

+	    }

+    }

+}

+

+

+/* Write a horizontal span of RGB color pixels with a boolean mask. */

+static void write_rgb_span_24(const struct gl_context *ctx, 

+			      struct gl_renderbuffer *rb, 

+			      GLuint n, GLint x, GLint y,

+			      const GLubyte rgb[][3], 

+			      const GLubyte mask[] )

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    GLuint i;

+    LPBYTE lpb;

+

+    (void) ctx;

+    

+    y=FLIP(y);

+    lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y)) + (3 * x);

+    if (mask) {

+	for (i=0; i<n; i++)

+	    if (mask[i]) {

+            lpb[3*i] = rgb[i][BCOMP];

+            lpb[3*i+1] = rgb[i][GCOMP];

+            lpb[3*i+2] = rgb[i][RCOMP];

+	    }

+    }

+    else {

+    	for (i=0; i<n; i++) {

+    		*lpb++ = rgb[i][BCOMP];

+    		*lpb++ = rgb[i][GCOMP];

+    		*lpb++ = rgb[i][RCOMP];

+    	}

+    }

+}

+

+/*

+ * Write a horizontal span of pixels with a boolean mask.  The current color

+ * is used for all pixels.

+ */

+static void write_mono_rgba_span_24(const struct gl_context *ctx, 

+				    struct gl_renderbuffer *rb,

+				    GLuint n, GLint x, GLint y,

+				    const GLchan color[4], 

+				    const GLubyte mask[])

+{

+    LPBYTE lpb;

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y)) + (3 * x);

+    y=FLIP(y);

+    if (mask) {

+	for (i=0; i<n; i++)

+	    if (mask[i]) {

+	    	lpb[3*i] = color[BCOMP];

+	    	lpb[3*i+1] = color[GCOMP];

+	    	lpb[3*i+2] = color[RCOMP];

+	    }

+    }

+    else

+	for (i=0; i<n; i++) {

+		*lpb++ = color[BCOMP];

+		*lpb++ = color[GCOMP];

+		*lpb++ = color[RCOMP];		

+	}

+}

+

+/* Write an array of RGBA pixels with a boolean mask. */

+static void write_rgba_pixels_24(const struct gl_context *ctx, 

+				 struct gl_renderbuffer *rb,

+				 GLuint n, const GLint x[], const GLint y[],

+				 const GLubyte rgba[][4], 

+				 const GLubyte mask[])

+{

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    for (i=0; i<n; i++)

+	if (mask[i])

+	    WMSETPIXEL24(pwfb, FLIP(y[i]), x[i],

+			 rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);

+}

+

+/*

+ * Write an array of pixels with a boolean mask.  The current color

+ * is used for all pixels.

+ */

+static void write_mono_rgba_pixels_24(const struct gl_context *ctx, 

+				      struct gl_renderbuffer *rb,

+				      GLuint n,

+				      const GLint x[], const GLint y[],

+				      const GLchan color[4],

+				      const GLubyte mask[])

+{

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    for (i=0; i<n; i++)

+	if (mask[i])

+	    WMSETPIXEL24(pwfb, FLIP(y[i]),x[i],color[RCOMP],

+			 color[GCOMP], color[BCOMP]);

+}

+

+/* Read a horizontal span of color pixels. */

+static void read_rgba_span_24(const struct gl_context *ctx, 

+			      struct gl_renderbuffer *rb,

+			      GLuint n, GLint x, GLint y,

+			      GLubyte rgba[][4] )

+{

+    GLuint i;

+    LPBYTE lpb;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    

+    y = FLIP(y);

+    lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y)) + (3 * x);

+    for (i=0; i<n; i++) {

+	rgba[i][RCOMP] = lpb[3*i+2];

+	rgba[i][GCOMP] = lpb[3*i+1];

+	rgba[i][BCOMP] = lpb[3*i];

+	rgba[i][ACOMP] = 255;

+    }

+}

+

+

+/* Read an array of color pixels. */

+static void read_rgba_pixels_24(const struct gl_context *ctx, 

+				struct gl_renderbuffer *rb,

+				GLuint n, const GLint x[], const GLint y[],

+				GLubyte rgba[][4])

+{

+    GLuint i;

+    LPBYTE lpb;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+

+    for (i=0; i<n; i++) {

+	GLint y2 = FLIP(y[i]);

+	lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y2)) + (3 * x[i]);

+	rgba[i][RCOMP] = lpb[3*i+2];

+	rgba[i][GCOMP] = lpb[3*i+1];

+	rgba[i][BCOMP] = lpb[3*i];

+	rgba[i][ACOMP] = 255;

+  }

+}

+

+

+/*********************************************************************/

+

+/* DOUBLE BUFFER 16-bit */

+

+#define WMSETPIXEL16(pwc, y, x, r, g, b) { \

+LPWORD lpw = ((LPWORD)((pwc)->pbPixels + (pwc)->ScanWidth * (y)) + (x)); \

+*lpw = BGR16((r),(g),(b)); }

+

+

+

+/* Write a horizontal span of RGBA color pixels with a boolean mask. */

+static void write_rgba_span_16(const struct gl_context *ctx, 

+			       struct gl_renderbuffer *rb, 

+			       GLuint n, GLint x, GLint y,

+			       const GLubyte rgba[][4], 

+			       const GLubyte mask[] )

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    GLuint i;

+    LPWORD lpw;

+

+    (void) ctx;

+    

+    y=FLIP(y);

+    lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;

+    if (mask) {

+	for (i=0; i<n; i++)

+	    if (mask[i])

+                lpw[i] = BGR16(rgba[i][RCOMP], rgba[i][GCOMP], 

+			       rgba[i][BCOMP]);

+    }

+    else {

+	for (i=0; i<n; i++)

+                *lpw++ = BGR16(rgba[i][RCOMP], rgba[i][GCOMP], 

+			       rgba[i][BCOMP]);

+    }

+}

+

+

+/* Write a horizontal span of RGB color pixels with a boolean mask. */

+static void write_rgb_span_16(const struct gl_context *ctx, 

+			      struct gl_renderbuffer *rb, 

+			      GLuint n, GLint x, GLint y,

+			      const GLubyte rgb[][3], 

+			      const GLubyte mask[] )

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    GLuint i;

+    LPWORD lpw;

+

+    (void) ctx;

+    

+    y=FLIP(y);

+    lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;

+    if (mask) {

+	for (i=0; i<n; i++)

+	    if (mask[i])

+                lpw[i] = BGR16(rgb[i][RCOMP], rgb[i][GCOMP], 

+			       rgb[i][BCOMP]);

+    }

+    else {

+	for (i=0; i<n; i++)

+                *lpw++ = BGR16(rgb[i][RCOMP], rgb[i][GCOMP], 

+			       rgb[i][BCOMP]);

+    }

+}

+

+/*

+ * Write a horizontal span of pixels with a boolean mask.  The current color

+ * is used for all pixels.

+ */

+static void write_mono_rgba_span_16(const struct gl_context *ctx, 

+				    struct gl_renderbuffer *rb,

+				    GLuint n, GLint x, GLint y,

+				    const GLchan color[4], 

+				    const GLubyte mask[])

+{

+    LPWORD lpw;

+    WORD pixel;

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    (void) ctx;

+    lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;

+    y=FLIP(y);

+    pixel = BGR16(color[RCOMP], color[GCOMP], color[BCOMP]);

+    if (mask) {

+	for (i=0; i<n; i++)

+	    if (mask[i])

+                lpw[i] = pixel;

+    }

+    else

+	for (i=0; i<n; i++)

+                *lpw++ = pixel;

+

+}

+

+/* Write an array of RGBA pixels with a boolean mask. */

+static void write_rgba_pixels_16(const struct gl_context *ctx, 

+				 struct gl_renderbuffer *rb,

+				 GLuint n, const GLint x[], const GLint y[],

+				 const GLubyte rgba[][4], 

+				 const GLubyte mask[])

+{

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    (void) ctx;

+    for (i=0; i<n; i++)

+	if (mask[i])

+	    WMSETPIXEL16(pwfb, FLIP(y[i]), x[i],

+			 rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);

+}

+

+/*

+ * Write an array of pixels with a boolean mask.  The current color

+ * is used for all pixels.

+ */

+static void write_mono_rgba_pixels_16(const struct gl_context *ctx, 

+				      struct gl_renderbuffer *rb,

+				      GLuint n,

+				      const GLint x[], const GLint y[],

+				      const GLchan color[4],

+				      const GLubyte mask[])

+{

+    GLuint i;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    (void) ctx;

+    for (i=0; i<n; i++)

+	if (mask[i])

+	    WMSETPIXEL16(pwfb, FLIP(y[i]),x[i],color[RCOMP],

+			 color[GCOMP], color[BCOMP]);

+}

+

+/* Read a horizontal span of color pixels. */

+static void read_rgba_span_16(const struct gl_context *ctx, 

+			      struct gl_renderbuffer *rb,

+			      GLuint n, GLint x, GLint y,

+			      GLubyte rgba[][4] )

+{

+    GLuint i, pixel;

+    LPWORD lpw;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+    

+    y = FLIP(y);

+    lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;

+    for (i=0; i<n; i++) {

+	pixel = lpw[i];

+	/* Windows uses 5,5,5 for 16-bit */

+	rgba[i][RCOMP] = (pixel & 0x7c00) >> 7;

+	rgba[i][GCOMP] = (pixel & 0x03e0) >> 2;

+	rgba[i][BCOMP] = (pixel & 0x001f) << 3;

+	rgba[i][ACOMP] = 255;

+    }

+}

+

+

+/* Read an array of color pixels. */

+static void read_rgba_pixels_16(const struct gl_context *ctx, 

+				struct gl_renderbuffer *rb,

+				GLuint n, const GLint x[], const GLint y[],

+				GLubyte rgba[][4])

+{

+    GLuint i, pixel;

+    LPWORD lpw;

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

+

+    for (i=0; i<n; i++) {

+	GLint y2 = FLIP(y[i]);

+	lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y2)) + x[i];

+	pixel = *lpw;

+	/* Windows uses 5,5,5 for 16-bit */

+	rgba[i][RCOMP] = (pixel & 0x7c00) >> 7;

+	rgba[i][GCOMP] = (pixel & 0x03e0) >> 2;

+	rgba[i][BCOMP] = (pixel & 0x001f) << 3;

+	rgba[i][ACOMP] = 255;

+  }

+}

+

+

+

+

+/**********************************************************************/

+/*****                   BUFFER Functions                         *****/

+/**********************************************************************/

+

+

+

+

+static void

+wmesa_delete_renderbuffer(struct gl_renderbuffer *rb)

+{

+    free(rb);

+}

+

+

+/**

+ * This is called by Mesa whenever it determines that the window size

+ * has changed.  Do whatever's needed to cope with that.

+ */

+static GLboolean

+wmesa_renderbuffer_storage(struct gl_context *ctx, 

+			   struct gl_renderbuffer *rb,

+			   GLenum internalFormat, 

+			   GLuint width, 

+			   GLuint height)

+{

+    rb->Width = width;

+    rb->Height = height;

+    return GL_TRUE;

+}

+

+

+/**

+ * Plug in the Get/PutRow/Values functions for a renderbuffer depending

+ * on if we're drawing to the front or back color buffer.

+ */

+void wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,

+                                  int cColorBits, int double_buffer)

+{

+    if (double_buffer) {

+        /* back buffer */

+	/* Picking the correct span functions is important because

+	 * the DIB was allocated with the indicated depth. */

+	switch(pixelformat) {

+	case PF_5R6G5B:

+	    rb->PutRow = write_rgba_span_16;

+	    rb->PutRowRGB = write_rgb_span_16;

+	    rb->PutMonoRow = write_mono_rgba_span_16;

+	    rb->PutValues = write_rgba_pixels_16;

+	    rb->PutMonoValues = write_mono_rgba_pixels_16;

+	    rb->GetRow = read_rgba_span_16;

+	    rb->GetValues = read_rgba_pixels_16;

+	    break;

+	case PF_8R8G8B:

+		if (cColorBits == 24)

+		{

+		    rb->PutRow = write_rgba_span_24;

+		    rb->PutRowRGB = write_rgb_span_24;

+		    rb->PutMonoRow = write_mono_rgba_span_24;

+		    rb->PutValues = write_rgba_pixels_24;

+		    rb->PutMonoValues = write_mono_rgba_pixels_24;

+		    rb->GetRow = read_rgba_span_24;

+		    rb->GetValues = read_rgba_pixels_24;

+		}

+		else

+		{

+	        rb->PutRow = write_rgba_span_32;

+	        rb->PutRowRGB = write_rgb_span_32;

+	        rb->PutMonoRow = write_mono_rgba_span_32;

+	        rb->PutValues = write_rgba_pixels_32;

+	        rb->PutMonoValues = write_mono_rgba_pixels_32;

+	        rb->GetRow = read_rgba_span_32;

+	        rb->GetValues = read_rgba_pixels_32;

+		}

+	    break;

+	default:

+	    break;

+	}

+    }

+    else {

+        /* front buffer (actual Windows window) */

+	rb->PutRow = write_rgba_span_front;

+	rb->PutRowRGB = write_rgb_span_front;

+	rb->PutMonoRow = write_mono_rgba_span_front;

+	rb->PutValues = write_rgba_pixels_front;

+	rb->PutMonoValues = write_mono_rgba_pixels_front;

+	rb->GetRow = read_rgba_span_front;

+	rb->GetValues = read_rgba_pixels_front;

+    }

+}

+

+/**

+ * Called by ctx->Driver.ResizeBuffers()

+ * Resize the front/back colorbuffers to match the latest window size.

+ */

+static void

+wmesa_resize_buffers(struct gl_context *ctx, struct gl_framebuffer *buffer,

+                     GLuint width, GLuint height)

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_framebuffer(buffer);

+

+    if (pwfb->Base.Width != width || pwfb->Base.Height != height) {

+	/* Realloc back buffer */

+	if (ctx->Visual.doubleBufferMode == 1) {

+	    wmDeleteBackingStore(pwfb);

+	    wmCreateBackingStore(pwfb, width, height);

+	}

+    }

+    _mesa_resize_framebuffer(ctx, buffer, width, height);

+}

+

+

+/**

+ * Called by glViewport.

+ * This is a good time for us to poll the current window size and adjust

+ * our renderbuffers to match the current window size.

+ * Remember, we have no opportunity to respond to conventional

+ * resize events since the driver has no event loop.

+ * Thus, we poll.

+ * MakeCurrent also ends up making a call here, so that ensures

+ * we get the viewport set correctly, even if the app does not call

+ * glViewport and relies on the defaults.

+ */

+static void wmesa_viewport(struct gl_context *ctx, 

+			   GLint x, GLint y, 

+			   GLsizei width, GLsizei height)

+{

+    WMesaContext pwc = wmesa_context(ctx);

+    GLuint new_width, new_height;

+

+    wmesa_get_buffer_size(ctx->WinSysDrawBuffer, &new_width, &new_height);

+

+    /**

+     * Resize buffers if the window size changed.

+     */

+    wmesa_resize_buffers(ctx, ctx->WinSysDrawBuffer, new_width, new_height);

+    ctx->NewState |= _NEW_BUFFERS;  /* to update scissor / window bounds */

+}

+

+

+

+

+/**

+ * Called when the driver should update it's state, based on the new_state

+ * flags.

+ */

+static void wmesa_update_state(struct gl_context *ctx, GLuint new_state)

+{

+    _swrast_InvalidateState(ctx, new_state);

+    _swsetup_InvalidateState(ctx, new_state);

+    _vbo_InvalidateState(ctx, new_state);

+    _tnl_InvalidateState(ctx, new_state);

+

+    /* TODO - This code is not complete yet because I 

+     * don't know what to do for all state updates.

+     */

+

+    if (new_state & _NEW_BUFFERS) {

+    }

+}

+

+

+

+

+

+/**********************************************************************/

+/*****                   WMESA Functions                          *****/

+/**********************************************************************/

+

+WMesaContext WMesaCreateContext(HDC hDC, 

+				HPALETTE* Pal,

+				GLboolean rgb_flag,

+				GLboolean db_flag,

+				GLboolean alpha_flag)

+{

+    WMesaContext c;

+    struct dd_function_table functions;

+    GLint red_bits, green_bits, blue_bits, alpha_bits;

+    struct gl_context *ctx;

+    struct gl_config *visual;

+

+    (void) Pal;

+    

+    /* Indexed mode not supported */

+    if (!rgb_flag)

+	return NULL;

+

+    /* Allocate wmesa context */

+    c = CALLOC_STRUCT(wmesa_context);

+    if (!c)

+	return NULL;

+

+#if 0

+    /* I do not understand this contributed code */

+    /* Support memory and device contexts */

+    if(WindowFromDC(hDC) != NULL) {

+	c->hDC = GetDC(WindowFromDC(hDC)); /* huh ???? */

+    }

+    else {

+	c->hDC = hDC;

+    }

+#else

+    c->hDC = hDC;

+#endif

+

+    /* Get data for visual */

+    /* Dealing with this is actually a bit of overkill because Mesa will end

+     * up treating all color component size requests less than 8 by using 

+     * a single byte per channel.  In addition, the interface to the span

+     * routines passes colors as an entire byte per channel anyway, so there

+     * is nothing to be saved by telling the visual to be 16 bits if the device

+     * is 16 bits.  That is, Mesa is going to compute colors down to 8 bits per

+     * channel anyway.

+     * But we go through the motions here anyway.

+     */

+    switch (GetDeviceCaps(c->hDC, BITSPIXEL)) {

+    case 16:

+	red_bits = green_bits = blue_bits = 5;

+	alpha_bits = 0;

+	break;

+    default:

+	red_bits = green_bits = blue_bits = 8;

+	alpha_bits = 8;

+	break;

+    }

+    /* Create visual based on flags */

+    visual = _mesa_create_visual(db_flag,    /* db_flag */

+                                 GL_FALSE,   /* stereo */

+                                 red_bits, green_bits, blue_bits, /* color RGB */

+                                 alpha_flag ? alpha_bits : 0, /* color A */

+                                 DEFAULT_SOFTWARE_DEPTH_BITS, /* depth_bits */

+                                 8,          /* stencil_bits */

+                                 16,16,16,   /* accum RGB */

+                                 alpha_flag ? 16 : 0, /* accum A */

+                                 1);         /* num samples */

+    

+    if (!visual) {

+	free(c);

+	return NULL;

+    }

+

+    /* Set up driver functions */

+    _mesa_init_driver_functions(&functions);

+    functions.GetString = wmesa_get_string;

+    functions.UpdateState = wmesa_update_state;

+    functions.GetBufferSize = wmesa_get_buffer_size;

+    functions.Flush = wmesa_flush;

+    functions.Clear = clear;

+    functions.ClearColor = clear_color;

+    functions.ResizeBuffers = wmesa_resize_buffers;

+    functions.Viewport = wmesa_viewport;

+

+    /* initialize the Mesa context data */

+    ctx = &c->gl_ctx;

+    _mesa_initialize_context(ctx, API_OPENGL, visual,

+                             NULL, &functions, (void *)c);

+

+    /* visual no longer needed - it was copied by _mesa_initialize_context() */

+    _mesa_destroy_visual(visual);

+

+    _mesa_enable_sw_extensions(ctx);

+    _mesa_enable_1_3_extensions(ctx);

+    _mesa_enable_1_4_extensions(ctx);

+    _mesa_enable_1_5_extensions(ctx);

+    _mesa_enable_2_0_extensions(ctx);

+    _mesa_enable_2_1_extensions(ctx);

+  

+    _mesa_meta_init(ctx);

+

+    /* Initialize the software rasterizer and helper modules. */

+    if (!_swrast_CreateContext(ctx) ||

+        !_vbo_CreateContext(ctx) ||

+        !_tnl_CreateContext(ctx) ||

+	!_swsetup_CreateContext(ctx)) {

+	_mesa_free_context_data(ctx);

+	free(c);

+	return NULL;

+    }

+    _swsetup_Wakeup(ctx);

+    TNL_CONTEXT(ctx)->Driver.RunPipeline = _tnl_run_pipeline;

+

+    return c;

+}

+

+

+void WMesaDestroyContext( WMesaContext pwc )

+{

+    struct gl_context *ctx = &pwc->gl_ctx;

+    WMesaFramebuffer pwfb;

+    GET_CURRENT_CONTEXT(cur_ctx);

+

+    if (cur_ctx == ctx) {

+        /* unbind current if deleting current context */

+        WMesaMakeCurrent(NULL, NULL);

+    }

+

+    /* clean up frame buffer resources */

+    pwfb = wmesa_lookup_framebuffer(pwc->hDC);

+    if (pwfb) {

+	if (ctx->Visual.doubleBufferMode == 1)

+	    wmDeleteBackingStore(pwfb);

+	wmesa_free_framebuffer(pwc->hDC);

+    }

+

+    /* Release for device, not memory contexts */

+    if (WindowFromDC(pwc->hDC) != NULL)

+    {

+      ReleaseDC(WindowFromDC(pwc->hDC), pwc->hDC);

+    }

+    DeleteObject(pwc->clearPen); 

+    DeleteObject(pwc->clearBrush); 

+    

+    _mesa_meta_free(ctx);

+

+    _swsetup_DestroyContext(ctx);

+    _tnl_DestroyContext(ctx);

+    _vbo_DestroyContext(ctx);

+    _swrast_DestroyContext(ctx);

+    

+    _mesa_free_context_data(ctx);

+    free(pwc);

+}

+

+

+/**

+ * Create a new color renderbuffer.

+ */

+struct gl_renderbuffer *

+wmesa_new_renderbuffer(void)

+{

+    struct gl_renderbuffer *rb = CALLOC_STRUCT(gl_renderbuffer);

+    if (!rb)

+        return NULL;

+

+    _mesa_init_renderbuffer(rb, (GLuint)0);

+    

+    rb->_BaseFormat = GL_RGBA;

+    rb->InternalFormat = GL_RGBA;

+    rb->DataType = CHAN_TYPE;

+    rb->Delete = wmesa_delete_renderbuffer;

+    rb->AllocStorage = wmesa_renderbuffer_storage;

+    return rb;

+}

+

+

+void WMesaMakeCurrent(WMesaContext c, HDC hdc)

+{

+    WMesaFramebuffer pwfb;

+

+    {

+        /* return if already current */

+        GET_CURRENT_CONTEXT(ctx);

+        WMesaContext pwc = wmesa_context(ctx);

+        if (pwc && c == pwc && pwc->hDC == hdc)

+            return;

+    }

+

+    pwfb = wmesa_lookup_framebuffer(hdc);

+

+    /* Lazy creation of framebuffers */

+    if (c && !pwfb && hdc) {

+        struct gl_renderbuffer *rb;

+        struct gl_config *visual = &c->gl_ctx.Visual;

+        GLuint width, height;

+

+        get_window_size(hdc, &width, &height);

+

+	c->clearPen = CreatePen(PS_SOLID, 1, 0); 

+	c->clearBrush = CreateSolidBrush(0); 

+

+        pwfb = wmesa_new_framebuffer(hdc, visual);

+

+	/* Create back buffer if double buffered */

+	if (visual->doubleBufferMode == 1) {

+	    wmCreateBackingStore(pwfb, width, height);

+	}

+	

+        /* make render buffers */

+        if (visual->doubleBufferMode == 1) {

+            rb = wmesa_new_renderbuffer();

+            _mesa_add_renderbuffer(&pwfb->Base, BUFFER_BACK_LEFT, rb);

+            wmesa_set_renderbuffer_funcs(rb, pwfb->pixelformat, pwfb->cColorBits, 1);

+	}

+        rb = wmesa_new_renderbuffer();

+        _mesa_add_renderbuffer(&pwfb->Base, BUFFER_FRONT_LEFT, rb);

+        wmesa_set_renderbuffer_funcs(rb, pwfb->pixelformat, pwfb->cColorBits, 0);

+

+	/* Let Mesa own the Depth, Stencil, and Accum buffers */

+        _mesa_add_soft_renderbuffers(&pwfb->Base,

+                                     GL_FALSE, /* color */

+                                     visual->depthBits > 0,

+                                     visual->stencilBits > 0,

+                                     visual->accumRedBits > 0,

+                                     visual->alphaBits >0, 

+                                     GL_FALSE);

+    }

+

+    if (c && pwfb)

+	_mesa_make_current(&c->gl_ctx, &pwfb->Base, &pwfb->Base);

+    else

+        _mesa_make_current(NULL, NULL, NULL);

+}

+

+

+void WMesaSwapBuffers( HDC hdc )

+{

+    GET_CURRENT_CONTEXT(ctx);

+    WMesaContext pwc = wmesa_context(ctx);

+    WMesaFramebuffer pwfb = wmesa_lookup_framebuffer(hdc);

+

+    if (!pwfb) {

+        _mesa_problem(NULL, "wmesa: swapbuffers on unknown hdc");

+        return;

+    }

+

+    /* If we're swapping the buffer associated with the current context

+     * we have to flush any pending rendering commands first.

+     */

+    if (pwc->hDC == hdc) {

+	_mesa_notifySwapBuffers(ctx);

+

+	BitBlt(pwfb->hDC, 0, 0, pwfb->Base.Width, pwfb->Base.Height,

+	       pwfb->dib_hDC, 0, 0, SRCCOPY);

+    }

+    else {

+        /* XXX for now only allow swapping current window */

+        _mesa_problem(NULL, "wmesa: can't swap non-current window");

+    }

+}

+

+void WMesaShareLists(WMesaContext ctx_to_share, WMesaContext ctx)

+{

+	_mesa_share_state(&ctx->gl_ctx, &ctx_to_share->gl_ctx);	

+}

+

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c b/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
index 9aedd2e3c..bc4839cfe 100644
--- a/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
@@ -1,2212 +1,2212 @@
-/****************************************************************************
-*
-*                        Mesa 3-D graphics library
-*                        Direct3D Driver Interface
-*
-*  ========================================================================
-*
-*   Copyright (C) 1991-2004 SciTech Software, Inc. All rights reserved.
-*
-*   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
-*   SCITECH SOFTWARE INC 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.
-*
-*  ======================================================================
-*
-* Language:     ANSI C
-* Environment:  Windows 9x (Win32)
-*
-* Description:  Context handling.
-*
-****************************************************************************/
-
-#include "dglcontext.h"
-
-// Get compile errors without this. KeithH
-//#include "scitech.h"	// ibool, etc.
-
-#ifdef _USE_GLD3_WGL
-#include "gld_driver.h"
-
-extern void _gld_mesa_warning(struct gl_context *, char *);
-extern void _gld_mesa_fatal(struct gl_context *, char *);
-#endif // _USE_GLD3_WGL
-
-// TODO: Clean out old DX6-specific code from GLD 2.x CAD driver
-// if it is no longer being built as part of GLDirect. (DaveM)
-
-// ***********************************************************************
-
-#define GLDERR_NONE     0
-#define GLDERR_MEM      1
-#define GLDERR_DDRAW    2
-#define GLDERR_D3D      3
-#define GLDERR_BPP      4
-
-char szResourceWarning[] =
-"GLDirect does not have enough video memory resources\n"
-"to support the requested OpenGL rendering context.\n\n"
-"You may have to reduce the current display resolution\n"
-"to obtain satisfactory OpenGL performance.\n";
-
-char szDDrawWarning[] =
-"GLDirect is unable to initialize DirectDraw for the\n"
-"requested OpenGL rendering context.\n\n"
-"You will have to check the DirectX control panel\n"
-"for further information.\n";
-
-char szD3DWarning[] =
-"GLDirect is unable to initialize Direct3D for the\n"
-"requested OpenGL rendering context.\n\n"
-"You may have to change the display mode resolution\n"
-"color depth or check the DirectX control panel for\n"
-"further information.\n";
-
-char szBPPWarning[] =
-"GLDirect is unable to use the selected color depth for\n"
-"the requested OpenGL rendering context.\n\n"
-"You will have to change the display mode resolution\n"
-"color depth with the Display Settings control panel.\n";
-
-int nContextError = GLDERR_NONE;
-
-// ***********************************************************************
-
-#define VENDORID_ATI 0x1002
-
-static DWORD devATIRagePro[] = {
-	0x4742, // 3D RAGE PRO BGA AGP 1X/2X
-	0x4744, // 3D RAGE PRO BGA AGP 1X only
-	0x4749, // 3D RAGE PRO BGA PCI 33 MHz
-	0x4750, // 3D RAGE PRO PQFP PCI 33 MHz
-	0x4751, // 3D RAGE PRO PQFP PCI 33 MHz limited 3D
-	0x4C42, // 3D RAGE LT PRO BGA-312 AGP 133 MHz
-	0x4C44, // 3D RAGE LT PRO BGA-312 AGP 66 MHz
-	0x4C49, // 3D RAGE LT PRO BGA-312 PCI 33 MHz
-	0x4C50, // 3D RAGE LT PRO BGA-256 PCI 33 MHz
-	0x4C51, // 3D RAGE LT PRO BGA-256 PCI 33 MHz limited 3D
-};
-
-static DWORD devATIRageIIplus[] = {
-	0x4755, // 3D RAGE II+
-	0x4756, // 3D RAGE IIC PQFP PCI
-	0x4757, // 3D RAGE IIC BGA AGP
-	0x475A, // 3D RAGE IIC PQFP AGP
-	0x4C47, // 3D RAGE LT-G
-};
-
-// ***********************************************************************
-
-#ifndef _USE_GLD3_WGL
-extern DGL_mesaFuncs mesaFuncs;
-#endif
-
-extern DWORD dwLogging;
-
-#ifdef GLD_THREADS
-#pragma message("compiling DGLCONTEXT.C vars for multi-threaded support")
-CRITICAL_SECTION CriticalSection;		// for serialized access
-DWORD		dwTLSCurrentContext = 0xFFFFFFFF;	// TLS index for current context
-DWORD		dwTLSPixelFormat = 0xFFFFFFFF;		// TLS index for current pixel format
-#endif
-HGLRC		iCurrentContext = 0;		// Index of current context (static)
-BOOL		bContextReady = FALSE;		// Context state ready ?
-
-DGL_ctx		ctxlist[DGL_MAX_CONTEXTS];	// Context list
-
-// ***********************************************************************
-
-static BOOL bHaveWin95 = FALSE;
-static BOOL bHaveWinNT = FALSE;
-static BOOL bHaveWin2K = FALSE;
-
-/****************************************************************************
-REMARKS:
-Detect the installed OS type.
-****************************************************************************/
-static void DetectOS(void)
-{
-    OSVERSIONINFO VersionInformation;
-    LPOSVERSIONINFO lpVersionInformation = &VersionInformation;
-
-    VersionInformation.dwOSVersionInfoSize = sizeof(VersionInformation);
-
-	GetVersionEx(lpVersionInformation);
-
-    switch (VersionInformation.dwPlatformId) {
-    	case VER_PLATFORM_WIN32_WINDOWS:
-			bHaveWin95 = TRUE;
-			bHaveWinNT = FALSE;
-			bHaveWin2K = FALSE;
-            break;
-    	case VER_PLATFORM_WIN32_NT:
-			bHaveWin95 = FALSE;
-			if (VersionInformation.dwMajorVersion <= 4) {
-				bHaveWinNT = TRUE;
-				bHaveWin2K = FALSE;
-                }
-            else {
-				bHaveWinNT = FALSE;
-				bHaveWin2K = TRUE;
-                }
-			break;
-		case VER_PLATFORM_WIN32s:
-			bHaveWin95 = FALSE;
-			bHaveWinNT = FALSE;
-			bHaveWin2K = FALSE;
-			break;
-        }
-}
-
-// ***********************************************************************
-
-HWND hWndEvent = NULL;					// event monitor window
-HWND hWndLastActive = NULL;				// last active client window
-LONG __stdcall GLD_EventWndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam);
-
-// ***********************************************************************
-
-// Checks if the HGLRC is valid in range of context list.
-BOOL dglIsValidContext(
-	HGLRC a)
-{
-	return ((int)a > 0 && (int)a <= DGL_MAX_CONTEXTS);
-}
-
-// ***********************************************************************
-
-// Convert a HGLRC to a pointer into the context list.
-DGL_ctx* dglGetContextAddress(
-	const HGLRC a)
-{
-	if (dglIsValidContext(a))
-		return &ctxlist[(int)a-1];
-	return NULL;
-}
-
-// ***********************************************************************
-
-// Return the current HGLRC (however it may be stored for multi-threading).
-HGLRC dglGetCurrentContext(void)
-{
-#ifdef GLD_THREADS
-	HGLRC hGLRC;
-	// load from thread-specific instance
-	if (glb.bMultiThreaded) {
-		// protect against calls from arbitrary threads
-		__try {
-			hGLRC = (HGLRC)TlsGetValue(dwTLSCurrentContext);
-		}
-		__except(EXCEPTION_EXECUTE_HANDLER) {
-			hGLRC = iCurrentContext;
-		}
-	}
-	// load from global static var
-	else {
-		hGLRC = iCurrentContext;
-	}
-	return hGLRC;
-#else
-	return iCurrentContext;
-#endif
-}
-
-// ***********************************************************************
-
-// Set the current HGLRC (however it may be stored for multi-threading).
-void dglSetCurrentContext(HGLRC hGLRC)
-{
-#ifdef GLD_THREADS
-	// store in thread-specific instance
-	if (glb.bMultiThreaded) {
-		// protect against calls from arbitrary threads
-		__try {
-			TlsSetValue(dwTLSCurrentContext, (LPVOID)hGLRC);
-		}
-		__except(EXCEPTION_EXECUTE_HANDLER) {
-			iCurrentContext = hGLRC;
-		}
-	}
-	// store in global static var
-	else {
-		iCurrentContext = hGLRC;
-	}
-#else
-	iCurrentContext = hGLRC;
-#endif
-}
-
-// ***********************************************************************
-
-// Return the current HDC only for a currently active HGLRC.
-HDC dglGetCurrentDC(void)
-{
-	HGLRC hGLRC;
-	DGL_ctx* lpCtx;
-
-	hGLRC = dglGetCurrentContext();
-	if (hGLRC) {
-		lpCtx = dglGetContextAddress(hGLRC);
-		return lpCtx->hDC;
-	}
-	return 0;
-}
-
-// ***********************************************************************
-
-void dglInitContextState()
-{
-	int i;
-	WNDCLASS wc;
-
-#ifdef GLD_THREADS
-	// Allocate thread local storage indexes for current context and pixel format
-	dwTLSCurrentContext = TlsAlloc();
-	dwTLSPixelFormat = TlsAlloc();
-#endif
-
-	dglSetCurrentContext(NULL); // No current rendering context
-
-	 // Clear all context data
-	ZeroMemory(ctxlist, sizeof(ctxlist[0]) * DGL_MAX_CONTEXTS);
-
-	for (i=0; i<DGL_MAX_CONTEXTS; i++)
-		ctxlist[i].bAllocated = FALSE; // Flag context as unused
-
-	// This section of code crashes the dll in circumstances where the app
-	// creates and destroys contexts.
-/*
-	// Register the class for our event monitor window
-	wc.style = 0;
-	wc.lpfnWndProc = GLD_EventWndProc;
-	wc.cbClsExtra = 0;
-	wc.cbWndExtra = 0;
-	wc.hInstance = GetModuleHandle(NULL);
-	wc.hIcon = LoadIcon(GetModuleHandle(NULL), IDI_APPLICATION);
-	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-	wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
-	wc.lpszMenuName = NULL;
-	wc.lpszClassName = "GLDIRECT";
-	RegisterClass(&wc);
-
-	// Create the non-visible window to monitor all broadcast messages
-	hWndEvent = CreateWindowEx(
-		WS_EX_TOOLWINDOW,"GLDIRECT","GLDIRECT",WS_POPUP,
-		0,0,0,0,
-		NULL,NULL,GetModuleHandle(NULL),NULL);
-*/
-
-#ifdef GLD_THREADS
-	// Create a critical section object for serializing access to
-	// DirectDraw and DDStereo create/destroy functions in multiple threads
-	if (glb.bMultiThreaded)
-		InitializeCriticalSection(&CriticalSection);
-#endif
-
-	// Context state is now initialized and ready
-	bContextReady = TRUE;
-}
-
-// ***********************************************************************
-
-void dglDeleteContextState()
-{
-	int i;
-	static BOOL bOnceIsEnough = FALSE;
-
-	// Only call once, from either DGL_exitDriver(), or DLL_PROCESS_DETACH
-	if (bOnceIsEnough)
-		return;
-	bOnceIsEnough = TRUE;
-
-	for (i=0; i<DGL_MAX_CONTEXTS; i++) {
-		if (ctxlist[i].bAllocated == TRUE) {
-			ddlogPrintf(DDLOG_WARN, "** Context %i not deleted - cleaning up.", (i+1));
-			dglDeleteContext((HGLRC)(i+1));
-		}
-	}
-
-	// Context state is no longer ready
-	bContextReady = FALSE;
-
-    // If executed when DLL unloads, DDraw objects may be invalid.
-    // So catch any page faults with this exception handler.
-__try {
-
-	// Release final DirectDraw interfaces
-	if (glb.bDirectDrawPersistant) {
-//		RELEASE(glb.lpGlobalPalette);
-//		RELEASE(glb.lpDepth4);
-//		RELEASE(glb.lpBack4);
-//		RELEASE(glb.lpPrimary4);
-//	    RELEASE(glb.lpDD4);
-    }
-}
-__except(EXCEPTION_EXECUTE_HANDLER) {
-    ddlogPrintf(DDLOG_WARN, "Exception raised in dglDeleteContextState.");
-}
-
-	// Destroy our event monitor window
-	if (hWndEvent) {
-		DestroyWindow(hWndEvent);
-		hWndEvent = hWndLastActive = NULL;
-	}
-
-#ifdef GLD_THREADS
-	// Destroy the critical section object
-	if (glb.bMultiThreaded)
-		DeleteCriticalSection(&CriticalSection);
-
-	// Release thread local storage indexes for current HGLRC and pixel format
-	TlsFree(dwTLSPixelFormat);
-	TlsFree(dwTLSCurrentContext);
-#endif
-}
-
-// ***********************************************************************
-
-// Application Window message handler interception
-static LONG __stdcall dglWndProc(
-	HWND hwnd,
-	UINT msg,
-	WPARAM wParam,
-	LPARAM lParam)
-{
-	DGL_ctx* 	lpCtx = NULL;
-	LONG 		lpfnWndProc = 0L;
-	int  		i;
-	HGLRC 		hGLRC;
-	RECT 		rect;
-	PAINTSTRUCT	ps;
-    BOOL        bQuit = FALSE;
-    BOOL        bMain = FALSE;
-    LONG        rc;
-
-    // Get the window's message handler *before* it is unhooked in WM_DESTROY
-
-    // Is this the main window?
-    if (hwnd == glb.hWndActive) {
-        bMain = TRUE;
-        lpfnWndProc = glb.lpfnWndProc;
-    }
-    // Search for DGL context matching window handle
-    for (i=0; i<DGL_MAX_CONTEXTS; i++) {
-	    if (ctxlist[i].hWnd == hwnd) {
-	        lpCtx = &ctxlist[i];
-	        lpfnWndProc = lpCtx->lpfnWndProc;
-		    break;
-        }
-    }
-	// Not one of ours...
-	if (!lpfnWndProc)
-	    return DefWindowProc(hwnd, msg, wParam, lParam);
-
-    // Intercept messages amd process *before* passing on to window
-	switch (msg) {
-#ifdef _USE_GLD3_WGL
-	case WM_DISPLAYCHANGE:
-		glb.bPixelformatsDirty = TRUE;
-		break;
-#endif
-	case WM_ACTIVATEAPP:
-		glb.bAppActive = (BOOL)wParam;
-		ddlogPrintf(DDLOG_INFO, "Calling app has been %s", glb.bAppActive ? "activated" : "de-activated");
-		break;
-	case WM_ERASEBKGND:
-		// Eat the GDI erase event for the GL window
-        if (!lpCtx || !lpCtx->bHasBeenCurrent)
-            break;
-		lpCtx->bGDIEraseBkgnd = TRUE;
-		return TRUE;
-	case WM_PAINT:
-		// Eat the invalidated update region if render scene is in progress
-        if (!lpCtx || !lpCtx->bHasBeenCurrent)
-            break;
-		if (lpCtx->bFrameStarted) {
-			if (GetUpdateRect(hwnd, &rect, FALSE)) {
-				BeginPaint(hwnd, &ps);
-				EndPaint(hwnd, &ps);
-				ValidateRect(hwnd, &rect);
-				return TRUE;
-				}
-			}
-		break;
-	}
-	// Call the appropriate window message handler
-	rc = CallWindowProc((WNDPROC)lpfnWndProc, hwnd, msg, wParam, lParam);
-
-    // Intercept messages and process *after* passing on to window
-	switch (msg) {
-    case WM_QUIT:
-	case WM_DESTROY:
-        bQuit = TRUE;
-		if (lpCtx && lpCtx->bAllocated) {
-			ddlogPrintf(DDLOG_WARN, "WM_DESTROY detected for HWND=%X, HDC=%X, HGLRC=%d", hwnd, lpCtx->hDC, i+1);
-			dglDeleteContext((HGLRC)(i+1));
-		}
-		break;
-#if 0
-	case WM_SIZE:
-		// Resize surfaces to fit window but not viewport (in case app did not bother)
-        if (!lpCtx || !lpCtx->bHasBeenCurrent)
-            break;
-		w = LOWORD(lParam);
-		h = HIWORD(lParam);
-		if (lpCtx->dwWidth < w || lpCtx->dwHeight < h) {
-			if (!dglWglResizeBuffers(lpCtx->glCtx, TRUE))
-                 dglWglResizeBuffers(lpCtx->glCtx, FALSE);
-        }
-		break;
-#endif
-    }
-
-    // If the main window is quitting, then so should we...
-    if (bMain && bQuit) {
-		ddlogPrintf(DDLOG_SYSTEM, "shutting down after WM_DESTROY detected for main HWND=%X", hwnd);
-        dglDeleteContextState();
-        dglExitDriver();
-    }
-
-    return rc;
-}
-
-// ***********************************************************************
-
-// Driver Window message handler
-static LONG __stdcall GLD_EventWndProc(
-	HWND hwnd,
-	UINT msg,
-	WPARAM wParam,
-	LPARAM lParam)
-{
-	switch (msg) {
-        // May be sent by splash screen dialog on exit
-        case WM_ACTIVATE:
-            if (LOWORD(wParam) == WA_ACTIVE && glb.hWndActive) {
-                SetForegroundWindow(glb.hWndActive);
-                return 0;
-                }
-            break;
-	}
-	return DefWindowProc(hwnd, msg, wParam, lParam);
-}
-
-// ***********************************************************************
-
-// Intercepted Keyboard handler for detecting hot keys.
-LRESULT CALLBACK dglKeyProc(
-	int code,
-	WPARAM wParam,
-	LPARAM lParam)
-{
-	HWND hWnd, hWndFrame;
-	HGLRC hGLRC = NULL;
-	DGL_ctx* lpCtx = NULL;
-	int cmd = 0, dx1 = 0, dx2 = 0, i;
-	static BOOL bAltPressed = FALSE;
-	static BOOL bCtrlPressed = FALSE;
-	static BOOL bShiftPressed = FALSE;
-    RECT r, rf, rc;
-    POINT pt;
-    BOOL bForceReshape = FALSE;
-
-	return CallNextHookEx(hKeyHook, code, wParam, lParam);
-}
-
-// ***********************************************************************
-
-HWND hWndMatch;
-
-// Window handle enumeration procedure.
-BOOL CALLBACK dglEnumChildProc(
-    HWND hWnd,
-    LPARAM lParam)
-{
-    RECT rect;
-
-    // Find window handle with matching client rect.
-    GetClientRect(hWnd, &rect);
-    if (EqualRect(&rect, (RECT*)lParam)) {
-        hWndMatch = hWnd;
-        return FALSE;
-        }
-    // Continue with next child window.
-    return TRUE;
-}
-
-// ***********************************************************************
-
-// Find window handle with matching client rect.
-HWND dglFindWindowRect(
-    RECT* pRect)
-{
-    hWndMatch = NULL;
-    EnumChildWindows(GetForegroundWindow(), dglEnumChildProc, (LPARAM)pRect);
-    return hWndMatch;
-}
-
-// ***********************************************************************
-#ifndef _USE_GLD3_WGL
-void dglChooseDisplayMode(
-	DGL_ctx *lpCtx)
-{
-	// Note: Choose an exact match if possible.
-
-	int				i;
-	DWORD			area;
-	DWORD			bestarea;
-	DDSURFACEDESC2	*lpDDSD		= NULL;	// Mode list pointer
-	DDSURFACEDESC2	*lpBestDDSD = NULL;	// Pointer to best
-
-	lpDDSD = glb.lpDisplayModes;
-	for (i=0; i<glb.nDisplayModeCount; i++, lpDDSD++) {
-		if ((lpDDSD->dwWidth == lpCtx->dwWidth) &&
-			(lpDDSD->dwHeight == lpCtx->dwHeight))
-			goto matched; // Mode has been exactly matched
-		// Choose modes that are larger in both dimensions than
-		// the window, but smaller in area than the current best.
-		if ( (lpDDSD->dwWidth >= lpCtx->dwWidth) &&
-			 (lpDDSD->dwHeight >= lpCtx->dwHeight))
-		{
-			if (lpBestDDSD == NULL) {
-				lpBestDDSD = lpDDSD;
-				bestarea = lpDDSD->dwWidth * lpDDSD->dwHeight;
-				continue;
-			}
-			area = lpDDSD->dwWidth * lpDDSD->dwHeight;
-			if (area < bestarea) {
-				lpBestDDSD = lpDDSD;
-				bestarea = area;
-			}
-		}
-	}
-
-	// Safety check
-	if (lpBestDDSD == NULL) {
-		ddlogMessage(DDLOG_CRITICAL, "dglChooseDisplayMode");
-		return;
-	}
-
-	lpCtx->dwModeWidth = lpBestDDSD->dwWidth;
-	lpCtx->dwModeHeight = lpBestDDSD->dwHeight;
-matched:
-	ddlogPrintf(DDLOG_INFO, "Matched (%ldx%ld) to (%ldx%ld)",
-		lpCtx->dwWidth, lpCtx->dwHeight, lpCtx->dwModeWidth, lpCtx->dwModeHeight);
-}
-#endif // _USE_GLD3_WGL
-// ***********************************************************************
-
-static BOOL IsDevice(
-	DWORD *lpDeviceIdList,
-	DWORD dwDeviceId,
-	int count)
-{
-	int i;
-
-	for (i=0; i<count; i++)
-		if (dwDeviceId == lpDeviceIdList[i])
-			return TRUE;
-
-	return FALSE;
-}
-
-// ***********************************************************************
-
-void dglTestForBrokenCards(
-	DGL_ctx *lpCtx)
-{
-#ifndef _GLD3
-	DDDEVICEIDENTIFIER	dddi; // DX6 device identifier
-
-	// Sanity check.
-	if (lpCtx == NULL) {
-		// Testing for broken cards is sensitive area, so we don't want
-		// anything saying "broken cards" in the error message. ;)
-		ddlogMessage(DDLOG_ERROR, "Null context passed to TFBC\n");
-		return;
-	}
-
-	if (lpCtx->lpDD4 == NULL) {
-		// Testing for broken cards is sensitive area, so we don't want
-		// anything saying "broken cards" in the error message. ;)
-		ddlogMessage(DDLOG_ERROR, "Null DD4 passed to TFBC\n");
-		return;
-	}
-
-	// Microsoft really fucked up with the GetDeviceIdentifier function
-	// on Windows 2000, since it locks up on stock driers on the CD. Updated
-	// drivers from vendors appear to work, but we can't identify the drivers
-	// without this function!!! For now we skip these tests on Windows 2000.
-	if ((GetVersion() & 0x80000000UL) == 0)
-		return;
-
-	// Obtain device info
-	if (FAILED(IDirectDraw4_GetDeviceIdentifier(lpCtx->lpDD4, &dddi, 0)))
-		return;
-
-	// Useful info. Log it.
-	ddlogPrintf(DDLOG_INFO, "DirectDraw: VendorId=0x%x, DeviceId=0x%x", dddi.dwVendorId, dddi.dwDeviceId);
-
-	// Vendor 1: ATI
-	if (dddi.dwVendorId == VENDORID_ATI) {
-		// Test A: ATI Rage PRO
-		if (IsDevice(devATIRagePro, dddi.dwDeviceId, sizeof(devATIRagePro)))
-			glb.bUseMipmaps = FALSE;
-		// Test B: ATI Rage II+
-		if (IsDevice(devATIRageIIplus, dddi.dwDeviceId, sizeof(devATIRageIIplus)))
-			glb.bEmulateAlphaTest = TRUE;
-	}
-
-	// Vendor 2: Matrox
-	if (dddi.dwVendorId == 0x102B) {
-		// Test: Matrox G400 stencil buffer support does not work for AutoCAD
-		if (dddi.dwDeviceId == 0x0525) {
-			lpCtx->lpPF->pfd.cStencilBits = 0;
-			if (lpCtx->lpPF->iZBufferPF != -1) {
-				glb.lpZBufferPF[lpCtx->lpPF->iZBufferPF].dwStencilBitDepth = 0;
-				glb.lpZBufferPF[lpCtx->lpPF->iZBufferPF].dwStencilBitMask = 0;
-				glb.lpZBufferPF[lpCtx->lpPF->iZBufferPF].dwFlags &= ~DDPF_STENCILBUFFER;
-			}
-		}
-	}
-#endif // _GLD3
-}
-
-// ***********************************************************************
-
-BOOL dglCreateContextBuffers(
-	HDC a,
-	DGL_ctx *lpCtx,
-	BOOL bFallback)
-{
-	HRESULT				hResult;
-
-	int					i;
-//	HGLRC				hGLRC;
-//	DGL_ctx*			lpCtx;
-
-#ifndef _USE_GLD3_WGL
-	DWORD				dwFlags;
-	DDSURFACEDESC2		ddsd2;
-	DDSCAPS2			ddscaps2;
-	LPDIRECTDRAWCLIPPER	lpddClipper;
-	D3DDEVICEDESC		D3DHWDevDesc;	// Direct3D Hardware description
-	D3DDEVICEDESC		D3DHELDevDesc;	// Direct3D Hardware Emulation Layer
-#endif // _USE_GLD3_WGL
-
-	float				inv_aspect;
-
-	GLenum				bDoubleBuffer;	// TRUE if double buffer required
-	GLenum				bDepthBuffer;	// TRUE if depth buffer required
-
-	const PIXELFORMATDESCRIPTOR	*lpPFD = &lpCtx->lpPF->pfd;
-
-	// Vars for Mesa visual
-	DWORD				dwDepthBits		= 0;
-	DWORD				dwStencilBits	= 0;
-	DWORD				dwAlphaBits		= 0;
-	DWORD				bAlphaSW		= GL_FALSE;
-	DWORD				bDouble			= GL_FALSE;
-
-	DDSURFACEDESC2 		ddsd2DisplayMode;
-	BOOL				bFullScrnWin	= FALSE;	// fullscreen-size window ?
-	DDBLTFX 			ddbltfx;
-	DWORD				dwMemoryType 	= (bFallback) ? DDSCAPS_SYSTEMMEMORY : glb.dwMemoryType;
-	BOOL				bBogusWindow	= FALSE;	// non-drawable window ?
-	DWORD               dwColorRef      = 0;        // GDI background color
-	RECT				rcDst;						// GDI window rect
-	POINT				pt;							// GDI window point
-
-	// Palette used for creating default global palette
-	PALETTEENTRY	ppe[256];
-
-#ifndef _USE_GLD3_WGL
-	// Vertex buffer description. Used for creation of vertex buffers
-	D3DVERTEXBUFFERDESC vbufdesc;
-#endif // _USE_GLD3_WGL
-
-#define DDLOG_CRITICAL_OR_WARN	(bFallback ? DDLOG_CRITICAL : DDLOG_WARN)
-
-	ddlogPrintf(DDLOG_SYSTEM, "dglCreateContextBuffers for HDC=%X", a);
-    nContextError = GLDERR_NONE;
-
-#ifdef GLD_THREADS
-	// Serialize access to DirectDraw object creation or DDS start
-	if (glb.bMultiThreaded)
-		EnterCriticalSection(&CriticalSection);
-#endif
-
-	// Check for back buffer
-	bDoubleBuffer = GL_TRUE; //(lpPFD->dwFlags & PFD_DOUBLEBUFFER) ? GL_TRUE : GL_FALSE;
-	// Since we always do back buffering, check if we emulate front buffering
-	lpCtx->EmulateSingle =
-		(lpPFD->dwFlags & PFD_DOUBLEBUFFER) ? FALSE : TRUE;
-#if 0	// Don't have to mimic MS OpenGL behavior for front-buffering (DaveM)
-	lpCtx->EmulateSingle |=
-		(lpPFD->dwFlags & PFD_SUPPORT_GDI) ? TRUE : FALSE;
-#endif
-
-	// Check for depth buffer
-	bDepthBuffer = (lpPFD->cDepthBits) ? GL_TRUE : GL_FALSE;
-
-	lpCtx->bDoubleBuffer = bDoubleBuffer;
-	lpCtx->bDepthBuffer = bDepthBuffer;
-
-	// Set the Fullscreen flag for the context.
-//	lpCtx->bFullscreen = glb.bFullscreen;
-
-	// Obtain the dimensions of the rendering window
-	lpCtx->hDC = a; // Cache DC
-	lpCtx->hWnd = WindowFromDC(lpCtx->hDC);
-	// Check for non-window DC = memory DC ?
-	if (lpCtx->hWnd == NULL) {
-        // bitmap memory contexts are always single-buffered
-        lpCtx->EmulateSingle = TRUE;
-		bBogusWindow = TRUE;
-		ddlogPrintf(DDLOG_INFO, "Non-Window Memory Device Context");
-		if (GetClipBox(lpCtx->hDC, &lpCtx->rcScreenRect) == ERROR) {
-			ddlogMessage(DDLOG_WARN, "GetClipBox failed in dglCreateContext\n");
-			SetRect(&lpCtx->rcScreenRect, 0, 0, 0, 0);
-		}
-	}
-	else if (!GetClientRect(lpCtx->hWnd, &lpCtx->rcScreenRect)) {
-		bBogusWindow = TRUE;
-		ddlogMessage(DDLOG_WARN, "GetClientRect failed in dglCreateContext\n");
-		SetRect(&lpCtx->rcScreenRect, 0, 0, 0, 0);
-	}
-	lpCtx->dwWidth = lpCtx->rcScreenRect.right - lpCtx->rcScreenRect.left;
-	lpCtx->dwHeight = lpCtx->rcScreenRect.bottom - lpCtx->rcScreenRect.top;
-
-	ddlogPrintf(DDLOG_INFO, "Input window %X: w=%i, h=%i",
-							lpCtx->hWnd, lpCtx->dwWidth, lpCtx->dwHeight);
-
-	// What if app only zeroes one dimension instead of both? (DaveM)
-	if ( (lpCtx->dwWidth == 0) || (lpCtx->dwHeight == 0) ) {
-		// Make the buffer size something sensible
-		lpCtx->dwWidth = 8;
-		lpCtx->dwHeight = 8;
-	}
-
-	// Set defaults
-	lpCtx->dwModeWidth = lpCtx->dwWidth;
-	lpCtx->dwModeHeight = lpCtx->dwHeight;
-/*
-	// Find best display mode for fullscreen
-	if (glb.bFullscreen || !glb.bPrimary) {
-		dglChooseDisplayMode(lpCtx);
-	}
-*/
-	// Misc initialisation
-	lpCtx->bCanRender = FALSE; // No rendering allowed yet
-	lpCtx->bSceneStarted = FALSE;
-	lpCtx->bFrameStarted = FALSE;
-
-	// Detect OS (specifically 'Windows 2000' or 'Windows XP')
-	DetectOS();
-
-	// NOTE: WinNT not supported
-	ddlogPrintf(DDLOG_INFO, "OS: %s", bHaveWin95 ? "Win9x" : (bHaveWin2K ? "Win2000/XP" : "Unsupported") );
-
-	// Test for Fullscreen
-	if (bHaveWin95) { // Problems with fullscreen on Win2K/XP
-		if ((GetSystemMetrics(SM_CXSCREEN) == lpCtx->dwWidth) && 
-			(GetSystemMetrics(SM_CYSCREEN) == lpCtx->dwHeight))
-		{
-			// Workaround for some apps that crash when going fullscreen.
-			//lpCtx->bFullscreen = TRUE;
-		}
-		
-	}
-
-#ifdef _USE_GLD3_WGL
-	_gldDriver.CreateDrawable(lpCtx, glb.bDirectDrawPersistant, glb.bPersistantBuffers);
-#else
-	// Check if DirectDraw has already been created by original GLRC (DaveM)
-	if (glb.bDirectDrawPersistant && glb.bDirectDraw) {
-		lpCtx->lpDD4 = glb.lpDD4;
-		IDirectDraw4_AddRef(lpCtx->lpDD4);
-		goto SkipDirectDrawCreate;
-	}
-
-	// Create DirectDraw object
-	if (glb.bPrimary)
-		hResult = DirectDrawCreate(NULL, &lpCtx->lpDD1, NULL);
-	else {
-		// A non-primary device is to be used.
-		// Force context to be Fullscreen, secondary adaptors can not
-		// be used in a window.
-		hResult = DirectDrawCreate(&glb.ddGuid, &lpCtx->lpDD1, NULL);
-		lpCtx->bFullscreen = TRUE;
-	}
-	if (FAILED(hResult)) {
-		MessageBox(NULL, "Unable to initialize DirectDraw", "GLDirect", MB_OK);
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to create DirectDraw interface", hResult);
-        nContextError = GLDERR_DDRAW;
-		goto return_with_error;
-	}
-
-	// Query for DX6 IDirectDraw4.
-	hResult = IDirectDraw_QueryInterface(lpCtx->lpDD1,
-										 &IID_IDirectDraw4,
-										 (void**)&lpCtx->lpDD4);
-	if (FAILED(hResult)) {
-		MessageBox(NULL, "GLDirect requires DirectX 6.0 or above", "GLDirect", MB_OK);
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to create DirectDraw4 interface", hResult);
-        nContextError = GLDERR_DDRAW;
-		goto return_with_error;
-	}
-
-	// Cache DirectDraw interface for subsequent GLRCs
-	if (glb.bDirectDrawPersistant && !glb.bDirectDraw) {
-		glb.lpDD4 = lpCtx->lpDD4;
-		IDirectDraw4_AddRef(glb.lpDD4);
-		glb.bDirectDraw = TRUE;
-	}
-SkipDirectDrawCreate:
-
-	// Now we have a DD4 interface we can check for broken cards
-	dglTestForBrokenCards(lpCtx);
-
-	// Test if primary device can use flipping instead of blitting
-	ZeroMemory(&ddsd2DisplayMode, sizeof(ddsd2DisplayMode));
-	ddsd2DisplayMode.dwSize = sizeof(ddsd2DisplayMode);
-	hResult = IDirectDraw4_GetDisplayMode(
-					lpCtx->lpDD4,
-					&ddsd2DisplayMode);
-	if (SUCCEEDED(hResult)) {
-		if ( (lpCtx->dwWidth == ddsd2DisplayMode.dwWidth) &&
-				 (lpCtx->dwHeight == ddsd2DisplayMode.dwHeight) ) {
-			// We have a fullscreen-size window
-			bFullScrnWin = TRUE;
-			// OK to use DirectDraw fullscreen mode ?
-			if (glb.bPrimary && !glb.bFullscreenBlit && !lpCtx->EmulateSingle && !glb.bDirectDrawPersistant) {
-				lpCtx->bFullscreen = TRUE;
-				ddlogMessage(DDLOG_INFO, "Primary upgraded to page flipping.\n");
-			}
-		}
-		// Cache the display mode dimensions
-		lpCtx->dwModeWidth = ddsd2DisplayMode.dwWidth;
-		lpCtx->dwModeHeight = ddsd2DisplayMode.dwHeight;
-	}
-
-	// Clamp the effective window dimensions to primary surface.
-	// We need to do this for D3D viewport dimensions even if wide
-	// surfaces are supported. This also is a good idea for handling
-	// whacked-out window dimensions passed for non-drawable windows
-	// like Solid Edge. (DaveM)
-	if (lpCtx->dwWidth > ddsd2DisplayMode.dwWidth)
-		lpCtx->dwWidth = ddsd2DisplayMode.dwWidth;
-	if (lpCtx->dwHeight > ddsd2DisplayMode.dwHeight)
-		lpCtx->dwHeight = ddsd2DisplayMode.dwHeight;
-
-	// Check for non-RGB desktop resolution
-	if (!lpCtx->bFullscreen && ddsd2DisplayMode.ddpfPixelFormat.dwRGBBitCount <= 8) {
-		ddlogPrintf(DDLOG_CRITICAL_OR_WARN, "Desktop color depth %d bpp not supported",
-			ddsd2DisplayMode.ddpfPixelFormat.dwRGBBitCount);
-        nContextError = GLDERR_BPP;
-		goto return_with_error;
-	}
-#endif // _USE_GLD3_WGL
-
-	ddlogPrintf(DDLOG_INFO, "Window: w=%i, h=%i (%s)",
-							lpCtx->dwWidth,
-							lpCtx->dwHeight,
-							lpCtx->bFullscreen ? "fullscreen" : "windowed");
-
-#ifndef _USE_GLD3_WGL
-	// Obtain ddraw caps
-    ZeroMemory(&lpCtx->ddCaps, sizeof(DDCAPS));
-	lpCtx->ddCaps.dwSize = sizeof(DDCAPS);
-	if (glb.bHardware) {
-		// Get HAL caps
-		IDirectDraw4_GetCaps(lpCtx->lpDD4, &lpCtx->ddCaps, NULL);
-	} else {
-		// Get HEL caps
-		IDirectDraw4_GetCaps(lpCtx->lpDD4, NULL, &lpCtx->ddCaps);
-	}
-
-	// If this flag is present then we can't default to Mesa
-	// SW rendering between BeginScene() and EndScene().
-	if (lpCtx->ddCaps.dwCaps2 & DDCAPS2_NO2DDURING3DSCENE) {
-		ddlogMessage(DDLOG_INFO,
-			"Warning          : No 2D allowed during 3D scene.\n");
-	}
-
-	// Query for DX6 Direct3D3 interface
-	hResult = IDirectDraw4_QueryInterface(lpCtx->lpDD4,
-										  &IID_IDirect3D3,
-										  (void**)&lpCtx->lpD3D3);
-	if (FAILED(hResult)) {
-		MessageBox(NULL, "Unable to initialize Direct3D", "GLDirect", MB_OK);
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to create Direct3D interface", hResult);
-        nContextError = GLDERR_D3D;
-		goto return_with_error;
-	}
-
-	// Context creation
-	if (lpCtx->bFullscreen) {
-		// FULLSCREEN
-
-        // Disable warning popups when in fullscreen mode
-        ddlogWarnOption(FALSE);
-
-		// Have to release persistant primary surface if fullscreen mode
-		if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary) {
-			RELEASE(glb.lpPrimary4);
-			glb.bDirectDrawPrimary = FALSE;
-		}
-
-		dwFlags = DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_ALLOWREBOOT;
-		if (glb.bFastFPU)
-			dwFlags |= DDSCL_FPUSETUP;	// fast FPU setup optional (DaveM)
-		hResult = IDirectDraw4_SetCooperativeLevel(lpCtx->lpDD4, lpCtx->hWnd, dwFlags);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to set Exclusive Fullscreen mode", hResult);
-			goto return_with_error;
-		}
-
-		hResult = IDirectDraw4_SetDisplayMode(lpCtx->lpDD4,
-											  lpCtx->dwModeWidth,
-											  lpCtx->dwModeHeight,
-											  lpPFD->cColorBits,
-											  0,
-											  0);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "SetDisplayMode failed", hResult);
-			goto return_with_error;
-		}
-
-		// ** The display mode has changed, so dont use MessageBox! **
-
-		ZeroMemory(&ddsd2, sizeof(ddsd2));
-		ddsd2.dwSize = sizeof(ddsd2);
-
-		if (bDoubleBuffer) {
-			// Double buffered
-			// Primary surface
-			ddsd2.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT;
-			ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE |
-								   DDSCAPS_FLIP |
-								   DDSCAPS_COMPLEX |
-								   DDSCAPS_3DDEVICE |
-								   dwMemoryType;
-			ddsd2.dwBackBufferCount = 1;
-
-			hResult = IDirectDraw4_CreateSurface(lpCtx->lpDD4, &ddsd2, &lpCtx->lpFront4, NULL);
-			if (FAILED(hResult)) {
-				ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateSurface (primary) failed", hResult);
-                nContextError = GLDERR_MEM;
-				goto return_with_error;
-			}
-
-			// Render target surface
-			ZeroMemory(&ddscaps2, sizeof(ddscaps2)); // Clear the entire struct.
-			ddscaps2.dwCaps = DDSCAPS_BACKBUFFER;
-			hResult = IDirectDrawSurface4_GetAttachedSurface(lpCtx->lpFront4, &ddscaps2, &lpCtx->lpBack4);
-			if (FAILED(hResult)) {
-				ddlogError(DDLOG_CRITICAL_OR_WARN, "GetAttachedSurface failed", hResult);
-                nContextError = GLDERR_MEM;
-				goto return_with_error;
-			}
-		} else {
-			// Single buffered
-			// Primary surface
-			ddsd2.dwFlags = DDSD_CAPS;
-			ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE |
-								   //DDSCAPS_3DDEVICE |
-								   dwMemoryType;
-
-			hResult = IDirectDraw4_CreateSurface(lpCtx->lpDD4, &ddsd2, &lpCtx->lpFront4, NULL);
-			if (FAILED(hResult)) {
-				ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateSurface (primary) failed", hResult);
-                nContextError = GLDERR_MEM;
-				goto return_with_error;
-			}
-
-			lpCtx->lpBack4 = NULL;
-		}
-	} else {
-		// WINDOWED
-
-        // OK to enable warning popups in windowed mode
-        ddlogWarnOption(glb.bMessageBoxWarnings);
-
-		dwFlags = DDSCL_NORMAL;
-		if (glb.bMultiThreaded)
-			dwFlags |= DDSCL_MULTITHREADED;
-		if (glb.bFastFPU)
-			dwFlags |= DDSCL_FPUSETUP;	// fast FPU setup optional (DaveM)
-		hResult = IDirectDraw4_SetCooperativeLevel(lpCtx->lpDD4,
-												  lpCtx->hWnd,
-												  dwFlags);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to set Normal coop level", hResult);
-			goto return_with_error;
-		}
-		// Has Primary surface already been created for original GLRC ?
-		// Note this can only be applicable for windowed modes
-		if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary) {
-			lpCtx->lpFront4 = glb.lpPrimary4;
-			IDirectDrawSurface4_AddRef(lpCtx->lpFront4);
-			// Update the window on the default clipper
-			IDirectDrawSurface4_GetClipper(lpCtx->lpFront4, &lpddClipper);
-			IDirectDrawClipper_SetHWnd(lpddClipper, 0, lpCtx->hWnd);
-			IDirectDrawClipper_Release(lpddClipper);
-			goto SkipPrimaryCreate;
-		}
-
-		// Primary surface
-		ZeroMemory(&ddsd2, sizeof(ddsd2));
-		ddsd2.dwSize = sizeof(ddsd2);
-		ddsd2.dwFlags = DDSD_CAPS;
-		ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-		hResult = IDirectDraw4_CreateSurface(lpCtx->lpDD4, &ddsd2, &lpCtx->lpFront4, NULL);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateSurface (primary) failed", hResult);
-            nContextError = GLDERR_MEM;
-			goto return_with_error;
-		}
-
-		// Cache Primary surface for subsequent GLRCs
-		// Note this can only be applicable to subsequent windowed modes
-		if (glb.bDirectDrawPersistant && !glb.bDirectDrawPrimary) {
-			glb.lpPrimary4 = lpCtx->lpFront4;
-			IDirectDrawSurface4_AddRef(glb.lpPrimary4);
-			glb.bDirectDrawPrimary = TRUE;
-		}
-
-		// Clipper object
-		hResult = DirectDrawCreateClipper(0, &lpddClipper, NULL);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateClipper failed", hResult);
-			goto return_with_error;
-		}
-		hResult = IDirectDrawClipper_SetHWnd(lpddClipper, 0, lpCtx->hWnd);
-		if (FAILED(hResult)) {
-			RELEASE(lpddClipper);
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "SetHWnd failed", hResult);
-			goto return_with_error;
-		}
-		hResult = IDirectDrawSurface4_SetClipper(lpCtx->lpFront4, lpddClipper);
-		RELEASE(lpddClipper); // We have finished with it.
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "SetClipper failed", hResult);
-			goto return_with_error;
-		}
-SkipPrimaryCreate:
-
-		if (bDoubleBuffer) {
-			// Render target surface
-			ZeroMemory(&ddsd2, sizeof(ddsd2));
-			ddsd2.dwSize = sizeof(ddsd2);
-			ddsd2.dwFlags        = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
-			ddsd2.dwWidth        = lpCtx->dwWidth;
-			ddsd2.dwHeight       = lpCtx->dwHeight;
-			ddsd2.ddsCaps.dwCaps = DDSCAPS_3DDEVICE |
-								   DDSCAPS_OFFSCREENPLAIN |
-								   dwMemoryType;
-
-			// Reserve the entire desktop size for persistant buffers option
-			if (glb.bDirectDrawPersistant && glb.bPersistantBuffers) {
-				ddsd2.dwWidth = ddsd2DisplayMode.dwWidth;
-				ddsd2.dwHeight = ddsd2DisplayMode.dwHeight;
-			}
-			// Re-use original back buffer if persistant buffers exist
-			if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && glb.lpBack4)
-				hResult = IDirectDrawSurface4_AddRef(lpCtx->lpBack4 = glb.lpBack4);
-			else
-				hResult = IDirectDraw4_CreateSurface(lpCtx->lpDD4, &ddsd2, &lpCtx->lpBack4, NULL);
-			if (FAILED(hResult)) {
-				ddlogError(DDLOG_CRITICAL_OR_WARN, "Create Backbuffer failed", hResult);
-                nContextError = GLDERR_MEM;
-				goto return_with_error;
-			}
-			if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && !glb.lpBack4)
-				IDirectDrawSurface4_AddRef(glb.lpBack4 = lpCtx->lpBack4);
-		} else {
-			lpCtx->lpBack4 = NULL;
-		}
-	}
-
-	//
-	// Now create the Z-buffer
-	//
-	lpCtx->bStencil = FALSE; // Default to no stencil buffer
-	if (bDepthBuffer && (lpCtx->lpPF->iZBufferPF != -1)) {
-		// Get z-buffer dimensions from the render target
-		// Setup the surface desc for the z-buffer.
-		ZeroMemory(&ddsd2, sizeof(ddsd2));
-		ddsd2.dwSize = sizeof(ddsd2);
-		ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;
-		ddsd2.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | dwMemoryType;
-		ddsd2.dwWidth = lpCtx->dwWidth;
-		ddsd2.dwHeight = lpCtx->dwHeight;
-		memcpy(&ddsd2.ddpfPixelFormat,
-			&glb.lpZBufferPF[lpCtx->lpPF->iZBufferPF],
-			sizeof(DDPIXELFORMAT) );
-
-		// Reserve the entire desktop size for persistant buffers option
-		if (glb.bDirectDrawPersistant && glb.bPersistantBuffers) {
-			ddsd2.dwWidth = ddsd2DisplayMode.dwWidth;
-			ddsd2.dwHeight = ddsd2DisplayMode.dwHeight;
-		}
-
-		// Create a z-buffer
-		if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && glb.lpDepth4)
-			hResult = IDirectDrawSurface4_AddRef(lpCtx->lpDepth4 = glb.lpDepth4);
-		else
-			hResult = IDirectDraw4_CreateSurface(lpCtx->lpDD4, &ddsd2, &lpCtx->lpDepth4, NULL);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateSurface (ZBuffer) failed", hResult);
-            nContextError = GLDERR_MEM;
-			goto return_with_error;
-		}
-		if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && !glb.lpDepth4)
-			IDirectDrawSurface4_AddRef(glb.lpDepth4 = lpCtx->lpDepth4);
-		else if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && glb.lpDepth4 && glb.lpBack4)
-			IDirectDrawSurface4_DeleteAttachedSurface(glb.lpBack4, 0, glb.lpDepth4);
-
-		// Attach Zbuffer to render target
-		TRY(IDirectDrawSurface4_AddAttachedSurface(
-			bDoubleBuffer ? lpCtx->lpBack4 : lpCtx->lpFront4,
-			lpCtx->lpDepth4),
-			"dglCreateContext: Attach Zbuffer");
-		if (glb.lpZBufferPF[lpCtx->lpPF->iZBufferPF].dwFlags & DDPF_STENCILBUFFER) {
-			lpCtx->bStencil = TRUE;
-			ddlogMessage(DDLOG_INFO, "Depth buffer has stencil\n");
-		}
-	}
-
-	// Clear all back buffers and Z-buffers in case of memory recycling.
-	ZeroMemory(&ddbltfx, sizeof(ddbltfx));
-	ddbltfx.dwSize = sizeof(ddbltfx);
-	IDirectDrawSurface4_Blt(lpCtx->lpBack4, NULL, NULL, NULL,
-		DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx);
-	if (lpCtx->lpDepth4)
-		IDirectDrawSurface4_Blt(lpCtx->lpDepth4, NULL, NULL, NULL,
-			DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx);
-
-	// Now that we have a Z-buffer we can create the 3D device
-	hResult = IDirect3D3_CreateDevice(lpCtx->lpD3D3,
-									  &glb.d3dGuid,
-									  bDoubleBuffer ? lpCtx->lpBack4 : lpCtx->lpFront4,
-									  &lpCtx->lpDev3,
-									  NULL);
-	if (FAILED(hResult)) {
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to create Direct3D device", hResult);
-        nContextError = GLDERR_D3D;
-		goto return_with_error;
-	}
-
-	// We must do this as soon as the device is created
-	dglInitStateCaches(lpCtx);
-
-	// Obtain the D3D Device Description
-	D3DHWDevDesc.dwSize = D3DHELDevDesc.dwSize = sizeof(D3DDEVICEDESC);
-	TRY(IDirect3DDevice3_GetCaps(lpCtx->lpDev3,
-								 &D3DHWDevDesc,
-								 &D3DHELDevDesc),
-								 "dglCreateContext: GetCaps failed");
-
-	// Choose the relevant description and cache it in the context.
-	// We will use this description later for caps checking
-	memcpy(	&lpCtx->D3DDevDesc,
-			glb.bHardware ? &D3DHWDevDesc : &D3DHELDevDesc,
-			sizeof(D3DDEVICEDESC));
-
-	// Now we can examine the texture formats
-	if (!dglBuildTextureFormatList(lpCtx->lpDev3)) {
-		ddlogMessage(DDLOG_CRITICAL_OR_WARN, "dglBuildTextureFormatList failed\n");
-		goto return_with_error;
-	}
-
-	// Get the pixel format of the back buffer
-	lpCtx->ddpfRender.dwSize = sizeof(lpCtx->ddpfRender);
-	if (bDoubleBuffer)
-		hResult = IDirectDrawSurface4_GetPixelFormat(
-					lpCtx->lpBack4,
-					&lpCtx->ddpfRender);
-	else
-		hResult = IDirectDrawSurface4_GetPixelFormat(
-					lpCtx->lpFront4,
-					&lpCtx->ddpfRender);
-
-	if (FAILED(hResult)) {
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "GetPixelFormat failed", hResult);
-		goto return_with_error;
-	}
-	// Find a pixel packing function suitable for this surface
-	pxClassifyPixelFormat(&lpCtx->ddpfRender,
-						  &lpCtx->fnPackFunc,
-						  &lpCtx->fnUnpackFunc,
-						  &lpCtx->fnPackSpanFunc);
-
-	// Viewport
-	hResult = IDirect3D3_CreateViewport(lpCtx->lpD3D3, &lpCtx->lpViewport3, NULL);
-	if (FAILED(hResult)) {
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateViewport failed", hResult);
-		goto return_with_error;
-	}
-
-	hResult = IDirect3DDevice3_AddViewport(lpCtx->lpDev3, lpCtx->lpViewport3);
-	if (FAILED(hResult)) {
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "AddViewport failed", hResult);
-		goto return_with_error;
-	}
-
-	// Initialise the viewport
-	// Note screen coordinates are used for viewport clipping since D3D
-	// transform operations are not used in the GLD CAD driver. (DaveM)
-	inv_aspect = (float)lpCtx->dwHeight/(float)lpCtx->dwWidth;
-
-	lpCtx->d3dViewport.dwSize = sizeof(lpCtx->d3dViewport);
-	lpCtx->d3dViewport.dwX = 0;
-	lpCtx->d3dViewport.dwY = 0;
-	lpCtx->d3dViewport.dwWidth = lpCtx->dwWidth;
-	lpCtx->d3dViewport.dwHeight = lpCtx->dwHeight;
-	lpCtx->d3dViewport.dvClipX = 0; // -1.0f;
-	lpCtx->d3dViewport.dvClipY = 0; // inv_aspect;
-	lpCtx->d3dViewport.dvClipWidth = lpCtx->dwWidth; // 2.0f;
-	lpCtx->d3dViewport.dvClipHeight = lpCtx->dwHeight; // 2.0f * inv_aspect;
-	lpCtx->d3dViewport.dvMinZ = 0.0f;
-	lpCtx->d3dViewport.dvMaxZ = 1.0f;
-	TRY(IDirect3DViewport3_SetViewport2(lpCtx->lpViewport3, &lpCtx->d3dViewport), "dglCreateContext: SetViewport2");
-
-	hResult = IDirect3DDevice3_SetCurrentViewport(lpCtx->lpDev3, lpCtx->lpViewport3);
-	if (FAILED(hResult)) {
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "SetCurrentViewport failed", hResult);
-		goto return_with_error;
-	}
-
-	lpCtx->dwBPP = lpPFD->cColorBits;
-	lpCtx->iZBufferPF = lpCtx->lpPF->iZBufferPF;
-
-	// Set last texture to NULL
-	for (i=0; i<MAX_TEXTURE_UNITS; i++) {
-		lpCtx->ColorOp[i] = D3DTOP_DISABLE;
-		lpCtx->AlphaOp[i] = D3DTOP_DISABLE;
-		lpCtx->tObj[i] = NULL;
-	}
-
-	// Default to perspective correct texture mapping
-	dglSetRenderState(lpCtx, D3DRENDERSTATE_TEXTUREPERSPECTIVE, TRUE, "TexturePersp");
-
-	// Set the default culling mode
-	lpCtx->cullmode = D3DCULL_NONE;
-	dglSetRenderState(lpCtx, D3DRENDERSTATE_CULLMODE, D3DCULL_NONE, "CullMode");
-
-	// Disable specular
-	dglSetRenderState(lpCtx, D3DRENDERSTATE_SPECULARENABLE, FALSE, "SpecularEnable");
-	// Disable subpixel correction
-//	dglSetRenderState(lpCtx, D3DRENDERSTATE_SUBPIXEL, FALSE, "SubpixelEnable");
-	// Disable dithering
-	dglSetRenderState(lpCtx, D3DRENDERSTATE_DITHERENABLE, FALSE, "DitherEnable");
-
-	// Initialise the primitive caches
-//	lpCtx->dwNextLineVert	= 0;
-//	lpCtx->dwNextTriVert	= 0;
-
-	// Init the global texture palette
-	lpCtx->lpGlobalPalette = NULL;
-
-	// Init the HW/SW usage counters
-//	lpCtx->dwHWUsageCount = lpCtx->dwSWUsageCount = 0L;
-
-	//
-	// Create two D3D vertex buffers.
-	// One will hold the pre-transformed data with the other one
-	// being used to hold the post-transformed & clipped verts.
-	//
-#if 0  // never used (DaveM)
-	vbufdesc.dwSize = sizeof(D3DVERTEXBUFFERDESC);
-	vbufdesc.dwCaps = D3DVBCAPS_WRITEONLY;
-	if (glb.bHardware == FALSE)
-		vbufdesc.dwCaps = D3DVBCAPS_SYSTEMMEMORY;
-	vbufdesc.dwNumVertices = 32768; // For the time being
-
-	// Source vertex buffer
-	vbufdesc.dwFVF = DGL_LVERTEX;
-	hResult = IDirect3D3_CreateVertexBuffer(lpCtx->lpD3D3, &vbufdesc, &lpCtx->m_vbuf, 0, NULL);
-	if (FAILED(hResult)) {
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateVertexBuffer(src) failed", hResult);
-		goto return_with_error;
-	}
-
-	// Destination vertex buffer
-	vbufdesc.dwFVF = (glb.bMultitexture == FALSE) ? D3DFVF_TLVERTEX : (D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX2);
-	hResult = IDirect3D3_CreateVertexBuffer(lpCtx->lpD3D3, &vbufdesc, &lpCtx->m_pvbuf, 0, NULL);
-	if(FAILED(hResult)) {
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateVertexBuffer(dst) failed", hResult);
-		goto return_with_error;
-	}
-#endif
-
-#endif _USE_GLD3_WGL
-
-	//
-	//	Now create the Mesa context
-	//
-
-	// Create the Mesa visual
-	if (lpPFD->cDepthBits)
-		dwDepthBits = 16;
-	if (lpPFD->cStencilBits)
-		dwStencilBits = 8;
-	if (lpPFD->cAlphaBits) {
-		dwAlphaBits = 8;
-		bAlphaSW = GL_TRUE;
-	}
-	if (lpPFD->dwFlags & PFD_DOUBLEBUFFER)
-		bDouble = GL_TRUE;
-//	lpCtx->EmulateSingle =
-//		(lpPFD->dwFlags & PFD_DOUBLEBUFFER) ? FALSE : TRUE;
-
-#ifdef _USE_GLD3_WGL
-	lpCtx->glVis = _mesa_create_visual(
-		bDouble,    /* double buffer */
-		GL_FALSE,			// stereo
-		lpPFD->cRedBits,
-		lpPFD->cGreenBits,
-		lpPFD->cBlueBits,
-		dwAlphaBits,
-		dwDepthBits,
-		dwStencilBits,
-		lpPFD->cAccumRedBits,	// accum bits
-		lpPFD->cAccumGreenBits,	// accum bits
-		lpPFD->cAccumBlueBits,	// accum bits
-		lpPFD->cAccumAlphaBits,	// accum alpha bits
-		1				// num samples
-		);
-#else // _USE_GLD3_WGL
-	lpCtx->glVis = (*mesaFuncs.gl_create_visual)(
-		GL_TRUE,			// RGB mode
-		bAlphaSW,			// Is an alpha buffer required?
-		bDouble,			// Is an double-buffering required?
-		GL_FALSE,			// stereo
-		dwDepthBits,		// depth_size
-		dwStencilBits,		// stencil_size
-		lpPFD->cAccumBits,	// accum_size
-		0,					// colour-index bits
-		lpPFD->cRedBits,	// Red bit count
-		lpPFD->cGreenBits,	// Green bit count
-		lpPFD->cBlueBits,	// Blue bit count
-		dwAlphaBits			// Alpha bit count
-		);
-#endif // _USE_GLD3_WGL
-
-	if (lpCtx->glVis == NULL) {
-		ddlogMessage(DDLOG_CRITICAL_OR_WARN, "gl_create_visual failed\n");
-		goto return_with_error;
-	}
-
-#ifdef _USE_GLD3_WGL
-	lpCtx->glCtx = _mesa_create_context(API_OPENGL, lpCtx->glVis, NULL, (void *)lpCtx, GL_TRUE);
-#else
-	// Create the Mesa context
-	lpCtx->glCtx = (*mesaFuncs.gl_create_context)(
-					lpCtx->glVis,	// Mesa visual
-					NULL,			// share list context
-					(void *)lpCtx,	// Pointer to our driver context
-					GL_TRUE			// Direct context flag
-				   );
-#endif // _USE_GLD3_WGL
-
-	if (lpCtx->glCtx == NULL) {
-		ddlogMessage(DDLOG_CRITICAL_OR_WARN, "gl_create_context failed\n");
-		goto return_with_error;
-	}
-
-	// Create the Mesa framebuffer
-#ifdef _USE_GLD3_WGL
-	lpCtx->glBuffer = _mesa_create_framebuffer(
-		lpCtx->glVis,
-		lpCtx->glVis->depthBits > 0,
-		lpCtx->glVis->stencilBits > 0,
-		lpCtx->glVis->accumRedBits > 0,
-		GL_FALSE //swalpha
-		);
-#else
-	lpCtx->glBuffer = (*mesaFuncs.gl_create_framebuffer)(lpCtx->glVis);
-#endif // _USE_GLD3_WGL
-
-	if (lpCtx->glBuffer == NULL) {
-		ddlogMessage(DDLOG_CRITICAL_OR_WARN, "gl_create_framebuffer failed\n");
-		goto return_with_error;
-	}
-
-#ifdef _USE_GLD3_WGL
-	// Init Mesa internals
-	_swrast_CreateContext( lpCtx->glCtx );
-	_vbo_CreateContext( lpCtx->glCtx );
-	_tnl_CreateContext( lpCtx->glCtx );
-	_swsetup_CreateContext( lpCtx->glCtx );
-
-	_gldDriver.InitialiseMesa(lpCtx);
-	
-	lpCtx->glCtx->imports.warning	= _gld_mesa_warning;
-	lpCtx->glCtx->imports.fatal		= _gld_mesa_fatal;
-
-#else
-	// Tell Mesa how many texture stages we have
-	glb.wMaxSimultaneousTextures = lpCtx->D3DDevDesc.wMaxSimultaneousTextures;
-	// Only use as many Units as the spec requires
-	if (glb.wMaxSimultaneousTextures > MAX_TEXTURE_UNITS)
-		glb.wMaxSimultaneousTextures = MAX_TEXTURE_UNITS;
-	lpCtx->glCtx->Const.MaxTextureUnits = glb.wMaxSimultaneousTextures;
-	ddlogPrintf(DDLOG_INFO, "Texture stages   : %d", glb.wMaxSimultaneousTextures);
-
-	// Set the max texture size.
-	// NOTE: clamped to a max of 1024 for extra performance!
-	lpCtx->dwMaxTextureSize = (lpCtx->D3DDevDesc.dwMaxTextureWidth <= 1024) ? lpCtx->D3DDevDesc.dwMaxTextureWidth : 1024;
-
-// Texture resize takes place elsewhere. KH
-// NOTE: This was added to workaround an issue with the Intel app.
-#if 0
-	lpCtx->glCtx->Const.MaxTextureSize = lpCtx->dwMaxTextureSize;
-#else
-	lpCtx->glCtx->Const.MaxTextureSize = 1024;
-#endif
-	lpCtx->glCtx->Const.MaxDrawBuffers = 1;
-
-	// Setup the Display Driver pointers
-	dglSetupDDPointers(lpCtx->glCtx);
-
-	// Initialise all the Direct3D renderstates
-	dglInitStateD3D(lpCtx->glCtx);
-
-#if 0
-	// Signal a reload of texture state on next glBegin
-	lpCtx->m_texHandleValid = FALSE;
-	lpCtx->m_mtex = FALSE;
-	lpCtx->m_texturing = FALSE;
-#else
-	// Set default texture unit state
-//	dglSetTexture(lpCtx, 0, NULL);
-//	dglSetTexture(lpCtx, 1, NULL);
-#endif
-
-	//
-	// Set the global texture palette to default values.
-	//
-
-	// Clear the entire palette
-	ZeroMemory(ppe, sizeof(PALETTEENTRY) * 256);
-
-	// Fill the palette with a default colour.
-	// A garish colour is used to catch bugs. Here Magenta is used.
-	for (i=0; i < 256; i++) {
-		ppe[i].peRed	= 255;
-		ppe[i].peGreen	= 0;
-		ppe[i].peBlue	= 255;
-	}
-
-	RELEASE(lpCtx->lpGlobalPalette);
-
-	if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && glb.lpGlobalPalette)
-		hResult = IDirectDrawPalette_AddRef(lpCtx->lpGlobalPalette = glb.lpGlobalPalette);
-	else
-		hResult = IDirectDraw4_CreatePalette(
-				lpCtx->lpDD4,
-				DDPCAPS_INITIALIZE | DDPCAPS_8BIT | DDPCAPS_ALLOW256,
-				ppe,
-				&(lpCtx->lpGlobalPalette),
-				NULL);
-	if (FAILED(hResult)) {
-		ddlogError(DDLOG_ERROR, "Default CreatePalette failed\n", hResult);
-		lpCtx->lpGlobalPalette = NULL;
-		goto return_with_error;
-	}
-	if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && !glb.lpGlobalPalette)
-		IDirectDrawPalette_AddRef(glb.lpGlobalPalette = lpCtx->lpGlobalPalette);
-
-#endif // _USE_GLD3_WGL
-
-	// ** If we have made it to here then we can enable rendering **
-	lpCtx->bCanRender = TRUE;
-
-//	ddlogMessage(DDLOG_SYSTEM, "dglCreateContextBuffers succeded\n");
-
-#ifdef GLD_THREADS
-	// Release serialized access
-	if (glb.bMultiThreaded)
-		LeaveCriticalSection(&CriticalSection);
-#endif
-
-	return TRUE;
-
-return_with_error:
-	// Clean up before returning.
-	// This is critical for secondary devices.
-
-	lpCtx->bCanRender = FALSE;
-
-#ifdef _USE_GLD3_WGL
-	// Destroy the Mesa context
-	if (lpCtx->glBuffer)
-		_mesa_destroy_framebuffer(lpCtx->glBuffer);
-	if (lpCtx->glCtx)
-		_mesa_destroy_context(lpCtx->glCtx);
-	if (lpCtx->glVis)
-		_mesa_destroy_visual(lpCtx->glVis);
-
-	// Destroy driver data
-	_gldDriver.DestroyDrawable(lpCtx);
-#else
-	// Destroy the Mesa context
-	if (lpCtx->glBuffer)
-		(*mesaFuncs.gl_destroy_framebuffer)(lpCtx->glBuffer);
-	if (lpCtx->glCtx)
-		(*mesaFuncs.gl_destroy_context)(lpCtx->glCtx);
-	if (lpCtx->glVis)
-		(*mesaFuncs.gl_destroy_visual)(lpCtx->glVis);
-
-	RELEASE(lpCtx->m_pvbuf); // Release D3D vertex buffer
-	RELEASE(lpCtx->m_vbuf); // Release D3D vertex buffer
-
-	if (lpCtx->lpViewport3) {
-		if (lpCtx->lpDev3) IDirect3DDevice3_DeleteViewport(lpCtx->lpDev3, lpCtx->lpViewport3);
-		RELEASE(lpCtx->lpViewport3);
-		lpCtx->lpViewport3 = NULL;
-	}
-
-	RELEASE(lpCtx->lpDev3);
-	if (lpCtx->lpDepth4) {
-		if (lpCtx->lpBack4)
-			IDirectDrawSurface4_DeleteAttachedSurface(lpCtx->lpBack4, 0L, lpCtx->lpDepth4);
-		else
-			IDirectDrawSurface4_DeleteAttachedSurface(lpCtx->lpFront4, 0L, lpCtx->lpDepth4);
-		RELEASE(lpCtx->lpDepth4);
-		lpCtx->lpDepth4 = NULL;
-	}
-	RELEASE(lpCtx->lpBack4);
-	RELEASE(lpCtx->lpFront4);
-	else
-	if (lpCtx->bFullscreen) {
-		IDirectDraw4_RestoreDisplayMode(lpCtx->lpDD4);
-		IDirectDraw4_SetCooperativeLevel(lpCtx->lpDD4, NULL, DDSCL_NORMAL);
-	}
-	RELEASE(lpCtx->lpD3D3);
-	RELEASE(lpCtx->lpDD4);
-	RELEASE(lpCtx->lpDD1);
-#endif // _USE_GLD3_WGL
-
-	lpCtx->bAllocated = FALSE;
-
-#ifdef GLD_THREADS
-	// Release serialized access
-	if (glb.bMultiThreaded)
-		LeaveCriticalSection(&CriticalSection);
-#endif
-
-	return FALSE;
-
-#undef DDLOG_CRITICAL_OR_WARN
-}
-
-// ***********************************************************************
-
-HGLRC dglCreateContext(
-	HDC a,
-	const DGL_pixelFormat *lpPF)
-{
-	int i;
-	HGLRC				hGLRC;
-	DGL_ctx*			lpCtx;
-	static BOOL			bWarnOnce = TRUE;
-	DWORD				dwThreadId = GetCurrentThreadId();
-    char                szMsg[256];
-    HWND                hWnd;
-    LONG                lpfnWndProc;
-
-	// Validate license
-	if (!dglValidate())
-		return NULL;
-
-	// Is context state ready ?
-	if (!bContextReady)
-		return NULL;
-
-	ddlogPrintf(DDLOG_SYSTEM, "dglCreateContext for HDC=%X, ThreadId=%X", a, dwThreadId);
-
-	// Find next free context.
-	// Also ensure that only one Fullscreen context is created at any one time.
-	hGLRC = 0; // Default to Not Found
-	for (i=0; i<DGL_MAX_CONTEXTS; i++) {
-		if (ctxlist[i].bAllocated) {
-			if (/*glb.bFullscreen && */ctxlist[i].bFullscreen)
-				break;
-		} else {
-			hGLRC = (HGLRC)(i+1);
-			break;
-		}
-	}
-
-	// Bail if no GLRC was found
-	if (!hGLRC)
-		return NULL;
-
-	// Set the context pointer
-	lpCtx = dglGetContextAddress(hGLRC);
-	// Make sure that context is zeroed before we do anything.
-	// MFC and C++ apps call wglCreateContext() and wglDeleteContext() multiple times,
-	// even though only one context is ever used by the app, so keep it clean. (DaveM)
-	ZeroMemory(lpCtx, sizeof(DGL_ctx));
-	lpCtx->bAllocated = TRUE;
-	// Flag that buffers need creating on next wglMakeCurrent call.
-	lpCtx->bHasBeenCurrent = FALSE;
-	lpCtx->lpPF = (DGL_pixelFormat *)lpPF;	// cache pixel format
-	lpCtx->bCanRender = FALSE;
-
-	// Create all the internal resources here, not in dglMakeCurrent().
-	// We do a re-size check in dglMakeCurrent in case of re-allocations. (DaveM)
-	// We now try context allocations twice, first with video memory,
-	// then again with system memory. This is similar to technique
-	// used for dglWglResizeBuffers(). (DaveM)
-	if (lpCtx->bHasBeenCurrent == FALSE) {
-		if (!dglCreateContextBuffers(a, lpCtx, FALSE)) {
-			if (glb.bMessageBoxWarnings && bWarnOnce && dwLogging) {
-				bWarnOnce = FALSE;
-                switch (nContextError) {
-                   case GLDERR_DDRAW: strcpy(szMsg, szDDrawWarning); break;
-                   case GLDERR_D3D: strcpy(szMsg, szD3DWarning); break;
-                   case GLDERR_MEM: strcpy(szMsg, szResourceWarning); break;
-                   case GLDERR_BPP: strcpy(szMsg, szBPPWarning); break;
-                   default: strcpy(szMsg, "");
-                }
-                if (strlen(szMsg))
-                    MessageBox(NULL, szMsg, "GLDirect", MB_OK | MB_ICONWARNING);
-			}
-            // Only need to try again if memory error
-            if (nContextError == GLDERR_MEM) {
-			    ddlogPrintf(DDLOG_WARN, "dglCreateContext failed 1st time with video memory");
-            }
-            else {
-			    ddlogPrintf(DDLOG_ERROR, "dglCreateContext failed");
-                return NULL;
-            }
-		}
-	}
-
-	// Now that we have a hWnd, we can intercept the WindowProc.
-    hWnd = lpCtx->hWnd;
-    if (hWnd) {
-		// Only hook individual window handler once if not hooked before.
-		lpfnWndProc = GetWindowLong(hWnd, GWL_WNDPROC);
-		if (lpfnWndProc != (LONG)dglWndProc) {
-			lpCtx->lpfnWndProc = lpfnWndProc;
-			SetWindowLong(hWnd, GWL_WNDPROC, (LONG)dglWndProc);
-			}
-        // Find the parent window of the app too.
-        if (glb.hWndActive == NULL) {
-            while (hWnd != NULL) {
-                glb.hWndActive = hWnd;
-                hWnd = GetParent(hWnd);
-            }
-            // Hook the parent window too.
-            lpfnWndProc = GetWindowLong(glb.hWndActive, GWL_WNDPROC);
-            if (glb.hWndActive == lpCtx->hWnd)
-                glb.lpfnWndProc = lpCtx->lpfnWndProc;
-            else if (lpfnWndProc != (LONG)dglWndProc)
-                glb.lpfnWndProc = lpfnWndProc;
-            if (glb.lpfnWndProc)
-                SetWindowLong(glb.hWndActive, GWL_WNDPROC, (LONG)dglWndProc);
-        }
-    }
-
-	ddlogPrintf(DDLOG_SYSTEM, "dglCreateContext succeeded for HGLRC=%d", (int)hGLRC);
-
-	return hGLRC;
-}
-
-// ***********************************************************************
-// Make a DirectGL context current
-// Used by wgl functions and dgl functions
-BOOL dglMakeCurrent(
-	HDC a,
-	HGLRC b)
-{
-	int context;
-	DGL_ctx* lpCtx;
-	HWND hWnd;
-	BOOL bNeedResize = FALSE;
-	BOOL bWindowChanged, bContextChanged;
-	LPDIRECTDRAWCLIPPER	lpddClipper;
-	DWORD dwThreadId = GetCurrentThreadId();
-	LONG lpfnWndProc;
-
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-
-	// Is context state ready ?
-	if (!bContextReady)
-		return FALSE;
-
-	context = (int)b; // This is as a result of STRICT!
-	ddlogPrintf(DDLOG_SYSTEM, "dglMakeCurrent: HDC=%X, HGLRC=%d, ThreadId=%X", a, context, dwThreadId);
-
-	// If the HGLRC is NULL then make no context current;
-	// Ditto if the HDC is NULL either. (DaveM)
-	if (context == 0 || a == 0) {
-		// Corresponding Mesa operation
-#ifdef _USE_GLD3_WGL
-		_mesa_make_current(NULL, NULL);
-#else
-		(*mesaFuncs.gl_make_current)(NULL, NULL);
-#endif
-		dglSetCurrentContext(0);
-		return TRUE;
-	}
-
-	// Make sure the HGLRC is in range
-	if ((context > DGL_MAX_CONTEXTS) || (context < 0)) {
-		ddlogMessage(DDLOG_ERROR, "dglMakeCurrent: HGLRC out of range\n");
-		return FALSE;
-	}
-
-	// Find address of context and make sure that it has been allocated
-	lpCtx = dglGetContextAddress(b);
-	if (!lpCtx->bAllocated) {
-		ddlogMessage(DDLOG_ERROR, "dglMakeCurrent: Context not allocated\n");
-//		return FALSE;
-		return TRUE; // HACK: Shuts up "WebLab Viewer Pro". KeithH
-	}
-
-#ifdef GLD_THREADS
-	// Serialize access to DirectDraw or DDS operations
-	if (glb.bMultiThreaded)
-		EnterCriticalSection(&CriticalSection);
-#endif
-
-	// Check if window has changed
-	hWnd = (a != lpCtx->hDC) ? WindowFromDC(a) : lpCtx->hWnd;
-	bWindowChanged = (hWnd != lpCtx->hWnd) ? TRUE : FALSE;
-	bContextChanged = (b != dglGetCurrentContext()) ? TRUE : FALSE;
-
-	// If the window has changed, make sure the clipper is updated. (DaveM)
-	if (glb.bDirectDrawPersistant && !lpCtx->bFullscreen && (bWindowChanged || bContextChanged)) {
-		lpCtx->hWnd = hWnd;
-#ifndef _USE_GLD3_WGL
-		IDirectDrawSurface4_GetClipper(lpCtx->lpFront4, &lpddClipper);
-		IDirectDrawClipper_SetHWnd(lpddClipper, 0, lpCtx->hWnd);
-		IDirectDrawClipper_Release(lpddClipper);
-#endif // _USE_GLD3_WGL
-	}
-
-	// Make sure hDC and hWnd is current. (DaveM)
-	// Obtain the dimensions of the rendering window
-	lpCtx->hDC = a; // Cache DC
-	lpCtx->hWnd = hWnd;
-	hWndLastActive = hWnd;
-
-	// Check for non-window DC = memory DC ?
-	if (hWnd == NULL) {
-		if (GetClipBox(a, &lpCtx->rcScreenRect) == ERROR) {
-			ddlogMessage(DDLOG_WARN, "GetClipBox failed in dglMakeCurrent\n");
-			SetRect(&lpCtx->rcScreenRect, 0, 0, 0, 0);
-		}
-	}
-	else if (!GetClientRect(lpCtx->hWnd, &lpCtx->rcScreenRect)) {
-		ddlogMessage(DDLOG_WARN, "GetClientRect failed in dglMakeCurrent\n");
-		SetRect(&lpCtx->rcScreenRect, 0, 0, 0, 0);
-	}
-	// Check if buffers need to be re-sized;
-	// If so, wait until Mesa GL stuff is setup before re-sizing;
-	if (lpCtx->dwWidth != lpCtx->rcScreenRect.right - lpCtx->rcScreenRect.left ||
-		lpCtx->dwHeight != lpCtx->rcScreenRect.bottom - lpCtx->rcScreenRect.top)
-		bNeedResize = TRUE;
-
-	// Now we can update our globals
-	dglSetCurrentContext(b);
-
-	// Corresponding Mesa operation
-#ifdef _USE_GLD3_WGL
-	_mesa_make_current(lpCtx->glCtx, lpCtx->glBuffer);
-	lpCtx->glCtx->Driver.UpdateState(lpCtx->glCtx, _NEW_ALL);
-	if (bNeedResize) {
-		// Resize buffers (Note Mesa GL needs to be setup beforehand);
-		// Resize Mesa internal buffer too via glViewport() command,
-		// which subsequently calls dglWglResizeBuffers() too.
-		lpCtx->glCtx->Driver.Viewport(lpCtx->glCtx, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);
-		lpCtx->bHasBeenCurrent = TRUE;
-	}
-#else
-	(*mesaFuncs.gl_make_current)(lpCtx->glCtx, lpCtx->glBuffer);
-
-	dglSetupDDPointers(lpCtx->glCtx);
-
-	// Insure DirectDraw surfaces fit current window DC
-	if (bNeedResize) {
-		// Resize buffers (Note Mesa GL needs to be setup beforehand);
-		// Resize Mesa internal buffer too via glViewport() command,
-		// which subsequently calls dglWglResizeBuffers() too.
-		(*mesaFuncs.gl_Viewport)(lpCtx->glCtx, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);
-		lpCtx->bHasBeenCurrent = TRUE;
-	}
-#endif // _USE_GLD3_WGL
-	ddlogPrintf(DDLOG_SYSTEM, "dglMakeCurrent: width = %d, height = %d", lpCtx->dwWidth, lpCtx->dwHeight);
-
-	// We have to clear D3D back buffer and render state if emulated front buffering
-	// for different window (but not context) like in Solid Edge.
-	if (glb.bDirectDrawPersistant && glb.bPersistantBuffers
-		&& (bWindowChanged /* || bContextChanged */) && lpCtx->EmulateSingle) {
-#ifdef _USE_GLD3_WGL
-//		IDirect3DDevice8_EndScene(lpCtx->pDev);
-//		lpCtx->bSceneStarted = FALSE;
-		lpCtx->glCtx->Driver.Clear(lpCtx->glCtx, GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT,
-			GL_TRUE, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);
-#else
-		IDirect3DDevice3_EndScene(lpCtx->lpDev3);
-		lpCtx->bSceneStarted = FALSE;
-		dglClearD3D(lpCtx->glCtx, GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT,
-			GL_TRUE, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);
-#endif // _USE_GLD3_WGL
-	}
-
-	// The first time we call MakeCurrent we set the initial viewport size
-	if (lpCtx->bHasBeenCurrent == FALSE)
-#ifdef _USE_GLD3_WGL
-		lpCtx->glCtx->Driver.Viewport(lpCtx->glCtx, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);
-#else
-		(*mesaFuncs.gl_Viewport)(lpCtx->glCtx, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);
-#endif // _USE_GLD3_WGL
-	lpCtx->bHasBeenCurrent = TRUE;
-
-#ifdef GLD_THREADS
-	// Release serialized access
-	if (glb.bMultiThreaded)
-		LeaveCriticalSection(&CriticalSection);
-#endif
-
-	return TRUE;
-}
-
-// ***********************************************************************
-
-BOOL dglDeleteContext(
-	HGLRC a)
-{
-	DGL_ctx* lpCtx;
-	DWORD dwThreadId = GetCurrentThreadId();
-    char argstr[256];
-
-#if 0	// We have enough trouble throwing exceptions as it is... (DaveM)
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-#endif
-
-	// Is context state ready ?
-	if (!bContextReady)
-		return FALSE;
-
-	ddlogPrintf(DDLOG_SYSTEM, "dglDeleteContext: Deleting context HGLRC=%d, ThreadId=%X", (int)a, dwThreadId);
-
-	// Make sure the HGLRC is in range
-	if (((int) a> DGL_MAX_CONTEXTS) || ((int)a < 0)) {
-		ddlogMessage(DDLOG_ERROR, "dglDeleteCurrent: HGLRC out of range\n");
-		return FALSE;
-	}
-
-	// Make sure context is valid
-	lpCtx = dglGetContextAddress(a);
-	if (!lpCtx->bAllocated) {
-		ddlogPrintf(DDLOG_WARN, "Tried to delete unallocated context HGLRC=%d", (int)a);
-//		return FALSE;
-		return TRUE; // HACK: Shuts up "WebLab Viewer Pro". KeithH
-	}
-
-	// Make sure context is de-activated
-	if (a == dglGetCurrentContext()) {
-		ddlogPrintf(DDLOG_WARN, "dglDeleteContext: context HGLRC=%d still active", (int)a);
-		dglMakeCurrent(NULL, NULL);
-	}
-
-#ifdef GLD_THREADS
-	// Serialize access to DirectDraw or DDS operations
-	if (glb.bMultiThreaded)
-		EnterCriticalSection(&CriticalSection);
-#endif
-
-	// We are about to destroy all Direct3D objects.
-	// Therefore we must disable rendering
-	lpCtx->bCanRender = FALSE;
-
-	// This exception handler was installed to catch some
-	// particularly nasty apps. Console apps that call exit()
-	// fall into this catagory (i.e. Win32 Glut).
-
-    // VC cannot successfully implement multiple exception handlers
-    // if more than one exception occurs. Therefore reverting back to
-    // single exception handler as Keith originally had it. (DaveM)
-
-#define WARN_MESSAGE(p) strcpy(argstr, (#p));
-#define SAFE_RELEASE(p) WARN_MESSAGE(p); RELEASE(p);
-
-__try {
-#ifdef _USE_GLD3_WGL
-    WARN_MESSAGE(gl_destroy_framebuffer);
-	if (lpCtx->glBuffer)
-		_mesa_destroy_framebuffer(lpCtx->glBuffer);
-    WARN_MESSAGE(gl_destroy_context);
-	if (lpCtx->glCtx)
-		_mesa_destroy_context(lpCtx->glCtx);
-    WARN_MESSAGE(gl_destroy_visual);
-	if (lpCtx->glVis)
-		_mesa_destroy_visual(lpCtx->glVis);
-
-	_gldDriver.DestroyDrawable(lpCtx);
-#else
-	// Destroy the Mesa context
-    WARN_MESSAGE(gl_destroy_framebuffer);
-	if (lpCtx->glBuffer)
-		(*mesaFuncs.gl_destroy_framebuffer)(lpCtx->glBuffer);
-    WARN_MESSAGE(gl_destroy_context);
-	if (lpCtx->glCtx)
-		(*mesaFuncs.gl_destroy_context)(lpCtx->glCtx);
-    WARN_MESSAGE(gl_destroy_visual);
-	if (lpCtx->glVis)
-		(*mesaFuncs.gl_destroy_visual)(lpCtx->glVis);
-
-	SAFE_RELEASE(lpCtx->m_pvbuf); // release D3D vertex buffer
-	SAFE_RELEASE(lpCtx->m_vbuf); // release D3D vertex buffer
-
-	// Delete the global palette
-	SAFE_RELEASE(lpCtx->lpGlobalPalette);
-
-	// Clean up.
-	if (lpCtx->lpViewport3) {
-		if (lpCtx->lpDev3) IDirect3DDevice3_DeleteViewport(lpCtx->lpDev3, lpCtx->lpViewport3);
-		SAFE_RELEASE(lpCtx->lpViewport3);
-		lpCtx->lpViewport3 = NULL;
-	}
-
-	SAFE_RELEASE(lpCtx->lpDev3);
-	if (lpCtx->lpDepth4) {
-		if (lpCtx->lpBack4)
-			IDirectDrawSurface4_DeleteAttachedSurface(lpCtx->lpBack4, 0L, lpCtx->lpDepth4);
-		else
-			IDirectDrawSurface4_DeleteAttachedSurface(lpCtx->lpFront4, 0L, lpCtx->lpDepth4);
-		SAFE_RELEASE(lpCtx->lpDepth4);
-		lpCtx->lpDepth4 = NULL;
-	}
-	SAFE_RELEASE(lpCtx->lpBack4);
-	SAFE_RELEASE(lpCtx->lpFront4);
-	if (lpCtx->bFullscreen) {
-		IDirectDraw4_RestoreDisplayMode(lpCtx->lpDD4);
-		IDirectDraw4_SetCooperativeLevel(lpCtx->lpDD4, NULL, DDSCL_NORMAL);
-	}
-	SAFE_RELEASE(lpCtx->lpD3D3);
-	SAFE_RELEASE(lpCtx->lpDD4);
-	SAFE_RELEASE(lpCtx->lpDD1);
-#endif // _ULSE_GLD3_WGL
-
-}
-__except(EXCEPTION_EXECUTE_HANDLER) {
-    ddlogPrintf(DDLOG_WARN, "Exception raised in dglDeleteContext: %s", argstr);
-}
-
-	// Restore the window message handler because this context may be used
-	// again by another window with a *different* message handler. (DaveM)
-	if (lpCtx->lpfnWndProc) {
-		SetWindowLong(lpCtx->hWnd, GWL_WNDPROC, (LONG)lpCtx->lpfnWndProc);
-		lpCtx->lpfnWndProc = (LONG)NULL;
-		}
-
-	lpCtx->bAllocated = FALSE; // This context is now free for use
-
-#ifdef GLD_THREADS
-	// Release serialized access
-	if (glb.bMultiThreaded)
-		LeaveCriticalSection(&CriticalSection);
-#endif
-
-	return TRUE;
-}
-
-// ***********************************************************************
-
-BOOL dglSwapBuffers(
-	HDC hDC)
-{
-	RECT		rSrcRect;	// Source rectangle
-	RECT		rDstRect;	// Destination rectangle
-	POINT		pt;
-	HRESULT		hResult;
-
-	DDBLTFX		bltFX;
-	DWORD		dwBlitFlags;
-	DDBLTFX		*lpBltFX;
-
-//	DWORD		dwThreadId = GetCurrentThreadId();
-	HGLRC		hGLRC = dglGetCurrentContext();
-	DGL_ctx		*lpCtx = dglGetContextAddress(hGLRC);
-	HWND		hWnd;
-
-	HDC 		hDCAux;		// for memory DC
-	int 		x,y,w,h;	// for memory DC BitBlt
-
-#if 0	// Perhaps not a good idea. Called too often. KH
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-#endif
-
-	if (!lpCtx) {
-		return TRUE; //FALSE; // No current context
-	}
-
-	if (!lpCtx->bCanRender) {
-		// Don't return false else some apps will bail.
-		return TRUE;
-	}
-
-	hWnd = lpCtx->hWnd;
-	if (hDC != lpCtx->hDC) {
-		ddlogPrintf(DDLOG_WARN, "dglSwapBuffers: HDC=%X does not match HDC=%X for HGLRC=%d", hDC, lpCtx->hDC, hGLRC);
-		hWnd = WindowFromDC(hDC);
-	}
-
-#ifndef _USE_GLD3_WGL
-	// Ensure that the surfaces exist before we tell
-	// the device to render to them.
-	IDirectDraw4_RestoreAllSurfaces(lpCtx->lpDD4);
-
-	// Make sure that the vertex caches have been emptied
-//	dglStateChange(lpCtx);
-
-	// Some OpenGL programs don't issue a glFinish - check for it here.
-	if (lpCtx->bSceneStarted) {
-		IDirect3DDevice3_EndScene(lpCtx->lpDev3);
-		lpCtx->bSceneStarted = FALSE;
-	}
-#endif
-
-#if 0
-	// If the calling app is not active then we don't need to Blit/Flip.
-	// We can therefore simply return TRUE.
-	if (!glb.bAppActive)
-		return TRUE;
-	// Addendum: This is WRONG! We should bail if the app is *minimized*,
-	//           not merely if the app is just plain 'not active'.
-	//           KeithH, 27/May/2000.
-#endif
-
-	// Check for non-window DC = memory DC ?
-	if (hWnd == NULL) {
-		if (GetClipBox(hDC, &rSrcRect) == ERROR)
-			return TRUE;
-		// Use GDI BitBlt instead from compatible DirectDraw DC
-		x = rSrcRect.left;
-		y = rSrcRect.top;
-		w = rSrcRect.right - rSrcRect.left;
-		h = rSrcRect.bottom - rSrcRect.top;
-
-		// Ack. DX8 does not have a GetDC() function...
-                // TODO: Defer to DX7 or DX9 drivers... (DaveM)
-		return TRUE;
-	}
-
-	// Bail if window client region is not drawable, like in Solid Edge
-	if (!IsWindow(hWnd) /* || !IsWindowVisible(hWnd) */ || !GetClientRect(hWnd, &rSrcRect))
-		return TRUE;
-
-#ifdef GLD_THREADS
-	// Serialize access to DirectDraw or DDS operations
-	if (glb.bMultiThreaded)
-		EnterCriticalSection(&CriticalSection);
-#endif
-
-#ifdef _USE_GLD3_WGL
-	// Notify Mesa of impending swap, so Mesa can flush internal buffers.
-	_mesa_notifySwapBuffers(lpCtx->glCtx);
-	// Now perform driver buffer swap
-	_gldDriver.SwapBuffers(lpCtx, hDC, hWnd);
-#else
-	if (lpCtx->bFullscreen) {
-		// Sync with retrace if required
-		if (glb.bWaitForRetrace) {
-			IDirectDraw4_WaitForVerticalBlank(
-				lpCtx->lpDD4,
-				DDWAITVB_BLOCKBEGIN,
-				0);
-		}
-
-		// Perform the fullscreen flip
-		TRY(IDirectDrawSurface4_Flip(
-			lpCtx->lpFront4,
-			NULL,
-			DDFLIP_WAIT),
-			"dglSwapBuffers: Flip");
-	} else {
-		// Calculate current window position and size
-		pt.x = pt.y = 0;
-		ClientToScreen(hWnd, &pt);
-		GetClientRect(hWnd, &rDstRect);
-		if (rDstRect.right > lpCtx->dwModeWidth)
-			rDstRect.right = lpCtx->dwModeWidth;
-		if (rDstRect.bottom > lpCtx->dwModeHeight)
-			rDstRect.bottom = lpCtx->dwModeHeight;
-		OffsetRect(&rDstRect, pt.x, pt.y);
-		rSrcRect.left = rSrcRect.top = 0;
-		rSrcRect.right = lpCtx->dwWidth;
-		rSrcRect.bottom = lpCtx->dwHeight;
-		if (rSrcRect.right > lpCtx->dwModeWidth)
-			rSrcRect.right = lpCtx->dwModeWidth;
-		if (rSrcRect.bottom > lpCtx->dwModeHeight)
-			rSrcRect.bottom = lpCtx->dwModeHeight;
-
-		if (glb.bWaitForRetrace) {
-			// Sync the blit to the vertical retrace
-			ZeroMemory(&bltFX, sizeof(bltFX));
-			bltFX.dwSize = sizeof(bltFX);
-			bltFX.dwDDFX = DDBLTFX_NOTEARING;
-			dwBlitFlags = DDBLT_WAIT | DDBLT_DDFX;
-			lpBltFX = &bltFX;
-		} else {
-			dwBlitFlags = DDBLT_WAIT;
-			lpBltFX = NULL;
-		}
-
-		// Perform the actual blit
-		TRY(IDirectDrawSurface4_Blt(
-			lpCtx->lpFront4,
-			&rDstRect,
-			lpCtx->lpBack4, // Blit source
-			&rSrcRect,
-			dwBlitFlags,
-			lpBltFX),
-			"dglSwapBuffers: Blt");
-	}
-#endif // _USE_GLD3_WGL
-
-#ifdef GLD_THREADS
-	// Release serialized access
-	if (glb.bMultiThreaded)
-		LeaveCriticalSection(&CriticalSection);
-#endif
-
-    // TODO: Re-instate rendering bitmap snapshot feature??? (DaveM)
-
-	// Render frame is completed
-	ValidateRect(hWnd, NULL);
-	lpCtx->bFrameStarted = FALSE;
-
-	return TRUE;
-}
-
-// ***********************************************************************
+/****************************************************************************

+*

+*                        Mesa 3-D graphics library

+*                        Direct3D Driver Interface

+*

+*  ========================================================================

+*

+*   Copyright (C) 1991-2004 SciTech Software, Inc. All rights reserved.

+*

+*   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

+*   SCITECH SOFTWARE INC 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.

+*

+*  ======================================================================

+*

+* Language:     ANSI C

+* Environment:  Windows 9x (Win32)

+*

+* Description:  Context handling.

+*

+****************************************************************************/

+

+#include "dglcontext.h"

+

+// Get compile errors without this. KeithH

+//#include "scitech.h"	// ibool, etc.

+

+#ifdef _USE_GLD3_WGL

+#include "gld_driver.h"

+

+extern void _gld_mesa_warning(struct gl_context *, char *);

+extern void _gld_mesa_fatal(struct gl_context *, char *);

+#endif // _USE_GLD3_WGL

+

+// TODO: Clean out old DX6-specific code from GLD 2.x CAD driver

+// if it is no longer being built as part of GLDirect. (DaveM)

+

+// ***********************************************************************

+

+#define GLDERR_NONE     0

+#define GLDERR_MEM      1

+#define GLDERR_DDRAW    2

+#define GLDERR_D3D      3

+#define GLDERR_BPP      4

+

+char szResourceWarning[] =

+"GLDirect does not have enough video memory resources\n"

+"to support the requested OpenGL rendering context.\n\n"

+"You may have to reduce the current display resolution\n"

+"to obtain satisfactory OpenGL performance.\n";

+

+char szDDrawWarning[] =

+"GLDirect is unable to initialize DirectDraw for the\n"

+"requested OpenGL rendering context.\n\n"

+"You will have to check the DirectX control panel\n"

+"for further information.\n";

+

+char szD3DWarning[] =

+"GLDirect is unable to initialize Direct3D for the\n"

+"requested OpenGL rendering context.\n\n"

+"You may have to change the display mode resolution\n"

+"color depth or check the DirectX control panel for\n"

+"further information.\n";

+

+char szBPPWarning[] =

+"GLDirect is unable to use the selected color depth for\n"

+"the requested OpenGL rendering context.\n\n"

+"You will have to change the display mode resolution\n"

+"color depth with the Display Settings control panel.\n";

+

+int nContextError = GLDERR_NONE;

+

+// ***********************************************************************

+

+#define VENDORID_ATI 0x1002

+

+static DWORD devATIRagePro[] = {

+	0x4742, // 3D RAGE PRO BGA AGP 1X/2X

+	0x4744, // 3D RAGE PRO BGA AGP 1X only

+	0x4749, // 3D RAGE PRO BGA PCI 33 MHz

+	0x4750, // 3D RAGE PRO PQFP PCI 33 MHz

+	0x4751, // 3D RAGE PRO PQFP PCI 33 MHz limited 3D

+	0x4C42, // 3D RAGE LT PRO BGA-312 AGP 133 MHz

+	0x4C44, // 3D RAGE LT PRO BGA-312 AGP 66 MHz

+	0x4C49, // 3D RAGE LT PRO BGA-312 PCI 33 MHz

+	0x4C50, // 3D RAGE LT PRO BGA-256 PCI 33 MHz

+	0x4C51, // 3D RAGE LT PRO BGA-256 PCI 33 MHz limited 3D

+};

+

+static DWORD devATIRageIIplus[] = {

+	0x4755, // 3D RAGE II+

+	0x4756, // 3D RAGE IIC PQFP PCI

+	0x4757, // 3D RAGE IIC BGA AGP

+	0x475A, // 3D RAGE IIC PQFP AGP

+	0x4C47, // 3D RAGE LT-G

+};

+

+// ***********************************************************************

+

+#ifndef _USE_GLD3_WGL

+extern DGL_mesaFuncs mesaFuncs;

+#endif

+

+extern DWORD dwLogging;

+

+#ifdef GLD_THREADS

+#pragma message("compiling DGLCONTEXT.C vars for multi-threaded support")

+CRITICAL_SECTION CriticalSection;		// for serialized access

+DWORD		dwTLSCurrentContext = 0xFFFFFFFF;	// TLS index for current context

+DWORD		dwTLSPixelFormat = 0xFFFFFFFF;		// TLS index for current pixel format

+#endif

+HGLRC		iCurrentContext = 0;		// Index of current context (static)

+BOOL		bContextReady = FALSE;		// Context state ready ?

+

+DGL_ctx		ctxlist[DGL_MAX_CONTEXTS];	// Context list

+

+// ***********************************************************************

+

+static BOOL bHaveWin95 = FALSE;

+static BOOL bHaveWinNT = FALSE;

+static BOOL bHaveWin2K = FALSE;

+

+/****************************************************************************

+REMARKS:

+Detect the installed OS type.

+****************************************************************************/

+static void DetectOS(void)

+{

+    OSVERSIONINFO VersionInformation;

+    LPOSVERSIONINFO lpVersionInformation = &VersionInformation;

+

+    VersionInformation.dwOSVersionInfoSize = sizeof(VersionInformation);

+

+	GetVersionEx(lpVersionInformation);

+

+    switch (VersionInformation.dwPlatformId) {

+    	case VER_PLATFORM_WIN32_WINDOWS:

+			bHaveWin95 = TRUE;

+			bHaveWinNT = FALSE;

+			bHaveWin2K = FALSE;

+            break;

+    	case VER_PLATFORM_WIN32_NT:

+			bHaveWin95 = FALSE;

+			if (VersionInformation.dwMajorVersion <= 4) {

+				bHaveWinNT = TRUE;

+				bHaveWin2K = FALSE;

+                }

+            else {

+				bHaveWinNT = FALSE;

+				bHaveWin2K = TRUE;

+                }

+			break;

+		case VER_PLATFORM_WIN32s:

+			bHaveWin95 = FALSE;

+			bHaveWinNT = FALSE;

+			bHaveWin2K = FALSE;

+			break;

+        }

+}

+

+// ***********************************************************************

+

+HWND hWndEvent = NULL;					// event monitor window

+HWND hWndLastActive = NULL;				// last active client window

+LONG __stdcall GLD_EventWndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam);

+

+// ***********************************************************************

+

+// Checks if the HGLRC is valid in range of context list.

+BOOL dglIsValidContext(

+	HGLRC a)

+{

+	return ((int)a > 0 && (int)a <= DGL_MAX_CONTEXTS);

+}

+

+// ***********************************************************************

+

+// Convert a HGLRC to a pointer into the context list.

+DGL_ctx* dglGetContextAddress(

+	const HGLRC a)

+{

+	if (dglIsValidContext(a))

+		return &ctxlist[(int)a-1];

+	return NULL;

+}

+

+// ***********************************************************************

+

+// Return the current HGLRC (however it may be stored for multi-threading).

+HGLRC dglGetCurrentContext(void)

+{

+#ifdef GLD_THREADS

+	HGLRC hGLRC;

+	// load from thread-specific instance

+	if (glb.bMultiThreaded) {

+		// protect against calls from arbitrary threads

+		__try {

+			hGLRC = (HGLRC)TlsGetValue(dwTLSCurrentContext);

+		}

+		__except(EXCEPTION_EXECUTE_HANDLER) {

+			hGLRC = iCurrentContext;

+		}

+	}

+	// load from global static var

+	else {

+		hGLRC = iCurrentContext;

+	}

+	return hGLRC;

+#else

+	return iCurrentContext;

+#endif

+}

+

+// ***********************************************************************

+

+// Set the current HGLRC (however it may be stored for multi-threading).

+void dglSetCurrentContext(HGLRC hGLRC)

+{

+#ifdef GLD_THREADS

+	// store in thread-specific instance

+	if (glb.bMultiThreaded) {

+		// protect against calls from arbitrary threads

+		__try {

+			TlsSetValue(dwTLSCurrentContext, (LPVOID)hGLRC);

+		}

+		__except(EXCEPTION_EXECUTE_HANDLER) {

+			iCurrentContext = hGLRC;

+		}

+	}

+	// store in global static var

+	else {

+		iCurrentContext = hGLRC;

+	}

+#else

+	iCurrentContext = hGLRC;

+#endif

+}

+

+// ***********************************************************************

+

+// Return the current HDC only for a currently active HGLRC.

+HDC dglGetCurrentDC(void)

+{

+	HGLRC hGLRC;

+	DGL_ctx* lpCtx;

+

+	hGLRC = dglGetCurrentContext();

+	if (hGLRC) {

+		lpCtx = dglGetContextAddress(hGLRC);

+		return lpCtx->hDC;

+	}

+	return 0;

+}

+

+// ***********************************************************************

+

+void dglInitContextState()

+{

+	int i;

+	WNDCLASS wc;

+

+#ifdef GLD_THREADS

+	// Allocate thread local storage indexes for current context and pixel format

+	dwTLSCurrentContext = TlsAlloc();

+	dwTLSPixelFormat = TlsAlloc();

+#endif

+

+	dglSetCurrentContext(NULL); // No current rendering context

+

+	 // Clear all context data

+	ZeroMemory(ctxlist, sizeof(ctxlist[0]) * DGL_MAX_CONTEXTS);

+

+	for (i=0; i<DGL_MAX_CONTEXTS; i++)

+		ctxlist[i].bAllocated = FALSE; // Flag context as unused

+

+	// This section of code crashes the dll in circumstances where the app

+	// creates and destroys contexts.

+/*

+	// Register the class for our event monitor window

+	wc.style = 0;

+	wc.lpfnWndProc = GLD_EventWndProc;

+	wc.cbClsExtra = 0;

+	wc.cbWndExtra = 0;

+	wc.hInstance = GetModuleHandle(NULL);

+	wc.hIcon = LoadIcon(GetModuleHandle(NULL), IDI_APPLICATION);

+	wc.hCursor = LoadCursor(NULL, IDC_ARROW);

+	wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);

+	wc.lpszMenuName = NULL;

+	wc.lpszClassName = "GLDIRECT";

+	RegisterClass(&wc);

+

+	// Create the non-visible window to monitor all broadcast messages

+	hWndEvent = CreateWindowEx(

+		WS_EX_TOOLWINDOW,"GLDIRECT","GLDIRECT",WS_POPUP,

+		0,0,0,0,

+		NULL,NULL,GetModuleHandle(NULL),NULL);

+*/

+

+#ifdef GLD_THREADS

+	// Create a critical section object for serializing access to

+	// DirectDraw and DDStereo create/destroy functions in multiple threads

+	if (glb.bMultiThreaded)

+		InitializeCriticalSection(&CriticalSection);

+#endif

+

+	// Context state is now initialized and ready

+	bContextReady = TRUE;

+}

+

+// ***********************************************************************

+

+void dglDeleteContextState()

+{

+	int i;

+	static BOOL bOnceIsEnough = FALSE;

+

+	// Only call once, from either DGL_exitDriver(), or DLL_PROCESS_DETACH

+	if (bOnceIsEnough)

+		return;

+	bOnceIsEnough = TRUE;

+

+	for (i=0; i<DGL_MAX_CONTEXTS; i++) {

+		if (ctxlist[i].bAllocated == TRUE) {

+			ddlogPrintf(DDLOG_WARN, "** Context %i not deleted - cleaning up.", (i+1));

+			dglDeleteContext((HGLRC)(i+1));

+		}

+	}

+

+	// Context state is no longer ready

+	bContextReady = FALSE;

+

+    // If executed when DLL unloads, DDraw objects may be invalid.

+    // So catch any page faults with this exception handler.

+__try {

+

+	// Release final DirectDraw interfaces

+	if (glb.bDirectDrawPersistant) {

+//		RELEASE(glb.lpGlobalPalette);

+//		RELEASE(glb.lpDepth4);

+//		RELEASE(glb.lpBack4);

+//		RELEASE(glb.lpPrimary4);

+//	    RELEASE(glb.lpDD4);

+    }

+}

+__except(EXCEPTION_EXECUTE_HANDLER) {

+    ddlogPrintf(DDLOG_WARN, "Exception raised in dglDeleteContextState.");

+}

+

+	// Destroy our event monitor window

+	if (hWndEvent) {

+		DestroyWindow(hWndEvent);

+		hWndEvent = hWndLastActive = NULL;

+	}

+

+#ifdef GLD_THREADS

+	// Destroy the critical section object

+	if (glb.bMultiThreaded)

+		DeleteCriticalSection(&CriticalSection);

+

+	// Release thread local storage indexes for current HGLRC and pixel format

+	TlsFree(dwTLSPixelFormat);

+	TlsFree(dwTLSCurrentContext);

+#endif

+}

+

+// ***********************************************************************

+

+// Application Window message handler interception

+static LONG __stdcall dglWndProc(

+	HWND hwnd,

+	UINT msg,

+	WPARAM wParam,

+	LPARAM lParam)

+{

+	DGL_ctx* 	lpCtx = NULL;

+	LONG 		lpfnWndProc = 0L;

+	int  		i;

+	HGLRC 		hGLRC;

+	RECT 		rect;

+	PAINTSTRUCT	ps;

+    BOOL        bQuit = FALSE;

+    BOOL        bMain = FALSE;

+    LONG        rc;

+

+    // Get the window's message handler *before* it is unhooked in WM_DESTROY

+

+    // Is this the main window?

+    if (hwnd == glb.hWndActive) {

+        bMain = TRUE;

+        lpfnWndProc = glb.lpfnWndProc;

+    }

+    // Search for DGL context matching window handle

+    for (i=0; i<DGL_MAX_CONTEXTS; i++) {

+	    if (ctxlist[i].hWnd == hwnd) {

+	        lpCtx = &ctxlist[i];

+	        lpfnWndProc = lpCtx->lpfnWndProc;

+		    break;

+        }

+    }

+	// Not one of ours...

+	if (!lpfnWndProc)

+	    return DefWindowProc(hwnd, msg, wParam, lParam);

+

+    // Intercept messages amd process *before* passing on to window

+	switch (msg) {

+#ifdef _USE_GLD3_WGL

+	case WM_DISPLAYCHANGE:

+		glb.bPixelformatsDirty = TRUE;

+		break;

+#endif

+	case WM_ACTIVATEAPP:

+		glb.bAppActive = (BOOL)wParam;

+		ddlogPrintf(DDLOG_INFO, "Calling app has been %s", glb.bAppActive ? "activated" : "de-activated");

+		break;

+	case WM_ERASEBKGND:

+		// Eat the GDI erase event for the GL window

+        if (!lpCtx || !lpCtx->bHasBeenCurrent)

+            break;

+		lpCtx->bGDIEraseBkgnd = TRUE;

+		return TRUE;

+	case WM_PAINT:

+		// Eat the invalidated update region if render scene is in progress

+        if (!lpCtx || !lpCtx->bHasBeenCurrent)

+            break;

+		if (lpCtx->bFrameStarted) {

+			if (GetUpdateRect(hwnd, &rect, FALSE)) {

+				BeginPaint(hwnd, &ps);

+				EndPaint(hwnd, &ps);

+				ValidateRect(hwnd, &rect);

+				return TRUE;

+				}

+			}

+		break;

+	}

+	// Call the appropriate window message handler

+	rc = CallWindowProc((WNDPROC)lpfnWndProc, hwnd, msg, wParam, lParam);

+

+    // Intercept messages and process *after* passing on to window

+	switch (msg) {

+    case WM_QUIT:

+	case WM_DESTROY:

+        bQuit = TRUE;

+		if (lpCtx && lpCtx->bAllocated) {

+			ddlogPrintf(DDLOG_WARN, "WM_DESTROY detected for HWND=%X, HDC=%X, HGLRC=%d", hwnd, lpCtx->hDC, i+1);

+			dglDeleteContext((HGLRC)(i+1));

+		}

+		break;

+#if 0

+	case WM_SIZE:

+		// Resize surfaces to fit window but not viewport (in case app did not bother)

+        if (!lpCtx || !lpCtx->bHasBeenCurrent)

+            break;

+		w = LOWORD(lParam);

+		h = HIWORD(lParam);

+		if (lpCtx->dwWidth < w || lpCtx->dwHeight < h) {

+			if (!dglWglResizeBuffers(lpCtx->glCtx, TRUE))

+                 dglWglResizeBuffers(lpCtx->glCtx, FALSE);

+        }

+		break;

+#endif

+    }

+

+    // If the main window is quitting, then so should we...

+    if (bMain && bQuit) {

+		ddlogPrintf(DDLOG_SYSTEM, "shutting down after WM_DESTROY detected for main HWND=%X", hwnd);

+        dglDeleteContextState();

+        dglExitDriver();

+    }

+

+    return rc;

+}

+

+// ***********************************************************************

+

+// Driver Window message handler

+static LONG __stdcall GLD_EventWndProc(

+	HWND hwnd,

+	UINT msg,

+	WPARAM wParam,

+	LPARAM lParam)

+{

+	switch (msg) {

+        // May be sent by splash screen dialog on exit

+        case WM_ACTIVATE:

+            if (LOWORD(wParam) == WA_ACTIVE && glb.hWndActive) {

+                SetForegroundWindow(glb.hWndActive);

+                return 0;

+                }

+            break;

+	}

+	return DefWindowProc(hwnd, msg, wParam, lParam);

+}

+

+// ***********************************************************************

+

+// Intercepted Keyboard handler for detecting hot keys.

+LRESULT CALLBACK dglKeyProc(

+	int code,

+	WPARAM wParam,

+	LPARAM lParam)

+{

+	HWND hWnd, hWndFrame;

+	HGLRC hGLRC = NULL;

+	DGL_ctx* lpCtx = NULL;

+	int cmd = 0, dx1 = 0, dx2 = 0, i;

+	static BOOL bAltPressed = FALSE;

+	static BOOL bCtrlPressed = FALSE;

+	static BOOL bShiftPressed = FALSE;

+    RECT r, rf, rc;

+    POINT pt;

+    BOOL bForceReshape = FALSE;

+

+	return CallNextHookEx(hKeyHook, code, wParam, lParam);

+}

+

+// ***********************************************************************

+

+HWND hWndMatch;

+

+// Window handle enumeration procedure.

+BOOL CALLBACK dglEnumChildProc(

+    HWND hWnd,

+    LPARAM lParam)

+{

+    RECT rect;

+

+    // Find window handle with matching client rect.

+    GetClientRect(hWnd, &rect);

+    if (EqualRect(&rect, (RECT*)lParam)) {

+        hWndMatch = hWnd;

+        return FALSE;

+        }

+    // Continue with next child window.

+    return TRUE;

+}

+

+// ***********************************************************************

+

+// Find window handle with matching client rect.

+HWND dglFindWindowRect(

+    RECT* pRect)

+{

+    hWndMatch = NULL;

+    EnumChildWindows(GetForegroundWindow(), dglEnumChildProc, (LPARAM)pRect);

+    return hWndMatch;

+}

+

+// ***********************************************************************

+#ifndef _USE_GLD3_WGL

+void dglChooseDisplayMode(

+	DGL_ctx *lpCtx)

+{

+	// Note: Choose an exact match if possible.

+

+	int				i;

+	DWORD			area;

+	DWORD			bestarea;

+	DDSURFACEDESC2	*lpDDSD		= NULL;	// Mode list pointer

+	DDSURFACEDESC2	*lpBestDDSD = NULL;	// Pointer to best

+

+	lpDDSD = glb.lpDisplayModes;

+	for (i=0; i<glb.nDisplayModeCount; i++, lpDDSD++) {

+		if ((lpDDSD->dwWidth == lpCtx->dwWidth) &&

+			(lpDDSD->dwHeight == lpCtx->dwHeight))

+			goto matched; // Mode has been exactly matched

+		// Choose modes that are larger in both dimensions than

+		// the window, but smaller in area than the current best.

+		if ( (lpDDSD->dwWidth >= lpCtx->dwWidth) &&

+			 (lpDDSD->dwHeight >= lpCtx->dwHeight))

+		{

+			if (lpBestDDSD == NULL) {

+				lpBestDDSD = lpDDSD;

+				bestarea = lpDDSD->dwWidth * lpDDSD->dwHeight;

+				continue;

+			}

+			area = lpDDSD->dwWidth * lpDDSD->dwHeight;

+			if (area < bestarea) {

+				lpBestDDSD = lpDDSD;

+				bestarea = area;

+			}

+		}

+	}

+

+	// Safety check

+	if (lpBestDDSD == NULL) {

+		ddlogMessage(DDLOG_CRITICAL, "dglChooseDisplayMode");

+		return;

+	}

+

+	lpCtx->dwModeWidth = lpBestDDSD->dwWidth;

+	lpCtx->dwModeHeight = lpBestDDSD->dwHeight;

+matched:

+	ddlogPrintf(DDLOG_INFO, "Matched (%ldx%ld) to (%ldx%ld)",

+		lpCtx->dwWidth, lpCtx->dwHeight, lpCtx->dwModeWidth, lpCtx->dwModeHeight);

+}

+#endif // _USE_GLD3_WGL

+// ***********************************************************************

+

+static BOOL IsDevice(

+	DWORD *lpDeviceIdList,

+	DWORD dwDeviceId,

+	int count)

+{

+	int i;

+

+	for (i=0; i<count; i++)

+		if (dwDeviceId == lpDeviceIdList[i])

+			return TRUE;

+

+	return FALSE;

+}

+

+// ***********************************************************************

+

+void dglTestForBrokenCards(

+	DGL_ctx *lpCtx)

+{

+#ifndef _GLD3

+	DDDEVICEIDENTIFIER	dddi; // DX6 device identifier

+

+	// Sanity check.

+	if (lpCtx == NULL) {

+		// Testing for broken cards is sensitive area, so we don't want

+		// anything saying "broken cards" in the error message. ;)

+		ddlogMessage(DDLOG_ERROR, "Null context passed to TFBC\n");

+		return;

+	}

+

+	if (lpCtx->lpDD4 == NULL) {

+		// Testing for broken cards is sensitive area, so we don't want

+		// anything saying "broken cards" in the error message. ;)

+		ddlogMessage(DDLOG_ERROR, "Null DD4 passed to TFBC\n");

+		return;

+	}

+

+	// Microsoft really fucked up with the GetDeviceIdentifier function

+	// on Windows 2000, since it locks up on stock driers on the CD. Updated

+	// drivers from vendors appear to work, but we can't identify the drivers

+	// without this function!!! For now we skip these tests on Windows 2000.

+	if ((GetVersion() & 0x80000000UL) == 0)

+		return;

+

+	// Obtain device info

+	if (FAILED(IDirectDraw4_GetDeviceIdentifier(lpCtx->lpDD4, &dddi, 0)))

+		return;

+

+	// Useful info. Log it.

+	ddlogPrintf(DDLOG_INFO, "DirectDraw: VendorId=0x%x, DeviceId=0x%x", dddi.dwVendorId, dddi.dwDeviceId);

+

+	// Vendor 1: ATI

+	if (dddi.dwVendorId == VENDORID_ATI) {

+		// Test A: ATI Rage PRO

+		if (IsDevice(devATIRagePro, dddi.dwDeviceId, sizeof(devATIRagePro)))

+			glb.bUseMipmaps = FALSE;

+		// Test B: ATI Rage II+

+		if (IsDevice(devATIRageIIplus, dddi.dwDeviceId, sizeof(devATIRageIIplus)))

+			glb.bEmulateAlphaTest = TRUE;

+	}

+

+	// Vendor 2: Matrox

+	if (dddi.dwVendorId == 0x102B) {

+		// Test: Matrox G400 stencil buffer support does not work for AutoCAD

+		if (dddi.dwDeviceId == 0x0525) {

+			lpCtx->lpPF->pfd.cStencilBits = 0;

+			if (lpCtx->lpPF->iZBufferPF != -1) {

+				glb.lpZBufferPF[lpCtx->lpPF->iZBufferPF].dwStencilBitDepth = 0;

+				glb.lpZBufferPF[lpCtx->lpPF->iZBufferPF].dwStencilBitMask = 0;

+				glb.lpZBufferPF[lpCtx->lpPF->iZBufferPF].dwFlags &= ~DDPF_STENCILBUFFER;

+			}

+		}

+	}

+#endif // _GLD3

+}

+

+// ***********************************************************************

+

+BOOL dglCreateContextBuffers(

+	HDC a,

+	DGL_ctx *lpCtx,

+	BOOL bFallback)

+{

+	HRESULT				hResult;

+

+	int					i;

+//	HGLRC				hGLRC;

+//	DGL_ctx*			lpCtx;

+

+#ifndef _USE_GLD3_WGL

+	DWORD				dwFlags;

+	DDSURFACEDESC2		ddsd2;

+	DDSCAPS2			ddscaps2;

+	LPDIRECTDRAWCLIPPER	lpddClipper;

+	D3DDEVICEDESC		D3DHWDevDesc;	// Direct3D Hardware description

+	D3DDEVICEDESC		D3DHELDevDesc;	// Direct3D Hardware Emulation Layer

+#endif // _USE_GLD3_WGL

+

+	float				inv_aspect;

+

+	GLenum				bDoubleBuffer;	// TRUE if double buffer required

+	GLenum				bDepthBuffer;	// TRUE if depth buffer required

+

+	const PIXELFORMATDESCRIPTOR	*lpPFD = &lpCtx->lpPF->pfd;

+

+	// Vars for Mesa visual

+	DWORD				dwDepthBits		= 0;

+	DWORD				dwStencilBits	= 0;

+	DWORD				dwAlphaBits		= 0;

+	DWORD				bAlphaSW		= GL_FALSE;

+	DWORD				bDouble			= GL_FALSE;

+

+	DDSURFACEDESC2 		ddsd2DisplayMode;

+	BOOL				bFullScrnWin	= FALSE;	// fullscreen-size window ?

+	DDBLTFX 			ddbltfx;

+	DWORD				dwMemoryType 	= (bFallback) ? DDSCAPS_SYSTEMMEMORY : glb.dwMemoryType;

+	BOOL				bBogusWindow	= FALSE;	// non-drawable window ?

+	DWORD               dwColorRef      = 0;        // GDI background color

+	RECT				rcDst;						// GDI window rect

+	POINT				pt;							// GDI window point

+

+	// Palette used for creating default global palette

+	PALETTEENTRY	ppe[256];

+

+#ifndef _USE_GLD3_WGL

+	// Vertex buffer description. Used for creation of vertex buffers

+	D3DVERTEXBUFFERDESC vbufdesc;

+#endif // _USE_GLD3_WGL

+

+#define DDLOG_CRITICAL_OR_WARN	(bFallback ? DDLOG_CRITICAL : DDLOG_WARN)

+

+	ddlogPrintf(DDLOG_SYSTEM, "dglCreateContextBuffers for HDC=%X", a);

+    nContextError = GLDERR_NONE;

+

+#ifdef GLD_THREADS

+	// Serialize access to DirectDraw object creation or DDS start

+	if (glb.bMultiThreaded)

+		EnterCriticalSection(&CriticalSection);

+#endif

+

+	// Check for back buffer

+	bDoubleBuffer = GL_TRUE; //(lpPFD->dwFlags & PFD_DOUBLEBUFFER) ? GL_TRUE : GL_FALSE;

+	// Since we always do back buffering, check if we emulate front buffering

+	lpCtx->EmulateSingle =

+		(lpPFD->dwFlags & PFD_DOUBLEBUFFER) ? FALSE : TRUE;

+#if 0	// Don't have to mimic MS OpenGL behavior for front-buffering (DaveM)

+	lpCtx->EmulateSingle |=

+		(lpPFD->dwFlags & PFD_SUPPORT_GDI) ? TRUE : FALSE;

+#endif

+

+	// Check for depth buffer

+	bDepthBuffer = (lpPFD->cDepthBits) ? GL_TRUE : GL_FALSE;

+

+	lpCtx->bDoubleBuffer = bDoubleBuffer;

+	lpCtx->bDepthBuffer = bDepthBuffer;

+

+	// Set the Fullscreen flag for the context.

+//	lpCtx->bFullscreen = glb.bFullscreen;

+

+	// Obtain the dimensions of the rendering window

+	lpCtx->hDC = a; // Cache DC

+	lpCtx->hWnd = WindowFromDC(lpCtx->hDC);

+	// Check for non-window DC = memory DC ?

+	if (lpCtx->hWnd == NULL) {

+        // bitmap memory contexts are always single-buffered

+        lpCtx->EmulateSingle = TRUE;

+		bBogusWindow = TRUE;

+		ddlogPrintf(DDLOG_INFO, "Non-Window Memory Device Context");

+		if (GetClipBox(lpCtx->hDC, &lpCtx->rcScreenRect) == ERROR) {

+			ddlogMessage(DDLOG_WARN, "GetClipBox failed in dglCreateContext\n");

+			SetRect(&lpCtx->rcScreenRect, 0, 0, 0, 0);

+		}

+	}

+	else if (!GetClientRect(lpCtx->hWnd, &lpCtx->rcScreenRect)) {

+		bBogusWindow = TRUE;

+		ddlogMessage(DDLOG_WARN, "GetClientRect failed in dglCreateContext\n");

+		SetRect(&lpCtx->rcScreenRect, 0, 0, 0, 0);

+	}

+	lpCtx->dwWidth = lpCtx->rcScreenRect.right - lpCtx->rcScreenRect.left;

+	lpCtx->dwHeight = lpCtx->rcScreenRect.bottom - lpCtx->rcScreenRect.top;

+

+	ddlogPrintf(DDLOG_INFO, "Input window %X: w=%i, h=%i",

+							lpCtx->hWnd, lpCtx->dwWidth, lpCtx->dwHeight);

+

+	// What if app only zeroes one dimension instead of both? (DaveM)

+	if ( (lpCtx->dwWidth == 0) || (lpCtx->dwHeight == 0) ) {

+		// Make the buffer size something sensible

+		lpCtx->dwWidth = 8;

+		lpCtx->dwHeight = 8;

+	}

+

+	// Set defaults

+	lpCtx->dwModeWidth = lpCtx->dwWidth;

+	lpCtx->dwModeHeight = lpCtx->dwHeight;

+/*

+	// Find best display mode for fullscreen

+	if (glb.bFullscreen || !glb.bPrimary) {

+		dglChooseDisplayMode(lpCtx);

+	}

+*/

+	// Misc initialisation

+	lpCtx->bCanRender = FALSE; // No rendering allowed yet

+	lpCtx->bSceneStarted = FALSE;

+	lpCtx->bFrameStarted = FALSE;

+

+	// Detect OS (specifically 'Windows 2000' or 'Windows XP')

+	DetectOS();

+

+	// NOTE: WinNT not supported

+	ddlogPrintf(DDLOG_INFO, "OS: %s", bHaveWin95 ? "Win9x" : (bHaveWin2K ? "Win2000/XP" : "Unsupported") );

+

+	// Test for Fullscreen

+	if (bHaveWin95) { // Problems with fullscreen on Win2K/XP

+		if ((GetSystemMetrics(SM_CXSCREEN) == lpCtx->dwWidth) && 

+			(GetSystemMetrics(SM_CYSCREEN) == lpCtx->dwHeight))

+		{

+			// Workaround for some apps that crash when going fullscreen.

+			//lpCtx->bFullscreen = TRUE;

+		}

+		

+	}

+

+#ifdef _USE_GLD3_WGL

+	_gldDriver.CreateDrawable(lpCtx, glb.bDirectDrawPersistant, glb.bPersistantBuffers);

+#else

+	// Check if DirectDraw has already been created by original GLRC (DaveM)

+	if (glb.bDirectDrawPersistant && glb.bDirectDraw) {

+		lpCtx->lpDD4 = glb.lpDD4;

+		IDirectDraw4_AddRef(lpCtx->lpDD4);

+		goto SkipDirectDrawCreate;

+	}

+

+	// Create DirectDraw object

+	if (glb.bPrimary)

+		hResult = DirectDrawCreate(NULL, &lpCtx->lpDD1, NULL);

+	else {

+		// A non-primary device is to be used.

+		// Force context to be Fullscreen, secondary adaptors can not

+		// be used in a window.

+		hResult = DirectDrawCreate(&glb.ddGuid, &lpCtx->lpDD1, NULL);

+		lpCtx->bFullscreen = TRUE;

+	}

+	if (FAILED(hResult)) {

+		MessageBox(NULL, "Unable to initialize DirectDraw", "GLDirect", MB_OK);

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to create DirectDraw interface", hResult);

+        nContextError = GLDERR_DDRAW;

+		goto return_with_error;

+	}

+

+	// Query for DX6 IDirectDraw4.

+	hResult = IDirectDraw_QueryInterface(lpCtx->lpDD1,

+										 &IID_IDirectDraw4,

+										 (void**)&lpCtx->lpDD4);

+	if (FAILED(hResult)) {

+		MessageBox(NULL, "GLDirect requires DirectX 6.0 or above", "GLDirect", MB_OK);

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to create DirectDraw4 interface", hResult);

+        nContextError = GLDERR_DDRAW;

+		goto return_with_error;

+	}

+

+	// Cache DirectDraw interface for subsequent GLRCs

+	if (glb.bDirectDrawPersistant && !glb.bDirectDraw) {

+		glb.lpDD4 = lpCtx->lpDD4;

+		IDirectDraw4_AddRef(glb.lpDD4);

+		glb.bDirectDraw = TRUE;

+	}

+SkipDirectDrawCreate:

+

+	// Now we have a DD4 interface we can check for broken cards

+	dglTestForBrokenCards(lpCtx);

+

+	// Test if primary device can use flipping instead of blitting

+	ZeroMemory(&ddsd2DisplayMode, sizeof(ddsd2DisplayMode));

+	ddsd2DisplayMode.dwSize = sizeof(ddsd2DisplayMode);

+	hResult = IDirectDraw4_GetDisplayMode(

+					lpCtx->lpDD4,

+					&ddsd2DisplayMode);

+	if (SUCCEEDED(hResult)) {

+		if ( (lpCtx->dwWidth == ddsd2DisplayMode.dwWidth) &&

+				 (lpCtx->dwHeight == ddsd2DisplayMode.dwHeight) ) {

+			// We have a fullscreen-size window

+			bFullScrnWin = TRUE;

+			// OK to use DirectDraw fullscreen mode ?

+			if (glb.bPrimary && !glb.bFullscreenBlit && !lpCtx->EmulateSingle && !glb.bDirectDrawPersistant) {

+				lpCtx->bFullscreen = TRUE;

+				ddlogMessage(DDLOG_INFO, "Primary upgraded to page flipping.\n");

+			}

+		}

+		// Cache the display mode dimensions

+		lpCtx->dwModeWidth = ddsd2DisplayMode.dwWidth;

+		lpCtx->dwModeHeight = ddsd2DisplayMode.dwHeight;

+	}

+

+	// Clamp the effective window dimensions to primary surface.

+	// We need to do this for D3D viewport dimensions even if wide

+	// surfaces are supported. This also is a good idea for handling

+	// whacked-out window dimensions passed for non-drawable windows

+	// like Solid Edge. (DaveM)

+	if (lpCtx->dwWidth > ddsd2DisplayMode.dwWidth)

+		lpCtx->dwWidth = ddsd2DisplayMode.dwWidth;

+	if (lpCtx->dwHeight > ddsd2DisplayMode.dwHeight)

+		lpCtx->dwHeight = ddsd2DisplayMode.dwHeight;

+

+	// Check for non-RGB desktop resolution

+	if (!lpCtx->bFullscreen && ddsd2DisplayMode.ddpfPixelFormat.dwRGBBitCount <= 8) {

+		ddlogPrintf(DDLOG_CRITICAL_OR_WARN, "Desktop color depth %d bpp not supported",

+			ddsd2DisplayMode.ddpfPixelFormat.dwRGBBitCount);

+        nContextError = GLDERR_BPP;

+		goto return_with_error;

+	}

+#endif // _USE_GLD3_WGL

+

+	ddlogPrintf(DDLOG_INFO, "Window: w=%i, h=%i (%s)",

+							lpCtx->dwWidth,

+							lpCtx->dwHeight,

+							lpCtx->bFullscreen ? "fullscreen" : "windowed");

+

+#ifndef _USE_GLD3_WGL

+	// Obtain ddraw caps

+    ZeroMemory(&lpCtx->ddCaps, sizeof(DDCAPS));

+	lpCtx->ddCaps.dwSize = sizeof(DDCAPS);

+	if (glb.bHardware) {

+		// Get HAL caps

+		IDirectDraw4_GetCaps(lpCtx->lpDD4, &lpCtx->ddCaps, NULL);

+	} else {

+		// Get HEL caps

+		IDirectDraw4_GetCaps(lpCtx->lpDD4, NULL, &lpCtx->ddCaps);

+	}

+

+	// If this flag is present then we can't default to Mesa

+	// SW rendering between BeginScene() and EndScene().

+	if (lpCtx->ddCaps.dwCaps2 & DDCAPS2_NO2DDURING3DSCENE) {

+		ddlogMessage(DDLOG_INFO,

+			"Warning          : No 2D allowed during 3D scene.\n");

+	}

+

+	// Query for DX6 Direct3D3 interface

+	hResult = IDirectDraw4_QueryInterface(lpCtx->lpDD4,

+										  &IID_IDirect3D3,

+										  (void**)&lpCtx->lpD3D3);

+	if (FAILED(hResult)) {

+		MessageBox(NULL, "Unable to initialize Direct3D", "GLDirect", MB_OK);

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to create Direct3D interface", hResult);

+        nContextError = GLDERR_D3D;

+		goto return_with_error;

+	}

+

+	// Context creation

+	if (lpCtx->bFullscreen) {

+		// FULLSCREEN

+

+        // Disable warning popups when in fullscreen mode

+        ddlogWarnOption(FALSE);

+

+		// Have to release persistant primary surface if fullscreen mode

+		if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary) {

+			RELEASE(glb.lpPrimary4);

+			glb.bDirectDrawPrimary = FALSE;

+		}

+

+		dwFlags = DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_ALLOWREBOOT;

+		if (glb.bFastFPU)

+			dwFlags |= DDSCL_FPUSETUP;	// fast FPU setup optional (DaveM)

+		hResult = IDirectDraw4_SetCooperativeLevel(lpCtx->lpDD4, lpCtx->hWnd, dwFlags);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to set Exclusive Fullscreen mode", hResult);

+			goto return_with_error;

+		}

+

+		hResult = IDirectDraw4_SetDisplayMode(lpCtx->lpDD4,

+											  lpCtx->dwModeWidth,

+											  lpCtx->dwModeHeight,

+											  lpPFD->cColorBits,

+											  0,

+											  0);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "SetDisplayMode failed", hResult);

+			goto return_with_error;

+		}

+

+		// ** The display mode has changed, so dont use MessageBox! **

+

+		ZeroMemory(&ddsd2, sizeof(ddsd2));

+		ddsd2.dwSize = sizeof(ddsd2);

+

+		if (bDoubleBuffer) {

+			// Double buffered

+			// Primary surface

+			ddsd2.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT;

+			ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE |

+								   DDSCAPS_FLIP |

+								   DDSCAPS_COMPLEX |

+								   DDSCAPS_3DDEVICE |

+								   dwMemoryType;

+			ddsd2.dwBackBufferCount = 1;

+

+			hResult = IDirectDraw4_CreateSurface(lpCtx->lpDD4, &ddsd2, &lpCtx->lpFront4, NULL);

+			if (FAILED(hResult)) {

+				ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateSurface (primary) failed", hResult);

+                nContextError = GLDERR_MEM;

+				goto return_with_error;

+			}

+

+			// Render target surface

+			ZeroMemory(&ddscaps2, sizeof(ddscaps2)); // Clear the entire struct.

+			ddscaps2.dwCaps = DDSCAPS_BACKBUFFER;

+			hResult = IDirectDrawSurface4_GetAttachedSurface(lpCtx->lpFront4, &ddscaps2, &lpCtx->lpBack4);

+			if (FAILED(hResult)) {

+				ddlogError(DDLOG_CRITICAL_OR_WARN, "GetAttachedSurface failed", hResult);

+                nContextError = GLDERR_MEM;

+				goto return_with_error;

+			}

+		} else {

+			// Single buffered

+			// Primary surface

+			ddsd2.dwFlags = DDSD_CAPS;

+			ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE |

+								   //DDSCAPS_3DDEVICE |

+								   dwMemoryType;

+

+			hResult = IDirectDraw4_CreateSurface(lpCtx->lpDD4, &ddsd2, &lpCtx->lpFront4, NULL);

+			if (FAILED(hResult)) {

+				ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateSurface (primary) failed", hResult);

+                nContextError = GLDERR_MEM;

+				goto return_with_error;

+			}

+

+			lpCtx->lpBack4 = NULL;

+		}

+	} else {

+		// WINDOWED

+

+        // OK to enable warning popups in windowed mode

+        ddlogWarnOption(glb.bMessageBoxWarnings);

+

+		dwFlags = DDSCL_NORMAL;

+		if (glb.bMultiThreaded)

+			dwFlags |= DDSCL_MULTITHREADED;

+		if (glb.bFastFPU)

+			dwFlags |= DDSCL_FPUSETUP;	// fast FPU setup optional (DaveM)

+		hResult = IDirectDraw4_SetCooperativeLevel(lpCtx->lpDD4,

+												  lpCtx->hWnd,

+												  dwFlags);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to set Normal coop level", hResult);

+			goto return_with_error;

+		}

+		// Has Primary surface already been created for original GLRC ?

+		// Note this can only be applicable for windowed modes

+		if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary) {

+			lpCtx->lpFront4 = glb.lpPrimary4;

+			IDirectDrawSurface4_AddRef(lpCtx->lpFront4);

+			// Update the window on the default clipper

+			IDirectDrawSurface4_GetClipper(lpCtx->lpFront4, &lpddClipper);

+			IDirectDrawClipper_SetHWnd(lpddClipper, 0, lpCtx->hWnd);

+			IDirectDrawClipper_Release(lpddClipper);

+			goto SkipPrimaryCreate;

+		}

+

+		// Primary surface

+		ZeroMemory(&ddsd2, sizeof(ddsd2));

+		ddsd2.dwSize = sizeof(ddsd2);

+		ddsd2.dwFlags = DDSD_CAPS;

+		ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;

+		hResult = IDirectDraw4_CreateSurface(lpCtx->lpDD4, &ddsd2, &lpCtx->lpFront4, NULL);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateSurface (primary) failed", hResult);

+            nContextError = GLDERR_MEM;

+			goto return_with_error;

+		}

+

+		// Cache Primary surface for subsequent GLRCs

+		// Note this can only be applicable to subsequent windowed modes

+		if (glb.bDirectDrawPersistant && !glb.bDirectDrawPrimary) {

+			glb.lpPrimary4 = lpCtx->lpFront4;

+			IDirectDrawSurface4_AddRef(glb.lpPrimary4);

+			glb.bDirectDrawPrimary = TRUE;

+		}

+

+		// Clipper object

+		hResult = DirectDrawCreateClipper(0, &lpddClipper, NULL);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateClipper failed", hResult);

+			goto return_with_error;

+		}

+		hResult = IDirectDrawClipper_SetHWnd(lpddClipper, 0, lpCtx->hWnd);

+		if (FAILED(hResult)) {

+			RELEASE(lpddClipper);

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "SetHWnd failed", hResult);

+			goto return_with_error;

+		}

+		hResult = IDirectDrawSurface4_SetClipper(lpCtx->lpFront4, lpddClipper);

+		RELEASE(lpddClipper); // We have finished with it.

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "SetClipper failed", hResult);

+			goto return_with_error;

+		}

+SkipPrimaryCreate:

+

+		if (bDoubleBuffer) {

+			// Render target surface

+			ZeroMemory(&ddsd2, sizeof(ddsd2));

+			ddsd2.dwSize = sizeof(ddsd2);

+			ddsd2.dwFlags        = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;

+			ddsd2.dwWidth        = lpCtx->dwWidth;

+			ddsd2.dwHeight       = lpCtx->dwHeight;

+			ddsd2.ddsCaps.dwCaps = DDSCAPS_3DDEVICE |

+								   DDSCAPS_OFFSCREENPLAIN |

+								   dwMemoryType;

+

+			// Reserve the entire desktop size for persistant buffers option

+			if (glb.bDirectDrawPersistant && glb.bPersistantBuffers) {

+				ddsd2.dwWidth = ddsd2DisplayMode.dwWidth;

+				ddsd2.dwHeight = ddsd2DisplayMode.dwHeight;

+			}

+			// Re-use original back buffer if persistant buffers exist

+			if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && glb.lpBack4)

+				hResult = IDirectDrawSurface4_AddRef(lpCtx->lpBack4 = glb.lpBack4);

+			else

+				hResult = IDirectDraw4_CreateSurface(lpCtx->lpDD4, &ddsd2, &lpCtx->lpBack4, NULL);

+			if (FAILED(hResult)) {

+				ddlogError(DDLOG_CRITICAL_OR_WARN, "Create Backbuffer failed", hResult);

+                nContextError = GLDERR_MEM;

+				goto return_with_error;

+			}

+			if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && !glb.lpBack4)

+				IDirectDrawSurface4_AddRef(glb.lpBack4 = lpCtx->lpBack4);

+		} else {

+			lpCtx->lpBack4 = NULL;

+		}

+	}

+

+	//

+	// Now create the Z-buffer

+	//

+	lpCtx->bStencil = FALSE; // Default to no stencil buffer

+	if (bDepthBuffer && (lpCtx->lpPF->iZBufferPF != -1)) {

+		// Get z-buffer dimensions from the render target

+		// Setup the surface desc for the z-buffer.

+		ZeroMemory(&ddsd2, sizeof(ddsd2));

+		ddsd2.dwSize = sizeof(ddsd2);

+		ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;

+		ddsd2.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | dwMemoryType;

+		ddsd2.dwWidth = lpCtx->dwWidth;

+		ddsd2.dwHeight = lpCtx->dwHeight;

+		memcpy(&ddsd2.ddpfPixelFormat,

+			&glb.lpZBufferPF[lpCtx->lpPF->iZBufferPF],

+			sizeof(DDPIXELFORMAT) );

+

+		// Reserve the entire desktop size for persistant buffers option

+		if (glb.bDirectDrawPersistant && glb.bPersistantBuffers) {

+			ddsd2.dwWidth = ddsd2DisplayMode.dwWidth;

+			ddsd2.dwHeight = ddsd2DisplayMode.dwHeight;

+		}

+

+		// Create a z-buffer

+		if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && glb.lpDepth4)

+			hResult = IDirectDrawSurface4_AddRef(lpCtx->lpDepth4 = glb.lpDepth4);

+		else

+			hResult = IDirectDraw4_CreateSurface(lpCtx->lpDD4, &ddsd2, &lpCtx->lpDepth4, NULL);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateSurface (ZBuffer) failed", hResult);

+            nContextError = GLDERR_MEM;

+			goto return_with_error;

+		}

+		if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && !glb.lpDepth4)

+			IDirectDrawSurface4_AddRef(glb.lpDepth4 = lpCtx->lpDepth4);

+		else if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && glb.lpDepth4 && glb.lpBack4)

+			IDirectDrawSurface4_DeleteAttachedSurface(glb.lpBack4, 0, glb.lpDepth4);

+

+		// Attach Zbuffer to render target

+		TRY(IDirectDrawSurface4_AddAttachedSurface(

+			bDoubleBuffer ? lpCtx->lpBack4 : lpCtx->lpFront4,

+			lpCtx->lpDepth4),

+			"dglCreateContext: Attach Zbuffer");

+		if (glb.lpZBufferPF[lpCtx->lpPF->iZBufferPF].dwFlags & DDPF_STENCILBUFFER) {

+			lpCtx->bStencil = TRUE;

+			ddlogMessage(DDLOG_INFO, "Depth buffer has stencil\n");

+		}

+	}

+

+	// Clear all back buffers and Z-buffers in case of memory recycling.

+	ZeroMemory(&ddbltfx, sizeof(ddbltfx));

+	ddbltfx.dwSize = sizeof(ddbltfx);

+	IDirectDrawSurface4_Blt(lpCtx->lpBack4, NULL, NULL, NULL,

+		DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx);

+	if (lpCtx->lpDepth4)

+		IDirectDrawSurface4_Blt(lpCtx->lpDepth4, NULL, NULL, NULL,

+			DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx);

+

+	// Now that we have a Z-buffer we can create the 3D device

+	hResult = IDirect3D3_CreateDevice(lpCtx->lpD3D3,

+									  &glb.d3dGuid,

+									  bDoubleBuffer ? lpCtx->lpBack4 : lpCtx->lpFront4,

+									  &lpCtx->lpDev3,

+									  NULL);

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "Unable to create Direct3D device", hResult);

+        nContextError = GLDERR_D3D;

+		goto return_with_error;

+	}

+

+	// We must do this as soon as the device is created

+	dglInitStateCaches(lpCtx);

+

+	// Obtain the D3D Device Description

+	D3DHWDevDesc.dwSize = D3DHELDevDesc.dwSize = sizeof(D3DDEVICEDESC);

+	TRY(IDirect3DDevice3_GetCaps(lpCtx->lpDev3,

+								 &D3DHWDevDesc,

+								 &D3DHELDevDesc),

+								 "dglCreateContext: GetCaps failed");

+

+	// Choose the relevant description and cache it in the context.

+	// We will use this description later for caps checking

+	memcpy(	&lpCtx->D3DDevDesc,

+			glb.bHardware ? &D3DHWDevDesc : &D3DHELDevDesc,

+			sizeof(D3DDEVICEDESC));

+

+	// Now we can examine the texture formats

+	if (!dglBuildTextureFormatList(lpCtx->lpDev3)) {

+		ddlogMessage(DDLOG_CRITICAL_OR_WARN, "dglBuildTextureFormatList failed\n");

+		goto return_with_error;

+	}

+

+	// Get the pixel format of the back buffer

+	lpCtx->ddpfRender.dwSize = sizeof(lpCtx->ddpfRender);

+	if (bDoubleBuffer)

+		hResult = IDirectDrawSurface4_GetPixelFormat(

+					lpCtx->lpBack4,

+					&lpCtx->ddpfRender);

+	else

+		hResult = IDirectDrawSurface4_GetPixelFormat(

+					lpCtx->lpFront4,

+					&lpCtx->ddpfRender);

+

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "GetPixelFormat failed", hResult);

+		goto return_with_error;

+	}

+	// Find a pixel packing function suitable for this surface

+	pxClassifyPixelFormat(&lpCtx->ddpfRender,

+						  &lpCtx->fnPackFunc,

+						  &lpCtx->fnUnpackFunc,

+						  &lpCtx->fnPackSpanFunc);

+

+	// Viewport

+	hResult = IDirect3D3_CreateViewport(lpCtx->lpD3D3, &lpCtx->lpViewport3, NULL);

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateViewport failed", hResult);

+		goto return_with_error;

+	}

+

+	hResult = IDirect3DDevice3_AddViewport(lpCtx->lpDev3, lpCtx->lpViewport3);

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "AddViewport failed", hResult);

+		goto return_with_error;

+	}

+

+	// Initialise the viewport

+	// Note screen coordinates are used for viewport clipping since D3D

+	// transform operations are not used in the GLD CAD driver. (DaveM)

+	inv_aspect = (float)lpCtx->dwHeight/(float)lpCtx->dwWidth;

+

+	lpCtx->d3dViewport.dwSize = sizeof(lpCtx->d3dViewport);

+	lpCtx->d3dViewport.dwX = 0;

+	lpCtx->d3dViewport.dwY = 0;

+	lpCtx->d3dViewport.dwWidth = lpCtx->dwWidth;

+	lpCtx->d3dViewport.dwHeight = lpCtx->dwHeight;

+	lpCtx->d3dViewport.dvClipX = 0; // -1.0f;

+	lpCtx->d3dViewport.dvClipY = 0; // inv_aspect;

+	lpCtx->d3dViewport.dvClipWidth = lpCtx->dwWidth; // 2.0f;

+	lpCtx->d3dViewport.dvClipHeight = lpCtx->dwHeight; // 2.0f * inv_aspect;

+	lpCtx->d3dViewport.dvMinZ = 0.0f;

+	lpCtx->d3dViewport.dvMaxZ = 1.0f;

+	TRY(IDirect3DViewport3_SetViewport2(lpCtx->lpViewport3, &lpCtx->d3dViewport), "dglCreateContext: SetViewport2");

+

+	hResult = IDirect3DDevice3_SetCurrentViewport(lpCtx->lpDev3, lpCtx->lpViewport3);

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "SetCurrentViewport failed", hResult);

+		goto return_with_error;

+	}

+

+	lpCtx->dwBPP = lpPFD->cColorBits;

+	lpCtx->iZBufferPF = lpCtx->lpPF->iZBufferPF;

+

+	// Set last texture to NULL

+	for (i=0; i<MAX_TEXTURE_UNITS; i++) {

+		lpCtx->ColorOp[i] = D3DTOP_DISABLE;

+		lpCtx->AlphaOp[i] = D3DTOP_DISABLE;

+		lpCtx->tObj[i] = NULL;

+	}

+

+	// Default to perspective correct texture mapping

+	dglSetRenderState(lpCtx, D3DRENDERSTATE_TEXTUREPERSPECTIVE, TRUE, "TexturePersp");

+

+	// Set the default culling mode

+	lpCtx->cullmode = D3DCULL_NONE;

+	dglSetRenderState(lpCtx, D3DRENDERSTATE_CULLMODE, D3DCULL_NONE, "CullMode");

+

+	// Disable specular

+	dglSetRenderState(lpCtx, D3DRENDERSTATE_SPECULARENABLE, FALSE, "SpecularEnable");

+	// Disable subpixel correction

+//	dglSetRenderState(lpCtx, D3DRENDERSTATE_SUBPIXEL, FALSE, "SubpixelEnable");

+	// Disable dithering

+	dglSetRenderState(lpCtx, D3DRENDERSTATE_DITHERENABLE, FALSE, "DitherEnable");

+

+	// Initialise the primitive caches

+//	lpCtx->dwNextLineVert	= 0;

+//	lpCtx->dwNextTriVert	= 0;

+

+	// Init the global texture palette

+	lpCtx->lpGlobalPalette = NULL;

+

+	// Init the HW/SW usage counters

+//	lpCtx->dwHWUsageCount = lpCtx->dwSWUsageCount = 0L;

+

+	//

+	// Create two D3D vertex buffers.

+	// One will hold the pre-transformed data with the other one

+	// being used to hold the post-transformed & clipped verts.

+	//

+#if 0  // never used (DaveM)

+	vbufdesc.dwSize = sizeof(D3DVERTEXBUFFERDESC);

+	vbufdesc.dwCaps = D3DVBCAPS_WRITEONLY;

+	if (glb.bHardware == FALSE)

+		vbufdesc.dwCaps = D3DVBCAPS_SYSTEMMEMORY;

+	vbufdesc.dwNumVertices = 32768; // For the time being

+

+	// Source vertex buffer

+	vbufdesc.dwFVF = DGL_LVERTEX;

+	hResult = IDirect3D3_CreateVertexBuffer(lpCtx->lpD3D3, &vbufdesc, &lpCtx->m_vbuf, 0, NULL);

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateVertexBuffer(src) failed", hResult);

+		goto return_with_error;

+	}

+

+	// Destination vertex buffer

+	vbufdesc.dwFVF = (glb.bMultitexture == FALSE) ? D3DFVF_TLVERTEX : (D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX2);

+	hResult = IDirect3D3_CreateVertexBuffer(lpCtx->lpD3D3, &vbufdesc, &lpCtx->m_pvbuf, 0, NULL);

+	if(FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "CreateVertexBuffer(dst) failed", hResult);

+		goto return_with_error;

+	}

+#endif

+

+#endif _USE_GLD3_WGL

+

+	//

+	//	Now create the Mesa context

+	//

+

+	// Create the Mesa visual

+	if (lpPFD->cDepthBits)

+		dwDepthBits = 16;

+	if (lpPFD->cStencilBits)

+		dwStencilBits = 8;

+	if (lpPFD->cAlphaBits) {

+		dwAlphaBits = 8;

+		bAlphaSW = GL_TRUE;

+	}

+	if (lpPFD->dwFlags & PFD_DOUBLEBUFFER)

+		bDouble = GL_TRUE;

+//	lpCtx->EmulateSingle =

+//		(lpPFD->dwFlags & PFD_DOUBLEBUFFER) ? FALSE : TRUE;

+

+#ifdef _USE_GLD3_WGL

+	lpCtx->glVis = _mesa_create_visual(

+		bDouble,    /* double buffer */

+		GL_FALSE,			// stereo

+		lpPFD->cRedBits,

+		lpPFD->cGreenBits,

+		lpPFD->cBlueBits,

+		dwAlphaBits,

+		dwDepthBits,

+		dwStencilBits,

+		lpPFD->cAccumRedBits,	// accum bits

+		lpPFD->cAccumGreenBits,	// accum bits

+		lpPFD->cAccumBlueBits,	// accum bits

+		lpPFD->cAccumAlphaBits,	// accum alpha bits

+		1				// num samples

+		);

+#else // _USE_GLD3_WGL

+	lpCtx->glVis = (*mesaFuncs.gl_create_visual)(

+		GL_TRUE,			// RGB mode

+		bAlphaSW,			// Is an alpha buffer required?

+		bDouble,			// Is an double-buffering required?

+		GL_FALSE,			// stereo

+		dwDepthBits,		// depth_size

+		dwStencilBits,		// stencil_size

+		lpPFD->cAccumBits,	// accum_size

+		0,					// colour-index bits

+		lpPFD->cRedBits,	// Red bit count

+		lpPFD->cGreenBits,	// Green bit count

+		lpPFD->cBlueBits,	// Blue bit count

+		dwAlphaBits			// Alpha bit count

+		);

+#endif // _USE_GLD3_WGL

+

+	if (lpCtx->glVis == NULL) {

+		ddlogMessage(DDLOG_CRITICAL_OR_WARN, "gl_create_visual failed\n");

+		goto return_with_error;

+	}

+

+#ifdef _USE_GLD3_WGL

+	lpCtx->glCtx = _mesa_create_context(API_OPENGL, lpCtx->glVis, NULL, (void *)lpCtx, GL_TRUE);

+#else

+	// Create the Mesa context

+	lpCtx->glCtx = (*mesaFuncs.gl_create_context)(

+					lpCtx->glVis,	// Mesa visual

+					NULL,			// share list context

+					(void *)lpCtx,	// Pointer to our driver context

+					GL_TRUE			// Direct context flag

+				   );

+#endif // _USE_GLD3_WGL

+

+	if (lpCtx->glCtx == NULL) {

+		ddlogMessage(DDLOG_CRITICAL_OR_WARN, "gl_create_context failed\n");

+		goto return_with_error;

+	}

+

+	// Create the Mesa framebuffer

+#ifdef _USE_GLD3_WGL

+	lpCtx->glBuffer = _mesa_create_framebuffer(

+		lpCtx->glVis,

+		lpCtx->glVis->depthBits > 0,

+		lpCtx->glVis->stencilBits > 0,

+		lpCtx->glVis->accumRedBits > 0,

+		GL_FALSE //swalpha

+		);

+#else

+	lpCtx->glBuffer = (*mesaFuncs.gl_create_framebuffer)(lpCtx->glVis);

+#endif // _USE_GLD3_WGL

+

+	if (lpCtx->glBuffer == NULL) {

+		ddlogMessage(DDLOG_CRITICAL_OR_WARN, "gl_create_framebuffer failed\n");

+		goto return_with_error;

+	}

+

+#ifdef _USE_GLD3_WGL

+	// Init Mesa internals

+	_swrast_CreateContext( lpCtx->glCtx );

+	_vbo_CreateContext( lpCtx->glCtx );

+	_tnl_CreateContext( lpCtx->glCtx );

+	_swsetup_CreateContext( lpCtx->glCtx );

+

+	_gldDriver.InitialiseMesa(lpCtx);

+	

+	lpCtx->glCtx->imports.warning	= _gld_mesa_warning;

+	lpCtx->glCtx->imports.fatal		= _gld_mesa_fatal;

+

+#else

+	// Tell Mesa how many texture stages we have

+	glb.wMaxSimultaneousTextures = lpCtx->D3DDevDesc.wMaxSimultaneousTextures;

+	// Only use as many Units as the spec requires

+	if (glb.wMaxSimultaneousTextures > MAX_TEXTURE_UNITS)

+		glb.wMaxSimultaneousTextures = MAX_TEXTURE_UNITS;

+	lpCtx->glCtx->Const.MaxTextureUnits = glb.wMaxSimultaneousTextures;

+	ddlogPrintf(DDLOG_INFO, "Texture stages   : %d", glb.wMaxSimultaneousTextures);

+

+	// Set the max texture size.

+	// NOTE: clamped to a max of 1024 for extra performance!

+	lpCtx->dwMaxTextureSize = (lpCtx->D3DDevDesc.dwMaxTextureWidth <= 1024) ? lpCtx->D3DDevDesc.dwMaxTextureWidth : 1024;

+

+// Texture resize takes place elsewhere. KH

+// NOTE: This was added to workaround an issue with the Intel app.

+#if 0

+	lpCtx->glCtx->Const.MaxTextureSize = lpCtx->dwMaxTextureSize;

+#else

+	lpCtx->glCtx->Const.MaxTextureSize = 1024;

+#endif

+	lpCtx->glCtx->Const.MaxDrawBuffers = 1;

+

+	// Setup the Display Driver pointers

+	dglSetupDDPointers(lpCtx->glCtx);

+

+	// Initialise all the Direct3D renderstates

+	dglInitStateD3D(lpCtx->glCtx);

+

+#if 0

+	// Signal a reload of texture state on next glBegin

+	lpCtx->m_texHandleValid = FALSE;

+	lpCtx->m_mtex = FALSE;

+	lpCtx->m_texturing = FALSE;

+#else

+	// Set default texture unit state

+//	dglSetTexture(lpCtx, 0, NULL);

+//	dglSetTexture(lpCtx, 1, NULL);

+#endif

+

+	//

+	// Set the global texture palette to default values.

+	//

+

+	// Clear the entire palette

+	ZeroMemory(ppe, sizeof(PALETTEENTRY) * 256);

+

+	// Fill the palette with a default colour.

+	// A garish colour is used to catch bugs. Here Magenta is used.

+	for (i=0; i < 256; i++) {

+		ppe[i].peRed	= 255;

+		ppe[i].peGreen	= 0;

+		ppe[i].peBlue	= 255;

+	}

+

+	RELEASE(lpCtx->lpGlobalPalette);

+

+	if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && glb.lpGlobalPalette)

+		hResult = IDirectDrawPalette_AddRef(lpCtx->lpGlobalPalette = glb.lpGlobalPalette);

+	else

+		hResult = IDirectDraw4_CreatePalette(

+				lpCtx->lpDD4,

+				DDPCAPS_INITIALIZE | DDPCAPS_8BIT | DDPCAPS_ALLOW256,

+				ppe,

+				&(lpCtx->lpGlobalPalette),

+				NULL);

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_ERROR, "Default CreatePalette failed\n", hResult);

+		lpCtx->lpGlobalPalette = NULL;

+		goto return_with_error;

+	}

+	if (glb.bDirectDrawPersistant && glb.bPersistantBuffers && !glb.lpGlobalPalette)

+		IDirectDrawPalette_AddRef(glb.lpGlobalPalette = lpCtx->lpGlobalPalette);

+

+#endif // _USE_GLD3_WGL

+

+	// ** If we have made it to here then we can enable rendering **

+	lpCtx->bCanRender = TRUE;

+

+//	ddlogMessage(DDLOG_SYSTEM, "dglCreateContextBuffers succeded\n");

+

+#ifdef GLD_THREADS

+	// Release serialized access

+	if (glb.bMultiThreaded)

+		LeaveCriticalSection(&CriticalSection);

+#endif

+

+	return TRUE;

+

+return_with_error:

+	// Clean up before returning.

+	// This is critical for secondary devices.

+

+	lpCtx->bCanRender = FALSE;

+

+#ifdef _USE_GLD3_WGL

+	// Destroy the Mesa context

+	if (lpCtx->glBuffer)

+		_mesa_destroy_framebuffer(lpCtx->glBuffer);

+	if (lpCtx->glCtx)

+		_mesa_destroy_context(lpCtx->glCtx);

+	if (lpCtx->glVis)

+		_mesa_destroy_visual(lpCtx->glVis);

+

+	// Destroy driver data

+	_gldDriver.DestroyDrawable(lpCtx);

+#else

+	// Destroy the Mesa context

+	if (lpCtx->glBuffer)

+		(*mesaFuncs.gl_destroy_framebuffer)(lpCtx->glBuffer);

+	if (lpCtx->glCtx)

+		(*mesaFuncs.gl_destroy_context)(lpCtx->glCtx);

+	if (lpCtx->glVis)

+		(*mesaFuncs.gl_destroy_visual)(lpCtx->glVis);

+

+	RELEASE(lpCtx->m_pvbuf); // Release D3D vertex buffer

+	RELEASE(lpCtx->m_vbuf); // Release D3D vertex buffer

+

+	if (lpCtx->lpViewport3) {

+		if (lpCtx->lpDev3) IDirect3DDevice3_DeleteViewport(lpCtx->lpDev3, lpCtx->lpViewport3);

+		RELEASE(lpCtx->lpViewport3);

+		lpCtx->lpViewport3 = NULL;

+	}

+

+	RELEASE(lpCtx->lpDev3);

+	if (lpCtx->lpDepth4) {

+		if (lpCtx->lpBack4)

+			IDirectDrawSurface4_DeleteAttachedSurface(lpCtx->lpBack4, 0L, lpCtx->lpDepth4);

+		else

+			IDirectDrawSurface4_DeleteAttachedSurface(lpCtx->lpFront4, 0L, lpCtx->lpDepth4);

+		RELEASE(lpCtx->lpDepth4);

+		lpCtx->lpDepth4 = NULL;

+	}

+	RELEASE(lpCtx->lpBack4);

+	RELEASE(lpCtx->lpFront4);

+	else

+	if (lpCtx->bFullscreen) {

+		IDirectDraw4_RestoreDisplayMode(lpCtx->lpDD4);

+		IDirectDraw4_SetCooperativeLevel(lpCtx->lpDD4, NULL, DDSCL_NORMAL);

+	}

+	RELEASE(lpCtx->lpD3D3);

+	RELEASE(lpCtx->lpDD4);

+	RELEASE(lpCtx->lpDD1);

+#endif // _USE_GLD3_WGL

+

+	lpCtx->bAllocated = FALSE;

+

+#ifdef GLD_THREADS

+	// Release serialized access

+	if (glb.bMultiThreaded)

+		LeaveCriticalSection(&CriticalSection);

+#endif

+

+	return FALSE;

+

+#undef DDLOG_CRITICAL_OR_WARN

+}

+

+// ***********************************************************************

+

+HGLRC dglCreateContext(

+	HDC a,

+	const DGL_pixelFormat *lpPF)

+{

+	int i;

+	HGLRC				hGLRC;

+	DGL_ctx*			lpCtx;

+	static BOOL			bWarnOnce = TRUE;

+	DWORD				dwThreadId = GetCurrentThreadId();

+    char                szMsg[256];

+    HWND                hWnd;

+    LONG                lpfnWndProc;

+

+	// Validate license

+	if (!dglValidate())

+		return NULL;

+

+	// Is context state ready ?

+	if (!bContextReady)

+		return NULL;

+

+	ddlogPrintf(DDLOG_SYSTEM, "dglCreateContext for HDC=%X, ThreadId=%X", a, dwThreadId);

+

+	// Find next free context.

+	// Also ensure that only one Fullscreen context is created at any one time.

+	hGLRC = 0; // Default to Not Found

+	for (i=0; i<DGL_MAX_CONTEXTS; i++) {

+		if (ctxlist[i].bAllocated) {

+			if (/*glb.bFullscreen && */ctxlist[i].bFullscreen)

+				break;

+		} else {

+			hGLRC = (HGLRC)(i+1);

+			break;

+		}

+	}

+

+	// Bail if no GLRC was found

+	if (!hGLRC)

+		return NULL;

+

+	// Set the context pointer

+	lpCtx = dglGetContextAddress(hGLRC);

+	// Make sure that context is zeroed before we do anything.

+	// MFC and C++ apps call wglCreateContext() and wglDeleteContext() multiple times,

+	// even though only one context is ever used by the app, so keep it clean. (DaveM)

+	ZeroMemory(lpCtx, sizeof(DGL_ctx));

+	lpCtx->bAllocated = TRUE;

+	// Flag that buffers need creating on next wglMakeCurrent call.

+	lpCtx->bHasBeenCurrent = FALSE;

+	lpCtx->lpPF = (DGL_pixelFormat *)lpPF;	// cache pixel format

+	lpCtx->bCanRender = FALSE;

+

+	// Create all the internal resources here, not in dglMakeCurrent().

+	// We do a re-size check in dglMakeCurrent in case of re-allocations. (DaveM)

+	// We now try context allocations twice, first with video memory,

+	// then again with system memory. This is similar to technique

+	// used for dglWglResizeBuffers(). (DaveM)

+	if (lpCtx->bHasBeenCurrent == FALSE) {

+		if (!dglCreateContextBuffers(a, lpCtx, FALSE)) {

+			if (glb.bMessageBoxWarnings && bWarnOnce && dwLogging) {

+				bWarnOnce = FALSE;

+                switch (nContextError) {

+                   case GLDERR_DDRAW: strcpy(szMsg, szDDrawWarning); break;

+                   case GLDERR_D3D: strcpy(szMsg, szD3DWarning); break;

+                   case GLDERR_MEM: strcpy(szMsg, szResourceWarning); break;

+                   case GLDERR_BPP: strcpy(szMsg, szBPPWarning); break;

+                   default: strcpy(szMsg, "");

+                }

+                if (strlen(szMsg))

+                    MessageBox(NULL, szMsg, "GLDirect", MB_OK | MB_ICONWARNING);

+			}

+            // Only need to try again if memory error

+            if (nContextError == GLDERR_MEM) {

+			    ddlogPrintf(DDLOG_WARN, "dglCreateContext failed 1st time with video memory");

+            }

+            else {

+			    ddlogPrintf(DDLOG_ERROR, "dglCreateContext failed");

+                return NULL;

+            }

+		}

+	}

+

+	// Now that we have a hWnd, we can intercept the WindowProc.

+    hWnd = lpCtx->hWnd;

+    if (hWnd) {

+		// Only hook individual window handler once if not hooked before.

+		lpfnWndProc = GetWindowLong(hWnd, GWL_WNDPROC);

+		if (lpfnWndProc != (LONG)dglWndProc) {

+			lpCtx->lpfnWndProc = lpfnWndProc;

+			SetWindowLong(hWnd, GWL_WNDPROC, (LONG)dglWndProc);

+			}

+        // Find the parent window of the app too.

+        if (glb.hWndActive == NULL) {

+            while (hWnd != NULL) {

+                glb.hWndActive = hWnd;

+                hWnd = GetParent(hWnd);

+            }

+            // Hook the parent window too.

+            lpfnWndProc = GetWindowLong(glb.hWndActive, GWL_WNDPROC);

+            if (glb.hWndActive == lpCtx->hWnd)

+                glb.lpfnWndProc = lpCtx->lpfnWndProc;

+            else if (lpfnWndProc != (LONG)dglWndProc)

+                glb.lpfnWndProc = lpfnWndProc;

+            if (glb.lpfnWndProc)

+                SetWindowLong(glb.hWndActive, GWL_WNDPROC, (LONG)dglWndProc);

+        }

+    }

+

+	ddlogPrintf(DDLOG_SYSTEM, "dglCreateContext succeeded for HGLRC=%d", (int)hGLRC);

+

+	return hGLRC;

+}

+

+// ***********************************************************************

+// Make a DirectGL context current

+// Used by wgl functions and dgl functions

+BOOL dglMakeCurrent(

+	HDC a,

+	HGLRC b)

+{

+	int context;

+	DGL_ctx* lpCtx;

+	HWND hWnd;

+	BOOL bNeedResize = FALSE;

+	BOOL bWindowChanged, bContextChanged;

+	LPDIRECTDRAWCLIPPER	lpddClipper;

+	DWORD dwThreadId = GetCurrentThreadId();

+	LONG lpfnWndProc;

+

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+

+	// Is context state ready ?

+	if (!bContextReady)

+		return FALSE;

+

+	context = (int)b; // This is as a result of STRICT!

+	ddlogPrintf(DDLOG_SYSTEM, "dglMakeCurrent: HDC=%X, HGLRC=%d, ThreadId=%X", a, context, dwThreadId);

+

+	// If the HGLRC is NULL then make no context current;

+	// Ditto if the HDC is NULL either. (DaveM)

+	if (context == 0 || a == 0) {

+		// Corresponding Mesa operation

+#ifdef _USE_GLD3_WGL

+		_mesa_make_current(NULL, NULL);

+#else

+		(*mesaFuncs.gl_make_current)(NULL, NULL);

+#endif

+		dglSetCurrentContext(0);

+		return TRUE;

+	}

+

+	// Make sure the HGLRC is in range

+	if ((context > DGL_MAX_CONTEXTS) || (context < 0)) {

+		ddlogMessage(DDLOG_ERROR, "dglMakeCurrent: HGLRC out of range\n");

+		return FALSE;

+	}

+

+	// Find address of context and make sure that it has been allocated

+	lpCtx = dglGetContextAddress(b);

+	if (!lpCtx->bAllocated) {

+		ddlogMessage(DDLOG_ERROR, "dglMakeCurrent: Context not allocated\n");

+//		return FALSE;

+		return TRUE; // HACK: Shuts up "WebLab Viewer Pro". KeithH

+	}

+

+#ifdef GLD_THREADS

+	// Serialize access to DirectDraw or DDS operations

+	if (glb.bMultiThreaded)

+		EnterCriticalSection(&CriticalSection);

+#endif

+

+	// Check if window has changed

+	hWnd = (a != lpCtx->hDC) ? WindowFromDC(a) : lpCtx->hWnd;

+	bWindowChanged = (hWnd != lpCtx->hWnd) ? TRUE : FALSE;

+	bContextChanged = (b != dglGetCurrentContext()) ? TRUE : FALSE;

+

+	// If the window has changed, make sure the clipper is updated. (DaveM)

+	if (glb.bDirectDrawPersistant && !lpCtx->bFullscreen && (bWindowChanged || bContextChanged)) {

+		lpCtx->hWnd = hWnd;

+#ifndef _USE_GLD3_WGL

+		IDirectDrawSurface4_GetClipper(lpCtx->lpFront4, &lpddClipper);

+		IDirectDrawClipper_SetHWnd(lpddClipper, 0, lpCtx->hWnd);

+		IDirectDrawClipper_Release(lpddClipper);

+#endif // _USE_GLD3_WGL

+	}

+

+	// Make sure hDC and hWnd is current. (DaveM)

+	// Obtain the dimensions of the rendering window

+	lpCtx->hDC = a; // Cache DC

+	lpCtx->hWnd = hWnd;

+	hWndLastActive = hWnd;

+

+	// Check for non-window DC = memory DC ?

+	if (hWnd == NULL) {

+		if (GetClipBox(a, &lpCtx->rcScreenRect) == ERROR) {

+			ddlogMessage(DDLOG_WARN, "GetClipBox failed in dglMakeCurrent\n");

+			SetRect(&lpCtx->rcScreenRect, 0, 0, 0, 0);

+		}

+	}

+	else if (!GetClientRect(lpCtx->hWnd, &lpCtx->rcScreenRect)) {

+		ddlogMessage(DDLOG_WARN, "GetClientRect failed in dglMakeCurrent\n");

+		SetRect(&lpCtx->rcScreenRect, 0, 0, 0, 0);

+	}

+	// Check if buffers need to be re-sized;

+	// If so, wait until Mesa GL stuff is setup before re-sizing;

+	if (lpCtx->dwWidth != lpCtx->rcScreenRect.right - lpCtx->rcScreenRect.left ||

+		lpCtx->dwHeight != lpCtx->rcScreenRect.bottom - lpCtx->rcScreenRect.top)

+		bNeedResize = TRUE;

+

+	// Now we can update our globals

+	dglSetCurrentContext(b);

+

+	// Corresponding Mesa operation

+#ifdef _USE_GLD3_WGL

+	_mesa_make_current(lpCtx->glCtx, lpCtx->glBuffer);

+	lpCtx->glCtx->Driver.UpdateState(lpCtx->glCtx, _NEW_ALL);

+	if (bNeedResize) {

+		// Resize buffers (Note Mesa GL needs to be setup beforehand);

+		// Resize Mesa internal buffer too via glViewport() command,

+		// which subsequently calls dglWglResizeBuffers() too.

+		lpCtx->glCtx->Driver.Viewport(lpCtx->glCtx, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);

+		lpCtx->bHasBeenCurrent = TRUE;

+	}

+#else

+	(*mesaFuncs.gl_make_current)(lpCtx->glCtx, lpCtx->glBuffer);

+

+	dglSetupDDPointers(lpCtx->glCtx);

+

+	// Insure DirectDraw surfaces fit current window DC

+	if (bNeedResize) {

+		// Resize buffers (Note Mesa GL needs to be setup beforehand);

+		// Resize Mesa internal buffer too via glViewport() command,

+		// which subsequently calls dglWglResizeBuffers() too.

+		(*mesaFuncs.gl_Viewport)(lpCtx->glCtx, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);

+		lpCtx->bHasBeenCurrent = TRUE;

+	}

+#endif // _USE_GLD3_WGL

+	ddlogPrintf(DDLOG_SYSTEM, "dglMakeCurrent: width = %d, height = %d", lpCtx->dwWidth, lpCtx->dwHeight);

+

+	// We have to clear D3D back buffer and render state if emulated front buffering

+	// for different window (but not context) like in Solid Edge.

+	if (glb.bDirectDrawPersistant && glb.bPersistantBuffers

+		&& (bWindowChanged /* || bContextChanged */) && lpCtx->EmulateSingle) {

+#ifdef _USE_GLD3_WGL

+//		IDirect3DDevice8_EndScene(lpCtx->pDev);

+//		lpCtx->bSceneStarted = FALSE;

+		lpCtx->glCtx->Driver.Clear(lpCtx->glCtx, GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT,

+			GL_TRUE, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);

+#else

+		IDirect3DDevice3_EndScene(lpCtx->lpDev3);

+		lpCtx->bSceneStarted = FALSE;

+		dglClearD3D(lpCtx->glCtx, GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT,

+			GL_TRUE, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);

+#endif // _USE_GLD3_WGL

+	}

+

+	// The first time we call MakeCurrent we set the initial viewport size

+	if (lpCtx->bHasBeenCurrent == FALSE)

+#ifdef _USE_GLD3_WGL

+		lpCtx->glCtx->Driver.Viewport(lpCtx->glCtx, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);

+#else

+		(*mesaFuncs.gl_Viewport)(lpCtx->glCtx, 0, 0, lpCtx->dwWidth, lpCtx->dwHeight);

+#endif // _USE_GLD3_WGL

+	lpCtx->bHasBeenCurrent = TRUE;

+

+#ifdef GLD_THREADS

+	// Release serialized access

+	if (glb.bMultiThreaded)

+		LeaveCriticalSection(&CriticalSection);

+#endif

+

+	return TRUE;

+}

+

+// ***********************************************************************

+

+BOOL dglDeleteContext(

+	HGLRC a)

+{

+	DGL_ctx* lpCtx;

+	DWORD dwThreadId = GetCurrentThreadId();

+    char argstr[256];

+

+#if 0	// We have enough trouble throwing exceptions as it is... (DaveM)

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+#endif

+

+	// Is context state ready ?

+	if (!bContextReady)

+		return FALSE;

+

+	ddlogPrintf(DDLOG_SYSTEM, "dglDeleteContext: Deleting context HGLRC=%d, ThreadId=%X", (int)a, dwThreadId);

+

+	// Make sure the HGLRC is in range

+	if (((int) a> DGL_MAX_CONTEXTS) || ((int)a < 0)) {

+		ddlogMessage(DDLOG_ERROR, "dglDeleteCurrent: HGLRC out of range\n");

+		return FALSE;

+	}

+

+	// Make sure context is valid

+	lpCtx = dglGetContextAddress(a);

+	if (!lpCtx->bAllocated) {

+		ddlogPrintf(DDLOG_WARN, "Tried to delete unallocated context HGLRC=%d", (int)a);

+//		return FALSE;

+		return TRUE; // HACK: Shuts up "WebLab Viewer Pro". KeithH

+	}

+

+	// Make sure context is de-activated

+	if (a == dglGetCurrentContext()) {

+		ddlogPrintf(DDLOG_WARN, "dglDeleteContext: context HGLRC=%d still active", (int)a);

+		dglMakeCurrent(NULL, NULL);

+	}

+

+#ifdef GLD_THREADS

+	// Serialize access to DirectDraw or DDS operations

+	if (glb.bMultiThreaded)

+		EnterCriticalSection(&CriticalSection);

+#endif

+

+	// We are about to destroy all Direct3D objects.

+	// Therefore we must disable rendering

+	lpCtx->bCanRender = FALSE;

+

+	// This exception handler was installed to catch some

+	// particularly nasty apps. Console apps that call exit()

+	// fall into this catagory (i.e. Win32 Glut).

+

+    // VC cannot successfully implement multiple exception handlers

+    // if more than one exception occurs. Therefore reverting back to

+    // single exception handler as Keith originally had it. (DaveM)

+

+#define WARN_MESSAGE(p) strcpy(argstr, (#p));

+#define SAFE_RELEASE(p) WARN_MESSAGE(p); RELEASE(p);

+

+__try {

+#ifdef _USE_GLD3_WGL

+    WARN_MESSAGE(gl_destroy_framebuffer);

+	if (lpCtx->glBuffer)

+		_mesa_destroy_framebuffer(lpCtx->glBuffer);

+    WARN_MESSAGE(gl_destroy_context);

+	if (lpCtx->glCtx)

+		_mesa_destroy_context(lpCtx->glCtx);

+    WARN_MESSAGE(gl_destroy_visual);

+	if (lpCtx->glVis)

+		_mesa_destroy_visual(lpCtx->glVis);

+

+	_gldDriver.DestroyDrawable(lpCtx);

+#else

+	// Destroy the Mesa context

+    WARN_MESSAGE(gl_destroy_framebuffer);

+	if (lpCtx->glBuffer)

+		(*mesaFuncs.gl_destroy_framebuffer)(lpCtx->glBuffer);

+    WARN_MESSAGE(gl_destroy_context);

+	if (lpCtx->glCtx)

+		(*mesaFuncs.gl_destroy_context)(lpCtx->glCtx);

+    WARN_MESSAGE(gl_destroy_visual);

+	if (lpCtx->glVis)

+		(*mesaFuncs.gl_destroy_visual)(lpCtx->glVis);

+

+	SAFE_RELEASE(lpCtx->m_pvbuf); // release D3D vertex buffer

+	SAFE_RELEASE(lpCtx->m_vbuf); // release D3D vertex buffer

+

+	// Delete the global palette

+	SAFE_RELEASE(lpCtx->lpGlobalPalette);

+

+	// Clean up.

+	if (lpCtx->lpViewport3) {

+		if (lpCtx->lpDev3) IDirect3DDevice3_DeleteViewport(lpCtx->lpDev3, lpCtx->lpViewport3);

+		SAFE_RELEASE(lpCtx->lpViewport3);

+		lpCtx->lpViewport3 = NULL;

+	}

+

+	SAFE_RELEASE(lpCtx->lpDev3);

+	if (lpCtx->lpDepth4) {

+		if (lpCtx->lpBack4)

+			IDirectDrawSurface4_DeleteAttachedSurface(lpCtx->lpBack4, 0L, lpCtx->lpDepth4);

+		else

+			IDirectDrawSurface4_DeleteAttachedSurface(lpCtx->lpFront4, 0L, lpCtx->lpDepth4);

+		SAFE_RELEASE(lpCtx->lpDepth4);

+		lpCtx->lpDepth4 = NULL;

+	}

+	SAFE_RELEASE(lpCtx->lpBack4);

+	SAFE_RELEASE(lpCtx->lpFront4);

+	if (lpCtx->bFullscreen) {

+		IDirectDraw4_RestoreDisplayMode(lpCtx->lpDD4);

+		IDirectDraw4_SetCooperativeLevel(lpCtx->lpDD4, NULL, DDSCL_NORMAL);

+	}

+	SAFE_RELEASE(lpCtx->lpD3D3);

+	SAFE_RELEASE(lpCtx->lpDD4);

+	SAFE_RELEASE(lpCtx->lpDD1);

+#endif // _ULSE_GLD3_WGL

+

+}

+__except(EXCEPTION_EXECUTE_HANDLER) {

+    ddlogPrintf(DDLOG_WARN, "Exception raised in dglDeleteContext: %s", argstr);

+}

+

+	// Restore the window message handler because this context may be used

+	// again by another window with a *different* message handler. (DaveM)

+	if (lpCtx->lpfnWndProc) {

+		SetWindowLong(lpCtx->hWnd, GWL_WNDPROC, (LONG)lpCtx->lpfnWndProc);

+		lpCtx->lpfnWndProc = (LONG)NULL;

+		}

+

+	lpCtx->bAllocated = FALSE; // This context is now free for use

+

+#ifdef GLD_THREADS

+	// Release serialized access

+	if (glb.bMultiThreaded)

+		LeaveCriticalSection(&CriticalSection);

+#endif

+

+	return TRUE;

+}

+

+// ***********************************************************************

+

+BOOL dglSwapBuffers(

+	HDC hDC)

+{

+	RECT		rSrcRect;	// Source rectangle

+	RECT		rDstRect;	// Destination rectangle

+	POINT		pt;

+	HRESULT		hResult;

+

+	DDBLTFX		bltFX;

+	DWORD		dwBlitFlags;

+	DDBLTFX		*lpBltFX;

+

+//	DWORD		dwThreadId = GetCurrentThreadId();

+	HGLRC		hGLRC = dglGetCurrentContext();

+	DGL_ctx		*lpCtx = dglGetContextAddress(hGLRC);

+	HWND		hWnd;

+

+	HDC 		hDCAux;		// for memory DC

+	int 		x,y,w,h;	// for memory DC BitBlt

+

+#if 0	// Perhaps not a good idea. Called too often. KH

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+#endif

+

+	if (!lpCtx) {

+		return TRUE; //FALSE; // No current context

+	}

+

+	if (!lpCtx->bCanRender) {

+		// Don't return false else some apps will bail.

+		return TRUE;

+	}

+

+	hWnd = lpCtx->hWnd;

+	if (hDC != lpCtx->hDC) {

+		ddlogPrintf(DDLOG_WARN, "dglSwapBuffers: HDC=%X does not match HDC=%X for HGLRC=%d", hDC, lpCtx->hDC, hGLRC);

+		hWnd = WindowFromDC(hDC);

+	}

+

+#ifndef _USE_GLD3_WGL

+	// Ensure that the surfaces exist before we tell

+	// the device to render to them.

+	IDirectDraw4_RestoreAllSurfaces(lpCtx->lpDD4);

+

+	// Make sure that the vertex caches have been emptied

+//	dglStateChange(lpCtx);

+

+	// Some OpenGL programs don't issue a glFinish - check for it here.

+	if (lpCtx->bSceneStarted) {

+		IDirect3DDevice3_EndScene(lpCtx->lpDev3);

+		lpCtx->bSceneStarted = FALSE;

+	}

+#endif

+

+#if 0

+	// If the calling app is not active then we don't need to Blit/Flip.

+	// We can therefore simply return TRUE.

+	if (!glb.bAppActive)

+		return TRUE;

+	// Addendum: This is WRONG! We should bail if the app is *minimized*,

+	//           not merely if the app is just plain 'not active'.

+	//           KeithH, 27/May/2000.

+#endif

+

+	// Check for non-window DC = memory DC ?

+	if (hWnd == NULL) {

+		if (GetClipBox(hDC, &rSrcRect) == ERROR)

+			return TRUE;

+		// Use GDI BitBlt instead from compatible DirectDraw DC

+		x = rSrcRect.left;

+		y = rSrcRect.top;

+		w = rSrcRect.right - rSrcRect.left;

+		h = rSrcRect.bottom - rSrcRect.top;

+

+		// Ack. DX8 does not have a GetDC() function...

+                // TODO: Defer to DX7 or DX9 drivers... (DaveM)

+		return TRUE;

+	}

+

+	// Bail if window client region is not drawable, like in Solid Edge

+	if (!IsWindow(hWnd) /* || !IsWindowVisible(hWnd) */ || !GetClientRect(hWnd, &rSrcRect))

+		return TRUE;

+

+#ifdef GLD_THREADS

+	// Serialize access to DirectDraw or DDS operations

+	if (glb.bMultiThreaded)

+		EnterCriticalSection(&CriticalSection);

+#endif

+

+#ifdef _USE_GLD3_WGL

+	// Notify Mesa of impending swap, so Mesa can flush internal buffers.

+	_mesa_notifySwapBuffers(lpCtx->glCtx);

+	// Now perform driver buffer swap

+	_gldDriver.SwapBuffers(lpCtx, hDC, hWnd);

+#else

+	if (lpCtx->bFullscreen) {

+		// Sync with retrace if required

+		if (glb.bWaitForRetrace) {

+			IDirectDraw4_WaitForVerticalBlank(

+				lpCtx->lpDD4,

+				DDWAITVB_BLOCKBEGIN,

+				0);

+		}

+

+		// Perform the fullscreen flip

+		TRY(IDirectDrawSurface4_Flip(

+			lpCtx->lpFront4,

+			NULL,

+			DDFLIP_WAIT),

+			"dglSwapBuffers: Flip");

+	} else {

+		// Calculate current window position and size

+		pt.x = pt.y = 0;

+		ClientToScreen(hWnd, &pt);

+		GetClientRect(hWnd, &rDstRect);

+		if (rDstRect.right > lpCtx->dwModeWidth)

+			rDstRect.right = lpCtx->dwModeWidth;

+		if (rDstRect.bottom > lpCtx->dwModeHeight)

+			rDstRect.bottom = lpCtx->dwModeHeight;

+		OffsetRect(&rDstRect, pt.x, pt.y);

+		rSrcRect.left = rSrcRect.top = 0;

+		rSrcRect.right = lpCtx->dwWidth;

+		rSrcRect.bottom = lpCtx->dwHeight;

+		if (rSrcRect.right > lpCtx->dwModeWidth)

+			rSrcRect.right = lpCtx->dwModeWidth;

+		if (rSrcRect.bottom > lpCtx->dwModeHeight)

+			rSrcRect.bottom = lpCtx->dwModeHeight;

+

+		if (glb.bWaitForRetrace) {

+			// Sync the blit to the vertical retrace

+			ZeroMemory(&bltFX, sizeof(bltFX));

+			bltFX.dwSize = sizeof(bltFX);

+			bltFX.dwDDFX = DDBLTFX_NOTEARING;

+			dwBlitFlags = DDBLT_WAIT | DDBLT_DDFX;

+			lpBltFX = &bltFX;

+		} else {

+			dwBlitFlags = DDBLT_WAIT;

+			lpBltFX = NULL;

+		}

+

+		// Perform the actual blit

+		TRY(IDirectDrawSurface4_Blt(

+			lpCtx->lpFront4,

+			&rDstRect,

+			lpCtx->lpBack4, // Blit source

+			&rSrcRect,

+			dwBlitFlags,

+			lpBltFX),

+			"dglSwapBuffers: Blt");

+	}

+#endif // _USE_GLD3_WGL

+

+#ifdef GLD_THREADS

+	// Release serialized access

+	if (glb.bMultiThreaded)

+		LeaveCriticalSection(&CriticalSection);

+#endif

+

+    // TODO: Re-instate rendering bitmap snapshot feature??? (DaveM)

+

+	// Render frame is completed

+	ValidateRect(hWnd, NULL);

+	lpCtx->bFrameStarted = FALSE;

+

+	return TRUE;

+}

+

+// ***********************************************************************

diff --git a/mesalib/src/mesa/main/api_arrayelt.c b/mesalib/src/mesa/main/api_arrayelt.c
index f88da8458..2eb41996d 100644
--- a/mesalib/src/mesa/main/api_arrayelt.c
+++ b/mesalib/src/mesa/main/api_arrayelt.c
@@ -1,1710 +1,1710 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.1
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-/**
- * This file implements the glArrayElement() function.
- * It involves looking at the format/type of all the enabled vertex arrays
- * and emitting a list of pointers to functions which set the per-vertex
- * state for the element/index.
- */
-
-
-/* Author:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#include "glheader.h"
-#include "api_arrayelt.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "imports.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
-typedef void (GLAPIENTRY *array_func)( const void * );
-
-typedef struct {
-   const struct gl_client_array *array;
-   int offset;
-} AEarray;
-
-typedef void (GLAPIENTRY *attrib_func)( GLuint indx, const void *data );
-
-typedef struct {
-   const struct gl_client_array *array;
-   attrib_func func;
-   GLuint index;
-} AEattrib;
-
-typedef struct {
-   AEarray arrays[32];
-   AEattrib attribs[VERT_ATTRIB_MAX + 1];
-   GLuint NewState;
-
-   struct gl_buffer_object *vbo[VERT_ATTRIB_MAX];
-   GLuint nr_vbos;
-   GLboolean mapped_vbos;
-
-} AEcontext;
-
-#define AE_CONTEXT(ctx) ((AEcontext *)(ctx)->aelt_context)
-
-
-/*
- * Convert GL_BYTE, GL_UNSIGNED_BYTE, .. GL_DOUBLE into an integer
- * in the range [0, 7].  Luckily these type tokens are sequentially
- * numbered in gl.h, except for GL_DOUBLE.
- */
-#define TYPE_IDX(t) ( (t) == GL_DOUBLE ? 7 : (t) & 7 )
-
-#define NUM_TYPES 8
-
-
-#if FEATURE_arrayelt
-
-
-static const int ColorFuncs[2][NUM_TYPES] = {
-   {
-      _gloffset_Color3bv,
-      _gloffset_Color3ubv,
-      _gloffset_Color3sv,
-      _gloffset_Color3usv,
-      _gloffset_Color3iv,
-      _gloffset_Color3uiv,
-      _gloffset_Color3fv,
-      _gloffset_Color3dv,
-   },
-   {
-      _gloffset_Color4bv,
-      _gloffset_Color4ubv,
-      _gloffset_Color4sv,
-      _gloffset_Color4usv,
-      _gloffset_Color4iv,
-      _gloffset_Color4uiv,
-      _gloffset_Color4fv,
-      _gloffset_Color4dv,
-   },
-};
-
-static const int VertexFuncs[3][NUM_TYPES] = {
-   {
-      -1,
-      -1,
-      _gloffset_Vertex2sv,
-      -1,
-      _gloffset_Vertex2iv,
-      -1,
-      _gloffset_Vertex2fv,
-      _gloffset_Vertex2dv,
-   },
-   {
-      -1,
-      -1,
-      _gloffset_Vertex3sv,
-      -1,
-      _gloffset_Vertex3iv,
-      -1,
-      _gloffset_Vertex3fv,
-      _gloffset_Vertex3dv,
-   },
-   {
-      -1,
-      -1,
-      _gloffset_Vertex4sv,
-      -1,
-      _gloffset_Vertex4iv,
-      -1,
-      _gloffset_Vertex4fv,
-      _gloffset_Vertex4dv,
-   },
-};
-
-static const int IndexFuncs[NUM_TYPES] = {
-   -1,
-   _gloffset_Indexubv,
-   _gloffset_Indexsv,
-   -1,
-   _gloffset_Indexiv,
-   -1,
-   _gloffset_Indexfv,
-   _gloffset_Indexdv,
-};
-
-static const int NormalFuncs[NUM_TYPES] = {
-   _gloffset_Normal3bv,
-   -1,
-   _gloffset_Normal3sv,
-   -1,
-   _gloffset_Normal3iv,
-   -1,
-   _gloffset_Normal3fv,
-   _gloffset_Normal3dv,
-};
-
-/* Note: _gloffset_* for these may not be a compile-time constant. */
-static int SecondaryColorFuncs[NUM_TYPES];
-static int FogCoordFuncs[NUM_TYPES];
-
-
-/**
- ** GL_NV_vertex_program
- **/
-
-/* GL_BYTE attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NbvNV(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1bvNV(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NbvNV(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2bvNV(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NbvNV(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),
-					       BYTE_TO_FLOAT(v[1]),
-					       BYTE_TO_FLOAT(v[2])));
-}
-
-static void GLAPIENTRY
-VertexAttrib3bvNV(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NbvNV(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),
-					       BYTE_TO_FLOAT(v[1]),
-					       BYTE_TO_FLOAT(v[2]),
-					       BYTE_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4bvNV(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
-}
-
-/* GL_UNSIGNED_BYTE attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NubvNV(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1ubvNV(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NubvNV(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),
-                                          UBYTE_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2ubvNV(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NubvNV(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),
-					       UBYTE_TO_FLOAT(v[1]),
-					       UBYTE_TO_FLOAT(v[2])));
-}
-static void GLAPIENTRY
-VertexAttrib3ubvNV(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0],
-                                          (GLfloat)v[1], (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NubvNV(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),
-                                          UBYTE_TO_FLOAT(v[1]),
-                                          UBYTE_TO_FLOAT(v[2]),
-                                          UBYTE_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0],
-                                          (GLfloat)v[1], (GLfloat)v[2],
-                                          (GLfloat)v[3]));
-}
-
-/* GL_SHORT attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NsvNV(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1svNV(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NsvNV(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),
-                                          SHORT_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2svNV(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NsvNV(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),
-			     SHORT_TO_FLOAT(v[1]),
-			     SHORT_TO_FLOAT(v[2])));
-}
-
-static void GLAPIENTRY
-VertexAttrib3svNV(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],
-                                          (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NsvNV(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),
-			     SHORT_TO_FLOAT(v[1]),
-			     SHORT_TO_FLOAT(v[2]),
-			     SHORT_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4svNV(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],
-                                          (GLfloat)v[2], (GLfloat)v[3]));
-}
-
-/* GL_UNSIGNED_SHORT attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NusvNV(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1usvNV(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NusvNV(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
-			     USHORT_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2usvNV(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0],
-                                          (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NusvNV(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
-					       USHORT_TO_FLOAT(v[1]),
-					       USHORT_TO_FLOAT(v[2])));
-}
-
-static void GLAPIENTRY
-VertexAttrib3usvNV(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],
-                                          (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NusvNV(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
-					       USHORT_TO_FLOAT(v[1]),
-					       USHORT_TO_FLOAT(v[2]),
-					       USHORT_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4usvNV(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],
-                                          (GLfloat)v[2], (GLfloat)v[3]));
-}
-
-/* GL_INT attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NivNV(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1ivNV(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NivNV(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
-					       INT_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2ivNV(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NivNV(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
-					       INT_TO_FLOAT(v[1]),
-					       INT_TO_FLOAT(v[2])));
-}
-
-static void GLAPIENTRY
-VertexAttrib3ivNV(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],
-                                          (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NivNV(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
-                                          INT_TO_FLOAT(v[1]),
-                                          INT_TO_FLOAT(v[2]),
-                                          INT_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4ivNV(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],
-                                          (GLfloat)v[2], (GLfloat)v[3]));
-}
-
-/* GL_UNSIGNED_INT attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NuivNV(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1uivNV(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NuivNV(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
-                                          UINT_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2uivNV(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0],
-                                          (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NuivNV(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
-					       UINT_TO_FLOAT(v[1]),
-					       UINT_TO_FLOAT(v[2])));
-}
-
-static void GLAPIENTRY
-VertexAttrib3uivNV(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],
-                                          (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NuivNV(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
-					       UINT_TO_FLOAT(v[1]),
-					       UINT_TO_FLOAT(v[2]),
-					       UINT_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4uivNV(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],
-                                          (GLfloat)v[2], (GLfloat)v[3]));
-}
-
-/* GL_FLOAT attributes */
-
-static void GLAPIENTRY
-VertexAttrib1fvNV(GLuint index, const GLfloat *v)
-{
-   CALL_VertexAttrib1fvNV(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib2fvNV(GLuint index, const GLfloat *v)
-{
-   CALL_VertexAttrib2fvNV(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib3fvNV(GLuint index, const GLfloat *v)
-{
-   CALL_VertexAttrib3fvNV(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib4fvNV(GLuint index, const GLfloat *v)
-{
-   CALL_VertexAttrib4fvNV(GET_DISPATCH(), (index, v));
-}
-
-/* GL_DOUBLE attributes */
-
-static void GLAPIENTRY
-VertexAttrib1dvNV(GLuint index, const GLdouble *v)
-{
-   CALL_VertexAttrib1dvNV(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib2dvNV(GLuint index, const GLdouble *v)
-{
-   CALL_VertexAttrib2dvNV(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib3dvNV(GLuint index, const GLdouble *v)
-{
-   CALL_VertexAttrib3dvNV(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib4dvNV(GLuint index, const GLdouble *v)
-{
-   CALL_VertexAttrib4dvNV(GET_DISPATCH(), (index, v));
-}
-
-
-/*
- * Array [size][type] of VertexAttrib functions
- */
-static attrib_func AttribFuncsNV[2][4][NUM_TYPES] = {
-   {
-      /* non-normalized */
-      {
-         /* size 1 */
-         (attrib_func) VertexAttrib1bvNV,
-         (attrib_func) VertexAttrib1ubvNV,
-         (attrib_func) VertexAttrib1svNV,
-         (attrib_func) VertexAttrib1usvNV,
-         (attrib_func) VertexAttrib1ivNV,
-         (attrib_func) VertexAttrib1uivNV,
-         (attrib_func) VertexAttrib1fvNV,
-         (attrib_func) VertexAttrib1dvNV
-      },
-      {
-         /* size 2 */
-         (attrib_func) VertexAttrib2bvNV,
-         (attrib_func) VertexAttrib2ubvNV,
-         (attrib_func) VertexAttrib2svNV,
-         (attrib_func) VertexAttrib2usvNV,
-         (attrib_func) VertexAttrib2ivNV,
-         (attrib_func) VertexAttrib2uivNV,
-         (attrib_func) VertexAttrib2fvNV,
-         (attrib_func) VertexAttrib2dvNV
-      },
-      {
-         /* size 3 */
-         (attrib_func) VertexAttrib3bvNV,
-         (attrib_func) VertexAttrib3ubvNV,
-         (attrib_func) VertexAttrib3svNV,
-         (attrib_func) VertexAttrib3usvNV,
-         (attrib_func) VertexAttrib3ivNV,
-         (attrib_func) VertexAttrib3uivNV,
-         (attrib_func) VertexAttrib3fvNV,
-         (attrib_func) VertexAttrib3dvNV
-      },
-      {
-         /* size 4 */
-         (attrib_func) VertexAttrib4bvNV,
-         (attrib_func) VertexAttrib4ubvNV,
-         (attrib_func) VertexAttrib4svNV,
-         (attrib_func) VertexAttrib4usvNV,
-         (attrib_func) VertexAttrib4ivNV,
-         (attrib_func) VertexAttrib4uivNV,
-         (attrib_func) VertexAttrib4fvNV,
-         (attrib_func) VertexAttrib4dvNV
-      }
-   },
-   {
-      /* normalized (except for float/double) */
-      {
-         /* size 1 */
-         (attrib_func) VertexAttrib1NbvNV,
-         (attrib_func) VertexAttrib1NubvNV,
-         (attrib_func) VertexAttrib1NsvNV,
-         (attrib_func) VertexAttrib1NusvNV,
-         (attrib_func) VertexAttrib1NivNV,
-         (attrib_func) VertexAttrib1NuivNV,
-         (attrib_func) VertexAttrib1fvNV,
-         (attrib_func) VertexAttrib1dvNV
-      },
-      {
-         /* size 2 */
-         (attrib_func) VertexAttrib2NbvNV,
-         (attrib_func) VertexAttrib2NubvNV,
-         (attrib_func) VertexAttrib2NsvNV,
-         (attrib_func) VertexAttrib2NusvNV,
-         (attrib_func) VertexAttrib2NivNV,
-         (attrib_func) VertexAttrib2NuivNV,
-         (attrib_func) VertexAttrib2fvNV,
-         (attrib_func) VertexAttrib2dvNV
-      },
-      {
-         /* size 3 */
-         (attrib_func) VertexAttrib3NbvNV,
-         (attrib_func) VertexAttrib3NubvNV,
-         (attrib_func) VertexAttrib3NsvNV,
-         (attrib_func) VertexAttrib3NusvNV,
-         (attrib_func) VertexAttrib3NivNV,
-         (attrib_func) VertexAttrib3NuivNV,
-         (attrib_func) VertexAttrib3fvNV,
-         (attrib_func) VertexAttrib3dvNV
-      },
-      {
-         /* size 4 */
-         (attrib_func) VertexAttrib4NbvNV,
-         (attrib_func) VertexAttrib4NubvNV,
-         (attrib_func) VertexAttrib4NsvNV,
-         (attrib_func) VertexAttrib4NusvNV,
-         (attrib_func) VertexAttrib4NivNV,
-         (attrib_func) VertexAttrib4NuivNV,
-         (attrib_func) VertexAttrib4fvNV,
-         (attrib_func) VertexAttrib4dvNV
-      }
-   }
-};
-
-
-/**
- ** GL_ARB_vertex_program
- **/
-
-/* GL_BYTE attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NbvARB(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1bvARB(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NbvARB(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2bvARB(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NbvARB(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),
-					       BYTE_TO_FLOAT(v[1]),
-					       BYTE_TO_FLOAT(v[2])));
-}
-
-static void GLAPIENTRY
-VertexAttrib3bvARB(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NbvARB(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),
-					       BYTE_TO_FLOAT(v[1]),
-					       BYTE_TO_FLOAT(v[2]),
-					       BYTE_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4bvARB(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
-}
-
-/* GL_UNSIGNED_BYTE attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NubvARB(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1ubvARB(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NubvARB(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index,
-                                           UBYTE_TO_FLOAT(v[0]),
-                                           UBYTE_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2ubvARB(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index,
-                                           (GLfloat)v[0], (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NubvARB(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index,
-                                           UBYTE_TO_FLOAT(v[0]),
-                                           UBYTE_TO_FLOAT(v[1]),
-                                           UBYTE_TO_FLOAT(v[2])));
-}
-static void GLAPIENTRY
-VertexAttrib3ubvARB(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index,
-                                           (GLfloat)v[0],
-                                           (GLfloat)v[1],
-                                           (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NubvARB(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(),
-                          (index,
-                           UBYTE_TO_FLOAT(v[0]),
-                           UBYTE_TO_FLOAT(v[1]),
-                           UBYTE_TO_FLOAT(v[2]),
-                           UBYTE_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4ubvARB(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(),
-                          (index,
-                           (GLfloat)v[0], (GLfloat)v[1],
-                           (GLfloat)v[2], (GLfloat)v[3]));
-}
-
-/* GL_SHORT attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NsvARB(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1svARB(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NsvARB(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(),
-                          (index, SHORT_TO_FLOAT(v[0]),
-                           SHORT_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2svARB(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(),
-                          (index, (GLfloat)v[0], (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NsvARB(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(),
-                          (index,
-                           SHORT_TO_FLOAT(v[0]),
-                           SHORT_TO_FLOAT(v[1]),
-                           SHORT_TO_FLOAT(v[2])));
-}
-
-static void GLAPIENTRY
-VertexAttrib3svARB(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(),
-                          (index,
-                           (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NsvARB(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(),
-                          (index,
-                           SHORT_TO_FLOAT(v[0]),
-                           SHORT_TO_FLOAT(v[1]),
-                           SHORT_TO_FLOAT(v[2]),
-                           SHORT_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4svARB(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],
-                                           (GLfloat)v[2], (GLfloat)v[3]));
-}
-
-/* GL_UNSIGNED_SHORT attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NusvARB(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1usvARB(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NusvARB(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
-			     USHORT_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2usvARB(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],
-                                           (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NusvARB(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
-					       USHORT_TO_FLOAT(v[1]),
-					       USHORT_TO_FLOAT(v[2])));
-}
-
-static void GLAPIENTRY
-VertexAttrib3usvARB(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],
-                                           (GLfloat)v[1], (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NusvARB(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
-					       USHORT_TO_FLOAT(v[1]),
-					       USHORT_TO_FLOAT(v[2]),
-					       USHORT_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4usvARB(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));
-}
-
-/* GL_INT attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NivARB(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1ivARB(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NivARB(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
-					       INT_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2ivARB(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],
-                                           (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NivARB(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
-					       INT_TO_FLOAT(v[1]),
-					       INT_TO_FLOAT(v[2])));
-}
-
-static void GLAPIENTRY
-VertexAttrib3ivARB(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],
-                                           (GLfloat)v[1], (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NivARB(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
-					       INT_TO_FLOAT(v[1]),
-					       INT_TO_FLOAT(v[2]),
-					       INT_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4ivARB(GLuint index, const GLint *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],
-                                           (GLfloat)v[2], (GLfloat)v[3]));
-}
-
-/* GL_UNSIGNED_INT attributes */
-
-static void GLAPIENTRY
-VertexAttrib1NuivARB(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0])));
-}
-
-static void GLAPIENTRY
-VertexAttrib1uivARB(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttrib2NuivARB(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
-                                           UINT_TO_FLOAT(v[1])));
-}
-
-static void GLAPIENTRY
-VertexAttrib2uivARB(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],
-                                           (GLfloat)v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttrib3NuivARB(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
-                                           UINT_TO_FLOAT(v[1]),
-                                           UINT_TO_FLOAT(v[2])));
-}
-
-static void GLAPIENTRY
-VertexAttrib3uivARB(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],
-                                           (GLfloat)v[1], (GLfloat)v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttrib4NuivARB(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
-                                           UINT_TO_FLOAT(v[1]),
-                                           UINT_TO_FLOAT(v[2]),
-                                           UINT_TO_FLOAT(v[3])));
-}
-
-static void GLAPIENTRY
-VertexAttrib4uivARB(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],
-                                           (GLfloat)v[2], (GLfloat)v[3]));
-}
-
-/* GL_FLOAT attributes */
-
-static void GLAPIENTRY
-VertexAttrib1fvARB(GLuint index, const GLfloat *v)
-{
-   CALL_VertexAttrib1fvARB(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib2fvARB(GLuint index, const GLfloat *v)
-{
-   CALL_VertexAttrib2fvARB(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib3fvARB(GLuint index, const GLfloat *v)
-{
-   CALL_VertexAttrib3fvARB(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib4fvARB(GLuint index, const GLfloat *v)
-{
-   CALL_VertexAttrib4fvARB(GET_DISPATCH(), (index, v));
-}
-
-/* GL_DOUBLE attributes */
-
-static void GLAPIENTRY
-VertexAttrib1dvARB(GLuint index, const GLdouble *v)
-{
-   CALL_VertexAttrib1dvARB(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib2dvARB(GLuint index, const GLdouble *v)
-{
-   CALL_VertexAttrib2dvARB(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib3dvARB(GLuint index, const GLdouble *v)
-{
-   CALL_VertexAttrib3dvARB(GET_DISPATCH(), (index, v));
-}
-
-static void GLAPIENTRY
-VertexAttrib4dvARB(GLuint index, const GLdouble *v)
-{
-   CALL_VertexAttrib4dvARB(GET_DISPATCH(), (index, v));
-}
-
-
-/**
- * Integer-valued attributes
- */
-static void GLAPIENTRY
-VertexAttribI1bv(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttribI2bv(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttribI3bv(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttribI4bv(GLuint index, const GLbyte *v)
-{
-   CALL_VertexAttribI4bvEXT(GET_DISPATCH(), (index, v));
-}
-
-
-static void GLAPIENTRY
-VertexAttribI1ubv(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttribI2ubv(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttribI3ubv(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttribI4ubv(GLuint index, const GLubyte *v)
-{
-   CALL_VertexAttribI4ubvEXT(GET_DISPATCH(), (index, v));
-}
-
-
-
-static void GLAPIENTRY
-VertexAttribI1sv(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttribI2sv(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttribI3sv(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttribI4sv(GLuint index, const GLshort *v)
-{
-   CALL_VertexAttribI4svEXT(GET_DISPATCH(), (index, v));
-}
-
-
-static void GLAPIENTRY
-VertexAttribI1usv(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttribI2usv(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttribI3usv(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttribI4usv(GLuint index, const GLushort *v)
-{
-   CALL_VertexAttribI4usvEXT(GET_DISPATCH(), (index, v));
-}
-
-
-
-static void GLAPIENTRY
-VertexAttribI1iv(GLuint index, const GLint *v)
-{
-   CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttribI2iv(GLuint index, const GLint *v)
-{
-   CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttribI3iv(GLuint index, const GLint *v)
-{
-   CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttribI4iv(GLuint index, const GLint *v)
-{
-   CALL_VertexAttribI4ivEXT(GET_DISPATCH(), (index, v));
-}
-
-
-static void GLAPIENTRY
-VertexAttribI1uiv(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));
-}
-
-static void GLAPIENTRY
-VertexAttribI2uiv(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));
-}
-
-static void GLAPIENTRY
-VertexAttribI3uiv(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));
-}
-
-static void GLAPIENTRY
-VertexAttribI4uiv(GLuint index, const GLuint *v)
-{
-   CALL_VertexAttribI4uivEXT(GET_DISPATCH(), (index, v));
-}
-
-
-
-
-/*
- * Array [unnormalized/normalized/integer][size][type] of VertexAttrib
- * functions
- */
-static attrib_func AttribFuncsARB[3][4][NUM_TYPES] = {
-   {
-      /* non-normalized */
-      {
-         /* size 1 */
-         (attrib_func) VertexAttrib1bvARB,
-         (attrib_func) VertexAttrib1ubvARB,
-         (attrib_func) VertexAttrib1svARB,
-         (attrib_func) VertexAttrib1usvARB,
-         (attrib_func) VertexAttrib1ivARB,
-         (attrib_func) VertexAttrib1uivARB,
-         (attrib_func) VertexAttrib1fvARB,
-         (attrib_func) VertexAttrib1dvARB
-      },
-      {
-         /* size 2 */
-         (attrib_func) VertexAttrib2bvARB,
-         (attrib_func) VertexAttrib2ubvARB,
-         (attrib_func) VertexAttrib2svARB,
-         (attrib_func) VertexAttrib2usvARB,
-         (attrib_func) VertexAttrib2ivARB,
-         (attrib_func) VertexAttrib2uivARB,
-         (attrib_func) VertexAttrib2fvARB,
-         (attrib_func) VertexAttrib2dvARB
-      },
-      {
-         /* size 3 */
-         (attrib_func) VertexAttrib3bvARB,
-         (attrib_func) VertexAttrib3ubvARB,
-         (attrib_func) VertexAttrib3svARB,
-         (attrib_func) VertexAttrib3usvARB,
-         (attrib_func) VertexAttrib3ivARB,
-         (attrib_func) VertexAttrib3uivARB,
-         (attrib_func) VertexAttrib3fvARB,
-         (attrib_func) VertexAttrib3dvARB
-      },
-      {
-         /* size 4 */
-         (attrib_func) VertexAttrib4bvARB,
-         (attrib_func) VertexAttrib4ubvARB,
-         (attrib_func) VertexAttrib4svARB,
-         (attrib_func) VertexAttrib4usvARB,
-         (attrib_func) VertexAttrib4ivARB,
-         (attrib_func) VertexAttrib4uivARB,
-         (attrib_func) VertexAttrib4fvARB,
-         (attrib_func) VertexAttrib4dvARB
-      }
-   },
-   {
-      /* normalized (except for float/double) */
-      {
-         /* size 1 */
-         (attrib_func) VertexAttrib1NbvARB,
-         (attrib_func) VertexAttrib1NubvARB,
-         (attrib_func) VertexAttrib1NsvARB,
-         (attrib_func) VertexAttrib1NusvARB,
-         (attrib_func) VertexAttrib1NivARB,
-         (attrib_func) VertexAttrib1NuivARB,
-         (attrib_func) VertexAttrib1fvARB,
-         (attrib_func) VertexAttrib1dvARB
-      },
-      {
-         /* size 2 */
-         (attrib_func) VertexAttrib2NbvARB,
-         (attrib_func) VertexAttrib2NubvARB,
-         (attrib_func) VertexAttrib2NsvARB,
-         (attrib_func) VertexAttrib2NusvARB,
-         (attrib_func) VertexAttrib2NivARB,
-         (attrib_func) VertexAttrib2NuivARB,
-         (attrib_func) VertexAttrib2fvARB,
-         (attrib_func) VertexAttrib2dvARB
-      },
-      {
-         /* size 3 */
-         (attrib_func) VertexAttrib3NbvARB,
-         (attrib_func) VertexAttrib3NubvARB,
-         (attrib_func) VertexAttrib3NsvARB,
-         (attrib_func) VertexAttrib3NusvARB,
-         (attrib_func) VertexAttrib3NivARB,
-         (attrib_func) VertexAttrib3NuivARB,
-         (attrib_func) VertexAttrib3fvARB,
-         (attrib_func) VertexAttrib3dvARB
-      },
-      {
-         /* size 4 */
-         (attrib_func) VertexAttrib4NbvARB,
-         (attrib_func) VertexAttrib4NubvARB,
-         (attrib_func) VertexAttrib4NsvARB,
-         (attrib_func) VertexAttrib4NusvARB,
-         (attrib_func) VertexAttrib4NivARB,
-         (attrib_func) VertexAttrib4NuivARB,
-         (attrib_func) VertexAttrib4fvARB,
-         (attrib_func) VertexAttrib4dvARB
-      }
-   },
-
-   {
-      /* integer-valued */
-      {
-         /* size 1 */
-         (attrib_func) VertexAttribI1bv,
-         (attrib_func) VertexAttribI1ubv,
-         (attrib_func) VertexAttribI1sv,
-         (attrib_func) VertexAttribI1usv,
-         (attrib_func) VertexAttribI1iv,
-         (attrib_func) VertexAttribI1uiv,
-         NULL, /* GL_FLOAT */
-         NULL  /* GL_DOUBLE */
-      },
-      {
-         /* size 2 */
-         (attrib_func) VertexAttribI2bv,
-         (attrib_func) VertexAttribI2ubv,
-         (attrib_func) VertexAttribI2sv,
-         (attrib_func) VertexAttribI2usv,
-         (attrib_func) VertexAttribI2iv,
-         (attrib_func) VertexAttribI2uiv,
-         NULL, /* GL_FLOAT */
-         NULL  /* GL_DOUBLE */
-      },
-      {
-         /* size 3 */
-         (attrib_func) VertexAttribI3bv,
-         (attrib_func) VertexAttribI3ubv,
-         (attrib_func) VertexAttribI3sv,
-         (attrib_func) VertexAttribI3usv,
-         (attrib_func) VertexAttribI3iv,
-         (attrib_func) VertexAttribI3uiv,
-         NULL, /* GL_FLOAT */
-         NULL  /* GL_DOUBLE */
-      },
-      {
-         /* size 4 */
-         (attrib_func) VertexAttribI4bv,
-         (attrib_func) VertexAttribI4ubv,
-         (attrib_func) VertexAttribI4sv,
-         (attrib_func) VertexAttribI4usv,
-         (attrib_func) VertexAttribI4iv,
-         (attrib_func) VertexAttribI4uiv,
-         NULL, /* GL_FLOAT */
-         NULL  /* GL_DOUBLE */
-      }
-   }
-};
-
-/**********************************************************************/
-
-
-GLboolean _ae_create_context( struct gl_context *ctx )
-{
-   if (ctx->aelt_context)
-      return GL_TRUE;
-
-   /* These _gloffset_* values may not be compile-time constants */
-   SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bvEXT;
-   SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubvEXT;
-   SecondaryColorFuncs[2] = _gloffset_SecondaryColor3svEXT;
-   SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usvEXT;
-   SecondaryColorFuncs[4] = _gloffset_SecondaryColor3ivEXT;
-   SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uivEXT;
-   SecondaryColorFuncs[6] = _gloffset_SecondaryColor3fvEXT;
-   SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dvEXT;
-
-   FogCoordFuncs[0] = -1;
-   FogCoordFuncs[1] = -1;
-   FogCoordFuncs[2] = -1;
-   FogCoordFuncs[3] = -1;
-   FogCoordFuncs[4] = -1;
-   FogCoordFuncs[5] = -1;
-   FogCoordFuncs[6] = _gloffset_FogCoordfvEXT;
-   FogCoordFuncs[7] = _gloffset_FogCoorddvEXT;
-
-   ctx->aelt_context = CALLOC( sizeof(AEcontext) );
-   if (!ctx->aelt_context)
-      return GL_FALSE;
-
-   AE_CONTEXT(ctx)->NewState = ~0;
-   return GL_TRUE;
-}
-
-
-void _ae_destroy_context( struct gl_context *ctx )
-{
-   if ( AE_CONTEXT( ctx ) ) {
-      FREE( ctx->aelt_context );
-      ctx->aelt_context = NULL;
-   }
-}
-
-static void check_vbo( AEcontext *actx,
-		       struct gl_buffer_object *vbo )
-{
-   if (_mesa_is_bufferobj(vbo) && !_mesa_bufferobj_mapped(vbo)) {
-      GLuint i;
-      for (i = 0; i < actx->nr_vbos; i++)
-	 if (actx->vbo[i] == vbo)
-	    return;
-      assert(actx->nr_vbos < VERT_ATTRIB_MAX);
-      actx->vbo[actx->nr_vbos++] = vbo;
-   }
-}
-
-
-/**
- * Make a list of per-vertex functions to call for each glArrayElement call.
- * These functions access the array data (i.e. glVertex, glColor, glNormal,
- * etc).
- * Note: this may be called during display list construction.
- */
-static void _ae_update_state( struct gl_context *ctx )
-{
-   AEcontext *actx = AE_CONTEXT(ctx);
-   AEarray *aa = actx->arrays;
-   AEattrib *at = actx->attribs;
-   GLuint i;
-   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
-
-   actx->nr_vbos = 0;
-
-   /* conventional vertex arrays */
-   if (arrayObj->Index.Enabled) {
-      aa->array = &arrayObj->Index;
-      aa->offset = IndexFuncs[TYPE_IDX(aa->array->Type)];
-      check_vbo(actx, aa->array->BufferObj);
-      aa++;
-   }
-   if (arrayObj->EdgeFlag.Enabled) {
-      aa->array = &arrayObj->EdgeFlag;
-      aa->offset = _gloffset_EdgeFlagv;
-      check_vbo(actx, aa->array->BufferObj);
-      aa++;
-   }
-   if (arrayObj->Normal.Enabled) {
-      aa->array = &arrayObj->Normal;
-      aa->offset = NormalFuncs[TYPE_IDX(aa->array->Type)];
-      check_vbo(actx, aa->array->BufferObj);
-      aa++;
-   }
-   if (arrayObj->Color.Enabled) {
-      aa->array = &arrayObj->Color;
-      aa->offset = ColorFuncs[aa->array->Size-3][TYPE_IDX(aa->array->Type)];
-      check_vbo(actx, aa->array->BufferObj);
-      aa++;
-   }
-   if (arrayObj->SecondaryColor.Enabled) {
-      aa->array = &arrayObj->SecondaryColor;
-      aa->offset = SecondaryColorFuncs[TYPE_IDX(aa->array->Type)];
-      check_vbo(actx, aa->array->BufferObj);
-      aa++;
-   }
-   if (arrayObj->FogCoord.Enabled) {
-      aa->array = &arrayObj->FogCoord;
-      aa->offset = FogCoordFuncs[TYPE_IDX(aa->array->Type)];
-      check_vbo(actx, aa->array->BufferObj);
-      aa++;
-   }
-   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
-      struct gl_client_array *attribArray = &arrayObj->TexCoord[i];
-      if (attribArray->Enabled) {
-         /* NOTE: we use generic glVertexAttribNV functions here.
-          * If we ever remove GL_NV_vertex_program this will have to change.
-          */
-         at->array = attribArray;
-         ASSERT(!at->array->Normalized);
-         at->func = AttribFuncsNV[at->array->Normalized]
-                                 [at->array->Size-1]
-                                 [TYPE_IDX(at->array->Type)];
-         at->index = VERT_ATTRIB_TEX0 + i;
-	 check_vbo(actx, at->array->BufferObj);
-         at++;
-      }
-   }
-
-   /* generic vertex attribute arrays */   
-   for (i = 1; i < Elements(arrayObj->VertexAttrib); i++) {  /* skip zero! */
-      struct gl_client_array *attribArray = &arrayObj->VertexAttrib[i];
-      if (attribArray->Enabled) {
-         at->array = attribArray;
-         /* Note: we can't grab the _glapi_Dispatch->VertexAttrib1fvNV
-          * function pointer here (for float arrays) since the pointer may
-          * change from one execution of _ae_ArrayElement() to
-          * the next.  Doing so caused UT to break.
-          */
-         if (ctx->VertexProgram._Enabled
-             && ctx->VertexProgram.Current->IsNVProgram) {
-            at->func = AttribFuncsNV[at->array->Normalized]
-                                    [at->array->Size-1]
-                                    [TYPE_IDX(at->array->Type)];
-         }
-         else {
-            GLint intOrNorm;
-            if (at->array->Integer)
-               intOrNorm = 2;
-            else if (at->array->Normalized)
-               intOrNorm = 1;
-            else
-               intOrNorm = 0;
-
-            at->func = AttribFuncsARB[intOrNorm]
-                                     [at->array->Size-1]
-                                     [TYPE_IDX(at->array->Type)];
-         }
-         at->index = i;
-	 check_vbo(actx, at->array->BufferObj);
-         at++;
-      }
-   }
-
-   /* finally, vertex position */
-   if (arrayObj->VertexAttrib[0].Enabled) {
-      /* Use glVertex(v) instead of glVertexAttrib(0, v) to be sure it's
-       * issued as the last (provoking) attribute).
-       */
-      aa->array = &arrayObj->VertexAttrib[0];
-      assert(aa->array->Size >= 2); /* XXX fix someday? */
-      aa->offset = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
-      check_vbo(actx, aa->array->BufferObj);
-      aa++;
-   }
-   else if (arrayObj->Vertex.Enabled) {
-      aa->array = &arrayObj->Vertex;
-      aa->offset = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
-      check_vbo(actx, aa->array->BufferObj);
-      aa++;
-   }
-
-   check_vbo(actx, ctx->Array.ElementArrayBufferObj);
-
-   ASSERT(at - actx->attribs <= VERT_ATTRIB_MAX);
-   ASSERT(aa - actx->arrays < 32);
-   at->func = NULL;  /* terminate the list */
-   aa->offset = -1;  /* terminate the list */
-
-   actx->NewState = 0;
-}
-
-void _ae_map_vbos( struct gl_context *ctx )
-{
-   AEcontext *actx = AE_CONTEXT(ctx);
-   GLuint i;
-   
-   if (actx->mapped_vbos)
-      return;
-
-   if (actx->NewState)
-      _ae_update_state(ctx);
-
-   for (i = 0; i < actx->nr_vbos; i++)
-      ctx->Driver.MapBuffer(ctx,
-			    GL_ARRAY_BUFFER_ARB,
-			    GL_DYNAMIC_DRAW_ARB,
-			    actx->vbo[i]);
-
-   if (actx->nr_vbos)
-      actx->mapped_vbos = GL_TRUE;
-}
-
-void _ae_unmap_vbos( struct gl_context *ctx )
-{
-   AEcontext *actx = AE_CONTEXT(ctx);
-   GLuint i;
-
-   if (!actx->mapped_vbos)
-      return;
-
-   assert (!actx->NewState);
-
-   for (i = 0; i < actx->nr_vbos; i++)
-      ctx->Driver.UnmapBuffer(ctx,
-			      GL_ARRAY_BUFFER_ARB,
-			      actx->vbo[i]);
-
-   actx->mapped_vbos = GL_FALSE;
-}
-
-
-/**
- * Called via glArrayElement() and glDrawArrays().
- * Issue the glNormal, glVertex, glColor, glVertexAttrib, etc functions
- * for all enabled vertex arrays (for elt-th element).
- * Note: this may be called during display list construction.
- */
-void GLAPIENTRY _ae_ArrayElement( GLint elt )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const AEcontext *actx = AE_CONTEXT(ctx);
-   const AEarray *aa;
-   const AEattrib *at;
-   const struct _glapi_table * const disp = GET_DISPATCH();
-   GLboolean do_map;
-
-   if (actx->NewState) {
-      assert(!actx->mapped_vbos);
-      _ae_update_state( ctx );
-   }
-
-   /* Determine if w need to map/unmap VBOs */
-   do_map = actx->nr_vbos && !actx->mapped_vbos;
-
-   if (do_map)
-      _ae_map_vbos(ctx);
-   
-   /* emit generic attribute elements */
-   for (at = actx->attribs; at->func; at++) {
-      const GLubyte *src
-         = ADD_POINTERS(at->array->BufferObj->Pointer, at->array->Ptr)
-         + elt * at->array->StrideB;
-      at->func( at->index, src );
-   }
-
-   /* emit conventional arrays elements */
-   for (aa = actx->arrays; aa->offset != -1 ; aa++) {
-      const GLubyte *src
-         = ADD_POINTERS(aa->array->BufferObj->Pointer, aa->array->Ptr)
-         + elt * aa->array->StrideB;
-      CALL_by_offset( disp, (array_func), aa->offset, 
-		      ((const void *) src) );
-   }
-
-   if (do_map)
-      _ae_unmap_vbos(ctx);
-}
-
-
-void _ae_invalidate_state( struct gl_context *ctx, GLuint new_state )
-{
-   AEcontext *actx = AE_CONTEXT(ctx);
-
-   
-   /* Only interested in this subset of mesa state.  Need to prune
-    * this down as both tnl/ and the drivers can raise statechanges
-    * for arcane reasons in the middle of seemingly atomic operations
-    * like DrawElements, over which we'd like to keep a known set of
-    * arrays and vbo's mapped.  
-    *
-    * Luckily, neither the drivers nor tnl muck with the state that
-    * concerns us here:
-    */
-   new_state &= _NEW_ARRAY | _NEW_PROGRAM;
-   if (new_state) {
-      assert(!actx->mapped_vbos);
-      actx->NewState |= new_state;
-   }
-}
-
-
-void _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
-                                   const GLvertexformat *vfmt)
-{
-   SET_ArrayElement(disp, vfmt->ArrayElement);
-}
-
-
-#endif /* FEATURE_arrayelt */
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.1

+ *

+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+/**

+ * This file implements the glArrayElement() function.

+ * It involves looking at the format/type of all the enabled vertex arrays

+ * and emitting a list of pointers to functions which set the per-vertex

+ * state for the element/index.

+ */

+

+

+/* Author:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+#include "glheader.h"

+#include "api_arrayelt.h"

+#include "bufferobj.h"

+#include "context.h"

+#include "imports.h"

+#include "macros.h"

+#include "mfeatures.h"

+#include "mtypes.h"

+#include "main/dispatch.h"

+

+typedef void (GLAPIENTRY *array_func)( const void * );

+

+typedef struct {

+   const struct gl_client_array *array;

+   int offset;

+} AEarray;

+

+typedef void (GLAPIENTRY *attrib_func)( GLuint indx, const void *data );

+

+typedef struct {

+   const struct gl_client_array *array;

+   attrib_func func;

+   GLuint index;

+} AEattrib;

+

+typedef struct {

+   AEarray arrays[32];

+   AEattrib attribs[VERT_ATTRIB_MAX + 1];

+   GLuint NewState;

+

+   struct gl_buffer_object *vbo[VERT_ATTRIB_MAX];

+   GLuint nr_vbos;

+   GLboolean mapped_vbos;

+

+} AEcontext;

+

+#define AE_CONTEXT(ctx) ((AEcontext *)(ctx)->aelt_context)

+

+

+/*

+ * Convert GL_BYTE, GL_UNSIGNED_BYTE, .. GL_DOUBLE into an integer

+ * in the range [0, 7].  Luckily these type tokens are sequentially

+ * numbered in gl.h, except for GL_DOUBLE.

+ */

+#define TYPE_IDX(t) ( (t) == GL_DOUBLE ? 7 : (t) & 7 )

+

+#define NUM_TYPES 8

+

+

+#if FEATURE_arrayelt

+

+

+static const int ColorFuncs[2][NUM_TYPES] = {

+   {

+      _gloffset_Color3bv,

+      _gloffset_Color3ubv,

+      _gloffset_Color3sv,

+      _gloffset_Color3usv,

+      _gloffset_Color3iv,

+      _gloffset_Color3uiv,

+      _gloffset_Color3fv,

+      _gloffset_Color3dv,

+   },

+   {

+      _gloffset_Color4bv,

+      _gloffset_Color4ubv,

+      _gloffset_Color4sv,

+      _gloffset_Color4usv,

+      _gloffset_Color4iv,

+      _gloffset_Color4uiv,

+      _gloffset_Color4fv,

+      _gloffset_Color4dv,

+   },

+};

+

+static const int VertexFuncs[3][NUM_TYPES] = {

+   {

+      -1,

+      -1,

+      _gloffset_Vertex2sv,

+      -1,

+      _gloffset_Vertex2iv,

+      -1,

+      _gloffset_Vertex2fv,

+      _gloffset_Vertex2dv,

+   },

+   {

+      -1,

+      -1,

+      _gloffset_Vertex3sv,

+      -1,

+      _gloffset_Vertex3iv,

+      -1,

+      _gloffset_Vertex3fv,

+      _gloffset_Vertex3dv,

+   },

+   {

+      -1,

+      -1,

+      _gloffset_Vertex4sv,

+      -1,

+      _gloffset_Vertex4iv,

+      -1,

+      _gloffset_Vertex4fv,

+      _gloffset_Vertex4dv,

+   },

+};

+

+static const int IndexFuncs[NUM_TYPES] = {

+   -1,

+   _gloffset_Indexubv,

+   _gloffset_Indexsv,

+   -1,

+   _gloffset_Indexiv,

+   -1,

+   _gloffset_Indexfv,

+   _gloffset_Indexdv,

+};

+

+static const int NormalFuncs[NUM_TYPES] = {

+   _gloffset_Normal3bv,

+   -1,

+   _gloffset_Normal3sv,

+   -1,

+   _gloffset_Normal3iv,

+   -1,

+   _gloffset_Normal3fv,

+   _gloffset_Normal3dv,

+};

+

+/* Note: _gloffset_* for these may not be a compile-time constant. */

+static int SecondaryColorFuncs[NUM_TYPES];

+static int FogCoordFuncs[NUM_TYPES];

+

+

+/**

+ ** GL_NV_vertex_program

+ **/

+

+/* GL_BYTE attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NbvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1bvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NbvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2bvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NbvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),

+					       BYTE_TO_FLOAT(v[1]),

+					       BYTE_TO_FLOAT(v[2])));

+}

+

+static void GLAPIENTRY

+VertexAttrib3bvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NbvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),

+					       BYTE_TO_FLOAT(v[1]),

+					       BYTE_TO_FLOAT(v[2]),

+					       BYTE_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4bvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));

+}

+

+/* GL_UNSIGNED_BYTE attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1ubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),

+                                          UBYTE_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2ubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),

+					       UBYTE_TO_FLOAT(v[1]),

+					       UBYTE_TO_FLOAT(v[2])));

+}

+static void GLAPIENTRY

+VertexAttrib3ubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                          (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),

+                                          UBYTE_TO_FLOAT(v[1]),

+                                          UBYTE_TO_FLOAT(v[2]),

+                                          UBYTE_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4ubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                          (GLfloat)v[1], (GLfloat)v[2],

+                                          (GLfloat)v[3]));

+}

+

+/* GL_SHORT attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NsvNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1svNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NsvNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),

+                                          SHORT_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2svNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NsvNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),

+			     SHORT_TO_FLOAT(v[1]),

+			     SHORT_TO_FLOAT(v[2])));

+}

+

+static void GLAPIENTRY

+VertexAttrib3svNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NsvNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),

+			     SHORT_TO_FLOAT(v[1]),

+			     SHORT_TO_FLOAT(v[2]),

+			     SHORT_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4svNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2], (GLfloat)v[3]));

+}

+

+/* GL_UNSIGNED_SHORT attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NusvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1usvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NusvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

+			     USHORT_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2usvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                          (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NusvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

+					       USHORT_TO_FLOAT(v[1]),

+					       USHORT_TO_FLOAT(v[2])));

+}

+

+static void GLAPIENTRY

+VertexAttrib3usvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NusvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

+					       USHORT_TO_FLOAT(v[1]),

+					       USHORT_TO_FLOAT(v[2]),

+					       USHORT_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4usvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2], (GLfloat)v[3]));

+}

+

+/* GL_INT attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1ivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

+					       INT_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2ivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

+					       INT_TO_FLOAT(v[1]),

+					       INT_TO_FLOAT(v[2])));

+}

+

+static void GLAPIENTRY

+VertexAttrib3ivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

+                                          INT_TO_FLOAT(v[1]),

+                                          INT_TO_FLOAT(v[2]),

+                                          INT_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4ivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2], (GLfloat)v[3]));

+}

+

+/* GL_UNSIGNED_INT attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NuivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1uivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NuivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

+                                          UINT_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2uivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                          (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NuivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

+					       UINT_TO_FLOAT(v[1]),

+					       UINT_TO_FLOAT(v[2])));

+}

+

+static void GLAPIENTRY

+VertexAttrib3uivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NuivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

+					       UINT_TO_FLOAT(v[1]),

+					       UINT_TO_FLOAT(v[2]),

+					       UINT_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4uivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2], (GLfloat)v[3]));

+}

+

+/* GL_FLOAT attributes */

+

+static void GLAPIENTRY

+VertexAttrib1fvNV(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib1fvNV(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib2fvNV(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib2fvNV(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib3fvNV(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib3fvNV(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib4fvNV(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib4fvNV(GET_DISPATCH(), (index, v));

+}

+

+/* GL_DOUBLE attributes */

+

+static void GLAPIENTRY

+VertexAttrib1dvNV(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib1dvNV(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib2dvNV(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib2dvNV(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib3dvNV(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib3dvNV(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib4dvNV(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib4dvNV(GET_DISPATCH(), (index, v));

+}

+

+

+/*

+ * Array [size][type] of VertexAttrib functions

+ */

+static attrib_func AttribFuncsNV[2][4][NUM_TYPES] = {

+   {

+      /* non-normalized */

+      {

+         /* size 1 */

+         (attrib_func) VertexAttrib1bvNV,

+         (attrib_func) VertexAttrib1ubvNV,

+         (attrib_func) VertexAttrib1svNV,

+         (attrib_func) VertexAttrib1usvNV,

+         (attrib_func) VertexAttrib1ivNV,

+         (attrib_func) VertexAttrib1uivNV,

+         (attrib_func) VertexAttrib1fvNV,

+         (attrib_func) VertexAttrib1dvNV

+      },

+      {

+         /* size 2 */

+         (attrib_func) VertexAttrib2bvNV,

+         (attrib_func) VertexAttrib2ubvNV,

+         (attrib_func) VertexAttrib2svNV,

+         (attrib_func) VertexAttrib2usvNV,

+         (attrib_func) VertexAttrib2ivNV,

+         (attrib_func) VertexAttrib2uivNV,

+         (attrib_func) VertexAttrib2fvNV,

+         (attrib_func) VertexAttrib2dvNV

+      },

+      {

+         /* size 3 */

+         (attrib_func) VertexAttrib3bvNV,

+         (attrib_func) VertexAttrib3ubvNV,

+         (attrib_func) VertexAttrib3svNV,

+         (attrib_func) VertexAttrib3usvNV,

+         (attrib_func) VertexAttrib3ivNV,

+         (attrib_func) VertexAttrib3uivNV,

+         (attrib_func) VertexAttrib3fvNV,

+         (attrib_func) VertexAttrib3dvNV

+      },

+      {

+         /* size 4 */

+         (attrib_func) VertexAttrib4bvNV,

+         (attrib_func) VertexAttrib4ubvNV,

+         (attrib_func) VertexAttrib4svNV,

+         (attrib_func) VertexAttrib4usvNV,

+         (attrib_func) VertexAttrib4ivNV,

+         (attrib_func) VertexAttrib4uivNV,

+         (attrib_func) VertexAttrib4fvNV,

+         (attrib_func) VertexAttrib4dvNV

+      }

+   },

+   {

+      /* normalized (except for float/double) */

+      {

+         /* size 1 */

+         (attrib_func) VertexAttrib1NbvNV,

+         (attrib_func) VertexAttrib1NubvNV,

+         (attrib_func) VertexAttrib1NsvNV,

+         (attrib_func) VertexAttrib1NusvNV,

+         (attrib_func) VertexAttrib1NivNV,

+         (attrib_func) VertexAttrib1NuivNV,

+         (attrib_func) VertexAttrib1fvNV,

+         (attrib_func) VertexAttrib1dvNV

+      },

+      {

+         /* size 2 */

+         (attrib_func) VertexAttrib2NbvNV,

+         (attrib_func) VertexAttrib2NubvNV,

+         (attrib_func) VertexAttrib2NsvNV,

+         (attrib_func) VertexAttrib2NusvNV,

+         (attrib_func) VertexAttrib2NivNV,

+         (attrib_func) VertexAttrib2NuivNV,

+         (attrib_func) VertexAttrib2fvNV,

+         (attrib_func) VertexAttrib2dvNV

+      },

+      {

+         /* size 3 */

+         (attrib_func) VertexAttrib3NbvNV,

+         (attrib_func) VertexAttrib3NubvNV,

+         (attrib_func) VertexAttrib3NsvNV,

+         (attrib_func) VertexAttrib3NusvNV,

+         (attrib_func) VertexAttrib3NivNV,

+         (attrib_func) VertexAttrib3NuivNV,

+         (attrib_func) VertexAttrib3fvNV,

+         (attrib_func) VertexAttrib3dvNV

+      },

+      {

+         /* size 4 */

+         (attrib_func) VertexAttrib4NbvNV,

+         (attrib_func) VertexAttrib4NubvNV,

+         (attrib_func) VertexAttrib4NsvNV,

+         (attrib_func) VertexAttrib4NusvNV,

+         (attrib_func) VertexAttrib4NivNV,

+         (attrib_func) VertexAttrib4NuivNV,

+         (attrib_func) VertexAttrib4fvNV,

+         (attrib_func) VertexAttrib4dvNV

+      }

+   }

+};

+

+

+/**

+ ** GL_ARB_vertex_program

+ **/

+

+/* GL_BYTE attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NbvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1bvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NbvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2bvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NbvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),

+					       BYTE_TO_FLOAT(v[1]),

+					       BYTE_TO_FLOAT(v[2])));

+}

+

+static void GLAPIENTRY

+VertexAttrib3bvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NbvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),

+					       BYTE_TO_FLOAT(v[1]),

+					       BYTE_TO_FLOAT(v[2]),

+					       BYTE_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4bvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));

+}

+

+/* GL_UNSIGNED_BYTE attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1ubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index,

+                                           UBYTE_TO_FLOAT(v[0]),

+                                           UBYTE_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2ubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index,

+                                           (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index,

+                                           UBYTE_TO_FLOAT(v[0]),

+                                           UBYTE_TO_FLOAT(v[1]),

+                                           UBYTE_TO_FLOAT(v[2])));

+}

+static void GLAPIENTRY

+VertexAttrib3ubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index,

+                                           (GLfloat)v[0],

+                                           (GLfloat)v[1],

+                                           (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(),

+                          (index,

+                           UBYTE_TO_FLOAT(v[0]),

+                           UBYTE_TO_FLOAT(v[1]),

+                           UBYTE_TO_FLOAT(v[2]),

+                           UBYTE_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4ubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(),

+                          (index,

+                           (GLfloat)v[0], (GLfloat)v[1],

+                           (GLfloat)v[2], (GLfloat)v[3]));

+}

+

+/* GL_SHORT attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NsvARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1svARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NsvARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(),

+                          (index, SHORT_TO_FLOAT(v[0]),

+                           SHORT_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2svARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(),

+                          (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NsvARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(),

+                          (index,

+                           SHORT_TO_FLOAT(v[0]),

+                           SHORT_TO_FLOAT(v[1]),

+                           SHORT_TO_FLOAT(v[2])));

+}

+

+static void GLAPIENTRY

+VertexAttrib3svARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(),

+                          (index,

+                           (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NsvARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(),

+                          (index,

+                           SHORT_TO_FLOAT(v[0]),

+                           SHORT_TO_FLOAT(v[1]),

+                           SHORT_TO_FLOAT(v[2]),

+                           SHORT_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4svARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                           (GLfloat)v[2], (GLfloat)v[3]));

+}

+

+/* GL_UNSIGNED_SHORT attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NusvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1usvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NusvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

+			     USHORT_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2usvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NusvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

+					       USHORT_TO_FLOAT(v[1]),

+					       USHORT_TO_FLOAT(v[2])));

+}

+

+static void GLAPIENTRY

+VertexAttrib3usvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NusvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

+					       USHORT_TO_FLOAT(v[1]),

+					       USHORT_TO_FLOAT(v[2]),

+					       USHORT_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4usvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));

+}

+

+/* GL_INT attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1ivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

+					       INT_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2ivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

+					       INT_TO_FLOAT(v[1]),

+					       INT_TO_FLOAT(v[2])));

+}

+

+static void GLAPIENTRY

+VertexAttrib3ivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

+					       INT_TO_FLOAT(v[1]),

+					       INT_TO_FLOAT(v[2]),

+					       INT_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4ivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                           (GLfloat)v[2], (GLfloat)v[3]));

+}

+

+/* GL_UNSIGNED_INT attributes */

+

+static void GLAPIENTRY

+VertexAttrib1NuivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0])));

+}

+

+static void GLAPIENTRY

+VertexAttrib1uivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttrib2NuivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

+                                           UINT_TO_FLOAT(v[1])));

+}

+

+static void GLAPIENTRY

+VertexAttrib2uivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttrib3NuivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

+                                           UINT_TO_FLOAT(v[1]),

+                                           UINT_TO_FLOAT(v[2])));

+}

+

+static void GLAPIENTRY

+VertexAttrib3uivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttrib4NuivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

+                                           UINT_TO_FLOAT(v[1]),

+                                           UINT_TO_FLOAT(v[2]),

+                                           UINT_TO_FLOAT(v[3])));

+}

+

+static void GLAPIENTRY

+VertexAttrib4uivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                           (GLfloat)v[2], (GLfloat)v[3]));

+}

+

+/* GL_FLOAT attributes */

+

+static void GLAPIENTRY

+VertexAttrib1fvARB(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib1fvARB(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib2fvARB(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib2fvARB(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib3fvARB(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib3fvARB(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib4fvARB(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib4fvARB(GET_DISPATCH(), (index, v));

+}

+

+/* GL_DOUBLE attributes */

+

+static void GLAPIENTRY

+VertexAttrib1dvARB(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib1dvARB(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib2dvARB(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib2dvARB(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib3dvARB(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib3dvARB(GET_DISPATCH(), (index, v));

+}

+

+static void GLAPIENTRY

+VertexAttrib4dvARB(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib4dvARB(GET_DISPATCH(), (index, v));

+}

+

+

+/**

+ * Integer-valued attributes

+ */

+static void GLAPIENTRY

+VertexAttribI1bv(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttribI2bv(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttribI3bv(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttribI4bv(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttribI4bvEXT(GET_DISPATCH(), (index, v));

+}

+

+

+static void GLAPIENTRY

+VertexAttribI1ubv(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttribI2ubv(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttribI3ubv(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttribI4ubv(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttribI4ubvEXT(GET_DISPATCH(), (index, v));

+}

+

+

+

+static void GLAPIENTRY

+VertexAttribI1sv(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttribI2sv(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttribI3sv(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttribI4sv(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttribI4svEXT(GET_DISPATCH(), (index, v));

+}

+

+

+static void GLAPIENTRY

+VertexAttribI1usv(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttribI2usv(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttribI3usv(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttribI4usv(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttribI4usvEXT(GET_DISPATCH(), (index, v));

+}

+

+

+

+static void GLAPIENTRY

+VertexAttribI1iv(GLuint index, const GLint *v)

+{

+   CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttribI2iv(GLuint index, const GLint *v)

+{

+   CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttribI3iv(GLuint index, const GLint *v)

+{

+   CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttribI4iv(GLuint index, const GLint *v)

+{

+   CALL_VertexAttribI4ivEXT(GET_DISPATCH(), (index, v));

+}

+

+

+static void GLAPIENTRY

+VertexAttribI1uiv(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void GLAPIENTRY

+VertexAttribI2uiv(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void GLAPIENTRY

+VertexAttribI3uiv(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void GLAPIENTRY

+VertexAttribI4uiv(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttribI4uivEXT(GET_DISPATCH(), (index, v));

+}

+

+

+

+

+/*

+ * Array [unnormalized/normalized/integer][size][type] of VertexAttrib

+ * functions

+ */

+static attrib_func AttribFuncsARB[3][4][NUM_TYPES] = {

+   {

+      /* non-normalized */

+      {

+         /* size 1 */

+         (attrib_func) VertexAttrib1bvARB,

+         (attrib_func) VertexAttrib1ubvARB,

+         (attrib_func) VertexAttrib1svARB,

+         (attrib_func) VertexAttrib1usvARB,

+         (attrib_func) VertexAttrib1ivARB,

+         (attrib_func) VertexAttrib1uivARB,

+         (attrib_func) VertexAttrib1fvARB,

+         (attrib_func) VertexAttrib1dvARB

+      },

+      {

+         /* size 2 */

+         (attrib_func) VertexAttrib2bvARB,

+         (attrib_func) VertexAttrib2ubvARB,

+         (attrib_func) VertexAttrib2svARB,

+         (attrib_func) VertexAttrib2usvARB,

+         (attrib_func) VertexAttrib2ivARB,

+         (attrib_func) VertexAttrib2uivARB,

+         (attrib_func) VertexAttrib2fvARB,

+         (attrib_func) VertexAttrib2dvARB

+      },

+      {

+         /* size 3 */

+         (attrib_func) VertexAttrib3bvARB,

+         (attrib_func) VertexAttrib3ubvARB,

+         (attrib_func) VertexAttrib3svARB,

+         (attrib_func) VertexAttrib3usvARB,

+         (attrib_func) VertexAttrib3ivARB,

+         (attrib_func) VertexAttrib3uivARB,

+         (attrib_func) VertexAttrib3fvARB,

+         (attrib_func) VertexAttrib3dvARB

+      },

+      {

+         /* size 4 */

+         (attrib_func) VertexAttrib4bvARB,

+         (attrib_func) VertexAttrib4ubvARB,

+         (attrib_func) VertexAttrib4svARB,

+         (attrib_func) VertexAttrib4usvARB,

+         (attrib_func) VertexAttrib4ivARB,

+         (attrib_func) VertexAttrib4uivARB,

+         (attrib_func) VertexAttrib4fvARB,

+         (attrib_func) VertexAttrib4dvARB

+      }

+   },

+   {

+      /* normalized (except for float/double) */

+      {

+         /* size 1 */

+         (attrib_func) VertexAttrib1NbvARB,

+         (attrib_func) VertexAttrib1NubvARB,

+         (attrib_func) VertexAttrib1NsvARB,

+         (attrib_func) VertexAttrib1NusvARB,

+         (attrib_func) VertexAttrib1NivARB,

+         (attrib_func) VertexAttrib1NuivARB,

+         (attrib_func) VertexAttrib1fvARB,

+         (attrib_func) VertexAttrib1dvARB

+      },

+      {

+         /* size 2 */

+         (attrib_func) VertexAttrib2NbvARB,

+         (attrib_func) VertexAttrib2NubvARB,

+         (attrib_func) VertexAttrib2NsvARB,

+         (attrib_func) VertexAttrib2NusvARB,

+         (attrib_func) VertexAttrib2NivARB,

+         (attrib_func) VertexAttrib2NuivARB,

+         (attrib_func) VertexAttrib2fvARB,

+         (attrib_func) VertexAttrib2dvARB

+      },

+      {

+         /* size 3 */

+         (attrib_func) VertexAttrib3NbvARB,

+         (attrib_func) VertexAttrib3NubvARB,

+         (attrib_func) VertexAttrib3NsvARB,

+         (attrib_func) VertexAttrib3NusvARB,

+         (attrib_func) VertexAttrib3NivARB,

+         (attrib_func) VertexAttrib3NuivARB,

+         (attrib_func) VertexAttrib3fvARB,

+         (attrib_func) VertexAttrib3dvARB

+      },

+      {

+         /* size 4 */

+         (attrib_func) VertexAttrib4NbvARB,

+         (attrib_func) VertexAttrib4NubvARB,

+         (attrib_func) VertexAttrib4NsvARB,

+         (attrib_func) VertexAttrib4NusvARB,

+         (attrib_func) VertexAttrib4NivARB,

+         (attrib_func) VertexAttrib4NuivARB,

+         (attrib_func) VertexAttrib4fvARB,

+         (attrib_func) VertexAttrib4dvARB

+      }

+   },

+

+   {

+      /* integer-valued */

+      {

+         /* size 1 */

+         (attrib_func) VertexAttribI1bv,

+         (attrib_func) VertexAttribI1ubv,

+         (attrib_func) VertexAttribI1sv,

+         (attrib_func) VertexAttribI1usv,

+         (attrib_func) VertexAttribI1iv,

+         (attrib_func) VertexAttribI1uiv,

+         NULL, /* GL_FLOAT */

+         NULL  /* GL_DOUBLE */

+      },

+      {

+         /* size 2 */

+         (attrib_func) VertexAttribI2bv,

+         (attrib_func) VertexAttribI2ubv,

+         (attrib_func) VertexAttribI2sv,

+         (attrib_func) VertexAttribI2usv,

+         (attrib_func) VertexAttribI2iv,

+         (attrib_func) VertexAttribI2uiv,

+         NULL, /* GL_FLOAT */

+         NULL  /* GL_DOUBLE */

+      },

+      {

+         /* size 3 */

+         (attrib_func) VertexAttribI3bv,

+         (attrib_func) VertexAttribI3ubv,

+         (attrib_func) VertexAttribI3sv,

+         (attrib_func) VertexAttribI3usv,

+         (attrib_func) VertexAttribI3iv,

+         (attrib_func) VertexAttribI3uiv,

+         NULL, /* GL_FLOAT */

+         NULL  /* GL_DOUBLE */

+      },

+      {

+         /* size 4 */

+         (attrib_func) VertexAttribI4bv,

+         (attrib_func) VertexAttribI4ubv,

+         (attrib_func) VertexAttribI4sv,

+         (attrib_func) VertexAttribI4usv,

+         (attrib_func) VertexAttribI4iv,

+         (attrib_func) VertexAttribI4uiv,

+         NULL, /* GL_FLOAT */

+         NULL  /* GL_DOUBLE */

+      }

+   }

+};

+

+/**********************************************************************/

+

+

+GLboolean _ae_create_context( struct gl_context *ctx )

+{

+   if (ctx->aelt_context)

+      return GL_TRUE;

+

+   /* These _gloffset_* values may not be compile-time constants */

+   SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bvEXT;

+   SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubvEXT;

+   SecondaryColorFuncs[2] = _gloffset_SecondaryColor3svEXT;

+   SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usvEXT;

+   SecondaryColorFuncs[4] = _gloffset_SecondaryColor3ivEXT;

+   SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uivEXT;

+   SecondaryColorFuncs[6] = _gloffset_SecondaryColor3fvEXT;

+   SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dvEXT;

+

+   FogCoordFuncs[0] = -1;

+   FogCoordFuncs[1] = -1;

+   FogCoordFuncs[2] = -1;

+   FogCoordFuncs[3] = -1;

+   FogCoordFuncs[4] = -1;

+   FogCoordFuncs[5] = -1;

+   FogCoordFuncs[6] = _gloffset_FogCoordfvEXT;

+   FogCoordFuncs[7] = _gloffset_FogCoorddvEXT;

+

+   ctx->aelt_context = CALLOC( sizeof(AEcontext) );

+   if (!ctx->aelt_context)

+      return GL_FALSE;

+

+   AE_CONTEXT(ctx)->NewState = ~0;

+   return GL_TRUE;

+}

+

+

+void _ae_destroy_context( struct gl_context *ctx )

+{

+   if ( AE_CONTEXT( ctx ) ) {

+      FREE( ctx->aelt_context );

+      ctx->aelt_context = NULL;

+   }

+}

+

+static void check_vbo( AEcontext *actx,

+		       struct gl_buffer_object *vbo )

+{

+   if (_mesa_is_bufferobj(vbo) && !_mesa_bufferobj_mapped(vbo)) {

+      GLuint i;

+      for (i = 0; i < actx->nr_vbos; i++)

+	 if (actx->vbo[i] == vbo)

+	    return;

+      assert(actx->nr_vbos < VERT_ATTRIB_MAX);

+      actx->vbo[actx->nr_vbos++] = vbo;

+   }

+}

+

+

+/**

+ * Make a list of per-vertex functions to call for each glArrayElement call.

+ * These functions access the array data (i.e. glVertex, glColor, glNormal,

+ * etc).

+ * Note: this may be called during display list construction.

+ */

+static void _ae_update_state( struct gl_context *ctx )

+{

+   AEcontext *actx = AE_CONTEXT(ctx);

+   AEarray *aa = actx->arrays;

+   AEattrib *at = actx->attribs;

+   GLuint i;

+   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;

+

+   actx->nr_vbos = 0;

+

+   /* conventional vertex arrays */

+   if (arrayObj->Index.Enabled) {

+      aa->array = &arrayObj->Index;

+      aa->offset = IndexFuncs[TYPE_IDX(aa->array->Type)];

+      check_vbo(actx, aa->array->BufferObj);

+      aa++;

+   }

+   if (arrayObj->EdgeFlag.Enabled) {

+      aa->array = &arrayObj->EdgeFlag;

+      aa->offset = _gloffset_EdgeFlagv;

+      check_vbo(actx, aa->array->BufferObj);

+      aa++;

+   }

+   if (arrayObj->Normal.Enabled) {

+      aa->array = &arrayObj->Normal;

+      aa->offset = NormalFuncs[TYPE_IDX(aa->array->Type)];

+      check_vbo(actx, aa->array->BufferObj);

+      aa++;

+   }

+   if (arrayObj->Color.Enabled) {

+      aa->array = &arrayObj->Color;

+      aa->offset = ColorFuncs[aa->array->Size-3][TYPE_IDX(aa->array->Type)];

+      check_vbo(actx, aa->array->BufferObj);

+      aa++;

+   }

+   if (arrayObj->SecondaryColor.Enabled) {

+      aa->array = &arrayObj->SecondaryColor;

+      aa->offset = SecondaryColorFuncs[TYPE_IDX(aa->array->Type)];

+      check_vbo(actx, aa->array->BufferObj);

+      aa++;

+   }

+   if (arrayObj->FogCoord.Enabled) {

+      aa->array = &arrayObj->FogCoord;

+      aa->offset = FogCoordFuncs[TYPE_IDX(aa->array->Type)];

+      check_vbo(actx, aa->array->BufferObj);

+      aa++;

+   }

+   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {

+      struct gl_client_array *attribArray = &arrayObj->TexCoord[i];

+      if (attribArray->Enabled) {

+         /* NOTE: we use generic glVertexAttribNV functions here.

+          * If we ever remove GL_NV_vertex_program this will have to change.

+          */

+         at->array = attribArray;

+         ASSERT(!at->array->Normalized);

+         at->func = AttribFuncsNV[at->array->Normalized]

+                                 [at->array->Size-1]

+                                 [TYPE_IDX(at->array->Type)];

+         at->index = VERT_ATTRIB_TEX0 + i;

+	 check_vbo(actx, at->array->BufferObj);

+         at++;

+      }

+   }

+

+   /* generic vertex attribute arrays */   

+   for (i = 1; i < Elements(arrayObj->VertexAttrib); i++) {  /* skip zero! */

+      struct gl_client_array *attribArray = &arrayObj->VertexAttrib[i];

+      if (attribArray->Enabled) {

+         at->array = attribArray;

+         /* Note: we can't grab the _glapi_Dispatch->VertexAttrib1fvNV

+          * function pointer here (for float arrays) since the pointer may

+          * change from one execution of _ae_ArrayElement() to

+          * the next.  Doing so caused UT to break.

+          */

+         if (ctx->VertexProgram._Enabled

+             && ctx->VertexProgram.Current->IsNVProgram) {

+            at->func = AttribFuncsNV[at->array->Normalized]

+                                    [at->array->Size-1]

+                                    [TYPE_IDX(at->array->Type)];

+         }

+         else {

+            GLint intOrNorm;

+            if (at->array->Integer)

+               intOrNorm = 2;

+            else if (at->array->Normalized)

+               intOrNorm = 1;

+            else

+               intOrNorm = 0;

+

+            at->func = AttribFuncsARB[intOrNorm]

+                                     [at->array->Size-1]

+                                     [TYPE_IDX(at->array->Type)];

+         }

+         at->index = i;

+	 check_vbo(actx, at->array->BufferObj);

+         at++;

+      }

+   }

+

+   /* finally, vertex position */

+   if (arrayObj->VertexAttrib[0].Enabled) {

+      /* Use glVertex(v) instead of glVertexAttrib(0, v) to be sure it's

+       * issued as the last (provoking) attribute).

+       */

+      aa->array = &arrayObj->VertexAttrib[0];

+      assert(aa->array->Size >= 2); /* XXX fix someday? */

+      aa->offset = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];

+      check_vbo(actx, aa->array->BufferObj);

+      aa++;

+   }

+   else if (arrayObj->Vertex.Enabled) {

+      aa->array = &arrayObj->Vertex;

+      aa->offset = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];

+      check_vbo(actx, aa->array->BufferObj);

+      aa++;

+   }

+

+   check_vbo(actx, ctx->Array.ElementArrayBufferObj);

+

+   ASSERT(at - actx->attribs <= VERT_ATTRIB_MAX);

+   ASSERT(aa - actx->arrays < 32);

+   at->func = NULL;  /* terminate the list */

+   aa->offset = -1;  /* terminate the list */

+

+   actx->NewState = 0;

+}

+

+void _ae_map_vbos( struct gl_context *ctx )

+{

+   AEcontext *actx = AE_CONTEXT(ctx);

+   GLuint i;

+   

+   if (actx->mapped_vbos)

+      return;

+

+   if (actx->NewState)

+      _ae_update_state(ctx);

+

+   for (i = 0; i < actx->nr_vbos; i++)

+      ctx->Driver.MapBuffer(ctx,

+			    GL_ARRAY_BUFFER_ARB,

+			    GL_DYNAMIC_DRAW_ARB,

+			    actx->vbo[i]);

+

+   if (actx->nr_vbos)

+      actx->mapped_vbos = GL_TRUE;

+}

+

+void _ae_unmap_vbos( struct gl_context *ctx )

+{

+   AEcontext *actx = AE_CONTEXT(ctx);

+   GLuint i;

+

+   if (!actx->mapped_vbos)

+      return;

+

+   assert (!actx->NewState);

+

+   for (i = 0; i < actx->nr_vbos; i++)

+      ctx->Driver.UnmapBuffer(ctx,

+			      GL_ARRAY_BUFFER_ARB,

+			      actx->vbo[i]);

+

+   actx->mapped_vbos = GL_FALSE;

+}

+

+

+/**

+ * Called via glArrayElement() and glDrawArrays().

+ * Issue the glNormal, glVertex, glColor, glVertexAttrib, etc functions

+ * for all enabled vertex arrays (for elt-th element).

+ * Note: this may be called during display list construction.

+ */

+void GLAPIENTRY _ae_ArrayElement( GLint elt )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const AEcontext *actx = AE_CONTEXT(ctx);

+   const AEarray *aa;

+   const AEattrib *at;

+   const struct _glapi_table * const disp = GET_DISPATCH();

+   GLboolean do_map;

+

+   if (actx->NewState) {

+      assert(!actx->mapped_vbos);

+      _ae_update_state( ctx );

+   }

+

+   /* Determine if w need to map/unmap VBOs */

+   do_map = actx->nr_vbos && !actx->mapped_vbos;

+

+   if (do_map)

+      _ae_map_vbos(ctx);

+   

+   /* emit generic attribute elements */

+   for (at = actx->attribs; at->func; at++) {

+      const GLubyte *src

+         = ADD_POINTERS(at->array->BufferObj->Pointer, at->array->Ptr)

+         + elt * at->array->StrideB;

+      at->func( at->index, src );

+   }

+

+   /* emit conventional arrays elements */

+   for (aa = actx->arrays; aa->offset != -1 ; aa++) {

+      const GLubyte *src

+         = ADD_POINTERS(aa->array->BufferObj->Pointer, aa->array->Ptr)

+         + elt * aa->array->StrideB;

+      CALL_by_offset( disp, (array_func), aa->offset, 

+		      ((const void *) src) );

+   }

+

+   if (do_map)

+      _ae_unmap_vbos(ctx);

+}

+

+

+void _ae_invalidate_state( struct gl_context *ctx, GLuint new_state )

+{

+   AEcontext *actx = AE_CONTEXT(ctx);

+

+   

+   /* Only interested in this subset of mesa state.  Need to prune

+    * this down as both tnl/ and the drivers can raise statechanges

+    * for arcane reasons in the middle of seemingly atomic operations

+    * like DrawElements, over which we'd like to keep a known set of

+    * arrays and vbo's mapped.  

+    *

+    * Luckily, neither the drivers nor tnl muck with the state that

+    * concerns us here:

+    */

+   new_state &= _NEW_ARRAY | _NEW_PROGRAM;

+   if (new_state) {

+      assert(!actx->mapped_vbos);

+      actx->NewState |= new_state;

+   }

+}

+

+

+void _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,

+                                   const GLvertexformat *vfmt)

+{

+   SET_ArrayElement(disp, vfmt->ArrayElement);

+}

+

+

+#endif /* FEATURE_arrayelt */

diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c
index 4699fcd8e..c939758c6 100644
--- a/mesalib/src/mesa/main/api_exec.c
+++ b/mesalib/src/mesa/main/api_exec.c
@@ -105,7 +105,6 @@
 

 #if FEATURE_GL

 

-

 /**

  * Initialize a dispatch table with pointers to Mesa's immediate-mode

  * commands.

diff --git a/mesalib/src/mesa/main/blend.c b/mesalib/src/mesa/main/blend.c
index 95c101c34..2985533e5 100644
--- a/mesalib/src/mesa/main/blend.c
+++ b/mesalib/src/mesa/main/blend.c
@@ -1,833 +1,833 @@
-/**
- * \file blend.c
- * Blending operations.
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.1
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-
-#include "glheader.h"
-#include "blend.h"
-#include "context.h"
-#include "enums.h"
-#include "macros.h"
-#include "mtypes.h"
-
-
-
-/**
- * Check if given blend source factor is legal.
- * \return GL_TRUE if legal, GL_FALSE otherwise.
- */
-static GLboolean
-legal_src_factor(const struct gl_context *ctx, GLenum factor)
-{
-   switch (factor) {
-   case GL_SRC_COLOR:
-   case GL_ONE_MINUS_SRC_COLOR:
-      return ctx->Extensions.NV_blend_square;
-   case GL_ZERO:
-   case GL_ONE:
-   case GL_DST_COLOR:
-   case GL_ONE_MINUS_DST_COLOR:
-   case GL_SRC_ALPHA:
-   case GL_ONE_MINUS_SRC_ALPHA:
-   case GL_DST_ALPHA:
-   case GL_ONE_MINUS_DST_ALPHA:
-   case GL_SRC_ALPHA_SATURATE:
-   case GL_CONSTANT_COLOR:
-   case GL_ONE_MINUS_CONSTANT_COLOR:
-   case GL_CONSTANT_ALPHA:
-   case GL_ONE_MINUS_CONSTANT_ALPHA:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Check if given blend destination factor is legal.
- * \return GL_TRUE if legal, GL_FALSE otherwise.
- */
-static GLboolean
-legal_dst_factor(const struct gl_context *ctx, GLenum factor)
-{
-   switch (factor) {
-   case GL_DST_COLOR:
-   case GL_ONE_MINUS_DST_COLOR:
-      return ctx->Extensions.NV_blend_square;
-   case GL_ZERO:
-   case GL_ONE:
-   case GL_SRC_COLOR:
-   case GL_ONE_MINUS_SRC_COLOR:
-   case GL_SRC_ALPHA:
-   case GL_ONE_MINUS_SRC_ALPHA:
-   case GL_DST_ALPHA:
-   case GL_ONE_MINUS_DST_ALPHA:
-   case GL_CONSTANT_COLOR:
-   case GL_ONE_MINUS_CONSTANT_COLOR:
-   case GL_CONSTANT_ALPHA:
-   case GL_ONE_MINUS_CONSTANT_ALPHA:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Check if src/dest RGB/A blend factors are legal.  If not generate
- * a GL error.
- * \return GL_TRUE if factors are legal, GL_FALSE otherwise.
- */
-static GLboolean
-validate_blend_factors(struct gl_context *ctx, const char *func,
-                       GLenum sfactorRGB, GLenum dfactorRGB,
-                       GLenum sfactorA, GLenum dfactorA)
-{
-   if (!legal_src_factor(ctx, sfactorRGB)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "%s(sfactorRGB = %s)", func,
-                  _mesa_lookup_enum_by_nr(sfactorRGB));
-      return GL_FALSE;
-   }
-
-   if (!legal_dst_factor(ctx, dfactorRGB)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "%s(dfactorRGB = %s)", func,
-                  _mesa_lookup_enum_by_nr(dfactorRGB));
-      return GL_FALSE;
-   }
-
-   if (sfactorA != sfactorRGB && !legal_src_factor(ctx, sfactorA)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "%s(sfactorA = %s)", func,
-                  _mesa_lookup_enum_by_nr(sfactorA));
-      return GL_FALSE;
-   }
-
-   if (dfactorA != dfactorRGB && !legal_dst_factor(ctx, dfactorA)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "%s(dfactorA = %s)", func,
-                  _mesa_lookup_enum_by_nr(dfactorA));
-      return GL_FALSE;
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Specify the blending operation.
- *
- * \param sfactor source factor operator.
- * \param dfactor destination factor operator.
- *
- * \sa glBlendFunc, glBlendFuncSeparateEXT
- */
-void GLAPIENTRY
-_mesa_BlendFunc( GLenum sfactor, GLenum dfactor )
-{
-   _mesa_BlendFuncSeparateEXT(sfactor, dfactor, sfactor, dfactor);
-}
-
-
-/**
- * Set the separate blend source/dest factors for all draw buffers.
- *
- * \param sfactorRGB RGB source factor operator.
- * \param dfactorRGB RGB destination factor operator.
- * \param sfactorA alpha source factor operator.
- * \param dfactorA alpha destination factor operator.
- */
-void GLAPIENTRY
-_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
-                            GLenum sfactorA, GLenum dfactorA )
-{
-   GLuint buf, numBuffers;
-   GLboolean changed;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glBlendFuncSeparate %s %s %s %s\n",
-                  _mesa_lookup_enum_by_nr(sfactorRGB),
-                  _mesa_lookup_enum_by_nr(dfactorRGB),
-                  _mesa_lookup_enum_by_nr(sfactorA),
-                  _mesa_lookup_enum_by_nr(dfactorA));
-
-   if (!validate_blend_factors(ctx, "glBlendFuncSeparate",
-                               sfactorRGB, dfactorRGB,
-                               sfactorA, dfactorA)) {
-      return;
-   }
-
-   numBuffers = ctx->Extensions.ARB_draw_buffers_blend
-      ? ctx->Const.MaxDrawBuffers : 1;
-
-   changed = GL_FALSE;
-   for (buf = 0; buf < numBuffers; buf++) {
-      if (ctx->Color.Blend[buf].SrcRGB != sfactorRGB ||
-          ctx->Color.Blend[buf].DstRGB != dfactorRGB ||
-          ctx->Color.Blend[buf].SrcA != sfactorA ||
-          ctx->Color.Blend[buf].DstA != dfactorA) {
-         changed = GL_TRUE;
-         break;
-      }
-   }
-   if (!changed)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-
-   for (buf = 0; buf < numBuffers; buf++) {
-      ctx->Color.Blend[buf].SrcRGB = sfactorRGB;
-      ctx->Color.Blend[buf].DstRGB = dfactorRGB;
-      ctx->Color.Blend[buf].SrcA = sfactorA;
-      ctx->Color.Blend[buf].DstA = dfactorA;
-   }
-   ctx->Color._BlendFuncPerBuffer = GL_FALSE;
-
-   if (ctx->Driver.BlendFuncSeparate) {
-      ctx->Driver.BlendFuncSeparate(ctx, sfactorRGB, dfactorRGB,
-                                    sfactorA, dfactorA);
-   }
-}
-
-
-#if _HAVE_FULL_GL
-
-
-/**
- * Set blend source/dest factors for one color buffer/target.
- */
-void GLAPIENTRY
-_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor)
-{
-   _mesa_BlendFuncSeparatei(buf, sfactor, dfactor, sfactor, dfactor);
-}
-
-
-/**
- * Set separate blend source/dest factors for one color buffer/target.
- */
-void GLAPIENTRY
-_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
-                         GLenum sfactorA, GLenum dfactorA)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.ARB_draw_buffers_blend) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBlendFunc[Separate]i()");
-      return;
-   }
-
-   if (buf >= ctx->Const.MaxDrawBuffers) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBlendFuncSeparatei(buffer=%u)",
-                  buf);
-      return;
-   }
-
-   if (!validate_blend_factors(ctx, "glBlendFuncSeparatei",
-                               sfactorRGB, dfactorRGB,
-                               sfactorA, dfactorA)) {
-      return;
-   }
-
-   if (ctx->Color.Blend[buf].SrcRGB == sfactorRGB &&
-       ctx->Color.Blend[buf].DstRGB == dfactorRGB &&
-       ctx->Color.Blend[buf].SrcA == sfactorA &&
-       ctx->Color.Blend[buf].DstA == dfactorA)
-      return; /* no change */
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-
-   ctx->Color.Blend[buf].SrcRGB = sfactorRGB;
-   ctx->Color.Blend[buf].DstRGB = dfactorRGB;
-   ctx->Color.Blend[buf].SrcA = sfactorA;
-   ctx->Color.Blend[buf].DstA = dfactorA;
-   ctx->Color._BlendFuncPerBuffer = GL_TRUE;
-
-   if (ctx->Driver.BlendFuncSeparatei) {
-      ctx->Driver.BlendFuncSeparatei(ctx, buf, sfactorRGB, dfactorRGB,
-                                     sfactorA, dfactorA);
-   }
-}
-
-
-/**
- * Check if given blend equation is legal.
- * \return GL_TRUE if legal, GL_FALSE otherwise.
- */
-static GLboolean
-legal_blend_equation(const struct gl_context *ctx,
-                     GLenum mode, GLboolean is_separate)
-{
-   switch (mode) {
-   case GL_FUNC_ADD:
-      return GL_TRUE;
-   case GL_MIN:
-   case GL_MAX:
-      return ctx->Extensions.EXT_blend_minmax;
-   case GL_LOGIC_OP:
-      /* glBlendEquationSeparate cannot take GL_LOGIC_OP as a parameter.
-       */
-      return ctx->Extensions.EXT_blend_logic_op && !is_separate;
-   case GL_FUNC_SUBTRACT:
-   case GL_FUNC_REVERSE_SUBTRACT:
-      return ctx->Extensions.EXT_blend_subtract;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/* This is really an extension function! */
-void GLAPIENTRY
-_mesa_BlendEquation( GLenum mode )
-{
-   GLuint buf, numBuffers;
-   GLboolean changed;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glBlendEquation(%s)\n",
-                  _mesa_lookup_enum_by_nr(mode));
-
-   if (!legal_blend_equation(ctx, mode, GL_FALSE)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquation");
-      return;
-   }
-
-   numBuffers = ctx->Extensions.ARB_draw_buffers_blend
-      ? ctx->Const.MaxDrawBuffers : 1;
-
-   changed = GL_FALSE;
-   for (buf = 0; buf < numBuffers; buf++) {
-      if (ctx->Color.Blend[buf].EquationRGB != mode ||
-          ctx->Color.Blend[buf].EquationA != mode) {
-         changed = GL_TRUE;
-         break;
-      }
-   }
-   if (!changed)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   for (buf = 0; buf < numBuffers; buf++) {
-      ctx->Color.Blend[buf].EquationRGB = mode;
-      ctx->Color.Blend[buf].EquationA = mode;
-   }
-   ctx->Color._BlendEquationPerBuffer = GL_FALSE;
-
-   if (ctx->Driver.BlendEquationSeparate)
-      (*ctx->Driver.BlendEquationSeparate)( ctx, mode, mode );
-}
-
-
-/**
- * Set blend equation for one color buffer/target.
- */
-void GLAPIENTRY
-_mesa_BlendEquationi(GLuint buf, GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glBlendEquationi(%u, %s)\n",
-                  buf, _mesa_lookup_enum_by_nr(mode));
-
-   if (buf >= ctx->Const.MaxDrawBuffers) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBlendFuncSeparatei(buffer=%u)",
-                  buf);
-      return;
-   }
-
-   if (!legal_blend_equation(ctx, mode, GL_FALSE)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationi");
-      return;
-   }
-
-   if (ctx->Color.Blend[buf].EquationRGB == mode &&
-       ctx->Color.Blend[buf].EquationA == mode)
-      return;  /* no change */
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   ctx->Color.Blend[buf].EquationRGB = mode;
-   ctx->Color.Blend[buf].EquationA = mode;
-   ctx->Color._BlendEquationPerBuffer = GL_TRUE;
-
-   if (ctx->Driver.BlendEquationSeparatei)
-      ctx->Driver.BlendEquationSeparatei(ctx, buf, mode, mode);
-}
-
-
-void GLAPIENTRY
-_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA )
-{
-   GLuint buf, numBuffers;
-   GLboolean changed;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glBlendEquationSeparateEXT(%s %s)\n",
-                  _mesa_lookup_enum_by_nr(modeRGB),
-                  _mesa_lookup_enum_by_nr(modeA));
-
-   if ( (modeRGB != modeA) && !ctx->Extensions.EXT_blend_equation_separate ) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-		  "glBlendEquationSeparateEXT not supported by driver");
-      return;
-   }
-
-   if (!legal_blend_equation(ctx, modeRGB, GL_TRUE)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeRGB)");
-      return;
-   }
-
-   if (!legal_blend_equation(ctx, modeA, GL_TRUE)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeA)");
-      return;
-   }
-
-   numBuffers = ctx->Extensions.ARB_draw_buffers_blend
-      ? ctx->Const.MaxDrawBuffers : 1;
-
-   changed = GL_FALSE;
-   for (buf = 0; buf < numBuffers; buf++) {
-      if (ctx->Color.Blend[buf].EquationRGB != modeRGB ||
-          ctx->Color.Blend[buf].EquationA != modeA) {
-         changed = GL_TRUE;
-         break;
-      }
-   }
-   if (!changed)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   for (buf = 0; buf < numBuffers; buf++) {
-      ctx->Color.Blend[buf].EquationRGB = modeRGB;
-      ctx->Color.Blend[buf].EquationA = modeA;
-   }
-   ctx->Color._BlendEquationPerBuffer = GL_FALSE;
-
-   if (ctx->Driver.BlendEquationSeparate)
-      ctx->Driver.BlendEquationSeparate(ctx, modeRGB, modeA);
-}
-
-
-/**
- * Set separate blend equations for one color buffer/target.
- */
-void
-_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glBlendEquationSeparatei(%u, %s %s)\n", buf,
-                  _mesa_lookup_enum_by_nr(modeRGB),
-                  _mesa_lookup_enum_by_nr(modeA));
-
-   if (buf >= ctx->Const.MaxDrawBuffers) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBlendEquationSeparatei(buffer=%u)",
-                  buf);
-      return;
-   }
-
-   if (!legal_blend_equation(ctx, modeRGB, GL_TRUE)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparatei(modeRGB)");
-      return;
-   }
-
-   if (!legal_blend_equation(ctx, modeA, GL_TRUE)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparatei(modeA)");
-      return;
-   }
-
-   if (ctx->Color.Blend[buf].EquationRGB == modeRGB &&
-       ctx->Color.Blend[buf].EquationA == modeA)
-      return;  /* no change */
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   ctx->Color.Blend[buf].EquationRGB = modeRGB;
-   ctx->Color.Blend[buf].EquationA = modeA;
-   ctx->Color._BlendEquationPerBuffer = GL_TRUE;
-
-   if (ctx->Driver.BlendEquationSeparatei)
-      ctx->Driver.BlendEquationSeparatei(ctx, buf, modeRGB, modeA);
-}
-
-
-
-#endif /* _HAVE_FULL_GL */
-
-
-/**
- * Set the blending color.
- *
- * \param red red color component.
- * \param green green color component.
- * \param blue blue color component.
- * \param alpha alpha color component.
- *
- * \sa glBlendColor().
- *
- * Clamps the parameters and updates gl_colorbuffer_attrib::BlendColor.  On a
- * change, flushes the vertices and notifies the driver via
- * dd_function_table::BlendColor callback.
- */
-void GLAPIENTRY
-_mesa_BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
-{
-   GLfloat tmp[4];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   tmp[0] = red;
-   tmp[1] = green;
-   tmp[2] = blue;
-   tmp[3] = alpha;
-
-   if (TEST_EQ_4V(tmp, ctx->Color.BlendColorUnclamped))
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   COPY_4FV( ctx->Color.BlendColorUnclamped, tmp );
-
-   ctx->Color.BlendColor[0] = CLAMP(tmp[0], 0.0F, 1.0F);
-   ctx->Color.BlendColor[1] = CLAMP(tmp[1], 0.0F, 1.0F);
-   ctx->Color.BlendColor[2] = CLAMP(tmp[2], 0.0F, 1.0F);
-   ctx->Color.BlendColor[3] = CLAMP(tmp[3], 0.0F, 1.0F);
-
-   if (ctx->Driver.BlendColor)
-      (*ctx->Driver.BlendColor)(ctx, ctx->Color.BlendColor);
-}
-
-
-/**
- * Specify the alpha test function.
- *
- * \param func alpha comparison function.
- * \param ref reference value.
- *
- * Verifies the parameters and updates gl_colorbuffer_attrib. 
- * On a change, flushes the vertices and notifies the driver via
- * dd_function_table::AlphaFunc callback.
- */
-void GLAPIENTRY
-_mesa_AlphaFunc( GLenum func, GLclampf ref )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glAlphaFunc(%s, %f)\n",
-                  _mesa_lookup_enum_by_nr(func), ref);
-
-   switch (func) {
-   case GL_NEVER:
-   case GL_LESS:
-   case GL_EQUAL:
-   case GL_LEQUAL:
-   case GL_GREATER:
-   case GL_NOTEQUAL:
-   case GL_GEQUAL:
-   case GL_ALWAYS:
-      if (ctx->Color.AlphaFunc == func && ctx->Color.AlphaRefUnclamped == ref)
-         return; /* no change */
-
-      FLUSH_VERTICES(ctx, _NEW_COLOR);
-      ctx->Color.AlphaFunc = func;
-      ctx->Color.AlphaRefUnclamped = ref;
-      ctx->Color.AlphaRef = CLAMP(ref, 0.0F, 1.0F);
-
-      if (ctx->Driver.AlphaFunc)
-         ctx->Driver.AlphaFunc(ctx, func, ctx->Color.AlphaRef);
-      return;
-
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glAlphaFunc(func)" );
-      return;
-   }
-}
-
-
-/**
- * Specify a logic pixel operation for color index rendering.
- *
- * \param opcode operation.
- *
- * Verifies that \p opcode is a valid enum and updates
-gl_colorbuffer_attrib::LogicOp.
- * On a change, flushes the vertices and notifies the driver via the
- * dd_function_table::LogicOpcode callback.
- */
-void GLAPIENTRY
-_mesa_LogicOp( GLenum opcode )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glLogicOp(%s)\n", _mesa_lookup_enum_by_nr(opcode));
-
-   switch (opcode) {
-      case GL_CLEAR:
-      case GL_SET:
-      case GL_COPY:
-      case GL_COPY_INVERTED:
-      case GL_NOOP:
-      case GL_INVERT:
-      case GL_AND:
-      case GL_NAND:
-      case GL_OR:
-      case GL_NOR:
-      case GL_XOR:
-      case GL_EQUIV:
-      case GL_AND_REVERSE:
-      case GL_AND_INVERTED:
-      case GL_OR_REVERSE:
-      case GL_OR_INVERTED:
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glLogicOp" );
-	 return;
-   }
-
-   if (ctx->Color.LogicOp == opcode)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   ctx->Color.LogicOp = opcode;
-
-   if (ctx->Driver.LogicOpcode)
-      ctx->Driver.LogicOpcode( ctx, opcode );
-}
-
-#if _HAVE_FULL_GL
-void GLAPIENTRY
-_mesa_IndexMask( GLuint mask )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Color.IndexMask == mask)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   ctx->Color.IndexMask = mask;
-}
-#endif
-
-
-/**
- * Enable or disable writing of frame buffer color components.
- *
- * \param red whether to mask writing of the red color component.
- * \param green whether to mask writing of the green color component.
- * \param blue whether to mask writing of the blue color component.
- * \param alpha whether to mask writing of the alpha color component.
- *
- * \sa glColorMask().
- *
- * Sets the appropriate value of gl_colorbuffer_attrib::ColorMask.  On a
- * change, flushes the vertices and notifies the driver via the
- * dd_function_table::ColorMask callback.
- */
-void GLAPIENTRY
-_mesa_ColorMask( GLboolean red, GLboolean green,
-                 GLboolean blue, GLboolean alpha )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLubyte tmp[4];
-   GLuint i;
-   GLboolean flushed;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glColorMask(%d, %d, %d, %d)\n",
-                  red, green, blue, alpha);
-
-   /* Shouldn't have any information about channel depth in core mesa
-    * -- should probably store these as the native booleans:
-    */
-   tmp[RCOMP] = red    ? 0xff : 0x0;
-   tmp[GCOMP] = green  ? 0xff : 0x0;
-   tmp[BCOMP] = blue   ? 0xff : 0x0;
-   tmp[ACOMP] = alpha  ? 0xff : 0x0;
-
-   flushed = GL_FALSE;
-   for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
-      if (!TEST_EQ_4V(tmp, ctx->Color.ColorMask[i])) {
-         if (!flushed) {
-            FLUSH_VERTICES(ctx, _NEW_COLOR);
-         }
-         flushed = GL_TRUE;
-         COPY_4UBV(ctx->Color.ColorMask[i], tmp);
-      }
-   }
-
-   if (ctx->Driver.ColorMask)
-      ctx->Driver.ColorMask( ctx, red, green, blue, alpha );
-}
-
-
-/**
- * For GL_EXT_draw_buffers2 and GL3
- */
-void GLAPIENTRY
-_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,
-                        GLboolean blue, GLboolean alpha )
-{
-   GLubyte tmp[4];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glColorMaskIndexed %u %d %d %d %d\n",
-                  buf, red, green, blue, alpha);
-
-   if (buf >= ctx->Const.MaxDrawBuffers) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glColorMaskIndexed(buf=%u)", buf);
-      return;
-   }
-
-   /* Shouldn't have any information about channel depth in core mesa
-    * -- should probably store these as the native booleans:
-    */
-   tmp[RCOMP] = red    ? 0xff : 0x0;
-   tmp[GCOMP] = green  ? 0xff : 0x0;
-   tmp[BCOMP] = blue   ? 0xff : 0x0;
-   tmp[ACOMP] = alpha  ? 0xff : 0x0;
-
-   if (TEST_EQ_4V(tmp, ctx->Color.ColorMask[buf]))
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   COPY_4UBV(ctx->Color.ColorMask[buf], tmp);
-
-   if (ctx->Driver.ColorMaskIndexed)
-      ctx->Driver.ColorMaskIndexed(ctx, buf, red, green, blue, alpha);
-}
-
-
-void GLAPIENTRY
-_mesa_ClampColorARB(GLenum target, GLenum clamp)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (clamp != GL_TRUE && clamp != GL_FALSE && clamp != GL_FIXED_ONLY_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glClampColorARB(clamp)");
-      return;
-   }
-
-   switch (target) {
-   case GL_CLAMP_VERTEX_COLOR_ARB:
-      FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      ctx->Light.ClampVertexColor = clamp;
-      break;
-   case GL_CLAMP_FRAGMENT_COLOR_ARB:
-      FLUSH_VERTICES(ctx, _NEW_FRAG_CLAMP);
-      ctx->Color.ClampFragmentColor = clamp;
-      break;
-   case GL_CLAMP_READ_COLOR_ARB:
-      FLUSH_VERTICES(ctx, _NEW_COLOR);
-      ctx->Color.ClampReadColor = clamp;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glClampColorARB(target)");
-      return;
-   }
-}
-
-
-
-
-/**********************************************************************/
-/** \name Initialization */
-/*@{*/
-
-/**
- * Initialization of the context's Color attribute group.
- *
- * \param ctx GL context.
- *
- * Initializes the related fields in the context color attribute group,
- * __struct gl_contextRec::Color.
- */
-void _mesa_init_color( struct gl_context * ctx )
-{
-   GLuint i;
-
-   /* Color buffer group */
-   ctx->Color.IndexMask = ~0u;
-   memset(ctx->Color.ColorMask, 0xff, sizeof(ctx->Color.ColorMask));
-   ctx->Color.ClearIndex = 0;
-   ASSIGN_4V( ctx->Color.ClearColor, 0, 0, 0, 0 );
-   ASSIGN_4V( ctx->Color.ClearColorUnclamped, 0, 0, 0, 0 );
-   ctx->Color.AlphaEnabled = GL_FALSE;
-   ctx->Color.AlphaFunc = GL_ALWAYS;
-   ctx->Color.AlphaRef = 0;
-   ctx->Color.BlendEnabled = 0x0;
-   for (i = 0; i < Elements(ctx->Color.Blend); i++) {
-      ctx->Color.Blend[i].SrcRGB = GL_ONE;
-      ctx->Color.Blend[i].DstRGB = GL_ZERO;
-      ctx->Color.Blend[i].SrcA = GL_ONE;
-      ctx->Color.Blend[i].DstA = GL_ZERO;
-      ctx->Color.Blend[i].EquationRGB = GL_FUNC_ADD;
-      ctx->Color.Blend[i].EquationA = GL_FUNC_ADD;
-   }
-   ASSIGN_4V( ctx->Color.BlendColor, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( ctx->Color.BlendColorUnclamped, 0.0, 0.0, 0.0, 0.0 );
-   ctx->Color.IndexLogicOpEnabled = GL_FALSE;
-   ctx->Color.ColorLogicOpEnabled = GL_FALSE;
-   ctx->Color._LogicOpEnabled = GL_FALSE;
-   ctx->Color.LogicOp = GL_COPY;
-   ctx->Color.DitherFlag = GL_TRUE;
-
-   if (ctx->Visual.doubleBufferMode) {
-      ctx->Color.DrawBuffer[0] = GL_BACK;
-   }
-   else {
-      ctx->Color.DrawBuffer[0] = GL_FRONT;
-   }
-
-   ctx->Color.ClampFragmentColor = GL_FIXED_ONLY_ARB;
-   ctx->Color._ClampFragmentColor = GL_TRUE;
-   ctx->Color.ClampReadColor = GL_FIXED_ONLY_ARB;
-   ctx->Color._ClampReadColor = GL_TRUE;
-}
-
-/*@}*/
+/**

+ * \file blend.c

+ * Blending operations.

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.1

+ *

+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+

+#include "glheader.h"

+#include "blend.h"

+#include "context.h"

+#include "enums.h"

+#include "macros.h"

+#include "mtypes.h"

+

+

+

+/**

+ * Check if given blend source factor is legal.

+ * \return GL_TRUE if legal, GL_FALSE otherwise.

+ */

+static GLboolean

+legal_src_factor(const struct gl_context *ctx, GLenum factor)

+{

+   switch (factor) {

+   case GL_SRC_COLOR:

+   case GL_ONE_MINUS_SRC_COLOR:

+      return ctx->Extensions.NV_blend_square;

+   case GL_ZERO:

+   case GL_ONE:

+   case GL_DST_COLOR:

+   case GL_ONE_MINUS_DST_COLOR:

+   case GL_SRC_ALPHA:

+   case GL_ONE_MINUS_SRC_ALPHA:

+   case GL_DST_ALPHA:

+   case GL_ONE_MINUS_DST_ALPHA:

+   case GL_SRC_ALPHA_SATURATE:

+   case GL_CONSTANT_COLOR:

+   case GL_ONE_MINUS_CONSTANT_COLOR:

+   case GL_CONSTANT_ALPHA:

+   case GL_ONE_MINUS_CONSTANT_ALPHA:

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Check if given blend destination factor is legal.

+ * \return GL_TRUE if legal, GL_FALSE otherwise.

+ */

+static GLboolean

+legal_dst_factor(const struct gl_context *ctx, GLenum factor)

+{

+   switch (factor) {

+   case GL_DST_COLOR:

+   case GL_ONE_MINUS_DST_COLOR:

+      return ctx->Extensions.NV_blend_square;

+   case GL_ZERO:

+   case GL_ONE:

+   case GL_SRC_COLOR:

+   case GL_ONE_MINUS_SRC_COLOR:

+   case GL_SRC_ALPHA:

+   case GL_ONE_MINUS_SRC_ALPHA:

+   case GL_DST_ALPHA:

+   case GL_ONE_MINUS_DST_ALPHA:

+   case GL_CONSTANT_COLOR:

+   case GL_ONE_MINUS_CONSTANT_COLOR:

+   case GL_CONSTANT_ALPHA:

+   case GL_ONE_MINUS_CONSTANT_ALPHA:

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Check if src/dest RGB/A blend factors are legal.  If not generate

+ * a GL error.

+ * \return GL_TRUE if factors are legal, GL_FALSE otherwise.

+ */

+static GLboolean

+validate_blend_factors(struct gl_context *ctx, const char *func,

+                       GLenum sfactorRGB, GLenum dfactorRGB,

+                       GLenum sfactorA, GLenum dfactorA)

+{

+   if (!legal_src_factor(ctx, sfactorRGB)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "%s(sfactorRGB = %s)", func,

+                  _mesa_lookup_enum_by_nr(sfactorRGB));

+      return GL_FALSE;

+   }

+

+   if (!legal_dst_factor(ctx, dfactorRGB)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "%s(dfactorRGB = %s)", func,

+                  _mesa_lookup_enum_by_nr(dfactorRGB));

+      return GL_FALSE;

+   }

+

+   if (sfactorA != sfactorRGB && !legal_src_factor(ctx, sfactorA)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "%s(sfactorA = %s)", func,

+                  _mesa_lookup_enum_by_nr(sfactorA));

+      return GL_FALSE;

+   }

+

+   if (dfactorA != dfactorRGB && !legal_dst_factor(ctx, dfactorA)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "%s(dfactorA = %s)", func,

+                  _mesa_lookup_enum_by_nr(dfactorA));

+      return GL_FALSE;

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Specify the blending operation.

+ *

+ * \param sfactor source factor operator.

+ * \param dfactor destination factor operator.

+ *

+ * \sa glBlendFunc, glBlendFuncSeparateEXT

+ */

+void GLAPIENTRY

+_mesa_BlendFunc( GLenum sfactor, GLenum dfactor )

+{

+   _mesa_BlendFuncSeparateEXT(sfactor, dfactor, sfactor, dfactor);

+}

+

+

+/**

+ * Set the separate blend source/dest factors for all draw buffers.

+ *

+ * \param sfactorRGB RGB source factor operator.

+ * \param dfactorRGB RGB destination factor operator.

+ * \param sfactorA alpha source factor operator.

+ * \param dfactorA alpha destination factor operator.

+ */

+void GLAPIENTRY

+_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,

+                            GLenum sfactorA, GLenum dfactorA )

+{

+   GLuint buf, numBuffers;

+   GLboolean changed;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glBlendFuncSeparate %s %s %s %s\n",

+                  _mesa_lookup_enum_by_nr(sfactorRGB),

+                  _mesa_lookup_enum_by_nr(dfactorRGB),

+                  _mesa_lookup_enum_by_nr(sfactorA),

+                  _mesa_lookup_enum_by_nr(dfactorA));

+

+   if (!validate_blend_factors(ctx, "glBlendFuncSeparate",

+                               sfactorRGB, dfactorRGB,

+                               sfactorA, dfactorA)) {

+      return;

+   }

+

+   numBuffers = ctx->Extensions.ARB_draw_buffers_blend

+      ? ctx->Const.MaxDrawBuffers : 1;

+

+   changed = GL_FALSE;

+   for (buf = 0; buf < numBuffers; buf++) {

+      if (ctx->Color.Blend[buf].SrcRGB != sfactorRGB ||

+          ctx->Color.Blend[buf].DstRGB != dfactorRGB ||

+          ctx->Color.Blend[buf].SrcA != sfactorA ||

+          ctx->Color.Blend[buf].DstA != dfactorA) {

+         changed = GL_TRUE;

+         break;

+      }

+   }

+   if (!changed)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+

+   for (buf = 0; buf < numBuffers; buf++) {

+      ctx->Color.Blend[buf].SrcRGB = sfactorRGB;

+      ctx->Color.Blend[buf].DstRGB = dfactorRGB;

+      ctx->Color.Blend[buf].SrcA = sfactorA;

+      ctx->Color.Blend[buf].DstA = dfactorA;

+   }

+   ctx->Color._BlendFuncPerBuffer = GL_FALSE;

+

+   if (ctx->Driver.BlendFuncSeparate) {

+      ctx->Driver.BlendFuncSeparate(ctx, sfactorRGB, dfactorRGB,

+                                    sfactorA, dfactorA);

+   }

+}

+

+

+#if _HAVE_FULL_GL

+

+

+/**

+ * Set blend source/dest factors for one color buffer/target.

+ */

+void GLAPIENTRY

+_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor)

+{

+   _mesa_BlendFuncSeparatei(buf, sfactor, dfactor, sfactor, dfactor);

+}

+

+

+/**

+ * Set separate blend source/dest factors for one color buffer/target.

+ */

+void GLAPIENTRY

+_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,

+                         GLenum sfactorA, GLenum dfactorA)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!ctx->Extensions.ARB_draw_buffers_blend) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBlendFunc[Separate]i()");

+      return;

+   }

+

+   if (buf >= ctx->Const.MaxDrawBuffers) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glBlendFuncSeparatei(buffer=%u)",

+                  buf);

+      return;

+   }

+

+   if (!validate_blend_factors(ctx, "glBlendFuncSeparatei",

+                               sfactorRGB, dfactorRGB,

+                               sfactorA, dfactorA)) {

+      return;

+   }

+

+   if (ctx->Color.Blend[buf].SrcRGB == sfactorRGB &&

+       ctx->Color.Blend[buf].DstRGB == dfactorRGB &&

+       ctx->Color.Blend[buf].SrcA == sfactorA &&

+       ctx->Color.Blend[buf].DstA == dfactorA)

+      return; /* no change */

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+

+   ctx->Color.Blend[buf].SrcRGB = sfactorRGB;

+   ctx->Color.Blend[buf].DstRGB = dfactorRGB;

+   ctx->Color.Blend[buf].SrcA = sfactorA;

+   ctx->Color.Blend[buf].DstA = dfactorA;

+   ctx->Color._BlendFuncPerBuffer = GL_TRUE;

+

+   if (ctx->Driver.BlendFuncSeparatei) {

+      ctx->Driver.BlendFuncSeparatei(ctx, buf, sfactorRGB, dfactorRGB,

+                                     sfactorA, dfactorA);

+   }

+}

+

+

+/**

+ * Check if given blend equation is legal.

+ * \return GL_TRUE if legal, GL_FALSE otherwise.

+ */

+static GLboolean

+legal_blend_equation(const struct gl_context *ctx,

+                     GLenum mode, GLboolean is_separate)

+{

+   switch (mode) {

+   case GL_FUNC_ADD:

+      return GL_TRUE;

+   case GL_MIN:

+   case GL_MAX:

+      return ctx->Extensions.EXT_blend_minmax;

+   case GL_LOGIC_OP:

+      /* glBlendEquationSeparate cannot take GL_LOGIC_OP as a parameter.

+       */

+      return ctx->Extensions.EXT_blend_logic_op && !is_separate;

+   case GL_FUNC_SUBTRACT:

+   case GL_FUNC_REVERSE_SUBTRACT:

+      return ctx->Extensions.EXT_blend_subtract;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+/* This is really an extension function! */

+void GLAPIENTRY

+_mesa_BlendEquation( GLenum mode )

+{

+   GLuint buf, numBuffers;

+   GLboolean changed;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glBlendEquation(%s)\n",

+                  _mesa_lookup_enum_by_nr(mode));

+

+   if (!legal_blend_equation(ctx, mode, GL_FALSE)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquation");

+      return;

+   }

+

+   numBuffers = ctx->Extensions.ARB_draw_buffers_blend

+      ? ctx->Const.MaxDrawBuffers : 1;

+

+   changed = GL_FALSE;

+   for (buf = 0; buf < numBuffers; buf++) {

+      if (ctx->Color.Blend[buf].EquationRGB != mode ||

+          ctx->Color.Blend[buf].EquationA != mode) {

+         changed = GL_TRUE;

+         break;

+      }

+   }

+   if (!changed)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   for (buf = 0; buf < numBuffers; buf++) {

+      ctx->Color.Blend[buf].EquationRGB = mode;

+      ctx->Color.Blend[buf].EquationA = mode;

+   }

+   ctx->Color._BlendEquationPerBuffer = GL_FALSE;

+

+   if (ctx->Driver.BlendEquationSeparate)

+      (*ctx->Driver.BlendEquationSeparate)( ctx, mode, mode );

+}

+

+

+/**

+ * Set blend equation for one color buffer/target.

+ */

+void GLAPIENTRY

+_mesa_BlendEquationi(GLuint buf, GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glBlendEquationi(%u, %s)\n",

+                  buf, _mesa_lookup_enum_by_nr(mode));

+

+   if (buf >= ctx->Const.MaxDrawBuffers) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glBlendFuncSeparatei(buffer=%u)",

+                  buf);

+      return;

+   }

+

+   if (!legal_blend_equation(ctx, mode, GL_FALSE)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationi");

+      return;

+   }

+

+   if (ctx->Color.Blend[buf].EquationRGB == mode &&

+       ctx->Color.Blend[buf].EquationA == mode)

+      return;  /* no change */

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   ctx->Color.Blend[buf].EquationRGB = mode;

+   ctx->Color.Blend[buf].EquationA = mode;

+   ctx->Color._BlendEquationPerBuffer = GL_TRUE;

+

+   if (ctx->Driver.BlendEquationSeparatei)

+      ctx->Driver.BlendEquationSeparatei(ctx, buf, mode, mode);

+}

+

+

+void GLAPIENTRY

+_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA )

+{

+   GLuint buf, numBuffers;

+   GLboolean changed;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glBlendEquationSeparateEXT(%s %s)\n",

+                  _mesa_lookup_enum_by_nr(modeRGB),

+                  _mesa_lookup_enum_by_nr(modeA));

+

+   if ( (modeRGB != modeA) && !ctx->Extensions.EXT_blend_equation_separate ) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+		  "glBlendEquationSeparateEXT not supported by driver");

+      return;

+   }

+

+   if (!legal_blend_equation(ctx, modeRGB, GL_TRUE)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeRGB)");

+      return;

+   }

+

+   if (!legal_blend_equation(ctx, modeA, GL_TRUE)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeA)");

+      return;

+   }

+

+   numBuffers = ctx->Extensions.ARB_draw_buffers_blend

+      ? ctx->Const.MaxDrawBuffers : 1;

+

+   changed = GL_FALSE;

+   for (buf = 0; buf < numBuffers; buf++) {

+      if (ctx->Color.Blend[buf].EquationRGB != modeRGB ||

+          ctx->Color.Blend[buf].EquationA != modeA) {

+         changed = GL_TRUE;

+         break;

+      }

+   }

+   if (!changed)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   for (buf = 0; buf < numBuffers; buf++) {

+      ctx->Color.Blend[buf].EquationRGB = modeRGB;

+      ctx->Color.Blend[buf].EquationA = modeA;

+   }

+   ctx->Color._BlendEquationPerBuffer = GL_FALSE;

+

+   if (ctx->Driver.BlendEquationSeparate)

+      ctx->Driver.BlendEquationSeparate(ctx, modeRGB, modeA);

+}

+

+

+/**

+ * Set separate blend equations for one color buffer/target.

+ */

+void

+_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glBlendEquationSeparatei(%u, %s %s)\n", buf,

+                  _mesa_lookup_enum_by_nr(modeRGB),

+                  _mesa_lookup_enum_by_nr(modeA));

+

+   if (buf >= ctx->Const.MaxDrawBuffers) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glBlendEquationSeparatei(buffer=%u)",

+                  buf);

+      return;

+   }

+

+   if (!legal_blend_equation(ctx, modeRGB, GL_TRUE)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparatei(modeRGB)");

+      return;

+   }

+

+   if (!legal_blend_equation(ctx, modeA, GL_TRUE)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparatei(modeA)");

+      return;

+   }

+

+   if (ctx->Color.Blend[buf].EquationRGB == modeRGB &&

+       ctx->Color.Blend[buf].EquationA == modeA)

+      return;  /* no change */

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   ctx->Color.Blend[buf].EquationRGB = modeRGB;

+   ctx->Color.Blend[buf].EquationA = modeA;

+   ctx->Color._BlendEquationPerBuffer = GL_TRUE;

+

+   if (ctx->Driver.BlendEquationSeparatei)

+      ctx->Driver.BlendEquationSeparatei(ctx, buf, modeRGB, modeA);

+}

+

+

+

+#endif /* _HAVE_FULL_GL */

+

+

+/**

+ * Set the blending color.

+ *

+ * \param red red color component.

+ * \param green green color component.

+ * \param blue blue color component.

+ * \param alpha alpha color component.

+ *

+ * \sa glBlendColor().

+ *

+ * Clamps the parameters and updates gl_colorbuffer_attrib::BlendColor.  On a

+ * change, flushes the vertices and notifies the driver via

+ * dd_function_table::BlendColor callback.

+ */

+void GLAPIENTRY

+_mesa_BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )

+{

+   GLfloat tmp[4];

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   tmp[0] = red;

+   tmp[1] = green;

+   tmp[2] = blue;

+   tmp[3] = alpha;

+

+   if (TEST_EQ_4V(tmp, ctx->Color.BlendColorUnclamped))

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   COPY_4FV( ctx->Color.BlendColorUnclamped, tmp );

+

+   ctx->Color.BlendColor[0] = CLAMP(tmp[0], 0.0F, 1.0F);

+   ctx->Color.BlendColor[1] = CLAMP(tmp[1], 0.0F, 1.0F);

+   ctx->Color.BlendColor[2] = CLAMP(tmp[2], 0.0F, 1.0F);

+   ctx->Color.BlendColor[3] = CLAMP(tmp[3], 0.0F, 1.0F);

+

+   if (ctx->Driver.BlendColor)

+      (*ctx->Driver.BlendColor)(ctx, ctx->Color.BlendColor);

+}

+

+

+/**

+ * Specify the alpha test function.

+ *

+ * \param func alpha comparison function.

+ * \param ref reference value.

+ *

+ * Verifies the parameters and updates gl_colorbuffer_attrib. 

+ * On a change, flushes the vertices and notifies the driver via

+ * dd_function_table::AlphaFunc callback.

+ */

+void GLAPIENTRY

+_mesa_AlphaFunc( GLenum func, GLclampf ref )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glAlphaFunc(%s, %f)\n",

+                  _mesa_lookup_enum_by_nr(func), ref);

+

+   switch (func) {

+   case GL_NEVER:

+   case GL_LESS:

+   case GL_EQUAL:

+   case GL_LEQUAL:

+   case GL_GREATER:

+   case GL_NOTEQUAL:

+   case GL_GEQUAL:

+   case GL_ALWAYS:

+      if (ctx->Color.AlphaFunc == func && ctx->Color.AlphaRefUnclamped == ref)

+         return; /* no change */

+

+      FLUSH_VERTICES(ctx, _NEW_COLOR);

+      ctx->Color.AlphaFunc = func;

+      ctx->Color.AlphaRefUnclamped = ref;

+      ctx->Color.AlphaRef = CLAMP(ref, 0.0F, 1.0F);

+

+      if (ctx->Driver.AlphaFunc)

+         ctx->Driver.AlphaFunc(ctx, func, ctx->Color.AlphaRef);

+      return;

+

+   default:

+      _mesa_error( ctx, GL_INVALID_ENUM, "glAlphaFunc(func)" );

+      return;

+   }

+}

+

+

+/**

+ * Specify a logic pixel operation for color index rendering.

+ *

+ * \param opcode operation.

+ *

+ * Verifies that \p opcode is a valid enum and updates

+gl_colorbuffer_attrib::LogicOp.

+ * On a change, flushes the vertices and notifies the driver via the

+ * dd_function_table::LogicOpcode callback.

+ */

+void GLAPIENTRY

+_mesa_LogicOp( GLenum opcode )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glLogicOp(%s)\n", _mesa_lookup_enum_by_nr(opcode));

+

+   switch (opcode) {

+      case GL_CLEAR:

+      case GL_SET:

+      case GL_COPY:

+      case GL_COPY_INVERTED:

+      case GL_NOOP:

+      case GL_INVERT:

+      case GL_AND:

+      case GL_NAND:

+      case GL_OR:

+      case GL_NOR:

+      case GL_XOR:

+      case GL_EQUIV:

+      case GL_AND_REVERSE:

+      case GL_AND_INVERTED:

+      case GL_OR_REVERSE:

+      case GL_OR_INVERTED:

+	 break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glLogicOp" );

+	 return;

+   }

+

+   if (ctx->Color.LogicOp == opcode)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   ctx->Color.LogicOp = opcode;

+

+   if (ctx->Driver.LogicOpcode)

+      ctx->Driver.LogicOpcode( ctx, opcode );

+}

+

+#if _HAVE_FULL_GL

+void GLAPIENTRY

+_mesa_IndexMask( GLuint mask )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->Color.IndexMask == mask)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   ctx->Color.IndexMask = mask;

+}

+#endif

+

+

+/**

+ * Enable or disable writing of frame buffer color components.

+ *

+ * \param red whether to mask writing of the red color component.

+ * \param green whether to mask writing of the green color component.

+ * \param blue whether to mask writing of the blue color component.

+ * \param alpha whether to mask writing of the alpha color component.

+ *

+ * \sa glColorMask().

+ *

+ * Sets the appropriate value of gl_colorbuffer_attrib::ColorMask.  On a

+ * change, flushes the vertices and notifies the driver via the

+ * dd_function_table::ColorMask callback.

+ */

+void GLAPIENTRY

+_mesa_ColorMask( GLboolean red, GLboolean green,

+                 GLboolean blue, GLboolean alpha )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLubyte tmp[4];

+   GLuint i;

+   GLboolean flushed;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glColorMask(%d, %d, %d, %d)\n",

+                  red, green, blue, alpha);

+

+   /* Shouldn't have any information about channel depth in core mesa

+    * -- should probably store these as the native booleans:

+    */

+   tmp[RCOMP] = red    ? 0xff : 0x0;

+   tmp[GCOMP] = green  ? 0xff : 0x0;

+   tmp[BCOMP] = blue   ? 0xff : 0x0;

+   tmp[ACOMP] = alpha  ? 0xff : 0x0;

+

+   flushed = GL_FALSE;

+   for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {

+      if (!TEST_EQ_4V(tmp, ctx->Color.ColorMask[i])) {

+         if (!flushed) {

+            FLUSH_VERTICES(ctx, _NEW_COLOR);

+         }

+         flushed = GL_TRUE;

+         COPY_4UBV(ctx->Color.ColorMask[i], tmp);

+      }

+   }

+

+   if (ctx->Driver.ColorMask)

+      ctx->Driver.ColorMask( ctx, red, green, blue, alpha );

+}

+

+

+/**

+ * For GL_EXT_draw_buffers2 and GL3

+ */

+void GLAPIENTRY

+_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,

+                        GLboolean blue, GLboolean alpha )

+{

+   GLubyte tmp[4];

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glColorMaskIndexed %u %d %d %d %d\n",

+                  buf, red, green, blue, alpha);

+

+   if (buf >= ctx->Const.MaxDrawBuffers) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glColorMaskIndexed(buf=%u)", buf);

+      return;

+   }

+

+   /* Shouldn't have any information about channel depth in core mesa

+    * -- should probably store these as the native booleans:

+    */

+   tmp[RCOMP] = red    ? 0xff : 0x0;

+   tmp[GCOMP] = green  ? 0xff : 0x0;

+   tmp[BCOMP] = blue   ? 0xff : 0x0;

+   tmp[ACOMP] = alpha  ? 0xff : 0x0;

+

+   if (TEST_EQ_4V(tmp, ctx->Color.ColorMask[buf]))

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   COPY_4UBV(ctx->Color.ColorMask[buf], tmp);

+

+   if (ctx->Driver.ColorMaskIndexed)

+      ctx->Driver.ColorMaskIndexed(ctx, buf, red, green, blue, alpha);

+}

+

+

+void GLAPIENTRY

+_mesa_ClampColorARB(GLenum target, GLenum clamp)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (clamp != GL_TRUE && clamp != GL_FALSE && clamp != GL_FIXED_ONLY_ARB) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glClampColorARB(clamp)");

+      return;

+   }

+

+   switch (target) {

+   case GL_CLAMP_VERTEX_COLOR_ARB:

+      FLUSH_VERTICES(ctx, _NEW_LIGHT);

+      ctx->Light.ClampVertexColor = clamp;

+      break;

+   case GL_CLAMP_FRAGMENT_COLOR_ARB:

+      FLUSH_VERTICES(ctx, _NEW_FRAG_CLAMP);

+      ctx->Color.ClampFragmentColor = clamp;

+      break;

+   case GL_CLAMP_READ_COLOR_ARB:

+      FLUSH_VERTICES(ctx, _NEW_COLOR);

+      ctx->Color.ClampReadColor = clamp;

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glClampColorARB(target)");

+      return;

+   }

+}

+

+

+

+

+/**********************************************************************/

+/** \name Initialization */

+/*@{*/

+

+/**

+ * Initialization of the context's Color attribute group.

+ *

+ * \param ctx GL context.

+ *

+ * Initializes the related fields in the context color attribute group,

+ * __struct gl_contextRec::Color.

+ */

+void _mesa_init_color( struct gl_context * ctx )

+{

+   GLuint i;

+

+   /* Color buffer group */

+   ctx->Color.IndexMask = ~0u;

+   memset(ctx->Color.ColorMask, 0xff, sizeof(ctx->Color.ColorMask));

+   ctx->Color.ClearIndex = 0;

+   ASSIGN_4V( ctx->Color.ClearColor, 0, 0, 0, 0 );

+   ASSIGN_4V( ctx->Color.ClearColorUnclamped, 0, 0, 0, 0 );

+   ctx->Color.AlphaEnabled = GL_FALSE;

+   ctx->Color.AlphaFunc = GL_ALWAYS;

+   ctx->Color.AlphaRef = 0;

+   ctx->Color.BlendEnabled = 0x0;

+   for (i = 0; i < Elements(ctx->Color.Blend); i++) {

+      ctx->Color.Blend[i].SrcRGB = GL_ONE;

+      ctx->Color.Blend[i].DstRGB = GL_ZERO;

+      ctx->Color.Blend[i].SrcA = GL_ONE;

+      ctx->Color.Blend[i].DstA = GL_ZERO;

+      ctx->Color.Blend[i].EquationRGB = GL_FUNC_ADD;

+      ctx->Color.Blend[i].EquationA = GL_FUNC_ADD;

+   }

+   ASSIGN_4V( ctx->Color.BlendColor, 0.0, 0.0, 0.0, 0.0 );

+   ASSIGN_4V( ctx->Color.BlendColorUnclamped, 0.0, 0.0, 0.0, 0.0 );

+   ctx->Color.IndexLogicOpEnabled = GL_FALSE;

+   ctx->Color.ColorLogicOpEnabled = GL_FALSE;

+   ctx->Color._LogicOpEnabled = GL_FALSE;

+   ctx->Color.LogicOp = GL_COPY;

+   ctx->Color.DitherFlag = GL_TRUE;

+

+   if (ctx->Visual.doubleBufferMode) {

+      ctx->Color.DrawBuffer[0] = GL_BACK;

+   }

+   else {

+      ctx->Color.DrawBuffer[0] = GL_FRONT;

+   }

+

+   ctx->Color.ClampFragmentColor = GL_FIXED_ONLY_ARB;

+   ctx->Color._ClampFragmentColor = GL_TRUE;

+   ctx->Color.ClampReadColor = GL_FIXED_ONLY_ARB;

+   ctx->Color._ClampReadColor = GL_TRUE;

+}

+

+/*@}*/

diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index c49437cf5..1d64e63f9 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -202,7 +202,7 @@ buffer_object_subdata_range_good( struct gl_context * ctx, GLenum target,
  * 

  * Default callback for the \c dd_function_table::NewBufferObject() hook.

  */

-static struct gl_buffer_object *

+struct gl_buffer_object *

 _mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )

 {

    struct gl_buffer_object *obj;

@@ -220,7 +220,7 @@ _mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )
  * 

  * Default callback for the \c dd_function_table::DeleteBuffer() hook.

  */

-static void

+void

 _mesa_delete_buffer_object(struct gl_context *ctx,

                            struct gl_buffer_object *bufObj)

 {

@@ -342,7 +342,7 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
  * \return GL_TRUE for success, GL_FALSE for failure

  * \sa glBufferDataARB, dd_function_table::BufferData.

  */

-static GLboolean

+GLboolean

 _mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,

 		   const GLvoid * data, GLenum usage,

 		   struct gl_buffer_object * bufObj )

@@ -386,7 +386,7 @@ _mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
  *

  * \sa glBufferSubDataARB, dd_function_table::BufferSubData.

  */

-static void

+void

 _mesa_buffer_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,

 		      GLsizeiptrARB size, const GLvoid * data,

 		      struct gl_buffer_object * bufObj )

@@ -419,7 +419,7 @@ _mesa_buffer_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,
  *

  * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.

  */

-static void

+void

 _mesa_buffer_get_subdata( struct gl_context *ctx,

                           GLenum target, GLintptrARB offset,

 			  GLsizeiptrARB size, GLvoid * data,

@@ -447,7 +447,7 @@ _mesa_buffer_get_subdata( struct gl_context *ctx,
  *

  * \sa glMapBufferARB, dd_function_table::MapBuffer

  */

-static void *

+void *

 _mesa_buffer_map( struct gl_context *ctx, GLenum target, GLenum access,

 		  struct gl_buffer_object *bufObj )

 {

@@ -512,7 +512,7 @@ _mesa_buffer_flush_mapped_range( struct gl_context *ctx, GLenum target,
  *

  * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer

  */

-static GLboolean

+GLboolean

 _mesa_buffer_unmap( struct gl_context *ctx, GLenum target,

                     struct gl_buffer_object *bufObj )

 {

diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h
index 91fa073b6..f673f431f 100644
--- a/mesalib/src/mesa/main/bufferobj.h
+++ b/mesalib/src/mesa/main/bufferobj.h
@@ -1,149 +1,149 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.6
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-
-#ifndef BUFFEROBJ_H
-#define BUFFEROBJ_H
-
-
-#include "mfeatures.h"
-#include "mtypes.h"
-
-
-/*
- * Internal functions
- */
-
-
-/** Is the given buffer object currently mapped? */
-static INLINE GLboolean
-_mesa_bufferobj_mapped(const struct gl_buffer_object *obj)
-{
-   return obj->Pointer != NULL;
-}
-
-/**
- * Is the given buffer object a user-created buffer object?
- * Mesa uses default buffer objects in several places.  Default buffers
- * always have Name==0.  User created buffers have Name!=0.
- */
-static INLINE GLboolean
-_mesa_is_bufferobj(const struct gl_buffer_object *obj)
-{
-   return obj->Name != 0;
-}
-
-
-extern void
-_mesa_init_buffer_objects( struct gl_context *ctx );
-
-extern void
-_mesa_free_buffer_objects( struct gl_context *ctx );
-
-extern void
-_mesa_update_default_objects_buffer_objects(struct gl_context *ctx);
-
-
-extern struct gl_buffer_object *
-_mesa_lookup_bufferobj(struct gl_context *ctx, GLuint buffer);
-
-extern void
-_mesa_initialize_buffer_object( struct gl_buffer_object *obj,
-				GLuint name, GLenum target );
-
-extern void
-_mesa_reference_buffer_object(struct gl_context *ctx,
-                              struct gl_buffer_object **ptr,
-                              struct gl_buffer_object *bufObj);
-
-extern void
-_mesa_init_buffer_object_functions(struct dd_function_table *driver);
-
-
-/*
- * API functions
- */
-
-extern void GLAPIENTRY
-_mesa_BindBufferARB(GLenum target, GLuint buffer);
-
-extern void GLAPIENTRY
-_mesa_DeleteBuffersARB(GLsizei n, const GLuint * buffer);
-
-extern void GLAPIENTRY
-_mesa_GenBuffersARB(GLsizei n, GLuint * buffer);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsBufferARB(GLuint buffer);
-
-extern void GLAPIENTRY
-_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);
-
-extern void GLAPIENTRY
-_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);
-
-extern void GLAPIENTRY
-_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data);
-
-extern void * GLAPIENTRY
-_mesa_MapBufferARB(GLenum target, GLenum access);
-
-extern GLboolean GLAPIENTRY
-_mesa_UnmapBufferARB(GLenum target);
-
-extern void GLAPIENTRY
-_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params);
-
-extern void GLAPIENTRY
-_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params);
-
-extern void GLAPIENTRY
-_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
-                        GLintptr readOffset, GLintptr writeOffset,
-                        GLsizeiptr size);
-
-extern void * GLAPIENTRY
-_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
-                     GLbitfield access);
-
-extern void GLAPIENTRY
-_mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length);
-
-#if FEATURE_APPLE_object_purgeable
-extern GLenum GLAPIENTRY
-_mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option);
-
-extern GLenum GLAPIENTRY
-_mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option);
-
-extern void GLAPIENTRY
-_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, GLint* params);
-#endif
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.6

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+

+#ifndef BUFFEROBJ_H

+#define BUFFEROBJ_H

+

+

+#include "mfeatures.h"

+#include "mtypes.h"

+

+

+/*

+ * Internal functions

+ */

+

+

+/** Is the given buffer object currently mapped? */

+static INLINE GLboolean

+_mesa_bufferobj_mapped(const struct gl_buffer_object *obj)

+{

+   return obj->Pointer != NULL;

+}

+

+/**

+ * Is the given buffer object a user-created buffer object?

+ * Mesa uses default buffer objects in several places.  Default buffers

+ * always have Name==0.  User created buffers have Name!=0.

+ */

+static INLINE GLboolean

+_mesa_is_bufferobj(const struct gl_buffer_object *obj)

+{

+   return obj->Name != 0;

+}

+

+

+extern void

+_mesa_init_buffer_objects( struct gl_context *ctx );

+

+extern void

+_mesa_free_buffer_objects( struct gl_context *ctx );

+

+extern void

+_mesa_update_default_objects_buffer_objects(struct gl_context *ctx);

+

+

+extern struct gl_buffer_object *

+_mesa_lookup_bufferobj(struct gl_context *ctx, GLuint buffer);

+

+extern void

+_mesa_initialize_buffer_object( struct gl_buffer_object *obj,

+				GLuint name, GLenum target );

+

+extern void

+_mesa_reference_buffer_object(struct gl_context *ctx,

+                              struct gl_buffer_object **ptr,

+                              struct gl_buffer_object *bufObj);

+

+extern void

+_mesa_init_buffer_object_functions(struct dd_function_table *driver);

+

+

+/*

+ * API functions

+ */

+

+extern void GLAPIENTRY

+_mesa_BindBufferARB(GLenum target, GLuint buffer);

+

+extern void GLAPIENTRY

+_mesa_DeleteBuffersARB(GLsizei n, const GLuint * buffer);

+

+extern void GLAPIENTRY

+_mesa_GenBuffersARB(GLsizei n, GLuint * buffer);

+

+extern GLboolean GLAPIENTRY

+_mesa_IsBufferARB(GLuint buffer);

+

+extern void GLAPIENTRY

+_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);

+

+extern void GLAPIENTRY

+_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);

+

+extern void GLAPIENTRY

+_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data);

+

+extern void * GLAPIENTRY

+_mesa_MapBufferARB(GLenum target, GLenum access);

+

+extern GLboolean GLAPIENTRY

+_mesa_UnmapBufferARB(GLenum target);

+

+extern void GLAPIENTRY

+_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params);

+

+extern void GLAPIENTRY

+_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params);

+

+extern void GLAPIENTRY

+_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,

+                        GLintptr readOffset, GLintptr writeOffset,

+                        GLsizeiptr size);

+

+extern void * GLAPIENTRY

+_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,

+                     GLbitfield access);

+

+extern void GLAPIENTRY

+_mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length);

+

+#if FEATURE_APPLE_object_purgeable

+extern GLenum GLAPIENTRY

+_mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option);

+

+extern GLenum GLAPIENTRY

+_mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option);

+

+extern void GLAPIENTRY

+_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, GLint* params);

+#endif

+

+#endif

diff --git a/mesalib/src/mesa/main/clear.c b/mesalib/src/mesa/main/clear.c
index fa95e4522..449a8d6ec 100644
--- a/mesalib/src/mesa/main/clear.c
+++ b/mesalib/src/mesa/main/clear.c
@@ -1,575 +1,575 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file clear.c
- * glClearColor, glClearIndex, glClear() functions.
- */
-
-
-
-#include "glheader.h"
-#include "clear.h"
-#include "context.h"
-#include "colormac.h"
-#include "enums.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "state.h"
-
-
-
-#if _HAVE_FULL_GL
-void GLAPIENTRY
-_mesa_ClearIndex( GLfloat c )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Color.ClearIndex == (GLuint) c)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   ctx->Color.ClearIndex = (GLuint) c;
-}
-#endif
-
-
-/**
- * Specify the clear values for the color buffers.
- *
- * \param red red color component.
- * \param green green color component.
- * \param blue blue color component.
- * \param alpha alpha component.
- *
- * \sa glClearColor().
- *
- * Clamps the parameters and updates gl_colorbuffer_attrib::ClearColor.  On a
- * change, flushes the vertices and notifies the driver via the
- * dd_function_table::ClearColor callback.
- */
-void GLAPIENTRY
-_mesa_ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
-{
-   GLfloat tmp[4];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   tmp[0] = red;
-   tmp[1] = green;
-   tmp[2] = blue;
-   tmp[3] = alpha;
-
-   if (TEST_EQ_4V(tmp, ctx->Color.ClearColorUnclamped))
-      return; /* no change */
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   COPY_4V(ctx->Color.ClearColorUnclamped, tmp);
-
-   ctx->Color.ClearColor[0] = CLAMP(tmp[0], 0.0F, 1.0F);
-   ctx->Color.ClearColor[1] = CLAMP(tmp[1], 0.0F, 1.0F);
-   ctx->Color.ClearColor[2] = CLAMP(tmp[2], 0.0F, 1.0F);
-   ctx->Color.ClearColor[3] = CLAMP(tmp[3], 0.0F, 1.0F);
-
-   if (ctx->Driver.ClearColor) {
-      /* it's OK to call glClearColor in CI mode but it should be a NOP */
-      /* we pass the clamped color, since all drivers that need this don't
-       * support GL_ARB_color_buffer_float
-       */
-      (*ctx->Driver.ClearColor)(ctx, ctx->Color.ClearColor);
-   }
-}
-
-
-/**
- * GL_EXT_texture_integer
- */
-void GLAPIENTRY
-_mesa_ClearColorIiEXT(GLint r, GLint g, GLint b, GLint a)
-{
-   GLfloat tmp[4];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   tmp[0] = (GLfloat) r;
-   tmp[1] = (GLfloat) g;
-   tmp[2] = (GLfloat) b;
-   tmp[3] = (GLfloat) a;
-
-   if (TEST_EQ_4V(tmp, ctx->Color.ClearColor))
-      return; /* no change */
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-
-   /* XXX we should eventually have a float/int/uint union for
-    * the ctx->Color.ClearColor state.
-    */
-   COPY_4V(ctx->Color.ClearColor, tmp);
-
-   if (ctx->Driver.ClearColor) {
-      ctx->Driver.ClearColor(ctx, ctx->Color.ClearColor);
-   }
-}
-
-
-/**
- * GL_EXT_texture_integer
- */
-void GLAPIENTRY
-_mesa_ClearColorIuiEXT(GLuint r, GLuint g, GLuint b, GLuint a)
-{
-   GLfloat tmp[4];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   tmp[0] = (GLfloat) r;
-   tmp[1] = (GLfloat) g;
-   tmp[2] = (GLfloat) b;
-   tmp[3] = (GLfloat) a;
-
-   if (TEST_EQ_4V(tmp, ctx->Color.ClearColor))
-      return; /* no change */
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-
-   /* XXX we should eventually have a float/int/uint union for
-    * the ctx->Color.ClearColor state.
-    */
-   COPY_4V(ctx->Color.ClearColor, tmp);
-
-   if (ctx->Driver.ClearColor) {
-      ctx->Driver.ClearColor(ctx, ctx->Color.ClearColor);
-   }
-}
-
-
-/**
- * Clear buffers.
- * 
- * \param mask bit-mask indicating the buffers to be cleared.
- *
- * Flushes the vertices and verifies the parameter. If __struct gl_contextRec::NewState
- * is set then calls _mesa_update_state() to update gl_frame_buffer::_Xmin,
- * etc. If the rasterization mode is set to GL_RENDER then requests the driver
- * to clear the buffers, via the dd_function_table::Clear callback.
- */ 
-void GLAPIENTRY
-_mesa_Clear( GLbitfield mask )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   FLUSH_CURRENT(ctx, 0);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glClear 0x%x\n", mask);
-
-   if (mask & ~(GL_COLOR_BUFFER_BIT |
-                GL_DEPTH_BUFFER_BIT |
-                GL_STENCIL_BUFFER_BIT |
-                GL_ACCUM_BUFFER_BIT)) {
-      /* invalid bit set */
-      _mesa_error( ctx, GL_INVALID_VALUE, "glClear(0x%x)", mask);
-      return;
-   }
-
-   if (ctx->NewState) {
-      _mesa_update_state( ctx );	/* update _Xmin, etc */
-   }
-
-   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glClear(incomplete framebuffer)");
-      return;
-   }
-
-   if (ctx->DrawBuffer->Width == 0 || ctx->DrawBuffer->Height == 0 ||
-       ctx->DrawBuffer->_Xmin >= ctx->DrawBuffer->_Xmax ||
-       ctx->DrawBuffer->_Ymin >= ctx->DrawBuffer->_Ymax)
-      return;
-
-   if (ctx->RenderMode == GL_RENDER) {
-      GLbitfield bufferMask;
-
-      /* don't clear depth buffer if depth writing disabled */
-      if (!ctx->Depth.Mask)
-         mask &= ~GL_DEPTH_BUFFER_BIT;
-
-      /* Build the bitmask to send to device driver's Clear function.
-       * Note that the GL_COLOR_BUFFER_BIT flag will expand to 0, 1, 2 or 4
-       * of the BUFFER_BIT_FRONT/BACK_LEFT/RIGHT flags, or one of the
-       * BUFFER_BIT_COLORn flags.
-       */
-      bufferMask = 0;
-      if (mask & GL_COLOR_BUFFER_BIT) {
-         GLuint i;
-         for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
-            bufferMask |= (1 << ctx->DrawBuffer->_ColorDrawBufferIndexes[i]);
-         }
-      }
-
-      if ((mask & GL_DEPTH_BUFFER_BIT)
-          && ctx->DrawBuffer->Visual.haveDepthBuffer) {
-         bufferMask |= BUFFER_BIT_DEPTH;
-      }
-
-      if ((mask & GL_STENCIL_BUFFER_BIT)
-          && ctx->DrawBuffer->Visual.haveStencilBuffer) {
-         bufferMask |= BUFFER_BIT_STENCIL;
-      }
-
-      if ((mask & GL_ACCUM_BUFFER_BIT)
-          && ctx->DrawBuffer->Visual.haveAccumBuffer) {
-         bufferMask |= BUFFER_BIT_ACCUM;
-      }
-
-      ASSERT(ctx->Driver.Clear);
-      ctx->Driver.Clear(ctx, bufferMask);
-   }
-}
-
-
-/** Returned by make_color_buffer_mask() for errors */
-#define INVALID_MASK ~0x0
-
-
-/**
- * Convert the glClearBuffer 'drawbuffer' parameter into a bitmask of
- * BUFFER_BIT_x values.
- * Return INVALID_MASK if the drawbuffer value is invalid.
- */
-static GLbitfield
-make_color_buffer_mask(struct gl_context *ctx, GLint drawbuffer)
-{
-   const struct gl_renderbuffer_attachment *att = ctx->DrawBuffer->Attachment;
-   GLbitfield mask = 0x0;
-
-   switch (drawbuffer) {
-   case GL_FRONT:
-      if (att[BUFFER_FRONT_LEFT].Renderbuffer)
-         mask |= BUFFER_BIT_FRONT_LEFT;
-      if (att[BUFFER_FRONT_RIGHT].Renderbuffer)
-         mask |= BUFFER_BIT_FRONT_RIGHT;
-      break;
-   case GL_BACK:
-      if (att[BUFFER_BACK_LEFT].Renderbuffer)
-         mask |= BUFFER_BIT_BACK_LEFT;
-      if (att[BUFFER_BACK_RIGHT].Renderbuffer)
-         mask |= BUFFER_BIT_BACK_RIGHT;
-      break;
-   case GL_LEFT:
-      if (att[BUFFER_FRONT_LEFT].Renderbuffer)
-         mask |= BUFFER_BIT_FRONT_LEFT;
-      if (att[BUFFER_BACK_LEFT].Renderbuffer)
-         mask |= BUFFER_BIT_BACK_LEFT;
-      break;
-   case GL_RIGHT:
-      if (att[BUFFER_FRONT_RIGHT].Renderbuffer)
-         mask |= BUFFER_BIT_FRONT_RIGHT;
-      if (att[BUFFER_BACK_RIGHT].Renderbuffer)
-         mask |= BUFFER_BIT_BACK_RIGHT;
-      break;
-   case GL_FRONT_AND_BACK:
-      if (att[BUFFER_FRONT_LEFT].Renderbuffer)
-         mask |= BUFFER_BIT_FRONT_LEFT;
-      if (att[BUFFER_BACK_LEFT].Renderbuffer)
-         mask |= BUFFER_BIT_BACK_LEFT;
-      if (att[BUFFER_FRONT_RIGHT].Renderbuffer)
-         mask |= BUFFER_BIT_FRONT_RIGHT;
-      if (att[BUFFER_BACK_RIGHT].Renderbuffer)
-         mask |= BUFFER_BIT_BACK_RIGHT;
-      break;
-   default:
-      if (drawbuffer < 0 || drawbuffer >= (GLint)ctx->Const.MaxDrawBuffers) {
-         mask = INVALID_MASK;
-      }
-      else if (att[BUFFER_COLOR0 + drawbuffer].Renderbuffer) {
-         mask |= (BUFFER_BIT_COLOR0 << drawbuffer);
-      }
-   }
-
-   return mask;
-}
-
-
-
-/**
- * New in GL 3.0
- * Clear signed integer color buffer or stencil buffer (not depth).
- */
-void GLAPIENTRY
-_mesa_ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   FLUSH_CURRENT(ctx, 0);
-
-   if (ctx->NewState) {
-      _mesa_update_state( ctx );
-   }
-
-   switch (buffer) {
-   case GL_STENCIL:
-      if (drawbuffer != 0) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferiv(drawbuffer=%d)",
-                     drawbuffer);
-         return;
-      }
-      else {
-         /* Save current stencil clear value, set to 'value', do the
-          * stencil clear and restore the clear value.
-          * XXX in the future we may have a new ctx->Driver.ClearBuffer()
-          * hook instead.
-          */
-         const GLuint clearSave = ctx->Stencil.Clear;
-         ctx->Stencil.Clear = *value;
-         if (ctx->Driver.ClearStencil)
-            ctx->Driver.ClearStencil(ctx, *value);
-         ctx->Driver.Clear(ctx, BUFFER_BIT_STENCIL);
-         ctx->Stencil.Clear = clearSave;
-         if (ctx->Driver.ClearStencil)
-            ctx->Driver.ClearStencil(ctx, clearSave);
-      }
-      break;
-   case GL_COLOR:
-      {
-         const GLbitfield mask = make_color_buffer_mask(ctx, drawbuffer);
-         if (mask == INVALID_MASK) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferiv(drawbuffer=%d)",
-                        drawbuffer);
-            return;
-         }
-         else if (mask) {
-            /* XXX note: we're putting the integer clear values into the
-             * floating point state var.  This will not always work.  We'll
-             * need a new ctx->Driver.ClearBuffer() hook....
-             */
-            GLclampf clearSave[4];
-            /* save color */
-            COPY_4V(clearSave, ctx->Color.ClearColor);
-            /* set color */
-            COPY_4V_CAST(ctx->Color.ClearColor, value, GLclampf);
-            if (ctx->Driver.ClearColor)
-               ctx->Driver.ClearColor(ctx, ctx->Color.ClearColor);
-            /* clear buffer(s) */
-            ctx->Driver.Clear(ctx, mask);
-            /* restore color */
-            COPY_4V(ctx->Color.ClearColor, clearSave);
-            if (ctx->Driver.ClearColor)
-               ctx->Driver.ClearColor(ctx, clearSave);
-         }
-      }
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferiv(buffer=%s)",
-                  _mesa_lookup_enum_by_nr(buffer));
-      return;
-   }
-}
-
-
-/**
- * New in GL 3.0
- * Clear unsigned integer color buffer (not depth, not stencil).
- */
-void GLAPIENTRY
-_mesa_ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   FLUSH_CURRENT(ctx, 0);
-
-   if (ctx->NewState) {
-      _mesa_update_state( ctx );
-   }
-
-   switch (buffer) {
-   case GL_COLOR:
-      {
-         const GLbitfield mask = make_color_buffer_mask(ctx, drawbuffer);
-         if (mask == INVALID_MASK) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferuiv(drawbuffer=%d)",
-                        drawbuffer);
-            return;
-         }
-         else if (mask) {
-            /* XXX note: we're putting the uint clear values into the
-             * floating point state var.  This will not always work.  We'll
-             * need a new ctx->Driver.ClearBuffer() hook....
-             */
-            GLclampf clearSave[4];
-            /* save color */
-            COPY_4V(clearSave, ctx->Color.ClearColor);
-            /* set color */
-            COPY_4V_CAST(ctx->Color.ClearColor, value, GLclampf);
-            if (ctx->Driver.ClearColor)
-               ctx->Driver.ClearColor(ctx, ctx->Color.ClearColor);
-            /* clear buffer(s) */
-            ctx->Driver.Clear(ctx, mask);
-            /* restore color */
-            COPY_4V(ctx->Color.ClearColor, clearSave);
-            if (ctx->Driver.ClearColor)
-               ctx->Driver.ClearColor(ctx, clearSave);
-         }
-      }
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferuiv(buffer=%s)",
-                  _mesa_lookup_enum_by_nr(buffer));
-      return;
-   }
-}
-
-
-/**
- * New in GL 3.0
- * Clear fixed-pt or float color buffer or depth buffer (not stencil).
- */
-void GLAPIENTRY
-_mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   FLUSH_CURRENT(ctx, 0);
-
-   if (ctx->NewState) {
-      _mesa_update_state( ctx );
-   }
-
-   switch (buffer) {
-   case GL_DEPTH:
-      if (drawbuffer != 0) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferfv(drawbuffer=%d)",
-                     drawbuffer);
-         return;
-      }
-      else {
-         /* Save current depth clear value, set to 'value', do the
-          * depth clear and restore the clear value.
-          * XXX in the future we may have a new ctx->Driver.ClearBuffer()
-          * hook instead.
-          */
-         const GLclampd clearSave = ctx->Depth.Clear;
-         ctx->Depth.Clear = *value;
-         if (ctx->Driver.ClearDepth)
-            ctx->Driver.ClearDepth(ctx, *value);
-         ctx->Driver.Clear(ctx, BUFFER_BIT_DEPTH);
-         ctx->Depth.Clear = clearSave;
-         if (ctx->Driver.ClearDepth)
-            ctx->Driver.ClearDepth(ctx, clearSave);
-      }
-      /* clear depth buffer to value */
-      break;
-   case GL_COLOR:
-      {
-         const GLbitfield mask = make_color_buffer_mask(ctx, drawbuffer);
-         if (mask == INVALID_MASK) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferfv(drawbuffer=%d)",
-                        drawbuffer);
-            return;
-         }
-         else if (mask) {
-            GLclampf clearSave[4];
-            /* save color */
-            COPY_4V(clearSave, ctx->Color.ClearColor);
-            /* set color */
-            COPY_4V_CAST(ctx->Color.ClearColor, value, GLclampf);
-            if (ctx->Driver.ClearColor)
-               ctx->Driver.ClearColor(ctx, ctx->Color.ClearColor);
-            /* clear buffer(s) */
-            ctx->Driver.Clear(ctx, mask);
-            /* restore color */
-            COPY_4V(ctx->Color.ClearColor, clearSave);
-            if (ctx->Driver.ClearColor)
-               ctx->Driver.ClearColor(ctx, clearSave);
-         }
-      }
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferfv(buffer=%s)",
-                  _mesa_lookup_enum_by_nr(buffer));
-      return;
-   }
-}
-
-
-/**
- * New in GL 3.0
- * Clear depth/stencil buffer only.
- */
-void GLAPIENTRY
-_mesa_ClearBufferfi(GLenum buffer, GLint drawbuffer,
-                    GLfloat depth, GLint stencil)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   FLUSH_CURRENT(ctx, 0);
-
-   if (buffer != GL_DEPTH_STENCIL) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferfi(buffer=%s)",
-                  _mesa_lookup_enum_by_nr(buffer));
-      return;
-   }
-
-   if (drawbuffer != 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferfi(drawbuffer=%d)",
-                  drawbuffer);
-      return;
-   }
-
-   if (ctx->NewState) {
-      _mesa_update_state( ctx );
-   }
-
-   {
-      /* save current clear values */
-      const GLclampd clearDepthSave = ctx->Depth.Clear;
-      const GLuint clearStencilSave = ctx->Stencil.Clear;
-
-      /* set new clear values */
-      ctx->Depth.Clear = depth;
-      ctx->Stencil.Clear = stencil;
-      if (ctx->Driver.ClearDepth)
-         ctx->Driver.ClearDepth(ctx, depth);
-      if (ctx->Driver.ClearStencil)
-         ctx->Driver.ClearStencil(ctx, stencil);
-
-      /* clear buffers */
-      ctx->Driver.Clear(ctx, BUFFER_BIT_DEPTH | BUFFER_BIT_STENCIL);
-
-      /* restore */
-      ctx->Depth.Clear = clearDepthSave;
-      ctx->Stencil.Clear = clearStencilSave;
-      if (ctx->Driver.ClearDepth)
-         ctx->Driver.ClearDepth(ctx, clearDepthSave);
-      if (ctx->Driver.ClearStencil)
-         ctx->Driver.ClearStencil(ctx, clearStencilSave);
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file clear.c

+ * glClearColor, glClearIndex, glClear() functions.

+ */

+

+

+

+#include "glheader.h"

+#include "clear.h"

+#include "context.h"

+#include "colormac.h"

+#include "enums.h"

+#include "macros.h"

+#include "mtypes.h"

+#include "state.h"

+

+

+

+#if _HAVE_FULL_GL

+void GLAPIENTRY

+_mesa_ClearIndex( GLfloat c )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->Color.ClearIndex == (GLuint) c)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   ctx->Color.ClearIndex = (GLuint) c;

+}

+#endif

+

+

+/**

+ * Specify the clear values for the color buffers.

+ *

+ * \param red red color component.

+ * \param green green color component.

+ * \param blue blue color component.

+ * \param alpha alpha component.

+ *

+ * \sa glClearColor().

+ *

+ * Clamps the parameters and updates gl_colorbuffer_attrib::ClearColor.  On a

+ * change, flushes the vertices and notifies the driver via the

+ * dd_function_table::ClearColor callback.

+ */

+void GLAPIENTRY

+_mesa_ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )

+{

+   GLfloat tmp[4];

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   tmp[0] = red;

+   tmp[1] = green;

+   tmp[2] = blue;

+   tmp[3] = alpha;

+

+   if (TEST_EQ_4V(tmp, ctx->Color.ClearColorUnclamped))

+      return; /* no change */

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   COPY_4V(ctx->Color.ClearColorUnclamped, tmp);

+

+   ctx->Color.ClearColor[0] = CLAMP(tmp[0], 0.0F, 1.0F);

+   ctx->Color.ClearColor[1] = CLAMP(tmp[1], 0.0F, 1.0F);

+   ctx->Color.ClearColor[2] = CLAMP(tmp[2], 0.0F, 1.0F);

+   ctx->Color.ClearColor[3] = CLAMP(tmp[3], 0.0F, 1.0F);

+

+   if (ctx->Driver.ClearColor) {

+      /* it's OK to call glClearColor in CI mode but it should be a NOP */

+      /* we pass the clamped color, since all drivers that need this don't

+       * support GL_ARB_color_buffer_float

+       */

+      (*ctx->Driver.ClearColor)(ctx, ctx->Color.ClearColor);

+   }

+}

+

+

+/**

+ * GL_EXT_texture_integer

+ */

+void GLAPIENTRY

+_mesa_ClearColorIiEXT(GLint r, GLint g, GLint b, GLint a)

+{

+   GLfloat tmp[4];

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   tmp[0] = (GLfloat) r;

+   tmp[1] = (GLfloat) g;

+   tmp[2] = (GLfloat) b;

+   tmp[3] = (GLfloat) a;

+

+   if (TEST_EQ_4V(tmp, ctx->Color.ClearColor))

+      return; /* no change */

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+

+   /* XXX we should eventually have a float/int/uint union for

+    * the ctx->Color.ClearColor state.

+    */

+   COPY_4V(ctx->Color.ClearColor, tmp);

+

+   if (ctx->Driver.ClearColor) {

+      ctx->Driver.ClearColor(ctx, ctx->Color.ClearColor);

+   }

+}

+

+

+/**

+ * GL_EXT_texture_integer

+ */

+void GLAPIENTRY

+_mesa_ClearColorIuiEXT(GLuint r, GLuint g, GLuint b, GLuint a)

+{

+   GLfloat tmp[4];

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   tmp[0] = (GLfloat) r;

+   tmp[1] = (GLfloat) g;

+   tmp[2] = (GLfloat) b;

+   tmp[3] = (GLfloat) a;

+

+   if (TEST_EQ_4V(tmp, ctx->Color.ClearColor))

+      return; /* no change */

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+

+   /* XXX we should eventually have a float/int/uint union for

+    * the ctx->Color.ClearColor state.

+    */

+   COPY_4V(ctx->Color.ClearColor, tmp);

+

+   if (ctx->Driver.ClearColor) {

+      ctx->Driver.ClearColor(ctx, ctx->Color.ClearColor);

+   }

+}

+

+

+/**

+ * Clear buffers.

+ * 

+ * \param mask bit-mask indicating the buffers to be cleared.

+ *

+ * Flushes the vertices and verifies the parameter. If __struct gl_contextRec::NewState

+ * is set then calls _mesa_update_state() to update gl_frame_buffer::_Xmin,

+ * etc. If the rasterization mode is set to GL_RENDER then requests the driver

+ * to clear the buffers, via the dd_function_table::Clear callback.

+ */ 

+void GLAPIENTRY

+_mesa_Clear( GLbitfield mask )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   FLUSH_CURRENT(ctx, 0);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glClear 0x%x\n", mask);

+

+   if (mask & ~(GL_COLOR_BUFFER_BIT |

+                GL_DEPTH_BUFFER_BIT |

+                GL_STENCIL_BUFFER_BIT |

+                GL_ACCUM_BUFFER_BIT)) {

+      /* invalid bit set */

+      _mesa_error( ctx, GL_INVALID_VALUE, "glClear(0x%x)", mask);

+      return;

+   }

+

+   if (ctx->NewState) {

+      _mesa_update_state( ctx );	/* update _Xmin, etc */

+   }

+

+   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,

+                  "glClear(incomplete framebuffer)");

+      return;

+   }

+

+   if (ctx->DrawBuffer->Width == 0 || ctx->DrawBuffer->Height == 0 ||

+       ctx->DrawBuffer->_Xmin >= ctx->DrawBuffer->_Xmax ||

+       ctx->DrawBuffer->_Ymin >= ctx->DrawBuffer->_Ymax)

+      return;

+

+   if (ctx->RenderMode == GL_RENDER) {

+      GLbitfield bufferMask;

+

+      /* don't clear depth buffer if depth writing disabled */

+      if (!ctx->Depth.Mask)

+         mask &= ~GL_DEPTH_BUFFER_BIT;

+

+      /* Build the bitmask to send to device driver's Clear function.

+       * Note that the GL_COLOR_BUFFER_BIT flag will expand to 0, 1, 2 or 4

+       * of the BUFFER_BIT_FRONT/BACK_LEFT/RIGHT flags, or one of the

+       * BUFFER_BIT_COLORn flags.

+       */

+      bufferMask = 0;

+      if (mask & GL_COLOR_BUFFER_BIT) {

+         GLuint i;

+         for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {

+            bufferMask |= (1 << ctx->DrawBuffer->_ColorDrawBufferIndexes[i]);

+         }

+      }

+

+      if ((mask & GL_DEPTH_BUFFER_BIT)

+          && ctx->DrawBuffer->Visual.haveDepthBuffer) {

+         bufferMask |= BUFFER_BIT_DEPTH;

+      }

+

+      if ((mask & GL_STENCIL_BUFFER_BIT)

+          && ctx->DrawBuffer->Visual.haveStencilBuffer) {

+         bufferMask |= BUFFER_BIT_STENCIL;

+      }

+

+      if ((mask & GL_ACCUM_BUFFER_BIT)

+          && ctx->DrawBuffer->Visual.haveAccumBuffer) {

+         bufferMask |= BUFFER_BIT_ACCUM;

+      }

+

+      ASSERT(ctx->Driver.Clear);

+      ctx->Driver.Clear(ctx, bufferMask);

+   }

+}

+

+

+/** Returned by make_color_buffer_mask() for errors */

+#define INVALID_MASK ~0x0

+

+

+/**

+ * Convert the glClearBuffer 'drawbuffer' parameter into a bitmask of

+ * BUFFER_BIT_x values.

+ * Return INVALID_MASK if the drawbuffer value is invalid.

+ */

+static GLbitfield

+make_color_buffer_mask(struct gl_context *ctx, GLint drawbuffer)

+{

+   const struct gl_renderbuffer_attachment *att = ctx->DrawBuffer->Attachment;

+   GLbitfield mask = 0x0;

+

+   switch (drawbuffer) {

+   case GL_FRONT:

+      if (att[BUFFER_FRONT_LEFT].Renderbuffer)

+         mask |= BUFFER_BIT_FRONT_LEFT;

+      if (att[BUFFER_FRONT_RIGHT].Renderbuffer)

+         mask |= BUFFER_BIT_FRONT_RIGHT;

+      break;

+   case GL_BACK:

+      if (att[BUFFER_BACK_LEFT].Renderbuffer)

+         mask |= BUFFER_BIT_BACK_LEFT;

+      if (att[BUFFER_BACK_RIGHT].Renderbuffer)

+         mask |= BUFFER_BIT_BACK_RIGHT;

+      break;

+   case GL_LEFT:

+      if (att[BUFFER_FRONT_LEFT].Renderbuffer)

+         mask |= BUFFER_BIT_FRONT_LEFT;

+      if (att[BUFFER_BACK_LEFT].Renderbuffer)

+         mask |= BUFFER_BIT_BACK_LEFT;

+      break;

+   case GL_RIGHT:

+      if (att[BUFFER_FRONT_RIGHT].Renderbuffer)

+         mask |= BUFFER_BIT_FRONT_RIGHT;

+      if (att[BUFFER_BACK_RIGHT].Renderbuffer)

+         mask |= BUFFER_BIT_BACK_RIGHT;

+      break;

+   case GL_FRONT_AND_BACK:

+      if (att[BUFFER_FRONT_LEFT].Renderbuffer)

+         mask |= BUFFER_BIT_FRONT_LEFT;

+      if (att[BUFFER_BACK_LEFT].Renderbuffer)

+         mask |= BUFFER_BIT_BACK_LEFT;

+      if (att[BUFFER_FRONT_RIGHT].Renderbuffer)

+         mask |= BUFFER_BIT_FRONT_RIGHT;

+      if (att[BUFFER_BACK_RIGHT].Renderbuffer)

+         mask |= BUFFER_BIT_BACK_RIGHT;

+      break;

+   default:

+      if (drawbuffer < 0 || drawbuffer >= (GLint)ctx->Const.MaxDrawBuffers) {

+         mask = INVALID_MASK;

+      }

+      else if (att[BUFFER_COLOR0 + drawbuffer].Renderbuffer) {

+         mask |= (BUFFER_BIT_COLOR0 << drawbuffer);

+      }

+   }

+

+   return mask;

+}

+

+

+

+/**

+ * New in GL 3.0

+ * Clear signed integer color buffer or stencil buffer (not depth).

+ */

+void GLAPIENTRY

+_mesa_ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   FLUSH_CURRENT(ctx, 0);

+

+   if (ctx->NewState) {

+      _mesa_update_state( ctx );

+   }

+

+   switch (buffer) {

+   case GL_STENCIL:

+      if (drawbuffer != 0) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferiv(drawbuffer=%d)",

+                     drawbuffer);

+         return;

+      }

+      else {

+         /* Save current stencil clear value, set to 'value', do the

+          * stencil clear and restore the clear value.

+          * XXX in the future we may have a new ctx->Driver.ClearBuffer()

+          * hook instead.

+          */

+         const GLuint clearSave = ctx->Stencil.Clear;

+         ctx->Stencil.Clear = *value;

+         if (ctx->Driver.ClearStencil)

+            ctx->Driver.ClearStencil(ctx, *value);

+         ctx->Driver.Clear(ctx, BUFFER_BIT_STENCIL);

+         ctx->Stencil.Clear = clearSave;

+         if (ctx->Driver.ClearStencil)

+            ctx->Driver.ClearStencil(ctx, clearSave);

+      }

+      break;

+   case GL_COLOR:

+      {

+         const GLbitfield mask = make_color_buffer_mask(ctx, drawbuffer);

+         if (mask == INVALID_MASK) {

+            _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferiv(drawbuffer=%d)",

+                        drawbuffer);

+            return;

+         }

+         else if (mask) {

+            /* XXX note: we're putting the integer clear values into the

+             * floating point state var.  This will not always work.  We'll

+             * need a new ctx->Driver.ClearBuffer() hook....

+             */

+            GLclampf clearSave[4];

+            /* save color */

+            COPY_4V(clearSave, ctx->Color.ClearColor);

+            /* set color */

+            COPY_4V_CAST(ctx->Color.ClearColor, value, GLclampf);

+            if (ctx->Driver.ClearColor)

+               ctx->Driver.ClearColor(ctx, ctx->Color.ClearColor);

+            /* clear buffer(s) */

+            ctx->Driver.Clear(ctx, mask);

+            /* restore color */

+            COPY_4V(ctx->Color.ClearColor, clearSave);

+            if (ctx->Driver.ClearColor)

+               ctx->Driver.ClearColor(ctx, clearSave);

+         }

+      }

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferiv(buffer=%s)",

+                  _mesa_lookup_enum_by_nr(buffer));

+      return;

+   }

+}

+

+

+/**

+ * New in GL 3.0

+ * Clear unsigned integer color buffer (not depth, not stencil).

+ */

+void GLAPIENTRY

+_mesa_ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   FLUSH_CURRENT(ctx, 0);

+

+   if (ctx->NewState) {

+      _mesa_update_state( ctx );

+   }

+

+   switch (buffer) {

+   case GL_COLOR:

+      {

+         const GLbitfield mask = make_color_buffer_mask(ctx, drawbuffer);

+         if (mask == INVALID_MASK) {

+            _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferuiv(drawbuffer=%d)",

+                        drawbuffer);

+            return;

+         }

+         else if (mask) {

+            /* XXX note: we're putting the uint clear values into the

+             * floating point state var.  This will not always work.  We'll

+             * need a new ctx->Driver.ClearBuffer() hook....

+             */

+            GLclampf clearSave[4];

+            /* save color */

+            COPY_4V(clearSave, ctx->Color.ClearColor);

+            /* set color */

+            COPY_4V_CAST(ctx->Color.ClearColor, value, GLclampf);

+            if (ctx->Driver.ClearColor)

+               ctx->Driver.ClearColor(ctx, ctx->Color.ClearColor);

+            /* clear buffer(s) */

+            ctx->Driver.Clear(ctx, mask);

+            /* restore color */

+            COPY_4V(ctx->Color.ClearColor, clearSave);

+            if (ctx->Driver.ClearColor)

+               ctx->Driver.ClearColor(ctx, clearSave);

+         }

+      }

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferuiv(buffer=%s)",

+                  _mesa_lookup_enum_by_nr(buffer));

+      return;

+   }

+}

+

+

+/**

+ * New in GL 3.0

+ * Clear fixed-pt or float color buffer or depth buffer (not stencil).

+ */

+void GLAPIENTRY

+_mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   FLUSH_CURRENT(ctx, 0);

+

+   if (ctx->NewState) {

+      _mesa_update_state( ctx );

+   }

+

+   switch (buffer) {

+   case GL_DEPTH:

+      if (drawbuffer != 0) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferfv(drawbuffer=%d)",

+                     drawbuffer);

+         return;

+      }

+      else {

+         /* Save current depth clear value, set to 'value', do the

+          * depth clear and restore the clear value.

+          * XXX in the future we may have a new ctx->Driver.ClearBuffer()

+          * hook instead.

+          */

+         const GLclampd clearSave = ctx->Depth.Clear;

+         ctx->Depth.Clear = *value;

+         if (ctx->Driver.ClearDepth)

+            ctx->Driver.ClearDepth(ctx, *value);

+         ctx->Driver.Clear(ctx, BUFFER_BIT_DEPTH);

+         ctx->Depth.Clear = clearSave;

+         if (ctx->Driver.ClearDepth)

+            ctx->Driver.ClearDepth(ctx, clearSave);

+      }

+      /* clear depth buffer to value */

+      break;

+   case GL_COLOR:

+      {

+         const GLbitfield mask = make_color_buffer_mask(ctx, drawbuffer);

+         if (mask == INVALID_MASK) {

+            _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferfv(drawbuffer=%d)",

+                        drawbuffer);

+            return;

+         }

+         else if (mask) {

+            GLclampf clearSave[4];

+            /* save color */

+            COPY_4V(clearSave, ctx->Color.ClearColor);

+            /* set color */

+            COPY_4V_CAST(ctx->Color.ClearColor, value, GLclampf);

+            if (ctx->Driver.ClearColor)

+               ctx->Driver.ClearColor(ctx, ctx->Color.ClearColor);

+            /* clear buffer(s) */

+            ctx->Driver.Clear(ctx, mask);

+            /* restore color */

+            COPY_4V(ctx->Color.ClearColor, clearSave);

+            if (ctx->Driver.ClearColor)

+               ctx->Driver.ClearColor(ctx, clearSave);

+         }

+      }

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferfv(buffer=%s)",

+                  _mesa_lookup_enum_by_nr(buffer));

+      return;

+   }

+}

+

+

+/**

+ * New in GL 3.0

+ * Clear depth/stencil buffer only.

+ */

+void GLAPIENTRY

+_mesa_ClearBufferfi(GLenum buffer, GLint drawbuffer,

+                    GLfloat depth, GLint stencil)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   FLUSH_CURRENT(ctx, 0);

+

+   if (buffer != GL_DEPTH_STENCIL) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferfi(buffer=%s)",

+                  _mesa_lookup_enum_by_nr(buffer));

+      return;

+   }

+

+   if (drawbuffer != 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferfi(drawbuffer=%d)",

+                  drawbuffer);

+      return;

+   }

+

+   if (ctx->NewState) {

+      _mesa_update_state( ctx );

+   }

+

+   {

+      /* save current clear values */

+      const GLclampd clearDepthSave = ctx->Depth.Clear;

+      const GLuint clearStencilSave = ctx->Stencil.Clear;

+

+      /* set new clear values */

+      ctx->Depth.Clear = depth;

+      ctx->Stencil.Clear = stencil;

+      if (ctx->Driver.ClearDepth)

+         ctx->Driver.ClearDepth(ctx, depth);

+      if (ctx->Driver.ClearStencil)

+         ctx->Driver.ClearStencil(ctx, stencil);

+

+      /* clear buffers */

+      ctx->Driver.Clear(ctx, BUFFER_BIT_DEPTH | BUFFER_BIT_STENCIL);

+

+      /* restore */

+      ctx->Depth.Clear = clearDepthSave;

+      ctx->Stencil.Clear = clearStencilSave;

+      if (ctx->Driver.ClearDepth)

+         ctx->Driver.ClearDepth(ctx, clearDepthSave);

+      if (ctx->Driver.ClearStencil)

+         ctx->Driver.ClearStencil(ctx, clearStencilSave);

+   }

+}

diff --git a/mesalib/src/mesa/main/colortab.c b/mesalib/src/mesa/main/colortab.c
index 35b3096f6..3c9fc8887 100644
--- a/mesalib/src/mesa/main/colortab.c
+++ b/mesalib/src/mesa/main/colortab.c
@@ -1,826 +1,826 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "colortab.h"
-#include "context.h"
-#include "image.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "pack.h"
-#include "pbo.h"
-#include "state.h"
-#include "teximage.h"
-#include "texstate.h"
-#include "main/dispatch.h"
-
-
-#if FEATURE_colortable
-
-
-/**
- * Given an internalFormat token passed to glColorTable,
- * return the corresponding base format.
- * Return -1 if invalid token.
- */
-static GLint
-base_colortab_format( GLenum format )
-{
-   switch (format) {
-      case GL_ALPHA:
-      case GL_ALPHA4:
-      case GL_ALPHA8:
-      case GL_ALPHA12:
-      case GL_ALPHA16:
-         return GL_ALPHA;
-      case GL_LUMINANCE:
-      case GL_LUMINANCE4:
-      case GL_LUMINANCE8:
-      case GL_LUMINANCE12:
-      case GL_LUMINANCE16:
-         return GL_LUMINANCE;
-      case GL_LUMINANCE_ALPHA:
-      case GL_LUMINANCE4_ALPHA4:
-      case GL_LUMINANCE6_ALPHA2:
-      case GL_LUMINANCE8_ALPHA8:
-      case GL_LUMINANCE12_ALPHA4:
-      case GL_LUMINANCE12_ALPHA12:
-      case GL_LUMINANCE16_ALPHA16:
-         return GL_LUMINANCE_ALPHA;
-      case GL_INTENSITY:
-      case GL_INTENSITY4:
-      case GL_INTENSITY8:
-      case GL_INTENSITY12:
-      case GL_INTENSITY16:
-         return GL_INTENSITY;
-      case GL_RGB:
-      case GL_R3_G3_B2:
-      case GL_RGB4:
-      case GL_RGB5:
-      case GL_RGB8:
-      case GL_RGB10:
-      case GL_RGB12:
-      case GL_RGB16:
-         return GL_RGB;
-      case GL_RGBA:
-      case GL_RGBA2:
-      case GL_RGBA4:
-      case GL_RGB5_A1:
-      case GL_RGBA8:
-      case GL_RGB10_A2:
-      case GL_RGBA12:
-      case GL_RGBA16:
-         return GL_RGBA;
-      default:
-         return -1;  /* error */
-   }
-}
-
-
-
-/**
- * Examine table's format and set the component sizes accordingly.
- */
-static void
-set_component_sizes( struct gl_color_table *table )
-{
-   /* assuming the ubyte table */
-   const GLubyte sz = 8;
-
-   switch (table->_BaseFormat) {
-      case GL_ALPHA:
-         table->RedSize = 0;
-         table->GreenSize = 0;
-         table->BlueSize = 0;
-         table->AlphaSize = sz;
-         table->IntensitySize = 0;
-         table->LuminanceSize = 0;
-         break;
-      case GL_LUMINANCE:
-         table->RedSize = 0;
-         table->GreenSize = 0;
-         table->BlueSize = 0;
-         table->AlphaSize = 0;
-         table->IntensitySize = 0;
-         table->LuminanceSize = sz;
-         break;
-      case GL_LUMINANCE_ALPHA:
-         table->RedSize = 0;
-         table->GreenSize = 0;
-         table->BlueSize = 0;
-         table->AlphaSize = sz;
-         table->IntensitySize = 0;
-         table->LuminanceSize = sz;
-         break;
-      case GL_INTENSITY:
-         table->RedSize = 0;
-         table->GreenSize = 0;
-         table->BlueSize = 0;
-         table->AlphaSize = 0;
-         table->IntensitySize = sz;
-         table->LuminanceSize = 0;
-         break;
-      case GL_RGB:
-         table->RedSize = sz;
-         table->GreenSize = sz;
-         table->BlueSize = sz;
-         table->AlphaSize = 0;
-         table->IntensitySize = 0;
-         table->LuminanceSize = 0;
-         break;
-      case GL_RGBA:
-         table->RedSize = sz;
-         table->GreenSize = sz;
-         table->BlueSize = sz;
-         table->AlphaSize = sz;
-         table->IntensitySize = 0;
-         table->LuminanceSize = 0;
-         break;
-      default:
-         _mesa_problem(NULL, "unexpected format in set_component_sizes");
-   }
-}
-
-
-
-/**
- * Update/replace all or part of a color table.  Helper function
- * used by _mesa_ColorTable() and _mesa_ColorSubTable().
- * The table->Table buffer should already be allocated.
- * \param start first entry to update
- * \param count number of entries to update
- * \param format format of user-provided table data
- * \param type datatype of user-provided table data
- * \param data user-provided table data
- * \param [rgba]Scale - RGBA scale factors
- * \param [rgba]Bias - RGBA bias factors
- */
-static void
-store_colortable_entries(struct gl_context *ctx, struct gl_color_table *table,
-			 GLsizei start, GLsizei count,
-			 GLenum format, GLenum type, const GLvoid *data,
-			 GLfloat rScale, GLfloat rBias,
-			 GLfloat gScale, GLfloat gBias,
-			 GLfloat bScale, GLfloat bBias,
-			 GLfloat aScale, GLfloat aBias)
-{
-   data = _mesa_map_validate_pbo_source(ctx, 
-                                        1, &ctx->Unpack, count, 1, 1,
-                                        format, type, data,
-                                        "glColor[Sub]Table");
-   if (!data)
-      return;
-
-   {
-      /* convert user-provided data to GLfloat values */
-      GLfloat tempTab[MAX_COLOR_TABLE_SIZE * 4];
-      GLfloat *tableF;
-      GLint i;
-
-      _mesa_unpack_color_span_float(ctx,
-                                    count,         /* number of pixels */
-                                    table->_BaseFormat, /* dest format */
-                                    tempTab,       /* dest address */
-                                    format, type,  /* src format/type */
-                                    data,          /* src data */
-                                    &ctx->Unpack,
-                                    IMAGE_CLAMP_BIT); /* transfer ops */
-
-      /* the destination */
-      tableF = table->TableF;
-
-      /* Apply scale & bias & clamp now */
-      switch (table->_BaseFormat) {
-         case GL_INTENSITY:
-            for (i = 0; i < count; i++) {
-               GLuint j = start + i;
-               tableF[j] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);
-            }
-            break;
-         case GL_LUMINANCE:
-            for (i = 0; i < count; i++) {
-               GLuint j = start + i;
-               tableF[j] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);
-            }
-            break;
-         case GL_ALPHA:
-            for (i = 0; i < count; i++) {
-               GLuint j = start + i;
-               tableF[j] = CLAMP(tempTab[i] * aScale + aBias, 0.0F, 1.0F);
-            }
-            break;
-         case GL_LUMINANCE_ALPHA:
-            for (i = 0; i < count; i++) {
-               GLuint j = start + i;
-               tableF[j*2+0] = CLAMP(tempTab[i*2+0] * rScale + rBias, 0.0F, 1.0F);
-               tableF[j*2+1] = CLAMP(tempTab[i*2+1] * aScale + aBias, 0.0F, 1.0F);
-            }
-            break;
-         case GL_RGB:
-            for (i = 0; i < count; i++) {
-               GLuint j = start + i;
-               tableF[j*3+0] = CLAMP(tempTab[i*3+0] * rScale + rBias, 0.0F, 1.0F);
-               tableF[j*3+1] = CLAMP(tempTab[i*3+1] * gScale + gBias, 0.0F, 1.0F);
-               tableF[j*3+2] = CLAMP(tempTab[i*3+2] * bScale + bBias, 0.0F, 1.0F);
-            }
-            break;
-         case GL_RGBA:
-            for (i = 0; i < count; i++) {
-               GLuint j = start + i;
-               tableF[j*4+0] = CLAMP(tempTab[i*4+0] * rScale + rBias, 0.0F, 1.0F);
-               tableF[j*4+1] = CLAMP(tempTab[i*4+1] * gScale + gBias, 0.0F, 1.0F);
-               tableF[j*4+2] = CLAMP(tempTab[i*4+2] * bScale + bBias, 0.0F, 1.0F);
-               tableF[j*4+3] = CLAMP(tempTab[i*4+3] * aScale + aBias, 0.0F, 1.0F);
-            }
-            break;
-         default:
-            _mesa_problem(ctx, "Bad format in store_colortable_entries");
-            return;
-         }
-   }
-
-   /* update the ubyte table */
-   {
-      const GLint comps = _mesa_components_in_format(table->_BaseFormat);
-      const GLfloat *tableF = table->TableF + start * comps;
-      GLubyte *tableUB = table->TableUB + start * comps;
-      GLint i;
-      for (i = 0; i < count * comps; i++) {
-         CLAMPED_FLOAT_TO_UBYTE(tableUB[i], tableF[i]);
-      }
-   }
-
-   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-}
-
-
-
-void GLAPIENTRY
-_mesa_ColorTable( GLenum target, GLenum internalFormat,
-                  GLsizei width, GLenum format, GLenum type,
-                  const GLvoid *data )
-{
-   static const GLfloat one[4] = { 1.0, 1.0, 1.0, 1.0 };
-   static const GLfloat zero[4] = { 0.0, 0.0, 0.0, 0.0 };
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
-   struct gl_texture_object *texObj = NULL;
-   struct gl_color_table *table = NULL;
-   GLboolean proxy = GL_FALSE;
-   GLint baseFormat;
-   const GLfloat *scale = one, *bias = zero;
-   GLint comps;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex */
-
-   switch (target) {
-      case GL_SHARED_TEXTURE_PALETTE_EXT:
-         table = &ctx->Texture.Palette;
-         break;
-      default:
-         /* try texture targets */
-         {
-            struct gl_texture_object *texobj
-               = _mesa_select_tex_object(ctx, texUnit, target);
-            if (texobj) {
-               table = &texobj->Palette;
-               proxy = _mesa_is_proxy_texture(target);
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
-               return;
-            }
-         }
-   }
-
-   assert(table);
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type) ||
-       format == GL_INTENSITY) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glColorTable(format or type)");
-      return;
-   }
-
-   baseFormat = base_colortab_format(internalFormat);
-   if (baseFormat < 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(internalFormat)");
-      return;
-   }
-
-   if (width < 0 || (width != 0 && !_mesa_is_pow_two(width))) {
-      /* error */
-      if (proxy) {
-         table->Size = 0;
-         table->InternalFormat = (GLenum) 0;
-         table->_BaseFormat = (GLenum) 0;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glColorTable(width=%d)", width);
-      }
-      return;
-   }
-
-   if (width > (GLsizei) ctx->Const.MaxColorTableSize) {
-      if (proxy) {
-         table->Size = 0;
-         table->InternalFormat = (GLenum) 0;
-         table->_BaseFormat = (GLenum) 0;
-      }
-      else {
-         _mesa_error(ctx, GL_TABLE_TOO_LARGE, "glColorTable(width)");
-      }
-      return;
-   }
-
-   table->Size = width;
-   table->InternalFormat = internalFormat;
-   table->_BaseFormat = (GLenum) baseFormat;
-
-   comps = _mesa_components_in_format(table->_BaseFormat);
-   assert(comps > 0);  /* error should have been caught sooner */
-
-   if (!proxy) {
-      _mesa_free_colortable_data(table);
-
-      if (width > 0) {
-         table->TableF = (GLfloat *) malloc(comps * width * sizeof(GLfloat));
-         table->TableUB = (GLubyte *) malloc(comps * width * sizeof(GLubyte));
-
-	 if (!table->TableF || !table->TableUB) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glColorTable");
-	    return;
-	 }
-
-	 store_colortable_entries(ctx, table,
-				  0, width,  /* start, count */
-				  format, type, data,
-				  scale[0], bias[0],
-				  scale[1], bias[1],
-				  scale[2], bias[2],
-				  scale[3], bias[3]);
-      }
-   } /* proxy */
-
-   /* do this after the table's Type and Format are set */
-   set_component_sizes(table);
-
-   if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {
-      /* texture object palette, texObj==NULL means the shared palette */
-      if (ctx->Driver.UpdateTexturePalette) {
-         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );
-      }
-   }
-
-   ctx->NewState |= _NEW_PIXEL;
-}
-
-
-
-void GLAPIENTRY
-_mesa_ColorSubTable( GLenum target, GLsizei start,
-                     GLsizei count, GLenum format, GLenum type,
-                     const GLvoid *data )
-{
-   static const GLfloat one[4] = { 1.0, 1.0, 1.0, 1.0 };
-   static const GLfloat zero[4] = { 0.0, 0.0, 0.0, 0.0 };
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
-   struct gl_texture_object *texObj = NULL;
-   struct gl_color_table *table = NULL;
-   const GLfloat *scale = one, *bias = zero;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   switch (target) {
-      case GL_SHARED_TEXTURE_PALETTE_EXT:
-         table = &ctx->Texture.Palette;
-         break;
-      default:
-         /* try texture targets */
-         texObj = _mesa_select_tex_object(ctx, texUnit, target);
-         if (texObj && !_mesa_is_proxy_texture(target)) {
-            table = &texObj->Palette;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
-            return;
-         }
-   }
-
-   assert(table);
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type) ||
-       format == GL_INTENSITY) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glColorSubTable(format or type)");
-      return;
-   }
-
-   if (count < 1) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)");
-      return;
-   }
-
-   /* error should have been caught sooner */
-   assert(_mesa_components_in_format(table->_BaseFormat) > 0);
-
-   if (start + count > (GLint) table->Size) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)");
-      return;
-   }
-
-   if (!table->TableF || !table->TableUB) {
-      /* a GL_OUT_OF_MEMORY error would have been recorded previously */
-      return;
-   }
-
-   store_colortable_entries(ctx, table, start, count,
-			    format, type, data,
-                            scale[0], bias[0],
-                            scale[1], bias[1],
-                            scale[2], bias[2],
-                            scale[3], bias[3]);
-
-   if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {
-      /* per-texture object palette */
-      if (ctx->Driver.UpdateTexturePalette) {
-         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );
-      }
-   }
-
-   ctx->NewState |= _NEW_PIXEL;
-}
-
-
-
-static void GLAPIENTRY
-_mesa_CopyColorTable(GLenum target, GLenum internalformat,
-                     GLint x, GLint y, GLsizei width)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (!ctx->ReadBuffer->_ColorReadBuffer) {
-      return;      /* no readbuffer - OK */
-   }
-
-   ctx->Driver.CopyColorTable( ctx, target, internalformat, x, y, width );
-}
-
-
-
-static void GLAPIENTRY
-_mesa_CopyColorSubTable(GLenum target, GLsizei start,
-                        GLint x, GLint y, GLsizei width)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (!ctx->ReadBuffer->_ColorReadBuffer) {
-      return;      /* no readbuffer - OK */
-   }
-
-   ctx->Driver.CopyColorSubTable( ctx, target, start, x, y, width );
-}
-
-
-
-static void GLAPIENTRY
-_mesa_GetColorTable( GLenum target, GLenum format,
-                     GLenum type, GLvoid *data )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
-   struct gl_color_table *table = NULL;
-   GLfloat rgba[MAX_COLOR_TABLE_SIZE][4];
-   GLbitfield transferOps = 0;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (ctx->NewState) {
-      _mesa_update_state(ctx);
-   }
-
-   switch (target) {
-      case GL_SHARED_TEXTURE_PALETTE_EXT:
-         table = &ctx->Texture.Palette;
-         break;
-      default:
-         /* try texture targets */
-         {
-            struct gl_texture_object *texobj
-               = _mesa_select_tex_object(ctx, texUnit, target);
-            if (texobj && !_mesa_is_proxy_texture(target)) {
-               table = &texobj->Palette;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");
-               return;
-            }
-         }
-   }
-
-   ASSERT(table);
-
-   if (table->Size <= 0) {
-      return;
-   }
-
-   switch (table->_BaseFormat) {
-   case GL_ALPHA:
-      {
-         GLuint i;
-         for (i = 0; i < table->Size; i++) {
-            rgba[i][RCOMP] = 0;
-            rgba[i][GCOMP] = 0;
-            rgba[i][BCOMP] = 0;
-            rgba[i][ACOMP] = table->TableF[i];
-         }
-      }
-      break;
-   case GL_LUMINANCE:
-      {
-         GLuint i;
-         for (i = 0; i < table->Size; i++) {
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = table->TableF[i];
-            rgba[i][ACOMP] = 1.0F;
-         }
-      }
-      break;
-   case GL_LUMINANCE_ALPHA:
-      {
-         GLuint i;
-         for (i = 0; i < table->Size; i++) {
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = table->TableF[i*2+0];
-            rgba[i][ACOMP] = table->TableF[i*2+1];
-         }
-      }
-      break;
-   case GL_INTENSITY:
-      {
-         GLuint i;
-         for (i = 0; i < table->Size; i++) {
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] =
-            rgba[i][ACOMP] = table->TableF[i];
-         }
-      }
-      break;
-   case GL_RGB:
-      {
-         GLuint i;
-         for (i = 0; i < table->Size; i++) {
-            rgba[i][RCOMP] = table->TableF[i*3+0];
-            rgba[i][GCOMP] = table->TableF[i*3+1];
-            rgba[i][BCOMP] = table->TableF[i*3+2];
-            rgba[i][ACOMP] = 1.0F;
-         }
-      }
-      break;
-   case GL_RGBA:
-      memcpy(rgba, table->TableF, 4 * table->Size * sizeof(GLfloat));
-      break;
-   default:
-      _mesa_problem(ctx, "bad table format in glGetColorTable");
-      return;
-   }
-
-   data = _mesa_map_validate_pbo_dest(ctx, 
-                                      1, &ctx->Pack, table->Size, 1, 1,
-                                      format, type, data,
-                                      "glGetColorTable");
-   if (!data)
-      return;
-
-   /* TODO: is this correct? */
-   if(ctx->Color._ClampReadColor)
-      transferOps |= IMAGE_CLAMP_BIT;
-
-   _mesa_pack_rgba_span_float(ctx, table->Size, rgba,
-                              format, type, data, &ctx->Pack, transferOps);
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-}
-
-
-
-static void GLAPIENTRY
-_mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-   /* no extensions use this function */
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(target)");
-}
-
-
-
-static void GLAPIENTRY
-_mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-   /* no extensions use this function */
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameteriv(target)");
-}
-
-
-
-static void GLAPIENTRY
-_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
-   struct gl_color_table *table = NULL;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (target) {
-      case GL_SHARED_TEXTURE_PALETTE_EXT:
-         table = &ctx->Texture.Palette;
-         break;
-      default:
-         /* try texture targets */
-         {
-            struct gl_texture_object *texobj
-               = _mesa_select_tex_object(ctx, texUnit, target);
-            if (texobj) {
-               table = &texobj->Palette;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM,
-                           "glGetColorTableParameterfv(target)");
-               return;
-            }
-         }
-   }
-
-   assert(table);
-
-   switch (pname) {
-      case GL_COLOR_TABLE_FORMAT:
-         *params = (GLfloat) table->InternalFormat;
-         break;
-      case GL_COLOR_TABLE_WIDTH:
-         *params = (GLfloat) table->Size;
-         break;
-      case GL_COLOR_TABLE_RED_SIZE:
-         *params = (GLfloat) table->RedSize;
-         break;
-      case GL_COLOR_TABLE_GREEN_SIZE:
-         *params = (GLfloat) table->GreenSize;
-         break;
-      case GL_COLOR_TABLE_BLUE_SIZE:
-         *params = (GLfloat) table->BlueSize;
-         break;
-      case GL_COLOR_TABLE_ALPHA_SIZE:
-         *params = (GLfloat) table->AlphaSize;
-         break;
-      case GL_COLOR_TABLE_LUMINANCE_SIZE:
-         *params = (GLfloat) table->LuminanceSize;
-         break;
-      case GL_COLOR_TABLE_INTENSITY_SIZE:
-         *params = (GLfloat) table->IntensitySize;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterfv(pname)" );
-         return;
-   }
-}
-
-
-
-static void GLAPIENTRY
-_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
-   struct gl_color_table *table = NULL;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (target) {
-      case GL_SHARED_TEXTURE_PALETTE_EXT:
-         table = &ctx->Texture.Palette;
-         break;
-      default:
-         /* Try texture targets */
-         {
-            struct gl_texture_object *texobj
-               = _mesa_select_tex_object(ctx, texUnit, target);
-            if (texobj) {
-               table = &texobj->Palette;
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_ENUM,
-                           "glGetColorTableParameteriv(target)");
-               return;
-            }
-         }
-   }
-
-   assert(table);
-
-   switch (pname) {
-      case GL_COLOR_TABLE_FORMAT:
-         *params = table->InternalFormat;
-         break;
-      case GL_COLOR_TABLE_WIDTH:
-         *params = table->Size;
-         break;
-      case GL_COLOR_TABLE_RED_SIZE:
-         *params = table->RedSize;
-         break;
-      case GL_COLOR_TABLE_GREEN_SIZE:
-         *params = table->GreenSize;
-         break;
-      case GL_COLOR_TABLE_BLUE_SIZE:
-         *params = table->BlueSize;
-         break;
-      case GL_COLOR_TABLE_ALPHA_SIZE:
-         *params = table->AlphaSize;
-         break;
-      case GL_COLOR_TABLE_LUMINANCE_SIZE:
-         *params = table->LuminanceSize;
-         break;
-      case GL_COLOR_TABLE_INTENSITY_SIZE:
-         *params = table->IntensitySize;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(pname)" );
-         return;
-   }
-}
-
-
-void
-_mesa_init_colortable_dispatch(struct _glapi_table *disp)
-{
-   SET_ColorSubTable(disp, _mesa_ColorSubTable);
-   SET_ColorTable(disp, _mesa_ColorTable);
-   SET_ColorTableParameterfv(disp, _mesa_ColorTableParameterfv);
-   SET_ColorTableParameteriv(disp, _mesa_ColorTableParameteriv);
-   SET_CopyColorSubTable(disp, _mesa_CopyColorSubTable);
-   SET_CopyColorTable(disp, _mesa_CopyColorTable);
-   SET_GetColorTable(disp, _mesa_GetColorTable);
-   SET_GetColorTableParameterfv(disp, _mesa_GetColorTableParameterfv);
-   SET_GetColorTableParameteriv(disp, _mesa_GetColorTableParameteriv);
-}
-
-
-#endif /* FEATURE_colortable */
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-
-void
-_mesa_init_colortable( struct gl_color_table *p )
-{
-   p->TableF = NULL;
-   p->TableUB = NULL;
-   p->Size = 0;
-   p->InternalFormat = GL_RGBA;
-}
-
-
-
-void
-_mesa_free_colortable_data( struct gl_color_table *p )
-{
-   if (p->TableF) {
-      free(p->TableF);
-      p->TableF = NULL;
-   }
-   if (p->TableUB) {
-      free(p->TableUB);
-      p->TableUB = NULL;
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include "glheader.h"

+#include "bufferobj.h"

+#include "colortab.h"

+#include "context.h"

+#include "image.h"

+#include "macros.h"

+#include "mfeatures.h"

+#include "mtypes.h"

+#include "pack.h"

+#include "pbo.h"

+#include "state.h"

+#include "teximage.h"

+#include "texstate.h"

+#include "main/dispatch.h"

+

+

+#if FEATURE_colortable

+

+

+/**

+ * Given an internalFormat token passed to glColorTable,

+ * return the corresponding base format.

+ * Return -1 if invalid token.

+ */

+static GLint

+base_colortab_format( GLenum format )

+{

+   switch (format) {

+      case GL_ALPHA:

+      case GL_ALPHA4:

+      case GL_ALPHA8:

+      case GL_ALPHA12:

+      case GL_ALPHA16:

+         return GL_ALPHA;

+      case GL_LUMINANCE:

+      case GL_LUMINANCE4:

+      case GL_LUMINANCE8:

+      case GL_LUMINANCE12:

+      case GL_LUMINANCE16:

+         return GL_LUMINANCE;

+      case GL_LUMINANCE_ALPHA:

+      case GL_LUMINANCE4_ALPHA4:

+      case GL_LUMINANCE6_ALPHA2:

+      case GL_LUMINANCE8_ALPHA8:

+      case GL_LUMINANCE12_ALPHA4:

+      case GL_LUMINANCE12_ALPHA12:

+      case GL_LUMINANCE16_ALPHA16:

+         return GL_LUMINANCE_ALPHA;

+      case GL_INTENSITY:

+      case GL_INTENSITY4:

+      case GL_INTENSITY8:

+      case GL_INTENSITY12:

+      case GL_INTENSITY16:

+         return GL_INTENSITY;

+      case GL_RGB:

+      case GL_R3_G3_B2:

+      case GL_RGB4:

+      case GL_RGB5:

+      case GL_RGB8:

+      case GL_RGB10:

+      case GL_RGB12:

+      case GL_RGB16:

+         return GL_RGB;

+      case GL_RGBA:

+      case GL_RGBA2:

+      case GL_RGBA4:

+      case GL_RGB5_A1:

+      case GL_RGBA8:

+      case GL_RGB10_A2:

+      case GL_RGBA12:

+      case GL_RGBA16:

+         return GL_RGBA;

+      default:

+         return -1;  /* error */

+   }

+}

+

+

+

+/**

+ * Examine table's format and set the component sizes accordingly.

+ */

+static void

+set_component_sizes( struct gl_color_table *table )

+{

+   /* assuming the ubyte table */

+   const GLubyte sz = 8;

+

+   switch (table->_BaseFormat) {

+      case GL_ALPHA:

+         table->RedSize = 0;

+         table->GreenSize = 0;

+         table->BlueSize = 0;

+         table->AlphaSize = sz;

+         table->IntensitySize = 0;

+         table->LuminanceSize = 0;

+         break;

+      case GL_LUMINANCE:

+         table->RedSize = 0;

+         table->GreenSize = 0;

+         table->BlueSize = 0;

+         table->AlphaSize = 0;

+         table->IntensitySize = 0;

+         table->LuminanceSize = sz;

+         break;

+      case GL_LUMINANCE_ALPHA:

+         table->RedSize = 0;

+         table->GreenSize = 0;

+         table->BlueSize = 0;

+         table->AlphaSize = sz;

+         table->IntensitySize = 0;

+         table->LuminanceSize = sz;

+         break;

+      case GL_INTENSITY:

+         table->RedSize = 0;

+         table->GreenSize = 0;

+         table->BlueSize = 0;

+         table->AlphaSize = 0;

+         table->IntensitySize = sz;

+         table->LuminanceSize = 0;

+         break;

+      case GL_RGB:

+         table->RedSize = sz;

+         table->GreenSize = sz;

+         table->BlueSize = sz;

+         table->AlphaSize = 0;

+         table->IntensitySize = 0;

+         table->LuminanceSize = 0;

+         break;

+      case GL_RGBA:

+         table->RedSize = sz;

+         table->GreenSize = sz;

+         table->BlueSize = sz;

+         table->AlphaSize = sz;

+         table->IntensitySize = 0;

+         table->LuminanceSize = 0;

+         break;

+      default:

+         _mesa_problem(NULL, "unexpected format in set_component_sizes");

+   }

+}

+

+

+

+/**

+ * Update/replace all or part of a color table.  Helper function

+ * used by _mesa_ColorTable() and _mesa_ColorSubTable().

+ * The table->Table buffer should already be allocated.

+ * \param start first entry to update

+ * \param count number of entries to update

+ * \param format format of user-provided table data

+ * \param type datatype of user-provided table data

+ * \param data user-provided table data

+ * \param [rgba]Scale - RGBA scale factors

+ * \param [rgba]Bias - RGBA bias factors

+ */

+static void

+store_colortable_entries(struct gl_context *ctx, struct gl_color_table *table,

+			 GLsizei start, GLsizei count,

+			 GLenum format, GLenum type, const GLvoid *data,

+			 GLfloat rScale, GLfloat rBias,

+			 GLfloat gScale, GLfloat gBias,

+			 GLfloat bScale, GLfloat bBias,

+			 GLfloat aScale, GLfloat aBias)

+{

+   data = _mesa_map_validate_pbo_source(ctx, 

+                                        1, &ctx->Unpack, count, 1, 1,

+                                        format, type, data,

+                                        "glColor[Sub]Table");

+   if (!data)

+      return;

+

+   {

+      /* convert user-provided data to GLfloat values */

+      GLfloat tempTab[MAX_COLOR_TABLE_SIZE * 4];

+      GLfloat *tableF;

+      GLint i;

+

+      _mesa_unpack_color_span_float(ctx,

+                                    count,         /* number of pixels */

+                                    table->_BaseFormat, /* dest format */

+                                    tempTab,       /* dest address */

+                                    format, type,  /* src format/type */

+                                    data,          /* src data */

+                                    &ctx->Unpack,

+                                    IMAGE_CLAMP_BIT); /* transfer ops */

+

+      /* the destination */

+      tableF = table->TableF;

+

+      /* Apply scale & bias & clamp now */

+      switch (table->_BaseFormat) {

+         case GL_INTENSITY:

+            for (i = 0; i < count; i++) {

+               GLuint j = start + i;

+               tableF[j] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);

+            }

+            break;

+         case GL_LUMINANCE:

+            for (i = 0; i < count; i++) {

+               GLuint j = start + i;

+               tableF[j] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);

+            }

+            break;

+         case GL_ALPHA:

+            for (i = 0; i < count; i++) {

+               GLuint j = start + i;

+               tableF[j] = CLAMP(tempTab[i] * aScale + aBias, 0.0F, 1.0F);

+            }

+            break;

+         case GL_LUMINANCE_ALPHA:

+            for (i = 0; i < count; i++) {

+               GLuint j = start + i;

+               tableF[j*2+0] = CLAMP(tempTab[i*2+0] * rScale + rBias, 0.0F, 1.0F);

+               tableF[j*2+1] = CLAMP(tempTab[i*2+1] * aScale + aBias, 0.0F, 1.0F);

+            }

+            break;

+         case GL_RGB:

+            for (i = 0; i < count; i++) {

+               GLuint j = start + i;

+               tableF[j*3+0] = CLAMP(tempTab[i*3+0] * rScale + rBias, 0.0F, 1.0F);

+               tableF[j*3+1] = CLAMP(tempTab[i*3+1] * gScale + gBias, 0.0F, 1.0F);

+               tableF[j*3+2] = CLAMP(tempTab[i*3+2] * bScale + bBias, 0.0F, 1.0F);

+            }

+            break;

+         case GL_RGBA:

+            for (i = 0; i < count; i++) {

+               GLuint j = start + i;

+               tableF[j*4+0] = CLAMP(tempTab[i*4+0] * rScale + rBias, 0.0F, 1.0F);

+               tableF[j*4+1] = CLAMP(tempTab[i*4+1] * gScale + gBias, 0.0F, 1.0F);

+               tableF[j*4+2] = CLAMP(tempTab[i*4+2] * bScale + bBias, 0.0F, 1.0F);

+               tableF[j*4+3] = CLAMP(tempTab[i*4+3] * aScale + aBias, 0.0F, 1.0F);

+            }

+            break;

+         default:

+            _mesa_problem(ctx, "Bad format in store_colortable_entries");

+            return;

+         }

+   }

+

+   /* update the ubyte table */

+   {

+      const GLint comps = _mesa_components_in_format(table->_BaseFormat);

+      const GLfloat *tableF = table->TableF + start * comps;

+      GLubyte *tableUB = table->TableUB + start * comps;

+      GLint i;

+      for (i = 0; i < count * comps; i++) {

+         CLAMPED_FLOAT_TO_UBYTE(tableUB[i], tableF[i]);

+      }

+   }

+

+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);

+}

+

+

+

+void GLAPIENTRY

+_mesa_ColorTable( GLenum target, GLenum internalFormat,

+                  GLsizei width, GLenum format, GLenum type,

+                  const GLvoid *data )

+{

+   static const GLfloat one[4] = { 1.0, 1.0, 1.0, 1.0 };

+   static const GLfloat zero[4] = { 0.0, 0.0, 0.0, 0.0 };

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

+   struct gl_texture_object *texObj = NULL;

+   struct gl_color_table *table = NULL;

+   GLboolean proxy = GL_FALSE;

+   GLint baseFormat;

+   const GLfloat *scale = one, *bias = zero;

+   GLint comps;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex */

+

+   switch (target) {

+      case GL_SHARED_TEXTURE_PALETTE_EXT:

+         table = &ctx->Texture.Palette;

+         break;

+      default:

+         /* try texture targets */

+         {

+            struct gl_texture_object *texobj

+               = _mesa_select_tex_object(ctx, texUnit, target);

+            if (texobj) {

+               table = &texobj->Palette;

+               proxy = _mesa_is_proxy_texture(target);

+            }

+            else {

+               _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");

+               return;

+            }

+         }

+   }

+

+   assert(table);

+

+   if (!_mesa_is_legal_format_and_type(ctx, format, type) ||

+       format == GL_INTENSITY) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glColorTable(format or type)");

+      return;

+   }

+

+   baseFormat = base_colortab_format(internalFormat);

+   if (baseFormat < 0) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(internalFormat)");

+      return;

+   }

+

+   if (width < 0 || (width != 0 && !_mesa_is_pow_two(width))) {

+      /* error */

+      if (proxy) {

+         table->Size = 0;

+         table->InternalFormat = (GLenum) 0;

+         table->_BaseFormat = (GLenum) 0;

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glColorTable(width=%d)", width);

+      }

+      return;

+   }

+

+   if (width > (GLsizei) ctx->Const.MaxColorTableSize) {

+      if (proxy) {

+         table->Size = 0;

+         table->InternalFormat = (GLenum) 0;

+         table->_BaseFormat = (GLenum) 0;

+      }

+      else {

+         _mesa_error(ctx, GL_TABLE_TOO_LARGE, "glColorTable(width)");

+      }

+      return;

+   }

+

+   table->Size = width;

+   table->InternalFormat = internalFormat;

+   table->_BaseFormat = (GLenum) baseFormat;

+

+   comps = _mesa_components_in_format(table->_BaseFormat);

+   assert(comps > 0);  /* error should have been caught sooner */

+

+   if (!proxy) {

+      _mesa_free_colortable_data(table);

+

+      if (width > 0) {

+         table->TableF = (GLfloat *) malloc(comps * width * sizeof(GLfloat));

+         table->TableUB = (GLubyte *) malloc(comps * width * sizeof(GLubyte));

+

+	 if (!table->TableF || !table->TableUB) {

+	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glColorTable");

+	    return;

+	 }

+

+	 store_colortable_entries(ctx, table,

+				  0, width,  /* start, count */

+				  format, type, data,

+				  scale[0], bias[0],

+				  scale[1], bias[1],

+				  scale[2], bias[2],

+				  scale[3], bias[3]);

+      }

+   } /* proxy */

+

+   /* do this after the table's Type and Format are set */

+   set_component_sizes(table);

+

+   if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {

+      /* texture object palette, texObj==NULL means the shared palette */

+      if (ctx->Driver.UpdateTexturePalette) {

+         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );

+      }

+   }

+

+   ctx->NewState |= _NEW_PIXEL;

+}

+

+

+

+void GLAPIENTRY

+_mesa_ColorSubTable( GLenum target, GLsizei start,

+                     GLsizei count, GLenum format, GLenum type,

+                     const GLvoid *data )

+{

+   static const GLfloat one[4] = { 1.0, 1.0, 1.0, 1.0 };

+   static const GLfloat zero[4] = { 0.0, 0.0, 0.0, 0.0 };

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

+   struct gl_texture_object *texObj = NULL;

+   struct gl_color_table *table = NULL;

+   const GLfloat *scale = one, *bias = zero;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   switch (target) {

+      case GL_SHARED_TEXTURE_PALETTE_EXT:

+         table = &ctx->Texture.Palette;

+         break;

+      default:

+         /* try texture targets */

+         texObj = _mesa_select_tex_object(ctx, texUnit, target);

+         if (texObj && !_mesa_is_proxy_texture(target)) {

+            table = &texObj->Palette;

+         }

+         else {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");

+            return;

+         }

+   }

+

+   assert(table);

+

+   if (!_mesa_is_legal_format_and_type(ctx, format, type) ||

+       format == GL_INTENSITY) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glColorSubTable(format or type)");

+      return;

+   }

+

+   if (count < 1) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)");

+      return;

+   }

+

+   /* error should have been caught sooner */

+   assert(_mesa_components_in_format(table->_BaseFormat) > 0);

+

+   if (start + count > (GLint) table->Size) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)");

+      return;

+   }

+

+   if (!table->TableF || !table->TableUB) {

+      /* a GL_OUT_OF_MEMORY error would have been recorded previously */

+      return;

+   }

+

+   store_colortable_entries(ctx, table, start, count,

+			    format, type, data,

+                            scale[0], bias[0],

+                            scale[1], bias[1],

+                            scale[2], bias[2],

+                            scale[3], bias[3]);

+

+   if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {

+      /* per-texture object palette */

+      if (ctx->Driver.UpdateTexturePalette) {

+         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );

+      }

+   }

+

+   ctx->NewState |= _NEW_PIXEL;

+}

+

+

+

+static void GLAPIENTRY

+_mesa_CopyColorTable(GLenum target, GLenum internalformat,

+                     GLint x, GLint y, GLsizei width)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (!ctx->ReadBuffer->_ColorReadBuffer) {

+      return;      /* no readbuffer - OK */

+   }

+

+   ctx->Driver.CopyColorTable( ctx, target, internalformat, x, y, width );

+}

+

+

+

+static void GLAPIENTRY

+_mesa_CopyColorSubTable(GLenum target, GLsizei start,

+                        GLint x, GLint y, GLsizei width)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (!ctx->ReadBuffer->_ColorReadBuffer) {

+      return;      /* no readbuffer - OK */

+   }

+

+   ctx->Driver.CopyColorSubTable( ctx, target, start, x, y, width );

+}

+

+

+

+static void GLAPIENTRY

+_mesa_GetColorTable( GLenum target, GLenum format,

+                     GLenum type, GLvoid *data )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

+   struct gl_color_table *table = NULL;

+   GLfloat rgba[MAX_COLOR_TABLE_SIZE][4];

+   GLbitfield transferOps = 0;

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (ctx->NewState) {

+      _mesa_update_state(ctx);

+   }

+

+   switch (target) {

+      case GL_SHARED_TEXTURE_PALETTE_EXT:

+         table = &ctx->Texture.Palette;

+         break;

+      default:

+         /* try texture targets */

+         {

+            struct gl_texture_object *texobj

+               = _mesa_select_tex_object(ctx, texUnit, target);

+            if (texobj && !_mesa_is_proxy_texture(target)) {

+               table = &texobj->Palette;

+            }

+            else {

+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");

+               return;

+            }

+         }

+   }

+

+   ASSERT(table);

+

+   if (table->Size <= 0) {

+      return;

+   }

+

+   switch (table->_BaseFormat) {

+   case GL_ALPHA:

+      {

+         GLuint i;

+         for (i = 0; i < table->Size; i++) {

+            rgba[i][RCOMP] = 0;

+            rgba[i][GCOMP] = 0;

+            rgba[i][BCOMP] = 0;

+            rgba[i][ACOMP] = table->TableF[i];

+         }

+      }

+      break;

+   case GL_LUMINANCE:

+      {

+         GLuint i;

+         for (i = 0; i < table->Size; i++) {

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] = table->TableF[i];

+            rgba[i][ACOMP] = 1.0F;

+         }

+      }

+      break;

+   case GL_LUMINANCE_ALPHA:

+      {

+         GLuint i;

+         for (i = 0; i < table->Size; i++) {

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] = table->TableF[i*2+0];

+            rgba[i][ACOMP] = table->TableF[i*2+1];

+         }

+      }

+      break;

+   case GL_INTENSITY:

+      {

+         GLuint i;

+         for (i = 0; i < table->Size; i++) {

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] =

+            rgba[i][ACOMP] = table->TableF[i];

+         }

+      }

+      break;

+   case GL_RGB:

+      {

+         GLuint i;

+         for (i = 0; i < table->Size; i++) {

+            rgba[i][RCOMP] = table->TableF[i*3+0];

+            rgba[i][GCOMP] = table->TableF[i*3+1];

+            rgba[i][BCOMP] = table->TableF[i*3+2];

+            rgba[i][ACOMP] = 1.0F;

+         }

+      }

+      break;

+   case GL_RGBA:

+      memcpy(rgba, table->TableF, 4 * table->Size * sizeof(GLfloat));

+      break;

+   default:

+      _mesa_problem(ctx, "bad table format in glGetColorTable");

+      return;

+   }

+

+   data = _mesa_map_validate_pbo_dest(ctx, 

+                                      1, &ctx->Pack, table->Size, 1, 1,

+                                      format, type, data,

+                                      "glGetColorTable");

+   if (!data)

+      return;

+

+   /* TODO: is this correct? */

+   if(ctx->Color._ClampReadColor)

+      transferOps |= IMAGE_CLAMP_BIT;

+

+   _mesa_pack_rgba_span_float(ctx, table->Size, rgba,

+                              format, type, data, &ctx->Pack, transferOps);

+

+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);

+}

+

+

+

+static void GLAPIENTRY

+_mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)

+{

+   /* no extensions use this function */

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(target)");

+}

+

+

+

+static void GLAPIENTRY

+_mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)

+{

+   /* no extensions use this function */

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameteriv(target)");

+}

+

+

+

+static void GLAPIENTRY

+_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

+   struct gl_color_table *table = NULL;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   switch (target) {

+      case GL_SHARED_TEXTURE_PALETTE_EXT:

+         table = &ctx->Texture.Palette;

+         break;

+      default:

+         /* try texture targets */

+         {

+            struct gl_texture_object *texobj

+               = _mesa_select_tex_object(ctx, texUnit, target);

+            if (texobj) {

+               table = &texobj->Palette;

+            }

+            else {

+               _mesa_error(ctx, GL_INVALID_ENUM,

+                           "glGetColorTableParameterfv(target)");

+               return;

+            }

+         }

+   }

+

+   assert(table);

+

+   switch (pname) {

+      case GL_COLOR_TABLE_FORMAT:

+         *params = (GLfloat) table->InternalFormat;

+         break;

+      case GL_COLOR_TABLE_WIDTH:

+         *params = (GLfloat) table->Size;

+         break;

+      case GL_COLOR_TABLE_RED_SIZE:

+         *params = (GLfloat) table->RedSize;

+         break;

+      case GL_COLOR_TABLE_GREEN_SIZE:

+         *params = (GLfloat) table->GreenSize;

+         break;

+      case GL_COLOR_TABLE_BLUE_SIZE:

+         *params = (GLfloat) table->BlueSize;

+         break;

+      case GL_COLOR_TABLE_ALPHA_SIZE:

+         *params = (GLfloat) table->AlphaSize;

+         break;

+      case GL_COLOR_TABLE_LUMINANCE_SIZE:

+         *params = (GLfloat) table->LuminanceSize;

+         break;

+      case GL_COLOR_TABLE_INTENSITY_SIZE:

+         *params = (GLfloat) table->IntensitySize;

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterfv(pname)" );

+         return;

+   }

+}

+

+

+

+static void GLAPIENTRY

+_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

+   struct gl_color_table *table = NULL;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   switch (target) {

+      case GL_SHARED_TEXTURE_PALETTE_EXT:

+         table = &ctx->Texture.Palette;

+         break;

+      default:

+         /* Try texture targets */

+         {

+            struct gl_texture_object *texobj

+               = _mesa_select_tex_object(ctx, texUnit, target);

+            if (texobj) {

+               table = &texobj->Palette;

+            }

+            else {

+               _mesa_error(ctx, GL_INVALID_ENUM,

+                           "glGetColorTableParameteriv(target)");

+               return;

+            }

+         }

+   }

+

+   assert(table);

+

+   switch (pname) {

+      case GL_COLOR_TABLE_FORMAT:

+         *params = table->InternalFormat;

+         break;

+      case GL_COLOR_TABLE_WIDTH:

+         *params = table->Size;

+         break;

+      case GL_COLOR_TABLE_RED_SIZE:

+         *params = table->RedSize;

+         break;

+      case GL_COLOR_TABLE_GREEN_SIZE:

+         *params = table->GreenSize;

+         break;

+      case GL_COLOR_TABLE_BLUE_SIZE:

+         *params = table->BlueSize;

+         break;

+      case GL_COLOR_TABLE_ALPHA_SIZE:

+         *params = table->AlphaSize;

+         break;

+      case GL_COLOR_TABLE_LUMINANCE_SIZE:

+         *params = table->LuminanceSize;

+         break;

+      case GL_COLOR_TABLE_INTENSITY_SIZE:

+         *params = table->IntensitySize;

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(pname)" );

+         return;

+   }

+}

+

+

+void

+_mesa_init_colortable_dispatch(struct _glapi_table *disp)

+{

+   SET_ColorSubTable(disp, _mesa_ColorSubTable);

+   SET_ColorTable(disp, _mesa_ColorTable);

+   SET_ColorTableParameterfv(disp, _mesa_ColorTableParameterfv);

+   SET_ColorTableParameteriv(disp, _mesa_ColorTableParameteriv);

+   SET_CopyColorSubTable(disp, _mesa_CopyColorSubTable);

+   SET_CopyColorTable(disp, _mesa_CopyColorTable);

+   SET_GetColorTable(disp, _mesa_GetColorTable);

+   SET_GetColorTableParameterfv(disp, _mesa_GetColorTableParameterfv);

+   SET_GetColorTableParameteriv(disp, _mesa_GetColorTableParameteriv);

+}

+

+

+#endif /* FEATURE_colortable */

+

+

+/**********************************************************************/

+/*****                      Initialization                        *****/

+/**********************************************************************/

+

+

+void

+_mesa_init_colortable( struct gl_color_table *p )

+{

+   p->TableF = NULL;

+   p->TableUB = NULL;

+   p->Size = 0;

+   p->InternalFormat = GL_RGBA;

+}

+

+

+

+void

+_mesa_free_colortable_data( struct gl_color_table *p )

+{

+   if (p->TableF) {

+      free(p->TableF);

+      p->TableF = NULL;

+   }

+   if (p->TableUB) {

+      free(p->TableUB);

+      p->TableUB = NULL;

+   }

+}

diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index e17fd0ff6..f2b344fd1 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -1,520 +1,498 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file compiler.h
- * Compiler-related stuff.
- */
-
-
-#ifndef COMPILER_H
-#define COMPILER_H
-
-
-#include <assert.h>
-#include <ctype.h>
-#if defined(__alpha__) && defined(CCPML)
-#include <cpml.h> /* use Compaq's Fast Math Library on Alpha */
-#else
-#include <math.h>
-#endif
-#include <limits.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#if defined(__linux__) && defined(__i386__)
-#include <fpu_control.h>
-#endif
-#include <float.h>
-#include <stdarg.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/**
- * Get standard integer types
- */
-#if defined(_MSC_VER)
-   typedef __int8             int8_t;
-   typedef unsigned __int8    uint8_t;
-   typedef __int16            int16_t;
-   typedef unsigned __int16   uint16_t;
-   typedef __int32            int32_t;
-   typedef unsigned __int32   uint32_t;
-   typedef __int64            int64_t;
-   typedef unsigned __int64   uint64_t;
-
-#  if defined(_WIN64)
-     typedef __int64            intptr_t;
-     typedef unsigned __int64   uintptr_t;
-#  else
-     typedef __int32            intptr_t;
-     typedef unsigned __int32   uintptr_t;
-#  endif
-
-#  define INT64_C(__val) __val##i64
-#  define UINT64_C(__val) __val##ui64
-#else
-#  include <stdint.h>
-#endif
-
-
-/**
-  * Sun compilers define __i386 instead of the gcc-style __i386__
- */
-#ifdef __SUNPRO_C
-# if !defined(__i386__) && defined(__i386)
-#  define __i386__
-# elif !defined(__amd64__) && defined(__amd64)
-#  define __amd64__
-# elif !defined(__sparc__) && defined(__sparc)
-#  define __sparc__
-# endif
-# if !defined(__volatile)
-#  define __volatile volatile
-# endif
-#endif
-
-
-/**
- * finite macro.
- */
-#if defined(_MSC_VER)
-#  define finite _finite
-#elif defined(__WATCOMC__)
-#  define finite _finite
-#endif
-
-
-/**
- * Disable assorted warnings
- */
-#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
-#  if !defined(__GNUC__) /* mingw environment */
-#    pragma warning( disable : 4068 ) /* unknown pragma */
-#    pragma warning( disable : 4710 ) /* function 'foo' not inlined */
-#    pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
-#    pragma warning( disable : 4127 ) /* conditional expression is constant */
-#    if defined(MESA_MINWARN)
-#      pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
-#      pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
-#      pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
-#      pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
-#      pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
-#    endif
-#  endif
-#endif
-#if defined(__WATCOMC__)
-#  pragma disable_message(201) /* Disable unreachable code warnings */
-#endif
-
-
-
-/**
- * Function inlining
- */
-#if defined(__GNUC__)
-#  define INLINE __inline__
-#elif defined(__MSC__)
-#  define INLINE __inline
-#elif defined(_MSC_VER)
-#  define INLINE __inline
-#elif defined(__ICL)
-#  define INLINE __inline
-#elif defined(__INTEL_COMPILER)
-#  define INLINE inline
-#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
-#  define INLINE __inline
-#elif defined(__SUNPRO_C) && defined(__C99FEATURES__)
-#  define INLINE inline
-#  define __inline inline
-#  define __inline__ inline
-#elif (__STDC_VERSION__ >= 199901L) /* C99 */
-#  define INLINE inline
-#else
-#  define INLINE
-#endif
-
-
-/**
- * PUBLIC/USED macros
- *
- * If we build the library with gcc's -fvisibility=hidden flag, we'll
- * use the PUBLIC macro to mark functions that are to be exported.
- *
- * We also need to define a USED attribute, so the optimizer doesn't 
- * inline a static function that we later use in an alias. - ajax
- */
-#ifndef PUBLIC
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-#    define PUBLIC __attribute__((visibility("default")))
-#    define USED __attribute__((used))
-#  else
-#    define PUBLIC
-#    define USED
-#  endif
-#endif
-
-
-/**
- * Some compilers don't like some of Mesa's const usage.  In those places use
- * CONST instead of const.  Pass -DNO_CONST to compilers where this matters.
- */
-#ifdef NO_CONST
-#  define CONST
-#else
-#  define CONST const
-#endif
-
-
-/**
- * __builtin_expect macros
- */
-#if !defined(__GNUC__)
-#  define __builtin_expect(x, y) (x)
-#endif
-
-#ifndef likely
-#  ifdef __GNUC__
-#    define likely(x)   __builtin_expect(!!(x), 1)
-#    define unlikely(x) __builtin_expect(!!(x), 0)
-#  else
-#    define likely(x)   (x)
-#    define unlikely(x) (x)
-#  endif
-#endif
-
-/**
- * The __FUNCTION__ gcc variable is generally only used for debugging.
- * If we're not using gcc, define __FUNCTION__ as a cpp symbol here.
- * Don't define it if using a newer Windows compiler.
- */
-#ifndef __FUNCTION__
-# if defined(__VMS)
-#  define __FUNCTION__ "VMS$NL:"
-# elif !defined(__GNUC__) && !defined(__xlC__) &&	\
-      (!defined(_MSC_VER) || _MSC_VER < 1300)
-#  if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
-    (defined(__SUNPRO_C) && defined(__C99FEATURES__))
-#   define __FUNCTION__ __func__
-#  else
-#   define __FUNCTION__ "<unknown>"
-#  endif
-# endif
-#endif
-#ifndef __func__
-#  if (__STDC_VERSION__ >= 199901L) || \
-      (defined(__SUNPRO_C) && defined(__C99FEATURES__))
-       /* __func__ is part of C99 */
-#  elif defined(_MSC_VER)
-#    if _MSC_VER >= 1300
-#      define __func__ __FUNCTION__
-#    else
-#      define __func__ "<unknown>"
-#    endif
-#  endif
-#endif
-
-
-/**
- * Either define MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN, and CPU_TO_LE32.
- * Do not use these unless absolutely necessary!
- * Try to use a runtime test instead.
- * For now, only used by some DRI hardware drivers for color/texel packing.
- */
-#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
-#if defined(__linux__)
-#include <byteswap.h>
-#define CPU_TO_LE32( x )	bswap_32( x )
-#elif defined(__APPLE__)
-#include <CoreFoundation/CFByteOrder.h>
-#define CPU_TO_LE32( x )	CFSwapInt32HostToLittle( x )
-#elif (defined(_AIX) || defined(__blrts))
-static INLINE GLuint CPU_TO_LE32(GLuint x)
-{
-   return (((x & 0x000000ff) << 24) |
-           ((x & 0x0000ff00) <<  8) |
-           ((x & 0x00ff0000) >>  8) |
-           ((x & 0xff000000) >> 24));
-}
-#else /*__linux__ */
-#include <sys/endian.h>
-#define CPU_TO_LE32( x )	bswap32( x )
-#endif /*__linux__*/
-#define MESA_BIG_ENDIAN 1
-#else
-#define CPU_TO_LE32( x )	( x )
-#define MESA_LITTLE_ENDIAN 1
-#endif
-#define LE32_TO_CPU( x )	CPU_TO_LE32( x )
-
-
-
-#if !defined(CAPI) && defined(WIN32) && !defined(BUILD_FOR_SNAP)
-#define CAPI _cdecl
-#endif
-
-
-/**
- * Create a macro so that asm functions can be linked into compilers other
- * than GNU C
- */
-#ifndef _ASMAPI
-#if defined(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/
-#define _ASMAPI __cdecl
-#else
-#define _ASMAPI
-#endif
-#ifdef	PTR_DECL_IN_FRONT
-#define	_ASMAPIP * _ASMAPI
-#else
-#define	_ASMAPIP _ASMAPI *
-#endif
-#endif
-
-#ifdef USE_X86_ASM
-#define _NORMAPI _ASMAPI
-#define _NORMAPIP _ASMAPIP
-#else
-#define _NORMAPI
-#define _NORMAPIP *
-#endif
-
-
-/* This is a macro on IRIX */
-#ifdef _P
-#undef _P
-#endif
-
-
-/* Turn off macro checking systems used by other libraries */
-#ifdef CHECK
-#undef CHECK
-#endif
-
-
-/**
- * ASSERT macro
- */
-#if !defined(_WIN32_WCE)
-#if defined(BUILD_FOR_SNAP) && defined(CHECKED)
-#  define ASSERT(X)   _CHECK(X) 
-#elif defined(DEBUG)
-#  define ASSERT(X)   assert(X)
-#else
-#  define ASSERT(X)
-#endif
-#endif
-
-#if (__GNUC__ >= 3)
-#define PRINTFLIKE(f, a) __attribute__ ((format(__printf__, f, a)))
-#else
-#define PRINTFLIKE(f, a)
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-
-/**
- * LONGSTRING macro
- * gcc -pedantic warns about long string literals, LONGSTRING silences that.
- */
-#if !defined(__GNUC__)
-# define LONGSTRING
-#else
-# define LONGSTRING __extension__
-#endif
-
-
-#ifndef M_PI
-#define M_PI (3.1415926536)
-#endif
-
-#ifndef M_E
-#define M_E (2.7182818284590452354)
-#endif
-
-#ifndef M_LOG2E
-#define M_LOG2E     (1.4426950408889634074)
-#endif
-
-#ifndef ONE_DIV_LN2
-#define ONE_DIV_LN2 (1.442695040888963456)
-#endif
-
-#ifndef ONE_DIV_SQRT_LN2
-#define ONE_DIV_SQRT_LN2 (1.201122408786449815)
-#endif
-
-#ifndef FLT_MAX_EXP
-#define FLT_MAX_EXP 128
-#endif
-
-
-/**
- * USE_IEEE: Determine if we're using IEEE floating point
- */
-#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
-    defined(__s390x__) || defined(__powerpc__) || \
-    defined(__x86_64__) || \
-    defined(ia64) || defined(__ia64__) || \
-    defined(__hppa__) || defined(hpux) || \
-    defined(__mips) || defined(_MIPS_ARCH) || \
-    defined(__arm__) || \
-    defined(__sh__) || defined(__m32r__) || \
-    (defined(__sun) && defined(_IEEE_754)) || \
-    (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
-#define USE_IEEE
-#define IEEE_ONE 0x3f800000
-#endif
-
-
-/**
- * START/END_FAST_MATH macros:
- *
- * START_FAST_MATH: Set x86 FPU to faster, 32-bit precision mode (and save
- *                  original mode to a temporary).
- * END_FAST_MATH: Restore x86 FPU to original mode.
- */
-#if defined(__GNUC__) && defined(__i386__)
-/*
- * Set the x86 FPU control word to guarentee only 32 bits of precision
- * are stored in registers.  Allowing the FPU to store more introduces
- * differences between situations where numbers are pulled out of memory
- * vs. situations where the compiler is able to optimize register usage.
- *
- * In the worst case, we force the compiler to use a memory access to
- * truncate the float, by specifying the 'volatile' keyword.
- */
-/* Hardware default: All exceptions masked, extended double precision,
- * round to nearest (IEEE compliant):
- */
-#define DEFAULT_X86_FPU		0x037f
-/* All exceptions masked, single precision, round to nearest:
- */
-#define FAST_X86_FPU		0x003f
-/* The fldcw instruction will cause any pending FP exceptions to be
- * raised prior to entering the block, and we clear any pending
- * exceptions before exiting the block.  Hence, asm code has free
- * reign over the FPU while in the fast math block.
- */
-#if defined(NO_FAST_MATH)
-#define START_FAST_MATH(x)						\
-do {									\
-   static GLuint mask = DEFAULT_X86_FPU;				\
-   __asm__ ( "fnstcw %0" : "=m" (*&(x)) );				\
-   __asm__ ( "fldcw %0" : : "m" (mask) );				\
-} while (0)
-#else
-#define START_FAST_MATH(x)						\
-do {									\
-   static GLuint mask = FAST_X86_FPU;					\
-   __asm__ ( "fnstcw %0" : "=m" (*&(x)) );				\
-   __asm__ ( "fldcw %0" : : "m" (mask) );				\
-} while (0)
-#endif
-/* Restore original FPU mode, and clear any exceptions that may have
- * occurred in the FAST_MATH block.
- */
-#define END_FAST_MATH(x)						\
-do {									\
-   __asm__ ( "fnclex ; fldcw %0" : : "m" (*&(x)) );			\
-} while (0)
-
-#elif defined(__WATCOMC__) && defined(__386__)
-#define DEFAULT_X86_FPU		0x037f /* See GCC comments above */
-#define FAST_X86_FPU		0x003f /* See GCC comments above */
-void _watcom_start_fast_math(unsigned short *x,unsigned short *mask);
-#pragma aux _watcom_start_fast_math =                                   \
-   "fnstcw  word ptr [eax]"                                             \
-   "fldcw   word ptr [ecx]"                                             \
-   parm [eax] [ecx]                                                     \
-   modify exact [];
-void _watcom_end_fast_math(unsigned short *x);
-#pragma aux _watcom_end_fast_math =                                     \
-   "fnclex"                                                             \
-   "fldcw   word ptr [eax]"                                             \
-   parm [eax]                                                           \
-   modify exact [];
-#if defined(NO_FAST_MATH)
-#define START_FAST_MATH(x)                                              \
-do {                                                                    \
-   static GLushort mask = DEFAULT_X86_FPU;	                        \
-   _watcom_start_fast_math(&x,&mask);                                   \
-} while (0)
-#else
-#define START_FAST_MATH(x)                                              \
-do {                                                                    \
-   static GLushort mask = FAST_X86_FPU;                                 \
-   _watcom_start_fast_math(&x,&mask);                                   \
-} while (0)
-#endif
-#define END_FAST_MATH(x)  _watcom_end_fast_math(&x)
-
-#elif defined(_MSC_VER) && defined(_M_IX86)
-#define DEFAULT_X86_FPU		0x037f /* See GCC comments above */
-#define FAST_X86_FPU		0x003f /* See GCC comments above */
-#if defined(NO_FAST_MATH)
-#define START_FAST_MATH(x) do {\
-	static GLuint mask = DEFAULT_X86_FPU;\
-	__asm fnstcw word ptr [x]\
-	__asm fldcw word ptr [mask]\
-} while(0)
-#else
-#define START_FAST_MATH(x) do {\
-	static GLuint mask = FAST_X86_FPU;\
-	__asm fnstcw word ptr [x]\
-	__asm fldcw word ptr [mask]\
-} while(0)
-#endif
-#define END_FAST_MATH(x) do {\
-	__asm fnclex\
-	__asm fldcw word ptr [x]\
-} while(0)
-
-#else
-#define START_FAST_MATH(x)  x = 0
-#define END_FAST_MATH(x)  (void)(x)
-#endif
-
-
-#ifndef Elements
-#define Elements(x) (sizeof(x)/sizeof(*(x)))
-#endif
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* COMPILER_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file compiler.h

+ * Compiler-related stuff.

+ */

+

+

+#ifndef COMPILER_H

+#define COMPILER_H

+

+

+#include <assert.h>

+#include <ctype.h>

+#if defined(__alpha__) && defined(CCPML)

+#include <cpml.h> /* use Compaq's Fast Math Library on Alpha */

+#else

+#include <math.h>

+#endif

+#include <limits.h>

+#include <stdlib.h>

+#include <stdio.h>

+#include <string.h>

+#if defined(__linux__) && defined(__i386__)

+#include <fpu_control.h>

+#endif

+#include <float.h>

+#include <stdarg.h>

+

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+

+/**

+ * Get standard integer types

+ */

+#include <stdint.h>

+

+

+/**

+  * Sun compilers define __i386 instead of the gcc-style __i386__

+ */

+#ifdef __SUNPRO_C

+# if !defined(__i386__) && defined(__i386)

+#  define __i386__

+# elif !defined(__amd64__) && defined(__amd64)

+#  define __amd64__

+# elif !defined(__sparc__) && defined(__sparc)

+#  define __sparc__

+# endif

+# if !defined(__volatile)

+#  define __volatile volatile

+# endif

+#endif

+

+

+/**

+ * finite macro.

+ */

+#if defined(_MSC_VER)

+#  define finite _finite

+#elif defined(__WATCOMC__)

+#  define finite _finite

+#endif

+

+

+/**

+ * Disable assorted warnings

+ */

+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)

+#  if !defined(__GNUC__) /* mingw environment */

+#    pragma warning( disable : 4068 ) /* unknown pragma */

+#    pragma warning( disable : 4710 ) /* function 'foo' not inlined */

+#    pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */

+#    pragma warning( disable : 4127 ) /* conditional expression is constant */

+#    if defined(MESA_MINWARN)

+#      pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */

+#      pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */

+#      pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */

+#      pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */

+#      pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */

+#    endif

+#  endif

+#endif

+#if defined(__WATCOMC__)

+#  pragma disable_message(201) /* Disable unreachable code warnings */

+#endif

+

+

+

+/**

+ * Function inlining

+ */

+#if defined(__GNUC__)

+#  define INLINE __inline__

+#elif defined(__MSC__)

+#  define INLINE __inline

+#elif defined(_MSC_VER)

+#  define INLINE __inline

+#elif defined(__ICL)

+#  define INLINE __inline

+#elif defined(__INTEL_COMPILER)

+#  define INLINE inline

+#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)

+#  define INLINE __inline

+#elif defined(__SUNPRO_C) && defined(__C99FEATURES__)

+#  define INLINE inline

+#  define __inline inline

+#  define __inline__ inline

+#elif (__STDC_VERSION__ >= 199901L) /* C99 */

+#  define INLINE inline

+#else

+#  define INLINE

+#endif

+

+

+/**

+ * PUBLIC/USED macros

+ *

+ * If we build the library with gcc's -fvisibility=hidden flag, we'll

+ * use the PUBLIC macro to mark functions that are to be exported.

+ *

+ * We also need to define a USED attribute, so the optimizer doesn't 

+ * inline a static function that we later use in an alias. - ajax

+ */

+#ifndef PUBLIC

+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))

+#    define PUBLIC __attribute__((visibility("default")))

+#    define USED __attribute__((used))

+#  else

+#    define PUBLIC

+#    define USED

+#  endif

+#endif

+

+

+/**

+ * Some compilers don't like some of Mesa's const usage.  In those places use

+ * CONST instead of const.  Pass -DNO_CONST to compilers where this matters.

+ */

+#ifdef NO_CONST

+#  define CONST

+#else

+#  define CONST const

+#endif

+

+

+/**

+ * __builtin_expect macros

+ */

+#if !defined(__GNUC__)

+#  define __builtin_expect(x, y) (x)

+#endif

+

+#ifndef likely

+#  ifdef __GNUC__

+#    define likely(x)   __builtin_expect(!!(x), 1)

+#    define unlikely(x) __builtin_expect(!!(x), 0)

+#  else

+#    define likely(x)   (x)

+#    define unlikely(x) (x)

+#  endif

+#endif

+

+/**

+ * The __FUNCTION__ gcc variable is generally only used for debugging.

+ * If we're not using gcc, define __FUNCTION__ as a cpp symbol here.

+ * Don't define it if using a newer Windows compiler.

+ */

+#ifndef __FUNCTION__

+# if defined(__VMS)

+#  define __FUNCTION__ "VMS$NL:"

+# elif !defined(__GNUC__) && !defined(__xlC__) &&	\

+      (!defined(_MSC_VER) || _MSC_VER < 1300)

+#  if (__STDC_VERSION__ >= 199901L) /* C99 */ || \

+    (defined(__SUNPRO_C) && defined(__C99FEATURES__))

+#   define __FUNCTION__ __func__

+#  else

+#   define __FUNCTION__ "<unknown>"

+#  endif

+# endif

+#endif

+#ifndef __func__

+#  if (__STDC_VERSION__ >= 199901L) || \

+      (defined(__SUNPRO_C) && defined(__C99FEATURES__))

+       /* __func__ is part of C99 */

+#  elif defined(_MSC_VER)

+#    if _MSC_VER >= 1300

+#      define __func__ __FUNCTION__

+#    else

+#      define __func__ "<unknown>"

+#    endif

+#  endif

+#endif

+

+

+/**

+ * Either define MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN, and CPU_TO_LE32.

+ * Do not use these unless absolutely necessary!

+ * Try to use a runtime test instead.

+ * For now, only used by some DRI hardware drivers for color/texel packing.

+ */

+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN

+#if defined(__linux__)

+#include <byteswap.h>

+#define CPU_TO_LE32( x )	bswap_32( x )

+#elif defined(__APPLE__)

+#include <CoreFoundation/CFByteOrder.h>

+#define CPU_TO_LE32( x )	CFSwapInt32HostToLittle( x )

+#elif (defined(_AIX) || defined(__blrts))

+static INLINE GLuint CPU_TO_LE32(GLuint x)

+{

+   return (((x & 0x000000ff) << 24) |

+           ((x & 0x0000ff00) <<  8) |

+           ((x & 0x00ff0000) >>  8) |

+           ((x & 0xff000000) >> 24));

+}

+#else /*__linux__ */

+#include <sys/endian.h>

+#define CPU_TO_LE32( x )	bswap32( x )

+#endif /*__linux__*/

+#define MESA_BIG_ENDIAN 1

+#else

+#define CPU_TO_LE32( x )	( x )

+#define MESA_LITTLE_ENDIAN 1

+#endif

+#define LE32_TO_CPU( x )	CPU_TO_LE32( x )

+

+

+

+#if !defined(CAPI) && defined(WIN32) && !defined(BUILD_FOR_SNAP)

+#define CAPI _cdecl

+#endif

+

+

+/**

+ * Create a macro so that asm functions can be linked into compilers other

+ * than GNU C

+ */

+#ifndef _ASMAPI

+#if defined(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/

+#define _ASMAPI __cdecl

+#else

+#define _ASMAPI

+#endif

+#ifdef	PTR_DECL_IN_FRONT

+#define	_ASMAPIP * _ASMAPI

+#else

+#define	_ASMAPIP _ASMAPI *

+#endif

+#endif

+

+#ifdef USE_X86_ASM

+#define _NORMAPI _ASMAPI

+#define _NORMAPIP _ASMAPIP

+#else

+#define _NORMAPI

+#define _NORMAPIP *

+#endif

+

+

+/* This is a macro on IRIX */

+#ifdef _P

+#undef _P

+#endif

+

+

+/* Turn off macro checking systems used by other libraries */

+#ifdef CHECK

+#undef CHECK

+#endif

+

+

+/**

+ * ASSERT macro

+ */

+#if !defined(_WIN32_WCE)

+#if defined(BUILD_FOR_SNAP) && defined(CHECKED)

+#  define ASSERT(X)   _CHECK(X) 

+#elif defined(DEBUG)

+#  define ASSERT(X)   assert(X)

+#else

+#  define ASSERT(X)

+#endif

+#endif

+

+#if (__GNUC__ >= 3)

+#define PRINTFLIKE(f, a) __attribute__ ((format(__printf__, f, a)))

+#else

+#define PRINTFLIKE(f, a)

+#endif

+

+#ifndef NULL

+#define NULL 0

+#endif

+

+

+/**

+ * LONGSTRING macro

+ * gcc -pedantic warns about long string literals, LONGSTRING silences that.

+ */

+#if !defined(__GNUC__)

+# define LONGSTRING

+#else

+# define LONGSTRING __extension__

+#endif

+

+

+#ifndef M_PI

+#define M_PI (3.1415926536)

+#endif

+

+#ifndef M_E

+#define M_E (2.7182818284590452354)

+#endif

+

+#ifndef M_LOG2E

+#define M_LOG2E     (1.4426950408889634074)

+#endif

+

+#ifndef ONE_DIV_LN2

+#define ONE_DIV_LN2 (1.442695040888963456)

+#endif

+

+#ifndef ONE_DIV_SQRT_LN2

+#define ONE_DIV_SQRT_LN2 (1.201122408786449815)

+#endif

+

+#ifndef FLT_MAX_EXP

+#define FLT_MAX_EXP 128

+#endif

+

+

+/**

+ * USE_IEEE: Determine if we're using IEEE floating point

+ */

+#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \

+    defined(__s390x__) || defined(__powerpc__) || \

+    defined(__x86_64__) || \

+    defined(ia64) || defined(__ia64__) || \

+    defined(__hppa__) || defined(hpux) || \

+    defined(__mips) || defined(_MIPS_ARCH) || \

+    defined(__arm__) || \

+    defined(__sh__) || defined(__m32r__) || \

+    (defined(__sun) && defined(_IEEE_754)) || \

+    (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))

+#define USE_IEEE

+#define IEEE_ONE 0x3f800000

+#endif

+

+

+/**

+ * START/END_FAST_MATH macros:

+ *

+ * START_FAST_MATH: Set x86 FPU to faster, 32-bit precision mode (and save

+ *                  original mode to a temporary).

+ * END_FAST_MATH: Restore x86 FPU to original mode.

+ */

+#if defined(__GNUC__) && defined(__i386__)

+/*

+ * Set the x86 FPU control word to guarentee only 32 bits of precision

+ * are stored in registers.  Allowing the FPU to store more introduces

+ * differences between situations where numbers are pulled out of memory

+ * vs. situations where the compiler is able to optimize register usage.

+ *

+ * In the worst case, we force the compiler to use a memory access to

+ * truncate the float, by specifying the 'volatile' keyword.

+ */

+/* Hardware default: All exceptions masked, extended double precision,

+ * round to nearest (IEEE compliant):

+ */

+#define DEFAULT_X86_FPU		0x037f

+/* All exceptions masked, single precision, round to nearest:

+ */

+#define FAST_X86_FPU		0x003f

+/* The fldcw instruction will cause any pending FP exceptions to be

+ * raised prior to entering the block, and we clear any pending

+ * exceptions before exiting the block.  Hence, asm code has free

+ * reign over the FPU while in the fast math block.

+ */

+#if defined(NO_FAST_MATH)

+#define START_FAST_MATH(x)						\

+do {									\

+   static GLuint mask = DEFAULT_X86_FPU;				\

+   __asm__ ( "fnstcw %0" : "=m" (*&(x)) );				\

+   __asm__ ( "fldcw %0" : : "m" (mask) );				\

+} while (0)

+#else

+#define START_FAST_MATH(x)						\

+do {									\

+   static GLuint mask = FAST_X86_FPU;					\

+   __asm__ ( "fnstcw %0" : "=m" (*&(x)) );				\

+   __asm__ ( "fldcw %0" : : "m" (mask) );				\

+} while (0)

+#endif

+/* Restore original FPU mode, and clear any exceptions that may have

+ * occurred in the FAST_MATH block.

+ */

+#define END_FAST_MATH(x)						\

+do {									\

+   __asm__ ( "fnclex ; fldcw %0" : : "m" (*&(x)) );			\

+} while (0)

+

+#elif defined(__WATCOMC__) && defined(__386__)

+#define DEFAULT_X86_FPU		0x037f /* See GCC comments above */

+#define FAST_X86_FPU		0x003f /* See GCC comments above */

+void _watcom_start_fast_math(unsigned short *x,unsigned short *mask);

+#pragma aux _watcom_start_fast_math =                                   \

+   "fnstcw  word ptr [eax]"                                             \

+   "fldcw   word ptr [ecx]"                                             \

+   parm [eax] [ecx]                                                     \

+   modify exact [];

+void _watcom_end_fast_math(unsigned short *x);

+#pragma aux _watcom_end_fast_math =                                     \

+   "fnclex"                                                             \

+   "fldcw   word ptr [eax]"                                             \

+   parm [eax]                                                           \

+   modify exact [];

+#if defined(NO_FAST_MATH)

+#define START_FAST_MATH(x)                                              \

+do {                                                                    \

+   static GLushort mask = DEFAULT_X86_FPU;	                        \

+   _watcom_start_fast_math(&x,&mask);                                   \

+} while (0)

+#else

+#define START_FAST_MATH(x)                                              \

+do {                                                                    \

+   static GLushort mask = FAST_X86_FPU;                                 \

+   _watcom_start_fast_math(&x,&mask);                                   \

+} while (0)

+#endif

+#define END_FAST_MATH(x)  _watcom_end_fast_math(&x)

+

+#elif defined(_MSC_VER) && defined(_M_IX86)

+#define DEFAULT_X86_FPU		0x037f /* See GCC comments above */

+#define FAST_X86_FPU		0x003f /* See GCC comments above */

+#if defined(NO_FAST_MATH)

+#define START_FAST_MATH(x) do {\

+	static GLuint mask = DEFAULT_X86_FPU;\

+	__asm fnstcw word ptr [x]\

+	__asm fldcw word ptr [mask]\

+} while(0)

+#else

+#define START_FAST_MATH(x) do {\

+	static GLuint mask = FAST_X86_FPU;\

+	__asm fnstcw word ptr [x]\

+	__asm fldcw word ptr [mask]\

+} while(0)

+#endif

+#define END_FAST_MATH(x) do {\

+	__asm fnclex\

+	__asm fldcw word ptr [x]\

+} while(0)

+

+#else

+#define START_FAST_MATH(x)  x = 0

+#define END_FAST_MATH(x)  (void)(x)

+#endif

+

+

+#ifndef Elements

+#define Elements(x) (sizeof(x)/sizeof(*(x)))

+#endif

+

+

+

+#ifdef __cplusplus

+}

+#endif

+

+

+#endif /* COMPILER_H */

diff --git a/mesalib/src/mesa/main/debug.h b/mesalib/src/mesa/main/debug.h
index d7c53b655..eda377abb 100644
--- a/mesalib/src/mesa/main/debug.h
+++ b/mesalib/src/mesa/main/debug.h
@@ -1,94 +1,94 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.1
- *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-/**
- * \file debug.h
- * Debugging functions.
- * 
- * \if subset
- * (No-op)
- *
- * \endif
- */
-
-
-#ifndef _DEBUG_H
-#define _DEBUG_H
-
-#include "glheader.h"
-#include "mfeatures.h"
-
-struct gl_context;
-struct gl_texture_image;
-
-#if _HAVE_FULL_GL
-
-extern void _mesa_print_tri_caps( const char *name, GLuint flags );
-extern void _mesa_print_enable_flags( const char *msg, GLuint flags );
-extern void _mesa_print_state( const char *msg, GLuint state );
-extern void _mesa_print_info( void );
-extern void _mesa_init_debug( struct gl_context *ctx );
-
-#else
-
-/** No-op */
-#define _mesa_print_state( m, s ) ((void)0)
-
-/** No-op */
-#define _mesa_print_info() ((void)0)
-
-/** No-op */
-#define _mesa_init_debug( c ) ((void)0)
-
-#endif
-
-extern void
-_mesa_write_renderbuffer_image(const struct gl_renderbuffer *rb);
-
-extern void
-_mesa_dump_texture(GLuint texture, GLuint writeImages);
-
-extern void
-_mesa_dump_textures(GLuint writeImages);
-
-extern void
-_mesa_dump_renderbuffers(GLboolean writeImages);
-
-extern void
-_mesa_dump_color_buffer(const char *filename);
-
-extern void
-_mesa_dump_depth_buffer(const char *filename);
-
-extern void
-_mesa_dump_stencil_buffer(const char *filename);
-
-extern void
-_mesa_dump_image(const char *filename, const void *image, GLuint w, GLuint h,
-                 GLenum format, GLenum type);
-
-extern void
-_mesa_print_texture(struct gl_context *ctx, const struct gl_texture_image *img);
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.1

+ *

+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+/**

+ * \file debug.h

+ * Debugging functions.

+ * 

+ * \if subset

+ * (No-op)

+ *

+ * \endif

+ */

+

+

+#ifndef _DEBUG_H

+#define _DEBUG_H

+

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct gl_context;

+struct gl_texture_image;

+

+#if _HAVE_FULL_GL

+

+extern void _mesa_print_tri_caps( const char *name, GLuint flags );

+extern void _mesa_print_enable_flags( const char *msg, GLuint flags );

+extern void _mesa_print_state( const char *msg, GLuint state );

+extern void _mesa_print_info( void );

+extern void _mesa_init_debug( struct gl_context *ctx );

+

+#else

+

+/** No-op */

+#define _mesa_print_state( m, s ) ((void)0)

+

+/** No-op */

+#define _mesa_print_info() ((void)0)

+

+/** No-op */

+#define _mesa_init_debug( c ) ((void)0)

+

+#endif

+

+extern void

+_mesa_write_renderbuffer_image(const struct gl_renderbuffer *rb);

+

+extern void

+_mesa_dump_texture(GLuint texture, GLuint writeImages);

+

+extern void

+_mesa_dump_textures(GLuint writeImages);

+

+extern void

+_mesa_dump_renderbuffers(GLboolean writeImages);

+

+extern void

+_mesa_dump_color_buffer(const char *filename);

+

+extern void

+_mesa_dump_depth_buffer(const char *filename);

+

+extern void

+_mesa_dump_stencil_buffer(const char *filename);

+

+extern void

+_mesa_dump_image(const char *filename, const void *image, GLuint w, GLuint h,

+                 GLenum format, GLenum type);

+

+extern void

+_mesa_print_texture(struct gl_context *ctx, const struct gl_texture_image *img);

+

+#endif

diff --git a/mesalib/src/mesa/main/depth.c b/mesalib/src/mesa/main/depth.c
index 52c69a6bc..d666ed5fe 100644
--- a/mesalib/src/mesa/main/depth.c
+++ b/mesalib/src/mesa/main/depth.c
@@ -1,174 +1,174 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "depth.h"
-#include "enums.h"
-#include "macros.h"
-#include "mtypes.h"
-
-
-/**********************************************************************/
-/*****                          API Functions                     *****/
-/**********************************************************************/
-
-
-
-void GLAPIENTRY
-_mesa_ClearDepth( GLclampd depth )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glClearDepth(%f)\n", depth);
-
-   depth = CLAMP( depth, 0.0, 1.0 );
-
-   if (ctx->Depth.Clear == depth)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_DEPTH);
-   ctx->Depth.Clear = depth;
-   if (ctx->Driver.ClearDepth)
-      (*ctx->Driver.ClearDepth)( ctx, ctx->Depth.Clear );
-}
-
-
-void GLAPIENTRY
-_mesa_ClearDepthf( GLclampf depth )
-{
-   _mesa_ClearDepth(depth);
-}
-
-
-void GLAPIENTRY
-_mesa_DepthFunc( GLenum func )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glDepthFunc %s\n", _mesa_lookup_enum_by_nr(func));
-
-   switch (func) {
-   case GL_LESS:    /* (default) pass if incoming z < stored z */
-   case GL_GEQUAL:
-   case GL_LEQUAL:
-   case GL_GREATER:
-   case GL_NOTEQUAL:
-   case GL_EQUAL:
-   case GL_ALWAYS:
-   case GL_NEVER:
-      break;
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glDepth.Func" );
-      return;
-   }
-
-   if (ctx->Depth.Func == func)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_DEPTH);
-   ctx->Depth.Func = func;
-
-   if (ctx->Driver.DepthFunc)
-      ctx->Driver.DepthFunc( ctx, func );
-}
-
-
-
-void GLAPIENTRY
-_mesa_DepthMask( GLboolean flag )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glDepthMask %d\n", flag);
-
-   /*
-    * GL_TRUE indicates depth buffer writing is enabled (default)
-    * GL_FALSE indicates depth buffer writing is disabled
-    */
-   if (ctx->Depth.Mask == flag)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_DEPTH);
-   ctx->Depth.Mask = flag;
-
-   if (ctx->Driver.DepthMask)
-      ctx->Driver.DepthMask( ctx, flag );
-}
-
-
-
-/**
- * Specified by the GL_EXT_depth_bounds_test extension.
- */
-void GLAPIENTRY
-_mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glDepthBounds(%f, %f)\n", zmin, zmax);
-
-   if (zmin > zmax) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glDepthBoundsEXT(zmin > zmax)");
-      return;
-   }
-
-   zmin = CLAMP(zmin, 0.0, 1.0);
-   zmax = CLAMP(zmax, 0.0, 1.0);
-
-   if (ctx->Depth.BoundsMin == zmin && ctx->Depth.BoundsMax == zmax)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_DEPTH);
-   ctx->Depth.BoundsMin = (GLfloat) zmin;
-   ctx->Depth.BoundsMax = (GLfloat) zmax;
-}
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-
-/**
- * Initialize the depth buffer attribute group in the given context.
- */
-void
-_mesa_init_depth(struct gl_context *ctx)
-{
-   ctx->Depth.Test = GL_FALSE;
-   ctx->Depth.Clear = 1.0;
-   ctx->Depth.Func = GL_LESS;
-   ctx->Depth.Mask = GL_TRUE;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "context.h"

+#include "depth.h"

+#include "enums.h"

+#include "macros.h"

+#include "mtypes.h"

+

+

+/**********************************************************************/

+/*****                          API Functions                     *****/

+/**********************************************************************/

+

+

+

+void GLAPIENTRY

+_mesa_ClearDepth( GLclampd depth )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glClearDepth(%f)\n", depth);

+

+   depth = CLAMP( depth, 0.0, 1.0 );

+

+   if (ctx->Depth.Clear == depth)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_DEPTH);

+   ctx->Depth.Clear = depth;

+   if (ctx->Driver.ClearDepth)

+      (*ctx->Driver.ClearDepth)( ctx, ctx->Depth.Clear );

+}

+

+

+void GLAPIENTRY

+_mesa_ClearDepthf( GLclampf depth )

+{

+   _mesa_ClearDepth(depth);

+}

+

+

+void GLAPIENTRY

+_mesa_DepthFunc( GLenum func )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glDepthFunc %s\n", _mesa_lookup_enum_by_nr(func));

+

+   switch (func) {

+   case GL_LESS:    /* (default) pass if incoming z < stored z */

+   case GL_GEQUAL:

+   case GL_LEQUAL:

+   case GL_GREATER:

+   case GL_NOTEQUAL:

+   case GL_EQUAL:

+   case GL_ALWAYS:

+   case GL_NEVER:

+      break;

+   default:

+      _mesa_error( ctx, GL_INVALID_ENUM, "glDepth.Func" );

+      return;

+   }

+

+   if (ctx->Depth.Func == func)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_DEPTH);

+   ctx->Depth.Func = func;

+

+   if (ctx->Driver.DepthFunc)

+      ctx->Driver.DepthFunc( ctx, func );

+}

+

+

+

+void GLAPIENTRY

+_mesa_DepthMask( GLboolean flag )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glDepthMask %d\n", flag);

+

+   /*

+    * GL_TRUE indicates depth buffer writing is enabled (default)

+    * GL_FALSE indicates depth buffer writing is disabled

+    */

+   if (ctx->Depth.Mask == flag)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_DEPTH);

+   ctx->Depth.Mask = flag;

+

+   if (ctx->Driver.DepthMask)

+      ctx->Driver.DepthMask( ctx, flag );

+}

+

+

+

+/**

+ * Specified by the GL_EXT_depth_bounds_test extension.

+ */

+void GLAPIENTRY

+_mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glDepthBounds(%f, %f)\n", zmin, zmax);

+

+   if (zmin > zmax) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glDepthBoundsEXT(zmin > zmax)");

+      return;

+   }

+

+   zmin = CLAMP(zmin, 0.0, 1.0);

+   zmax = CLAMP(zmax, 0.0, 1.0);

+

+   if (ctx->Depth.BoundsMin == zmin && ctx->Depth.BoundsMax == zmax)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_DEPTH);

+   ctx->Depth.BoundsMin = (GLfloat) zmin;

+   ctx->Depth.BoundsMax = (GLfloat) zmax;

+}

+

+

+/**********************************************************************/

+/*****                      Initialization                        *****/

+/**********************************************************************/

+

+

+/**

+ * Initialize the depth buffer attribute group in the given context.

+ */

+void

+_mesa_init_depth(struct gl_context *ctx)

+{

+   ctx->Depth.Test = GL_FALSE;

+   ctx->Depth.Clear = 1.0;

+   ctx->Depth.Func = GL_LESS;

+   ctx->Depth.Mask = GL_TRUE;

+}

diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index 7e86f1d0e..e0f9706bb 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -1,10382 +1,10382 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.7
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file dlist.c
- * Display lists management functions.
- */
-
-#include "glheader.h"
-#include "imports.h"
-#include "api_arrayelt.h"
-#include "api_exec.h"
-#include "api_loopback.h"
-#if FEATURE_ATI_fragment_shader
-#include "atifragshader.h"
-#endif
-#include "config.h"
-#include "mfeatures.h"
-#if FEATURE_ARB_vertex_buffer_object
-#include "bufferobj.h"
-#endif
-#include "arrayobj.h"
-#include "context.h"
-#include "dlist.h"
-#include "enums.h"
-#include "eval.h"
-#include "framebuffer.h"
-#include "glapi/glapi.h"
-#include "hash.h"
-#include "image.h"
-#include "light.h"
-#include "macros.h"
-#include "pack.h"
-#include "pbo.h"
-#include "queryobj.h"
-#include "teximage.h"
-#include "mtypes.h"
-#include "varray.h"
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-#include "arbprogram.h"
-#endif
-#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
-#include "nvprogram.h"
-#endif
-
-#include "math/m_matrix.h"
-
-#include "main/dispatch.h"
-
-
-
-/**
- * Other parts of Mesa (such as the VBO module) can plug into the display
- * list system.  This structure describes new display list instructions.
- */
-struct gl_list_instruction
-{
-   GLuint Size;
-   void (*Execute)( struct gl_context *ctx, void *data );
-   void (*Destroy)( struct gl_context *ctx, void *data );
-   void (*Print)( struct gl_context *ctx, void *data );
-};
-
-
-#define MAX_DLIST_EXT_OPCODES 16
-
-/**
- * Used by device drivers to hook new commands into display lists.
- */
-struct gl_list_extensions
-{
-   struct gl_list_instruction Opcode[MAX_DLIST_EXT_OPCODES];
-   GLuint NumOpcodes;
-};
-
-
-
-/**
- * Flush vertices.
- *
- * \param ctx GL context.
- *
- * Checks if dd_function_table::SaveNeedFlush is marked to flush
- * stored (save) vertices, and calls
- * dd_function_table::SaveFlushVertices if so.
- */
-#define SAVE_FLUSH_VERTICES(ctx)		\
-do {						\
-   if (ctx->Driver.SaveNeedFlush)		\
-      ctx->Driver.SaveFlushVertices(ctx);	\
-} while (0)
-
-
-/**
- * Macro to assert that the API call was made outside the
- * glBegin()/glEnd() pair, with return value.
- * 
- * \param ctx GL context.
- * \param retval value to return value in case the assertion fails.
- */
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval)		\
-do {									\
-   if (ctx->Driver.CurrentSavePrimitive <= GL_POLYGON ||		\
-       ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) {	\
-      _mesa_compile_error( ctx, GL_INVALID_OPERATION, "begin/end" );	\
-      return retval;							\
-   }									\
-} while (0)
-
-/**
- * Macro to assert that the API call was made outside the
- * glBegin()/glEnd() pair.
- * 
- * \param ctx GL context.
- */
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx)				\
-do {									\
-   if (ctx->Driver.CurrentSavePrimitive <= GL_POLYGON ||		\
-       ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) {	\
-      _mesa_compile_error( ctx, GL_INVALID_OPERATION, "begin/end" );	\
-      return;								\
-   }									\
-} while (0)
-
-/**
- * Macro to assert that the API call was made outside the
- * glBegin()/glEnd() pair and flush the vertices.
- * 
- * \param ctx GL context.
- */
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx)			\
-do {									\
-   ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx);					\
-   SAVE_FLUSH_VERTICES(ctx);						\
-} while (0)
-
-/**
- * Macro to assert that the API call was made outside the
- * glBegin()/glEnd() pair and flush the vertices, with return value.
- * 
- * \param ctx GL context.
- * \param retval value to return value in case the assertion fails.
- */
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval)\
-do {									\
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval);		\
-   SAVE_FLUSH_VERTICES(ctx);						\
-} while (0)
-
-
-
-/**
- * Display list opcodes.
- *
- * The fact that these identifiers are assigned consecutive
- * integer values starting at 0 is very important, see InstSize array usage)
- */
-typedef enum
-{
-   OPCODE_INVALID = -1,         /* Force signed enum */
-   OPCODE_ACCUM,
-   OPCODE_ALPHA_FUNC,
-   OPCODE_BIND_TEXTURE,
-   OPCODE_BITMAP,
-   OPCODE_BLEND_COLOR,
-   OPCODE_BLEND_EQUATION,
-   OPCODE_BLEND_EQUATION_SEPARATE,
-   OPCODE_BLEND_FUNC_SEPARATE,
-
-   OPCODE_BLEND_EQUATION_I,
-   OPCODE_BLEND_EQUATION_SEPARATE_I,
-   OPCODE_BLEND_FUNC_I,
-   OPCODE_BLEND_FUNC_SEPARATE_I,
-
-   OPCODE_CALL_LIST,
-   OPCODE_CALL_LIST_OFFSET,
-   OPCODE_CLEAR,
-   OPCODE_CLEAR_ACCUM,
-   OPCODE_CLEAR_COLOR,
-   OPCODE_CLEAR_DEPTH,
-   OPCODE_CLEAR_INDEX,
-   OPCODE_CLEAR_STENCIL,
-   OPCODE_CLEAR_BUFFER_IV,
-   OPCODE_CLEAR_BUFFER_UIV,
-   OPCODE_CLEAR_BUFFER_FV,
-   OPCODE_CLEAR_BUFFER_FI,
-   OPCODE_CLIP_PLANE,
-   OPCODE_COLOR_MASK,
-   OPCODE_COLOR_MASK_INDEXED,
-   OPCODE_COLOR_MATERIAL,
-   OPCODE_COLOR_TABLE,
-   OPCODE_COLOR_TABLE_PARAMETER_FV,
-   OPCODE_COLOR_TABLE_PARAMETER_IV,
-   OPCODE_COLOR_SUB_TABLE,
-   OPCODE_CONVOLUTION_FILTER_1D,
-   OPCODE_CONVOLUTION_FILTER_2D,
-   OPCODE_CONVOLUTION_PARAMETER_I,
-   OPCODE_CONVOLUTION_PARAMETER_IV,
-   OPCODE_CONVOLUTION_PARAMETER_F,
-   OPCODE_CONVOLUTION_PARAMETER_FV,
-   OPCODE_COPY_COLOR_SUB_TABLE,
-   OPCODE_COPY_COLOR_TABLE,
-   OPCODE_COPY_PIXELS,
-   OPCODE_COPY_TEX_IMAGE1D,
-   OPCODE_COPY_TEX_IMAGE2D,
-   OPCODE_COPY_TEX_SUB_IMAGE1D,
-   OPCODE_COPY_TEX_SUB_IMAGE2D,
-   OPCODE_COPY_TEX_SUB_IMAGE3D,
-   OPCODE_CULL_FACE,
-   OPCODE_DEPTH_FUNC,
-   OPCODE_DEPTH_MASK,
-   OPCODE_DEPTH_RANGE,
-   OPCODE_DISABLE,
-   OPCODE_DISABLE_INDEXED,
-   OPCODE_DRAW_BUFFER,
-   OPCODE_DRAW_PIXELS,
-   OPCODE_ENABLE,
-   OPCODE_ENABLE_INDEXED,
-   OPCODE_EVALMESH1,
-   OPCODE_EVALMESH2,
-   OPCODE_FOG,
-   OPCODE_FRONT_FACE,
-   OPCODE_FRUSTUM,
-   OPCODE_HINT,
-   OPCODE_HISTOGRAM,
-   OPCODE_INDEX_MASK,
-   OPCODE_INIT_NAMES,
-   OPCODE_LIGHT,
-   OPCODE_LIGHT_MODEL,
-   OPCODE_LINE_STIPPLE,
-   OPCODE_LINE_WIDTH,
-   OPCODE_LIST_BASE,
-   OPCODE_LOAD_IDENTITY,
-   OPCODE_LOAD_MATRIX,
-   OPCODE_LOAD_NAME,
-   OPCODE_LOGIC_OP,
-   OPCODE_MAP1,
-   OPCODE_MAP2,
-   OPCODE_MAPGRID1,
-   OPCODE_MAPGRID2,
-   OPCODE_MATRIX_MODE,
-   OPCODE_MIN_MAX,
-   OPCODE_MULT_MATRIX,
-   OPCODE_ORTHO,
-   OPCODE_PASSTHROUGH,
-   OPCODE_PIXEL_MAP,
-   OPCODE_PIXEL_TRANSFER,
-   OPCODE_PIXEL_ZOOM,
-   OPCODE_POINT_SIZE,
-   OPCODE_POINT_PARAMETERS,
-   OPCODE_POLYGON_MODE,
-   OPCODE_POLYGON_STIPPLE,
-   OPCODE_POLYGON_OFFSET,
-   OPCODE_POP_ATTRIB,
-   OPCODE_POP_MATRIX,
-   OPCODE_POP_NAME,
-   OPCODE_PRIORITIZE_TEXTURE,
-   OPCODE_PUSH_ATTRIB,
-   OPCODE_PUSH_MATRIX,
-   OPCODE_PUSH_NAME,
-   OPCODE_RASTER_POS,
-   OPCODE_READ_BUFFER,
-   OPCODE_RESET_HISTOGRAM,
-   OPCODE_RESET_MIN_MAX,
-   OPCODE_ROTATE,
-   OPCODE_SCALE,
-   OPCODE_SCISSOR,
-   OPCODE_SELECT_TEXTURE_SGIS,
-   OPCODE_SELECT_TEXTURE_COORD_SET,
-   OPCODE_SHADE_MODEL,
-   OPCODE_STENCIL_FUNC,
-   OPCODE_STENCIL_MASK,
-   OPCODE_STENCIL_OP,
-   OPCODE_TEXENV,
-   OPCODE_TEXGEN,
-   OPCODE_TEXPARAMETER,
-   OPCODE_TEX_IMAGE1D,
-   OPCODE_TEX_IMAGE2D,
-   OPCODE_TEX_IMAGE3D,
-   OPCODE_TEX_SUB_IMAGE1D,
-   OPCODE_TEX_SUB_IMAGE2D,
-   OPCODE_TEX_SUB_IMAGE3D,
-   OPCODE_TRANSLATE,
-   OPCODE_VIEWPORT,
-   OPCODE_WINDOW_POS,
-   /* GL_ARB_multitexture */
-   OPCODE_ACTIVE_TEXTURE,
-   /* GL_ARB_texture_compression */
-   OPCODE_COMPRESSED_TEX_IMAGE_1D,
-   OPCODE_COMPRESSED_TEX_IMAGE_2D,
-   OPCODE_COMPRESSED_TEX_IMAGE_3D,
-   OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D,
-   OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D,
-   OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D,
-   /* GL_ARB_multisample */
-   OPCODE_SAMPLE_COVERAGE,
-   /* GL_ARB_window_pos */
-   OPCODE_WINDOW_POS_ARB,
-   /* GL_NV_vertex_program */
-   OPCODE_BIND_PROGRAM_NV,
-   OPCODE_EXECUTE_PROGRAM_NV,
-   OPCODE_REQUEST_RESIDENT_PROGRAMS_NV,
-   OPCODE_LOAD_PROGRAM_NV,
-   OPCODE_TRACK_MATRIX_NV,
-   /* GL_NV_fragment_program */
-   OPCODE_PROGRAM_LOCAL_PARAMETER_ARB,
-   OPCODE_PROGRAM_NAMED_PARAMETER_NV,
-   /* GL_EXT_stencil_two_side */
-   OPCODE_ACTIVE_STENCIL_FACE_EXT,
-   /* GL_EXT_depth_bounds_test */
-   OPCODE_DEPTH_BOUNDS_EXT,
-   /* GL_ARB_vertex/fragment_program */
-   OPCODE_PROGRAM_STRING_ARB,
-   OPCODE_PROGRAM_ENV_PARAMETER_ARB,
-   /* GL_ARB_occlusion_query */
-   OPCODE_BEGIN_QUERY_ARB,
-   OPCODE_END_QUERY_ARB,
-   /* GL_ARB_draw_buffers */
-   OPCODE_DRAW_BUFFERS_ARB,
-   /* GL_ATI_fragment_shader */
-   OPCODE_TEX_BUMP_PARAMETER_ATI,
-   /* GL_ATI_fragment_shader */
-   OPCODE_BIND_FRAGMENT_SHADER_ATI,
-   OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI,
-   /* OpenGL 2.0 */
-   OPCODE_STENCIL_FUNC_SEPARATE,
-   OPCODE_STENCIL_OP_SEPARATE,
-   OPCODE_STENCIL_MASK_SEPARATE,
-
-   /* GL_ARB_shader_objects */
-   OPCODE_USE_PROGRAM,
-   OPCODE_UNIFORM_1F,
-   OPCODE_UNIFORM_2F,
-   OPCODE_UNIFORM_3F,
-   OPCODE_UNIFORM_4F,
-   OPCODE_UNIFORM_1FV,
-   OPCODE_UNIFORM_2FV,
-   OPCODE_UNIFORM_3FV,
-   OPCODE_UNIFORM_4FV,
-   OPCODE_UNIFORM_1I,
-   OPCODE_UNIFORM_2I,
-   OPCODE_UNIFORM_3I,
-   OPCODE_UNIFORM_4I,
-   OPCODE_UNIFORM_1IV,
-   OPCODE_UNIFORM_2IV,
-   OPCODE_UNIFORM_3IV,
-   OPCODE_UNIFORM_4IV,
-   OPCODE_UNIFORM_MATRIX22,
-   OPCODE_UNIFORM_MATRIX33,
-   OPCODE_UNIFORM_MATRIX44,
-   OPCODE_UNIFORM_MATRIX23,
-   OPCODE_UNIFORM_MATRIX32,
-   OPCODE_UNIFORM_MATRIX24,
-   OPCODE_UNIFORM_MATRIX42,
-   OPCODE_UNIFORM_MATRIX34,
-   OPCODE_UNIFORM_MATRIX43,
-
-   /* OpenGL 3.0 */
-   OPCODE_UNIFORM_1UI,
-   OPCODE_UNIFORM_2UI,
-   OPCODE_UNIFORM_3UI,
-   OPCODE_UNIFORM_4UI,
-   OPCODE_UNIFORM_1UIV,
-   OPCODE_UNIFORM_2UIV,
-   OPCODE_UNIFORM_3UIV,
-   OPCODE_UNIFORM_4UIV,
-
-   /* GL_ARB_color_buffer_float */
-   OPCODE_CLAMP_COLOR,
-
-   /* GL_EXT_framebuffer_blit */
-   OPCODE_BLIT_FRAMEBUFFER,
-
-   /* Vertex attributes -- fallback for when optimized display
-    * list build isn't active.
-    */
-   OPCODE_ATTR_1F_NV,
-   OPCODE_ATTR_2F_NV,
-   OPCODE_ATTR_3F_NV,
-   OPCODE_ATTR_4F_NV,
-   OPCODE_ATTR_1F_ARB,
-   OPCODE_ATTR_2F_ARB,
-   OPCODE_ATTR_3F_ARB,
-   OPCODE_ATTR_4F_ARB,
-   OPCODE_MATERIAL,
-   OPCODE_BEGIN,
-   OPCODE_END,
-   OPCODE_RECTF,
-   OPCODE_EVAL_C1,
-   OPCODE_EVAL_C2,
-   OPCODE_EVAL_P1,
-   OPCODE_EVAL_P2,
-
-   /* GL_EXT_provoking_vertex */
-   OPCODE_PROVOKING_VERTEX,
-
-   /* GL_EXT_transform_feedback */
-   OPCODE_BEGIN_TRANSFORM_FEEDBACK,
-   OPCODE_END_TRANSFORM_FEEDBACK,
-
-   /* GL_EXT_texture_integer */
-   OPCODE_CLEARCOLOR_I,
-   OPCODE_CLEARCOLOR_UI,
-   OPCODE_TEXPARAMETER_I,
-   OPCODE_TEXPARAMETER_UI,
-
-   /* GL_EXT_separate_shader_objects */
-   OPCODE_ACTIVE_PROGRAM_EXT,
-   OPCODE_USE_SHADER_PROGRAM_EXT,
-
-   /* GL_ARB_instanced_arrays */
-   OPCODE_VERTEX_ATTRIB_DIVISOR,
-
-   /* GL_NV_texture_barrier */
-   OPCODE_TEXTURE_BARRIER_NV,
-
-   /* The following three are meta instructions */
-   OPCODE_ERROR,                /* raise compiled-in error */
-   OPCODE_CONTINUE,
-   OPCODE_END_OF_LIST,
-   OPCODE_EXT_0
-} OpCode;
-
-
-
-/**
- * Display list node.
- *
- * Display list instructions are stored as sequences of "nodes".  Nodes
- * are allocated in blocks.  Each block has BLOCK_SIZE nodes.  Blocks
- * are linked together with a pointer.
- *
- * Each instruction in the display list is stored as a sequence of
- * contiguous nodes in memory.
- * Each node is the union of a variety of data types.
- */
-union gl_dlist_node
-{
-   OpCode opcode;
-   GLboolean b;
-   GLbitfield bf;
-   GLubyte ub;
-   GLshort s;
-   GLushort us;
-   GLint i;
-   GLuint ui;
-   GLenum e;
-   GLfloat f;
-   GLvoid *data;
-   void *next;                  /* If prev node's opcode==OPCODE_CONTINUE */
-};
-
-
-typedef union gl_dlist_node Node;
-
-
-/**
- * How many nodes to allocate at a time.
- *
- * \note Reduced now that we hold vertices etc. elsewhere.
- */
-#define BLOCK_SIZE 256
-
-
-
-/**
- * Number of nodes of storage needed for each instruction.
- * Sizes for dynamically allocated opcodes are stored in the context struct.
- */
-static GLuint InstSize[OPCODE_END_OF_LIST + 1];
-
-
-#if FEATURE_dlist
-
-
-void mesa_print_display_list(GLuint list);
-
-
-/**********************************************************************/
-/*****                           Private                          *****/
-/**********************************************************************/
-
-
-/**
- * Make an empty display list.  This is used by glGenLists() to
- * reserve display list IDs.
- */
-static struct gl_display_list *
-make_list(GLuint name, GLuint count)
-{
-   struct gl_display_list *dlist = CALLOC_STRUCT(gl_display_list);
-   dlist->Name = name;
-   dlist->Head = (Node *) malloc(sizeof(Node) * count);
-   dlist->Head[0].opcode = OPCODE_END_OF_LIST;
-   return dlist;
-}
-
-
-/**
- * Lookup function to just encapsulate casting.
- */
-static INLINE struct gl_display_list *
-lookup_list(struct gl_context *ctx, GLuint list)
-{
-   return (struct gl_display_list *)
-      _mesa_HashLookup(ctx->Shared->DisplayList, list);
-}
-
-
-/** Is the given opcode an extension code? */
-static INLINE GLboolean
-is_ext_opcode(OpCode opcode)
-{
-   return (opcode >= OPCODE_EXT_0);
-}
-
-
-/** Destroy an extended opcode instruction */
-static GLint
-ext_opcode_destroy(struct gl_context *ctx, Node *node)
-{
-   const GLint i = node[0].opcode - OPCODE_EXT_0;
-   GLint step;
-   ctx->ListExt->Opcode[i].Destroy(ctx, &node[1]);
-   step = ctx->ListExt->Opcode[i].Size;
-   return step;
-}
-
-
-/** Execute an extended opcode instruction */
-static GLint
-ext_opcode_execute(struct gl_context *ctx, Node *node)
-{
-   const GLint i = node[0].opcode - OPCODE_EXT_0;
-   GLint step;
-   ctx->ListExt->Opcode[i].Execute(ctx, &node[1]);
-   step = ctx->ListExt->Opcode[i].Size;
-   return step;
-}
-
-
-/** Print an extended opcode instruction */
-static GLint
-ext_opcode_print(struct gl_context *ctx, Node *node)
-{
-   const GLint i = node[0].opcode - OPCODE_EXT_0;
-   GLint step;
-   ctx->ListExt->Opcode[i].Print(ctx, &node[1]);
-   step = ctx->ListExt->Opcode[i].Size;
-   return step;
-}
-
-
-/**
- * Delete the named display list, but don't remove from hash table.
- * \param dlist - display list pointer
- */
-void
-_mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist)
-{
-   Node *n, *block;
-   GLboolean done;
-
-   n = block = dlist->Head;
-
-   done = block ? GL_FALSE : GL_TRUE;
-   while (!done) {
-      const OpCode opcode = n[0].opcode;
-
-      /* check for extension opcodes first */
-      if (is_ext_opcode(opcode)) {
-         n += ext_opcode_destroy(ctx, n);
-      }
-      else {
-         switch (opcode) {
-            /* for some commands, we need to free malloc'd memory */
-         case OPCODE_MAP1:
-            free(n[6].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_MAP2:
-            free(n[10].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_DRAW_PIXELS:
-            free(n[5].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_BITMAP:
-            free(n[7].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_COLOR_TABLE:
-            free(n[6].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_COLOR_SUB_TABLE:
-            free(n[6].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_CONVOLUTION_FILTER_1D:
-            free(n[6].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_CONVOLUTION_FILTER_2D:
-            free(n[7].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_POLYGON_STIPPLE:
-            free(n[1].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_TEX_IMAGE1D:
-            free(n[8].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_TEX_IMAGE2D:
-            free(n[9].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_TEX_IMAGE3D:
-            free(n[10].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_TEX_SUB_IMAGE1D:
-            free(n[7].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_TEX_SUB_IMAGE2D:
-            free(n[9].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_TEX_SUB_IMAGE3D:
-            free(n[11].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_COMPRESSED_TEX_IMAGE_1D:
-            free(n[7].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_COMPRESSED_TEX_IMAGE_2D:
-            free(n[8].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_COMPRESSED_TEX_IMAGE_3D:
-            free(n[9].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D:
-            free(n[7].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D:
-            free(n[9].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D:
-            free(n[11].data);
-            n += InstSize[n[0].opcode];
-            break;
-#if FEATURE_NV_vertex_program
-         case OPCODE_LOAD_PROGRAM_NV:
-            free(n[4].data);      /* program string */
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_REQUEST_RESIDENT_PROGRAMS_NV:
-            free(n[2].data);      /* array of program ids */
-            n += InstSize[n[0].opcode];
-            break;
-#endif
-#if FEATURE_NV_fragment_program
-         case OPCODE_PROGRAM_NAMED_PARAMETER_NV:
-            free(n[3].data);      /* parameter name */
-            n += InstSize[n[0].opcode];
-            break;
-#endif
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-         case OPCODE_PROGRAM_STRING_ARB:
-            free(n[4].data);      /* program string */
-            n += InstSize[n[0].opcode];
-            break;
-#endif
-         case OPCODE_UNIFORM_1FV:
-         case OPCODE_UNIFORM_2FV:
-         case OPCODE_UNIFORM_3FV:
-         case OPCODE_UNIFORM_4FV:
-         case OPCODE_UNIFORM_1IV:
-         case OPCODE_UNIFORM_2IV:
-         case OPCODE_UNIFORM_3IV:
-         case OPCODE_UNIFORM_4IV:
-         case OPCODE_UNIFORM_1UIV:
-         case OPCODE_UNIFORM_2UIV:
-         case OPCODE_UNIFORM_3UIV:
-         case OPCODE_UNIFORM_4UIV:
-            free(n[3].data);
-            n += InstSize[n[0].opcode];
-            break;
-         case OPCODE_UNIFORM_MATRIX22:
-         case OPCODE_UNIFORM_MATRIX33:
-         case OPCODE_UNIFORM_MATRIX44:
-         case OPCODE_UNIFORM_MATRIX24:
-         case OPCODE_UNIFORM_MATRIX42:
-         case OPCODE_UNIFORM_MATRIX23:
-         case OPCODE_UNIFORM_MATRIX32:
-         case OPCODE_UNIFORM_MATRIX34:
-         case OPCODE_UNIFORM_MATRIX43:
-            free(n[4].data);
-            n += InstSize[n[0].opcode];
-            break;
-
-         case OPCODE_CONTINUE:
-            n = (Node *) n[1].next;
-            free(block);
-            block = n;
-            break;
-         case OPCODE_END_OF_LIST:
-            free(block);
-            done = GL_TRUE;
-            break;
-         default:
-            /* Most frequent case */
-            n += InstSize[n[0].opcode];
-            break;
-         }
-      }
-   }
-
-   free(dlist);
-}
-
-
-/**
- * Destroy a display list and remove from hash table.
- * \param list - display list number
- */
-static void
-destroy_list(struct gl_context *ctx, GLuint list)
-{
-   struct gl_display_list *dlist;
-
-   if (list == 0)
-      return;
-
-   dlist = lookup_list(ctx, list);
-   if (!dlist)
-      return;
-
-   _mesa_delete_list(ctx, dlist);
-   _mesa_HashRemove(ctx->Shared->DisplayList, list);
-}
-
-
-/*
- * Translate the nth element of list from <type> to GLint.
- */
-static GLint
-translate_id(GLsizei n, GLenum type, const GLvoid * list)
-{
-   GLbyte *bptr;
-   GLubyte *ubptr;
-   GLshort *sptr;
-   GLushort *usptr;
-   GLint *iptr;
-   GLuint *uiptr;
-   GLfloat *fptr;
-
-   switch (type) {
-   case GL_BYTE:
-      bptr = (GLbyte *) list;
-      return (GLint) bptr[n];
-   case GL_UNSIGNED_BYTE:
-      ubptr = (GLubyte *) list;
-      return (GLint) ubptr[n];
-   case GL_SHORT:
-      sptr = (GLshort *) list;
-      return (GLint) sptr[n];
-   case GL_UNSIGNED_SHORT:
-      usptr = (GLushort *) list;
-      return (GLint) usptr[n];
-   case GL_INT:
-      iptr = (GLint *) list;
-      return iptr[n];
-   case GL_UNSIGNED_INT:
-      uiptr = (GLuint *) list;
-      return (GLint) uiptr[n];
-   case GL_FLOAT:
-      fptr = (GLfloat *) list;
-      return (GLint) FLOORF(fptr[n]);
-   case GL_2_BYTES:
-      ubptr = ((GLubyte *) list) + 2 * n;
-      return (GLint) ubptr[0] * 256
-           + (GLint) ubptr[1];
-   case GL_3_BYTES:
-      ubptr = ((GLubyte *) list) + 3 * n;
-      return (GLint) ubptr[0] * 65536
-           + (GLint) ubptr[1] * 256
-           + (GLint) ubptr[2];
-   case GL_4_BYTES:
-      ubptr = ((GLubyte *) list) + 4 * n;
-      return (GLint) ubptr[0] * 16777216
-           + (GLint) ubptr[1] * 65536
-           + (GLint) ubptr[2] * 256
-           + (GLint) ubptr[3];
-   default:
-      return 0;
-   }
-}
-
-
-
-
-/**********************************************************************/
-/*****                        Public                              *****/
-/**********************************************************************/
-
-/**
- * Wrapper for _mesa_unpack_image() that handles pixel buffer objects.
- * If we run out of memory, GL_OUT_OF_MEMORY will be recorded.
- */
-static GLvoid *
-unpack_image(struct gl_context *ctx, GLuint dimensions,
-             GLsizei width, GLsizei height, GLsizei depth,
-             GLenum format, GLenum type, const GLvoid * pixels,
-             const struct gl_pixelstore_attrib *unpack)
-{
-   if (!_mesa_is_bufferobj(unpack->BufferObj)) {
-      /* no PBO */
-      GLvoid *image = _mesa_unpack_image(dimensions, width, height, depth,
-                                         format, type, pixels, unpack);
-      if (pixels && !image) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "display list construction");
-      }
-      return image;
-   }
-   else if (_mesa_validate_pbo_access(dimensions, unpack, width, height, depth,
-                                      format, type, pixels)) {
-      const GLubyte *map, *src;
-      GLvoid *image;
-
-      map = (GLubyte *)
-         ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                               GL_READ_ONLY_ARB, unpack->BufferObj);
-      if (!map) {
-         /* unable to map src buffer! */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "unable to map PBO");
-         return NULL;
-      }
-
-      src = ADD_POINTERS(map, pixels);
-      image = _mesa_unpack_image(dimensions, width, height, depth,
-                                 format, type, src, unpack);
-
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              unpack->BufferObj);
-
-      if (!image) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "display list construction");
-      }
-      return image;
-   }
-   /* bad access! */
-   return NULL;
-}
-
-
-/**
- * Allocate space for a display list instruction (opcode + payload space).
- * \param opcode  the instruction opcode (OPCODE_* value)
- * \param bytes   instruction payload size (not counting opcode)
- * \return pointer to allocated memory (the opcode space)
- */
-static Node *
-dlist_alloc(struct gl_context *ctx, OpCode opcode, GLuint bytes)
-{
-   const GLuint numNodes = 1 + (bytes + sizeof(Node) - 1) / sizeof(Node);
-   Node *n;
-
-   if (opcode < (GLuint) OPCODE_EXT_0) {
-      if (InstSize[opcode] == 0) {
-         /* save instruction size now */
-         InstSize[opcode] = numNodes;
-      }
-      else {
-         /* make sure instruction size agrees */
-         ASSERT(numNodes == InstSize[opcode]);
-      }
-   }
-
-   if (ctx->ListState.CurrentPos + numNodes + 2 > BLOCK_SIZE) {
-      /* This block is full.  Allocate a new block and chain to it */
-      Node *newblock;
-      n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos;
-      n[0].opcode = OPCODE_CONTINUE;
-      newblock = (Node *) malloc(sizeof(Node) * BLOCK_SIZE);
-      if (!newblock) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "Building display list");
-         return NULL;
-      }
-      n[1].next = (Node *) newblock;
-      ctx->ListState.CurrentBlock = newblock;
-      ctx->ListState.CurrentPos = 0;
-   }
-
-   n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos;
-   ctx->ListState.CurrentPos += numNodes;
-
-   n[0].opcode = opcode;
-
-   return n;
-}
-
-
-
-/**
- * Allocate space for a display list instruction.  Used by callers outside
- * this file for things like VBO vertex data.
- *
- * \param opcode  the instruction opcode (OPCODE_* value)
- * \param bytes   instruction size in bytes, not counting opcode.
- * \return pointer to the usable data area (not including the internal
- *         opcode).
- */
-void *
-_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint bytes)
-{
-   Node *n = dlist_alloc(ctx, (OpCode) opcode, bytes);
-   if (n)
-      return n + 1;  /* return pointer to payload area, after opcode */
-   else
-      return NULL;
-}
-
-
-/**
- * This function allows modules and drivers to get their own opcodes
- * for extending display list functionality.
- * \param ctx  the rendering context
- * \param size  number of bytes for storing the new display list command
- * \param execute  function to execute the new display list command
- * \param destroy  function to destroy the new display list command
- * \param print  function to print the new display list command
- * \return  the new opcode number or -1 if error
- */
-GLint
-_mesa_dlist_alloc_opcode(struct gl_context *ctx,
-                         GLuint size,
-                         void (*execute) (struct gl_context *, void *),
-                         void (*destroy) (struct gl_context *, void *),
-                         void (*print) (struct gl_context *, void *))
-{
-   if (ctx->ListExt->NumOpcodes < MAX_DLIST_EXT_OPCODES) {
-      const GLuint i = ctx->ListExt->NumOpcodes++;
-      ctx->ListExt->Opcode[i].Size =
-         1 + (size + sizeof(Node) - 1) / sizeof(Node);
-      ctx->ListExt->Opcode[i].Execute = execute;
-      ctx->ListExt->Opcode[i].Destroy = destroy;
-      ctx->ListExt->Opcode[i].Print = print;
-      return i + OPCODE_EXT_0;
-   }
-   return -1;
-}
-
-
-/**
- * Allocate space for a display list instruction.  The space is basically
- * an array of Nodes where node[0] holds the opcode, node[1] is the first
- * function parameter, node[2] is the second parameter, etc.
- *
- * \param opcode  one of OPCODE_x
- * \param nparams  number of function parameters
- * \return  pointer to start of instruction space
- */
-static INLINE Node *
-alloc_instruction(struct gl_context *ctx, OpCode opcode, GLuint nparams)
-{
-   return dlist_alloc(ctx, opcode, nparams * sizeof(Node));
-}
-
-
-
-/*
- * Display List compilation functions
- */
-static void GLAPIENTRY
-save_Accum(GLenum op, GLfloat value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_ACCUM, 2);
-   if (n) {
-      n[1].e = op;
-      n[2].f = value;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Accum(ctx->Exec, (op, value));
-   }
-}
-
-
-static void GLAPIENTRY
-save_AlphaFunc(GLenum func, GLclampf ref)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_ALPHA_FUNC, 2);
-   if (n) {
-      n[1].e = func;
-      n[2].f = (GLfloat) ref;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_AlphaFunc(ctx->Exec, (func, ref));
-   }
-}
-
-
-static void GLAPIENTRY
-save_BindTexture(GLenum target, GLuint texture)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BIND_TEXTURE, 2);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = texture;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BindTexture(ctx->Exec, (target, texture));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Bitmap(GLsizei width, GLsizei height,
-            GLfloat xorig, GLfloat yorig,
-            GLfloat xmove, GLfloat ymove, const GLubyte * pixels)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BITMAP, 7);
-   if (n) {
-      n[1].i = (GLint) width;
-      n[2].i = (GLint) height;
-      n[3].f = xorig;
-      n[4].f = yorig;
-      n[5].f = xmove;
-      n[6].f = ymove;
-      n[7].data = _mesa_unpack_bitmap(width, height, pixels, &ctx->Unpack);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Bitmap(ctx->Exec, (width, height,
-                              xorig, yorig, xmove, ymove, pixels));
-   }
-}
-
-
-static void GLAPIENTRY
-save_BlendEquation(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BLEND_EQUATION, 1);
-   if (n) {
-      n[1].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BlendEquation(ctx->Exec, (mode));
-   }
-}
-
-
-static void GLAPIENTRY
-save_BlendEquationSeparateEXT(GLenum modeRGB, GLenum modeA)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BLEND_EQUATION_SEPARATE, 2);
-   if (n) {
-      n[1].e = modeRGB;
-      n[2].e = modeA;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BlendEquationSeparateEXT(ctx->Exec, (modeRGB, modeA));
-   }
-}
-
-
-static void GLAPIENTRY
-save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB,
-                          GLenum sfactorA, GLenum dfactorA)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BLEND_FUNC_SEPARATE, 4);
-   if (n) {
-      n[1].e = sfactorRGB;
-      n[2].e = dfactorRGB;
-      n[3].e = sfactorA;
-      n[4].e = dfactorA;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BlendFuncSeparateEXT(ctx->Exec,
-                                (sfactorRGB, dfactorRGB, sfactorA, dfactorA));
-   }
-}
-
-
-static void GLAPIENTRY
-save_BlendFunc(GLenum srcfactor, GLenum dstfactor)
-{
-   save_BlendFuncSeparateEXT(srcfactor, dstfactor, srcfactor, dstfactor);
-}
-
-
-static void GLAPIENTRY
-save_BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BLEND_COLOR, 4);
-   if (n) {
-      n[1].f = red;
-      n[2].f = green;
-      n[3].f = blue;
-      n[4].f = alpha;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BlendColor(ctx->Exec, (red, green, blue, alpha));
-   }
-}
-
-/* GL_ARB_draw_buffers_blend */
-static void GLAPIENTRY
-save_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
-                        GLenum sfactorA, GLenum dfactorA)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BLEND_FUNC_SEPARATE_I, 5);
-   if (n) {
-      n[1].ui = buf;
-      n[2].e = sfactorRGB;
-      n[3].e = dfactorRGB;
-      n[4].e = sfactorA;
-      n[5].e = dfactorA;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BlendFuncSeparateiARB(ctx->Exec, (buf, sfactorRGB, dfactorRGB,
-                                             sfactorA, dfactorA));
-   }
-}
-
-/* GL_ARB_draw_buffers_blend */
-static void GLAPIENTRY
-save_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BLEND_FUNC_SEPARATE_I, 3);
-   if (n) {
-      n[1].ui = buf;
-      n[2].e = sfactor;
-      n[3].e = dfactor;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BlendFunciARB(ctx->Exec, (buf, sfactor, dfactor));
-   }
-}
-
-/* GL_ARB_draw_buffers_blend */
-static void GLAPIENTRY
-save_BlendEquationi(GLuint buf, GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BLEND_EQUATION_I, 2);
-   if (n) {
-      n[1].ui = buf;
-      n[2].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BlendEquationiARB(ctx->Exec, (buf, mode));
-   }
-}
-
-/* GL_ARB_draw_buffers_blend */
-static void GLAPIENTRY
-save_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BLEND_EQUATION_SEPARATE_I, 3);
-   if (n) {
-      n[1].ui = buf;
-      n[2].e = modeRGB;
-      n[3].e = modeA;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BlendEquationSeparateiARB(ctx->Exec, (buf, modeRGB, modeA));
-   }
-}
-
-
-static void invalidate_saved_current_state( struct gl_context *ctx )
-{
-   GLint i;
-
-   for (i = 0; i < VERT_ATTRIB_MAX; i++)
-      ctx->ListState.ActiveAttribSize[i] = 0;
-
-   for (i = 0; i < MAT_ATTRIB_MAX; i++)
-      ctx->ListState.ActiveMaterialSize[i] = 0;
-
-   memset(&ctx->ListState.Current, 0, sizeof ctx->ListState.Current);
-
-   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
-}
-
-static void GLAPIENTRY
-save_CallList(GLuint list)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_CALL_LIST, 1);
-   if (n) {
-      n[1].ui = list;
-   }
-
-   /* After this, we don't know what state we're in.  Invalidate all
-    * cached information previously gathered:
-    */
-   invalidate_saved_current_state( ctx );
-
-   if (ctx->ExecuteFlag) {
-      _mesa_CallList(list);
-   }
-}
-
-
-static void GLAPIENTRY
-save_CallLists(GLsizei num, GLenum type, const GLvoid * lists)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-   GLboolean typeErrorFlag;
-
-   SAVE_FLUSH_VERTICES(ctx);
-
-   switch (type) {
-   case GL_BYTE:
-   case GL_UNSIGNED_BYTE:
-   case GL_SHORT:
-   case GL_UNSIGNED_SHORT:
-   case GL_INT:
-   case GL_UNSIGNED_INT:
-   case GL_FLOAT:
-   case GL_2_BYTES:
-   case GL_3_BYTES:
-   case GL_4_BYTES:
-      typeErrorFlag = GL_FALSE;
-      break;
-   default:
-      typeErrorFlag = GL_TRUE;
-   }
-
-   for (i = 0; i < num; i++) {
-      GLint list = translate_id(i, type, lists);
-      Node *n = alloc_instruction(ctx, OPCODE_CALL_LIST_OFFSET, 2);
-      if (n) {
-         n[1].i = list;
-         n[2].b = typeErrorFlag;
-      }
-   }
-
-   /* After this, we don't know what state we're in.  Invalidate all
-    * cached information previously gathered:
-    */
-   invalidate_saved_current_state( ctx );
-
-   if (ctx->ExecuteFlag) {
-      CALL_CallLists(ctx->Exec, (num, type, lists));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Clear(GLbitfield mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEAR, 1);
-   if (n) {
-      n[1].bf = mask;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Clear(ctx->Exec, (mask));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEAR_BUFFER_IV, 6);
-   if (n) {
-      n[1].e = buffer;
-      n[2].i = drawbuffer;
-      n[3].i = value[0];
-      if (buffer == GL_COLOR) {
-         n[4].i = value[1];
-         n[5].i = value[2];
-         n[6].i = value[3];
-      }
-      else {
-         n[4].i = 0;
-         n[5].i = 0;
-         n[6].i = 0;
-      }
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_ClearBufferiv(ctx->Exec, (buffer, drawbuffer, value));*/
-   }
-}
-
-
-static void GLAPIENTRY
-save_ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEAR_BUFFER_UIV, 6);
-   if (n) {
-      n[1].e = buffer;
-      n[2].i = drawbuffer;
-      n[3].ui = value[0];
-      if (buffer == GL_COLOR) {
-         n[4].ui = value[1];
-         n[5].ui = value[2];
-         n[6].ui = value[3];
-      }
-      else {
-         n[4].ui = 0;
-         n[5].ui = 0;
-         n[6].ui = 0;
-      }
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_ClearBufferuiv(ctx->Exec, (buffer, drawbuffer, value));*/
-   }
-}
-
-
-static void GLAPIENTRY
-save_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEAR_BUFFER_FV, 6);
-   if (n) {
-      n[1].e = buffer;
-      n[2].i = drawbuffer;
-      n[3].f = value[0];
-      if (buffer == GL_COLOR) {
-         n[4].f = value[1];
-         n[5].f = value[2];
-         n[6].f = value[3];
-      }
-      else {
-         n[4].f = 0.0F;
-         n[5].f = 0.0F;
-         n[6].f = 0.0F;
-      }
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_ClearBufferuiv(ctx->Exec, (buffer, drawbuffer, value));*/
-   }
-}
-
-
-static void GLAPIENTRY
-save_ClearBufferfi(GLenum buffer, GLint drawbuffer,
-                   GLfloat depth, GLint stencil)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEAR_BUFFER_FI, 4);
-   if (n) {
-      n[1].e = buffer;
-      n[2].i = drawbuffer;
-      n[3].f = depth;
-      n[4].i = stencil;
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_ClearBufferfi(ctx->Exec, (buffer, drawbuffer, depth, stencil));*/
-   }
-}
-
-
-static void GLAPIENTRY
-save_ClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEAR_ACCUM, 4);
-   if (n) {
-      n[1].f = red;
-      n[2].f = green;
-      n[3].f = blue;
-      n[4].f = alpha;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ClearAccum(ctx->Exec, (red, green, blue, alpha));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEAR_COLOR, 4);
-   if (n) {
-      n[1].f = red;
-      n[2].f = green;
-      n[3].f = blue;
-      n[4].f = alpha;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ClearColor(ctx->Exec, (red, green, blue, alpha));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ClearDepth(GLclampd depth)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEAR_DEPTH, 1);
-   if (n) {
-      n[1].f = (GLfloat) depth;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ClearDepth(ctx->Exec, (depth));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ClearIndex(GLfloat c)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEAR_INDEX, 1);
-   if (n) {
-      n[1].f = c;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ClearIndex(ctx->Exec, (c));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ClearStencil(GLint s)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEAR_STENCIL, 1);
-   if (n) {
-      n[1].i = s;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ClearStencil(ctx->Exec, (s));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ClipPlane(GLenum plane, const GLdouble * equ)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLIP_PLANE, 5);
-   if (n) {
-      n[1].e = plane;
-      n[2].f = (GLfloat) equ[0];
-      n[3].f = (GLfloat) equ[1];
-      n[4].f = (GLfloat) equ[2];
-      n[5].f = (GLfloat) equ[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ClipPlane(ctx->Exec, (plane, equ));
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_ColorMask(GLboolean red, GLboolean green,
-               GLboolean blue, GLboolean alpha)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_COLOR_MASK, 4);
-   if (n) {
-      n[1].b = red;
-      n[2].b = green;
-      n[3].b = blue;
-      n[4].b = alpha;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ColorMask(ctx->Exec, (red, green, blue, alpha));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ColorMaskIndexed(GLuint buf, GLboolean red, GLboolean green,
-                      GLboolean blue, GLboolean alpha)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_COLOR_MASK_INDEXED, 5);
-   if (n) {
-      n[1].ui = buf;
-      n[2].b = red;
-      n[3].b = green;
-      n[4].b = blue;
-      n[5].b = alpha;
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_ColorMaskIndexedEXT(ctx->Exec, (buf, red, green, blue, alpha));*/
-   }
-}
-
-
-static void GLAPIENTRY
-save_ColorMaterial(GLenum face, GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_COLOR_MATERIAL, 2);
-   if (n) {
-      n[1].e = face;
-      n[2].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ColorMaterial(ctx->Exec, (face, mode));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ColorTable(GLenum target, GLenum internalFormat,
-                GLsizei width, GLenum format, GLenum type,
-                const GLvoid * table)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (_mesa_is_proxy_texture(target)) {
-      /* execute immediately */
-      CALL_ColorTable(ctx->Exec, (target, internalFormat, width,
-                                  format, type, table));
-   }
-   else {
-      Node *n;
-      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-      n = alloc_instruction(ctx, OPCODE_COLOR_TABLE, 6);
-      if (n) {
-         n[1].e = target;
-         n[2].e = internalFormat;
-         n[3].i = width;
-         n[4].e = format;
-         n[5].e = type;
-         n[6].data = unpack_image(ctx, 1, width, 1, 1, format, type, table,
-                                  &ctx->Unpack);
-      }
-      if (ctx->ExecuteFlag) {
-         CALL_ColorTable(ctx->Exec, (target, internalFormat, width,
-                                     format, type, table));
-      }
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_ColorTableParameterfv(GLenum target, GLenum pname,
-                           const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_COLOR_TABLE_PARAMETER_FV, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].e = pname;
-      n[3].f = params[0];
-      if (pname == GL_COLOR_TABLE_SGI ||
-          pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
-          pname == GL_TEXTURE_COLOR_TABLE_SGI) {
-         n[4].f = params[1];
-         n[5].f = params[2];
-         n[6].f = params[3];
-      }
-   }
-
-   if (ctx->ExecuteFlag) {
-      CALL_ColorTableParameterfv(ctx->Exec, (target, pname, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_COLOR_TABLE_PARAMETER_IV, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].e = pname;
-      n[3].i = params[0];
-      if (pname == GL_COLOR_TABLE_SGI ||
-          pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
-          pname == GL_TEXTURE_COLOR_TABLE_SGI) {
-         n[4].i = params[1];
-         n[5].i = params[2];
-         n[6].i = params[3];
-      }
-   }
-
-   if (ctx->ExecuteFlag) {
-      CALL_ColorTableParameteriv(ctx->Exec, (target, pname, params));
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_ColorSubTable(GLenum target, GLsizei start, GLsizei count,
-                   GLenum format, GLenum type, const GLvoid * table)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_COLOR_SUB_TABLE, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].i = start;
-      n[3].i = count;
-      n[4].e = format;
-      n[5].e = type;
-      n[6].data = unpack_image(ctx, 1, count, 1, 1, format, type, table,
-                               &ctx->Unpack);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ColorSubTable(ctx->Exec,
-                         (target, start, count, format, type, table));
-   }
-}
-
-
-static void GLAPIENTRY
-save_CopyColorSubTable(GLenum target, GLsizei start,
-                       GLint x, GLint y, GLsizei width)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_COPY_COLOR_SUB_TABLE, 5);
-   if (n) {
-      n[1].e = target;
-      n[2].i = start;
-      n[3].i = x;
-      n[4].i = y;
-      n[5].i = width;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CopyColorSubTable(ctx->Exec, (target, start, x, y, width));
-   }
-}
-
-
-static void GLAPIENTRY
-save_CopyColorTable(GLenum target, GLenum internalformat,
-                    GLint x, GLint y, GLsizei width)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_COPY_COLOR_TABLE, 5);
-   if (n) {
-      n[1].e = target;
-      n[2].e = internalformat;
-      n[3].i = x;
-      n[4].i = y;
-      n[5].i = width;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CopyColorTable(ctx->Exec, (target, internalformat, x, y, width));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width,
-                         GLenum format, GLenum type, const GLvoid * filter)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_FILTER_1D, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].e = internalFormat;
-      n[3].i = width;
-      n[4].e = format;
-      n[5].e = type;
-      n[6].data = unpack_image(ctx, 1, width, 1, 1, format, type, filter,
-                               &ctx->Unpack);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ConvolutionFilter1D(ctx->Exec, (target, internalFormat, width,
-                                           format, type, filter));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ConvolutionFilter2D(GLenum target, GLenum internalFormat,
-                         GLsizei width, GLsizei height, GLenum format,
-                         GLenum type, const GLvoid * filter)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_FILTER_2D, 7);
-   if (n) {
-      n[1].e = target;
-      n[2].e = internalFormat;
-      n[3].i = width;
-      n[4].i = height;
-      n[5].e = format;
-      n[6].e = type;
-      n[7].data = unpack_image(ctx, 2, width, height, 1, format, type, filter,
-                               &ctx->Unpack);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ConvolutionFilter2D(ctx->Exec,
-                               (target, internalFormat, width, height, format,
-                                type, filter));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_PARAMETER_I, 3);
-   if (n) {
-      n[1].e = target;
-      n[2].e = pname;
-      n[3].i = param;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ConvolutionParameteri(ctx->Exec, (target, pname, param));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_PARAMETER_IV, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].e = pname;
-      n[3].i = params[0];
-      if (pname == GL_CONVOLUTION_BORDER_COLOR ||
-          pname == GL_CONVOLUTION_FILTER_SCALE ||
-          pname == GL_CONVOLUTION_FILTER_BIAS) {
-         n[4].i = params[1];
-         n[5].i = params[2];
-         n[6].i = params[3];
-      }
-      else {
-         n[4].i = n[5].i = n[6].i = 0;
-      }
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ConvolutionParameteriv(ctx->Exec, (target, pname, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_PARAMETER_F, 3);
-   if (n) {
-      n[1].e = target;
-      n[2].e = pname;
-      n[3].f = param;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ConvolutionParameterf(ctx->Exec, (target, pname, param));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ConvolutionParameterfv(GLenum target, GLenum pname,
-                            const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_PARAMETER_FV, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].e = pname;
-      n[3].f = params[0];
-      if (pname == GL_CONVOLUTION_BORDER_COLOR ||
-          pname == GL_CONVOLUTION_FILTER_SCALE ||
-          pname == GL_CONVOLUTION_FILTER_BIAS) {
-         n[4].f = params[1];
-         n[5].f = params[2];
-         n[6].f = params[3];
-      }
-      else {
-         n[4].f = n[5].f = n[6].f = 0.0F;
-      }
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ConvolutionParameterfv(ctx->Exec, (target, pname, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_CopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_COPY_PIXELS, 5);
-   if (n) {
-      n[1].i = x;
-      n[2].i = y;
-      n[3].i = (GLint) width;
-      n[4].i = (GLint) height;
-      n[5].e = type;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CopyPixels(ctx->Exec, (x, y, width, height, type));
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_CopyTexImage1D(GLenum target, GLint level, GLenum internalformat,
-                    GLint x, GLint y, GLsizei width, GLint border)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_COPY_TEX_IMAGE1D, 7);
-   if (n) {
-      n[1].e = target;
-      n[2].i = level;
-      n[3].e = internalformat;
-      n[4].i = x;
-      n[5].i = y;
-      n[6].i = width;
-      n[7].i = border;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CopyTexImage1D(ctx->Exec, (target, level, internalformat,
-                                      x, y, width, border));
-   }
-}
-
-
-static void GLAPIENTRY
-save_CopyTexImage2D(GLenum target, GLint level,
-                    GLenum internalformat,
-                    GLint x, GLint y, GLsizei width,
-                    GLsizei height, GLint border)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_COPY_TEX_IMAGE2D, 8);
-   if (n) {
-      n[1].e = target;
-      n[2].i = level;
-      n[3].e = internalformat;
-      n[4].i = x;
-      n[5].i = y;
-      n[6].i = width;
-      n[7].i = height;
-      n[8].i = border;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CopyTexImage2D(ctx->Exec, (target, level, internalformat,
-                                      x, y, width, height, border));
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_CopyTexSubImage1D(GLenum target, GLint level,
-                       GLint xoffset, GLint x, GLint y, GLsizei width)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_COPY_TEX_SUB_IMAGE1D, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].i = level;
-      n[3].i = xoffset;
-      n[4].i = x;
-      n[5].i = y;
-      n[6].i = width;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CopyTexSubImage1D(ctx->Exec,
-                             (target, level, xoffset, x, y, width));
-   }
-}
-
-
-static void GLAPIENTRY
-save_CopyTexSubImage2D(GLenum target, GLint level,
-                       GLint xoffset, GLint yoffset,
-                       GLint x, GLint y, GLsizei width, GLint height)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_COPY_TEX_SUB_IMAGE2D, 8);
-   if (n) {
-      n[1].e = target;
-      n[2].i = level;
-      n[3].i = xoffset;
-      n[4].i = yoffset;
-      n[5].i = x;
-      n[6].i = y;
-      n[7].i = width;
-      n[8].i = height;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CopyTexSubImage2D(ctx->Exec, (target, level, xoffset, yoffset,
-                                         x, y, width, height));
-   }
-}
-
-
-static void GLAPIENTRY
-save_CopyTexSubImage3D(GLenum target, GLint level,
-                       GLint xoffset, GLint yoffset, GLint zoffset,
-                       GLint x, GLint y, GLsizei width, GLint height)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_COPY_TEX_SUB_IMAGE3D, 9);
-   if (n) {
-      n[1].e = target;
-      n[2].i = level;
-      n[3].i = xoffset;
-      n[4].i = yoffset;
-      n[5].i = zoffset;
-      n[6].i = x;
-      n[7].i = y;
-      n[8].i = width;
-      n[9].i = height;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CopyTexSubImage3D(ctx->Exec, (target, level,
-                                         xoffset, yoffset, zoffset,
-                                         x, y, width, height));
-   }
-}
-
-
-static void GLAPIENTRY
-save_CullFace(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CULL_FACE, 1);
-   if (n) {
-      n[1].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CullFace(ctx->Exec, (mode));
-   }
-}
-
-
-static void GLAPIENTRY
-save_DepthFunc(GLenum func)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_DEPTH_FUNC, 1);
-   if (n) {
-      n[1].e = func;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_DepthFunc(ctx->Exec, (func));
-   }
-}
-
-
-static void GLAPIENTRY
-save_DepthMask(GLboolean mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_DEPTH_MASK, 1);
-   if (n) {
-      n[1].b = mask;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_DepthMask(ctx->Exec, (mask));
-   }
-}
-
-
-static void GLAPIENTRY
-save_DepthRange(GLclampd nearval, GLclampd farval)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_DEPTH_RANGE, 2);
-   if (n) {
-      n[1].f = (GLfloat) nearval;
-      n[2].f = (GLfloat) farval;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_DepthRange(ctx->Exec, (nearval, farval));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Disable(GLenum cap)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_DISABLE, 1);
-   if (n) {
-      n[1].e = cap;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Disable(ctx->Exec, (cap));
-   }
-}
-
-
-static void GLAPIENTRY
-save_DisableIndexed(GLuint index, GLenum cap)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_DISABLE_INDEXED, 2);
-   if (n) {
-      n[1].ui = index;
-      n[2].e = cap;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_DisableIndexedEXT(ctx->Exec, (index, cap));
-   }
-}
-
-
-static void GLAPIENTRY
-save_DrawBuffer(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_DRAW_BUFFER, 1);
-   if (n) {
-      n[1].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_DrawBuffer(ctx->Exec, (mode));
-   }
-}
-
-
-static void GLAPIENTRY
-save_DrawPixels(GLsizei width, GLsizei height,
-                GLenum format, GLenum type, const GLvoid * pixels)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_DRAW_PIXELS, 5);
-   if (n) {
-      n[1].i = width;
-      n[2].i = height;
-      n[3].e = format;
-      n[4].e = type;
-      n[5].data = unpack_image(ctx, 2, width, height, 1, format, type,
-                               pixels, &ctx->Unpack);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_DrawPixels(ctx->Exec, (width, height, format, type, pixels));
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_Enable(GLenum cap)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_ENABLE, 1);
-   if (n) {
-      n[1].e = cap;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Enable(ctx->Exec, (cap));
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_EnableIndexed(GLuint index, GLenum cap)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_ENABLE_INDEXED, 2);
-   if (n) {
-      n[1].ui = index;
-      n[2].e = cap;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_EnableIndexedEXT(ctx->Exec, (index, cap));
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_EvalMesh1(GLenum mode, GLint i1, GLint i2)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_EVALMESH1, 3);
-   if (n) {
-      n[1].e = mode;
-      n[2].i = i1;
-      n[3].i = i2;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_EvalMesh1(ctx->Exec, (mode, i1, i2));
-   }
-}
-
-
-static void GLAPIENTRY
-save_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_EVALMESH2, 5);
-   if (n) {
-      n[1].e = mode;
-      n[2].i = i1;
-      n[3].i = i2;
-      n[4].i = j1;
-      n[5].i = j2;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_EvalMesh2(ctx->Exec, (mode, i1, i2, j1, j2));
-   }
-}
-
-
-
-
-static void GLAPIENTRY
-save_Fogfv(GLenum pname, const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_FOG, 5);
-   if (n) {
-      n[1].e = pname;
-      n[2].f = params[0];
-      n[3].f = params[1];
-      n[4].f = params[2];
-      n[5].f = params[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Fogfv(ctx->Exec, (pname, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Fogf(GLenum pname, GLfloat param)
-{
-   GLfloat parray[4];
-   parray[0] = param;
-   parray[1] = parray[2] = parray[3] = 0.0F;
-   save_Fogfv(pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_Fogiv(GLenum pname, const GLint *params)
-{
-   GLfloat p[4];
-   switch (pname) {
-   case GL_FOG_MODE:
-   case GL_FOG_DENSITY:
-   case GL_FOG_START:
-   case GL_FOG_END:
-   case GL_FOG_INDEX:
-      p[0] = (GLfloat) *params;
-      p[1] = 0.0f;
-      p[2] = 0.0f;
-      p[3] = 0.0f;
-      break;
-   case GL_FOG_COLOR:
-      p[0] = INT_TO_FLOAT(params[0]);
-      p[1] = INT_TO_FLOAT(params[1]);
-      p[2] = INT_TO_FLOAT(params[2]);
-      p[3] = INT_TO_FLOAT(params[3]);
-      break;
-   default:
-      /* Error will be caught later in gl_Fogfv */
-      ASSIGN_4V(p, 0.0F, 0.0F, 0.0F, 0.0F);
-   }
-   save_Fogfv(pname, p);
-}
-
-
-static void GLAPIENTRY
-save_Fogi(GLenum pname, GLint param)
-{
-   GLint parray[4];
-   parray[0] = param;
-   parray[1] = parray[2] = parray[3] = 0;
-   save_Fogiv(pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_FrontFace(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_FRONT_FACE, 1);
-   if (n) {
-      n[1].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_FrontFace(ctx->Exec, (mode));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Frustum(GLdouble left, GLdouble right,
-             GLdouble bottom, GLdouble top, GLdouble nearval, GLdouble farval)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_FRUSTUM, 6);
-   if (n) {
-      n[1].f = (GLfloat) left;
-      n[2].f = (GLfloat) right;
-      n[3].f = (GLfloat) bottom;
-      n[4].f = (GLfloat) top;
-      n[5].f = (GLfloat) nearval;
-      n[6].f = (GLfloat) farval;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Frustum(ctx->Exec, (left, right, bottom, top, nearval, farval));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Hint(GLenum target, GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_HINT, 2);
-   if (n) {
-      n[1].e = target;
-      n[2].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Hint(ctx->Exec, (target, mode));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Histogram(GLenum target, GLsizei width, GLenum internalFormat,
-               GLboolean sink)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_HISTOGRAM, 4);
-   if (n) {
-      n[1].e = target;
-      n[2].i = width;
-      n[3].e = internalFormat;
-      n[4].b = sink;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Histogram(ctx->Exec, (target, width, internalFormat, sink));
-   }
-}
-
-
-static void GLAPIENTRY
-save_IndexMask(GLuint mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_INDEX_MASK, 1);
-   if (n) {
-      n[1].ui = mask;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_IndexMask(ctx->Exec, (mask));
-   }
-}
-
-
-static void GLAPIENTRY
-save_InitNames(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   (void) alloc_instruction(ctx, OPCODE_INIT_NAMES, 0);
-   if (ctx->ExecuteFlag) {
-      CALL_InitNames(ctx->Exec, ());
-   }
-}
-
-
-static void GLAPIENTRY
-save_Lightfv(GLenum light, GLenum pname, const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_LIGHT, 6);
-   if (n) {
-      GLint i, nParams;
-      n[1].e = light;
-      n[2].e = pname;
-      switch (pname) {
-      case GL_AMBIENT:
-         nParams = 4;
-         break;
-      case GL_DIFFUSE:
-         nParams = 4;
-         break;
-      case GL_SPECULAR:
-         nParams = 4;
-         break;
-      case GL_POSITION:
-         nParams = 4;
-         break;
-      case GL_SPOT_DIRECTION:
-         nParams = 3;
-         break;
-      case GL_SPOT_EXPONENT:
-         nParams = 1;
-         break;
-      case GL_SPOT_CUTOFF:
-         nParams = 1;
-         break;
-      case GL_CONSTANT_ATTENUATION:
-         nParams = 1;
-         break;
-      case GL_LINEAR_ATTENUATION:
-         nParams = 1;
-         break;
-      case GL_QUADRATIC_ATTENUATION:
-         nParams = 1;
-         break;
-      default:
-         nParams = 0;
-      }
-      for (i = 0; i < nParams; i++) {
-         n[3 + i].f = params[i];
-      }
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Lightfv(ctx->Exec, (light, pname, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Lightf(GLenum light, GLenum pname, GLfloat param)
-{
-   GLfloat parray[4];
-   parray[0] = param;
-   parray[1] = parray[2] = parray[3] = 0.0F;
-   save_Lightfv(light, pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_Lightiv(GLenum light, GLenum pname, const GLint *params)
-{
-   GLfloat fparam[4];
-   switch (pname) {
-   case GL_AMBIENT:
-   case GL_DIFFUSE:
-   case GL_SPECULAR:
-      fparam[0] = INT_TO_FLOAT(params[0]);
-      fparam[1] = INT_TO_FLOAT(params[1]);
-      fparam[2] = INT_TO_FLOAT(params[2]);
-      fparam[3] = INT_TO_FLOAT(params[3]);
-      break;
-   case GL_POSITION:
-      fparam[0] = (GLfloat) params[0];
-      fparam[1] = (GLfloat) params[1];
-      fparam[2] = (GLfloat) params[2];
-      fparam[3] = (GLfloat) params[3];
-      break;
-   case GL_SPOT_DIRECTION:
-      fparam[0] = (GLfloat) params[0];
-      fparam[1] = (GLfloat) params[1];
-      fparam[2] = (GLfloat) params[2];
-      break;
-   case GL_SPOT_EXPONENT:
-   case GL_SPOT_CUTOFF:
-   case GL_CONSTANT_ATTENUATION:
-   case GL_LINEAR_ATTENUATION:
-   case GL_QUADRATIC_ATTENUATION:
-      fparam[0] = (GLfloat) params[0];
-      break;
-   default:
-      /* error will be caught later in gl_Lightfv */
-      ;
-   }
-   save_Lightfv(light, pname, fparam);
-}
-
-
-static void GLAPIENTRY
-save_Lighti(GLenum light, GLenum pname, GLint param)
-{
-   GLint parray[4];
-   parray[0] = param;
-   parray[1] = parray[2] = parray[3] = 0;
-   save_Lightiv(light, pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_LightModelfv(GLenum pname, const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_LIGHT_MODEL, 5);
-   if (n) {
-      n[1].e = pname;
-      n[2].f = params[0];
-      n[3].f = params[1];
-      n[4].f = params[2];
-      n[5].f = params[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_LightModelfv(ctx->Exec, (pname, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_LightModelf(GLenum pname, GLfloat param)
-{
-   GLfloat parray[4];
-   parray[0] = param;
-   parray[1] = parray[2] = parray[3] = 0.0F;
-   save_LightModelfv(pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_LightModeliv(GLenum pname, const GLint *params)
-{
-   GLfloat fparam[4];
-   switch (pname) {
-   case GL_LIGHT_MODEL_AMBIENT:
-      fparam[0] = INT_TO_FLOAT(params[0]);
-      fparam[1] = INT_TO_FLOAT(params[1]);
-      fparam[2] = INT_TO_FLOAT(params[2]);
-      fparam[3] = INT_TO_FLOAT(params[3]);
-      break;
-   case GL_LIGHT_MODEL_LOCAL_VIEWER:
-   case GL_LIGHT_MODEL_TWO_SIDE:
-   case GL_LIGHT_MODEL_COLOR_CONTROL:
-      fparam[0] = (GLfloat) params[0];
-      fparam[1] = 0.0F;
-      fparam[2] = 0.0F;
-      fparam[3] = 0.0F;
-      break;
-   default:
-      /* Error will be caught later in gl_LightModelfv */
-      ASSIGN_4V(fparam, 0.0F, 0.0F, 0.0F, 0.0F);
-   }
-   save_LightModelfv(pname, fparam);
-}
-
-
-static void GLAPIENTRY
-save_LightModeli(GLenum pname, GLint param)
-{
-   GLint parray[4];
-   parray[0] = param;
-   parray[1] = parray[2] = parray[3] = 0;
-   save_LightModeliv(pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_LineStipple(GLint factor, GLushort pattern)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_LINE_STIPPLE, 2);
-   if (n) {
-      n[1].i = factor;
-      n[2].us = pattern;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_LineStipple(ctx->Exec, (factor, pattern));
-   }
-}
-
-
-static void GLAPIENTRY
-save_LineWidth(GLfloat width)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_LINE_WIDTH, 1);
-   if (n) {
-      n[1].f = width;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_LineWidth(ctx->Exec, (width));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ListBase(GLuint base)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_LIST_BASE, 1);
-   if (n) {
-      n[1].ui = base;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ListBase(ctx->Exec, (base));
-   }
-}
-
-
-static void GLAPIENTRY
-save_LoadIdentity(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   (void) alloc_instruction(ctx, OPCODE_LOAD_IDENTITY, 0);
-   if (ctx->ExecuteFlag) {
-      CALL_LoadIdentity(ctx->Exec, ());
-   }
-}
-
-
-static void GLAPIENTRY
-save_LoadMatrixf(const GLfloat * m)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_LOAD_MATRIX, 16);
-   if (n) {
-      GLuint i;
-      for (i = 0; i < 16; i++) {
-         n[1 + i].f = m[i];
-      }
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_LoadMatrixf(ctx->Exec, (m));
-   }
-}
-
-
-static void GLAPIENTRY
-save_LoadMatrixd(const GLdouble * m)
-{
-   GLfloat f[16];
-   GLint i;
-   for (i = 0; i < 16; i++) {
-      f[i] = (GLfloat) m[i];
-   }
-   save_LoadMatrixf(f);
-}
-
-
-static void GLAPIENTRY
-save_LoadName(GLuint name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_LOAD_NAME, 1);
-   if (n) {
-      n[1].ui = name;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_LoadName(ctx->Exec, (name));
-   }
-}
-
-
-static void GLAPIENTRY
-save_LogicOp(GLenum opcode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_LOGIC_OP, 1);
-   if (n) {
-      n[1].e = opcode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_LogicOp(ctx->Exec, (opcode));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Map1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride,
-           GLint order, const GLdouble * points)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_MAP1, 6);
-   if (n) {
-      GLfloat *pnts = _mesa_copy_map_points1d(target, stride, order, points);
-      n[1].e = target;
-      n[2].f = (GLfloat) u1;
-      n[3].f = (GLfloat) u2;
-      n[4].i = _mesa_evaluator_components(target);      /* stride */
-      n[5].i = order;
-      n[6].data = (void *) pnts;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Map1d(ctx->Exec, (target, u1, u2, stride, order, points));
-   }
-}
-
-static void GLAPIENTRY
-save_Map1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride,
-           GLint order, const GLfloat * points)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_MAP1, 6);
-   if (n) {
-      GLfloat *pnts = _mesa_copy_map_points1f(target, stride, order, points);
-      n[1].e = target;
-      n[2].f = u1;
-      n[3].f = u2;
-      n[4].i = _mesa_evaluator_components(target);      /* stride */
-      n[5].i = order;
-      n[6].data = (void *) pnts;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Map1f(ctx->Exec, (target, u1, u2, stride, order, points));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Map2d(GLenum target,
-           GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
-           GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
-           const GLdouble * points)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_MAP2, 10);
-   if (n) {
-      GLfloat *pnts = _mesa_copy_map_points2d(target, ustride, uorder,
-                                              vstride, vorder, points);
-      n[1].e = target;
-      n[2].f = (GLfloat) u1;
-      n[3].f = (GLfloat) u2;
-      n[4].f = (GLfloat) v1;
-      n[5].f = (GLfloat) v2;
-      /* XXX verify these strides are correct */
-      n[6].i = _mesa_evaluator_components(target) * vorder;     /*ustride */
-      n[7].i = _mesa_evaluator_components(target);      /*vstride */
-      n[8].i = uorder;
-      n[9].i = vorder;
-      n[10].data = (void *) pnts;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Map2d(ctx->Exec, (target,
-                             u1, u2, ustride, uorder,
-                             v1, v2, vstride, vorder, points));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Map2f(GLenum target,
-           GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
-           GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
-           const GLfloat * points)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_MAP2, 10);
-   if (n) {
-      GLfloat *pnts = _mesa_copy_map_points2f(target, ustride, uorder,
-                                              vstride, vorder, points);
-      n[1].e = target;
-      n[2].f = u1;
-      n[3].f = u2;
-      n[4].f = v1;
-      n[5].f = v2;
-      /* XXX verify these strides are correct */
-      n[6].i = _mesa_evaluator_components(target) * vorder;     /*ustride */
-      n[7].i = _mesa_evaluator_components(target);      /*vstride */
-      n[8].i = uorder;
-      n[9].i = vorder;
-      n[10].data = (void *) pnts;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Map2f(ctx->Exec, (target, u1, u2, ustride, uorder,
-                             v1, v2, vstride, vorder, points));
-   }
-}
-
-
-static void GLAPIENTRY
-save_MapGrid1f(GLint un, GLfloat u1, GLfloat u2)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_MAPGRID1, 3);
-   if (n) {
-      n[1].i = un;
-      n[2].f = u1;
-      n[3].f = u2;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_MapGrid1f(ctx->Exec, (un, u1, u2));
-   }
-}
-
-
-static void GLAPIENTRY
-save_MapGrid1d(GLint un, GLdouble u1, GLdouble u2)
-{
-   save_MapGrid1f(un, (GLfloat) u1, (GLfloat) u2);
-}
-
-
-static void GLAPIENTRY
-save_MapGrid2f(GLint un, GLfloat u1, GLfloat u2,
-               GLint vn, GLfloat v1, GLfloat v2)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_MAPGRID2, 6);
-   if (n) {
-      n[1].i = un;
-      n[2].f = u1;
-      n[3].f = u2;
-      n[4].i = vn;
-      n[5].f = v1;
-      n[6].f = v2;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_MapGrid2f(ctx->Exec, (un, u1, u2, vn, v1, v2));
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_MapGrid2d(GLint un, GLdouble u1, GLdouble u2,
-               GLint vn, GLdouble v1, GLdouble v2)
-{
-   save_MapGrid2f(un, (GLfloat) u1, (GLfloat) u2,
-                  vn, (GLfloat) v1, (GLfloat) v2);
-}
-
-
-static void GLAPIENTRY
-save_MatrixMode(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_MATRIX_MODE, 1);
-   if (n) {
-      n[1].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_MatrixMode(ctx->Exec, (mode));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_MIN_MAX, 3);
-   if (n) {
-      n[1].e = target;
-      n[2].e = internalFormat;
-      n[3].b = sink;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Minmax(ctx->Exec, (target, internalFormat, sink));
-   }
-}
-
-
-static void GLAPIENTRY
-save_MultMatrixf(const GLfloat * m)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_MULT_MATRIX, 16);
-   if (n) {
-      GLuint i;
-      for (i = 0; i < 16; i++) {
-         n[1 + i].f = m[i];
-      }
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_MultMatrixf(ctx->Exec, (m));
-   }
-}
-
-
-static void GLAPIENTRY
-save_MultMatrixd(const GLdouble * m)
-{
-   GLfloat f[16];
-   GLint i;
-   for (i = 0; i < 16; i++) {
-      f[i] = (GLfloat) m[i];
-   }
-   save_MultMatrixf(f);
-}
-
-
-static void GLAPIENTRY
-save_NewList(GLuint name, GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   /* It's an error to call this function while building a display list */
-   _mesa_error(ctx, GL_INVALID_OPERATION, "glNewList");
-   (void) name;
-   (void) mode;
-}
-
-
-
-static void GLAPIENTRY
-save_Ortho(GLdouble left, GLdouble right,
-           GLdouble bottom, GLdouble top, GLdouble nearval, GLdouble farval)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_ORTHO, 6);
-   if (n) {
-      n[1].f = (GLfloat) left;
-      n[2].f = (GLfloat) right;
-      n[3].f = (GLfloat) bottom;
-      n[4].f = (GLfloat) top;
-      n[5].f = (GLfloat) nearval;
-      n[6].f = (GLfloat) farval;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Ortho(ctx->Exec, (left, right, bottom, top, nearval, farval));
-   }
-}
-
-
-static void GLAPIENTRY
-save_PixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PIXEL_MAP, 3);
-   if (n) {
-      n[1].e = map;
-      n[2].i = mapsize;
-      n[3].data = (void *) malloc(mapsize * sizeof(GLfloat));
-      memcpy(n[3].data, (void *) values, mapsize * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PixelMapfv(ctx->Exec, (map, mapsize, values));
-   }
-}
-
-
-static void GLAPIENTRY
-save_PixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
-{
-   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];
-   GLint i;
-   if (map == GL_PIXEL_MAP_I_TO_I || map == GL_PIXEL_MAP_S_TO_S) {
-      for (i = 0; i < mapsize; i++) {
-         fvalues[i] = (GLfloat) values[i];
-      }
-   }
-   else {
-      for (i = 0; i < mapsize; i++) {
-         fvalues[i] = UINT_TO_FLOAT(values[i]);
-      }
-   }
-   save_PixelMapfv(map, mapsize, fvalues);
-}
-
-
-static void GLAPIENTRY
-save_PixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
-{
-   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];
-   GLint i;
-   if (map == GL_PIXEL_MAP_I_TO_I || map == GL_PIXEL_MAP_S_TO_S) {
-      for (i = 0; i < mapsize; i++) {
-         fvalues[i] = (GLfloat) values[i];
-      }
-   }
-   else {
-      for (i = 0; i < mapsize; i++) {
-         fvalues[i] = USHORT_TO_FLOAT(values[i]);
-      }
-   }
-   save_PixelMapfv(map, mapsize, fvalues);
-}
-
-
-static void GLAPIENTRY
-save_PixelTransferf(GLenum pname, GLfloat param)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PIXEL_TRANSFER, 2);
-   if (n) {
-      n[1].e = pname;
-      n[2].f = param;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PixelTransferf(ctx->Exec, (pname, param));
-   }
-}
-
-
-static void GLAPIENTRY
-save_PixelTransferi(GLenum pname, GLint param)
-{
-   save_PixelTransferf(pname, (GLfloat) param);
-}
-
-
-static void GLAPIENTRY
-save_PixelZoom(GLfloat xfactor, GLfloat yfactor)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PIXEL_ZOOM, 2);
-   if (n) {
-      n[1].f = xfactor;
-      n[2].f = yfactor;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PixelZoom(ctx->Exec, (xfactor, yfactor));
-   }
-}
-
-
-static void GLAPIENTRY
-save_PointParameterfvEXT(GLenum pname, const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_POINT_PARAMETERS, 4);
-   if (n) {
-      n[1].e = pname;
-      n[2].f = params[0];
-      n[3].f = params[1];
-      n[4].f = params[2];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PointParameterfvEXT(ctx->Exec, (pname, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_PointParameterfEXT(GLenum pname, GLfloat param)
-{
-   GLfloat parray[3];
-   parray[0] = param;
-   parray[1] = parray[2] = 0.0F;
-   save_PointParameterfvEXT(pname, parray);
-}
-
-static void GLAPIENTRY
-save_PointParameteriNV(GLenum pname, GLint param)
-{
-   GLfloat parray[3];
-   parray[0] = (GLfloat) param;
-   parray[1] = parray[2] = 0.0F;
-   save_PointParameterfvEXT(pname, parray);
-}
-
-static void GLAPIENTRY
-save_PointParameterivNV(GLenum pname, const GLint * param)
-{
-   GLfloat parray[3];
-   parray[0] = (GLfloat) param[0];
-   parray[1] = parray[2] = 0.0F;
-   save_PointParameterfvEXT(pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_PointSize(GLfloat size)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_POINT_SIZE, 1);
-   if (n) {
-      n[1].f = size;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PointSize(ctx->Exec, (size));
-   }
-}
-
-
-static void GLAPIENTRY
-save_PolygonMode(GLenum face, GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_POLYGON_MODE, 2);
-   if (n) {
-      n[1].e = face;
-      n[2].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PolygonMode(ctx->Exec, (face, mode));
-   }
-}
-
-
-static void GLAPIENTRY
-save_PolygonStipple(const GLubyte * pattern)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_POLYGON_STIPPLE, 1);
-   if (n) {
-      n[1].data = unpack_image(ctx, 2, 32, 32, 1, GL_COLOR_INDEX, GL_BITMAP,
-                               pattern, &ctx->Unpack);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PolygonStipple(ctx->Exec, ((GLubyte *) pattern));
-   }
-}
-
-
-static void GLAPIENTRY
-save_PolygonOffset(GLfloat factor, GLfloat units)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_POLYGON_OFFSET, 2);
-   if (n) {
-      n[1].f = factor;
-      n[2].f = units;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PolygonOffset(ctx->Exec, (factor, units));
-   }
-}
-
-
-static void GLAPIENTRY
-save_PolygonOffsetEXT(GLfloat factor, GLfloat bias)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   /* XXX mult by DepthMaxF here??? */
-   save_PolygonOffset(factor, ctx->DrawBuffer->_DepthMaxF * bias);
-}
-
-
-static void GLAPIENTRY
-save_PopAttrib(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   (void) alloc_instruction(ctx, OPCODE_POP_ATTRIB, 0);
-   if (ctx->ExecuteFlag) {
-      CALL_PopAttrib(ctx->Exec, ());
-   }
-}
-
-
-static void GLAPIENTRY
-save_PopMatrix(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   (void) alloc_instruction(ctx, OPCODE_POP_MATRIX, 0);
-   if (ctx->ExecuteFlag) {
-      CALL_PopMatrix(ctx->Exec, ());
-   }
-}
-
-
-static void GLAPIENTRY
-save_PopName(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   (void) alloc_instruction(ctx, OPCODE_POP_NAME, 0);
-   if (ctx->ExecuteFlag) {
-      CALL_PopName(ctx->Exec, ());
-   }
-}
-
-
-static void GLAPIENTRY
-save_PrioritizeTextures(GLsizei num, const GLuint * textures,
-                        const GLclampf * priorities)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   for (i = 0; i < num; i++) {
-      Node *n;
-      n = alloc_instruction(ctx, OPCODE_PRIORITIZE_TEXTURE, 2);
-      if (n) {
-         n[1].ui = textures[i];
-         n[2].f = priorities[i];
-      }
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PrioritizeTextures(ctx->Exec, (num, textures, priorities));
-   }
-}
-
-
-static void GLAPIENTRY
-save_PushAttrib(GLbitfield mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PUSH_ATTRIB, 1);
-   if (n) {
-      n[1].bf = mask;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PushAttrib(ctx->Exec, (mask));
-   }
-}
-
-
-static void GLAPIENTRY
-save_PushMatrix(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   (void) alloc_instruction(ctx, OPCODE_PUSH_MATRIX, 0);
-   if (ctx->ExecuteFlag) {
-      CALL_PushMatrix(ctx->Exec, ());
-   }
-}
-
-
-static void GLAPIENTRY
-save_PushName(GLuint name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PUSH_NAME, 1);
-   if (n) {
-      n[1].ui = name;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PushName(ctx->Exec, (name));
-   }
-}
-
-
-static void GLAPIENTRY
-save_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_RASTER_POS, 4);
-   if (n) {
-      n[1].f = x;
-      n[2].f = y;
-      n[3].f = z;
-      n[4].f = w;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_RasterPos4f(ctx->Exec, (x, y, z, w));
-   }
-}
-
-static void GLAPIENTRY
-save_RasterPos2d(GLdouble x, GLdouble y)
-{
-   save_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos2f(GLfloat x, GLfloat y)
-{
-   save_RasterPos4f(x, y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos2i(GLint x, GLint y)
-{
-   save_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos2s(GLshort x, GLshort y)
-{
-   save_RasterPos4f(x, y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos3d(GLdouble x, GLdouble y, GLdouble z)
-{
-   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos3f(GLfloat x, GLfloat y, GLfloat z)
-{
-   save_RasterPos4f(x, y, z, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos3i(GLint x, GLint y, GLint z)
-{
-   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos3s(GLshort x, GLshort y, GLshort z)
-{
-   save_RasterPos4f(x, y, z, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-save_RasterPos4i(GLint x, GLint y, GLint z, GLint w)
-{
-   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-save_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
-{
-   save_RasterPos4f(x, y, z, w);
-}
-
-static void GLAPIENTRY
-save_RasterPos2dv(const GLdouble * v)
-{
-   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos2fv(const GLfloat * v)
-{
-   save_RasterPos4f(v[0], v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos2iv(const GLint * v)
-{
-   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos2sv(const GLshort * v)
-{
-   save_RasterPos4f(v[0], v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos3dv(const GLdouble * v)
-{
-   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos3fv(const GLfloat * v)
-{
-   save_RasterPos4f(v[0], v[1], v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos3iv(const GLint * v)
-{
-   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos3sv(const GLshort * v)
-{
-   save_RasterPos4f(v[0], v[1], v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-save_RasterPos4dv(const GLdouble * v)
-{
-   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1],
-                    (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-save_RasterPos4fv(const GLfloat * v)
-{
-   save_RasterPos4f(v[0], v[1], v[2], v[3]);
-}
-
-static void GLAPIENTRY
-save_RasterPos4iv(const GLint * v)
-{
-   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1],
-                    (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-save_RasterPos4sv(const GLshort * v)
-{
-   save_RasterPos4f(v[0], v[1], v[2], v[3]);
-}
-
-
-static void GLAPIENTRY
-save_PassThrough(GLfloat token)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PASSTHROUGH, 1);
-   if (n) {
-      n[1].f = token;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_PassThrough(ctx->Exec, (token));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ReadBuffer(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_READ_BUFFER, 1);
-   if (n) {
-      n[1].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ReadBuffer(ctx->Exec, (mode));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ResetHistogram(GLenum target)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_RESET_HISTOGRAM, 1);
-   if (n) {
-      n[1].e = target;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ResetHistogram(ctx->Exec, (target));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ResetMinmax(GLenum target)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_RESET_MIN_MAX, 1);
-   if (n) {
-      n[1].e = target;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ResetMinmax(ctx->Exec, (target));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_ROTATE, 4);
-   if (n) {
-      n[1].f = angle;
-      n[2].f = x;
-      n[3].f = y;
-      n[4].f = z;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Rotatef(ctx->Exec, (angle, x, y, z));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Rotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
-{
-   save_Rotatef((GLfloat) angle, (GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-
-static void GLAPIENTRY
-save_Scalef(GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_SCALE, 3);
-   if (n) {
-      n[1].f = x;
-      n[2].f = y;
-      n[3].f = z;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Scalef(ctx->Exec, (x, y, z));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Scaled(GLdouble x, GLdouble y, GLdouble z)
-{
-   save_Scalef((GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-
-static void GLAPIENTRY
-save_Scissor(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_SCISSOR, 4);
-   if (n) {
-      n[1].i = x;
-      n[2].i = y;
-      n[3].i = width;
-      n[4].i = height;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Scissor(ctx->Exec, (x, y, width, height));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ShadeModel(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx);
-
-   if (ctx->ExecuteFlag) {
-      CALL_ShadeModel(ctx->Exec, (mode));
-   }
-
-   if (ctx->ListState.Current.ShadeModel == mode)
-      return;
-
-   SAVE_FLUSH_VERTICES(ctx);
-
-   /* Only save the value if we know the statechange will take effect:
-    */
-   if (ctx->Driver.CurrentSavePrimitive == PRIM_OUTSIDE_BEGIN_END)
-      ctx->ListState.Current.ShadeModel = mode;
-
-   n = alloc_instruction(ctx, OPCODE_SHADE_MODEL, 1);
-   if (n) {
-      n[1].e = mode;
-   }
-}
-
-
-static void GLAPIENTRY
-save_StencilFunc(GLenum func, GLint ref, GLuint mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_STENCIL_FUNC, 3);
-   if (n) {
-      n[1].e = func;
-      n[2].i = ref;
-      n[3].ui = mask;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_StencilFunc(ctx->Exec, (func, ref, mask));
-   }
-}
-
-
-static void GLAPIENTRY
-save_StencilMask(GLuint mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_STENCIL_MASK, 1);
-   if (n) {
-      n[1].ui = mask;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_StencilMask(ctx->Exec, (mask));
-   }
-}
-
-
-static void GLAPIENTRY
-save_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_STENCIL_OP, 3);
-   if (n) {
-      n[1].e = fail;
-      n[2].e = zfail;
-      n[3].e = zpass;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_StencilOp(ctx->Exec, (fail, zfail, zpass));
-   }
-}
-
-
-static void GLAPIENTRY
-save_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_STENCIL_FUNC_SEPARATE, 4);
-   if (n) {
-      n[1].e = face;
-      n[2].e = func;
-      n[3].i = ref;
-      n[4].ui = mask;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_StencilFuncSeparate(ctx->Exec, (face, func, ref, mask));
-   }
-}
-
-
-static void GLAPIENTRY
-save_StencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, GLint ref,
-                            GLuint mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   /* GL_FRONT */
-   n = alloc_instruction(ctx, OPCODE_STENCIL_FUNC_SEPARATE, 4);
-   if (n) {
-      n[1].e = GL_FRONT;
-      n[2].e = frontfunc;
-      n[3].i = ref;
-      n[4].ui = mask;
-   }
-   /* GL_BACK */
-   n = alloc_instruction(ctx, OPCODE_STENCIL_FUNC_SEPARATE, 4);
-   if (n) {
-      n[1].e = GL_BACK;
-      n[2].e = backfunc;
-      n[3].i = ref;
-      n[4].ui = mask;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_StencilFuncSeparate(ctx->Exec, (GL_FRONT, frontfunc, ref, mask));
-      CALL_StencilFuncSeparate(ctx->Exec, (GL_BACK, backfunc, ref, mask));
-   }
-}
-
-
-static void GLAPIENTRY
-save_StencilMaskSeparate(GLenum face, GLuint mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_STENCIL_MASK_SEPARATE, 2);
-   if (n) {
-      n[1].e = face;
-      n[2].ui = mask;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_StencilMaskSeparate(ctx->Exec, (face, mask));
-   }
-}
-
-
-static void GLAPIENTRY
-save_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_STENCIL_OP_SEPARATE, 4);
-   if (n) {
-      n[1].e = face;
-      n[2].e = fail;
-      n[3].e = zfail;
-      n[4].e = zpass;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_StencilOpSeparate(ctx->Exec, (face, fail, zfail, zpass));
-   }
-}
-
-
-static void GLAPIENTRY
-save_TexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_TEXENV, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].e = pname;
-      if (pname == GL_TEXTURE_ENV_COLOR) {
-         n[3].f = params[0];
-         n[4].f = params[1];
-         n[5].f = params[2];
-         n[6].f = params[3];
-      }
-      else {
-         n[3].f = params[0];
-         n[4].f = n[5].f = n[6].f = 0.0F;
-      }
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_TexEnvfv(ctx->Exec, (target, pname, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_TexEnvf(GLenum target, GLenum pname, GLfloat param)
-{
-   GLfloat parray[4];
-   parray[0] = (GLfloat) param;
-   parray[1] = parray[2] = parray[3] = 0.0F;
-   save_TexEnvfv(target, pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_TexEnvi(GLenum target, GLenum pname, GLint param)
-{
-   GLfloat p[4];
-   p[0] = (GLfloat) param;
-   p[1] = p[2] = p[3] = 0.0F;
-   save_TexEnvfv(target, pname, p);
-}
-
-
-static void GLAPIENTRY
-save_TexEnviv(GLenum target, GLenum pname, const GLint * param)
-{
-   GLfloat p[4];
-   if (pname == GL_TEXTURE_ENV_COLOR) {
-      p[0] = INT_TO_FLOAT(param[0]);
-      p[1] = INT_TO_FLOAT(param[1]);
-      p[2] = INT_TO_FLOAT(param[2]);
-      p[3] = INT_TO_FLOAT(param[3]);
-   }
-   else {
-      p[0] = (GLfloat) param[0];
-      p[1] = p[2] = p[3] = 0.0F;
-   }
-   save_TexEnvfv(target, pname, p);
-}
-
-
-static void GLAPIENTRY
-save_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_TEXGEN, 6);
-   if (n) {
-      n[1].e = coord;
-      n[2].e = pname;
-      n[3].f = params[0];
-      n[4].f = params[1];
-      n[5].f = params[2];
-      n[6].f = params[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_TexGenfv(ctx->Exec, (coord, pname, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_TexGeniv(GLenum coord, GLenum pname, const GLint *params)
-{
-   GLfloat p[4];
-   p[0] = (GLfloat) params[0];
-   p[1] = (GLfloat) params[1];
-   p[2] = (GLfloat) params[2];
-   p[3] = (GLfloat) params[3];
-   save_TexGenfv(coord, pname, p);
-}
-
-
-static void GLAPIENTRY
-save_TexGend(GLenum coord, GLenum pname, GLdouble param)
-{
-   GLfloat parray[4];
-   parray[0] = (GLfloat) param;
-   parray[1] = parray[2] = parray[3] = 0.0F;
-   save_TexGenfv(coord, pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_TexGendv(GLenum coord, GLenum pname, const GLdouble *params)
-{
-   GLfloat p[4];
-   p[0] = (GLfloat) params[0];
-   p[1] = (GLfloat) params[1];
-   p[2] = (GLfloat) params[2];
-   p[3] = (GLfloat) params[3];
-   save_TexGenfv(coord, pname, p);
-}
-
-
-static void GLAPIENTRY
-save_TexGenf(GLenum coord, GLenum pname, GLfloat param)
-{
-   GLfloat parray[4];
-   parray[0] = param;
-   parray[1] = parray[2] = parray[3] = 0.0F;
-   save_TexGenfv(coord, pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_TexGeni(GLenum coord, GLenum pname, GLint param)
-{
-   GLint parray[4];
-   parray[0] = param;
-   parray[1] = parray[2] = parray[3] = 0;
-   save_TexGeniv(coord, pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_TEXPARAMETER, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].e = pname;
-      n[3].f = params[0];
-      n[4].f = params[1];
-      n[5].f = params[2];
-      n[6].f = params[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_TexParameterfv(ctx->Exec, (target, pname, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_TexParameterf(GLenum target, GLenum pname, GLfloat param)
-{
-   GLfloat parray[4];
-   parray[0] = param;
-   parray[1] = parray[2] = parray[3] = 0.0F;
-   save_TexParameterfv(target, pname, parray);
-}
-
-
-static void GLAPIENTRY
-save_TexParameteri(GLenum target, GLenum pname, GLint param)
-{
-   GLfloat fparam[4];
-   fparam[0] = (GLfloat) param;
-   fparam[1] = fparam[2] = fparam[3] = 0.0F;
-   save_TexParameterfv(target, pname, fparam);
-}
-
-
-static void GLAPIENTRY
-save_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-   GLfloat fparam[4];
-   fparam[0] = (GLfloat) params[0];
-   fparam[1] = fparam[2] = fparam[3] = 0.0F;
-   save_TexParameterfv(target, pname, fparam);
-}
-
-
-static void GLAPIENTRY
-save_TexImage1D(GLenum target,
-                GLint level, GLint components,
-                GLsizei width, GLint border,
-                GLenum format, GLenum type, const GLvoid * pixels)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (target == GL_PROXY_TEXTURE_1D) {
-      /* don't compile, execute immediately */
-      CALL_TexImage1D(ctx->Exec, (target, level, components, width,
-                                  border, format, type, pixels));
-   }
-   else {
-      Node *n;
-      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-      n = alloc_instruction(ctx, OPCODE_TEX_IMAGE1D, 8);
-      if (n) {
-         n[1].e = target;
-         n[2].i = level;
-         n[3].i = components;
-         n[4].i = (GLint) width;
-         n[5].i = border;
-         n[6].e = format;
-         n[7].e = type;
-         n[8].data = unpack_image(ctx, 1, width, 1, 1, format, type,
-                                  pixels, &ctx->Unpack);
-      }
-      if (ctx->ExecuteFlag) {
-         CALL_TexImage1D(ctx->Exec, (target, level, components, width,
-                                     border, format, type, pixels));
-      }
-   }
-}
-
-
-static void GLAPIENTRY
-save_TexImage2D(GLenum target,
-                GLint level, GLint components,
-                GLsizei width, GLsizei height, GLint border,
-                GLenum format, GLenum type, const GLvoid * pixels)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (target == GL_PROXY_TEXTURE_2D) {
-      /* don't compile, execute immediately */
-      CALL_TexImage2D(ctx->Exec, (target, level, components, width,
-                                  height, border, format, type, pixels));
-   }
-   else {
-      Node *n;
-      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-      n = alloc_instruction(ctx, OPCODE_TEX_IMAGE2D, 9);
-      if (n) {
-         n[1].e = target;
-         n[2].i = level;
-         n[3].i = components;
-         n[4].i = (GLint) width;
-         n[5].i = (GLint) height;
-         n[6].i = border;
-         n[7].e = format;
-         n[8].e = type;
-         n[9].data = unpack_image(ctx, 2, width, height, 1, format, type,
-                                  pixels, &ctx->Unpack);
-      }
-      if (ctx->ExecuteFlag) {
-         CALL_TexImage2D(ctx->Exec, (target, level, components, width,
-                                     height, border, format, type, pixels));
-      }
-   }
-}
-
-
-static void GLAPIENTRY
-save_TexImage3D(GLenum target,
-                GLint level, GLint internalFormat,
-                GLsizei width, GLsizei height, GLsizei depth,
-                GLint border,
-                GLenum format, GLenum type, const GLvoid * pixels)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (target == GL_PROXY_TEXTURE_3D) {
-      /* don't compile, execute immediately */
-      CALL_TexImage3D(ctx->Exec, (target, level, internalFormat, width,
-                                  height, depth, border, format, type,
-                                  pixels));
-   }
-   else {
-      Node *n;
-      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-      n = alloc_instruction(ctx, OPCODE_TEX_IMAGE3D, 10);
-      if (n) {
-         n[1].e = target;
-         n[2].i = level;
-         n[3].i = (GLint) internalFormat;
-         n[4].i = (GLint) width;
-         n[5].i = (GLint) height;
-         n[6].i = (GLint) depth;
-         n[7].i = border;
-         n[8].e = format;
-         n[9].e = type;
-         n[10].data = unpack_image(ctx, 3, width, height, depth, format, type,
-                                   pixels, &ctx->Unpack);
-      }
-      if (ctx->ExecuteFlag) {
-         CALL_TexImage3D(ctx->Exec, (target, level, internalFormat, width,
-                                     height, depth, border, format, type,
-                                     pixels));
-      }
-   }
-}
-
-
-static void GLAPIENTRY
-save_TexSubImage1D(GLenum target, GLint level, GLint xoffset,
-                   GLsizei width, GLenum format, GLenum type,
-                   const GLvoid * pixels)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_TEX_SUB_IMAGE1D, 7);
-   if (n) {
-      n[1].e = target;
-      n[2].i = level;
-      n[3].i = xoffset;
-      n[4].i = (GLint) width;
-      n[5].e = format;
-      n[6].e = type;
-      n[7].data = unpack_image(ctx, 1, width, 1, 1, format, type,
-                               pixels, &ctx->Unpack);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_TexSubImage1D(ctx->Exec, (target, level, xoffset, width,
-                                     format, type, pixels));
-   }
-}
-
-
-static void GLAPIENTRY
-save_TexSubImage2D(GLenum target, GLint level,
-                   GLint xoffset, GLint yoffset,
-                   GLsizei width, GLsizei height,
-                   GLenum format, GLenum type, const GLvoid * pixels)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_TEX_SUB_IMAGE2D, 9);
-   if (n) {
-      n[1].e = target;
-      n[2].i = level;
-      n[3].i = xoffset;
-      n[4].i = yoffset;
-      n[5].i = (GLint) width;
-      n[6].i = (GLint) height;
-      n[7].e = format;
-      n[8].e = type;
-      n[9].data = unpack_image(ctx, 2, width, height, 1, format, type,
-                               pixels, &ctx->Unpack);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_TexSubImage2D(ctx->Exec, (target, level, xoffset, yoffset,
-                                     width, height, format, type, pixels));
-   }
-}
-
-
-static void GLAPIENTRY
-save_TexSubImage3D(GLenum target, GLint level,
-                   GLint xoffset, GLint yoffset, GLint zoffset,
-                   GLsizei width, GLsizei height, GLsizei depth,
-                   GLenum format, GLenum type, const GLvoid * pixels)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_TEX_SUB_IMAGE3D, 11);
-   if (n) {
-      n[1].e = target;
-      n[2].i = level;
-      n[3].i = xoffset;
-      n[4].i = yoffset;
-      n[5].i = zoffset;
-      n[6].i = (GLint) width;
-      n[7].i = (GLint) height;
-      n[8].i = (GLint) depth;
-      n[9].e = format;
-      n[10].e = type;
-      n[11].data = unpack_image(ctx, 3, width, height, depth, format, type,
-                                pixels, &ctx->Unpack);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_TexSubImage3D(ctx->Exec, (target, level,
-                                     xoffset, yoffset, zoffset,
-                                     width, height, depth, format, type,
-                                     pixels));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Translatef(GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_TRANSLATE, 3);
-   if (n) {
-      n[1].f = x;
-      n[2].f = y;
-      n[3].f = z;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Translatef(ctx->Exec, (x, y, z));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Translated(GLdouble x, GLdouble y, GLdouble z)
-{
-   save_Translatef((GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-
-
-static void GLAPIENTRY
-save_Viewport(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_VIEWPORT, 4);
-   if (n) {
-      n[1].i = x;
-      n[2].i = y;
-      n[3].i = (GLint) width;
-      n[4].i = (GLint) height;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Viewport(ctx->Exec, (x, y, width, height));
-   }
-}
-
-
-static void GLAPIENTRY
-save_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_WINDOW_POS, 4);
-   if (n) {
-      n[1].f = x;
-      n[2].f = y;
-      n[3].f = z;
-      n[4].f = w;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_WindowPos4fMESA(ctx->Exec, (x, y, z, w));
-   }
-}
-
-static void GLAPIENTRY
-save_WindowPos2dMESA(GLdouble x, GLdouble y)
-{
-   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos2fMESA(GLfloat x, GLfloat y)
-{
-   save_WindowPos4fMESA(x, y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos2iMESA(GLint x, GLint y)
-{
-   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos2sMESA(GLshort x, GLshort y)
-{
-   save_WindowPos4fMESA(x, y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)
-{
-   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z)
-{
-   save_WindowPos4fMESA(x, y, z, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos3iMESA(GLint x, GLint y, GLint z)
-{
-   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos3sMESA(GLshort x, GLshort y, GLshort z)
-{
-   save_WindowPos4fMESA(x, y, z, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-save_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w)
-{
-   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-save_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w)
-{
-   save_WindowPos4fMESA(x, y, z, w);
-}
-
-static void GLAPIENTRY
-save_WindowPos2dvMESA(const GLdouble * v)
-{
-   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos2fvMESA(const GLfloat * v)
-{
-   save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos2ivMESA(const GLint * v)
-{
-   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos2svMESA(const GLshort * v)
-{
-   save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos3dvMESA(const GLdouble * v)
-{
-   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos3fvMESA(const GLfloat * v)
-{
-   save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos3ivMESA(const GLint * v)
-{
-   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos3svMESA(const GLshort * v)
-{
-   save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-save_WindowPos4dvMESA(const GLdouble * v)
-{
-   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1],
-                        (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-save_WindowPos4fvMESA(const GLfloat * v)
-{
-   save_WindowPos4fMESA(v[0], v[1], v[2], v[3]);
-}
-
-static void GLAPIENTRY
-save_WindowPos4ivMESA(const GLint * v)
-{
-   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1],
-                        (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-save_WindowPos4svMESA(const GLshort * v)
-{
-   save_WindowPos4fMESA(v[0], v[1], v[2], v[3]);
-}
-
-
-
-/* GL_ARB_multitexture */
-static void GLAPIENTRY
-save_ActiveTextureARB(GLenum target)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_ACTIVE_TEXTURE, 1);
-   if (n) {
-      n[1].e = target;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ActiveTextureARB(ctx->Exec, (target));
-   }
-}
-
-
-/* GL_ARB_transpose_matrix */
-
-static void GLAPIENTRY
-save_LoadTransposeMatrixdARB(const GLdouble m[16])
-{
-   GLfloat tm[16];
-   _math_transposefd(tm, m);
-   save_LoadMatrixf(tm);
-}
-
-
-static void GLAPIENTRY
-save_LoadTransposeMatrixfARB(const GLfloat m[16])
-{
-   GLfloat tm[16];
-   _math_transposef(tm, m);
-   save_LoadMatrixf(tm);
-}
-
-
-static void GLAPIENTRY
-save_MultTransposeMatrixdARB(const GLdouble m[16])
-{
-   GLfloat tm[16];
-   _math_transposefd(tm, m);
-   save_MultMatrixf(tm);
-}
-
-
-static void GLAPIENTRY
-save_MultTransposeMatrixfARB(const GLfloat m[16])
-{
-   GLfloat tm[16];
-   _math_transposef(tm, m);
-   save_MultMatrixf(tm);
-}
-
-
-/* GL_ARB_texture_compression */
-static void GLAPIENTRY
-save_CompressedTexImage1DARB(GLenum target, GLint level,
-                             GLenum internalFormat, GLsizei width,
-                             GLint border, GLsizei imageSize,
-                             const GLvoid * data)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (target == GL_PROXY_TEXTURE_1D) {
-      /* don't compile, execute immediately */
-      CALL_CompressedTexImage1DARB(ctx->Exec, (target, level, internalFormat,
-                                               width, border, imageSize,
-                                               data));
-   }
-   else {
-      Node *n;
-      GLvoid *image;
-      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-      /* make copy of image */
-      image = malloc(imageSize);
-      if (!image) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage1DARB");
-         return;
-      }
-      memcpy(image, data, imageSize);
-      n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_IMAGE_1D, 7);
-      if (n) {
-         n[1].e = target;
-         n[2].i = level;
-         n[3].e = internalFormat;
-         n[4].i = (GLint) width;
-         n[5].i = border;
-         n[6].i = imageSize;
-         n[7].data = image;
-      }
-      else if (image) {
-         free(image);
-      }
-      if (ctx->ExecuteFlag) {
-         CALL_CompressedTexImage1DARB(ctx->Exec,
-                                      (target, level, internalFormat, width,
-                                       border, imageSize, data));
-      }
-   }
-}
-
-
-static void GLAPIENTRY
-save_CompressedTexImage2DARB(GLenum target, GLint level,
-                             GLenum internalFormat, GLsizei width,
-                             GLsizei height, GLint border, GLsizei imageSize,
-                             const GLvoid * data)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (target == GL_PROXY_TEXTURE_2D) {
-      /* don't compile, execute immediately */
-      CALL_CompressedTexImage2DARB(ctx->Exec, (target, level, internalFormat,
-                                               width, height, border,
-                                               imageSize, data));
-   }
-   else {
-      Node *n;
-      GLvoid *image;
-      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-      /* make copy of image */
-      image = malloc(imageSize);
-      if (!image) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB");
-         return;
-      }
-      memcpy(image, data, imageSize);
-      n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_IMAGE_2D, 8);
-      if (n) {
-         n[1].e = target;
-         n[2].i = level;
-         n[3].e = internalFormat;
-         n[4].i = (GLint) width;
-         n[5].i = (GLint) height;
-         n[6].i = border;
-         n[7].i = imageSize;
-         n[8].data = image;
-      }
-      else if (image) {
-         free(image);
-      }
-      if (ctx->ExecuteFlag) {
-         CALL_CompressedTexImage2DARB(ctx->Exec,
-                                      (target, level, internalFormat, width,
-                                       height, border, imageSize, data));
-      }
-   }
-}
-
-
-static void GLAPIENTRY
-save_CompressedTexImage3DARB(GLenum target, GLint level,
-                             GLenum internalFormat, GLsizei width,
-                             GLsizei height, GLsizei depth, GLint border,
-                             GLsizei imageSize, const GLvoid * data)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (target == GL_PROXY_TEXTURE_3D) {
-      /* don't compile, execute immediately */
-      CALL_CompressedTexImage3DARB(ctx->Exec, (target, level, internalFormat,
-                                               width, height, depth, border,
-                                               imageSize, data));
-   }
-   else {
-      Node *n;
-      GLvoid *image;
-      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-      /* make copy of image */
-      image = malloc(imageSize);
-      if (!image) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage3DARB");
-         return;
-      }
-      memcpy(image, data, imageSize);
-      n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_IMAGE_3D, 9);
-      if (n) {
-         n[1].e = target;
-         n[2].i = level;
-         n[3].e = internalFormat;
-         n[4].i = (GLint) width;
-         n[5].i = (GLint) height;
-         n[6].i = (GLint) depth;
-         n[7].i = border;
-         n[8].i = imageSize;
-         n[9].data = image;
-      }
-      else if (image) {
-         free(image);
-      }
-      if (ctx->ExecuteFlag) {
-         CALL_CompressedTexImage3DARB(ctx->Exec,
-                                      (target, level, internalFormat, width,
-                                       height, depth, border, imageSize,
-                                       data));
-      }
-   }
-}
-
-
-static void GLAPIENTRY
-save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
-                                GLsizei width, GLenum format,
-                                GLsizei imageSize, const GLvoid * data)
-{
-   Node *n;
-   GLvoid *image;
-
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   /* make copy of image */
-   image = malloc(imageSize);
-   if (!image) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage1DARB");
-      return;
-   }
-   memcpy(image, data, imageSize);
-   n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D, 7);
-   if (n) {
-      n[1].e = target;
-      n[2].i = level;
-      n[3].i = xoffset;
-      n[4].i = (GLint) width;
-      n[5].e = format;
-      n[6].i = imageSize;
-      n[7].data = image;
-   }
-   else if (image) {
-      free(image);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CompressedTexSubImage1DARB(ctx->Exec, (target, level, xoffset,
-                                                  width, format, imageSize,
-                                                  data));
-   }
-}
-
-
-static void GLAPIENTRY
-save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
-                                GLint yoffset, GLsizei width, GLsizei height,
-                                GLenum format, GLsizei imageSize,
-                                const GLvoid * data)
-{
-   Node *n;
-   GLvoid *image;
-
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   /* make copy of image */
-   image = malloc(imageSize);
-   if (!image) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage2DARB");
-      return;
-   }
-   memcpy(image, data, imageSize);
-   n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D, 9);
-   if (n) {
-      n[1].e = target;
-      n[2].i = level;
-      n[3].i = xoffset;
-      n[4].i = yoffset;
-      n[5].i = (GLint) width;
-      n[6].i = (GLint) height;
-      n[7].e = format;
-      n[8].i = imageSize;
-      n[9].data = image;
-   }
-   else if (image) {
-      free(image);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CompressedTexSubImage2DARB(ctx->Exec,
-                                      (target, level, xoffset, yoffset, width,
-                                       height, format, imageSize, data));
-   }
-}
-
-
-static void GLAPIENTRY
-save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
-                                GLint yoffset, GLint zoffset, GLsizei width,
-                                GLsizei height, GLsizei depth, GLenum format,
-                                GLsizei imageSize, const GLvoid * data)
-{
-   Node *n;
-   GLvoid *image;
-
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   /* make copy of image */
-   image = malloc(imageSize);
-   if (!image) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage3DARB");
-      return;
-   }
-   memcpy(image, data, imageSize);
-   n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D, 11);
-   if (n) {
-      n[1].e = target;
-      n[2].i = level;
-      n[3].i = xoffset;
-      n[4].i = yoffset;
-      n[5].i = zoffset;
-      n[6].i = (GLint) width;
-      n[7].i = (GLint) height;
-      n[8].i = (GLint) depth;
-      n[9].e = format;
-      n[10].i = imageSize;
-      n[11].data = image;
-   }
-   else if (image) {
-      free(image);
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_CompressedTexSubImage3DARB(ctx->Exec,
-                                      (target, level, xoffset, yoffset,
-                                       zoffset, width, height, depth, format,
-                                       imageSize, data));
-   }
-}
-
-
-/* GL_ARB_multisample */
-static void GLAPIENTRY
-save_SampleCoverageARB(GLclampf value, GLboolean invert)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_SAMPLE_COVERAGE, 2);
-   if (n) {
-      n[1].f = value;
-      n[2].b = invert;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_SampleCoverageARB(ctx->Exec, (value, invert));
-   }
-}
-
-
-/*
- * GL_NV_vertex_program
- */
-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-static void GLAPIENTRY
-save_BindProgramNV(GLenum target, GLuint id)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BIND_PROGRAM_NV, 2);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = id;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BindProgramNV(ctx->Exec, (target, id));
-   }
-}
-
-static void GLAPIENTRY
-save_ProgramEnvParameter4fARB(GLenum target, GLuint index,
-                              GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PROGRAM_ENV_PARAMETER_ARB, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = index;
-      n[3].f = x;
-      n[4].f = y;
-      n[5].f = z;
-      n[6].f = w;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ProgramEnvParameter4fARB(ctx->Exec, (target, index, x, y, z, w));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
-                               const GLfloat *params)
-{
-   save_ProgramEnvParameter4fARB(target, index, params[0], params[1],
-                                 params[2], params[3]);
-}
-
-
-static void GLAPIENTRY
-save_ProgramEnvParameters4fvEXT(GLenum target, GLuint index, GLsizei count,
-				const GLfloat * params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (count > 0) {
-      GLint i;
-      const GLfloat * p = params;
-
-      for (i = 0 ; i < count ; i++) {
-	 n = alloc_instruction(ctx, OPCODE_PROGRAM_ENV_PARAMETER_ARB, 6);
-	 if (n) {
-	    n[1].e = target;
-	    n[2].ui = index;
-	    n[3].f = p[0];
-	    n[4].f = p[1];
-	    n[5].f = p[2];
-	    n[6].f = p[3];
-	    p += 4;
-	 }
-      }
-   }
-
-   if (ctx->ExecuteFlag) {
-      CALL_ProgramEnvParameters4fvEXT(ctx->Exec, (target, index, count, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramEnvParameter4dARB(GLenum target, GLuint index,
-                              GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   save_ProgramEnvParameter4fARB(target, index,
-                                 (GLfloat) x,
-                                 (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-
-static void GLAPIENTRY
-save_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
-                               const GLdouble *params)
-{
-   save_ProgramEnvParameter4fARB(target, index,
-                                 (GLfloat) params[0],
-                                 (GLfloat) params[1],
-                                 (GLfloat) params[2], (GLfloat) params[3]);
-}
-
-#endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program || FEATURE_NV_vertex_program */
-
-#if FEATURE_NV_vertex_program
-static void GLAPIENTRY
-save_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_EXECUTE_PROGRAM_NV, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = id;
-      n[3].f = params[0];
-      n[4].f = params[1];
-      n[5].f = params[2];
-      n[6].f = params[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ExecuteProgramNV(ctx->Exec, (target, id, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramParameters4dvNV(GLenum target, GLuint index,
-                            GLsizei num, const GLdouble *params)
-{
-   GLint i;
-   for (i = 0; i < num; i++) {
-      save_ProgramEnvParameter4dvARB(target, index + i, params + 4 * i);
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramParameters4fvNV(GLenum target, GLuint index,
-                            GLsizei num, const GLfloat *params)
-{
-   GLint i;
-   for (i = 0; i < num; i++) {
-      save_ProgramEnvParameter4fvARB(target, index + i, params + 4 * i);
-   }
-}
-
-
-static void GLAPIENTRY
-save_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
-                   const GLubyte * program)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_LOAD_PROGRAM_NV, 4);
-   if (n) {
-      GLubyte *programCopy = (GLubyte *) malloc(len);
-      if (!programCopy) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-         return;
-      }
-      memcpy(programCopy, program, len);
-      n[1].e = target;
-      n[2].ui = id;
-      n[3].i = len;
-      n[4].data = programCopy;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_LoadProgramNV(ctx->Exec, (target, id, len, program));
-   }
-}
-
-
-static void GLAPIENTRY
-save_RequestResidentProgramsNV(GLsizei num, const GLuint * ids)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_TRACK_MATRIX_NV, 2);
-   if (n) {
-      GLuint *idCopy = (GLuint *) malloc(num * sizeof(GLuint));
-      if (!idCopy) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glRequestResidentProgramsNV");
-         return;
-      }
-      memcpy(idCopy, ids, num * sizeof(GLuint));
-      n[1].i = num;
-      n[2].data = idCopy;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_RequestResidentProgramsNV(ctx->Exec, (num, ids));
-   }
-}
-
-
-static void GLAPIENTRY
-save_TrackMatrixNV(GLenum target, GLuint address,
-                   GLenum matrix, GLenum transform)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_TRACK_MATRIX_NV, 4);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = address;
-      n[3].e = matrix;
-      n[4].e = transform;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_TrackMatrixNV(ctx->Exec, (target, address, matrix, transform));
-   }
-}
-#endif /* FEATURE_NV_vertex_program */
-
-
-/*
- * GL_NV_fragment_program
- */
-#if FEATURE_NV_fragment_program
-static void GLAPIENTRY
-save_ProgramLocalParameter4fARB(GLenum target, GLuint index,
-                                GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = index;
-      n[3].f = x;
-      n[4].f = y;
-      n[5].f = z;
-      n[6].f = w;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ProgramLocalParameter4fARB(ctx->Exec, (target, index, x, y, z, w));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramLocalParameter4fvARB(GLenum target, GLuint index,
-                                 const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = index;
-      n[3].f = params[0];
-      n[4].f = params[1];
-      n[5].f = params[2];
-      n[6].f = params[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ProgramLocalParameter4fvARB(ctx->Exec, (target, index, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramLocalParameters4fvEXT(GLenum target, GLuint index, GLsizei count,
-				  const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (count > 0) {
-      GLint i;
-      const GLfloat * p = params;
-
-      for (i = 0 ; i < count ; i++) {
-	 n = alloc_instruction(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6);
-	 if (n) {
-	    n[1].e = target;
-	    n[2].ui = index;
-	    n[3].f = p[0];
-	    n[4].f = p[1];
-	    n[5].f = p[2];
-	    n[6].f = p[3];
-	    p += 4;
-	 }
-      }
-   }
-
-   if (ctx->ExecuteFlag) {
-      CALL_ProgramLocalParameters4fvEXT(ctx->Exec, (target, index, count, params));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramLocalParameter4dARB(GLenum target, GLuint index,
-                                GLdouble x, GLdouble y,
-                                GLdouble z, GLdouble w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = index;
-      n[3].f = (GLfloat) x;
-      n[4].f = (GLfloat) y;
-      n[5].f = (GLfloat) z;
-      n[6].f = (GLfloat) w;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ProgramLocalParameter4dARB(ctx->Exec, (target, index, x, y, z, w));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramLocalParameter4dvARB(GLenum target, GLuint index,
-                                 const GLdouble *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = index;
-      n[3].f = (GLfloat) params[0];
-      n[4].f = (GLfloat) params[1];
-      n[5].f = (GLfloat) params[2];
-      n[6].f = (GLfloat) params[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ProgramLocalParameter4dvARB(ctx->Exec, (target, index, params));
-   }
-}
-
-static void GLAPIENTRY
-save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte * name,
-                               GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_PROGRAM_NAMED_PARAMETER_NV, 6);
-   if (n) {
-      GLubyte *nameCopy = (GLubyte *) malloc(len);
-      if (!nameCopy) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramNamedParameter4fNV");
-         return;
-      }
-      memcpy(nameCopy, name, len);
-      n[1].ui = id;
-      n[2].i = len;
-      n[3].data = nameCopy;
-      n[4].f = x;
-      n[5].f = y;
-      n[6].f = z;
-      n[7].f = w;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ProgramNamedParameter4fNV(ctx->Exec, (id, len, name, x, y, z, w));
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte * name,
-                                const float v[])
-{
-   save_ProgramNamedParameter4fNV(id, len, name, v[0], v[1], v[2], v[3]);
-}
-
-
-static void GLAPIENTRY
-save_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte * name,
-                               GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   save_ProgramNamedParameter4fNV(id, len, name, (GLfloat) x, (GLfloat) y,
-                                  (GLfloat) z, (GLfloat) w);
-}
-
-
-static void GLAPIENTRY
-save_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte * name,
-                                const double v[])
-{
-   save_ProgramNamedParameter4fNV(id, len, name, (GLfloat) v[0],
-                                  (GLfloat) v[1], (GLfloat) v[2],
-                                  (GLfloat) v[3]);
-}
-
-#endif /* FEATURE_NV_fragment_program */
-
-
-
-/* GL_EXT_stencil_two_side */
-static void GLAPIENTRY
-save_ActiveStencilFaceEXT(GLenum face)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_ACTIVE_STENCIL_FACE_EXT, 1);
-   if (n) {
-      n[1].e = face;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ActiveStencilFaceEXT(ctx->Exec, (face));
-   }
-}
-
-
-/* GL_EXT_depth_bounds_test */
-static void GLAPIENTRY
-save_DepthBoundsEXT(GLclampd zmin, GLclampd zmax)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_DEPTH_BOUNDS_EXT, 2);
-   if (n) {
-      n[1].f = (GLfloat) zmin;
-      n[2].f = (GLfloat) zmax;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_DepthBoundsEXT(ctx->Exec, (zmin, zmax));
-   }
-}
-
-
-
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-
-static void GLAPIENTRY
-save_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
-                      const GLvoid * string)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_PROGRAM_STRING_ARB, 4);
-   if (n) {
-      GLubyte *programCopy = (GLubyte *) malloc(len);
-      if (!programCopy) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
-         return;
-      }
-      memcpy(programCopy, string, len);
-      n[1].e = target;
-      n[2].e = format;
-      n[3].i = len;
-      n[4].data = programCopy;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ProgramStringARB(ctx->Exec, (target, format, len, string));
-   }
-}
-
-#endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */
-
-
-#if FEATURE_queryobj
-
-static void GLAPIENTRY
-save_BeginQueryARB(GLenum target, GLuint id)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BEGIN_QUERY_ARB, 2);
-   if (n) {
-      n[1].e = target;
-      n[2].ui = id;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BeginQueryARB(ctx->Exec, (target, id));
-   }
-}
-
-
-static void GLAPIENTRY
-save_EndQueryARB(GLenum target)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_END_QUERY_ARB, 1);
-   if (n) {
-      n[1].e = target;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_EndQueryARB(ctx->Exec, (target));
-   }
-}
-
-#endif /* FEATURE_queryobj */
-
-
-static void GLAPIENTRY
-save_DrawBuffersARB(GLsizei count, const GLenum * buffers)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_DRAW_BUFFERS_ARB, 1 + MAX_DRAW_BUFFERS);
-   if (n) {
-      GLint i;
-      n[1].i = count;
-      if (count > MAX_DRAW_BUFFERS)
-         count = MAX_DRAW_BUFFERS;
-      for (i = 0; i < count; i++) {
-         n[2 + i].e = buffers[i];
-      }
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_DrawBuffersARB(ctx->Exec, (count, buffers));
-   }
-}
-
-static void GLAPIENTRY
-save_TexBumpParameterfvATI(GLenum pname, const GLfloat *param)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   n = alloc_instruction(ctx, OPCODE_TEX_BUMP_PARAMETER_ATI, 5);
-   if (n) {
-      n[1].ui = pname;
-      n[2].f = param[0];
-      n[3].f = param[1];
-      n[4].f = param[2];
-      n[5].f = param[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_TexBumpParameterfvATI(ctx->Exec, (pname, param));
-   }
-}
-
-static void GLAPIENTRY
-save_TexBumpParameterivATI(GLenum pname, const GLint *param)
-{
-   GLfloat p[4];
-   p[0] = INT_TO_FLOAT(param[0]);
-   p[1] = INT_TO_FLOAT(param[1]);
-   p[2] = INT_TO_FLOAT(param[2]);
-   p[3] = INT_TO_FLOAT(param[3]);
-   save_TexBumpParameterfvATI(pname, p);
-}
-
-#if FEATURE_ATI_fragment_shader
-static void GLAPIENTRY
-save_BindFragmentShaderATI(GLuint id)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   n = alloc_instruction(ctx, OPCODE_BIND_FRAGMENT_SHADER_ATI, 1);
-   if (n) {
-      n[1].ui = id;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BindFragmentShaderATI(ctx->Exec, (id));
-   }
-}
-
-static void GLAPIENTRY
-save_SetFragmentShaderConstantATI(GLuint dst, const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-
-   n = alloc_instruction(ctx, OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI, 5);
-   if (n) {
-      n[1].ui = dst;
-      n[2].f = value[0];
-      n[3].f = value[1];
-      n[4].f = value[2];
-      n[5].f = value[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_SetFragmentShaderConstantATI(ctx->Exec, (dst, value));
-   }
-}
-#endif
-
-static void
-save_Attr1fNV(GLenum attr, GLfloat x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_ATTR_1F_NV, 2);
-   if (n) {
-      n[1].e = attr;
-      n[2].f = x;
-   }
-
-   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
-   ctx->ListState.ActiveAttribSize[attr] = 1;
-   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1);
-
-   if (ctx->ExecuteFlag) {
-      CALL_VertexAttrib1fNV(ctx->Exec, (attr, x));
-   }
-}
-
-static void
-save_Attr2fNV(GLenum attr, GLfloat x, GLfloat y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_ATTR_2F_NV, 3);
-   if (n) {
-      n[1].e = attr;
-      n[2].f = x;
-      n[3].f = y;
-   }
-
-   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
-   ctx->ListState.ActiveAttribSize[attr] = 2;
-   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, 0, 1);
-
-   if (ctx->ExecuteFlag) {
-      CALL_VertexAttrib2fNV(ctx->Exec, (attr, x, y));
-   }
-}
-
-static void
-save_Attr3fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_ATTR_3F_NV, 4);
-   if (n) {
-      n[1].e = attr;
-      n[2].f = x;
-      n[3].f = y;
-      n[4].f = z;
-   }
-
-   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
-   ctx->ListState.ActiveAttribSize[attr] = 3;
-   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, 1);
-
-   if (ctx->ExecuteFlag) {
-      CALL_VertexAttrib3fNV(ctx->Exec, (attr, x, y, z));
-   }
-}
-
-static void
-save_Attr4fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_ATTR_4F_NV, 5);
-   if (n) {
-      n[1].e = attr;
-      n[2].f = x;
-      n[3].f = y;
-      n[4].f = z;
-      n[5].f = w;
-   }
-
-   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
-   ctx->ListState.ActiveAttribSize[attr] = 4;
-   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, w);
-
-   if (ctx->ExecuteFlag) {
-      CALL_VertexAttrib4fNV(ctx->Exec, (attr, x, y, z, w));
-   }
-}
-
-
-static void
-save_Attr1fARB(GLenum attr, GLfloat x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_ATTR_1F_ARB, 2);
-   if (n) {
-      n[1].e = attr;
-      n[2].f = x;
-   }
-
-   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
-   ctx->ListState.ActiveAttribSize[attr] = 1;
-   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1);
-
-   if (ctx->ExecuteFlag) {
-      CALL_VertexAttrib1fARB(ctx->Exec, (attr, x));
-   }
-}
-
-static void
-save_Attr2fARB(GLenum attr, GLfloat x, GLfloat y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_ATTR_2F_ARB, 3);
-   if (n) {
-      n[1].e = attr;
-      n[2].f = x;
-      n[3].f = y;
-   }
-
-   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
-   ctx->ListState.ActiveAttribSize[attr] = 2;
-   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, 0, 1);
-
-   if (ctx->ExecuteFlag) {
-      CALL_VertexAttrib2fARB(ctx->Exec, (attr, x, y));
-   }
-}
-
-static void
-save_Attr3fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_ATTR_3F_ARB, 4);
-   if (n) {
-      n[1].e = attr;
-      n[2].f = x;
-      n[3].f = y;
-      n[4].f = z;
-   }
-
-   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
-   ctx->ListState.ActiveAttribSize[attr] = 3;
-   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, 1);
-
-   if (ctx->ExecuteFlag) {
-      CALL_VertexAttrib3fARB(ctx->Exec, (attr, x, y, z));
-   }
-}
-
-static void
-save_Attr4fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_ATTR_4F_ARB, 5);
-   if (n) {
-      n[1].e = attr;
-      n[2].f = x;
-      n[3].f = y;
-      n[4].f = z;
-      n[5].f = w;
-   }
-
-   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);
-   ctx->ListState.ActiveAttribSize[attr] = 4;
-   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, w);
-
-   if (ctx->ExecuteFlag) {
-      CALL_VertexAttrib4fARB(ctx->Exec, (attr, x, y, z, w));
-   }
-}
-
-
-static void GLAPIENTRY
-save_EvalCoord1f(GLfloat x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_EVAL_C1, 1);
-   if (n) {
-      n[1].f = x;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_EvalCoord1f(ctx->Exec, (x));
-   }
-}
-
-static void GLAPIENTRY
-save_EvalCoord1fv(const GLfloat * v)
-{
-   save_EvalCoord1f(v[0]);
-}
-
-static void GLAPIENTRY
-save_EvalCoord2f(GLfloat x, GLfloat y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_EVAL_C2, 2);
-   if (n) {
-      n[1].f = x;
-      n[2].f = y;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_EvalCoord2f(ctx->Exec, (x, y));
-   }
-}
-
-static void GLAPIENTRY
-save_EvalCoord2fv(const GLfloat * v)
-{
-   save_EvalCoord2f(v[0], v[1]);
-}
-
-
-static void GLAPIENTRY
-save_EvalPoint1(GLint x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_EVAL_P1, 1);
-   if (n) {
-      n[1].i = x;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_EvalPoint1(ctx->Exec, (x));
-   }
-}
-
-static void GLAPIENTRY
-save_EvalPoint2(GLint x, GLint y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_EVAL_P2, 2);
-   if (n) {
-      n[1].i = x;
-      n[2].i = y;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_EvalPoint2(ctx->Exec, (x, y));
-   }
-}
-
-static void GLAPIENTRY
-save_Indexf(GLfloat x)
-{
-   save_Attr1fNV(VERT_ATTRIB_COLOR_INDEX, x);
-}
-
-static void GLAPIENTRY
-save_Indexfv(const GLfloat * v)
-{
-   save_Attr1fNV(VERT_ATTRIB_COLOR_INDEX, v[0]);
-}
-
-static void GLAPIENTRY
-save_EdgeFlag(GLboolean x)
-{
-   save_Attr1fNV(VERT_ATTRIB_EDGEFLAG, x ? (GLfloat)1.0 : (GLfloat)0.0);
-}
-
-static INLINE GLboolean compare4fv( const GLfloat *a,
-                                    const GLfloat *b,
-                                    GLuint count )
-{
-   return memcmp( a, b, count * sizeof(GLfloat) ) == 0;
-}
-                              
-
-static void GLAPIENTRY
-save_Materialfv(GLenum face, GLenum pname, const GLfloat * param)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   int args, i;
-   GLuint bitmask;
-
-   switch (face) {
-   case GL_BACK:
-   case GL_FRONT:
-   case GL_FRONT_AND_BACK:
-      break;
-   default:
-      _mesa_compile_error(ctx, GL_INVALID_ENUM, "material(face)");
-      return;
-   }
-
-   switch (pname) {
-   case GL_EMISSION:
-   case GL_AMBIENT:
-   case GL_DIFFUSE:
-   case GL_SPECULAR:
-   case GL_AMBIENT_AND_DIFFUSE:
-      args = 4;
-      break;
-   case GL_SHININESS:
-      args = 1;
-      break;
-   case GL_COLOR_INDEXES:
-      args = 3;
-      break;
-   default:
-      _mesa_compile_error(ctx, GL_INVALID_ENUM, "material(pname)");
-      return;
-   }
-   
-   if (ctx->ExecuteFlag) {
-      CALL_Materialfv(ctx->Exec, (face, pname, param));
-   }
-
-   bitmask = _mesa_material_bitmask(ctx, face, pname, ~0, NULL);
-
-   /* Try to eliminate redundant statechanges.  Because it is legal to
-    * call glMaterial even inside begin/end calls, don't need to worry
-    * about ctx->Driver.CurrentSavePrimitive here.
-    */
-   for (i = 0; i < MAT_ATTRIB_MAX; i++) {
-      if (bitmask & (1 << i)) {
-         if (ctx->ListState.ActiveMaterialSize[i] == args &&
-             compare4fv(ctx->ListState.CurrentMaterial[i], param, args)) {
-            bitmask &= ~(1 << i);
-         }
-         else {
-            ctx->ListState.ActiveMaterialSize[i] = args;
-            COPY_SZ_4V(ctx->ListState.CurrentMaterial[i], args, param);
-         }
-      }
-   }
-
-   /* If this call has effect, return early:
-    */
-   if (bitmask == 0)
-      return;
-
-   SAVE_FLUSH_VERTICES(ctx);
-
-   n = alloc_instruction(ctx, OPCODE_MATERIAL, 6);
-   if (n) {
-      n[1].e = face;
-      n[2].e = pname;
-      for (i = 0; i < args; i++)
-         n[3 + i].f = param[i];
-   }
-}
-
-static void GLAPIENTRY
-save_Begin(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   GLboolean error = GL_FALSE;
-
-   if ( /*mode < GL_POINTS || */ mode > GL_POLYGON) {
-      _mesa_compile_error(ctx, GL_INVALID_ENUM, "Begin (mode)");
-      error = GL_TRUE;
-   }
-   else if (ctx->Driver.CurrentSavePrimitive == PRIM_UNKNOWN) {
-      /* Typically the first begin.  This may raise an error on
-       * playback, depending on whether CallList is issued from inside
-       * a begin/end or not.
-       */
-      ctx->Driver.CurrentSavePrimitive = PRIM_INSIDE_UNKNOWN_PRIM;
-   }
-   else if (ctx->Driver.CurrentSavePrimitive == PRIM_OUTSIDE_BEGIN_END) {
-      ctx->Driver.CurrentSavePrimitive = mode;
-   }
-   else {
-      _mesa_compile_error(ctx, GL_INVALID_OPERATION, "recursive begin");
-      error = GL_TRUE;
-   }
-
-   if (!error) {
-      /* Give the driver an opportunity to hook in an optimized
-       * display list compiler.
-       */
-      if (ctx->Driver.NotifySaveBegin(ctx, mode))
-         return;
-
-      SAVE_FLUSH_VERTICES(ctx);
-      n = alloc_instruction(ctx, OPCODE_BEGIN, 1);
-      if (n) {
-         n[1].e = mode;
-      }
-   }
-
-   if (ctx->ExecuteFlag) {
-      CALL_Begin(ctx->Exec, (mode));
-   }
-}
-
-static void GLAPIENTRY
-save_End(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   SAVE_FLUSH_VERTICES(ctx);
-   (void) alloc_instruction(ctx, OPCODE_END, 0);
-   ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;
-   if (ctx->ExecuteFlag) {
-      CALL_End(ctx->Exec, ());
-   }
-}
-
-static void GLAPIENTRY
-save_Rectf(GLfloat a, GLfloat b, GLfloat c, GLfloat d)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   SAVE_FLUSH_VERTICES(ctx);
-   n = alloc_instruction(ctx, OPCODE_RECTF, 4);
-   if (n) {
-      n[1].f = a;
-      n[2].f = b;
-      n[3].f = c;
-      n[4].f = d;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Rectf(ctx->Exec, (a, b, c, d));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Vertex2f(GLfloat x, GLfloat y)
-{
-   save_Attr2fNV(VERT_ATTRIB_POS, x, y);
-}
-
-static void GLAPIENTRY
-save_Vertex2fv(const GLfloat * v)
-{
-   save_Attr2fNV(VERT_ATTRIB_POS, v[0], v[1]);
-}
-
-static void GLAPIENTRY
-save_Vertex3f(GLfloat x, GLfloat y, GLfloat z)
-{
-   save_Attr3fNV(VERT_ATTRIB_POS, x, y, z);
-}
-
-static void GLAPIENTRY
-save_Vertex3fv(const GLfloat * v)
-{
-   save_Attr3fNV(VERT_ATTRIB_POS, v[0], v[1], v[2]);
-}
-
-static void GLAPIENTRY
-save_Vertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   save_Attr4fNV(VERT_ATTRIB_POS, x, y, z, w);
-}
-
-static void GLAPIENTRY
-save_Vertex4fv(const GLfloat * v)
-{
-   save_Attr4fNV(VERT_ATTRIB_POS, v[0], v[1], v[2], v[3]);
-}
-
-static void GLAPIENTRY
-save_TexCoord1f(GLfloat x)
-{
-   save_Attr1fNV(VERT_ATTRIB_TEX0, x);
-}
-
-static void GLAPIENTRY
-save_TexCoord1fv(const GLfloat * v)
-{
-   save_Attr1fNV(VERT_ATTRIB_TEX0, v[0]);
-}
-
-static void GLAPIENTRY
-save_TexCoord2f(GLfloat x, GLfloat y)
-{
-   save_Attr2fNV(VERT_ATTRIB_TEX0, x, y);
-}
-
-static void GLAPIENTRY
-save_TexCoord2fv(const GLfloat * v)
-{
-   save_Attr2fNV(VERT_ATTRIB_TEX0, v[0], v[1]);
-}
-
-static void GLAPIENTRY
-save_TexCoord3f(GLfloat x, GLfloat y, GLfloat z)
-{
-   save_Attr3fNV(VERT_ATTRIB_TEX0, x, y, z);
-}
-
-static void GLAPIENTRY
-save_TexCoord3fv(const GLfloat * v)
-{
-   save_Attr3fNV(VERT_ATTRIB_TEX0, v[0], v[1], v[2]);
-}
-
-static void GLAPIENTRY
-save_TexCoord4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   save_Attr4fNV(VERT_ATTRIB_TEX0, x, y, z, w);
-}
-
-static void GLAPIENTRY
-save_TexCoord4fv(const GLfloat * v)
-{
-   save_Attr4fNV(VERT_ATTRIB_TEX0, v[0], v[1], v[2], v[3]);
-}
-
-static void GLAPIENTRY
-save_Normal3f(GLfloat x, GLfloat y, GLfloat z)
-{
-   save_Attr3fNV(VERT_ATTRIB_NORMAL, x, y, z);
-}
-
-static void GLAPIENTRY
-save_Normal3fv(const GLfloat * v)
-{
-   save_Attr3fNV(VERT_ATTRIB_NORMAL, v[0], v[1], v[2]);
-}
-
-static void GLAPIENTRY
-save_FogCoordfEXT(GLfloat x)
-{
-   save_Attr1fNV(VERT_ATTRIB_FOG, x);
-}
-
-static void GLAPIENTRY
-save_FogCoordfvEXT(const GLfloat * v)
-{
-   save_Attr1fNV(VERT_ATTRIB_FOG, v[0]);
-}
-
-static void GLAPIENTRY
-save_Color3f(GLfloat x, GLfloat y, GLfloat z)
-{
-   save_Attr3fNV(VERT_ATTRIB_COLOR0, x, y, z);
-}
-
-static void GLAPIENTRY
-save_Color3fv(const GLfloat * v)
-{
-   save_Attr3fNV(VERT_ATTRIB_COLOR0, v[0], v[1], v[2]);
-}
-
-static void GLAPIENTRY
-save_Color4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   save_Attr4fNV(VERT_ATTRIB_COLOR0, x, y, z, w);
-}
-
-static void GLAPIENTRY
-save_Color4fv(const GLfloat * v)
-{
-   save_Attr4fNV(VERT_ATTRIB_COLOR0, v[0], v[1], v[2], v[3]);
-}
-
-static void GLAPIENTRY
-save_SecondaryColor3fEXT(GLfloat x, GLfloat y, GLfloat z)
-{
-   save_Attr3fNV(VERT_ATTRIB_COLOR1, x, y, z);
-}
-
-static void GLAPIENTRY
-save_SecondaryColor3fvEXT(const GLfloat * v)
-{
-   save_Attr3fNV(VERT_ATTRIB_COLOR1, v[0], v[1], v[2]);
-}
-
-
-/* Just call the respective ATTR for texcoord
- */
-static void GLAPIENTRY
-save_MultiTexCoord1f(GLenum target, GLfloat x)
-{
-   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
-   save_Attr1fNV(attr, x);
-}
-
-static void GLAPIENTRY
-save_MultiTexCoord1fv(GLenum target, const GLfloat * v)
-{
-   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
-   save_Attr1fNV(attr, v[0]);
-}
-
-static void GLAPIENTRY
-save_MultiTexCoord2f(GLenum target, GLfloat x, GLfloat y)
-{
-   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
-   save_Attr2fNV(attr, x, y);
-}
-
-static void GLAPIENTRY
-save_MultiTexCoord2fv(GLenum target, const GLfloat * v)
-{
-   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
-   save_Attr2fNV(attr, v[0], v[1]);
-}
-
-static void GLAPIENTRY
-save_MultiTexCoord3f(GLenum target, GLfloat x, GLfloat y, GLfloat z)
-{
-   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
-   save_Attr3fNV(attr, x, y, z);
-}
-
-static void GLAPIENTRY
-save_MultiTexCoord3fv(GLenum target, const GLfloat * v)
-{
-   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
-   save_Attr3fNV(attr, v[0], v[1], v[2]);
-}
-
-static void GLAPIENTRY
-save_MultiTexCoord4f(GLenum target, GLfloat x, GLfloat y,
-                     GLfloat z, GLfloat w)
-{
-   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
-   save_Attr4fNV(attr, x, y, z, w);
-}
-
-static void GLAPIENTRY
-save_MultiTexCoord4fv(GLenum target, const GLfloat * v)
-{
-   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
-   save_Attr4fNV(attr, v[0], v[1], v[2], v[3]);
-}
-
-
-/**
- * Record a GL_INVALID_VALUE error when a invalid vertex attribute
- * index is found.
- */
-static void
-index_error(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_error(ctx, GL_INVALID_VALUE, "VertexAttribf(index)");
-}
-
-
-/* First level for NV_vertex_program:
- *
- * Check for errors at compile time?.
- */
-static void GLAPIENTRY
-save_VertexAttrib1fNV(GLuint index, GLfloat x)
-{
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
-      save_Attr1fNV(index, x);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib1fvNV(GLuint index, const GLfloat * v)
-{
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
-      save_Attr1fNV(index, v[0]);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib2fNV(GLuint index, GLfloat x, GLfloat y)
-{
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
-      save_Attr2fNV(index, x, y);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib2fvNV(GLuint index, const GLfloat * v)
-{
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
-      save_Attr2fNV(index, v[0], v[1]);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib3fNV(GLuint index, GLfloat x, GLfloat y, GLfloat z)
-{
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
-      save_Attr3fNV(index, x, y, z);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib3fvNV(GLuint index, const GLfloat * v)
-{
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
-      save_Attr3fNV(index, v[0], v[1], v[2]);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib4fNV(GLuint index, GLfloat x, GLfloat y,
-                      GLfloat z, GLfloat w)
-{
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
-      save_Attr4fNV(index, x, y, z, w);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib4fvNV(GLuint index, const GLfloat * v)
-{
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)
-      save_Attr4fNV(index, v[0], v[1], v[2], v[3]);
-   else
-      index_error();
-}
-
-
-
-
-static void GLAPIENTRY
-save_VertexAttrib1fARB(GLuint index, GLfloat x)
-{
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      save_Attr1fARB(index, x);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib1fvARB(GLuint index, const GLfloat * v)
-{
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      save_Attr1fARB(index, v[0]);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib2fARB(GLuint index, GLfloat x, GLfloat y)
-{
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      save_Attr2fARB(index, x, y);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib2fvARB(GLuint index, const GLfloat * v)
-{
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      save_Attr2fARB(index, v[0], v[1]);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib3fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z)
-{
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      save_Attr3fARB(index, x, y, z);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib3fvARB(GLuint index, const GLfloat * v)
-{
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      save_Attr3fARB(index, v[0], v[1], v[2]);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib4fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z,
-                       GLfloat w)
-{
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      save_Attr4fARB(index, x, y, z, w);
-   else
-      index_error();
-}
-
-static void GLAPIENTRY
-save_VertexAttrib4fvARB(GLuint index, const GLfloat * v)
-{
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      save_Attr4fARB(index, v[0], v[1], v[2], v[3]);
-   else
-      index_error();
-}
-
-
-/* GL_ARB_shader_objects, GL_ARB_vertex/fragment_shader */
-
-static void GLAPIENTRY
-exec_BindAttribLocationARB(GLuint program, GLuint index, const GLchar *name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_BindAttribLocationARB(ctx->Exec, (program, index, name));
-}
-
-static GLint GLAPIENTRY
-exec_GetAttribLocationARB(GLuint program, const GLchar *name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   return CALL_GetAttribLocationARB(ctx->Exec, (program, name));
-}
-
-static GLint GLAPIENTRY
-exec_GetUniformLocationARB(GLuint program, const GLchar *name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   return CALL_GetUniformLocationARB(ctx->Exec, (program, name));
-}
-/* XXX more shader functions needed here */
-
-
-#if FEATURE_EXT_framebuffer_blit
-static void GLAPIENTRY
-save_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                        GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                        GLbitfield mask, GLenum filter)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BLIT_FRAMEBUFFER, 10);
-   if (n) {
-      n[1].i = srcX0;
-      n[2].i = srcY0;
-      n[3].i = srcX1;
-      n[4].i = srcY1;
-      n[5].i = dstX0;
-      n[6].i = dstY0;
-      n[7].i = dstX1;
-      n[8].i = dstY1;
-      n[9].i = mask;
-      n[10].e = filter;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BlitFramebufferEXT(ctx->Exec, (srcX0, srcY0, srcX1, srcY1,
-                                          dstX0, dstY0, dstX1, dstY1,
-                                          mask, filter));
-   }
-}
-#endif
-
-
-/** GL_EXT_provoking_vertex */
-static void GLAPIENTRY
-save_ProvokingVertexEXT(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_PROVOKING_VERTEX, 1);
-   if (n) {
-      n[1].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_ProvokingVertexEXT(ctx->Exec, (mode));*/
-      _mesa_ProvokingVertexEXT(mode);
-   }
-}
-
-
-/** GL_EXT_transform_feedback */
-static void GLAPIENTRY
-save_BeginTransformFeedback(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_BEGIN_TRANSFORM_FEEDBACK, 1);
-   if (n) {
-      n[1].e = mode;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_BeginTransformFeedbackEXT(ctx->Exec, (mode));
-   }
-}
-
-
-/** GL_EXT_transform_feedback */
-static void GLAPIENTRY
-save_EndTransformFeedback(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   (void) alloc_instruction(ctx, OPCODE_END_TRANSFORM_FEEDBACK, 0);
-   if (ctx->ExecuteFlag) {
-      CALL_EndTransformFeedbackEXT(ctx->Exec, ());
-   }
-}
-
-
-/* aka UseProgram() */
-static void GLAPIENTRY
-save_UseProgramObjectARB(GLhandleARB program)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_USE_PROGRAM, 1);
-   if (n) {
-      n[1].ui = program;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_UseProgramObjectARB(ctx->Exec, (program));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Uniform1fARB(GLint location, GLfloat x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_1F, 2);
-   if (n) {
-      n[1].i = location;
-      n[2].f = x;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform1fARB(ctx->Exec, (location, x));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Uniform2fARB(GLint location, GLfloat x, GLfloat y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_2F, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].f = x;
-      n[3].f = y;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform2fARB(ctx->Exec, (location, x, y));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Uniform3fARB(GLint location, GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_3F, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].f = x;
-      n[3].f = y;
-      n[4].f = z;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform3fARB(ctx->Exec, (location, x, y, z));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Uniform4fARB(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_4F, 5);
-   if (n) {
-      n[1].i = location;
-      n[2].f = x;
-      n[3].f = y;
-      n[4].f = z;
-      n[5].f = w;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform4fARB(ctx->Exec, (location, x, y, z, w));
-   }
-}
-
-
-/** Return copy of memory */
-static void *
-memdup(const void *src, GLsizei bytes)
-{
-   void *b = bytes >= 0 ? malloc(bytes) : NULL;
-   if (b)
-      memcpy(b, src, bytes);
-   return b;
-}
-
-
-static void GLAPIENTRY
-save_Uniform1fvARB(GLint location, GLsizei count, const GLfloat *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_1FV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 1 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform1fvARB(ctx->Exec, (location, count, v));
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform2fvARB(GLint location, GLsizei count, const GLfloat *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_2FV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 2 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform2fvARB(ctx->Exec, (location, count, v));
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform3fvARB(GLint location, GLsizei count, const GLfloat *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_3FV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 3 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform3fvARB(ctx->Exec, (location, count, v));
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform4fvARB(GLint location, GLsizei count, const GLfloat *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_4FV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 4 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform4fvARB(ctx->Exec, (location, count, v));
-   }
-}
-
-
-static void GLAPIENTRY
-save_Uniform1iARB(GLint location, GLint x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_1I, 2);
-   if (n) {
-      n[1].i = location;
-      n[2].i = x;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform1iARB(ctx->Exec, (location, x));
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform2iARB(GLint location, GLint x, GLint y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_2I, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = x;
-      n[3].i = y;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform2iARB(ctx->Exec, (location, x, y));
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform3iARB(GLint location, GLint x, GLint y, GLint z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_3I, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].i = x;
-      n[3].i = y;
-      n[4].i = z;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform3iARB(ctx->Exec, (location, x, y, z));
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform4iARB(GLint location, GLint x, GLint y, GLint z, GLint w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_4I, 5);
-   if (n) {
-      n[1].i = location;
-      n[2].i = x;
-      n[3].i = y;
-      n[4].i = z;
-      n[5].i = w;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform4iARB(ctx->Exec, (location, x, y, z, w));
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_Uniform1ivARB(GLint location, GLsizei count, const GLint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_1IV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 1 * sizeof(GLint));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform1ivARB(ctx->Exec, (location, count, v));
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform2ivARB(GLint location, GLsizei count, const GLint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_2IV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 2 * sizeof(GLint));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform2ivARB(ctx->Exec, (location, count, v));
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform3ivARB(GLint location, GLsizei count, const GLint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_3IV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 3 * sizeof(GLint));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform3ivARB(ctx->Exec, (location, count, v));
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform4ivARB(GLint location, GLsizei count, const GLint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_4IV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 4 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_Uniform4ivARB(ctx->Exec, (location, count, v));
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_Uniform1ui(GLint location, GLuint x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_1UI, 2);
-   if (n) {
-      n[1].i = location;
-      n[2].i = x;
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_Uniform1ui(ctx->Exec, (location, x));*/
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform2ui(GLint location, GLuint x, GLuint y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_2UI, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = x;
-      n[3].i = y;
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_Uniform2ui(ctx->Exec, (location, x, y));*/
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform3ui(GLint location, GLuint x, GLuint y, GLuint z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_3UI, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].i = x;
-      n[3].i = y;
-      n[4].i = z;
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_Uniform3ui(ctx->Exec, (location, x, y, z));*/
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform4ui(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_4UI, 5);
-   if (n) {
-      n[1].i = location;
-      n[2].i = x;
-      n[3].i = y;
-      n[4].i = z;
-      n[5].i = w;
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_Uniform4ui(ctx->Exec, (location, x, y, z, w));*/
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_Uniform1uiv(GLint location, GLsizei count, const GLuint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_1UIV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 1 * sizeof(*v));
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_Uniform1uiv(ctx->Exec, (location, count, v));*/
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform2uiv(GLint location, GLsizei count, const GLuint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_2UIV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 2 * sizeof(*v));
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_Uniform2uiv(ctx->Exec, (location, count, v));*/
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform3uiv(GLint location, GLsizei count, const GLuint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_3UIV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 3 * sizeof(*v));
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_Uniform3uiv(ctx->Exec, (location, count, v));*/
-   }
-}
-
-static void GLAPIENTRY
-save_Uniform4uiv(GLint location, GLsizei count, const GLuint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_4UIV, 3);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].data = memdup(v, count * 4 * sizeof(*v));
-   }
-   if (ctx->ExecuteFlag) {
-      /*CALL_Uniform4uiv(ctx->Exec, (location, count, v));*/
-   }
-}
-
-
-
-static void GLAPIENTRY
-save_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *m)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX22, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].b = transpose;
-      n[4].data = memdup(m, count * 2 * 2 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix2fvARB(ctx->Exec, (location, count, transpose, m));
-   }
-}
-
-static void GLAPIENTRY
-save_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *m)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX33, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].b = transpose;
-      n[4].data = memdup(m, count * 3 * 3 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix3fvARB(ctx->Exec, (location, count, transpose, m));
-   }
-}
-
-static void GLAPIENTRY
-save_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *m)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX44, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].b = transpose;
-      n[4].data = memdup(m, count * 4 * 4 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix4fvARB(ctx->Exec, (location, count, transpose, m));
-   }
-}
-
-
-static void GLAPIENTRY
-save_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
-                        const GLfloat *m)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX23, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].b = transpose;
-      n[4].data = memdup(m, count * 2 * 3 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix2x3fv(ctx->Exec, (location, count, transpose, m));
-   }
-}
-
-static void GLAPIENTRY
-save_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,
-                        const GLfloat *m)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX32, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].b = transpose;
-      n[4].data = memdup(m, count * 3 * 2 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix3x2fv(ctx->Exec, (location, count, transpose, m));
-   }
-}
-
-
-static void GLAPIENTRY
-save_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,
-                        const GLfloat *m)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX24, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].b = transpose;
-      n[4].data = memdup(m, count * 2 * 4 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix2x4fv(ctx->Exec, (location, count, transpose, m));
-   }
-}
-
-static void GLAPIENTRY
-save_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,
-                        const GLfloat *m)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX42, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].b = transpose;
-      n[4].data = memdup(m, count * 4 * 2 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix4x2fv(ctx->Exec, (location, count, transpose, m));
-   }
-}
-
-
-static void GLAPIENTRY
-save_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,
-                        const GLfloat *m)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX34, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].b = transpose;
-      n[4].data = memdup(m, count * 3 * 4 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix3x4fv(ctx->Exec, (location, count, transpose, m));
-   }
-}
-
-static void GLAPIENTRY
-save_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
-                        const GLfloat *m)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX43, 4);
-   if (n) {
-      n[1].i = location;
-      n[2].i = count;
-      n[3].b = transpose;
-      n[4].data = memdup(m, count * 4 * 3 * sizeof(GLfloat));
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_UniformMatrix4x3fv(ctx->Exec, (location, count, transpose, m));
-   }
-}
-
-static void GLAPIENTRY
-save_ClampColorARB(GLenum target, GLenum clamp)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLAMP_COLOR, 2);
-   if (n) {
-      n[1].e = target;
-      n[2].e = clamp;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ClampColorARB(ctx->Exec, (target, clamp));
-   }
-}
-
-static void GLAPIENTRY
-save_UseShaderProgramEXT(GLenum type, GLuint program)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_USE_SHADER_PROGRAM_EXT, 2);
-   if (n) {
-      n[1].ui = type;
-      n[2].ui = program;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_UseShaderProgramEXT(ctx->Exec, (type, program));
-   }
-}
-
-static void GLAPIENTRY
-save_ActiveProgramEXT(GLuint program)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_ACTIVE_PROGRAM_EXT, 1);
-   if (n) {
-      n[1].ui = program;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ActiveProgramEXT(ctx->Exec, (program));
-   }
-}
-
-/** GL_EXT_texture_integer */
-static void GLAPIENTRY
-save_ClearColorIi(GLint red, GLint green, GLint blue, GLint alpha)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEARCOLOR_I, 4);
-   if (n) {
-      n[1].i = red;
-      n[2].i = green;
-      n[3].i = blue;
-      n[4].i = alpha;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ClearColorIiEXT(ctx->Exec, (red, green, blue, alpha));
-   }
-}
-
-/** GL_EXT_texture_integer */
-static void GLAPIENTRY
-save_ClearColorIui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_CLEARCOLOR_UI, 4);
-   if (n) {
-      n[1].ui = red;
-      n[2].ui = green;
-      n[3].ui = blue;
-      n[4].ui = alpha;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_ClearColorIuiEXT(ctx->Exec, (red, green, blue, alpha));
-   }
-}
-
-/** GL_EXT_texture_integer */
-static void GLAPIENTRY
-save_TexParameterIiv(GLenum target, GLenum pname, const GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_TEXPARAMETER_I, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].e = pname;
-      n[3].i = params[0];
-      n[4].i = params[1];
-      n[5].i = params[2];
-      n[6].i = params[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_TexParameterIivEXT(ctx->Exec, (target, pname, params));
-   }
-}
-
-/** GL_EXT_texture_integer */
-static void GLAPIENTRY
-save_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_TEXPARAMETER_UI, 6);
-   if (n) {
-      n[1].e = target;
-      n[2].e = pname;
-      n[3].ui = params[0];
-      n[4].ui = params[1];
-      n[5].ui = params[2];
-      n[6].ui = params[3];
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_TexParameterIuivEXT(ctx->Exec, (target, pname, params));
-   }
-}
-
-/** GL_EXT_texture_integer */
-static void GLAPIENTRY
-exec_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexParameterIivEXT(ctx->Exec, (target, pname, params));
-}
-
-/** GL_EXT_texture_integer */
-static void GLAPIENTRY
-exec_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexParameterIuivEXT(ctx->Exec, (target, pname, params));
-}
-
-
-/* GL_ARB_instanced_arrays */
-static void
-save_VertexAttribDivisor(GLuint index, GLuint divisor)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   Node *n;
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   n = alloc_instruction(ctx, OPCODE_VERTEX_ATTRIB_DIVISOR, 2);
-   if (n) {
-      n[1].ui = index;
-      n[2].ui = divisor;
-   }
-   if (ctx->ExecuteFlag) {
-      CALL_VertexAttribDivisorARB(ctx->Exec, (index, divisor));
-   }
-}
-
-
-/* GL_NV_texture_barrier */
-static void
-save_TextureBarrierNV(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
-   alloc_instruction(ctx, OPCODE_TEXTURE_BARRIER_NV, 0);
-   if (ctx->ExecuteFlag) {
-      CALL_TextureBarrierNV(ctx->Exec, ());
-   }
-}
-
-
-/**
- * Save an error-generating command into display list.
- *
- * KW: Will appear in the list before the vertex buffer containing the
- * command that provoked the error.  I don't see this as a problem.
- */
-static void
-save_error(struct gl_context *ctx, GLenum error, const char *s)
-{
-   Node *n;
-   n = alloc_instruction(ctx, OPCODE_ERROR, 2);
-   if (n) {
-      n[1].e = error;
-      n[2].data = (void *) s;
-   }
-}
-
-
-/**
- * Compile an error into current display list.
- */
-void
-_mesa_compile_error(struct gl_context *ctx, GLenum error, const char *s)
-{
-   if (ctx->CompileFlag)
-      save_error(ctx, error, s);
-   if (ctx->ExecuteFlag)
-      _mesa_error(ctx, error, "%s", s);
-}
-
-
-/**
- * Test if ID names a display list.
- */
-static GLboolean
-islist(struct gl_context *ctx, GLuint list)
-{
-   if (list > 0 && lookup_list(ctx, list)) {
-      return GL_TRUE;
-   }
-   else {
-      return GL_FALSE;
-   }
-}
-
-
-
-/**********************************************************************/
-/*                     Display list execution                         */
-/**********************************************************************/
-
-
-/*
- * Execute a display list.  Note that the ListBase offset must have already
- * been added before calling this function.  I.e. the list argument is
- * the absolute list number, not relative to ListBase.
- * \param list - display list number
- */
-static void
-execute_list(struct gl_context *ctx, GLuint list)
-{
-   struct gl_display_list *dlist;
-   Node *n;
-   GLboolean done;
-
-   if (list == 0 || !islist(ctx, list))
-      return;
-
-   if (ctx->ListState.CallDepth == MAX_LIST_NESTING) {
-      /* raise an error? */
-      return;
-   }
-
-   dlist = lookup_list(ctx, list);
-   if (!dlist)
-      return;
-
-   ctx->ListState.CallDepth++;
-
-   if (ctx->Driver.BeginCallList)
-      ctx->Driver.BeginCallList(ctx, dlist);
-
-   n = dlist->Head;
-
-   done = GL_FALSE;
-   while (!done) {
-      const OpCode opcode = n[0].opcode;
-
-      if (is_ext_opcode(opcode)) {
-         n += ext_opcode_execute(ctx, n);
-      }
-      else {
-         switch (opcode) {
-         case OPCODE_ERROR:
-            _mesa_error(ctx, n[1].e, "%s", (const char *) n[2].data);
-            break;
-         case OPCODE_ACCUM:
-            CALL_Accum(ctx->Exec, (n[1].e, n[2].f));
-            break;
-         case OPCODE_ALPHA_FUNC:
-            CALL_AlphaFunc(ctx->Exec, (n[1].e, n[2].f));
-            break;
-         case OPCODE_BIND_TEXTURE:
-            CALL_BindTexture(ctx->Exec, (n[1].e, n[2].ui));
-            break;
-         case OPCODE_BITMAP:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_Bitmap(ctx->Exec, ((GLsizei) n[1].i, (GLsizei) n[2].i,
-                                       n[3].f, n[4].f, n[5].f, n[6].f,
-                                       (const GLubyte *) n[7].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_BLEND_COLOR:
-            CALL_BlendColor(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));
-            break;
-         case OPCODE_BLEND_EQUATION:
-            CALL_BlendEquation(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_BLEND_EQUATION_SEPARATE:
-            CALL_BlendEquationSeparateEXT(ctx->Exec, (n[1].e, n[2].e));
-            break;
-         case OPCODE_BLEND_FUNC_SEPARATE:
-            CALL_BlendFuncSeparateEXT(ctx->Exec,
-                                      (n[1].e, n[2].e, n[3].e, n[4].e));
-            break;
-
-         case OPCODE_BLEND_FUNC_I:
-            /* GL_ARB_draw_buffers_blend */
-            CALL_BlendFunciARB(ctx->Exec, (n[1].ui, n[2].e, n[3].e));
-            break;
-         case OPCODE_BLEND_FUNC_SEPARATE_I:
-            /* GL_ARB_draw_buffers_blend */
-            CALL_BlendFuncSeparateiARB(ctx->Exec, (n[1].ui, n[2].e, n[3].e,
-                                                   n[4].e, n[5].e));
-            break;
-         case OPCODE_BLEND_EQUATION_I:
-            /* GL_ARB_draw_buffers_blend */
-            CALL_BlendEquationiARB(ctx->Exec, (n[1].ui, n[2].e));
-            break;
-         case OPCODE_BLEND_EQUATION_SEPARATE_I:
-            /* GL_ARB_draw_buffers_blend */
-            CALL_BlendEquationSeparateiARB(ctx->Exec,
-                                           (n[1].ui, n[2].e, n[3].e));
-            break;
-
-         case OPCODE_CALL_LIST:
-            /* Generated by glCallList(), don't add ListBase */
-            if (ctx->ListState.CallDepth < MAX_LIST_NESTING) {
-               execute_list(ctx, n[1].ui);
-            }
-            break;
-         case OPCODE_CALL_LIST_OFFSET:
-            /* Generated by glCallLists() so we must add ListBase */
-            if (n[2].b) {
-               /* user specified a bad data type at compile time */
-               _mesa_error(ctx, GL_INVALID_ENUM, "glCallLists(type)");
-            }
-            else if (ctx->ListState.CallDepth < MAX_LIST_NESTING) {
-               GLuint list = (GLuint) (ctx->List.ListBase + n[1].i);
-               execute_list(ctx, list);
-            }
-            break;
-         case OPCODE_CLEAR:
-            CALL_Clear(ctx->Exec, (n[1].bf));
-            break;
-         case OPCODE_CLEAR_BUFFER_IV:
-            {
-               GLint value[4];
-               value[0] = n[3].i;
-               value[1] = n[4].i;
-               value[2] = n[5].i;
-               value[3] = n[6].i;
-               /*CALL_ClearBufferiv(ctx->Exec, (n[1].e, n[2].i, value));*/
-            }
-            break;
-         case OPCODE_CLEAR_BUFFER_UIV:
-            {
-               GLuint value[4];
-               value[0] = n[3].ui;
-               value[1] = n[4].ui;
-               value[2] = n[5].ui;
-               value[3] = n[6].ui;
-               /*CALL_ClearBufferiv(ctx->Exec, (n[1].e, n[2].i, value));*/
-            }
-            break;
-         case OPCODE_CLEAR_BUFFER_FV:
-            {
-               GLfloat value[4];
-               value[0] = n[3].f;
-               value[1] = n[4].f;
-               value[2] = n[5].f;
-               value[3] = n[6].f;
-               /*CALL_ClearBufferfv(ctx->Exec, (n[1].e, n[2].i, value));*/
-            }
-            break;
-         case OPCODE_CLEAR_BUFFER_FI:
-            /*CALL_ClearBufferfi(ctx->Exec, (n[1].e, n[2].i, n[3].f, n[4].i));*/
-            break;
-         case OPCODE_CLEAR_COLOR:
-            CALL_ClearColor(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));
-            break;
-         case OPCODE_CLEAR_ACCUM:
-            CALL_ClearAccum(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));
-            break;
-         case OPCODE_CLEAR_DEPTH:
-            CALL_ClearDepth(ctx->Exec, ((GLclampd) n[1].f));
-            break;
-         case OPCODE_CLEAR_INDEX:
-            CALL_ClearIndex(ctx->Exec, ((GLfloat) n[1].ui));
-            break;
-         case OPCODE_CLEAR_STENCIL:
-            CALL_ClearStencil(ctx->Exec, (n[1].i));
-            break;
-         case OPCODE_CLIP_PLANE:
-            {
-               GLdouble eq[4];
-               eq[0] = n[2].f;
-               eq[1] = n[3].f;
-               eq[2] = n[4].f;
-               eq[3] = n[5].f;
-               CALL_ClipPlane(ctx->Exec, (n[1].e, eq));
-            }
-            break;
-         case OPCODE_COLOR_MASK:
-            CALL_ColorMask(ctx->Exec, (n[1].b, n[2].b, n[3].b, n[4].b));
-            break;
-         case OPCODE_COLOR_MASK_INDEXED:
-            CALL_ColorMaskIndexedEXT(ctx->Exec, (n[1].ui, n[2].b, n[3].b,
-                                                 n[4].b, n[5].b));
-            break;
-         case OPCODE_COLOR_MATERIAL:
-            CALL_ColorMaterial(ctx->Exec, (n[1].e, n[2].e));
-            break;
-         case OPCODE_COLOR_TABLE:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_ColorTable(ctx->Exec, (n[1].e, n[2].e, n[3].i, n[4].e,
-                                           n[5].e, n[6].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_COLOR_TABLE_PARAMETER_FV:
-            {
-               GLfloat params[4];
-               params[0] = n[3].f;
-               params[1] = n[4].f;
-               params[2] = n[5].f;
-               params[3] = n[6].f;
-               CALL_ColorTableParameterfv(ctx->Exec,
-                                          (n[1].e, n[2].e, params));
-            }
-            break;
-         case OPCODE_COLOR_TABLE_PARAMETER_IV:
-            {
-               GLint params[4];
-               params[0] = n[3].i;
-               params[1] = n[4].i;
-               params[2] = n[5].i;
-               params[3] = n[6].i;
-               CALL_ColorTableParameteriv(ctx->Exec,
-                                          (n[1].e, n[2].e, params));
-            }
-            break;
-         case OPCODE_COLOR_SUB_TABLE:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_ColorSubTable(ctx->Exec, (n[1].e, n[2].i, n[3].i,
-                                              n[4].e, n[5].e, n[6].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_CONVOLUTION_FILTER_1D:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_ConvolutionFilter1D(ctx->Exec, (n[1].e, n[2].i, n[3].i,
-                                                    n[4].e, n[5].e,
-                                                    n[6].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_CONVOLUTION_FILTER_2D:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_ConvolutionFilter2D(ctx->Exec, (n[1].e, n[2].i, n[3].i,
-                                                    n[4].i, n[5].e, n[6].e,
-                                                    n[7].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_CONVOLUTION_PARAMETER_I:
-            CALL_ConvolutionParameteri(ctx->Exec, (n[1].e, n[2].e, n[3].i));
-            break;
-         case OPCODE_CONVOLUTION_PARAMETER_IV:
-            {
-               GLint params[4];
-               params[0] = n[3].i;
-               params[1] = n[4].i;
-               params[2] = n[5].i;
-               params[3] = n[6].i;
-               CALL_ConvolutionParameteriv(ctx->Exec,
-                                           (n[1].e, n[2].e, params));
-            }
-            break;
-         case OPCODE_CONVOLUTION_PARAMETER_F:
-            CALL_ConvolutionParameterf(ctx->Exec, (n[1].e, n[2].e, n[3].f));
-            break;
-         case OPCODE_CONVOLUTION_PARAMETER_FV:
-            {
-               GLfloat params[4];
-               params[0] = n[3].f;
-               params[1] = n[4].f;
-               params[2] = n[5].f;
-               params[3] = n[6].f;
-               CALL_ConvolutionParameterfv(ctx->Exec,
-                                           (n[1].e, n[2].e, params));
-            }
-            break;
-         case OPCODE_COPY_COLOR_SUB_TABLE:
-            CALL_CopyColorSubTable(ctx->Exec, (n[1].e, n[2].i,
-                                               n[3].i, n[4].i, n[5].i));
-            break;
-         case OPCODE_COPY_COLOR_TABLE:
-            CALL_CopyColorSubTable(ctx->Exec, (n[1].e, n[2].i,
-                                               n[3].i, n[4].i, n[5].i));
-            break;
-         case OPCODE_COPY_PIXELS:
-            CALL_CopyPixels(ctx->Exec, (n[1].i, n[2].i,
-                                        (GLsizei) n[3].i, (GLsizei) n[4].i,
-                                        n[5].e));
-            break;
-         case OPCODE_COPY_TEX_IMAGE1D:
-            CALL_CopyTexImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].i,
-                                            n[5].i, n[6].i, n[7].i));
-            break;
-         case OPCODE_COPY_TEX_IMAGE2D:
-            CALL_CopyTexImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].i,
-                                            n[5].i, n[6].i, n[7].i, n[8].i));
-            break;
-         case OPCODE_COPY_TEX_SUB_IMAGE1D:
-            CALL_CopyTexSubImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].i,
-                                               n[4].i, n[5].i, n[6].i));
-            break;
-         case OPCODE_COPY_TEX_SUB_IMAGE2D:
-            CALL_CopyTexSubImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].i,
-                                               n[4].i, n[5].i, n[6].i, n[7].i,
-                                               n[8].i));
-            break;
-         case OPCODE_COPY_TEX_SUB_IMAGE3D:
-            CALL_CopyTexSubImage3D(ctx->Exec, (n[1].e, n[2].i, n[3].i,
-                                               n[4].i, n[5].i, n[6].i, n[7].i,
-                                               n[8].i, n[9].i));
-            break;
-         case OPCODE_CULL_FACE:
-            CALL_CullFace(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_DEPTH_FUNC:
-            CALL_DepthFunc(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_DEPTH_MASK:
-            CALL_DepthMask(ctx->Exec, (n[1].b));
-            break;
-         case OPCODE_DEPTH_RANGE:
-            CALL_DepthRange(ctx->Exec,
-                            ((GLclampd) n[1].f, (GLclampd) n[2].f));
-            break;
-         case OPCODE_DISABLE:
-            CALL_Disable(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_DISABLE_INDEXED:
-            CALL_DisableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e));
-            break;
-         case OPCODE_DRAW_BUFFER:
-            CALL_DrawBuffer(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_DRAW_PIXELS:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_DrawPixels(ctx->Exec, (n[1].i, n[2].i, n[3].e, n[4].e,
-                                           n[5].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_ENABLE:
-            CALL_Enable(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_ENABLE_INDEXED:
-            CALL_EnableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e));
-            break;
-         case OPCODE_EVALMESH1:
-            CALL_EvalMesh1(ctx->Exec, (n[1].e, n[2].i, n[3].i));
-            break;
-         case OPCODE_EVALMESH2:
-            CALL_EvalMesh2(ctx->Exec,
-                           (n[1].e, n[2].i, n[3].i, n[4].i, n[5].i));
-            break;
-         case OPCODE_FOG:
-            {
-               GLfloat p[4];
-               p[0] = n[2].f;
-               p[1] = n[3].f;
-               p[2] = n[4].f;
-               p[3] = n[5].f;
-               CALL_Fogfv(ctx->Exec, (n[1].e, p));
-            }
-            break;
-         case OPCODE_FRONT_FACE:
-            CALL_FrontFace(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_FRUSTUM:
-            CALL_Frustum(ctx->Exec,
-                         (n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f));
-            break;
-         case OPCODE_HINT:
-            CALL_Hint(ctx->Exec, (n[1].e, n[2].e));
-            break;
-         case OPCODE_HISTOGRAM:
-            CALL_Histogram(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].b));
-            break;
-         case OPCODE_INDEX_MASK:
-            CALL_IndexMask(ctx->Exec, (n[1].ui));
-            break;
-         case OPCODE_INIT_NAMES:
-            CALL_InitNames(ctx->Exec, ());
-            break;
-         case OPCODE_LIGHT:
-            {
-               GLfloat p[4];
-               p[0] = n[3].f;
-               p[1] = n[4].f;
-               p[2] = n[5].f;
-               p[3] = n[6].f;
-               CALL_Lightfv(ctx->Exec, (n[1].e, n[2].e, p));
-            }
-            break;
-         case OPCODE_LIGHT_MODEL:
-            {
-               GLfloat p[4];
-               p[0] = n[2].f;
-               p[1] = n[3].f;
-               p[2] = n[4].f;
-               p[3] = n[5].f;
-               CALL_LightModelfv(ctx->Exec, (n[1].e, p));
-            }
-            break;
-         case OPCODE_LINE_STIPPLE:
-            CALL_LineStipple(ctx->Exec, (n[1].i, n[2].us));
-            break;
-         case OPCODE_LINE_WIDTH:
-            CALL_LineWidth(ctx->Exec, (n[1].f));
-            break;
-         case OPCODE_LIST_BASE:
-            CALL_ListBase(ctx->Exec, (n[1].ui));
-            break;
-         case OPCODE_LOAD_IDENTITY:
-            CALL_LoadIdentity(ctx->Exec, ());
-            break;
-         case OPCODE_LOAD_MATRIX:
-            if (sizeof(Node) == sizeof(GLfloat)) {
-               CALL_LoadMatrixf(ctx->Exec, (&n[1].f));
-            }
-            else {
-               GLfloat m[16];
-               GLuint i;
-               for (i = 0; i < 16; i++) {
-                  m[i] = n[1 + i].f;
-               }
-               CALL_LoadMatrixf(ctx->Exec, (m));
-            }
-            break;
-         case OPCODE_LOAD_NAME:
-            CALL_LoadName(ctx->Exec, (n[1].ui));
-            break;
-         case OPCODE_LOGIC_OP:
-            CALL_LogicOp(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_MAP1:
-            {
-               GLenum target = n[1].e;
-               GLint ustride = _mesa_evaluator_components(target);
-               GLint uorder = n[5].i;
-               GLfloat u1 = n[2].f;
-               GLfloat u2 = n[3].f;
-               CALL_Map1f(ctx->Exec, (target, u1, u2, ustride, uorder,
-                                      (GLfloat *) n[6].data));
-            }
-            break;
-         case OPCODE_MAP2:
-            {
-               GLenum target = n[1].e;
-               GLfloat u1 = n[2].f;
-               GLfloat u2 = n[3].f;
-               GLfloat v1 = n[4].f;
-               GLfloat v2 = n[5].f;
-               GLint ustride = n[6].i;
-               GLint vstride = n[7].i;
-               GLint uorder = n[8].i;
-               GLint vorder = n[9].i;
-               CALL_Map2f(ctx->Exec, (target, u1, u2, ustride, uorder,
-                                      v1, v2, vstride, vorder,
-                                      (GLfloat *) n[10].data));
-            }
-            break;
-         case OPCODE_MAPGRID1:
-            CALL_MapGrid1f(ctx->Exec, (n[1].i, n[2].f, n[3].f));
-            break;
-         case OPCODE_MAPGRID2:
-            CALL_MapGrid2f(ctx->Exec,
-                           (n[1].i, n[2].f, n[3].f, n[4].i, n[5].f, n[6].f));
-            break;
-         case OPCODE_MATRIX_MODE:
-            CALL_MatrixMode(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_MIN_MAX:
-            CALL_Minmax(ctx->Exec, (n[1].e, n[2].e, n[3].b));
-            break;
-         case OPCODE_MULT_MATRIX:
-            if (sizeof(Node) == sizeof(GLfloat)) {
-               CALL_MultMatrixf(ctx->Exec, (&n[1].f));
-            }
-            else {
-               GLfloat m[16];
-               GLuint i;
-               for (i = 0; i < 16; i++) {
-                  m[i] = n[1 + i].f;
-               }
-               CALL_MultMatrixf(ctx->Exec, (m));
-            }
-            break;
-         case OPCODE_ORTHO:
-            CALL_Ortho(ctx->Exec,
-                       (n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f));
-            break;
-         case OPCODE_PASSTHROUGH:
-            CALL_PassThrough(ctx->Exec, (n[1].f));
-            break;
-         case OPCODE_PIXEL_MAP:
-            CALL_PixelMapfv(ctx->Exec,
-                            (n[1].e, n[2].i, (GLfloat *) n[3].data));
-            break;
-         case OPCODE_PIXEL_TRANSFER:
-            CALL_PixelTransferf(ctx->Exec, (n[1].e, n[2].f));
-            break;
-         case OPCODE_PIXEL_ZOOM:
-            CALL_PixelZoom(ctx->Exec, (n[1].f, n[2].f));
-            break;
-         case OPCODE_POINT_SIZE:
-            CALL_PointSize(ctx->Exec, (n[1].f));
-            break;
-         case OPCODE_POINT_PARAMETERS:
-            {
-               GLfloat params[3];
-               params[0] = n[2].f;
-               params[1] = n[3].f;
-               params[2] = n[4].f;
-               CALL_PointParameterfvEXT(ctx->Exec, (n[1].e, params));
-            }
-            break;
-         case OPCODE_POLYGON_MODE:
-            CALL_PolygonMode(ctx->Exec, (n[1].e, n[2].e));
-            break;
-         case OPCODE_POLYGON_STIPPLE:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_PolygonStipple(ctx->Exec, ((GLubyte *) n[1].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_POLYGON_OFFSET:
-            CALL_PolygonOffset(ctx->Exec, (n[1].f, n[2].f));
-            break;
-         case OPCODE_POP_ATTRIB:
-            CALL_PopAttrib(ctx->Exec, ());
-            break;
-         case OPCODE_POP_MATRIX:
-            CALL_PopMatrix(ctx->Exec, ());
-            break;
-         case OPCODE_POP_NAME:
-            CALL_PopName(ctx->Exec, ());
-            break;
-         case OPCODE_PRIORITIZE_TEXTURE:
-            CALL_PrioritizeTextures(ctx->Exec, (1, &n[1].ui, &n[2].f));
-            break;
-         case OPCODE_PUSH_ATTRIB:
-            CALL_PushAttrib(ctx->Exec, (n[1].bf));
-            break;
-         case OPCODE_PUSH_MATRIX:
-            CALL_PushMatrix(ctx->Exec, ());
-            break;
-         case OPCODE_PUSH_NAME:
-            CALL_PushName(ctx->Exec, (n[1].ui));
-            break;
-         case OPCODE_RASTER_POS:
-            CALL_RasterPos4f(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));
-            break;
-         case OPCODE_READ_BUFFER:
-            CALL_ReadBuffer(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_RESET_HISTOGRAM:
-            CALL_ResetHistogram(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_RESET_MIN_MAX:
-            CALL_ResetMinmax(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_ROTATE:
-            CALL_Rotatef(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));
-            break;
-         case OPCODE_SCALE:
-            CALL_Scalef(ctx->Exec, (n[1].f, n[2].f, n[3].f));
-            break;
-         case OPCODE_SCISSOR:
-            CALL_Scissor(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));
-            break;
-         case OPCODE_SHADE_MODEL:
-            CALL_ShadeModel(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_PROVOKING_VERTEX:
-            CALL_ProvokingVertexEXT(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_BEGIN_TRANSFORM_FEEDBACK:
-            CALL_BeginTransformFeedbackEXT(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_END_TRANSFORM_FEEDBACK:
-            CALL_EndTransformFeedbackEXT(ctx->Exec, ());
-            break;
-         case OPCODE_STENCIL_FUNC:
-            CALL_StencilFunc(ctx->Exec, (n[1].e, n[2].i, n[3].ui));
-            break;
-         case OPCODE_STENCIL_MASK:
-            CALL_StencilMask(ctx->Exec, (n[1].ui));
-            break;
-         case OPCODE_STENCIL_OP:
-            CALL_StencilOp(ctx->Exec, (n[1].e, n[2].e, n[3].e));
-            break;
-         case OPCODE_STENCIL_FUNC_SEPARATE:
-            CALL_StencilFuncSeparate(ctx->Exec,
-                                     (n[1].e, n[2].e, n[3].i, n[4].ui));
-            break;
-         case OPCODE_STENCIL_MASK_SEPARATE:
-            CALL_StencilMaskSeparate(ctx->Exec, (n[1].e, n[2].ui));
-            break;
-         case OPCODE_STENCIL_OP_SEPARATE:
-            CALL_StencilOpSeparate(ctx->Exec,
-                                   (n[1].e, n[2].e, n[3].e, n[4].e));
-            break;
-         case OPCODE_TEXENV:
-            {
-               GLfloat params[4];
-               params[0] = n[3].f;
-               params[1] = n[4].f;
-               params[2] = n[5].f;
-               params[3] = n[6].f;
-               CALL_TexEnvfv(ctx->Exec, (n[1].e, n[2].e, params));
-            }
-            break;
-         case OPCODE_TEXGEN:
-            {
-               GLfloat params[4];
-               params[0] = n[3].f;
-               params[1] = n[4].f;
-               params[2] = n[5].f;
-               params[3] = n[6].f;
-               CALL_TexGenfv(ctx->Exec, (n[1].e, n[2].e, params));
-            }
-            break;
-         case OPCODE_TEXPARAMETER:
-            {
-               GLfloat params[4];
-               params[0] = n[3].f;
-               params[1] = n[4].f;
-               params[2] = n[5].f;
-               params[3] = n[6].f;
-               CALL_TexParameterfv(ctx->Exec, (n[1].e, n[2].e, params));
-            }
-            break;
-         case OPCODE_TEX_IMAGE1D:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_TexImage1D(ctx->Exec, (n[1].e,      /* target */
-                                           n[2].i,      /* level */
-                                           n[3].i,      /* components */
-                                           n[4].i,      /* width */
-                                           n[5].e,      /* border */
-                                           n[6].e,      /* format */
-                                           n[7].e,      /* type */
-                                           n[8].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_TEX_IMAGE2D:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_TexImage2D(ctx->Exec, (n[1].e,      /* target */
-                                           n[2].i,      /* level */
-                                           n[3].i,      /* components */
-                                           n[4].i,      /* width */
-                                           n[5].i,      /* height */
-                                           n[6].e,      /* border */
-                                           n[7].e,      /* format */
-                                           n[8].e,      /* type */
-                                           n[9].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_TEX_IMAGE3D:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_TexImage3D(ctx->Exec, (n[1].e,      /* target */
-                                           n[2].i,      /* level */
-                                           n[3].i,      /* components */
-                                           n[4].i,      /* width */
-                                           n[5].i,      /* height */
-                                           n[6].i,      /* depth  */
-                                           n[7].e,      /* border */
-                                           n[8].e,      /* format */
-                                           n[9].e,      /* type */
-                                           n[10].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_TEX_SUB_IMAGE1D:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_TexSubImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].i,
-                                              n[4].i, n[5].e,
-                                              n[6].e, n[7].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_TEX_SUB_IMAGE2D:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_TexSubImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].i,
-                                              n[4].i, n[5].e,
-                                              n[6].i, n[7].e, n[8].e,
-                                              n[9].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_TEX_SUB_IMAGE3D:
-            {
-               const struct gl_pixelstore_attrib save = ctx->Unpack;
-               ctx->Unpack = ctx->DefaultPacking;
-               CALL_TexSubImage3D(ctx->Exec, (n[1].e, n[2].i, n[3].i,
-                                              n[4].i, n[5].i, n[6].i, n[7].i,
-                                              n[8].i, n[9].e, n[10].e,
-                                              n[11].data));
-               ctx->Unpack = save;      /* restore */
-            }
-            break;
-         case OPCODE_TRANSLATE:
-            CALL_Translatef(ctx->Exec, (n[1].f, n[2].f, n[3].f));
-            break;
-         case OPCODE_VIEWPORT:
-            CALL_Viewport(ctx->Exec, (n[1].i, n[2].i,
-                                      (GLsizei) n[3].i, (GLsizei) n[4].i));
-            break;
-         case OPCODE_WINDOW_POS:
-            CALL_WindowPos4fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));
-            break;
-         case OPCODE_ACTIVE_TEXTURE:   /* GL_ARB_multitexture */
-            CALL_ActiveTextureARB(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_COMPRESSED_TEX_IMAGE_1D:  /* GL_ARB_texture_compression */
-            CALL_CompressedTexImage1DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,
-                                                     n[4].i, n[5].i, n[6].i,
-                                                     n[7].data));
-            break;
-         case OPCODE_COMPRESSED_TEX_IMAGE_2D:  /* GL_ARB_texture_compression */
-            CALL_CompressedTexImage2DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,
-                                                     n[4].i, n[5].i, n[6].i,
-                                                     n[7].i, n[8].data));
-            break;
-         case OPCODE_COMPRESSED_TEX_IMAGE_3D:  /* GL_ARB_texture_compression */
-            CALL_CompressedTexImage3DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,
-                                                     n[4].i, n[5].i, n[6].i,
-                                                     n[7].i, n[8].i,
-                                                     n[9].data));
-            break;
-         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D:      /* GL_ARB_texture_compress */
-            CALL_CompressedTexSubImage1DARB(ctx->Exec,
-                                            (n[1].e, n[2].i, n[3].i, n[4].i,
-                                             n[5].e, n[6].i, n[7].data));
-            break;
-         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D:      /* GL_ARB_texture_compress */
-            CALL_CompressedTexSubImage2DARB(ctx->Exec,
-                                            (n[1].e, n[2].i, n[3].i, n[4].i,
-                                             n[5].i, n[6].i, n[7].e, n[8].i,
-                                             n[9].data));
-            break;
-         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D:      /* GL_ARB_texture_compress */
-            CALL_CompressedTexSubImage3DARB(ctx->Exec,
-                                            (n[1].e, n[2].i, n[3].i, n[4].i,
-                                             n[5].i, n[6].i, n[7].i, n[8].i,
-                                             n[9].e, n[10].i, n[11].data));
-            break;
-         case OPCODE_SAMPLE_COVERAGE:  /* GL_ARB_multisample */
-            CALL_SampleCoverageARB(ctx->Exec, (n[1].f, n[2].b));
-            break;
-         case OPCODE_WINDOW_POS_ARB:   /* GL_ARB_window_pos */
-            CALL_WindowPos3fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f));
-            break;
-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-         case OPCODE_BIND_PROGRAM_NV:  /* GL_NV_vertex_program */
-            CALL_BindProgramNV(ctx->Exec, (n[1].e, n[2].ui));
-            break;
-#endif
-#if FEATURE_NV_vertex_program
-         case OPCODE_EXECUTE_PROGRAM_NV:
-            {
-               GLfloat v[4];
-               v[0] = n[3].f;
-               v[1] = n[4].f;
-               v[2] = n[5].f;
-               v[3] = n[6].f;
-               CALL_ExecuteProgramNV(ctx->Exec, (n[1].e, n[2].ui, v));
-            }
-            break;
-         case OPCODE_REQUEST_RESIDENT_PROGRAMS_NV:
-            CALL_RequestResidentProgramsNV(ctx->Exec, (n[1].ui,
-                                                       (GLuint *) n[2].data));
-            break;
-         case OPCODE_LOAD_PROGRAM_NV:
-            CALL_LoadProgramNV(ctx->Exec, (n[1].e, n[2].ui, n[3].i,
-                                           (const GLubyte *) n[4].data));
-            break;
-         case OPCODE_TRACK_MATRIX_NV:
-            CALL_TrackMatrixNV(ctx->Exec, (n[1].e, n[2].ui, n[3].e, n[4].e));
-            break;
-#endif
-
-#if FEATURE_NV_fragment_program
-         case OPCODE_PROGRAM_LOCAL_PARAMETER_ARB:
-            CALL_ProgramLocalParameter4fARB(ctx->Exec,
-                                            (n[1].e, n[2].ui, n[3].f, n[4].f,
-                                             n[5].f, n[6].f));
-            break;
-         case OPCODE_PROGRAM_NAMED_PARAMETER_NV:
-            CALL_ProgramNamedParameter4fNV(ctx->Exec, (n[1].ui, n[2].i,
-                                                       (const GLubyte *) n[3].
-                                                       data, n[4].f, n[5].f,
-                                                       n[6].f, n[7].f));
-            break;
-#endif
-
-         case OPCODE_ACTIVE_STENCIL_FACE_EXT:
-            CALL_ActiveStencilFaceEXT(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_DEPTH_BOUNDS_EXT:
-            CALL_DepthBoundsEXT(ctx->Exec, (n[1].f, n[2].f));
-            break;
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-         case OPCODE_PROGRAM_STRING_ARB:
-            CALL_ProgramStringARB(ctx->Exec,
-                                  (n[1].e, n[2].e, n[3].i, n[4].data));
-            break;
-#endif
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program || FEATURE_NV_vertex_program
-         case OPCODE_PROGRAM_ENV_PARAMETER_ARB:
-            CALL_ProgramEnvParameter4fARB(ctx->Exec, (n[1].e, n[2].ui, n[3].f,
-                                                      n[4].f, n[5].f,
-                                                      n[6].f));
-            break;
-#endif
-#if FEATURE_queryobj
-         case OPCODE_BEGIN_QUERY_ARB:
-            CALL_BeginQueryARB(ctx->Exec, (n[1].e, n[2].ui));
-            break;
-         case OPCODE_END_QUERY_ARB:
-            CALL_EndQueryARB(ctx->Exec, (n[1].e));
-            break;
-#endif
-         case OPCODE_DRAW_BUFFERS_ARB:
-            {
-               GLenum buffers[MAX_DRAW_BUFFERS];
-               GLint i, count = MIN2(n[1].i, MAX_DRAW_BUFFERS);
-               for (i = 0; i < count; i++)
-                  buffers[i] = n[2 + i].e;
-               CALL_DrawBuffersARB(ctx->Exec, (n[1].i, buffers));
-            }
-            break;
-#if FEATURE_EXT_framebuffer_blit
-	 case OPCODE_BLIT_FRAMEBUFFER:
-	    CALL_BlitFramebufferEXT(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i,
-                                                n[5].i, n[6].i, n[7].i, n[8].i,
-                                                n[9].i, n[10].e));
-	    break;
-#endif
-
-	 case OPCODE_USE_PROGRAM:
-	    CALL_UseProgramObjectARB(ctx->Exec, (n[1].ui));
-	    break;
-	 case OPCODE_USE_SHADER_PROGRAM_EXT:
-	    CALL_UseShaderProgramEXT(ctx->Exec, (n[1].ui, n[2].ui));
-	    break;
-	 case OPCODE_ACTIVE_PROGRAM_EXT:
-	    CALL_ActiveProgramEXT(ctx->Exec, (n[1].ui));
-	    break;
-	 case OPCODE_UNIFORM_1F:
-	    CALL_Uniform1fARB(ctx->Exec, (n[1].i, n[2].f));
-	    break;
-	 case OPCODE_UNIFORM_2F:
-	    CALL_Uniform2fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f));
-	    break;
-	 case OPCODE_UNIFORM_3F:
-	    CALL_Uniform3fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f));
-	    break;
-	 case OPCODE_UNIFORM_4F:
-	    CALL_Uniform4fARB(ctx->Exec,
-                              (n[1].i, n[2].f, n[3].f, n[4].f, n[5].f));
-	    break;
-	 case OPCODE_UNIFORM_1FV:
-	    CALL_Uniform1fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
-	    break;
-	 case OPCODE_UNIFORM_2FV:
-	    CALL_Uniform2fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
-	    break;
-	 case OPCODE_UNIFORM_3FV:
-	    CALL_Uniform3fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
-	    break;
-	 case OPCODE_UNIFORM_4FV:
-	    CALL_Uniform4fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
-	    break;
-	 case OPCODE_UNIFORM_1I:
-	    CALL_Uniform1iARB(ctx->Exec, (n[1].i, n[2].i));
-	    break;
-	 case OPCODE_UNIFORM_2I:
-	    CALL_Uniform2iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i));
-	    break;
-	 case OPCODE_UNIFORM_3I:
-	    CALL_Uniform3iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));
-	    break;
-	 case OPCODE_UNIFORM_4I:
-	    CALL_Uniform4iARB(ctx->Exec,
-                              (n[1].i, n[2].i, n[3].i, n[4].i, n[5].i));
-	    break;
-	 case OPCODE_UNIFORM_1IV:
-	    CALL_Uniform1ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
-	    break;
-	 case OPCODE_UNIFORM_2IV:
-	    CALL_Uniform2ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
-	    break;
-	 case OPCODE_UNIFORM_3IV:
-	    CALL_Uniform3ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
-	    break;
-	 case OPCODE_UNIFORM_4IV:
-	    CALL_Uniform4ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
-	    break;
-	 case OPCODE_UNIFORM_1UI:
-	    /*CALL_Uniform1uiARB(ctx->Exec, (n[1].i, n[2].i));*/
-	    break;
-	 case OPCODE_UNIFORM_2UI:
-	    /*CALL_Uniform2uiARB(ctx->Exec, (n[1].i, n[2].i, n[3].i));*/
-	    break;
-	 case OPCODE_UNIFORM_3UI:
-	    /*CALL_Uniform3uiARB(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));*/
-	    break;
-	 case OPCODE_UNIFORM_4UI:
-	    /*CALL_Uniform4uiARB(ctx->Exec,
-                              (n[1].i, n[2].i, n[3].i, n[4].i, n[5].i));
-            */
-	    break;
-	 case OPCODE_UNIFORM_1UIV:
-	    /*CALL_Uniform1uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/
-	    break;
-	 case OPCODE_UNIFORM_2UIV:
-	    /*CALL_Uniform2uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/
-	    break;
-	 case OPCODE_UNIFORM_3UIV:
-	    /*CALL_Uniform3uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/
-	    break;
-	 case OPCODE_UNIFORM_4UIV:
-	    /*CALL_Uniform4uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/
-	    break;
-	 case OPCODE_UNIFORM_MATRIX22:
-	    CALL_UniformMatrix2fvARB(ctx->Exec,
-                                     (n[1].i, n[2].i, n[3].b, n[4].data));
-	    break;
-	 case OPCODE_UNIFORM_MATRIX33:
-	    CALL_UniformMatrix3fvARB(ctx->Exec,
-                                     (n[1].i, n[2].i, n[3].b, n[4].data));
-	    break;
-	 case OPCODE_UNIFORM_MATRIX44:
-	    CALL_UniformMatrix4fvARB(ctx->Exec,
-                                     (n[1].i, n[2].i, n[3].b, n[4].data));
-	    break;
-	 case OPCODE_UNIFORM_MATRIX23:
-	    CALL_UniformMatrix2x3fv(ctx->Exec,
-                                    (n[1].i, n[2].i, n[3].b, n[4].data));
-	    break;
-	 case OPCODE_UNIFORM_MATRIX32:
-	    CALL_UniformMatrix3x2fv(ctx->Exec,
-                                    (n[1].i, n[2].i, n[3].b, n[4].data));
-	    break;
-	 case OPCODE_UNIFORM_MATRIX24:
-	    CALL_UniformMatrix2x4fv(ctx->Exec,
-                                    (n[1].i, n[2].i, n[3].b, n[4].data));
-	    break;
-	 case OPCODE_UNIFORM_MATRIX42:
-	    CALL_UniformMatrix4x2fv(ctx->Exec,
-                                    (n[1].i, n[2].i, n[3].b, n[4].data));
-	    break;
-	 case OPCODE_UNIFORM_MATRIX34:
-	    CALL_UniformMatrix3x4fv(ctx->Exec,
-                                    (n[1].i, n[2].i, n[3].b, n[4].data));
-	    break;
-	 case OPCODE_UNIFORM_MATRIX43:
-	    CALL_UniformMatrix4x3fv(ctx->Exec,
-                                    (n[1].i, n[2].i, n[3].b, n[4].data));
-	    break;
-
-         case OPCODE_CLAMP_COLOR:
-            CALL_ClampColorARB(ctx->Exec, (n[1].e, n[2].e));
-            break;
-
-         case OPCODE_TEX_BUMP_PARAMETER_ATI:
-            {
-               GLfloat values[4];
-               GLuint i, pname = n[1].ui;
-
-               for (i = 0; i < 4; i++)
-                  values[i] = n[1 + i].f;
-               CALL_TexBumpParameterfvATI(ctx->Exec, (pname, values));
-            }
-            break;
-#if FEATURE_ATI_fragment_shader
-         case OPCODE_BIND_FRAGMENT_SHADER_ATI:
-            CALL_BindFragmentShaderATI(ctx->Exec, (n[1].i));
-            break;
-         case OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI:
-            {
-               GLfloat values[4];
-               GLuint i, dst = n[1].ui;
-
-               for (i = 0; i < 4; i++)
-                  values[i] = n[1 + i].f;
-               CALL_SetFragmentShaderConstantATI(ctx->Exec, (dst, values));
-            }
-            break;
-#endif
-         case OPCODE_ATTR_1F_NV:
-            CALL_VertexAttrib1fNV(ctx->Exec, (n[1].e, n[2].f));
-            break;
-         case OPCODE_ATTR_2F_NV:
-            /* Really shouldn't have to do this - the Node structure
-             * is convenient, but it would be better to store the data
-             * packed appropriately so that it can be sent directly
-             * on.  With x86_64 becoming common, this will start to
-             * matter more.
-             */
-            if (sizeof(Node) == sizeof(GLfloat))
-               CALL_VertexAttrib2fvNV(ctx->Exec, (n[1].e, &n[2].f));
-            else
-               CALL_VertexAttrib2fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f));
-            break;
-         case OPCODE_ATTR_3F_NV:
-            if (sizeof(Node) == sizeof(GLfloat))
-               CALL_VertexAttrib3fvNV(ctx->Exec, (n[1].e, &n[2].f));
-            else
-               CALL_VertexAttrib3fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f,
-                                                 n[4].f));
-            break;
-         case OPCODE_ATTR_4F_NV:
-            if (sizeof(Node) == sizeof(GLfloat))
-               CALL_VertexAttrib4fvNV(ctx->Exec, (n[1].e, &n[2].f));
-            else
-               CALL_VertexAttrib4fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f,
-                                                 n[4].f, n[5].f));
-            break;
-         case OPCODE_ATTR_1F_ARB:
-            CALL_VertexAttrib1fARB(ctx->Exec, (n[1].e, n[2].f));
-            break;
-         case OPCODE_ATTR_2F_ARB:
-            /* Really shouldn't have to do this - the Node structure
-             * is convenient, but it would be better to store the data
-             * packed appropriately so that it can be sent directly
-             * on.  With x86_64 becoming common, this will start to
-             * matter more.
-             */
-            if (sizeof(Node) == sizeof(GLfloat))
-               CALL_VertexAttrib2fvARB(ctx->Exec, (n[1].e, &n[2].f));
-            else
-               CALL_VertexAttrib2fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f));
-            break;
-         case OPCODE_ATTR_3F_ARB:
-            if (sizeof(Node) == sizeof(GLfloat))
-               CALL_VertexAttrib3fvARB(ctx->Exec, (n[1].e, &n[2].f));
-            else
-               CALL_VertexAttrib3fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f,
-                                                  n[4].f));
-            break;
-         case OPCODE_ATTR_4F_ARB:
-            if (sizeof(Node) == sizeof(GLfloat))
-               CALL_VertexAttrib4fvARB(ctx->Exec, (n[1].e, &n[2].f));
-            else
-               CALL_VertexAttrib4fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f,
-                                                  n[4].f, n[5].f));
-            break;
-         case OPCODE_MATERIAL:
-            if (sizeof(Node) == sizeof(GLfloat))
-               CALL_Materialfv(ctx->Exec, (n[1].e, n[2].e, &n[3].f));
-            else {
-               GLfloat f[4];
-               f[0] = n[3].f;
-               f[1] = n[4].f;
-               f[2] = n[5].f;
-               f[3] = n[6].f;
-               CALL_Materialfv(ctx->Exec, (n[1].e, n[2].e, f));
-            }
-            break;
-         case OPCODE_BEGIN:
-            CALL_Begin(ctx->Exec, (n[1].e));
-            break;
-         case OPCODE_END:
-            CALL_End(ctx->Exec, ());
-            break;
-         case OPCODE_RECTF:
-            CALL_Rectf(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));
-            break;
-         case OPCODE_EVAL_C1:
-            CALL_EvalCoord1f(ctx->Exec, (n[1].f));
-            break;
-         case OPCODE_EVAL_C2:
-            CALL_EvalCoord2f(ctx->Exec, (n[1].f, n[2].f));
-            break;
-         case OPCODE_EVAL_P1:
-            CALL_EvalPoint1(ctx->Exec, (n[1].i));
-            break;
-         case OPCODE_EVAL_P2:
-            CALL_EvalPoint2(ctx->Exec, (n[1].i, n[2].i));
-            break;
-
-         /* GL_EXT_texture_integer */
-         case OPCODE_CLEARCOLOR_I:
-            CALL_ClearColorIiEXT(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));
-            break;
-         case OPCODE_CLEARCOLOR_UI:
-            CALL_ClearColorIuiEXT(ctx->Exec,
-                                  (n[1].ui, n[2].ui, n[3].ui, n[4].ui));
-            break;
-         case OPCODE_TEXPARAMETER_I:
-            {
-               GLint params[4];
-               params[0] = n[3].i;
-               params[1] = n[4].i;
-               params[2] = n[5].i;
-               params[3] = n[6].i;
-               CALL_TexParameterIivEXT(ctx->Exec, (n[1].e, n[2].e, params));
-            }
-            break;
-         case OPCODE_TEXPARAMETER_UI:
-            {
-               GLuint params[4];
-               params[0] = n[3].ui;
-               params[1] = n[4].ui;
-               params[2] = n[5].ui;
-               params[3] = n[6].ui;
-               CALL_TexParameterIuivEXT(ctx->Exec, (n[1].e, n[2].e, params));
-            }
-            break;
-
-         case OPCODE_VERTEX_ATTRIB_DIVISOR:
-            /* GL_ARB_instanced_arrays */
-            CALL_VertexAttribDivisorARB(ctx->Exec, (n[1].ui, n[2].ui));
-            break;
-
-         case OPCODE_TEXTURE_BARRIER_NV:
-            CALL_TextureBarrierNV(ctx->Exec, ());
-            break;
-
-         case OPCODE_CONTINUE:
-            n = (Node *) n[1].next;
-            break;
-         case OPCODE_END_OF_LIST:
-            done = GL_TRUE;
-            break;
-         default:
-            {
-               char msg[1000];
-               _mesa_snprintf(msg, sizeof(msg), "Error in execute_list: opcode=%d",
-                             (int) opcode);
-               _mesa_problem(ctx, "%s", msg);
-            }
-            done = GL_TRUE;
-         }
-
-         /* increment n to point to next compiled command */
-         if (opcode != OPCODE_CONTINUE) {
-            n += InstSize[opcode];
-         }
-      }
-   }
-
-   if (ctx->Driver.EndCallList)
-      ctx->Driver.EndCallList(ctx);
-
-   ctx->ListState.CallDepth--;
-}
-
-
-
-/**********************************************************************/
-/*                           GL functions                             */
-/**********************************************************************/
-
-/**
- * Test if a display list number is valid.
- */
-static GLboolean GLAPIENTRY
-_mesa_IsList(GLuint list)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);      /* must be called before assert */
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-   return islist(ctx, list);
-}
-
-
-/**
- * Delete a sequence of consecutive display lists.
- */
-static void GLAPIENTRY
-_mesa_DeleteLists(GLuint list, GLsizei range)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint i;
-   FLUSH_VERTICES(ctx, 0);      /* must be called before assert */
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (range < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteLists");
-      return;
-   }
-   for (i = list; i < list + range; i++) {
-      destroy_list(ctx, i);
-   }
-}
-
-
-/**
- * Return a display list number, n, such that lists n through n+range-1
- * are free.
- */
-static GLuint GLAPIENTRY
-_mesa_GenLists(GLsizei range)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint base;
-   FLUSH_VERTICES(ctx, 0);      /* must be called before assert */
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
-
-   if (range < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenLists");
-      return 0;
-   }
-   if (range == 0) {
-      return 0;
-   }
-
-   /*
-    * Make this an atomic operation
-    */
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-
-   base = _mesa_HashFindFreeKeyBlock(ctx->Shared->DisplayList, range);
-   if (base) {
-      /* reserve the list IDs by with empty/dummy lists */
-      GLint i;
-      for (i = 0; i < range; i++) {
-         _mesa_HashInsert(ctx->Shared->DisplayList, base + i,
-                          make_list(base + i, 1));
-      }
-   }
-
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-
-   return base;
-}
-
-
-/**
- * Begin a new display list.
- */
-static void GLAPIENTRY
-_mesa_NewList(GLuint name, GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   FLUSH_CURRENT(ctx, 0);       /* must be called before assert */
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glNewList %u %s\n", name,
-                  _mesa_lookup_enum_by_nr(mode));
-
-   if (name == 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glNewList");
-      return;
-   }
-
-   if (mode != GL_COMPILE && mode != GL_COMPILE_AND_EXECUTE) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glNewList");
-      return;
-   }
-
-   if (ctx->ListState.CurrentList) {
-      /* already compiling a display list */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glNewList");
-      return;
-   }
-
-   ctx->CompileFlag = GL_TRUE;
-   ctx->ExecuteFlag = (mode == GL_COMPILE_AND_EXECUTE);
-
-   /* Reset acumulated list state:
-    */
-   invalidate_saved_current_state( ctx );
-
-   /* Allocate new display list */
-   ctx->ListState.CurrentList = make_list(name, BLOCK_SIZE);
-   ctx->ListState.CurrentBlock = ctx->ListState.CurrentList->Head;
-   ctx->ListState.CurrentPos = 0;
-
-   ctx->Driver.NewList(ctx, name, mode);
-
-   ctx->CurrentDispatch = ctx->Save;
-   _glapi_set_dispatch(ctx->CurrentDispatch);
-}
-
-
-/**
- * End definition of current display list. 
- */
-static void GLAPIENTRY
-_mesa_EndList(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   SAVE_FLUSH_VERTICES(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glEndList\n");
-
-   /* Check that a list is under construction */
-   if (!ctx->ListState.CurrentList) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glEndList");
-      return;
-   }
-   
-   /* Call before emitting END_OF_LIST, in case the driver wants to
-    * emit opcodes itself.
-    */
-   ctx->Driver.EndList(ctx);
-
-   (void) alloc_instruction(ctx, OPCODE_END_OF_LIST, 0);
-
-   /* Destroy old list, if any */
-   destroy_list(ctx, ctx->ListState.CurrentList->Name);
-
-   /* Install the new list */
-   _mesa_HashInsert(ctx->Shared->DisplayList,
-                    ctx->ListState.CurrentList->Name,
-                    ctx->ListState.CurrentList);
-
-
-   if (MESA_VERBOSE & VERBOSE_DISPLAY_LIST)
-      mesa_print_display_list(ctx->ListState.CurrentList->Name);
-
-   ctx->ListState.CurrentList = NULL;
-   ctx->ExecuteFlag = GL_TRUE;
-   ctx->CompileFlag = GL_FALSE;
-
-   ctx->CurrentDispatch = ctx->Exec;
-   _glapi_set_dispatch(ctx->CurrentDispatch);
-}
-
-
-void GLAPIENTRY
-_mesa_CallList(GLuint list)
-{
-   GLboolean save_compile_flag;
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_CURRENT(ctx, 0);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glCallList %d\n", list);
-
-   if (list == 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glCallList(list==0)");
-      return;
-   }
-
-   if (0)
-      mesa_print_display_list( list );
-
-   /* VERY IMPORTANT:  Save the CompileFlag status, turn it off,
-    * execute the display list, and restore the CompileFlag.
-    */
-   save_compile_flag = ctx->CompileFlag;
-   if (save_compile_flag) {
-      ctx->CompileFlag = GL_FALSE;
-   }
-
-   execute_list(ctx, list);
-   ctx->CompileFlag = save_compile_flag;
-
-   /* also restore API function pointers to point to "save" versions */
-   if (save_compile_flag) {
-      ctx->CurrentDispatch = ctx->Save;
-      _glapi_set_dispatch(ctx->CurrentDispatch);
-   }
-}
-
-
-/**
- * Execute glCallLists:  call multiple display lists.
- */
-void GLAPIENTRY
-_mesa_CallLists(GLsizei n, GLenum type, const GLvoid * lists)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-   GLboolean save_compile_flag;
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glCallLists %d\n", n);
-
-   switch (type) {
-   case GL_BYTE:
-   case GL_UNSIGNED_BYTE:
-   case GL_SHORT:
-   case GL_UNSIGNED_SHORT:
-   case GL_INT:
-   case GL_UNSIGNED_INT:
-   case GL_FLOAT:
-   case GL_2_BYTES:
-   case GL_3_BYTES:
-   case GL_4_BYTES:
-      /* OK */
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCallLists(type)");
-      return;
-   }
-
-   /* Save the CompileFlag status, turn it off, execute display list,
-    * and restore the CompileFlag.
-    */
-   save_compile_flag = ctx->CompileFlag;
-   ctx->CompileFlag = GL_FALSE;
-
-   for (i = 0; i < n; i++) {
-      GLuint list = (GLuint) (ctx->List.ListBase + translate_id(i, type, lists));
-      execute_list(ctx, list);
-   }
-
-   ctx->CompileFlag = save_compile_flag;
-
-   /* also restore API function pointers to point to "save" versions */
-   if (save_compile_flag) {
-      ctx->CurrentDispatch = ctx->Save;
-      _glapi_set_dispatch(ctx->CurrentDispatch);
-   }
-}
-
-
-/**
- * Set the offset added to list numbers in glCallLists.
- */
-static void GLAPIENTRY
-_mesa_ListBase(GLuint base)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);      /* must be called before assert */
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-   ctx->List.ListBase = base;
-}
-
-
-/* Can no longer assume ctx->Exec->Func is equal to _mesa_Func.
- */
-static void GLAPIENTRY
-exec_Finish(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_Finish(ctx->Exec, ());
-}
-
-static void GLAPIENTRY
-exec_Flush(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_Flush(ctx->Exec, ());
-}
-
-static void GLAPIENTRY
-exec_GetBooleanv(GLenum pname, GLboolean *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetBooleanv(ctx->Exec, (pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetClipPlane(GLenum plane, GLdouble * equation)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetClipPlane(ctx->Exec, (plane, equation));
-}
-
-static void GLAPIENTRY
-exec_GetDoublev(GLenum pname, GLdouble *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetDoublev(ctx->Exec, (pname, params));
-}
-
-static GLenum GLAPIENTRY
-exec_GetError(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   return CALL_GetError(ctx->Exec, ());
-}
-
-static void GLAPIENTRY
-exec_GetFloatv(GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetFloatv(ctx->Exec, (pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetIntegerv(GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetIntegerv(ctx->Exec, (pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetLightfv(GLenum light, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetLightfv(ctx->Exec, (light, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetLightiv(GLenum light, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetLightiv(ctx->Exec, (light, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetMapdv(GLenum target, GLenum query, GLdouble * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetMapdv(ctx->Exec, (target, query, v));
-}
-
-static void GLAPIENTRY
-exec_GetMapfv(GLenum target, GLenum query, GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetMapfv(ctx->Exec, (target, query, v));
-}
-
-static void GLAPIENTRY
-exec_GetMapiv(GLenum target, GLenum query, GLint * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetMapiv(ctx->Exec, (target, query, v));
-}
-
-static void GLAPIENTRY
-exec_GetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetMaterialfv(ctx->Exec, (face, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetMaterialiv(GLenum face, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetMaterialiv(ctx->Exec, (face, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetPixelMapfv(GLenum map, GLfloat *values)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetPixelMapfv(ctx->Exec, (map, values));
-}
-
-static void GLAPIENTRY
-exec_GetPixelMapuiv(GLenum map, GLuint *values)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetPixelMapuiv(ctx->Exec, (map, values));
-}
-
-static void GLAPIENTRY
-exec_GetPixelMapusv(GLenum map, GLushort *values)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetPixelMapusv(ctx->Exec, (map, values));
-}
-
-static void GLAPIENTRY
-exec_GetPolygonStipple(GLubyte * dest)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetPolygonStipple(ctx->Exec, (dest));
-}
-
-static const GLubyte *GLAPIENTRY
-exec_GetString(GLenum name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   return CALL_GetString(ctx->Exec, (name));
-}
-
-static void GLAPIENTRY
-exec_GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexEnvfv(ctx->Exec, (target, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetTexEnviv(GLenum target, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexEnviv(ctx->Exec, (target, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexGendv(ctx->Exec, (coord, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexGenfv(ctx->Exec, (coord, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetTexGeniv(GLenum coord, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexGeniv(ctx->Exec, (coord, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetTexImage(GLenum target, GLint level, GLenum format,
-                 GLenum type, GLvoid * pixels)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexImage(ctx->Exec, (target, level, format, type, pixels));
-}
-
-static void GLAPIENTRY
-exec_GetTexLevelParameterfv(GLenum target, GLint level,
-                            GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexLevelParameterfv(ctx->Exec, (target, level, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetTexLevelParameteriv(GLenum target, GLint level,
-                            GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexLevelParameteriv(ctx->Exec, (target, level, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexParameterfv(ctx->Exec, (target, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetTexParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetTexParameteriv(ctx->Exec, (target, pname, params));
-}
-
-static GLboolean GLAPIENTRY
-exec_IsEnabled(GLenum cap)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   return CALL_IsEnabled(ctx->Exec, (cap));
-}
-
-static void GLAPIENTRY
-exec_PixelStoref(GLenum pname, GLfloat param)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_PixelStoref(ctx->Exec, (pname, param));
-}
-
-static void GLAPIENTRY
-exec_PixelStorei(GLenum pname, GLint param)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_PixelStorei(ctx->Exec, (pname, param));
-}
-
-static void GLAPIENTRY
-exec_ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
-                GLenum format, GLenum type, GLvoid * pixels)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_ReadPixels(ctx->Exec, (x, y, width, height, format, type, pixels));
-}
-
-static GLint GLAPIENTRY
-exec_RenderMode(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   return CALL_RenderMode(ctx->Exec, (mode));
-}
-
-static void GLAPIENTRY
-exec_FeedbackBuffer(GLsizei size, GLenum type, GLfloat * buffer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_FeedbackBuffer(ctx->Exec, (size, type, buffer));
-}
-
-static void GLAPIENTRY
-exec_SelectBuffer(GLsizei size, GLuint * buffer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_SelectBuffer(ctx->Exec, (size, buffer));
-}
-
-static GLboolean GLAPIENTRY
-exec_AreTexturesResident(GLsizei n, const GLuint * texName,
-                         GLboolean * residences)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   return CALL_AreTexturesResident(ctx->Exec, (n, texName, residences));
-}
-
-static void GLAPIENTRY
-exec_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_ColorPointer(ctx->Exec, (size, type, stride, ptr));
-}
-
-static void GLAPIENTRY
-exec_DeleteTextures(GLsizei n, const GLuint * texName)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_DeleteTextures(ctx->Exec, (n, texName));
-}
-
-static void GLAPIENTRY
-exec_DisableClientState(GLenum cap)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_DisableClientState(ctx->Exec, (cap));
-}
-
-static void GLAPIENTRY
-exec_EdgeFlagPointer(GLsizei stride, const GLvoid * vptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_EdgeFlagPointer(ctx->Exec, (stride, vptr));
-}
-
-static void GLAPIENTRY
-exec_EnableClientState(GLenum cap)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_EnableClientState(ctx->Exec, (cap));
-}
-
-static void GLAPIENTRY
-exec_GenTextures(GLsizei n, GLuint * texName)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GenTextures(ctx->Exec, (n, texName));
-}
-
-static void GLAPIENTRY
-exec_GetPointerv(GLenum pname, GLvoid **params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetPointerv(ctx->Exec, (pname, params));
-}
-
-static void GLAPIENTRY
-exec_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_IndexPointer(ctx->Exec, (type, stride, ptr));
-}
-
-static void GLAPIENTRY
-exec_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid * pointer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_InterleavedArrays(ctx->Exec, (format, stride, pointer));
-}
-
-static GLboolean GLAPIENTRY
-exec_IsTexture(GLuint texture)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   return CALL_IsTexture(ctx->Exec, (texture));
-}
-
-static void GLAPIENTRY
-exec_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_NormalPointer(ctx->Exec, (type, stride, ptr));
-}
-
-static void GLAPIENTRY
-exec_PopClientAttrib(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_PopClientAttrib(ctx->Exec, ());
-}
-
-static void GLAPIENTRY
-exec_PushClientAttrib(GLbitfield mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_PushClientAttrib(ctx->Exec, (mask));
-}
-
-static void GLAPIENTRY
-exec_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
-                     const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_TexCoordPointer(ctx->Exec, (size, type, stride, ptr));
-}
-
-static void GLAPIENTRY
-exec_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid * img)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetCompressedTexImageARB(ctx->Exec, (target, level, img));
-}
-
-static void GLAPIENTRY
-exec_VertexPointer(GLint size, GLenum type, GLsizei stride,
-                   const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_VertexPointer(ctx->Exec, (size, type, stride, ptr));
-}
-
-static void GLAPIENTRY
-exec_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat,
-                             GLint x, GLint y, GLsizei width)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_CopyConvolutionFilter1D(ctx->Exec,
-                                (target, internalFormat, x, y, width));
-}
-
-static void GLAPIENTRY
-exec_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat,
-                             GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_CopyConvolutionFilter2D(ctx->Exec,
-                                (target, internalFormat, x, y, width,
-                                 height));
-}
-
-static void GLAPIENTRY
-exec_GetColorTable(GLenum target, GLenum format, GLenum type, GLvoid * data)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetColorTable(ctx->Exec, (target, format, type, data));
-}
-
-static void GLAPIENTRY
-exec_GetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetColorTableParameterfv(ctx->Exec, (target, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetColorTableParameteriv(ctx->Exec, (target, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
-                          GLvoid * image)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetConvolutionFilter(ctx->Exec, (target, format, type, image));
-}
-
-static void GLAPIENTRY
-exec_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetConvolutionParameterfv(ctx->Exec, (target, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetConvolutionParameteriv(ctx->Exec, (target, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetHistogram(GLenum target, GLboolean reset, GLenum format,
-                  GLenum type, GLvoid *values)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetHistogram(ctx->Exec, (target, reset, format, type, values));
-}
-
-static void GLAPIENTRY
-exec_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetHistogramParameterfv(ctx->Exec, (target, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetHistogramParameteriv(ctx->Exec, (target, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetMinmax(GLenum target, GLboolean reset, GLenum format,
-               GLenum type, GLvoid *values)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetMinmax(ctx->Exec, (target, reset, format, type, values));
-}
-
-static void GLAPIENTRY
-exec_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetMinmaxParameterfv(ctx->Exec, (target, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetMinmaxParameteriv(ctx->Exec, (target, pname, params));
-}
-
-static void GLAPIENTRY
-exec_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
-                        GLvoid *row, GLvoid *column, GLvoid *span)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_GetSeparableFilter(ctx->Exec,
-                           (target, format, type, row, column, span));
-}
-
-static void GLAPIENTRY
-exec_SeparableFilter2D(GLenum target, GLenum internalFormat,
-                       GLsizei width, GLsizei height, GLenum format,
-                       GLenum type, const GLvoid *row, const GLvoid *column)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_SeparableFilter2D(ctx->Exec,
-                          (target, internalFormat, width, height, format,
-                           type, row, column));
-}
-
-static void GLAPIENTRY
-exec_ColorPointerEXT(GLint size, GLenum type, GLsizei stride,
-                     GLsizei count, const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_ColorPointerEXT(ctx->Exec, (size, type, stride, count, ptr));
-}
-
-static void GLAPIENTRY
-exec_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_EdgeFlagPointerEXT(ctx->Exec, (stride, count, ptr));
-}
-
-static void GLAPIENTRY
-exec_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
-                     const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_IndexPointerEXT(ctx->Exec, (type, stride, count, ptr));
-}
-
-static void GLAPIENTRY
-exec_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
-                      const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_NormalPointerEXT(ctx->Exec, (type, stride, count, ptr));
-}
-
-static void GLAPIENTRY
-exec_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
-                        GLsizei count, const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_TexCoordPointerEXT(ctx->Exec, (size, type, stride, count, ptr));
-}
-
-static void GLAPIENTRY
-exec_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
-                      GLsizei count, const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_VertexPointerEXT(ctx->Exec, (size, type, stride, count, ptr));
-}
-
-static void GLAPIENTRY
-exec_LockArraysEXT(GLint first, GLsizei count)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_LockArraysEXT(ctx->Exec, (first, count));
-}
-
-static void GLAPIENTRY
-exec_UnlockArraysEXT(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_UnlockArraysEXT(ctx->Exec, ());
-}
-
-static void GLAPIENTRY
-exec_ClientActiveTextureARB(GLenum target)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_ClientActiveTextureARB(ctx->Exec, (target));
-}
-
-static void GLAPIENTRY
-exec_SecondaryColorPointerEXT(GLint size, GLenum type,
-                              GLsizei stride, const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_SecondaryColorPointerEXT(ctx->Exec, (size, type, stride, ptr));
-}
-
-static void GLAPIENTRY
-exec_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_FogCoordPointerEXT(ctx->Exec, (type, stride, ptr));
-}
-
-/* GL_EXT_multi_draw_arrays */
-static void GLAPIENTRY
-exec_MultiDrawArraysEXT(GLenum mode, const GLint *first,
-                        const GLsizei *count, GLsizei primcount)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_MultiDrawArraysEXT(ctx->Exec, (mode, first, count, primcount));
-}
-
-/* GL_IBM_multimode_draw_arrays */
-static void GLAPIENTRY
-exec_MultiModeDrawArraysIBM(const GLenum * mode, const GLint * first,
-                            const GLsizei * count, GLsizei primcount,
-                            GLint modestride)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_MultiModeDrawArraysIBM(ctx->Exec,
-                               (mode, first, count, primcount, modestride));
-}
-
-/* GL_IBM_multimode_draw_arrays */
-static void GLAPIENTRY
-exec_MultiModeDrawElementsIBM(const GLenum * mode,
-                              const GLsizei * count,
-                              GLenum type,
-                              const GLvoid * const *indices,
-                              GLsizei primcount, GLint modestride)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_MultiModeDrawElementsIBM(ctx->Exec,
-                                 (mode, count, type, indices, primcount,
-                                  modestride));
-}
-
-
-
-/**
- * Setup the given dispatch table to point to Mesa's display list
- * building functions.
- *
- * This does not include any of the tnl functions - they are
- * initialized from _mesa_init_api_defaults and from the active vtxfmt
- * struct.
- */
-struct _glapi_table *
-_mesa_create_save_table(void)
-{
-   struct _glapi_table *table;
-
-   table = _mesa_alloc_dispatch_table(_gloffset_COUNT);
-   if (table == NULL)
-      return NULL;
-
-   _mesa_loopback_init_api_table(table);
-
-   /* GL 1.0 */
-   SET_Accum(table, save_Accum);
-   SET_AlphaFunc(table, save_AlphaFunc);
-   SET_Bitmap(table, save_Bitmap);
-   SET_BlendFunc(table, save_BlendFunc);
-   SET_CallList(table, save_CallList);
-   SET_CallLists(table, save_CallLists);
-   SET_Clear(table, save_Clear);
-   SET_ClearAccum(table, save_ClearAccum);
-   SET_ClearColor(table, save_ClearColor);
-   SET_ClearDepth(table, save_ClearDepth);
-   SET_ClearIndex(table, save_ClearIndex);
-   SET_ClearStencil(table, save_ClearStencil);
-   SET_ClipPlane(table, save_ClipPlane);
-   SET_ColorMask(table, save_ColorMask);
-   SET_ColorMaskIndexedEXT(table, save_ColorMaskIndexed);
-   SET_ColorMaterial(table, save_ColorMaterial);
-   SET_CopyPixels(table, save_CopyPixels);
-   SET_CullFace(table, save_CullFace);
-   SET_DeleteLists(table, _mesa_DeleteLists);
-   SET_DepthFunc(table, save_DepthFunc);
-   SET_DepthMask(table, save_DepthMask);
-   SET_DepthRange(table, save_DepthRange);
-   SET_Disable(table, save_Disable);
-   SET_DisableIndexedEXT(table, save_DisableIndexed);
-   SET_DrawBuffer(table, save_DrawBuffer);
-   SET_DrawPixels(table, save_DrawPixels);
-   SET_Enable(table, save_Enable);
-   SET_EnableIndexedEXT(table, save_EnableIndexed);
-   SET_EndList(table, _mesa_EndList);
-   SET_EvalMesh1(table, save_EvalMesh1);
-   SET_EvalMesh2(table, save_EvalMesh2);
-   SET_Finish(table, exec_Finish);
-   SET_Flush(table, exec_Flush);
-   SET_Fogf(table, save_Fogf);
-   SET_Fogfv(table, save_Fogfv);
-   SET_Fogi(table, save_Fogi);
-   SET_Fogiv(table, save_Fogiv);
-   SET_FrontFace(table, save_FrontFace);
-   SET_Frustum(table, save_Frustum);
-   SET_GenLists(table, _mesa_GenLists);
-   SET_GetBooleanv(table, exec_GetBooleanv);
-   SET_GetClipPlane(table, exec_GetClipPlane);
-   SET_GetDoublev(table, exec_GetDoublev);
-   SET_GetError(table, exec_GetError);
-   SET_GetFloatv(table, exec_GetFloatv);
-   SET_GetIntegerv(table, exec_GetIntegerv);
-   SET_GetLightfv(table, exec_GetLightfv);
-   SET_GetLightiv(table, exec_GetLightiv);
-   SET_GetMapdv(table, exec_GetMapdv);
-   SET_GetMapfv(table, exec_GetMapfv);
-   SET_GetMapiv(table, exec_GetMapiv);
-   SET_GetMaterialfv(table, exec_GetMaterialfv);
-   SET_GetMaterialiv(table, exec_GetMaterialiv);
-   SET_GetPixelMapfv(table, exec_GetPixelMapfv);
-   SET_GetPixelMapuiv(table, exec_GetPixelMapuiv);
-   SET_GetPixelMapusv(table, exec_GetPixelMapusv);
-   SET_GetPolygonStipple(table, exec_GetPolygonStipple);
-   SET_GetString(table, exec_GetString);
-   SET_GetTexEnvfv(table, exec_GetTexEnvfv);
-   SET_GetTexEnviv(table, exec_GetTexEnviv);
-   SET_GetTexGendv(table, exec_GetTexGendv);
-   SET_GetTexGenfv(table, exec_GetTexGenfv);
-   SET_GetTexGeniv(table, exec_GetTexGeniv);
-   SET_GetTexImage(table, exec_GetTexImage);
-   SET_GetTexLevelParameterfv(table, exec_GetTexLevelParameterfv);
-   SET_GetTexLevelParameteriv(table, exec_GetTexLevelParameteriv);
-   SET_GetTexParameterfv(table, exec_GetTexParameterfv);
-   SET_GetTexParameteriv(table, exec_GetTexParameteriv);
-   SET_Hint(table, save_Hint);
-   SET_IndexMask(table, save_IndexMask);
-   SET_InitNames(table, save_InitNames);
-   SET_IsEnabled(table, exec_IsEnabled);
-   SET_IsList(table, _mesa_IsList);
-   SET_LightModelf(table, save_LightModelf);
-   SET_LightModelfv(table, save_LightModelfv);
-   SET_LightModeli(table, save_LightModeli);
-   SET_LightModeliv(table, save_LightModeliv);
-   SET_Lightf(table, save_Lightf);
-   SET_Lightfv(table, save_Lightfv);
-   SET_Lighti(table, save_Lighti);
-   SET_Lightiv(table, save_Lightiv);
-   SET_LineStipple(table, save_LineStipple);
-   SET_LineWidth(table, save_LineWidth);
-   SET_ListBase(table, save_ListBase);
-   SET_LoadIdentity(table, save_LoadIdentity);
-   SET_LoadMatrixd(table, save_LoadMatrixd);
-   SET_LoadMatrixf(table, save_LoadMatrixf);
-   SET_LoadName(table, save_LoadName);
-   SET_LogicOp(table, save_LogicOp);
-   SET_Map1d(table, save_Map1d);
-   SET_Map1f(table, save_Map1f);
-   SET_Map2d(table, save_Map2d);
-   SET_Map2f(table, save_Map2f);
-   SET_MapGrid1d(table, save_MapGrid1d);
-   SET_MapGrid1f(table, save_MapGrid1f);
-   SET_MapGrid2d(table, save_MapGrid2d);
-   SET_MapGrid2f(table, save_MapGrid2f);
-   SET_MatrixMode(table, save_MatrixMode);
-   SET_MultMatrixd(table, save_MultMatrixd);
-   SET_MultMatrixf(table, save_MultMatrixf);
-   SET_NewList(table, save_NewList);
-   SET_Ortho(table, save_Ortho);
-   SET_PassThrough(table, save_PassThrough);
-   SET_PixelMapfv(table, save_PixelMapfv);
-   SET_PixelMapuiv(table, save_PixelMapuiv);
-   SET_PixelMapusv(table, save_PixelMapusv);
-   SET_PixelStoref(table, exec_PixelStoref);
-   SET_PixelStorei(table, exec_PixelStorei);
-   SET_PixelTransferf(table, save_PixelTransferf);
-   SET_PixelTransferi(table, save_PixelTransferi);
-   SET_PixelZoom(table, save_PixelZoom);
-   SET_PointSize(table, save_PointSize);
-   SET_PolygonMode(table, save_PolygonMode);
-   SET_PolygonOffset(table, save_PolygonOffset);
-   SET_PolygonStipple(table, save_PolygonStipple);
-   SET_PopAttrib(table, save_PopAttrib);
-   SET_PopMatrix(table, save_PopMatrix);
-   SET_PopName(table, save_PopName);
-   SET_PushAttrib(table, save_PushAttrib);
-   SET_PushMatrix(table, save_PushMatrix);
-   SET_PushName(table, save_PushName);
-   SET_RasterPos2d(table, save_RasterPos2d);
-   SET_RasterPos2dv(table, save_RasterPos2dv);
-   SET_RasterPos2f(table, save_RasterPos2f);
-   SET_RasterPos2fv(table, save_RasterPos2fv);
-   SET_RasterPos2i(table, save_RasterPos2i);
-   SET_RasterPos2iv(table, save_RasterPos2iv);
-   SET_RasterPos2s(table, save_RasterPos2s);
-   SET_RasterPos2sv(table, save_RasterPos2sv);
-   SET_RasterPos3d(table, save_RasterPos3d);
-   SET_RasterPos3dv(table, save_RasterPos3dv);
-   SET_RasterPos3f(table, save_RasterPos3f);
-   SET_RasterPos3fv(table, save_RasterPos3fv);
-   SET_RasterPos3i(table, save_RasterPos3i);
-   SET_RasterPos3iv(table, save_RasterPos3iv);
-   SET_RasterPos3s(table, save_RasterPos3s);
-   SET_RasterPos3sv(table, save_RasterPos3sv);
-   SET_RasterPos4d(table, save_RasterPos4d);
-   SET_RasterPos4dv(table, save_RasterPos4dv);
-   SET_RasterPos4f(table, save_RasterPos4f);
-   SET_RasterPos4fv(table, save_RasterPos4fv);
-   SET_RasterPos4i(table, save_RasterPos4i);
-   SET_RasterPos4iv(table, save_RasterPos4iv);
-   SET_RasterPos4s(table, save_RasterPos4s);
-   SET_RasterPos4sv(table, save_RasterPos4sv);
-   SET_ReadBuffer(table, save_ReadBuffer);
-   SET_ReadPixels(table, exec_ReadPixels);
-   SET_RenderMode(table, exec_RenderMode);
-   SET_Rotated(table, save_Rotated);
-   SET_Rotatef(table, save_Rotatef);
-   SET_Scaled(table, save_Scaled);
-   SET_Scalef(table, save_Scalef);
-   SET_Scissor(table, save_Scissor);
-   SET_FeedbackBuffer(table, exec_FeedbackBuffer);
-   SET_SelectBuffer(table, exec_SelectBuffer);
-   SET_ShadeModel(table, save_ShadeModel);
-   SET_StencilFunc(table, save_StencilFunc);
-   SET_StencilMask(table, save_StencilMask);
-   SET_StencilOp(table, save_StencilOp);
-   SET_TexEnvf(table, save_TexEnvf);
-   SET_TexEnvfv(table, save_TexEnvfv);
-   SET_TexEnvi(table, save_TexEnvi);
-   SET_TexEnviv(table, save_TexEnviv);
-   SET_TexGend(table, save_TexGend);
-   SET_TexGendv(table, save_TexGendv);
-   SET_TexGenf(table, save_TexGenf);
-   SET_TexGenfv(table, save_TexGenfv);
-   SET_TexGeni(table, save_TexGeni);
-   SET_TexGeniv(table, save_TexGeniv);
-   SET_TexImage1D(table, save_TexImage1D);
-   SET_TexImage2D(table, save_TexImage2D);
-   SET_TexParameterf(table, save_TexParameterf);
-   SET_TexParameterfv(table, save_TexParameterfv);
-   SET_TexParameteri(table, save_TexParameteri);
-   SET_TexParameteriv(table, save_TexParameteriv);
-   SET_Translated(table, save_Translated);
-   SET_Translatef(table, save_Translatef);
-   SET_Viewport(table, save_Viewport);
-
-   /* GL 1.1 */
-   SET_AreTexturesResident(table, exec_AreTexturesResident);
-   SET_BindTexture(table, save_BindTexture);
-   SET_ColorPointer(table, exec_ColorPointer);
-   SET_CopyTexImage1D(table, save_CopyTexImage1D);
-   SET_CopyTexImage2D(table, save_CopyTexImage2D);
-   SET_CopyTexSubImage1D(table, save_CopyTexSubImage1D);
-   SET_CopyTexSubImage2D(table, save_CopyTexSubImage2D);
-   SET_DeleteTextures(table, exec_DeleteTextures);
-   SET_DisableClientState(table, exec_DisableClientState);
-   SET_EdgeFlagPointer(table, exec_EdgeFlagPointer);
-   SET_EnableClientState(table, exec_EnableClientState);
-   SET_GenTextures(table, exec_GenTextures);
-   SET_GetPointerv(table, exec_GetPointerv);
-   SET_IndexPointer(table, exec_IndexPointer);
-   SET_InterleavedArrays(table, exec_InterleavedArrays);
-   SET_IsTexture(table, exec_IsTexture);
-   SET_NormalPointer(table, exec_NormalPointer);
-   SET_PopClientAttrib(table, exec_PopClientAttrib);
-   SET_PrioritizeTextures(table, save_PrioritizeTextures);
-   SET_PushClientAttrib(table, exec_PushClientAttrib);
-   SET_TexCoordPointer(table, exec_TexCoordPointer);
-   SET_TexSubImage1D(table, save_TexSubImage1D);
-   SET_TexSubImage2D(table, save_TexSubImage2D);
-   SET_VertexPointer(table, exec_VertexPointer);
-
-   /* GL 1.2 */
-   SET_CopyTexSubImage3D(table, save_CopyTexSubImage3D);
-   SET_TexImage3D(table, save_TexImage3D);
-   SET_TexSubImage3D(table, save_TexSubImage3D);
-
-   /* GL 2.0 */
-   SET_StencilFuncSeparate(table, save_StencilFuncSeparate);
-   SET_StencilMaskSeparate(table, save_StencilMaskSeparate);
-   SET_StencilOpSeparate(table, save_StencilOpSeparate);
-
-   /* ATI_separate_stencil */ 
-   SET_StencilFuncSeparateATI(table, save_StencilFuncSeparateATI);
-
-   /* GL_ARB_imaging */
-   /* Not all are supported */
-   SET_BlendColor(table, save_BlendColor);
-   SET_BlendEquation(table, save_BlendEquation);
-   SET_ColorSubTable(table, save_ColorSubTable);
-   SET_ColorTable(table, save_ColorTable);
-   SET_ColorTableParameterfv(table, save_ColorTableParameterfv);
-   SET_ColorTableParameteriv(table, save_ColorTableParameteriv);
-   SET_ConvolutionFilter1D(table, save_ConvolutionFilter1D);
-   SET_ConvolutionFilter2D(table, save_ConvolutionFilter2D);
-   SET_ConvolutionParameterf(table, save_ConvolutionParameterf);
-   SET_ConvolutionParameterfv(table, save_ConvolutionParameterfv);
-   SET_ConvolutionParameteri(table, save_ConvolutionParameteri);
-   SET_ConvolutionParameteriv(table, save_ConvolutionParameteriv);
-   SET_CopyColorSubTable(table, save_CopyColorSubTable);
-   SET_CopyColorTable(table, save_CopyColorTable);
-   SET_CopyConvolutionFilter1D(table, exec_CopyConvolutionFilter1D);
-   SET_CopyConvolutionFilter2D(table, exec_CopyConvolutionFilter2D);
-   SET_GetColorTable(table, exec_GetColorTable);
-   SET_GetColorTableParameterfv(table, exec_GetColorTableParameterfv);
-   SET_GetColorTableParameteriv(table, exec_GetColorTableParameteriv);
-   SET_GetConvolutionFilter(table, exec_GetConvolutionFilter);
-   SET_GetConvolutionParameterfv(table, exec_GetConvolutionParameterfv);
-   SET_GetConvolutionParameteriv(table, exec_GetConvolutionParameteriv);
-   SET_GetHistogram(table, exec_GetHistogram);
-   SET_GetHistogramParameterfv(table, exec_GetHistogramParameterfv);
-   SET_GetHistogramParameteriv(table, exec_GetHistogramParameteriv);
-   SET_GetMinmax(table, exec_GetMinmax);
-   SET_GetMinmaxParameterfv(table, exec_GetMinmaxParameterfv);
-   SET_GetMinmaxParameteriv(table, exec_GetMinmaxParameteriv);
-   SET_GetSeparableFilter(table, exec_GetSeparableFilter);
-   SET_Histogram(table, save_Histogram);
-   SET_Minmax(table, save_Minmax);
-   SET_ResetHistogram(table, save_ResetHistogram);
-   SET_ResetMinmax(table, save_ResetMinmax);
-   SET_SeparableFilter2D(table, exec_SeparableFilter2D);
-
-   /* 2. GL_EXT_blend_color */
-#if 0
-   SET_BlendColorEXT(table, save_BlendColorEXT);
-#endif
-
-   /* 3. GL_EXT_polygon_offset */
-   SET_PolygonOffsetEXT(table, save_PolygonOffsetEXT);
-
-   /* 6. GL_EXT_texture3d */
-#if 0
-   SET_CopyTexSubImage3DEXT(table, save_CopyTexSubImage3D);
-   SET_TexImage3DEXT(table, save_TexImage3DEXT);
-   SET_TexSubImage3DEXT(table, save_TexSubImage3D);
-#endif
-
-   /* 14. GL_SGI_color_table */
-#if 0
-   SET_ColorTableSGI(table, save_ColorTable);
-   SET_ColorSubTableSGI(table, save_ColorSubTable);
-   SET_GetColorTableSGI(table, exec_GetColorTable);
-   SET_GetColorTableParameterfvSGI(table, exec_GetColorTableParameterfv);
-   SET_GetColorTableParameterivSGI(table, exec_GetColorTableParameteriv);
-#endif
-
-   /* 30. GL_EXT_vertex_array */
-   SET_ColorPointerEXT(table, exec_ColorPointerEXT);
-   SET_EdgeFlagPointerEXT(table, exec_EdgeFlagPointerEXT);
-   SET_IndexPointerEXT(table, exec_IndexPointerEXT);
-   SET_NormalPointerEXT(table, exec_NormalPointerEXT);
-   SET_TexCoordPointerEXT(table, exec_TexCoordPointerEXT);
-   SET_VertexPointerEXT(table, exec_VertexPointerEXT);
-
-   /* 37. GL_EXT_blend_minmax */
-#if 0
-   SET_BlendEquationEXT(table, save_BlendEquationEXT);
-#endif
-
-   /* 54. GL_EXT_point_parameters */
-   SET_PointParameterfEXT(table, save_PointParameterfEXT);
-   SET_PointParameterfvEXT(table, save_PointParameterfvEXT);
-
-   /* 97. GL_EXT_compiled_vertex_array */
-   SET_LockArraysEXT(table, exec_LockArraysEXT);
-   SET_UnlockArraysEXT(table, exec_UnlockArraysEXT);
-
-   /* 145. GL_EXT_secondary_color */
-   SET_SecondaryColorPointerEXT(table, exec_SecondaryColorPointerEXT);
-
-   /* 148. GL_EXT_multi_draw_arrays */
-   SET_MultiDrawArraysEXT(table, exec_MultiDrawArraysEXT);
-
-   /* 149. GL_EXT_fog_coord */
-   SET_FogCoordPointerEXT(table, exec_FogCoordPointerEXT);
-
-   /* 173. GL_EXT_blend_func_separate */
-   SET_BlendFuncSeparateEXT(table, save_BlendFuncSeparateEXT);
-
-   /* 196. GL_MESA_resize_buffers */
-   SET_ResizeBuffersMESA(table, _mesa_ResizeBuffersMESA);
-
-   /* 197. GL_MESA_window_pos */
-   SET_WindowPos2dMESA(table, save_WindowPos2dMESA);
-   SET_WindowPos2dvMESA(table, save_WindowPos2dvMESA);
-   SET_WindowPos2fMESA(table, save_WindowPos2fMESA);
-   SET_WindowPos2fvMESA(table, save_WindowPos2fvMESA);
-   SET_WindowPos2iMESA(table, save_WindowPos2iMESA);
-   SET_WindowPos2ivMESA(table, save_WindowPos2ivMESA);
-   SET_WindowPos2sMESA(table, save_WindowPos2sMESA);
-   SET_WindowPos2svMESA(table, save_WindowPos2svMESA);
-   SET_WindowPos3dMESA(table, save_WindowPos3dMESA);
-   SET_WindowPos3dvMESA(table, save_WindowPos3dvMESA);
-   SET_WindowPos3fMESA(table, save_WindowPos3fMESA);
-   SET_WindowPos3fvMESA(table, save_WindowPos3fvMESA);
-   SET_WindowPos3iMESA(table, save_WindowPos3iMESA);
-   SET_WindowPos3ivMESA(table, save_WindowPos3ivMESA);
-   SET_WindowPos3sMESA(table, save_WindowPos3sMESA);
-   SET_WindowPos3svMESA(table, save_WindowPos3svMESA);
-   SET_WindowPos4dMESA(table, save_WindowPos4dMESA);
-   SET_WindowPos4dvMESA(table, save_WindowPos4dvMESA);
-   SET_WindowPos4fMESA(table, save_WindowPos4fMESA);
-   SET_WindowPos4fvMESA(table, save_WindowPos4fvMESA);
-   SET_WindowPos4iMESA(table, save_WindowPos4iMESA);
-   SET_WindowPos4ivMESA(table, save_WindowPos4ivMESA);
-   SET_WindowPos4sMESA(table, save_WindowPos4sMESA);
-   SET_WindowPos4svMESA(table, save_WindowPos4svMESA);
-
-   /* 200. GL_IBM_multimode_draw_arrays */
-   SET_MultiModeDrawArraysIBM(table, exec_MultiModeDrawArraysIBM);
-   SET_MultiModeDrawElementsIBM(table, exec_MultiModeDrawElementsIBM);
-
-#if FEATURE_NV_vertex_program
-   /* 233. GL_NV_vertex_program */
-   /* The following commands DO NOT go into display lists:
-    * AreProgramsResidentNV, IsProgramNV, GenProgramsNV, DeleteProgramsNV,
-    * VertexAttribPointerNV, GetProgram*, GetVertexAttrib*
-    */
-   SET_BindProgramNV(table, save_BindProgramNV);
-   SET_DeleteProgramsNV(table, _mesa_DeletePrograms);
-   SET_ExecuteProgramNV(table, save_ExecuteProgramNV);
-   SET_GenProgramsNV(table, _mesa_GenPrograms);
-   SET_AreProgramsResidentNV(table, _mesa_AreProgramsResidentNV);
-   SET_RequestResidentProgramsNV(table, save_RequestResidentProgramsNV);
-   SET_GetProgramParameterfvNV(table, _mesa_GetProgramParameterfvNV);
-   SET_GetProgramParameterdvNV(table, _mesa_GetProgramParameterdvNV);
-   SET_GetProgramivNV(table, _mesa_GetProgramivNV);
-   SET_GetProgramStringNV(table, _mesa_GetProgramStringNV);
-   SET_GetTrackMatrixivNV(table, _mesa_GetTrackMatrixivNV);
-   SET_GetVertexAttribdvNV(table, _mesa_GetVertexAttribdvNV);
-   SET_GetVertexAttribfvNV(table, _mesa_GetVertexAttribfvNV);
-   SET_GetVertexAttribivNV(table, _mesa_GetVertexAttribivNV);
-   SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervNV);
-   SET_IsProgramNV(table, _mesa_IsProgramARB);
-   SET_LoadProgramNV(table, save_LoadProgramNV);
-   SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB);
-   SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB);
-   SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB);
-   SET_ProgramEnvParameter4fvARB(table, save_ProgramEnvParameter4fvARB);
-   SET_ProgramParameters4dvNV(table, save_ProgramParameters4dvNV);
-   SET_ProgramParameters4fvNV(table, save_ProgramParameters4fvNV);
-   SET_TrackMatrixNV(table, save_TrackMatrixNV);
-   SET_VertexAttribPointerNV(table, _mesa_VertexAttribPointerNV);
-#endif
-
-   /* 244. GL_ATI_envmap_bumpmap */
-   SET_TexBumpParameterivATI(table, save_TexBumpParameterivATI);
-   SET_TexBumpParameterfvATI(table, save_TexBumpParameterfvATI);
-
-   /* 245. GL_ATI_fragment_shader */
-#if FEATURE_ATI_fragment_shader
-   SET_BindFragmentShaderATI(table, save_BindFragmentShaderATI);
-   SET_SetFragmentShaderConstantATI(table, save_SetFragmentShaderConstantATI);
-#endif
-
-   /* 282. GL_NV_fragment_program */
-#if FEATURE_NV_fragment_program
-   SET_ProgramNamedParameter4fNV(table, save_ProgramNamedParameter4fNV);
-   SET_ProgramNamedParameter4dNV(table, save_ProgramNamedParameter4dNV);
-   SET_ProgramNamedParameter4fvNV(table, save_ProgramNamedParameter4fvNV);
-   SET_ProgramNamedParameter4dvNV(table, save_ProgramNamedParameter4dvNV);
-   SET_GetProgramNamedParameterfvNV(table,
-                                    _mesa_GetProgramNamedParameterfvNV);
-   SET_GetProgramNamedParameterdvNV(table,
-                                    _mesa_GetProgramNamedParameterdvNV);
-   SET_ProgramLocalParameter4dARB(table, save_ProgramLocalParameter4dARB);
-   SET_ProgramLocalParameter4dvARB(table, save_ProgramLocalParameter4dvARB);
-   SET_ProgramLocalParameter4fARB(table, save_ProgramLocalParameter4fARB);
-   SET_ProgramLocalParameter4fvARB(table, save_ProgramLocalParameter4fvARB);
-   SET_GetProgramLocalParameterdvARB(table,
-                                     _mesa_GetProgramLocalParameterdvARB);
-   SET_GetProgramLocalParameterfvARB(table,
-                                     _mesa_GetProgramLocalParameterfvARB);
-#endif
-
-   /* 262. GL_NV_point_sprite */
-   SET_PointParameteriNV(table, save_PointParameteriNV);
-   SET_PointParameterivNV(table, save_PointParameterivNV);
-
-   /* 268. GL_EXT_stencil_two_side */
-   SET_ActiveStencilFaceEXT(table, save_ActiveStencilFaceEXT);
-
-   /* 273. GL_APPLE_vertex_array_object */
-   SET_BindVertexArrayAPPLE(table, _mesa_BindVertexArrayAPPLE);
-   SET_DeleteVertexArraysAPPLE(table, _mesa_DeleteVertexArraysAPPLE);
-   SET_GenVertexArraysAPPLE(table, _mesa_GenVertexArraysAPPLE);
-   SET_IsVertexArrayAPPLE(table, _mesa_IsVertexArrayAPPLE);
-
-   /* ???. GL_EXT_depth_bounds_test */
-   SET_DepthBoundsEXT(table, save_DepthBoundsEXT);
-
-   /* ARB 1. GL_ARB_multitexture */
-   SET_ActiveTextureARB(table, save_ActiveTextureARB);
-   SET_ClientActiveTextureARB(table, exec_ClientActiveTextureARB);
-
-   /* ARB 3. GL_ARB_transpose_matrix */
-   SET_LoadTransposeMatrixdARB(table, save_LoadTransposeMatrixdARB);
-   SET_LoadTransposeMatrixfARB(table, save_LoadTransposeMatrixfARB);
-   SET_MultTransposeMatrixdARB(table, save_MultTransposeMatrixdARB);
-   SET_MultTransposeMatrixfARB(table, save_MultTransposeMatrixfARB);
-
-   /* ARB 5. GL_ARB_multisample */
-   SET_SampleCoverageARB(table, save_SampleCoverageARB);
-
-   /* ARB 12. GL_ARB_texture_compression */
-   SET_CompressedTexImage3DARB(table, save_CompressedTexImage3DARB);
-   SET_CompressedTexImage2DARB(table, save_CompressedTexImage2DARB);
-   SET_CompressedTexImage1DARB(table, save_CompressedTexImage1DARB);
-   SET_CompressedTexSubImage3DARB(table, save_CompressedTexSubImage3DARB);
-   SET_CompressedTexSubImage2DARB(table, save_CompressedTexSubImage2DARB);
-   SET_CompressedTexSubImage1DARB(table, save_CompressedTexSubImage1DARB);
-   SET_GetCompressedTexImageARB(table, exec_GetCompressedTexImageARB);
-
-   /* ARB 14. GL_ARB_point_parameters */
-   /* aliased with EXT_point_parameters functions */
-
-   /* ARB 25. GL_ARB_window_pos */
-   /* aliased with MESA_window_pos functions */
-
-   /* ARB 26. GL_ARB_vertex_program */
-   /* ARB 27. GL_ARB_fragment_program */
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-   /* glVertexAttrib* functions alias the NV ones, handled elsewhere */
-   SET_VertexAttribPointerARB(table, _mesa_VertexAttribPointerARB);
-   SET_EnableVertexAttribArrayARB(table, _mesa_EnableVertexAttribArrayARB);
-   SET_DisableVertexAttribArrayARB(table, _mesa_DisableVertexAttribArrayARB);
-   SET_ProgramStringARB(table, save_ProgramStringARB);
-   SET_BindProgramNV(table, save_BindProgramNV);
-   SET_DeleteProgramsNV(table, _mesa_DeletePrograms);
-   SET_GenProgramsNV(table, _mesa_GenPrograms);
-   SET_IsProgramNV(table, _mesa_IsProgramARB);
-   SET_GetVertexAttribdvNV(table, _mesa_GetVertexAttribdvNV);
-   SET_GetVertexAttribfvNV(table, _mesa_GetVertexAttribfvNV);
-   SET_GetVertexAttribivNV(table, _mesa_GetVertexAttribivNV);
-   SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervNV);
-   SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB);
-   SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB);
-   SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB);
-   SET_ProgramEnvParameter4fvARB(table, save_ProgramEnvParameter4fvARB);
-   SET_ProgramLocalParameter4dARB(table, save_ProgramLocalParameter4dARB);
-   SET_ProgramLocalParameter4dvARB(table, save_ProgramLocalParameter4dvARB);
-   SET_ProgramLocalParameter4fARB(table, save_ProgramLocalParameter4fARB);
-   SET_ProgramLocalParameter4fvARB(table, save_ProgramLocalParameter4fvARB);
-   SET_GetProgramEnvParameterdvARB(table, _mesa_GetProgramEnvParameterdvARB);
-   SET_GetProgramEnvParameterfvARB(table, _mesa_GetProgramEnvParameterfvARB);
-   SET_GetProgramLocalParameterdvARB(table,
-                                     _mesa_GetProgramLocalParameterdvARB);
-   SET_GetProgramLocalParameterfvARB(table,
-                                     _mesa_GetProgramLocalParameterfvARB);
-   SET_GetProgramivARB(table, _mesa_GetProgramivARB);
-   SET_GetProgramStringARB(table, _mesa_GetProgramStringARB);
-#endif
-
-   /* ARB 28. GL_ARB_vertex_buffer_object */
-#if FEATURE_ARB_vertex_buffer_object
-   /* None of the extension's functions get compiled */
-   SET_BindBufferARB(table, _mesa_BindBufferARB);
-   SET_BufferDataARB(table, _mesa_BufferDataARB);
-   SET_BufferSubDataARB(table, _mesa_BufferSubDataARB);
-   SET_DeleteBuffersARB(table, _mesa_DeleteBuffersARB);
-   SET_GenBuffersARB(table, _mesa_GenBuffersARB);
-   SET_GetBufferParameterivARB(table, _mesa_GetBufferParameterivARB);
-   SET_GetBufferPointervARB(table, _mesa_GetBufferPointervARB);
-   SET_GetBufferSubDataARB(table, _mesa_GetBufferSubDataARB);
-   SET_IsBufferARB(table, _mesa_IsBufferARB);
-   SET_MapBufferARB(table, _mesa_MapBufferARB);
-   SET_UnmapBufferARB(table, _mesa_UnmapBufferARB);
-#endif
-
-#if FEATURE_queryobj
-   SET_BeginQueryARB(table, save_BeginQueryARB);
-   SET_EndQueryARB(table, save_EndQueryARB);
-   SET_GenQueriesARB(table, _mesa_GenQueriesARB);
-   SET_DeleteQueriesARB(table, _mesa_DeleteQueriesARB);
-   SET_IsQueryARB(table, _mesa_IsQueryARB);
-   SET_GetQueryivARB(table, _mesa_GetQueryivARB);
-   SET_GetQueryObjectivARB(table, _mesa_GetQueryObjectivARB);
-   SET_GetQueryObjectuivARB(table, _mesa_GetQueryObjectuivARB);
-#endif
-   SET_DrawBuffersARB(table, save_DrawBuffersARB);
-
-#if FEATURE_EXT_framebuffer_blit
-   SET_BlitFramebufferEXT(table, save_BlitFramebufferEXT);
-#endif
-
-   /* GL_ARB_shader_objects */
-   SET_UseProgramObjectARB(table, save_UseProgramObjectARB);
-   SET_Uniform1fARB(table, save_Uniform1fARB);
-   SET_Uniform2fARB(table, save_Uniform2fARB);
-   SET_Uniform3fARB(table, save_Uniform3fARB);
-   SET_Uniform4fARB(table, save_Uniform4fARB);
-   SET_Uniform1fvARB(table, save_Uniform1fvARB);
-   SET_Uniform2fvARB(table, save_Uniform2fvARB);
-   SET_Uniform3fvARB(table, save_Uniform3fvARB);
-   SET_Uniform4fvARB(table, save_Uniform4fvARB);
-   SET_Uniform1iARB(table, save_Uniform1iARB);
-   SET_Uniform2iARB(table, save_Uniform2iARB);
-   SET_Uniform3iARB(table, save_Uniform3iARB);
-   SET_Uniform4iARB(table, save_Uniform4iARB);
-   SET_Uniform1ivARB(table, save_Uniform1ivARB);
-   SET_Uniform2ivARB(table, save_Uniform2ivARB);
-   SET_Uniform3ivARB(table, save_Uniform3ivARB);
-   SET_Uniform4ivARB(table, save_Uniform4ivARB);
-   SET_UniformMatrix2fvARB(table, save_UniformMatrix2fvARB);
-   SET_UniformMatrix3fvARB(table, save_UniformMatrix3fvARB);
-   SET_UniformMatrix4fvARB(table, save_UniformMatrix4fvARB);
-   SET_UniformMatrix2x3fv(table, save_UniformMatrix2x3fv);
-   SET_UniformMatrix3x2fv(table, save_UniformMatrix3x2fv);
-   SET_UniformMatrix2x4fv(table, save_UniformMatrix2x4fv);
-   SET_UniformMatrix4x2fv(table, save_UniformMatrix4x2fv);
-   SET_UniformMatrix3x4fv(table, save_UniformMatrix3x4fv);
-   SET_UniformMatrix4x3fv(table, save_UniformMatrix4x3fv);
-
-   /* ARB 30/31/32. GL_ARB_shader_objects, GL_ARB_vertex/fragment_shader */
-   SET_BindAttribLocationARB(table, exec_BindAttribLocationARB);
-   SET_GetAttribLocationARB(table, exec_GetAttribLocationARB);
-   SET_GetUniformLocationARB(table, exec_GetUniformLocationARB);
-   /* XXX additional functions need to be implemented here! */
-
-   /* 299. GL_EXT_blend_equation_separate */
-   SET_BlendEquationSeparateEXT(table, save_BlendEquationSeparateEXT);
-
-   /* GL_EXT_gpu_program_parameters */
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-   SET_ProgramEnvParameters4fvEXT(table, save_ProgramEnvParameters4fvEXT);
-   SET_ProgramLocalParameters4fvEXT(table, save_ProgramLocalParameters4fvEXT);
-#endif
-
-   /* ARB 50. GL_ARB_map_buffer_range */
-#if FEATURE_ARB_map_buffer_range
-   SET_MapBufferRange(table, _mesa_MapBufferRange); /* no dlist save */
-   SET_FlushMappedBufferRange(table, _mesa_FlushMappedBufferRange); /* no dl */
-#endif
-
-   /* ARB 59. GL_ARB_copy_buffer */
-   SET_CopyBufferSubData(table, _mesa_CopyBufferSubData); /* no dlist save */
-
-   /* 352. GL_EXT_transform_feedback */
-#if FEATURE_EXT_transform_feedback
-   SET_BeginTransformFeedbackEXT(table, save_BeginTransformFeedback);
-   SET_EndTransformFeedbackEXT(table, save_EndTransformFeedback);
-#endif
-
-   /* 364. GL_EXT_provoking_vertex */
-   SET_ProvokingVertexEXT(table, save_ProvokingVertexEXT);
-
-   /* 371. GL_APPLE_object_purgeable */
-#if FEATURE_APPLE_object_purgeable
-   SET_ObjectPurgeableAPPLE(table, _mesa_ObjectPurgeableAPPLE);
-   SET_ObjectUnpurgeableAPPLE(table, _mesa_ObjectUnpurgeableAPPLE);
-#endif
-
-   /* GL_EXT_texture_integer */
-   SET_ClearColorIiEXT(table, save_ClearColorIi);
-   SET_ClearColorIuiEXT(table, save_ClearColorIui);
-   SET_TexParameterIivEXT(table, save_TexParameterIiv);
-   SET_TexParameterIuivEXT(table, save_TexParameterIuiv);
-   SET_GetTexParameterIivEXT(table, exec_GetTexParameterIiv);
-   SET_GetTexParameterIuivEXT(table, exec_GetTexParameterIuiv);
-
-   /* 377. GL_EXT_separate_shader_objects */
-   SET_UseShaderProgramEXT(table, save_UseShaderProgramEXT);
-   SET_ActiveProgramEXT(table, save_ActiveProgramEXT);
-
-   /* GL_ARB_color_buffer_float */
-   SET_ClampColorARB(table, save_ClampColorARB);
-   SET_ClampColor(table, save_ClampColorARB);
-
-   /* GL 3.0 */
-#if 0
-   SET_ClearBufferiv(table, save_ClearBufferiv);
-   SET_ClearBufferuiv(table, save_ClearBufferuiv);
-   SET_ClearBufferfv(table, save_ClearBufferfv);
-   SET_ClearBufferfi(table, save_ClearBufferfi);
-   SET_Uniform1ui(table, save_Uniform1ui);
-   SET_Uniform2ui(table, save_Uniform2ui);
-   SET_Uniform3ui(table, save_Uniform3ui);
-   SET_Uniform4ui(table, save_Uniform4ui);
-   SET_Uniform1uiv(table, save_Uniform1uiv);
-   SET_Uniform2uiv(table, save_Uniform2uiv);
-   SET_Uniform3uiv(table, save_Uniform3uiv);
-   SET_Uniform4uiv(table, save_Uniform4uiv);
-#else
-   (void) save_ClearBufferiv;
-   (void) save_ClearBufferuiv;
-   (void) save_ClearBufferfv;
-   (void) save_ClearBufferfi;
-   (void) save_Uniform1ui;
-   (void) save_Uniform2ui;
-   (void) save_Uniform3ui;
-   (void) save_Uniform4ui;
-   (void) save_Uniform1uiv;
-   (void) save_Uniform2uiv;
-   (void) save_Uniform3uiv;
-   (void) save_Uniform4uiv;
-#endif
-
-   /* GL_ARB_instanced_arrays */
-   SET_VertexAttribDivisorARB(table, save_VertexAttribDivisor);
-
-   /* GL_NV_texture_barrier */
-   SET_TextureBarrierNV(table, save_TextureBarrierNV);
-
-   /* GL_ARB_draw_buffer_blend */
-   SET_BlendFunciARB(table, save_BlendFunci);
-   SET_BlendFuncSeparateiARB(table, save_BlendFuncSeparatei);
-   SET_BlendEquationiARB(table, save_BlendEquationi);
-   SET_BlendEquationSeparateiARB(table, save_BlendEquationSeparatei);
-
-   return table;
-}
-
-
-
-static const char *
-enum_string(GLenum k)
-{
-   return _mesa_lookup_enum_by_nr(k);
-}
-
-
-/**
- * Print the commands in a display list.  For debugging only.
- * TODO: many commands aren't handled yet.
- */
-static void GLAPIENTRY
-print_list(struct gl_context *ctx, GLuint list)
-{
-   struct gl_display_list *dlist;
-   Node *n;
-   GLboolean done;
-
-   if (!islist(ctx, list)) {
-      printf("%u is not a display list ID\n", list);
-      return;
-   }
-
-   dlist = lookup_list(ctx, list);
-   if (!dlist)
-      return;
-
-   n = dlist->Head;
-
-   printf("START-LIST %u, address %p\n", list, (void *) n);
-
-   done = n ? GL_FALSE : GL_TRUE;
-   while (!done) {
-      const OpCode opcode = n[0].opcode;
-
-      if (is_ext_opcode(opcode)) {
-         n += ext_opcode_print(ctx, n);
-      }
-      else {
-         switch (opcode) {
-         case OPCODE_ACCUM:
-            printf("Accum %s %g\n", enum_string(n[1].e), n[2].f);
-            break;
-         case OPCODE_BITMAP:
-            printf("Bitmap %d %d %g %g %g %g %p\n", n[1].i, n[2].i,
-                         n[3].f, n[4].f, n[5].f, n[6].f, (void *) n[7].data);
-            break;
-         case OPCODE_CALL_LIST:
-            printf("CallList %d\n", (int) n[1].ui);
-            break;
-         case OPCODE_CALL_LIST_OFFSET:
-            printf("CallList %d + offset %u = %u\n", (int) n[1].ui,
-                         ctx->List.ListBase, ctx->List.ListBase + n[1].ui);
-            break;
-         case OPCODE_COLOR_TABLE_PARAMETER_FV:
-            printf("ColorTableParameterfv %s %s %f %f %f %f\n",
-                         enum_string(n[1].e), enum_string(n[2].e),
-                         n[3].f, n[4].f, n[5].f, n[6].f);
-            break;
-         case OPCODE_COLOR_TABLE_PARAMETER_IV:
-            printf("ColorTableParameteriv %s %s %d %d %d %d\n",
-                         enum_string(n[1].e), enum_string(n[2].e),
-                         n[3].i, n[4].i, n[5].i, n[6].i);
-            break;
-         case OPCODE_DISABLE:
-            printf("Disable %s\n", enum_string(n[1].e));
-            break;
-         case OPCODE_ENABLE:
-            printf("Enable %s\n", enum_string(n[1].e));
-            break;
-         case OPCODE_FRUSTUM:
-            printf("Frustum %g %g %g %g %g %g\n",
-                         n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f);
-            break;
-         case OPCODE_LINE_STIPPLE:
-            printf("LineStipple %d %x\n", n[1].i, (int) n[2].us);
-            break;
-         case OPCODE_LOAD_IDENTITY:
-            printf("LoadIdentity\n");
-            break;
-         case OPCODE_LOAD_MATRIX:
-            printf("LoadMatrix\n");
-            printf("  %8f %8f %8f %8f\n",
-                         n[1].f, n[5].f, n[9].f, n[13].f);
-            printf("  %8f %8f %8f %8f\n",
-                         n[2].f, n[6].f, n[10].f, n[14].f);
-            printf("  %8f %8f %8f %8f\n",
-                         n[3].f, n[7].f, n[11].f, n[15].f);
-            printf("  %8f %8f %8f %8f\n",
-                         n[4].f, n[8].f, n[12].f, n[16].f);
-            break;
-         case OPCODE_MULT_MATRIX:
-            printf("MultMatrix (or Rotate)\n");
-            printf("  %8f %8f %8f %8f\n",
-                         n[1].f, n[5].f, n[9].f, n[13].f);
-            printf("  %8f %8f %8f %8f\n",
-                         n[2].f, n[6].f, n[10].f, n[14].f);
-            printf("  %8f %8f %8f %8f\n",
-                         n[3].f, n[7].f, n[11].f, n[15].f);
-            printf("  %8f %8f %8f %8f\n",
-                         n[4].f, n[8].f, n[12].f, n[16].f);
-            break;
-         case OPCODE_ORTHO:
-            printf("Ortho %g %g %g %g %g %g\n",
-                         n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f);
-            break;
-         case OPCODE_POP_ATTRIB:
-            printf("PopAttrib\n");
-            break;
-         case OPCODE_POP_MATRIX:
-            printf("PopMatrix\n");
-            break;
-         case OPCODE_POP_NAME:
-            printf("PopName\n");
-            break;
-         case OPCODE_PUSH_ATTRIB:
-            printf("PushAttrib %x\n", n[1].bf);
-            break;
-         case OPCODE_PUSH_MATRIX:
-            printf("PushMatrix\n");
-            break;
-         case OPCODE_PUSH_NAME:
-            printf("PushName %d\n", (int) n[1].ui);
-            break;
-         case OPCODE_RASTER_POS:
-            printf("RasterPos %g %g %g %g\n",
-                         n[1].f, n[2].f, n[3].f, n[4].f);
-            break;
-         case OPCODE_ROTATE:
-            printf("Rotate %g %g %g %g\n",
-                         n[1].f, n[2].f, n[3].f, n[4].f);
-            break;
-         case OPCODE_SCALE:
-            printf("Scale %g %g %g\n", n[1].f, n[2].f, n[3].f);
-            break;
-         case OPCODE_TRANSLATE:
-            printf("Translate %g %g %g\n", n[1].f, n[2].f, n[3].f);
-            break;
-         case OPCODE_BIND_TEXTURE:
-            printf("BindTexture %s %d\n",
-                         _mesa_lookup_enum_by_nr(n[1].ui), n[2].ui);
-            break;
-         case OPCODE_SHADE_MODEL:
-            printf("ShadeModel %s\n", _mesa_lookup_enum_by_nr(n[1].ui));
-            break;
-         case OPCODE_MAP1:
-            printf("Map1 %s %.3f %.3f %d %d\n",
-                         _mesa_lookup_enum_by_nr(n[1].ui),
-                         n[2].f, n[3].f, n[4].i, n[5].i);
-            break;
-         case OPCODE_MAP2:
-            printf("Map2 %s %.3f %.3f %.3f %.3f %d %d %d %d\n",
-                         _mesa_lookup_enum_by_nr(n[1].ui),
-                         n[2].f, n[3].f, n[4].f, n[5].f,
-                         n[6].i, n[7].i, n[8].i, n[9].i);
-            break;
-         case OPCODE_MAPGRID1:
-            printf("MapGrid1 %d %.3f %.3f\n", n[1].i, n[2].f, n[3].f);
-            break;
-         case OPCODE_MAPGRID2:
-            printf("MapGrid2 %d %.3f %.3f, %d %.3f %.3f\n",
-                         n[1].i, n[2].f, n[3].f, n[4].i, n[5].f, n[6].f);
-            break;
-         case OPCODE_EVALMESH1:
-            printf("EvalMesh1 %d %d\n", n[1].i, n[2].i);
-            break;
-         case OPCODE_EVALMESH2:
-            printf("EvalMesh2 %d %d %d %d\n",
-                         n[1].i, n[2].i, n[3].i, n[4].i);
-            break;
-
-         case OPCODE_ATTR_1F_NV:
-            printf("ATTR_1F_NV attr %d: %f\n", n[1].i, n[2].f);
-            break;
-         case OPCODE_ATTR_2F_NV:
-            printf("ATTR_2F_NV attr %d: %f %f\n",
-                         n[1].i, n[2].f, n[3].f);
-            break;
-         case OPCODE_ATTR_3F_NV:
-            printf("ATTR_3F_NV attr %d: %f %f %f\n",
-                         n[1].i, n[2].f, n[3].f, n[4].f);
-            break;
-         case OPCODE_ATTR_4F_NV:
-            printf("ATTR_4F_NV attr %d: %f %f %f %f\n",
-                         n[1].i, n[2].f, n[3].f, n[4].f, n[5].f);
-            break;
-         case OPCODE_ATTR_1F_ARB:
-            printf("ATTR_1F_ARB attr %d: %f\n", n[1].i, n[2].f);
-            break;
-         case OPCODE_ATTR_2F_ARB:
-            printf("ATTR_2F_ARB attr %d: %f %f\n",
-                         n[1].i, n[2].f, n[3].f);
-            break;
-         case OPCODE_ATTR_3F_ARB:
-            printf("ATTR_3F_ARB attr %d: %f %f %f\n",
-                         n[1].i, n[2].f, n[3].f, n[4].f);
-            break;
-         case OPCODE_ATTR_4F_ARB:
-            printf("ATTR_4F_ARB attr %d: %f %f %f %f\n",
-                         n[1].i, n[2].f, n[3].f, n[4].f, n[5].f);
-            break;
-
-         case OPCODE_MATERIAL:
-            printf("MATERIAL %x %x: %f %f %f %f\n",
-                         n[1].i, n[2].i, n[3].f, n[4].f, n[5].f, n[6].f);
-            break;
-         case OPCODE_BEGIN:
-            printf("BEGIN %x\n", n[1].i);
-            break;
-         case OPCODE_END:
-            printf("END\n");
-            break;
-         case OPCODE_RECTF:
-            printf("RECTF %f %f %f %f\n", n[1].f, n[2].f, n[3].f,
-                         n[4].f);
-            break;
-         case OPCODE_EVAL_C1:
-            printf("EVAL_C1 %f\n", n[1].f);
-            break;
-         case OPCODE_EVAL_C2:
-            printf("EVAL_C2 %f %f\n", n[1].f, n[2].f);
-            break;
-         case OPCODE_EVAL_P1:
-            printf("EVAL_P1 %d\n", n[1].i);
-            break;
-         case OPCODE_EVAL_P2:
-            printf("EVAL_P2 %d %d\n", n[1].i, n[2].i);
-            break;
-
-         case OPCODE_PROVOKING_VERTEX:
-            printf("ProvokingVertex %s\n",
-                         _mesa_lookup_enum_by_nr(n[1].ui));
-            break;
-
-            /*
-             * meta opcodes/commands
-             */
-         case OPCODE_ERROR:
-            printf("Error: %s %s\n",
-                         enum_string(n[1].e), (const char *) n[2].data);
-            break;
-         case OPCODE_CONTINUE:
-            printf("DISPLAY-LIST-CONTINUE\n");
-            n = (Node *) n[1].next;
-            break;
-         case OPCODE_END_OF_LIST:
-            printf("END-LIST %u\n", list);
-            done = GL_TRUE;
-            break;
-         default:
-            if (opcode < 0 || opcode > OPCODE_END_OF_LIST) {
-               printf
-                  ("ERROR IN DISPLAY LIST: opcode = %d, address = %p\n",
-                   opcode, (void *) n);
-               return;
-            }
-            else {
-               printf("command %d, %u operands\n", opcode,
-                            InstSize[opcode]);
-            }
-         }
-         /* increment n to point to next compiled command */
-         if (opcode != OPCODE_CONTINUE) {
-            n += InstSize[opcode];
-         }
-      }
-   }
-}
-
-
-
-/**
- * Clients may call this function to help debug display list problems.
- * This function is _ONLY_FOR_DEBUGGING_PURPOSES_.  It may be removed,
- * changed, or break in the future without notice.
- */
-void
-mesa_print_display_list(GLuint list)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   print_list(ctx, list);
-}
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-void
-_mesa_save_vtxfmt_init(GLvertexformat * vfmt)
-{
-   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
-
-   vfmt->Begin = save_Begin;
-
-   _MESA_INIT_DLIST_VTXFMT(vfmt, save_);
-
-   vfmt->Color3f = save_Color3f;
-   vfmt->Color3fv = save_Color3fv;
-   vfmt->Color4f = save_Color4f;
-   vfmt->Color4fv = save_Color4fv;
-   vfmt->EdgeFlag = save_EdgeFlag;
-   vfmt->End = save_End;
-
-   _MESA_INIT_EVAL_VTXFMT(vfmt, save_);
-
-   vfmt->FogCoordfEXT = save_FogCoordfEXT;
-   vfmt->FogCoordfvEXT = save_FogCoordfvEXT;
-   vfmt->Indexf = save_Indexf;
-   vfmt->Indexfv = save_Indexfv;
-   vfmt->Materialfv = save_Materialfv;
-   vfmt->MultiTexCoord1fARB = save_MultiTexCoord1f;
-   vfmt->MultiTexCoord1fvARB = save_MultiTexCoord1fv;
-   vfmt->MultiTexCoord2fARB = save_MultiTexCoord2f;
-   vfmt->MultiTexCoord2fvARB = save_MultiTexCoord2fv;
-   vfmt->MultiTexCoord3fARB = save_MultiTexCoord3f;
-   vfmt->MultiTexCoord3fvARB = save_MultiTexCoord3fv;
-   vfmt->MultiTexCoord4fARB = save_MultiTexCoord4f;
-   vfmt->MultiTexCoord4fvARB = save_MultiTexCoord4fv;
-   vfmt->Normal3f = save_Normal3f;
-   vfmt->Normal3fv = save_Normal3fv;
-   vfmt->SecondaryColor3fEXT = save_SecondaryColor3fEXT;
-   vfmt->SecondaryColor3fvEXT = save_SecondaryColor3fvEXT;
-   vfmt->TexCoord1f = save_TexCoord1f;
-   vfmt->TexCoord1fv = save_TexCoord1fv;
-   vfmt->TexCoord2f = save_TexCoord2f;
-   vfmt->TexCoord2fv = save_TexCoord2fv;
-   vfmt->TexCoord3f = save_TexCoord3f;
-   vfmt->TexCoord3fv = save_TexCoord3fv;
-   vfmt->TexCoord4f = save_TexCoord4f;
-   vfmt->TexCoord4fv = save_TexCoord4fv;
-   vfmt->Vertex2f = save_Vertex2f;
-   vfmt->Vertex2fv = save_Vertex2fv;
-   vfmt->Vertex3f = save_Vertex3f;
-   vfmt->Vertex3fv = save_Vertex3fv;
-   vfmt->Vertex4f = save_Vertex4f;
-   vfmt->Vertex4fv = save_Vertex4fv;
-   vfmt->VertexAttrib1fNV = save_VertexAttrib1fNV;
-   vfmt->VertexAttrib1fvNV = save_VertexAttrib1fvNV;
-   vfmt->VertexAttrib2fNV = save_VertexAttrib2fNV;
-   vfmt->VertexAttrib2fvNV = save_VertexAttrib2fvNV;
-   vfmt->VertexAttrib3fNV = save_VertexAttrib3fNV;
-   vfmt->VertexAttrib3fvNV = save_VertexAttrib3fvNV;
-   vfmt->VertexAttrib4fNV = save_VertexAttrib4fNV;
-   vfmt->VertexAttrib4fvNV = save_VertexAttrib4fvNV;
-   vfmt->VertexAttrib1fARB = save_VertexAttrib1fARB;
-   vfmt->VertexAttrib1fvARB = save_VertexAttrib1fvARB;
-   vfmt->VertexAttrib2fARB = save_VertexAttrib2fARB;
-   vfmt->VertexAttrib2fvARB = save_VertexAttrib2fvARB;
-   vfmt->VertexAttrib3fARB = save_VertexAttrib3fARB;
-   vfmt->VertexAttrib3fvARB = save_VertexAttrib3fvARB;
-   vfmt->VertexAttrib4fARB = save_VertexAttrib4fARB;
-   vfmt->VertexAttrib4fvARB = save_VertexAttrib4fvARB;
-
-   vfmt->Rectf = save_Rectf;
-
-   /* The driver is required to implement these as
-    * 1) They can probably do a better job.
-    * 2) A lot of new mechanisms would have to be added to this module
-    *     to support it.  That code would probably never get used,
-    *     because of (1).
-    */
-#if 0
-   vfmt->DrawArrays = 0;
-   vfmt->DrawElements = 0;
-   vfmt->DrawRangeElements = 0;
-   vfmt->MultiDrawElemementsEXT = 0;
-   vfmt->DrawElementsBaseVertex = 0;
-   vfmt->DrawRangeElementsBaseVertex = 0;
-   vfmt->MultiDrawElemementsBaseVertex = 0;
-#endif
-}
-
-
-void
-_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
-                           const GLvertexformat *vfmt)
-{
-   SET_CallList(disp, vfmt->CallList);
-   SET_CallLists(disp, vfmt->CallLists);
-}
-
-
-void _mesa_init_dlist_dispatch(struct _glapi_table *disp)
-{
-   SET_CallList(disp, _mesa_CallList);
-   SET_CallLists(disp, _mesa_CallLists);
-
-   SET_DeleteLists(disp, _mesa_DeleteLists);
-   SET_EndList(disp, _mesa_EndList);
-   SET_GenLists(disp, _mesa_GenLists);
-   SET_IsList(disp, _mesa_IsList);
-   SET_ListBase(disp, _mesa_ListBase);
-   SET_NewList(disp, _mesa_NewList);
-}
-
-
-#endif /* FEATURE_dlist */
-
-
-/**
- * Initialize display list state for given context.
- */
-void
-_mesa_init_display_list(struct gl_context *ctx)
-{
-   static GLboolean tableInitialized = GL_FALSE;
-
-   /* zero-out the instruction size table, just once */
-   if (!tableInitialized) {
-      memset(InstSize, 0, sizeof(InstSize));
-      tableInitialized = GL_TRUE;
-   }
-
-   /* extension info */
-   ctx->ListExt = CALLOC_STRUCT(gl_list_extensions);
-
-   /* Display list */
-   ctx->ListState.CallDepth = 0;
-   ctx->ExecuteFlag = GL_TRUE;
-   ctx->CompileFlag = GL_FALSE;
-   ctx->ListState.CurrentBlock = NULL;
-   ctx->ListState.CurrentPos = 0;
-
-   /* Display List group */
-   ctx->List.ListBase = 0;
-
-#if FEATURE_dlist
-   _mesa_save_vtxfmt_init(&ctx->ListState.ListVtxfmt);
-#endif
-}
-
-
-void
-_mesa_free_display_list_data(struct gl_context *ctx)
-{
-   free(ctx->ListExt);
-   ctx->ListExt = NULL;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.7

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file dlist.c

+ * Display lists management functions.

+ */

+

+#include "glheader.h"

+#include "imports.h"

+#include "api_arrayelt.h"

+#include "api_exec.h"

+#include "api_loopback.h"

+#if FEATURE_ATI_fragment_shader

+#include "atifragshader.h"

+#endif

+#include "config.h"

+#include "mfeatures.h"

+#if FEATURE_ARB_vertex_buffer_object

+#include "bufferobj.h"

+#endif

+#include "arrayobj.h"

+#include "context.h"

+#include "dlist.h"

+#include "enums.h"

+#include "eval.h"

+#include "framebuffer.h"

+#include "glapi/glapi.h"

+#include "hash.h"

+#include "image.h"

+#include "light.h"

+#include "macros.h"

+#include "pack.h"

+#include "pbo.h"

+#include "queryobj.h"

+#include "teximage.h"

+#include "mtypes.h"

+#include "varray.h"

+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+#include "arbprogram.h"

+#endif

+#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program

+#include "nvprogram.h"

+#endif

+

+#include "math/m_matrix.h"

+

+#include "main/dispatch.h"

+

+

+

+/**

+ * Other parts of Mesa (such as the VBO module) can plug into the display

+ * list system.  This structure describes new display list instructions.

+ */

+struct gl_list_instruction

+{

+   GLuint Size;

+   void (*Execute)( struct gl_context *ctx, void *data );

+   void (*Destroy)( struct gl_context *ctx, void *data );

+   void (*Print)( struct gl_context *ctx, void *data );

+};

+

+

+#define MAX_DLIST_EXT_OPCODES 16

+

+/**

+ * Used by device drivers to hook new commands into display lists.

+ */

+struct gl_list_extensions

+{

+   struct gl_list_instruction Opcode[MAX_DLIST_EXT_OPCODES];

+   GLuint NumOpcodes;

+};

+

+

+

+/**

+ * Flush vertices.

+ *

+ * \param ctx GL context.

+ *

+ * Checks if dd_function_table::SaveNeedFlush is marked to flush

+ * stored (save) vertices, and calls

+ * dd_function_table::SaveFlushVertices if so.

+ */

+#define SAVE_FLUSH_VERTICES(ctx)		\

+do {						\

+   if (ctx->Driver.SaveNeedFlush)		\

+      ctx->Driver.SaveFlushVertices(ctx);	\

+} while (0)

+

+

+/**

+ * Macro to assert that the API call was made outside the

+ * glBegin()/glEnd() pair, with return value.

+ * 

+ * \param ctx GL context.

+ * \param retval value to return value in case the assertion fails.

+ */

+#define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval)		\

+do {									\

+   if (ctx->Driver.CurrentSavePrimitive <= GL_POLYGON ||		\

+       ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) {	\

+      _mesa_compile_error( ctx, GL_INVALID_OPERATION, "begin/end" );	\

+      return retval;							\

+   }									\

+} while (0)

+

+/**

+ * Macro to assert that the API call was made outside the

+ * glBegin()/glEnd() pair.

+ * 

+ * \param ctx GL context.

+ */

+#define ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx)				\

+do {									\

+   if (ctx->Driver.CurrentSavePrimitive <= GL_POLYGON ||		\

+       ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) {	\

+      _mesa_compile_error( ctx, GL_INVALID_OPERATION, "begin/end" );	\

+      return;								\

+   }									\

+} while (0)

+

+/**

+ * Macro to assert that the API call was made outside the

+ * glBegin()/glEnd() pair and flush the vertices.

+ * 

+ * \param ctx GL context.

+ */

+#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx)			\

+do {									\

+   ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx);					\

+   SAVE_FLUSH_VERTICES(ctx);						\

+} while (0)

+

+/**

+ * Macro to assert that the API call was made outside the

+ * glBegin()/glEnd() pair and flush the vertices, with return value.

+ * 

+ * \param ctx GL context.

+ * \param retval value to return value in case the assertion fails.

+ */

+#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval)\

+do {									\

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval);		\

+   SAVE_FLUSH_VERTICES(ctx);						\

+} while (0)

+

+

+

+/**

+ * Display list opcodes.

+ *

+ * The fact that these identifiers are assigned consecutive

+ * integer values starting at 0 is very important, see InstSize array usage)

+ */

+typedef enum

+{

+   OPCODE_INVALID = -1,         /* Force signed enum */

+   OPCODE_ACCUM,

+   OPCODE_ALPHA_FUNC,

+   OPCODE_BIND_TEXTURE,

+   OPCODE_BITMAP,

+   OPCODE_BLEND_COLOR,

+   OPCODE_BLEND_EQUATION,

+   OPCODE_BLEND_EQUATION_SEPARATE,

+   OPCODE_BLEND_FUNC_SEPARATE,

+

+   OPCODE_BLEND_EQUATION_I,

+   OPCODE_BLEND_EQUATION_SEPARATE_I,

+   OPCODE_BLEND_FUNC_I,

+   OPCODE_BLEND_FUNC_SEPARATE_I,

+

+   OPCODE_CALL_LIST,

+   OPCODE_CALL_LIST_OFFSET,

+   OPCODE_CLEAR,

+   OPCODE_CLEAR_ACCUM,

+   OPCODE_CLEAR_COLOR,

+   OPCODE_CLEAR_DEPTH,

+   OPCODE_CLEAR_INDEX,

+   OPCODE_CLEAR_STENCIL,

+   OPCODE_CLEAR_BUFFER_IV,

+   OPCODE_CLEAR_BUFFER_UIV,

+   OPCODE_CLEAR_BUFFER_FV,

+   OPCODE_CLEAR_BUFFER_FI,

+   OPCODE_CLIP_PLANE,

+   OPCODE_COLOR_MASK,

+   OPCODE_COLOR_MASK_INDEXED,

+   OPCODE_COLOR_MATERIAL,

+   OPCODE_COLOR_TABLE,

+   OPCODE_COLOR_TABLE_PARAMETER_FV,

+   OPCODE_COLOR_TABLE_PARAMETER_IV,

+   OPCODE_COLOR_SUB_TABLE,

+   OPCODE_CONVOLUTION_FILTER_1D,

+   OPCODE_CONVOLUTION_FILTER_2D,

+   OPCODE_CONVOLUTION_PARAMETER_I,

+   OPCODE_CONVOLUTION_PARAMETER_IV,

+   OPCODE_CONVOLUTION_PARAMETER_F,

+   OPCODE_CONVOLUTION_PARAMETER_FV,

+   OPCODE_COPY_COLOR_SUB_TABLE,

+   OPCODE_COPY_COLOR_TABLE,

+   OPCODE_COPY_PIXELS,

+   OPCODE_COPY_TEX_IMAGE1D,

+   OPCODE_COPY_TEX_IMAGE2D,

+   OPCODE_COPY_TEX_SUB_IMAGE1D,

+   OPCODE_COPY_TEX_SUB_IMAGE2D,

+   OPCODE_COPY_TEX_SUB_IMAGE3D,

+   OPCODE_CULL_FACE,

+   OPCODE_DEPTH_FUNC,

+   OPCODE_DEPTH_MASK,

+   OPCODE_DEPTH_RANGE,

+   OPCODE_DISABLE,

+   OPCODE_DISABLE_INDEXED,

+   OPCODE_DRAW_BUFFER,

+   OPCODE_DRAW_PIXELS,

+   OPCODE_ENABLE,

+   OPCODE_ENABLE_INDEXED,

+   OPCODE_EVALMESH1,

+   OPCODE_EVALMESH2,

+   OPCODE_FOG,

+   OPCODE_FRONT_FACE,

+   OPCODE_FRUSTUM,

+   OPCODE_HINT,

+   OPCODE_HISTOGRAM,

+   OPCODE_INDEX_MASK,

+   OPCODE_INIT_NAMES,

+   OPCODE_LIGHT,

+   OPCODE_LIGHT_MODEL,

+   OPCODE_LINE_STIPPLE,

+   OPCODE_LINE_WIDTH,

+   OPCODE_LIST_BASE,

+   OPCODE_LOAD_IDENTITY,

+   OPCODE_LOAD_MATRIX,

+   OPCODE_LOAD_NAME,

+   OPCODE_LOGIC_OP,

+   OPCODE_MAP1,

+   OPCODE_MAP2,

+   OPCODE_MAPGRID1,

+   OPCODE_MAPGRID2,

+   OPCODE_MATRIX_MODE,

+   OPCODE_MIN_MAX,

+   OPCODE_MULT_MATRIX,

+   OPCODE_ORTHO,

+   OPCODE_PASSTHROUGH,

+   OPCODE_PIXEL_MAP,

+   OPCODE_PIXEL_TRANSFER,

+   OPCODE_PIXEL_ZOOM,

+   OPCODE_POINT_SIZE,

+   OPCODE_POINT_PARAMETERS,

+   OPCODE_POLYGON_MODE,

+   OPCODE_POLYGON_STIPPLE,

+   OPCODE_POLYGON_OFFSET,

+   OPCODE_POP_ATTRIB,

+   OPCODE_POP_MATRIX,

+   OPCODE_POP_NAME,

+   OPCODE_PRIORITIZE_TEXTURE,

+   OPCODE_PUSH_ATTRIB,

+   OPCODE_PUSH_MATRIX,

+   OPCODE_PUSH_NAME,

+   OPCODE_RASTER_POS,

+   OPCODE_READ_BUFFER,

+   OPCODE_RESET_HISTOGRAM,

+   OPCODE_RESET_MIN_MAX,

+   OPCODE_ROTATE,

+   OPCODE_SCALE,

+   OPCODE_SCISSOR,

+   OPCODE_SELECT_TEXTURE_SGIS,

+   OPCODE_SELECT_TEXTURE_COORD_SET,

+   OPCODE_SHADE_MODEL,

+   OPCODE_STENCIL_FUNC,

+   OPCODE_STENCIL_MASK,

+   OPCODE_STENCIL_OP,

+   OPCODE_TEXENV,

+   OPCODE_TEXGEN,

+   OPCODE_TEXPARAMETER,

+   OPCODE_TEX_IMAGE1D,

+   OPCODE_TEX_IMAGE2D,

+   OPCODE_TEX_IMAGE3D,

+   OPCODE_TEX_SUB_IMAGE1D,

+   OPCODE_TEX_SUB_IMAGE2D,

+   OPCODE_TEX_SUB_IMAGE3D,

+   OPCODE_TRANSLATE,

+   OPCODE_VIEWPORT,

+   OPCODE_WINDOW_POS,

+   /* GL_ARB_multitexture */

+   OPCODE_ACTIVE_TEXTURE,

+   /* GL_ARB_texture_compression */

+   OPCODE_COMPRESSED_TEX_IMAGE_1D,

+   OPCODE_COMPRESSED_TEX_IMAGE_2D,

+   OPCODE_COMPRESSED_TEX_IMAGE_3D,

+   OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D,

+   OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D,

+   OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D,

+   /* GL_ARB_multisample */

+   OPCODE_SAMPLE_COVERAGE,

+   /* GL_ARB_window_pos */

+   OPCODE_WINDOW_POS_ARB,

+   /* GL_NV_vertex_program */

+   OPCODE_BIND_PROGRAM_NV,

+   OPCODE_EXECUTE_PROGRAM_NV,

+   OPCODE_REQUEST_RESIDENT_PROGRAMS_NV,

+   OPCODE_LOAD_PROGRAM_NV,

+   OPCODE_TRACK_MATRIX_NV,

+   /* GL_NV_fragment_program */

+   OPCODE_PROGRAM_LOCAL_PARAMETER_ARB,

+   OPCODE_PROGRAM_NAMED_PARAMETER_NV,

+   /* GL_EXT_stencil_two_side */

+   OPCODE_ACTIVE_STENCIL_FACE_EXT,

+   /* GL_EXT_depth_bounds_test */

+   OPCODE_DEPTH_BOUNDS_EXT,

+   /* GL_ARB_vertex/fragment_program */

+   OPCODE_PROGRAM_STRING_ARB,

+   OPCODE_PROGRAM_ENV_PARAMETER_ARB,

+   /* GL_ARB_occlusion_query */

+   OPCODE_BEGIN_QUERY_ARB,

+   OPCODE_END_QUERY_ARB,

+   /* GL_ARB_draw_buffers */

+   OPCODE_DRAW_BUFFERS_ARB,

+   /* GL_ATI_fragment_shader */

+   OPCODE_TEX_BUMP_PARAMETER_ATI,

+   /* GL_ATI_fragment_shader */

+   OPCODE_BIND_FRAGMENT_SHADER_ATI,

+   OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI,

+   /* OpenGL 2.0 */

+   OPCODE_STENCIL_FUNC_SEPARATE,

+   OPCODE_STENCIL_OP_SEPARATE,

+   OPCODE_STENCIL_MASK_SEPARATE,

+

+   /* GL_ARB_shader_objects */

+   OPCODE_USE_PROGRAM,

+   OPCODE_UNIFORM_1F,

+   OPCODE_UNIFORM_2F,

+   OPCODE_UNIFORM_3F,

+   OPCODE_UNIFORM_4F,

+   OPCODE_UNIFORM_1FV,

+   OPCODE_UNIFORM_2FV,

+   OPCODE_UNIFORM_3FV,

+   OPCODE_UNIFORM_4FV,

+   OPCODE_UNIFORM_1I,

+   OPCODE_UNIFORM_2I,

+   OPCODE_UNIFORM_3I,

+   OPCODE_UNIFORM_4I,

+   OPCODE_UNIFORM_1IV,

+   OPCODE_UNIFORM_2IV,

+   OPCODE_UNIFORM_3IV,

+   OPCODE_UNIFORM_4IV,

+   OPCODE_UNIFORM_MATRIX22,

+   OPCODE_UNIFORM_MATRIX33,

+   OPCODE_UNIFORM_MATRIX44,

+   OPCODE_UNIFORM_MATRIX23,

+   OPCODE_UNIFORM_MATRIX32,

+   OPCODE_UNIFORM_MATRIX24,

+   OPCODE_UNIFORM_MATRIX42,

+   OPCODE_UNIFORM_MATRIX34,

+   OPCODE_UNIFORM_MATRIX43,

+

+   /* OpenGL 3.0 */

+   OPCODE_UNIFORM_1UI,

+   OPCODE_UNIFORM_2UI,

+   OPCODE_UNIFORM_3UI,

+   OPCODE_UNIFORM_4UI,

+   OPCODE_UNIFORM_1UIV,

+   OPCODE_UNIFORM_2UIV,

+   OPCODE_UNIFORM_3UIV,

+   OPCODE_UNIFORM_4UIV,

+

+   /* GL_ARB_color_buffer_float */

+   OPCODE_CLAMP_COLOR,

+

+   /* GL_EXT_framebuffer_blit */

+   OPCODE_BLIT_FRAMEBUFFER,

+

+   /* Vertex attributes -- fallback for when optimized display

+    * list build isn't active.

+    */

+   OPCODE_ATTR_1F_NV,

+   OPCODE_ATTR_2F_NV,

+   OPCODE_ATTR_3F_NV,

+   OPCODE_ATTR_4F_NV,

+   OPCODE_ATTR_1F_ARB,

+   OPCODE_ATTR_2F_ARB,

+   OPCODE_ATTR_3F_ARB,

+   OPCODE_ATTR_4F_ARB,

+   OPCODE_MATERIAL,

+   OPCODE_BEGIN,

+   OPCODE_END,

+   OPCODE_RECTF,

+   OPCODE_EVAL_C1,

+   OPCODE_EVAL_C2,

+   OPCODE_EVAL_P1,

+   OPCODE_EVAL_P2,

+

+   /* GL_EXT_provoking_vertex */

+   OPCODE_PROVOKING_VERTEX,

+

+   /* GL_EXT_transform_feedback */

+   OPCODE_BEGIN_TRANSFORM_FEEDBACK,

+   OPCODE_END_TRANSFORM_FEEDBACK,

+

+   /* GL_EXT_texture_integer */

+   OPCODE_CLEARCOLOR_I,

+   OPCODE_CLEARCOLOR_UI,

+   OPCODE_TEXPARAMETER_I,

+   OPCODE_TEXPARAMETER_UI,

+

+   /* GL_EXT_separate_shader_objects */

+   OPCODE_ACTIVE_PROGRAM_EXT,

+   OPCODE_USE_SHADER_PROGRAM_EXT,

+

+   /* GL_ARB_instanced_arrays */

+   OPCODE_VERTEX_ATTRIB_DIVISOR,

+

+   /* GL_NV_texture_barrier */

+   OPCODE_TEXTURE_BARRIER_NV,

+

+   /* The following three are meta instructions */

+   OPCODE_ERROR,                /* raise compiled-in error */

+   OPCODE_CONTINUE,

+   OPCODE_END_OF_LIST,

+   OPCODE_EXT_0

+} OpCode;

+

+

+

+/**

+ * Display list node.

+ *

+ * Display list instructions are stored as sequences of "nodes".  Nodes

+ * are allocated in blocks.  Each block has BLOCK_SIZE nodes.  Blocks

+ * are linked together with a pointer.

+ *

+ * Each instruction in the display list is stored as a sequence of

+ * contiguous nodes in memory.

+ * Each node is the union of a variety of data types.

+ */

+union gl_dlist_node

+{

+   OpCode opcode;

+   GLboolean b;

+   GLbitfield bf;

+   GLubyte ub;

+   GLshort s;

+   GLushort us;

+   GLint i;

+   GLuint ui;

+   GLenum e;

+   GLfloat f;

+   GLvoid *data;

+   void *next;                  /* If prev node's opcode==OPCODE_CONTINUE */

+};

+

+

+typedef union gl_dlist_node Node;

+

+

+/**

+ * How many nodes to allocate at a time.

+ *

+ * \note Reduced now that we hold vertices etc. elsewhere.

+ */

+#define BLOCK_SIZE 256

+

+

+

+/**

+ * Number of nodes of storage needed for each instruction.

+ * Sizes for dynamically allocated opcodes are stored in the context struct.

+ */

+static GLuint InstSize[OPCODE_END_OF_LIST + 1];

+

+

+#if FEATURE_dlist

+

+

+void mesa_print_display_list(GLuint list);

+

+

+/**********************************************************************/

+/*****                           Private                          *****/

+/**********************************************************************/

+

+

+/**

+ * Make an empty display list.  This is used by glGenLists() to

+ * reserve display list IDs.

+ */

+static struct gl_display_list *

+make_list(GLuint name, GLuint count)

+{

+   struct gl_display_list *dlist = CALLOC_STRUCT(gl_display_list);

+   dlist->Name = name;

+   dlist->Head = (Node *) malloc(sizeof(Node) * count);

+   dlist->Head[0].opcode = OPCODE_END_OF_LIST;

+   return dlist;

+}

+

+

+/**

+ * Lookup function to just encapsulate casting.

+ */

+static INLINE struct gl_display_list *

+lookup_list(struct gl_context *ctx, GLuint list)

+{

+   return (struct gl_display_list *)

+      _mesa_HashLookup(ctx->Shared->DisplayList, list);

+}

+

+

+/** Is the given opcode an extension code? */

+static INLINE GLboolean

+is_ext_opcode(OpCode opcode)

+{

+   return (opcode >= OPCODE_EXT_0);

+}

+

+

+/** Destroy an extended opcode instruction */

+static GLint

+ext_opcode_destroy(struct gl_context *ctx, Node *node)

+{

+   const GLint i = node[0].opcode - OPCODE_EXT_0;

+   GLint step;

+   ctx->ListExt->Opcode[i].Destroy(ctx, &node[1]);

+   step = ctx->ListExt->Opcode[i].Size;

+   return step;

+}

+

+

+/** Execute an extended opcode instruction */

+static GLint

+ext_opcode_execute(struct gl_context *ctx, Node *node)

+{

+   const GLint i = node[0].opcode - OPCODE_EXT_0;

+   GLint step;

+   ctx->ListExt->Opcode[i].Execute(ctx, &node[1]);

+   step = ctx->ListExt->Opcode[i].Size;

+   return step;

+}

+

+

+/** Print an extended opcode instruction */

+static GLint

+ext_opcode_print(struct gl_context *ctx, Node *node)

+{

+   const GLint i = node[0].opcode - OPCODE_EXT_0;

+   GLint step;

+   ctx->ListExt->Opcode[i].Print(ctx, &node[1]);

+   step = ctx->ListExt->Opcode[i].Size;

+   return step;

+}

+

+

+/**

+ * Delete the named display list, but don't remove from hash table.

+ * \param dlist - display list pointer

+ */

+void

+_mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist)

+{

+   Node *n, *block;

+   GLboolean done;

+

+   n = block = dlist->Head;

+

+   done = block ? GL_FALSE : GL_TRUE;

+   while (!done) {

+      const OpCode opcode = n[0].opcode;

+

+      /* check for extension opcodes first */

+      if (is_ext_opcode(opcode)) {

+         n += ext_opcode_destroy(ctx, n);

+      }

+      else {

+         switch (opcode) {

+            /* for some commands, we need to free malloc'd memory */

+         case OPCODE_MAP1:

+            free(n[6].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_MAP2:

+            free(n[10].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_DRAW_PIXELS:

+            free(n[5].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_BITMAP:

+            free(n[7].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_COLOR_TABLE:

+            free(n[6].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_COLOR_SUB_TABLE:

+            free(n[6].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_CONVOLUTION_FILTER_1D:

+            free(n[6].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_CONVOLUTION_FILTER_2D:

+            free(n[7].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_POLYGON_STIPPLE:

+            free(n[1].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_TEX_IMAGE1D:

+            free(n[8].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_TEX_IMAGE2D:

+            free(n[9].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_TEX_IMAGE3D:

+            free(n[10].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_TEX_SUB_IMAGE1D:

+            free(n[7].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_TEX_SUB_IMAGE2D:

+            free(n[9].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_TEX_SUB_IMAGE3D:

+            free(n[11].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_COMPRESSED_TEX_IMAGE_1D:

+            free(n[7].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_COMPRESSED_TEX_IMAGE_2D:

+            free(n[8].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_COMPRESSED_TEX_IMAGE_3D:

+            free(n[9].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D:

+            free(n[7].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D:

+            free(n[9].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D:

+            free(n[11].data);

+            n += InstSize[n[0].opcode];

+            break;

+#if FEATURE_NV_vertex_program

+         case OPCODE_LOAD_PROGRAM_NV:

+            free(n[4].data);      /* program string */

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_REQUEST_RESIDENT_PROGRAMS_NV:

+            free(n[2].data);      /* array of program ids */

+            n += InstSize[n[0].opcode];

+            break;

+#endif

+#if FEATURE_NV_fragment_program

+         case OPCODE_PROGRAM_NAMED_PARAMETER_NV:

+            free(n[3].data);      /* parameter name */

+            n += InstSize[n[0].opcode];

+            break;

+#endif

+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+         case OPCODE_PROGRAM_STRING_ARB:

+            free(n[4].data);      /* program string */

+            n += InstSize[n[0].opcode];

+            break;

+#endif

+         case OPCODE_UNIFORM_1FV:

+         case OPCODE_UNIFORM_2FV:

+         case OPCODE_UNIFORM_3FV:

+         case OPCODE_UNIFORM_4FV:

+         case OPCODE_UNIFORM_1IV:

+         case OPCODE_UNIFORM_2IV:

+         case OPCODE_UNIFORM_3IV:

+         case OPCODE_UNIFORM_4IV:

+         case OPCODE_UNIFORM_1UIV:

+         case OPCODE_UNIFORM_2UIV:

+         case OPCODE_UNIFORM_3UIV:

+         case OPCODE_UNIFORM_4UIV:

+            free(n[3].data);

+            n += InstSize[n[0].opcode];

+            break;

+         case OPCODE_UNIFORM_MATRIX22:

+         case OPCODE_UNIFORM_MATRIX33:

+         case OPCODE_UNIFORM_MATRIX44:

+         case OPCODE_UNIFORM_MATRIX24:

+         case OPCODE_UNIFORM_MATRIX42:

+         case OPCODE_UNIFORM_MATRIX23:

+         case OPCODE_UNIFORM_MATRIX32:

+         case OPCODE_UNIFORM_MATRIX34:

+         case OPCODE_UNIFORM_MATRIX43:

+            free(n[4].data);

+            n += InstSize[n[0].opcode];

+            break;

+

+         case OPCODE_CONTINUE:

+            n = (Node *) n[1].next;

+            free(block);

+            block = n;

+            break;

+         case OPCODE_END_OF_LIST:

+            free(block);

+            done = GL_TRUE;

+            break;

+         default:

+            /* Most frequent case */

+            n += InstSize[n[0].opcode];

+            break;

+         }

+      }

+   }

+

+   free(dlist);

+}

+

+

+/**

+ * Destroy a display list and remove from hash table.

+ * \param list - display list number

+ */

+static void

+destroy_list(struct gl_context *ctx, GLuint list)

+{

+   struct gl_display_list *dlist;

+

+   if (list == 0)

+      return;

+

+   dlist = lookup_list(ctx, list);

+   if (!dlist)

+      return;

+

+   _mesa_delete_list(ctx, dlist);

+   _mesa_HashRemove(ctx->Shared->DisplayList, list);

+}

+

+

+/*

+ * Translate the nth element of list from <type> to GLint.

+ */

+static GLint

+translate_id(GLsizei n, GLenum type, const GLvoid * list)

+{

+   GLbyte *bptr;

+   GLubyte *ubptr;

+   GLshort *sptr;

+   GLushort *usptr;

+   GLint *iptr;

+   GLuint *uiptr;

+   GLfloat *fptr;

+

+   switch (type) {

+   case GL_BYTE:

+      bptr = (GLbyte *) list;

+      return (GLint) bptr[n];

+   case GL_UNSIGNED_BYTE:

+      ubptr = (GLubyte *) list;

+      return (GLint) ubptr[n];

+   case GL_SHORT:

+      sptr = (GLshort *) list;

+      return (GLint) sptr[n];

+   case GL_UNSIGNED_SHORT:

+      usptr = (GLushort *) list;

+      return (GLint) usptr[n];

+   case GL_INT:

+      iptr = (GLint *) list;

+      return iptr[n];

+   case GL_UNSIGNED_INT:

+      uiptr = (GLuint *) list;

+      return (GLint) uiptr[n];

+   case GL_FLOAT:

+      fptr = (GLfloat *) list;

+      return (GLint) FLOORF(fptr[n]);

+   case GL_2_BYTES:

+      ubptr = ((GLubyte *) list) + 2 * n;

+      return (GLint) ubptr[0] * 256

+           + (GLint) ubptr[1];

+   case GL_3_BYTES:

+      ubptr = ((GLubyte *) list) + 3 * n;

+      return (GLint) ubptr[0] * 65536

+           + (GLint) ubptr[1] * 256

+           + (GLint) ubptr[2];

+   case GL_4_BYTES:

+      ubptr = ((GLubyte *) list) + 4 * n;

+      return (GLint) ubptr[0] * 16777216

+           + (GLint) ubptr[1] * 65536

+           + (GLint) ubptr[2] * 256

+           + (GLint) ubptr[3];

+   default:

+      return 0;

+   }

+}

+

+

+

+

+/**********************************************************************/

+/*****                        Public                              *****/

+/**********************************************************************/

+

+/**

+ * Wrapper for _mesa_unpack_image() that handles pixel buffer objects.

+ * If we run out of memory, GL_OUT_OF_MEMORY will be recorded.

+ */

+static GLvoid *

+unpack_image(struct gl_context *ctx, GLuint dimensions,

+             GLsizei width, GLsizei height, GLsizei depth,

+             GLenum format, GLenum type, const GLvoid * pixels,

+             const struct gl_pixelstore_attrib *unpack)

+{

+   if (!_mesa_is_bufferobj(unpack->BufferObj)) {

+      /* no PBO */

+      GLvoid *image = _mesa_unpack_image(dimensions, width, height, depth,

+                                         format, type, pixels, unpack);

+      if (pixels && !image) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "display list construction");

+      }

+      return image;

+   }

+   else if (_mesa_validate_pbo_access(dimensions, unpack, width, height, depth,

+                                      format, type, pixels)) {

+      const GLubyte *map, *src;

+      GLvoid *image;

+

+      map = (GLubyte *)

+         ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,

+                               GL_READ_ONLY_ARB, unpack->BufferObj);

+      if (!map) {

+         /* unable to map src buffer! */

+         _mesa_error(ctx, GL_INVALID_OPERATION, "unable to map PBO");

+         return NULL;

+      }

+

+      src = ADD_POINTERS(map, pixels);

+      image = _mesa_unpack_image(dimensions, width, height, depth,

+                                 format, type, src, unpack);

+

+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,

+                              unpack->BufferObj);

+

+      if (!image) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "display list construction");

+      }

+      return image;

+   }

+   /* bad access! */

+   return NULL;

+}

+

+

+/**

+ * Allocate space for a display list instruction (opcode + payload space).

+ * \param opcode  the instruction opcode (OPCODE_* value)

+ * \param bytes   instruction payload size (not counting opcode)

+ * \return pointer to allocated memory (the opcode space)

+ */

+static Node *

+dlist_alloc(struct gl_context *ctx, OpCode opcode, GLuint bytes)

+{

+   const GLuint numNodes = 1 + (bytes + sizeof(Node) - 1) / sizeof(Node);

+   Node *n;

+

+   if (opcode < (GLuint) OPCODE_EXT_0) {

+      if (InstSize[opcode] == 0) {

+         /* save instruction size now */

+         InstSize[opcode] = numNodes;

+      }

+      else {

+         /* make sure instruction size agrees */

+         ASSERT(numNodes == InstSize[opcode]);

+      }

+   }

+

+   if (ctx->ListState.CurrentPos + numNodes + 2 > BLOCK_SIZE) {

+      /* This block is full.  Allocate a new block and chain to it */

+      Node *newblock;

+      n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos;

+      n[0].opcode = OPCODE_CONTINUE;

+      newblock = (Node *) malloc(sizeof(Node) * BLOCK_SIZE);

+      if (!newblock) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "Building display list");

+         return NULL;

+      }

+      n[1].next = (Node *) newblock;

+      ctx->ListState.CurrentBlock = newblock;

+      ctx->ListState.CurrentPos = 0;

+   }

+

+   n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos;

+   ctx->ListState.CurrentPos += numNodes;

+

+   n[0].opcode = opcode;

+

+   return n;

+}

+

+

+

+/**

+ * Allocate space for a display list instruction.  Used by callers outside

+ * this file for things like VBO vertex data.

+ *

+ * \param opcode  the instruction opcode (OPCODE_* value)

+ * \param bytes   instruction size in bytes, not counting opcode.

+ * \return pointer to the usable data area (not including the internal

+ *         opcode).

+ */

+void *

+_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint bytes)

+{

+   Node *n = dlist_alloc(ctx, (OpCode) opcode, bytes);

+   if (n)

+      return n + 1;  /* return pointer to payload area, after opcode */

+   else

+      return NULL;

+}

+

+

+/**

+ * This function allows modules and drivers to get their own opcodes

+ * for extending display list functionality.

+ * \param ctx  the rendering context

+ * \param size  number of bytes for storing the new display list command

+ * \param execute  function to execute the new display list command

+ * \param destroy  function to destroy the new display list command

+ * \param print  function to print the new display list command

+ * \return  the new opcode number or -1 if error

+ */

+GLint

+_mesa_dlist_alloc_opcode(struct gl_context *ctx,

+                         GLuint size,

+                         void (*execute) (struct gl_context *, void *),

+                         void (*destroy) (struct gl_context *, void *),

+                         void (*print) (struct gl_context *, void *))

+{

+   if (ctx->ListExt->NumOpcodes < MAX_DLIST_EXT_OPCODES) {

+      const GLuint i = ctx->ListExt->NumOpcodes++;

+      ctx->ListExt->Opcode[i].Size =

+         1 + (size + sizeof(Node) - 1) / sizeof(Node);

+      ctx->ListExt->Opcode[i].Execute = execute;

+      ctx->ListExt->Opcode[i].Destroy = destroy;

+      ctx->ListExt->Opcode[i].Print = print;

+      return i + OPCODE_EXT_0;

+   }

+   return -1;

+}

+

+

+/**

+ * Allocate space for a display list instruction.  The space is basically

+ * an array of Nodes where node[0] holds the opcode, node[1] is the first

+ * function parameter, node[2] is the second parameter, etc.

+ *

+ * \param opcode  one of OPCODE_x

+ * \param nparams  number of function parameters

+ * \return  pointer to start of instruction space

+ */

+static INLINE Node *

+alloc_instruction(struct gl_context *ctx, OpCode opcode, GLuint nparams)

+{

+   return dlist_alloc(ctx, opcode, nparams * sizeof(Node));

+}

+

+

+

+/*

+ * Display List compilation functions

+ */

+static void GLAPIENTRY

+save_Accum(GLenum op, GLfloat value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_ACCUM, 2);

+   if (n) {

+      n[1].e = op;

+      n[2].f = value;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Accum(ctx->Exec, (op, value));

+   }

+}

+

+

+static void GLAPIENTRY

+save_AlphaFunc(GLenum func, GLclampf ref)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_ALPHA_FUNC, 2);

+   if (n) {

+      n[1].e = func;

+      n[2].f = (GLfloat) ref;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_AlphaFunc(ctx->Exec, (func, ref));

+   }

+}

+

+

+static void GLAPIENTRY

+save_BindTexture(GLenum target, GLuint texture)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BIND_TEXTURE, 2);

+   if (n) {

+      n[1].e = target;

+      n[2].ui = texture;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BindTexture(ctx->Exec, (target, texture));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Bitmap(GLsizei width, GLsizei height,

+            GLfloat xorig, GLfloat yorig,

+            GLfloat xmove, GLfloat ymove, const GLubyte * pixels)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BITMAP, 7);

+   if (n) {

+      n[1].i = (GLint) width;

+      n[2].i = (GLint) height;

+      n[3].f = xorig;

+      n[4].f = yorig;

+      n[5].f = xmove;

+      n[6].f = ymove;

+      n[7].data = _mesa_unpack_bitmap(width, height, pixels, &ctx->Unpack);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Bitmap(ctx->Exec, (width, height,

+                              xorig, yorig, xmove, ymove, pixels));

+   }

+}

+

+

+static void GLAPIENTRY

+save_BlendEquation(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BLEND_EQUATION, 1);

+   if (n) {

+      n[1].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BlendEquation(ctx->Exec, (mode));

+   }

+}

+

+

+static void GLAPIENTRY

+save_BlendEquationSeparateEXT(GLenum modeRGB, GLenum modeA)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BLEND_EQUATION_SEPARATE, 2);

+   if (n) {

+      n[1].e = modeRGB;

+      n[2].e = modeA;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BlendEquationSeparateEXT(ctx->Exec, (modeRGB, modeA));

+   }

+}

+

+

+static void GLAPIENTRY

+save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB,

+                          GLenum sfactorA, GLenum dfactorA)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BLEND_FUNC_SEPARATE, 4);

+   if (n) {

+      n[1].e = sfactorRGB;

+      n[2].e = dfactorRGB;

+      n[3].e = sfactorA;

+      n[4].e = dfactorA;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BlendFuncSeparateEXT(ctx->Exec,

+                                (sfactorRGB, dfactorRGB, sfactorA, dfactorA));

+   }

+}

+

+

+static void GLAPIENTRY

+save_BlendFunc(GLenum srcfactor, GLenum dstfactor)

+{

+   save_BlendFuncSeparateEXT(srcfactor, dstfactor, srcfactor, dstfactor);

+}

+

+

+static void GLAPIENTRY

+save_BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BLEND_COLOR, 4);

+   if (n) {

+      n[1].f = red;

+      n[2].f = green;

+      n[3].f = blue;

+      n[4].f = alpha;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BlendColor(ctx->Exec, (red, green, blue, alpha));

+   }

+}

+

+/* GL_ARB_draw_buffers_blend */

+static void GLAPIENTRY

+save_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,

+                        GLenum sfactorA, GLenum dfactorA)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BLEND_FUNC_SEPARATE_I, 5);

+   if (n) {

+      n[1].ui = buf;

+      n[2].e = sfactorRGB;

+      n[3].e = dfactorRGB;

+      n[4].e = sfactorA;

+      n[5].e = dfactorA;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BlendFuncSeparateiARB(ctx->Exec, (buf, sfactorRGB, dfactorRGB,

+                                             sfactorA, dfactorA));

+   }

+}

+

+/* GL_ARB_draw_buffers_blend */

+static void GLAPIENTRY

+save_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BLEND_FUNC_SEPARATE_I, 3);

+   if (n) {

+      n[1].ui = buf;

+      n[2].e = sfactor;

+      n[3].e = dfactor;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BlendFunciARB(ctx->Exec, (buf, sfactor, dfactor));

+   }

+}

+

+/* GL_ARB_draw_buffers_blend */

+static void GLAPIENTRY

+save_BlendEquationi(GLuint buf, GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BLEND_EQUATION_I, 2);

+   if (n) {

+      n[1].ui = buf;

+      n[2].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BlendEquationiARB(ctx->Exec, (buf, mode));

+   }

+}

+

+/* GL_ARB_draw_buffers_blend */

+static void GLAPIENTRY

+save_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BLEND_EQUATION_SEPARATE_I, 3);

+   if (n) {

+      n[1].ui = buf;

+      n[2].e = modeRGB;

+      n[3].e = modeA;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BlendEquationSeparateiARB(ctx->Exec, (buf, modeRGB, modeA));

+   }

+}

+

+

+static void invalidate_saved_current_state( struct gl_context *ctx )

+{

+   GLint i;

+

+   for (i = 0; i < VERT_ATTRIB_MAX; i++)

+      ctx->ListState.ActiveAttribSize[i] = 0;

+

+   for (i = 0; i < MAT_ATTRIB_MAX; i++)

+      ctx->ListState.ActiveMaterialSize[i] = 0;

+

+   memset(&ctx->ListState.Current, 0, sizeof ctx->ListState.Current);

+

+   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;

+}

+

+static void GLAPIENTRY

+save_CallList(GLuint list)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_CALL_LIST, 1);

+   if (n) {

+      n[1].ui = list;

+   }

+

+   /* After this, we don't know what state we're in.  Invalidate all

+    * cached information previously gathered:

+    */

+   invalidate_saved_current_state( ctx );

+

+   if (ctx->ExecuteFlag) {

+      _mesa_CallList(list);

+   }

+}

+

+

+static void GLAPIENTRY

+save_CallLists(GLsizei num, GLenum type, const GLvoid * lists)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+   GLboolean typeErrorFlag;

+

+   SAVE_FLUSH_VERTICES(ctx);

+

+   switch (type) {

+   case GL_BYTE:

+   case GL_UNSIGNED_BYTE:

+   case GL_SHORT:

+   case GL_UNSIGNED_SHORT:

+   case GL_INT:

+   case GL_UNSIGNED_INT:

+   case GL_FLOAT:

+   case GL_2_BYTES:

+   case GL_3_BYTES:

+   case GL_4_BYTES:

+      typeErrorFlag = GL_FALSE;

+      break;

+   default:

+      typeErrorFlag = GL_TRUE;

+   }

+

+   for (i = 0; i < num; i++) {

+      GLint list = translate_id(i, type, lists);

+      Node *n = alloc_instruction(ctx, OPCODE_CALL_LIST_OFFSET, 2);

+      if (n) {

+         n[1].i = list;

+         n[2].b = typeErrorFlag;

+      }

+   }

+

+   /* After this, we don't know what state we're in.  Invalidate all

+    * cached information previously gathered:

+    */

+   invalidate_saved_current_state( ctx );

+

+   if (ctx->ExecuteFlag) {

+      CALL_CallLists(ctx->Exec, (num, type, lists));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Clear(GLbitfield mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEAR, 1);

+   if (n) {

+      n[1].bf = mask;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Clear(ctx->Exec, (mask));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEAR_BUFFER_IV, 6);

+   if (n) {

+      n[1].e = buffer;

+      n[2].i = drawbuffer;

+      n[3].i = value[0];

+      if (buffer == GL_COLOR) {

+         n[4].i = value[1];

+         n[5].i = value[2];

+         n[6].i = value[3];

+      }

+      else {

+         n[4].i = 0;

+         n[5].i = 0;

+         n[6].i = 0;

+      }

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_ClearBufferiv(ctx->Exec, (buffer, drawbuffer, value));*/

+   }

+}

+

+

+static void GLAPIENTRY

+save_ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEAR_BUFFER_UIV, 6);

+   if (n) {

+      n[1].e = buffer;

+      n[2].i = drawbuffer;

+      n[3].ui = value[0];

+      if (buffer == GL_COLOR) {

+         n[4].ui = value[1];

+         n[5].ui = value[2];

+         n[6].ui = value[3];

+      }

+      else {

+         n[4].ui = 0;

+         n[5].ui = 0;

+         n[6].ui = 0;

+      }

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_ClearBufferuiv(ctx->Exec, (buffer, drawbuffer, value));*/

+   }

+}

+

+

+static void GLAPIENTRY

+save_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEAR_BUFFER_FV, 6);

+   if (n) {

+      n[1].e = buffer;

+      n[2].i = drawbuffer;

+      n[3].f = value[0];

+      if (buffer == GL_COLOR) {

+         n[4].f = value[1];

+         n[5].f = value[2];

+         n[6].f = value[3];

+      }

+      else {

+         n[4].f = 0.0F;

+         n[5].f = 0.0F;

+         n[6].f = 0.0F;

+      }

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_ClearBufferuiv(ctx->Exec, (buffer, drawbuffer, value));*/

+   }

+}

+

+

+static void GLAPIENTRY

+save_ClearBufferfi(GLenum buffer, GLint drawbuffer,

+                   GLfloat depth, GLint stencil)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEAR_BUFFER_FI, 4);

+   if (n) {

+      n[1].e = buffer;

+      n[2].i = drawbuffer;

+      n[3].f = depth;

+      n[4].i = stencil;

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_ClearBufferfi(ctx->Exec, (buffer, drawbuffer, depth, stencil));*/

+   }

+}

+

+

+static void GLAPIENTRY

+save_ClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEAR_ACCUM, 4);

+   if (n) {

+      n[1].f = red;

+      n[2].f = green;

+      n[3].f = blue;

+      n[4].f = alpha;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ClearAccum(ctx->Exec, (red, green, blue, alpha));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEAR_COLOR, 4);

+   if (n) {

+      n[1].f = red;

+      n[2].f = green;

+      n[3].f = blue;

+      n[4].f = alpha;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ClearColor(ctx->Exec, (red, green, blue, alpha));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ClearDepth(GLclampd depth)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEAR_DEPTH, 1);

+   if (n) {

+      n[1].f = (GLfloat) depth;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ClearDepth(ctx->Exec, (depth));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ClearIndex(GLfloat c)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEAR_INDEX, 1);

+   if (n) {

+      n[1].f = c;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ClearIndex(ctx->Exec, (c));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ClearStencil(GLint s)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEAR_STENCIL, 1);

+   if (n) {

+      n[1].i = s;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ClearStencil(ctx->Exec, (s));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ClipPlane(GLenum plane, const GLdouble * equ)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLIP_PLANE, 5);

+   if (n) {

+      n[1].e = plane;

+      n[2].f = (GLfloat) equ[0];

+      n[3].f = (GLfloat) equ[1];

+      n[4].f = (GLfloat) equ[2];

+      n[5].f = (GLfloat) equ[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ClipPlane(ctx->Exec, (plane, equ));

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_ColorMask(GLboolean red, GLboolean green,

+               GLboolean blue, GLboolean alpha)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_COLOR_MASK, 4);

+   if (n) {

+      n[1].b = red;

+      n[2].b = green;

+      n[3].b = blue;

+      n[4].b = alpha;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ColorMask(ctx->Exec, (red, green, blue, alpha));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ColorMaskIndexed(GLuint buf, GLboolean red, GLboolean green,

+                      GLboolean blue, GLboolean alpha)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_COLOR_MASK_INDEXED, 5);

+   if (n) {

+      n[1].ui = buf;

+      n[2].b = red;

+      n[3].b = green;

+      n[4].b = blue;

+      n[5].b = alpha;

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_ColorMaskIndexedEXT(ctx->Exec, (buf, red, green, blue, alpha));*/

+   }

+}

+

+

+static void GLAPIENTRY

+save_ColorMaterial(GLenum face, GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_COLOR_MATERIAL, 2);

+   if (n) {

+      n[1].e = face;

+      n[2].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ColorMaterial(ctx->Exec, (face, mode));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ColorTable(GLenum target, GLenum internalFormat,

+                GLsizei width, GLenum format, GLenum type,

+                const GLvoid * table)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (_mesa_is_proxy_texture(target)) {

+      /* execute immediately */

+      CALL_ColorTable(ctx->Exec, (target, internalFormat, width,

+                                  format, type, table));

+   }

+   else {

+      Node *n;

+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+      n = alloc_instruction(ctx, OPCODE_COLOR_TABLE, 6);

+      if (n) {

+         n[1].e = target;

+         n[2].e = internalFormat;

+         n[3].i = width;

+         n[4].e = format;

+         n[5].e = type;

+         n[6].data = unpack_image(ctx, 1, width, 1, 1, format, type, table,

+                                  &ctx->Unpack);

+      }

+      if (ctx->ExecuteFlag) {

+         CALL_ColorTable(ctx->Exec, (target, internalFormat, width,

+                                     format, type, table));

+      }

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_ColorTableParameterfv(GLenum target, GLenum pname,

+                           const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_COLOR_TABLE_PARAMETER_FV, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].e = pname;

+      n[3].f = params[0];

+      if (pname == GL_COLOR_TABLE_SGI ||

+          pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||

+          pname == GL_TEXTURE_COLOR_TABLE_SGI) {

+         n[4].f = params[1];

+         n[5].f = params[2];

+         n[6].f = params[3];

+      }

+   }

+

+   if (ctx->ExecuteFlag) {

+      CALL_ColorTableParameterfv(ctx->Exec, (target, pname, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_COLOR_TABLE_PARAMETER_IV, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].e = pname;

+      n[3].i = params[0];

+      if (pname == GL_COLOR_TABLE_SGI ||

+          pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||

+          pname == GL_TEXTURE_COLOR_TABLE_SGI) {

+         n[4].i = params[1];

+         n[5].i = params[2];

+         n[6].i = params[3];

+      }

+   }

+

+   if (ctx->ExecuteFlag) {

+      CALL_ColorTableParameteriv(ctx->Exec, (target, pname, params));

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_ColorSubTable(GLenum target, GLsizei start, GLsizei count,

+                   GLenum format, GLenum type, const GLvoid * table)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_COLOR_SUB_TABLE, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].i = start;

+      n[3].i = count;

+      n[4].e = format;

+      n[5].e = type;

+      n[6].data = unpack_image(ctx, 1, count, 1, 1, format, type, table,

+                               &ctx->Unpack);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ColorSubTable(ctx->Exec,

+                         (target, start, count, format, type, table));

+   }

+}

+

+

+static void GLAPIENTRY

+save_CopyColorSubTable(GLenum target, GLsizei start,

+                       GLint x, GLint y, GLsizei width)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_COPY_COLOR_SUB_TABLE, 5);

+   if (n) {

+      n[1].e = target;

+      n[2].i = start;

+      n[3].i = x;

+      n[4].i = y;

+      n[5].i = width;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CopyColorSubTable(ctx->Exec, (target, start, x, y, width));

+   }

+}

+

+

+static void GLAPIENTRY

+save_CopyColorTable(GLenum target, GLenum internalformat,

+                    GLint x, GLint y, GLsizei width)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_COPY_COLOR_TABLE, 5);

+   if (n) {

+      n[1].e = target;

+      n[2].e = internalformat;

+      n[3].i = x;

+      n[4].i = y;

+      n[5].i = width;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CopyColorTable(ctx->Exec, (target, internalformat, x, y, width));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width,

+                         GLenum format, GLenum type, const GLvoid * filter)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_FILTER_1D, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].e = internalFormat;

+      n[3].i = width;

+      n[4].e = format;

+      n[5].e = type;

+      n[6].data = unpack_image(ctx, 1, width, 1, 1, format, type, filter,

+                               &ctx->Unpack);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ConvolutionFilter1D(ctx->Exec, (target, internalFormat, width,

+                                           format, type, filter));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ConvolutionFilter2D(GLenum target, GLenum internalFormat,

+                         GLsizei width, GLsizei height, GLenum format,

+                         GLenum type, const GLvoid * filter)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_FILTER_2D, 7);

+   if (n) {

+      n[1].e = target;

+      n[2].e = internalFormat;

+      n[3].i = width;

+      n[4].i = height;

+      n[5].e = format;

+      n[6].e = type;

+      n[7].data = unpack_image(ctx, 2, width, height, 1, format, type, filter,

+                               &ctx->Unpack);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ConvolutionFilter2D(ctx->Exec,

+                               (target, internalFormat, width, height, format,

+                                type, filter));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_PARAMETER_I, 3);

+   if (n) {

+      n[1].e = target;

+      n[2].e = pname;

+      n[3].i = param;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ConvolutionParameteri(ctx->Exec, (target, pname, param));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_PARAMETER_IV, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].e = pname;

+      n[3].i = params[0];

+      if (pname == GL_CONVOLUTION_BORDER_COLOR ||

+          pname == GL_CONVOLUTION_FILTER_SCALE ||

+          pname == GL_CONVOLUTION_FILTER_BIAS) {

+         n[4].i = params[1];

+         n[5].i = params[2];

+         n[6].i = params[3];

+      }

+      else {

+         n[4].i = n[5].i = n[6].i = 0;

+      }

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ConvolutionParameteriv(ctx->Exec, (target, pname, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_PARAMETER_F, 3);

+   if (n) {

+      n[1].e = target;

+      n[2].e = pname;

+      n[3].f = param;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ConvolutionParameterf(ctx->Exec, (target, pname, param));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ConvolutionParameterfv(GLenum target, GLenum pname,

+                            const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CONVOLUTION_PARAMETER_FV, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].e = pname;

+      n[3].f = params[0];

+      if (pname == GL_CONVOLUTION_BORDER_COLOR ||

+          pname == GL_CONVOLUTION_FILTER_SCALE ||

+          pname == GL_CONVOLUTION_FILTER_BIAS) {

+         n[4].f = params[1];

+         n[5].f = params[2];

+         n[6].f = params[3];

+      }

+      else {

+         n[4].f = n[5].f = n[6].f = 0.0F;

+      }

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ConvolutionParameterfv(ctx->Exec, (target, pname, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_CopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_COPY_PIXELS, 5);

+   if (n) {

+      n[1].i = x;

+      n[2].i = y;

+      n[3].i = (GLint) width;

+      n[4].i = (GLint) height;

+      n[5].e = type;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CopyPixels(ctx->Exec, (x, y, width, height, type));

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_CopyTexImage1D(GLenum target, GLint level, GLenum internalformat,

+                    GLint x, GLint y, GLsizei width, GLint border)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_COPY_TEX_IMAGE1D, 7);

+   if (n) {

+      n[1].e = target;

+      n[2].i = level;

+      n[3].e = internalformat;

+      n[4].i = x;

+      n[5].i = y;

+      n[6].i = width;

+      n[7].i = border;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CopyTexImage1D(ctx->Exec, (target, level, internalformat,

+                                      x, y, width, border));

+   }

+}

+

+

+static void GLAPIENTRY

+save_CopyTexImage2D(GLenum target, GLint level,

+                    GLenum internalformat,

+                    GLint x, GLint y, GLsizei width,

+                    GLsizei height, GLint border)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_COPY_TEX_IMAGE2D, 8);

+   if (n) {

+      n[1].e = target;

+      n[2].i = level;

+      n[3].e = internalformat;

+      n[4].i = x;

+      n[5].i = y;

+      n[6].i = width;

+      n[7].i = height;

+      n[8].i = border;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CopyTexImage2D(ctx->Exec, (target, level, internalformat,

+                                      x, y, width, height, border));

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_CopyTexSubImage1D(GLenum target, GLint level,

+                       GLint xoffset, GLint x, GLint y, GLsizei width)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_COPY_TEX_SUB_IMAGE1D, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].i = level;

+      n[3].i = xoffset;

+      n[4].i = x;

+      n[5].i = y;

+      n[6].i = width;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CopyTexSubImage1D(ctx->Exec,

+                             (target, level, xoffset, x, y, width));

+   }

+}

+

+

+static void GLAPIENTRY

+save_CopyTexSubImage2D(GLenum target, GLint level,

+                       GLint xoffset, GLint yoffset,

+                       GLint x, GLint y, GLsizei width, GLint height)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_COPY_TEX_SUB_IMAGE2D, 8);

+   if (n) {

+      n[1].e = target;

+      n[2].i = level;

+      n[3].i = xoffset;

+      n[4].i = yoffset;

+      n[5].i = x;

+      n[6].i = y;

+      n[7].i = width;

+      n[8].i = height;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CopyTexSubImage2D(ctx->Exec, (target, level, xoffset, yoffset,

+                                         x, y, width, height));

+   }

+}

+

+

+static void GLAPIENTRY

+save_CopyTexSubImage3D(GLenum target, GLint level,

+                       GLint xoffset, GLint yoffset, GLint zoffset,

+                       GLint x, GLint y, GLsizei width, GLint height)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_COPY_TEX_SUB_IMAGE3D, 9);

+   if (n) {

+      n[1].e = target;

+      n[2].i = level;

+      n[3].i = xoffset;

+      n[4].i = yoffset;

+      n[5].i = zoffset;

+      n[6].i = x;

+      n[7].i = y;

+      n[8].i = width;

+      n[9].i = height;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CopyTexSubImage3D(ctx->Exec, (target, level,

+                                         xoffset, yoffset, zoffset,

+                                         x, y, width, height));

+   }

+}

+

+

+static void GLAPIENTRY

+save_CullFace(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CULL_FACE, 1);

+   if (n) {

+      n[1].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CullFace(ctx->Exec, (mode));

+   }

+}

+

+

+static void GLAPIENTRY

+save_DepthFunc(GLenum func)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_DEPTH_FUNC, 1);

+   if (n) {

+      n[1].e = func;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_DepthFunc(ctx->Exec, (func));

+   }

+}

+

+

+static void GLAPIENTRY

+save_DepthMask(GLboolean mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_DEPTH_MASK, 1);

+   if (n) {

+      n[1].b = mask;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_DepthMask(ctx->Exec, (mask));

+   }

+}

+

+

+static void GLAPIENTRY

+save_DepthRange(GLclampd nearval, GLclampd farval)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_DEPTH_RANGE, 2);

+   if (n) {

+      n[1].f = (GLfloat) nearval;

+      n[2].f = (GLfloat) farval;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_DepthRange(ctx->Exec, (nearval, farval));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Disable(GLenum cap)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_DISABLE, 1);

+   if (n) {

+      n[1].e = cap;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Disable(ctx->Exec, (cap));

+   }

+}

+

+

+static void GLAPIENTRY

+save_DisableIndexed(GLuint index, GLenum cap)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_DISABLE_INDEXED, 2);

+   if (n) {

+      n[1].ui = index;

+      n[2].e = cap;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_DisableIndexedEXT(ctx->Exec, (index, cap));

+   }

+}

+

+

+static void GLAPIENTRY

+save_DrawBuffer(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_DRAW_BUFFER, 1);

+   if (n) {

+      n[1].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_DrawBuffer(ctx->Exec, (mode));

+   }

+}

+

+

+static void GLAPIENTRY

+save_DrawPixels(GLsizei width, GLsizei height,

+                GLenum format, GLenum type, const GLvoid * pixels)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_DRAW_PIXELS, 5);

+   if (n) {

+      n[1].i = width;

+      n[2].i = height;

+      n[3].e = format;

+      n[4].e = type;

+      n[5].data = unpack_image(ctx, 2, width, height, 1, format, type,

+                               pixels, &ctx->Unpack);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_DrawPixels(ctx->Exec, (width, height, format, type, pixels));

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_Enable(GLenum cap)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_ENABLE, 1);

+   if (n) {

+      n[1].e = cap;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Enable(ctx->Exec, (cap));

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_EnableIndexed(GLuint index, GLenum cap)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_ENABLE_INDEXED, 2);

+   if (n) {

+      n[1].ui = index;

+      n[2].e = cap;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_EnableIndexedEXT(ctx->Exec, (index, cap));

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_EvalMesh1(GLenum mode, GLint i1, GLint i2)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_EVALMESH1, 3);

+   if (n) {

+      n[1].e = mode;

+      n[2].i = i1;

+      n[3].i = i2;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_EvalMesh1(ctx->Exec, (mode, i1, i2));

+   }

+}

+

+

+static void GLAPIENTRY

+save_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_EVALMESH2, 5);

+   if (n) {

+      n[1].e = mode;

+      n[2].i = i1;

+      n[3].i = i2;

+      n[4].i = j1;

+      n[5].i = j2;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_EvalMesh2(ctx->Exec, (mode, i1, i2, j1, j2));

+   }

+}

+

+

+

+

+static void GLAPIENTRY

+save_Fogfv(GLenum pname, const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_FOG, 5);

+   if (n) {

+      n[1].e = pname;

+      n[2].f = params[0];

+      n[3].f = params[1];

+      n[4].f = params[2];

+      n[5].f = params[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Fogfv(ctx->Exec, (pname, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Fogf(GLenum pname, GLfloat param)

+{

+   GLfloat parray[4];

+   parray[0] = param;

+   parray[1] = parray[2] = parray[3] = 0.0F;

+   save_Fogfv(pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_Fogiv(GLenum pname, const GLint *params)

+{

+   GLfloat p[4];

+   switch (pname) {

+   case GL_FOG_MODE:

+   case GL_FOG_DENSITY:

+   case GL_FOG_START:

+   case GL_FOG_END:

+   case GL_FOG_INDEX:

+      p[0] = (GLfloat) *params;

+      p[1] = 0.0f;

+      p[2] = 0.0f;

+      p[3] = 0.0f;

+      break;

+   case GL_FOG_COLOR:

+      p[0] = INT_TO_FLOAT(params[0]);

+      p[1] = INT_TO_FLOAT(params[1]);

+      p[2] = INT_TO_FLOAT(params[2]);

+      p[3] = INT_TO_FLOAT(params[3]);

+      break;

+   default:

+      /* Error will be caught later in gl_Fogfv */

+      ASSIGN_4V(p, 0.0F, 0.0F, 0.0F, 0.0F);

+   }

+   save_Fogfv(pname, p);

+}

+

+

+static void GLAPIENTRY

+save_Fogi(GLenum pname, GLint param)

+{

+   GLint parray[4];

+   parray[0] = param;

+   parray[1] = parray[2] = parray[3] = 0;

+   save_Fogiv(pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_FrontFace(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_FRONT_FACE, 1);

+   if (n) {

+      n[1].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_FrontFace(ctx->Exec, (mode));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Frustum(GLdouble left, GLdouble right,

+             GLdouble bottom, GLdouble top, GLdouble nearval, GLdouble farval)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_FRUSTUM, 6);

+   if (n) {

+      n[1].f = (GLfloat) left;

+      n[2].f = (GLfloat) right;

+      n[3].f = (GLfloat) bottom;

+      n[4].f = (GLfloat) top;

+      n[5].f = (GLfloat) nearval;

+      n[6].f = (GLfloat) farval;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Frustum(ctx->Exec, (left, right, bottom, top, nearval, farval));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Hint(GLenum target, GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_HINT, 2);

+   if (n) {

+      n[1].e = target;

+      n[2].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Hint(ctx->Exec, (target, mode));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Histogram(GLenum target, GLsizei width, GLenum internalFormat,

+               GLboolean sink)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_HISTOGRAM, 4);

+   if (n) {

+      n[1].e = target;

+      n[2].i = width;

+      n[3].e = internalFormat;

+      n[4].b = sink;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Histogram(ctx->Exec, (target, width, internalFormat, sink));

+   }

+}

+

+

+static void GLAPIENTRY

+save_IndexMask(GLuint mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_INDEX_MASK, 1);

+   if (n) {

+      n[1].ui = mask;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_IndexMask(ctx->Exec, (mask));

+   }

+}

+

+

+static void GLAPIENTRY

+save_InitNames(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   (void) alloc_instruction(ctx, OPCODE_INIT_NAMES, 0);

+   if (ctx->ExecuteFlag) {

+      CALL_InitNames(ctx->Exec, ());

+   }

+}

+

+

+static void GLAPIENTRY

+save_Lightfv(GLenum light, GLenum pname, const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_LIGHT, 6);

+   if (n) {

+      GLint i, nParams;

+      n[1].e = light;

+      n[2].e = pname;

+      switch (pname) {

+      case GL_AMBIENT:

+         nParams = 4;

+         break;

+      case GL_DIFFUSE:

+         nParams = 4;

+         break;

+      case GL_SPECULAR:

+         nParams = 4;

+         break;

+      case GL_POSITION:

+         nParams = 4;

+         break;

+      case GL_SPOT_DIRECTION:

+         nParams = 3;

+         break;

+      case GL_SPOT_EXPONENT:

+         nParams = 1;

+         break;

+      case GL_SPOT_CUTOFF:

+         nParams = 1;

+         break;

+      case GL_CONSTANT_ATTENUATION:

+         nParams = 1;

+         break;

+      case GL_LINEAR_ATTENUATION:

+         nParams = 1;

+         break;

+      case GL_QUADRATIC_ATTENUATION:

+         nParams = 1;

+         break;

+      default:

+         nParams = 0;

+      }

+      for (i = 0; i < nParams; i++) {

+         n[3 + i].f = params[i];

+      }

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Lightfv(ctx->Exec, (light, pname, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Lightf(GLenum light, GLenum pname, GLfloat param)

+{

+   GLfloat parray[4];

+   parray[0] = param;

+   parray[1] = parray[2] = parray[3] = 0.0F;

+   save_Lightfv(light, pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_Lightiv(GLenum light, GLenum pname, const GLint *params)

+{

+   GLfloat fparam[4];

+   switch (pname) {

+   case GL_AMBIENT:

+   case GL_DIFFUSE:

+   case GL_SPECULAR:

+      fparam[0] = INT_TO_FLOAT(params[0]);

+      fparam[1] = INT_TO_FLOAT(params[1]);

+      fparam[2] = INT_TO_FLOAT(params[2]);

+      fparam[3] = INT_TO_FLOAT(params[3]);

+      break;

+   case GL_POSITION:

+      fparam[0] = (GLfloat) params[0];

+      fparam[1] = (GLfloat) params[1];

+      fparam[2] = (GLfloat) params[2];

+      fparam[3] = (GLfloat) params[3];

+      break;

+   case GL_SPOT_DIRECTION:

+      fparam[0] = (GLfloat) params[0];

+      fparam[1] = (GLfloat) params[1];

+      fparam[2] = (GLfloat) params[2];

+      break;

+   case GL_SPOT_EXPONENT:

+   case GL_SPOT_CUTOFF:

+   case GL_CONSTANT_ATTENUATION:

+   case GL_LINEAR_ATTENUATION:

+   case GL_QUADRATIC_ATTENUATION:

+      fparam[0] = (GLfloat) params[0];

+      break;

+   default:

+      /* error will be caught later in gl_Lightfv */

+      ;

+   }

+   save_Lightfv(light, pname, fparam);

+}

+

+

+static void GLAPIENTRY

+save_Lighti(GLenum light, GLenum pname, GLint param)

+{

+   GLint parray[4];

+   parray[0] = param;

+   parray[1] = parray[2] = parray[3] = 0;

+   save_Lightiv(light, pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_LightModelfv(GLenum pname, const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_LIGHT_MODEL, 5);

+   if (n) {

+      n[1].e = pname;

+      n[2].f = params[0];

+      n[3].f = params[1];

+      n[4].f = params[2];

+      n[5].f = params[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_LightModelfv(ctx->Exec, (pname, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_LightModelf(GLenum pname, GLfloat param)

+{

+   GLfloat parray[4];

+   parray[0] = param;

+   parray[1] = parray[2] = parray[3] = 0.0F;

+   save_LightModelfv(pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_LightModeliv(GLenum pname, const GLint *params)

+{

+   GLfloat fparam[4];

+   switch (pname) {

+   case GL_LIGHT_MODEL_AMBIENT:

+      fparam[0] = INT_TO_FLOAT(params[0]);

+      fparam[1] = INT_TO_FLOAT(params[1]);

+      fparam[2] = INT_TO_FLOAT(params[2]);

+      fparam[3] = INT_TO_FLOAT(params[3]);

+      break;

+   case GL_LIGHT_MODEL_LOCAL_VIEWER:

+   case GL_LIGHT_MODEL_TWO_SIDE:

+   case GL_LIGHT_MODEL_COLOR_CONTROL:

+      fparam[0] = (GLfloat) params[0];

+      fparam[1] = 0.0F;

+      fparam[2] = 0.0F;

+      fparam[3] = 0.0F;

+      break;

+   default:

+      /* Error will be caught later in gl_LightModelfv */

+      ASSIGN_4V(fparam, 0.0F, 0.0F, 0.0F, 0.0F);

+   }

+   save_LightModelfv(pname, fparam);

+}

+

+

+static void GLAPIENTRY

+save_LightModeli(GLenum pname, GLint param)

+{

+   GLint parray[4];

+   parray[0] = param;

+   parray[1] = parray[2] = parray[3] = 0;

+   save_LightModeliv(pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_LineStipple(GLint factor, GLushort pattern)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_LINE_STIPPLE, 2);

+   if (n) {

+      n[1].i = factor;

+      n[2].us = pattern;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_LineStipple(ctx->Exec, (factor, pattern));

+   }

+}

+

+

+static void GLAPIENTRY

+save_LineWidth(GLfloat width)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_LINE_WIDTH, 1);

+   if (n) {

+      n[1].f = width;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_LineWidth(ctx->Exec, (width));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ListBase(GLuint base)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_LIST_BASE, 1);

+   if (n) {

+      n[1].ui = base;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ListBase(ctx->Exec, (base));

+   }

+}

+

+

+static void GLAPIENTRY

+save_LoadIdentity(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   (void) alloc_instruction(ctx, OPCODE_LOAD_IDENTITY, 0);

+   if (ctx->ExecuteFlag) {

+      CALL_LoadIdentity(ctx->Exec, ());

+   }

+}

+

+

+static void GLAPIENTRY

+save_LoadMatrixf(const GLfloat * m)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_LOAD_MATRIX, 16);

+   if (n) {

+      GLuint i;

+      for (i = 0; i < 16; i++) {

+         n[1 + i].f = m[i];

+      }

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_LoadMatrixf(ctx->Exec, (m));

+   }

+}

+

+

+static void GLAPIENTRY

+save_LoadMatrixd(const GLdouble * m)

+{

+   GLfloat f[16];

+   GLint i;

+   for (i = 0; i < 16; i++) {

+      f[i] = (GLfloat) m[i];

+   }

+   save_LoadMatrixf(f);

+}

+

+

+static void GLAPIENTRY

+save_LoadName(GLuint name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_LOAD_NAME, 1);

+   if (n) {

+      n[1].ui = name;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_LoadName(ctx->Exec, (name));

+   }

+}

+

+

+static void GLAPIENTRY

+save_LogicOp(GLenum opcode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_LOGIC_OP, 1);

+   if (n) {

+      n[1].e = opcode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_LogicOp(ctx->Exec, (opcode));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Map1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride,

+           GLint order, const GLdouble * points)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_MAP1, 6);

+   if (n) {

+      GLfloat *pnts = _mesa_copy_map_points1d(target, stride, order, points);

+      n[1].e = target;

+      n[2].f = (GLfloat) u1;

+      n[3].f = (GLfloat) u2;

+      n[4].i = _mesa_evaluator_components(target);      /* stride */

+      n[5].i = order;

+      n[6].data = (void *) pnts;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Map1d(ctx->Exec, (target, u1, u2, stride, order, points));

+   }

+}

+

+static void GLAPIENTRY

+save_Map1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride,

+           GLint order, const GLfloat * points)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_MAP1, 6);

+   if (n) {

+      GLfloat *pnts = _mesa_copy_map_points1f(target, stride, order, points);

+      n[1].e = target;

+      n[2].f = u1;

+      n[3].f = u2;

+      n[4].i = _mesa_evaluator_components(target);      /* stride */

+      n[5].i = order;

+      n[6].data = (void *) pnts;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Map1f(ctx->Exec, (target, u1, u2, stride, order, points));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Map2d(GLenum target,

+           GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,

+           GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,

+           const GLdouble * points)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_MAP2, 10);

+   if (n) {

+      GLfloat *pnts = _mesa_copy_map_points2d(target, ustride, uorder,

+                                              vstride, vorder, points);

+      n[1].e = target;

+      n[2].f = (GLfloat) u1;

+      n[3].f = (GLfloat) u2;

+      n[4].f = (GLfloat) v1;

+      n[5].f = (GLfloat) v2;

+      /* XXX verify these strides are correct */

+      n[6].i = _mesa_evaluator_components(target) * vorder;     /*ustride */

+      n[7].i = _mesa_evaluator_components(target);      /*vstride */

+      n[8].i = uorder;

+      n[9].i = vorder;

+      n[10].data = (void *) pnts;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Map2d(ctx->Exec, (target,

+                             u1, u2, ustride, uorder,

+                             v1, v2, vstride, vorder, points));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Map2f(GLenum target,

+           GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,

+           GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,

+           const GLfloat * points)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_MAP2, 10);

+   if (n) {

+      GLfloat *pnts = _mesa_copy_map_points2f(target, ustride, uorder,

+                                              vstride, vorder, points);

+      n[1].e = target;

+      n[2].f = u1;

+      n[3].f = u2;

+      n[4].f = v1;

+      n[5].f = v2;

+      /* XXX verify these strides are correct */

+      n[6].i = _mesa_evaluator_components(target) * vorder;     /*ustride */

+      n[7].i = _mesa_evaluator_components(target);      /*vstride */

+      n[8].i = uorder;

+      n[9].i = vorder;

+      n[10].data = (void *) pnts;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Map2f(ctx->Exec, (target, u1, u2, ustride, uorder,

+                             v1, v2, vstride, vorder, points));

+   }

+}

+

+

+static void GLAPIENTRY

+save_MapGrid1f(GLint un, GLfloat u1, GLfloat u2)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_MAPGRID1, 3);

+   if (n) {

+      n[1].i = un;

+      n[2].f = u1;

+      n[3].f = u2;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_MapGrid1f(ctx->Exec, (un, u1, u2));

+   }

+}

+

+

+static void GLAPIENTRY

+save_MapGrid1d(GLint un, GLdouble u1, GLdouble u2)

+{

+   save_MapGrid1f(un, (GLfloat) u1, (GLfloat) u2);

+}

+

+

+static void GLAPIENTRY

+save_MapGrid2f(GLint un, GLfloat u1, GLfloat u2,

+               GLint vn, GLfloat v1, GLfloat v2)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_MAPGRID2, 6);

+   if (n) {

+      n[1].i = un;

+      n[2].f = u1;

+      n[3].f = u2;

+      n[4].i = vn;

+      n[5].f = v1;

+      n[6].f = v2;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_MapGrid2f(ctx->Exec, (un, u1, u2, vn, v1, v2));

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_MapGrid2d(GLint un, GLdouble u1, GLdouble u2,

+               GLint vn, GLdouble v1, GLdouble v2)

+{

+   save_MapGrid2f(un, (GLfloat) u1, (GLfloat) u2,

+                  vn, (GLfloat) v1, (GLfloat) v2);

+}

+

+

+static void GLAPIENTRY

+save_MatrixMode(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_MATRIX_MODE, 1);

+   if (n) {

+      n[1].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_MatrixMode(ctx->Exec, (mode));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_MIN_MAX, 3);

+   if (n) {

+      n[1].e = target;

+      n[2].e = internalFormat;

+      n[3].b = sink;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Minmax(ctx->Exec, (target, internalFormat, sink));

+   }

+}

+

+

+static void GLAPIENTRY

+save_MultMatrixf(const GLfloat * m)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_MULT_MATRIX, 16);

+   if (n) {

+      GLuint i;

+      for (i = 0; i < 16; i++) {

+         n[1 + i].f = m[i];

+      }

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_MultMatrixf(ctx->Exec, (m));

+   }

+}

+

+

+static void GLAPIENTRY

+save_MultMatrixd(const GLdouble * m)

+{

+   GLfloat f[16];

+   GLint i;

+   for (i = 0; i < 16; i++) {

+      f[i] = (GLfloat) m[i];

+   }

+   save_MultMatrixf(f);

+}

+

+

+static void GLAPIENTRY

+save_NewList(GLuint name, GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   /* It's an error to call this function while building a display list */

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glNewList");

+   (void) name;

+   (void) mode;

+}

+

+

+

+static void GLAPIENTRY

+save_Ortho(GLdouble left, GLdouble right,

+           GLdouble bottom, GLdouble top, GLdouble nearval, GLdouble farval)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_ORTHO, 6);

+   if (n) {

+      n[1].f = (GLfloat) left;

+      n[2].f = (GLfloat) right;

+      n[3].f = (GLfloat) bottom;

+      n[4].f = (GLfloat) top;

+      n[5].f = (GLfloat) nearval;

+      n[6].f = (GLfloat) farval;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Ortho(ctx->Exec, (left, right, bottom, top, nearval, farval));

+   }

+}

+

+

+static void GLAPIENTRY

+save_PixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PIXEL_MAP, 3);

+   if (n) {

+      n[1].e = map;

+      n[2].i = mapsize;

+      n[3].data = (void *) malloc(mapsize * sizeof(GLfloat));

+      memcpy(n[3].data, (void *) values, mapsize * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PixelMapfv(ctx->Exec, (map, mapsize, values));

+   }

+}

+

+

+static void GLAPIENTRY

+save_PixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)

+{

+   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];

+   GLint i;

+   if (map == GL_PIXEL_MAP_I_TO_I || map == GL_PIXEL_MAP_S_TO_S) {

+      for (i = 0; i < mapsize; i++) {

+         fvalues[i] = (GLfloat) values[i];

+      }

+   }

+   else {

+      for (i = 0; i < mapsize; i++) {

+         fvalues[i] = UINT_TO_FLOAT(values[i]);

+      }

+   }

+   save_PixelMapfv(map, mapsize, fvalues);

+}

+

+

+static void GLAPIENTRY

+save_PixelMapusv(GLenum map, GLint mapsize, const GLushort *values)

+{

+   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];

+   GLint i;

+   if (map == GL_PIXEL_MAP_I_TO_I || map == GL_PIXEL_MAP_S_TO_S) {

+      for (i = 0; i < mapsize; i++) {

+         fvalues[i] = (GLfloat) values[i];

+      }

+   }

+   else {

+      for (i = 0; i < mapsize; i++) {

+         fvalues[i] = USHORT_TO_FLOAT(values[i]);

+      }

+   }

+   save_PixelMapfv(map, mapsize, fvalues);

+}

+

+

+static void GLAPIENTRY

+save_PixelTransferf(GLenum pname, GLfloat param)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PIXEL_TRANSFER, 2);

+   if (n) {

+      n[1].e = pname;

+      n[2].f = param;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PixelTransferf(ctx->Exec, (pname, param));

+   }

+}

+

+

+static void GLAPIENTRY

+save_PixelTransferi(GLenum pname, GLint param)

+{

+   save_PixelTransferf(pname, (GLfloat) param);

+}

+

+

+static void GLAPIENTRY

+save_PixelZoom(GLfloat xfactor, GLfloat yfactor)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PIXEL_ZOOM, 2);

+   if (n) {

+      n[1].f = xfactor;

+      n[2].f = yfactor;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PixelZoom(ctx->Exec, (xfactor, yfactor));

+   }

+}

+

+

+static void GLAPIENTRY

+save_PointParameterfvEXT(GLenum pname, const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_POINT_PARAMETERS, 4);

+   if (n) {

+      n[1].e = pname;

+      n[2].f = params[0];

+      n[3].f = params[1];

+      n[4].f = params[2];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PointParameterfvEXT(ctx->Exec, (pname, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_PointParameterfEXT(GLenum pname, GLfloat param)

+{

+   GLfloat parray[3];

+   parray[0] = param;

+   parray[1] = parray[2] = 0.0F;

+   save_PointParameterfvEXT(pname, parray);

+}

+

+static void GLAPIENTRY

+save_PointParameteriNV(GLenum pname, GLint param)

+{

+   GLfloat parray[3];

+   parray[0] = (GLfloat) param;

+   parray[1] = parray[2] = 0.0F;

+   save_PointParameterfvEXT(pname, parray);

+}

+

+static void GLAPIENTRY

+save_PointParameterivNV(GLenum pname, const GLint * param)

+{

+   GLfloat parray[3];

+   parray[0] = (GLfloat) param[0];

+   parray[1] = parray[2] = 0.0F;

+   save_PointParameterfvEXT(pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_PointSize(GLfloat size)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_POINT_SIZE, 1);

+   if (n) {

+      n[1].f = size;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PointSize(ctx->Exec, (size));

+   }

+}

+

+

+static void GLAPIENTRY

+save_PolygonMode(GLenum face, GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_POLYGON_MODE, 2);

+   if (n) {

+      n[1].e = face;

+      n[2].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PolygonMode(ctx->Exec, (face, mode));

+   }

+}

+

+

+static void GLAPIENTRY

+save_PolygonStipple(const GLubyte * pattern)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_POLYGON_STIPPLE, 1);

+   if (n) {

+      n[1].data = unpack_image(ctx, 2, 32, 32, 1, GL_COLOR_INDEX, GL_BITMAP,

+                               pattern, &ctx->Unpack);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PolygonStipple(ctx->Exec, ((GLubyte *) pattern));

+   }

+}

+

+

+static void GLAPIENTRY

+save_PolygonOffset(GLfloat factor, GLfloat units)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_POLYGON_OFFSET, 2);

+   if (n) {

+      n[1].f = factor;

+      n[2].f = units;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PolygonOffset(ctx->Exec, (factor, units));

+   }

+}

+

+

+static void GLAPIENTRY

+save_PolygonOffsetEXT(GLfloat factor, GLfloat bias)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   /* XXX mult by DepthMaxF here??? */

+   save_PolygonOffset(factor, ctx->DrawBuffer->_DepthMaxF * bias);

+}

+

+

+static void GLAPIENTRY

+save_PopAttrib(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   (void) alloc_instruction(ctx, OPCODE_POP_ATTRIB, 0);

+   if (ctx->ExecuteFlag) {

+      CALL_PopAttrib(ctx->Exec, ());

+   }

+}

+

+

+static void GLAPIENTRY

+save_PopMatrix(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   (void) alloc_instruction(ctx, OPCODE_POP_MATRIX, 0);

+   if (ctx->ExecuteFlag) {

+      CALL_PopMatrix(ctx->Exec, ());

+   }

+}

+

+

+static void GLAPIENTRY

+save_PopName(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   (void) alloc_instruction(ctx, OPCODE_POP_NAME, 0);

+   if (ctx->ExecuteFlag) {

+      CALL_PopName(ctx->Exec, ());

+   }

+}

+

+

+static void GLAPIENTRY

+save_PrioritizeTextures(GLsizei num, const GLuint * textures,

+                        const GLclampf * priorities)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   for (i = 0; i < num; i++) {

+      Node *n;

+      n = alloc_instruction(ctx, OPCODE_PRIORITIZE_TEXTURE, 2);

+      if (n) {

+         n[1].ui = textures[i];

+         n[2].f = priorities[i];

+      }

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PrioritizeTextures(ctx->Exec, (num, textures, priorities));

+   }

+}

+

+

+static void GLAPIENTRY

+save_PushAttrib(GLbitfield mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PUSH_ATTRIB, 1);

+   if (n) {

+      n[1].bf = mask;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PushAttrib(ctx->Exec, (mask));

+   }

+}

+

+

+static void GLAPIENTRY

+save_PushMatrix(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   (void) alloc_instruction(ctx, OPCODE_PUSH_MATRIX, 0);

+   if (ctx->ExecuteFlag) {

+      CALL_PushMatrix(ctx->Exec, ());

+   }

+}

+

+

+static void GLAPIENTRY

+save_PushName(GLuint name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PUSH_NAME, 1);

+   if (n) {

+      n[1].ui = name;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PushName(ctx->Exec, (name));

+   }

+}

+

+

+static void GLAPIENTRY

+save_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_RASTER_POS, 4);

+   if (n) {

+      n[1].f = x;

+      n[2].f = y;

+      n[3].f = z;

+      n[4].f = w;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_RasterPos4f(ctx->Exec, (x, y, z, w));

+   }

+}

+

+static void GLAPIENTRY

+save_RasterPos2d(GLdouble x, GLdouble y)

+{

+   save_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos2f(GLfloat x, GLfloat y)

+{

+   save_RasterPos4f(x, y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos2i(GLint x, GLint y)

+{

+   save_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos2s(GLshort x, GLshort y)

+{

+   save_RasterPos4f(x, y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos3d(GLdouble x, GLdouble y, GLdouble z)

+{

+   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos3f(GLfloat x, GLfloat y, GLfloat z)

+{

+   save_RasterPos4f(x, y, z, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos3i(GLint x, GLint y, GLint z)

+{

+   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos3s(GLshort x, GLshort y, GLshort z)

+{

+   save_RasterPos4f(x, y, z, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)

+{

+   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+save_RasterPos4i(GLint x, GLint y, GLint z, GLint w)

+{

+   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+save_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)

+{

+   save_RasterPos4f(x, y, z, w);

+}

+

+static void GLAPIENTRY

+save_RasterPos2dv(const GLdouble * v)

+{

+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos2fv(const GLfloat * v)

+{

+   save_RasterPos4f(v[0], v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos2iv(const GLint * v)

+{

+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos2sv(const GLshort * v)

+{

+   save_RasterPos4f(v[0], v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos3dv(const GLdouble * v)

+{

+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos3fv(const GLfloat * v)

+{

+   save_RasterPos4f(v[0], v[1], v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos3iv(const GLint * v)

+{

+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos3sv(const GLshort * v)

+{

+   save_RasterPos4f(v[0], v[1], v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+save_RasterPos4dv(const GLdouble * v)

+{

+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1],

+                    (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+save_RasterPos4fv(const GLfloat * v)

+{

+   save_RasterPos4f(v[0], v[1], v[2], v[3]);

+}

+

+static void GLAPIENTRY

+save_RasterPos4iv(const GLint * v)

+{

+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1],

+                    (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+save_RasterPos4sv(const GLshort * v)

+{

+   save_RasterPos4f(v[0], v[1], v[2], v[3]);

+}

+

+

+static void GLAPIENTRY

+save_PassThrough(GLfloat token)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PASSTHROUGH, 1);

+   if (n) {

+      n[1].f = token;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_PassThrough(ctx->Exec, (token));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ReadBuffer(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_READ_BUFFER, 1);

+   if (n) {

+      n[1].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ReadBuffer(ctx->Exec, (mode));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ResetHistogram(GLenum target)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_RESET_HISTOGRAM, 1);

+   if (n) {

+      n[1].e = target;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ResetHistogram(ctx->Exec, (target));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ResetMinmax(GLenum target)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_RESET_MIN_MAX, 1);

+   if (n) {

+      n[1].e = target;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ResetMinmax(ctx->Exec, (target));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_ROTATE, 4);

+   if (n) {

+      n[1].f = angle;

+      n[2].f = x;

+      n[3].f = y;

+      n[4].f = z;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Rotatef(ctx->Exec, (angle, x, y, z));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Rotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)

+{

+   save_Rotatef((GLfloat) angle, (GLfloat) x, (GLfloat) y, (GLfloat) z);

+}

+

+

+static void GLAPIENTRY

+save_Scalef(GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_SCALE, 3);

+   if (n) {

+      n[1].f = x;

+      n[2].f = y;

+      n[3].f = z;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Scalef(ctx->Exec, (x, y, z));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Scaled(GLdouble x, GLdouble y, GLdouble z)

+{

+   save_Scalef((GLfloat) x, (GLfloat) y, (GLfloat) z);

+}

+

+

+static void GLAPIENTRY

+save_Scissor(GLint x, GLint y, GLsizei width, GLsizei height)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_SCISSOR, 4);

+   if (n) {

+      n[1].i = x;

+      n[2].i = y;

+      n[3].i = width;

+      n[4].i = height;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Scissor(ctx->Exec, (x, y, width, height));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ShadeModel(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx);

+

+   if (ctx->ExecuteFlag) {

+      CALL_ShadeModel(ctx->Exec, (mode));

+   }

+

+   if (ctx->ListState.Current.ShadeModel == mode)

+      return;

+

+   SAVE_FLUSH_VERTICES(ctx);

+

+   /* Only save the value if we know the statechange will take effect:

+    */

+   if (ctx->Driver.CurrentSavePrimitive == PRIM_OUTSIDE_BEGIN_END)

+      ctx->ListState.Current.ShadeModel = mode;

+

+   n = alloc_instruction(ctx, OPCODE_SHADE_MODEL, 1);

+   if (n) {

+      n[1].e = mode;

+   }

+}

+

+

+static void GLAPIENTRY

+save_StencilFunc(GLenum func, GLint ref, GLuint mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_STENCIL_FUNC, 3);

+   if (n) {

+      n[1].e = func;

+      n[2].i = ref;

+      n[3].ui = mask;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_StencilFunc(ctx->Exec, (func, ref, mask));

+   }

+}

+

+

+static void GLAPIENTRY

+save_StencilMask(GLuint mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_STENCIL_MASK, 1);

+   if (n) {

+      n[1].ui = mask;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_StencilMask(ctx->Exec, (mask));

+   }

+}

+

+

+static void GLAPIENTRY

+save_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_STENCIL_OP, 3);

+   if (n) {

+      n[1].e = fail;

+      n[2].e = zfail;

+      n[3].e = zpass;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_StencilOp(ctx->Exec, (fail, zfail, zpass));

+   }

+}

+

+

+static void GLAPIENTRY

+save_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_STENCIL_FUNC_SEPARATE, 4);

+   if (n) {

+      n[1].e = face;

+      n[2].e = func;

+      n[3].i = ref;

+      n[4].ui = mask;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_StencilFuncSeparate(ctx->Exec, (face, func, ref, mask));

+   }

+}

+

+

+static void GLAPIENTRY

+save_StencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, GLint ref,

+                            GLuint mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   /* GL_FRONT */

+   n = alloc_instruction(ctx, OPCODE_STENCIL_FUNC_SEPARATE, 4);

+   if (n) {

+      n[1].e = GL_FRONT;

+      n[2].e = frontfunc;

+      n[3].i = ref;

+      n[4].ui = mask;

+   }

+   /* GL_BACK */

+   n = alloc_instruction(ctx, OPCODE_STENCIL_FUNC_SEPARATE, 4);

+   if (n) {

+      n[1].e = GL_BACK;

+      n[2].e = backfunc;

+      n[3].i = ref;

+      n[4].ui = mask;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_StencilFuncSeparate(ctx->Exec, (GL_FRONT, frontfunc, ref, mask));

+      CALL_StencilFuncSeparate(ctx->Exec, (GL_BACK, backfunc, ref, mask));

+   }

+}

+

+

+static void GLAPIENTRY

+save_StencilMaskSeparate(GLenum face, GLuint mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_STENCIL_MASK_SEPARATE, 2);

+   if (n) {

+      n[1].e = face;

+      n[2].ui = mask;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_StencilMaskSeparate(ctx->Exec, (face, mask));

+   }

+}

+

+

+static void GLAPIENTRY

+save_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_STENCIL_OP_SEPARATE, 4);

+   if (n) {

+      n[1].e = face;

+      n[2].e = fail;

+      n[3].e = zfail;

+      n[4].e = zpass;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_StencilOpSeparate(ctx->Exec, (face, fail, zfail, zpass));

+   }

+}

+

+

+static void GLAPIENTRY

+save_TexEnvfv(GLenum target, GLenum pname, const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_TEXENV, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].e = pname;

+      if (pname == GL_TEXTURE_ENV_COLOR) {

+         n[3].f = params[0];

+         n[4].f = params[1];

+         n[5].f = params[2];

+         n[6].f = params[3];

+      }

+      else {

+         n[3].f = params[0];

+         n[4].f = n[5].f = n[6].f = 0.0F;

+      }

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_TexEnvfv(ctx->Exec, (target, pname, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_TexEnvf(GLenum target, GLenum pname, GLfloat param)

+{

+   GLfloat parray[4];

+   parray[0] = (GLfloat) param;

+   parray[1] = parray[2] = parray[3] = 0.0F;

+   save_TexEnvfv(target, pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_TexEnvi(GLenum target, GLenum pname, GLint param)

+{

+   GLfloat p[4];

+   p[0] = (GLfloat) param;

+   p[1] = p[2] = p[3] = 0.0F;

+   save_TexEnvfv(target, pname, p);

+}

+

+

+static void GLAPIENTRY

+save_TexEnviv(GLenum target, GLenum pname, const GLint * param)

+{

+   GLfloat p[4];

+   if (pname == GL_TEXTURE_ENV_COLOR) {

+      p[0] = INT_TO_FLOAT(param[0]);

+      p[1] = INT_TO_FLOAT(param[1]);

+      p[2] = INT_TO_FLOAT(param[2]);

+      p[3] = INT_TO_FLOAT(param[3]);

+   }

+   else {

+      p[0] = (GLfloat) param[0];

+      p[1] = p[2] = p[3] = 0.0F;

+   }

+   save_TexEnvfv(target, pname, p);

+}

+

+

+static void GLAPIENTRY

+save_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_TEXGEN, 6);

+   if (n) {

+      n[1].e = coord;

+      n[2].e = pname;

+      n[3].f = params[0];

+      n[4].f = params[1];

+      n[5].f = params[2];

+      n[6].f = params[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_TexGenfv(ctx->Exec, (coord, pname, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_TexGeniv(GLenum coord, GLenum pname, const GLint *params)

+{

+   GLfloat p[4];

+   p[0] = (GLfloat) params[0];

+   p[1] = (GLfloat) params[1];

+   p[2] = (GLfloat) params[2];

+   p[3] = (GLfloat) params[3];

+   save_TexGenfv(coord, pname, p);

+}

+

+

+static void GLAPIENTRY

+save_TexGend(GLenum coord, GLenum pname, GLdouble param)

+{

+   GLfloat parray[4];

+   parray[0] = (GLfloat) param;

+   parray[1] = parray[2] = parray[3] = 0.0F;

+   save_TexGenfv(coord, pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_TexGendv(GLenum coord, GLenum pname, const GLdouble *params)

+{

+   GLfloat p[4];

+   p[0] = (GLfloat) params[0];

+   p[1] = (GLfloat) params[1];

+   p[2] = (GLfloat) params[2];

+   p[3] = (GLfloat) params[3];

+   save_TexGenfv(coord, pname, p);

+}

+

+

+static void GLAPIENTRY

+save_TexGenf(GLenum coord, GLenum pname, GLfloat param)

+{

+   GLfloat parray[4];

+   parray[0] = param;

+   parray[1] = parray[2] = parray[3] = 0.0F;

+   save_TexGenfv(coord, pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_TexGeni(GLenum coord, GLenum pname, GLint param)

+{

+   GLint parray[4];

+   parray[0] = param;

+   parray[1] = parray[2] = parray[3] = 0;

+   save_TexGeniv(coord, pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_TEXPARAMETER, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].e = pname;

+      n[3].f = params[0];

+      n[4].f = params[1];

+      n[5].f = params[2];

+      n[6].f = params[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_TexParameterfv(ctx->Exec, (target, pname, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_TexParameterf(GLenum target, GLenum pname, GLfloat param)

+{

+   GLfloat parray[4];

+   parray[0] = param;

+   parray[1] = parray[2] = parray[3] = 0.0F;

+   save_TexParameterfv(target, pname, parray);

+}

+

+

+static void GLAPIENTRY

+save_TexParameteri(GLenum target, GLenum pname, GLint param)

+{

+   GLfloat fparam[4];

+   fparam[0] = (GLfloat) param;

+   fparam[1] = fparam[2] = fparam[3] = 0.0F;

+   save_TexParameterfv(target, pname, fparam);

+}

+

+

+static void GLAPIENTRY

+save_TexParameteriv(GLenum target, GLenum pname, const GLint *params)

+{

+   GLfloat fparam[4];

+   fparam[0] = (GLfloat) params[0];

+   fparam[1] = fparam[2] = fparam[3] = 0.0F;

+   save_TexParameterfv(target, pname, fparam);

+}

+

+

+static void GLAPIENTRY

+save_TexImage1D(GLenum target,

+                GLint level, GLint components,

+                GLsizei width, GLint border,

+                GLenum format, GLenum type, const GLvoid * pixels)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (target == GL_PROXY_TEXTURE_1D) {

+      /* don't compile, execute immediately */

+      CALL_TexImage1D(ctx->Exec, (target, level, components, width,

+                                  border, format, type, pixels));

+   }

+   else {

+      Node *n;

+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+      n = alloc_instruction(ctx, OPCODE_TEX_IMAGE1D, 8);

+      if (n) {

+         n[1].e = target;

+         n[2].i = level;

+         n[3].i = components;

+         n[4].i = (GLint) width;

+         n[5].i = border;

+         n[6].e = format;

+         n[7].e = type;

+         n[8].data = unpack_image(ctx, 1, width, 1, 1, format, type,

+                                  pixels, &ctx->Unpack);

+      }

+      if (ctx->ExecuteFlag) {

+         CALL_TexImage1D(ctx->Exec, (target, level, components, width,

+                                     border, format, type, pixels));

+      }

+   }

+}

+

+

+static void GLAPIENTRY

+save_TexImage2D(GLenum target,

+                GLint level, GLint components,

+                GLsizei width, GLsizei height, GLint border,

+                GLenum format, GLenum type, const GLvoid * pixels)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (target == GL_PROXY_TEXTURE_2D) {

+      /* don't compile, execute immediately */

+      CALL_TexImage2D(ctx->Exec, (target, level, components, width,

+                                  height, border, format, type, pixels));

+   }

+   else {

+      Node *n;

+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+      n = alloc_instruction(ctx, OPCODE_TEX_IMAGE2D, 9);

+      if (n) {

+         n[1].e = target;

+         n[2].i = level;

+         n[3].i = components;

+         n[4].i = (GLint) width;

+         n[5].i = (GLint) height;

+         n[6].i = border;

+         n[7].e = format;

+         n[8].e = type;

+         n[9].data = unpack_image(ctx, 2, width, height, 1, format, type,

+                                  pixels, &ctx->Unpack);

+      }

+      if (ctx->ExecuteFlag) {

+         CALL_TexImage2D(ctx->Exec, (target, level, components, width,

+                                     height, border, format, type, pixels));

+      }

+   }

+}

+

+

+static void GLAPIENTRY

+save_TexImage3D(GLenum target,

+                GLint level, GLint internalFormat,

+                GLsizei width, GLsizei height, GLsizei depth,

+                GLint border,

+                GLenum format, GLenum type, const GLvoid * pixels)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (target == GL_PROXY_TEXTURE_3D) {

+      /* don't compile, execute immediately */

+      CALL_TexImage3D(ctx->Exec, (target, level, internalFormat, width,

+                                  height, depth, border, format, type,

+                                  pixels));

+   }

+   else {

+      Node *n;

+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+      n = alloc_instruction(ctx, OPCODE_TEX_IMAGE3D, 10);

+      if (n) {

+         n[1].e = target;

+         n[2].i = level;

+         n[3].i = (GLint) internalFormat;

+         n[4].i = (GLint) width;

+         n[5].i = (GLint) height;

+         n[6].i = (GLint) depth;

+         n[7].i = border;

+         n[8].e = format;

+         n[9].e = type;

+         n[10].data = unpack_image(ctx, 3, width, height, depth, format, type,

+                                   pixels, &ctx->Unpack);

+      }

+      if (ctx->ExecuteFlag) {

+         CALL_TexImage3D(ctx->Exec, (target, level, internalFormat, width,

+                                     height, depth, border, format, type,

+                                     pixels));

+      }

+   }

+}

+

+

+static void GLAPIENTRY

+save_TexSubImage1D(GLenum target, GLint level, GLint xoffset,

+                   GLsizei width, GLenum format, GLenum type,

+                   const GLvoid * pixels)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_TEX_SUB_IMAGE1D, 7);

+   if (n) {

+      n[1].e = target;

+      n[2].i = level;

+      n[3].i = xoffset;

+      n[4].i = (GLint) width;

+      n[5].e = format;

+      n[6].e = type;

+      n[7].data = unpack_image(ctx, 1, width, 1, 1, format, type,

+                               pixels, &ctx->Unpack);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_TexSubImage1D(ctx->Exec, (target, level, xoffset, width,

+                                     format, type, pixels));

+   }

+}

+

+

+static void GLAPIENTRY

+save_TexSubImage2D(GLenum target, GLint level,

+                   GLint xoffset, GLint yoffset,

+                   GLsizei width, GLsizei height,

+                   GLenum format, GLenum type, const GLvoid * pixels)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_TEX_SUB_IMAGE2D, 9);

+   if (n) {

+      n[1].e = target;

+      n[2].i = level;

+      n[3].i = xoffset;

+      n[4].i = yoffset;

+      n[5].i = (GLint) width;

+      n[6].i = (GLint) height;

+      n[7].e = format;

+      n[8].e = type;

+      n[9].data = unpack_image(ctx, 2, width, height, 1, format, type,

+                               pixels, &ctx->Unpack);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_TexSubImage2D(ctx->Exec, (target, level, xoffset, yoffset,

+                                     width, height, format, type, pixels));

+   }

+}

+

+

+static void GLAPIENTRY

+save_TexSubImage3D(GLenum target, GLint level,

+                   GLint xoffset, GLint yoffset, GLint zoffset,

+                   GLsizei width, GLsizei height, GLsizei depth,

+                   GLenum format, GLenum type, const GLvoid * pixels)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_TEX_SUB_IMAGE3D, 11);

+   if (n) {

+      n[1].e = target;

+      n[2].i = level;

+      n[3].i = xoffset;

+      n[4].i = yoffset;

+      n[5].i = zoffset;

+      n[6].i = (GLint) width;

+      n[7].i = (GLint) height;

+      n[8].i = (GLint) depth;

+      n[9].e = format;

+      n[10].e = type;

+      n[11].data = unpack_image(ctx, 3, width, height, depth, format, type,

+                                pixels, &ctx->Unpack);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_TexSubImage3D(ctx->Exec, (target, level,

+                                     xoffset, yoffset, zoffset,

+                                     width, height, depth, format, type,

+                                     pixels));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Translatef(GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_TRANSLATE, 3);

+   if (n) {

+      n[1].f = x;

+      n[2].f = y;

+      n[3].f = z;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Translatef(ctx->Exec, (x, y, z));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Translated(GLdouble x, GLdouble y, GLdouble z)

+{

+   save_Translatef((GLfloat) x, (GLfloat) y, (GLfloat) z);

+}

+

+

+

+static void GLAPIENTRY

+save_Viewport(GLint x, GLint y, GLsizei width, GLsizei height)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_VIEWPORT, 4);

+   if (n) {

+      n[1].i = x;

+      n[2].i = y;

+      n[3].i = (GLint) width;

+      n[4].i = (GLint) height;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Viewport(ctx->Exec, (x, y, width, height));

+   }

+}

+

+

+static void GLAPIENTRY

+save_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_WINDOW_POS, 4);

+   if (n) {

+      n[1].f = x;

+      n[2].f = y;

+      n[3].f = z;

+      n[4].f = w;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_WindowPos4fMESA(ctx->Exec, (x, y, z, w));

+   }

+}

+

+static void GLAPIENTRY

+save_WindowPos2dMESA(GLdouble x, GLdouble y)

+{

+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos2fMESA(GLfloat x, GLfloat y)

+{

+   save_WindowPos4fMESA(x, y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos2iMESA(GLint x, GLint y)

+{

+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos2sMESA(GLshort x, GLshort y)

+{

+   save_WindowPos4fMESA(x, y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)

+{

+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z)

+{

+   save_WindowPos4fMESA(x, y, z, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos3iMESA(GLint x, GLint y, GLint z)

+{

+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos3sMESA(GLshort x, GLshort y, GLshort z)

+{

+   save_WindowPos4fMESA(x, y, z, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w)

+{

+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+save_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w)

+{

+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+save_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w)

+{

+   save_WindowPos4fMESA(x, y, z, w);

+}

+

+static void GLAPIENTRY

+save_WindowPos2dvMESA(const GLdouble * v)

+{

+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos2fvMESA(const GLfloat * v)

+{

+   save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos2ivMESA(const GLint * v)

+{

+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos2svMESA(const GLshort * v)

+{

+   save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos3dvMESA(const GLdouble * v)

+{

+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos3fvMESA(const GLfloat * v)

+{

+   save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos3ivMESA(const GLint * v)

+{

+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos3svMESA(const GLshort * v)

+{

+   save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+save_WindowPos4dvMESA(const GLdouble * v)

+{

+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1],

+                        (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+save_WindowPos4fvMESA(const GLfloat * v)

+{

+   save_WindowPos4fMESA(v[0], v[1], v[2], v[3]);

+}

+

+static void GLAPIENTRY

+save_WindowPos4ivMESA(const GLint * v)

+{

+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1],

+                        (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+save_WindowPos4svMESA(const GLshort * v)

+{

+   save_WindowPos4fMESA(v[0], v[1], v[2], v[3]);

+}

+

+

+

+/* GL_ARB_multitexture */

+static void GLAPIENTRY

+save_ActiveTextureARB(GLenum target)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_ACTIVE_TEXTURE, 1);

+   if (n) {

+      n[1].e = target;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ActiveTextureARB(ctx->Exec, (target));

+   }

+}

+

+

+/* GL_ARB_transpose_matrix */

+

+static void GLAPIENTRY

+save_LoadTransposeMatrixdARB(const GLdouble m[16])

+{

+   GLfloat tm[16];

+   _math_transposefd(tm, m);

+   save_LoadMatrixf(tm);

+}

+

+

+static void GLAPIENTRY

+save_LoadTransposeMatrixfARB(const GLfloat m[16])

+{

+   GLfloat tm[16];

+   _math_transposef(tm, m);

+   save_LoadMatrixf(tm);

+}

+

+

+static void GLAPIENTRY

+save_MultTransposeMatrixdARB(const GLdouble m[16])

+{

+   GLfloat tm[16];

+   _math_transposefd(tm, m);

+   save_MultMatrixf(tm);

+}

+

+

+static void GLAPIENTRY

+save_MultTransposeMatrixfARB(const GLfloat m[16])

+{

+   GLfloat tm[16];

+   _math_transposef(tm, m);

+   save_MultMatrixf(tm);

+}

+

+

+/* GL_ARB_texture_compression */

+static void GLAPIENTRY

+save_CompressedTexImage1DARB(GLenum target, GLint level,

+                             GLenum internalFormat, GLsizei width,

+                             GLint border, GLsizei imageSize,

+                             const GLvoid * data)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (target == GL_PROXY_TEXTURE_1D) {

+      /* don't compile, execute immediately */

+      CALL_CompressedTexImage1DARB(ctx->Exec, (target, level, internalFormat,

+                                               width, border, imageSize,

+                                               data));

+   }

+   else {

+      Node *n;

+      GLvoid *image;

+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+      /* make copy of image */

+      image = malloc(imageSize);

+      if (!image) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage1DARB");

+         return;

+      }

+      memcpy(image, data, imageSize);

+      n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_IMAGE_1D, 7);

+      if (n) {

+         n[1].e = target;

+         n[2].i = level;

+         n[3].e = internalFormat;

+         n[4].i = (GLint) width;

+         n[5].i = border;

+         n[6].i = imageSize;

+         n[7].data = image;

+      }

+      else if (image) {

+         free(image);

+      }

+      if (ctx->ExecuteFlag) {

+         CALL_CompressedTexImage1DARB(ctx->Exec,

+                                      (target, level, internalFormat, width,

+                                       border, imageSize, data));

+      }

+   }

+}

+

+

+static void GLAPIENTRY

+save_CompressedTexImage2DARB(GLenum target, GLint level,

+                             GLenum internalFormat, GLsizei width,

+                             GLsizei height, GLint border, GLsizei imageSize,

+                             const GLvoid * data)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (target == GL_PROXY_TEXTURE_2D) {

+      /* don't compile, execute immediately */

+      CALL_CompressedTexImage2DARB(ctx->Exec, (target, level, internalFormat,

+                                               width, height, border,

+                                               imageSize, data));

+   }

+   else {

+      Node *n;

+      GLvoid *image;

+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+      /* make copy of image */

+      image = malloc(imageSize);

+      if (!image) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB");

+         return;

+      }

+      memcpy(image, data, imageSize);

+      n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_IMAGE_2D, 8);

+      if (n) {

+         n[1].e = target;

+         n[2].i = level;

+         n[3].e = internalFormat;

+         n[4].i = (GLint) width;

+         n[5].i = (GLint) height;

+         n[6].i = border;

+         n[7].i = imageSize;

+         n[8].data = image;

+      }

+      else if (image) {

+         free(image);

+      }

+      if (ctx->ExecuteFlag) {

+         CALL_CompressedTexImage2DARB(ctx->Exec,

+                                      (target, level, internalFormat, width,

+                                       height, border, imageSize, data));

+      }

+   }

+}

+

+

+static void GLAPIENTRY

+save_CompressedTexImage3DARB(GLenum target, GLint level,

+                             GLenum internalFormat, GLsizei width,

+                             GLsizei height, GLsizei depth, GLint border,

+                             GLsizei imageSize, const GLvoid * data)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (target == GL_PROXY_TEXTURE_3D) {

+      /* don't compile, execute immediately */

+      CALL_CompressedTexImage3DARB(ctx->Exec, (target, level, internalFormat,

+                                               width, height, depth, border,

+                                               imageSize, data));

+   }

+   else {

+      Node *n;

+      GLvoid *image;

+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+      /* make copy of image */

+      image = malloc(imageSize);

+      if (!image) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage3DARB");

+         return;

+      }

+      memcpy(image, data, imageSize);

+      n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_IMAGE_3D, 9);

+      if (n) {

+         n[1].e = target;

+         n[2].i = level;

+         n[3].e = internalFormat;

+         n[4].i = (GLint) width;

+         n[5].i = (GLint) height;

+         n[6].i = (GLint) depth;

+         n[7].i = border;

+         n[8].i = imageSize;

+         n[9].data = image;

+      }

+      else if (image) {

+         free(image);

+      }

+      if (ctx->ExecuteFlag) {

+         CALL_CompressedTexImage3DARB(ctx->Exec,

+                                      (target, level, internalFormat, width,

+                                       height, depth, border, imageSize,

+                                       data));

+      }

+   }

+}

+

+

+static void GLAPIENTRY

+save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,

+                                GLsizei width, GLenum format,

+                                GLsizei imageSize, const GLvoid * data)

+{

+   Node *n;

+   GLvoid *image;

+

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   /* make copy of image */

+   image = malloc(imageSize);

+   if (!image) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage1DARB");

+      return;

+   }

+   memcpy(image, data, imageSize);

+   n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D, 7);

+   if (n) {

+      n[1].e = target;

+      n[2].i = level;

+      n[3].i = xoffset;

+      n[4].i = (GLint) width;

+      n[5].e = format;

+      n[6].i = imageSize;

+      n[7].data = image;

+   }

+   else if (image) {

+      free(image);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CompressedTexSubImage1DARB(ctx->Exec, (target, level, xoffset,

+                                                  width, format, imageSize,

+                                                  data));

+   }

+}

+

+

+static void GLAPIENTRY

+save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,

+                                GLint yoffset, GLsizei width, GLsizei height,

+                                GLenum format, GLsizei imageSize,

+                                const GLvoid * data)

+{

+   Node *n;

+   GLvoid *image;

+

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   /* make copy of image */

+   image = malloc(imageSize);

+   if (!image) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage2DARB");

+      return;

+   }

+   memcpy(image, data, imageSize);

+   n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D, 9);

+   if (n) {

+      n[1].e = target;

+      n[2].i = level;

+      n[3].i = xoffset;

+      n[4].i = yoffset;

+      n[5].i = (GLint) width;

+      n[6].i = (GLint) height;

+      n[7].e = format;

+      n[8].i = imageSize;

+      n[9].data = image;

+   }

+   else if (image) {

+      free(image);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CompressedTexSubImage2DARB(ctx->Exec,

+                                      (target, level, xoffset, yoffset, width,

+                                       height, format, imageSize, data));

+   }

+}

+

+

+static void GLAPIENTRY

+save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,

+                                GLint yoffset, GLint zoffset, GLsizei width,

+                                GLsizei height, GLsizei depth, GLenum format,

+                                GLsizei imageSize, const GLvoid * data)

+{

+   Node *n;

+   GLvoid *image;

+

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   /* make copy of image */

+   image = malloc(imageSize);

+   if (!image) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage3DARB");

+      return;

+   }

+   memcpy(image, data, imageSize);

+   n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D, 11);

+   if (n) {

+      n[1].e = target;

+      n[2].i = level;

+      n[3].i = xoffset;

+      n[4].i = yoffset;

+      n[5].i = zoffset;

+      n[6].i = (GLint) width;

+      n[7].i = (GLint) height;

+      n[8].i = (GLint) depth;

+      n[9].e = format;

+      n[10].i = imageSize;

+      n[11].data = image;

+   }

+   else if (image) {

+      free(image);

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_CompressedTexSubImage3DARB(ctx->Exec,

+                                      (target, level, xoffset, yoffset,

+                                       zoffset, width, height, depth, format,

+                                       imageSize, data));

+   }

+}

+

+

+/* GL_ARB_multisample */

+static void GLAPIENTRY

+save_SampleCoverageARB(GLclampf value, GLboolean invert)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_SAMPLE_COVERAGE, 2);

+   if (n) {

+      n[1].f = value;

+      n[2].b = invert;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_SampleCoverageARB(ctx->Exec, (value, invert));

+   }

+}

+

+

+/*

+ * GL_NV_vertex_program

+ */

+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+static void GLAPIENTRY

+save_BindProgramNV(GLenum target, GLuint id)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BIND_PROGRAM_NV, 2);

+   if (n) {

+      n[1].e = target;

+      n[2].ui = id;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BindProgramNV(ctx->Exec, (target, id));

+   }

+}

+

+static void GLAPIENTRY

+save_ProgramEnvParameter4fARB(GLenum target, GLuint index,

+                              GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PROGRAM_ENV_PARAMETER_ARB, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].ui = index;

+      n[3].f = x;

+      n[4].f = y;

+      n[5].f = z;

+      n[6].f = w;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ProgramEnvParameter4fARB(ctx->Exec, (target, index, x, y, z, w));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ProgramEnvParameter4fvARB(GLenum target, GLuint index,

+                               const GLfloat *params)

+{

+   save_ProgramEnvParameter4fARB(target, index, params[0], params[1],

+                                 params[2], params[3]);

+}

+

+

+static void GLAPIENTRY

+save_ProgramEnvParameters4fvEXT(GLenum target, GLuint index, GLsizei count,

+				const GLfloat * params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (count > 0) {

+      GLint i;

+      const GLfloat * p = params;

+

+      for (i = 0 ; i < count ; i++) {

+	 n = alloc_instruction(ctx, OPCODE_PROGRAM_ENV_PARAMETER_ARB, 6);

+	 if (n) {

+	    n[1].e = target;

+	    n[2].ui = index;

+	    n[3].f = p[0];

+	    n[4].f = p[1];

+	    n[5].f = p[2];

+	    n[6].f = p[3];

+	    p += 4;

+	 }

+      }

+   }

+

+   if (ctx->ExecuteFlag) {

+      CALL_ProgramEnvParameters4fvEXT(ctx->Exec, (target, index, count, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ProgramEnvParameter4dARB(GLenum target, GLuint index,

+                              GLdouble x, GLdouble y, GLdouble z, GLdouble w)

+{

+   save_ProgramEnvParameter4fARB(target, index,

+                                 (GLfloat) x,

+                                 (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+

+static void GLAPIENTRY

+save_ProgramEnvParameter4dvARB(GLenum target, GLuint index,

+                               const GLdouble *params)

+{

+   save_ProgramEnvParameter4fARB(target, index,

+                                 (GLfloat) params[0],

+                                 (GLfloat) params[1],

+                                 (GLfloat) params[2], (GLfloat) params[3]);

+}

+

+#endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program || FEATURE_NV_vertex_program */

+

+#if FEATURE_NV_vertex_program

+static void GLAPIENTRY

+save_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_EXECUTE_PROGRAM_NV, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].ui = id;

+      n[3].f = params[0];

+      n[4].f = params[1];

+      n[5].f = params[2];

+      n[6].f = params[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ExecuteProgramNV(ctx->Exec, (target, id, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ProgramParameters4dvNV(GLenum target, GLuint index,

+                            GLsizei num, const GLdouble *params)

+{

+   GLint i;

+   for (i = 0; i < num; i++) {

+      save_ProgramEnvParameter4dvARB(target, index + i, params + 4 * i);

+   }

+}

+

+

+static void GLAPIENTRY

+save_ProgramParameters4fvNV(GLenum target, GLuint index,

+                            GLsizei num, const GLfloat *params)

+{

+   GLint i;

+   for (i = 0; i < num; i++) {

+      save_ProgramEnvParameter4fvARB(target, index + i, params + 4 * i);

+   }

+}

+

+

+static void GLAPIENTRY

+save_LoadProgramNV(GLenum target, GLuint id, GLsizei len,

+                   const GLubyte * program)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_LOAD_PROGRAM_NV, 4);

+   if (n) {

+      GLubyte *programCopy = (GLubyte *) malloc(len);

+      if (!programCopy) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");

+         return;

+      }

+      memcpy(programCopy, program, len);

+      n[1].e = target;

+      n[2].ui = id;

+      n[3].i = len;

+      n[4].data = programCopy;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_LoadProgramNV(ctx->Exec, (target, id, len, program));

+   }

+}

+

+

+static void GLAPIENTRY

+save_RequestResidentProgramsNV(GLsizei num, const GLuint * ids)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_TRACK_MATRIX_NV, 2);

+   if (n) {

+      GLuint *idCopy = (GLuint *) malloc(num * sizeof(GLuint));

+      if (!idCopy) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glRequestResidentProgramsNV");

+         return;

+      }

+      memcpy(idCopy, ids, num * sizeof(GLuint));

+      n[1].i = num;

+      n[2].data = idCopy;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_RequestResidentProgramsNV(ctx->Exec, (num, ids));

+   }

+}

+

+

+static void GLAPIENTRY

+save_TrackMatrixNV(GLenum target, GLuint address,

+                   GLenum matrix, GLenum transform)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_TRACK_MATRIX_NV, 4);

+   if (n) {

+      n[1].e = target;

+      n[2].ui = address;

+      n[3].e = matrix;

+      n[4].e = transform;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_TrackMatrixNV(ctx->Exec, (target, address, matrix, transform));

+   }

+}

+#endif /* FEATURE_NV_vertex_program */

+

+

+/*

+ * GL_NV_fragment_program

+ */

+#if FEATURE_NV_fragment_program

+static void GLAPIENTRY

+save_ProgramLocalParameter4fARB(GLenum target, GLuint index,

+                                GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].ui = index;

+      n[3].f = x;

+      n[4].f = y;

+      n[5].f = z;

+      n[6].f = w;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ProgramLocalParameter4fARB(ctx->Exec, (target, index, x, y, z, w));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ProgramLocalParameter4fvARB(GLenum target, GLuint index,

+                                 const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].ui = index;

+      n[3].f = params[0];

+      n[4].f = params[1];

+      n[5].f = params[2];

+      n[6].f = params[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ProgramLocalParameter4fvARB(ctx->Exec, (target, index, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ProgramLocalParameters4fvEXT(GLenum target, GLuint index, GLsizei count,

+				  const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (count > 0) {

+      GLint i;

+      const GLfloat * p = params;

+

+      for (i = 0 ; i < count ; i++) {

+	 n = alloc_instruction(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6);

+	 if (n) {

+	    n[1].e = target;

+	    n[2].ui = index;

+	    n[3].f = p[0];

+	    n[4].f = p[1];

+	    n[5].f = p[2];

+	    n[6].f = p[3];

+	    p += 4;

+	 }

+      }

+   }

+

+   if (ctx->ExecuteFlag) {

+      CALL_ProgramLocalParameters4fvEXT(ctx->Exec, (target, index, count, params));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ProgramLocalParameter4dARB(GLenum target, GLuint index,

+                                GLdouble x, GLdouble y,

+                                GLdouble z, GLdouble w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].ui = index;

+      n[3].f = (GLfloat) x;

+      n[4].f = (GLfloat) y;

+      n[5].f = (GLfloat) z;

+      n[6].f = (GLfloat) w;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ProgramLocalParameter4dARB(ctx->Exec, (target, index, x, y, z, w));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ProgramLocalParameter4dvARB(GLenum target, GLuint index,

+                                 const GLdouble *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].ui = index;

+      n[3].f = (GLfloat) params[0];

+      n[4].f = (GLfloat) params[1];

+      n[5].f = (GLfloat) params[2];

+      n[6].f = (GLfloat) params[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ProgramLocalParameter4dvARB(ctx->Exec, (target, index, params));

+   }

+}

+

+static void GLAPIENTRY

+save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte * name,

+                               GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_PROGRAM_NAMED_PARAMETER_NV, 6);

+   if (n) {

+      GLubyte *nameCopy = (GLubyte *) malloc(len);

+      if (!nameCopy) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramNamedParameter4fNV");

+         return;

+      }

+      memcpy(nameCopy, name, len);

+      n[1].ui = id;

+      n[2].i = len;

+      n[3].data = nameCopy;

+      n[4].f = x;

+      n[5].f = y;

+      n[6].f = z;

+      n[7].f = w;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ProgramNamedParameter4fNV(ctx->Exec, (id, len, name, x, y, z, w));

+   }

+}

+

+

+static void GLAPIENTRY

+save_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte * name,

+                                const float v[])

+{

+   save_ProgramNamedParameter4fNV(id, len, name, v[0], v[1], v[2], v[3]);

+}

+

+

+static void GLAPIENTRY

+save_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte * name,

+                               GLdouble x, GLdouble y, GLdouble z, GLdouble w)

+{

+   save_ProgramNamedParameter4fNV(id, len, name, (GLfloat) x, (GLfloat) y,

+                                  (GLfloat) z, (GLfloat) w);

+}

+

+

+static void GLAPIENTRY

+save_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte * name,

+                                const double v[])

+{

+   save_ProgramNamedParameter4fNV(id, len, name, (GLfloat) v[0],

+                                  (GLfloat) v[1], (GLfloat) v[2],

+                                  (GLfloat) v[3]);

+}

+

+#endif /* FEATURE_NV_fragment_program */

+

+

+

+/* GL_EXT_stencil_two_side */

+static void GLAPIENTRY

+save_ActiveStencilFaceEXT(GLenum face)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_ACTIVE_STENCIL_FACE_EXT, 1);

+   if (n) {

+      n[1].e = face;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ActiveStencilFaceEXT(ctx->Exec, (face));

+   }

+}

+

+

+/* GL_EXT_depth_bounds_test */

+static void GLAPIENTRY

+save_DepthBoundsEXT(GLclampd zmin, GLclampd zmax)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_DEPTH_BOUNDS_EXT, 2);

+   if (n) {

+      n[1].f = (GLfloat) zmin;

+      n[2].f = (GLfloat) zmax;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_DepthBoundsEXT(ctx->Exec, (zmin, zmax));

+   }

+}

+

+

+

+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+

+static void GLAPIENTRY

+save_ProgramStringARB(GLenum target, GLenum format, GLsizei len,

+                      const GLvoid * string)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_PROGRAM_STRING_ARB, 4);

+   if (n) {

+      GLubyte *programCopy = (GLubyte *) malloc(len);

+      if (!programCopy) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");

+         return;

+      }

+      memcpy(programCopy, string, len);

+      n[1].e = target;

+      n[2].e = format;

+      n[3].i = len;

+      n[4].data = programCopy;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ProgramStringARB(ctx->Exec, (target, format, len, string));

+   }

+}

+

+#endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */

+

+

+#if FEATURE_queryobj

+

+static void GLAPIENTRY

+save_BeginQueryARB(GLenum target, GLuint id)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BEGIN_QUERY_ARB, 2);

+   if (n) {

+      n[1].e = target;

+      n[2].ui = id;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BeginQueryARB(ctx->Exec, (target, id));

+   }

+}

+

+

+static void GLAPIENTRY

+save_EndQueryARB(GLenum target)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_END_QUERY_ARB, 1);

+   if (n) {

+      n[1].e = target;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_EndQueryARB(ctx->Exec, (target));

+   }

+}

+

+#endif /* FEATURE_queryobj */

+

+

+static void GLAPIENTRY

+save_DrawBuffersARB(GLsizei count, const GLenum * buffers)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_DRAW_BUFFERS_ARB, 1 + MAX_DRAW_BUFFERS);

+   if (n) {

+      GLint i;

+      n[1].i = count;

+      if (count > MAX_DRAW_BUFFERS)

+         count = MAX_DRAW_BUFFERS;

+      for (i = 0; i < count; i++) {

+         n[2 + i].e = buffers[i];

+      }

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_DrawBuffersARB(ctx->Exec, (count, buffers));

+   }

+}

+

+static void GLAPIENTRY

+save_TexBumpParameterfvATI(GLenum pname, const GLfloat *param)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   n = alloc_instruction(ctx, OPCODE_TEX_BUMP_PARAMETER_ATI, 5);

+   if (n) {

+      n[1].ui = pname;

+      n[2].f = param[0];

+      n[3].f = param[1];

+      n[4].f = param[2];

+      n[5].f = param[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_TexBumpParameterfvATI(ctx->Exec, (pname, param));

+   }

+}

+

+static void GLAPIENTRY

+save_TexBumpParameterivATI(GLenum pname, const GLint *param)

+{

+   GLfloat p[4];

+   p[0] = INT_TO_FLOAT(param[0]);

+   p[1] = INT_TO_FLOAT(param[1]);

+   p[2] = INT_TO_FLOAT(param[2]);

+   p[3] = INT_TO_FLOAT(param[3]);

+   save_TexBumpParameterfvATI(pname, p);

+}

+

+#if FEATURE_ATI_fragment_shader

+static void GLAPIENTRY

+save_BindFragmentShaderATI(GLuint id)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   n = alloc_instruction(ctx, OPCODE_BIND_FRAGMENT_SHADER_ATI, 1);

+   if (n) {

+      n[1].ui = id;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BindFragmentShaderATI(ctx->Exec, (id));

+   }

+}

+

+static void GLAPIENTRY

+save_SetFragmentShaderConstantATI(GLuint dst, const GLfloat *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+

+   n = alloc_instruction(ctx, OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI, 5);

+   if (n) {

+      n[1].ui = dst;

+      n[2].f = value[0];

+      n[3].f = value[1];

+      n[4].f = value[2];

+      n[5].f = value[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_SetFragmentShaderConstantATI(ctx->Exec, (dst, value));

+   }

+}

+#endif

+

+static void

+save_Attr1fNV(GLenum attr, GLfloat x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_ATTR_1F_NV, 2);

+   if (n) {

+      n[1].e = attr;

+      n[2].f = x;

+   }

+

+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);

+   ctx->ListState.ActiveAttribSize[attr] = 1;

+   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1);

+

+   if (ctx->ExecuteFlag) {

+      CALL_VertexAttrib1fNV(ctx->Exec, (attr, x));

+   }

+}

+

+static void

+save_Attr2fNV(GLenum attr, GLfloat x, GLfloat y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_ATTR_2F_NV, 3);

+   if (n) {

+      n[1].e = attr;

+      n[2].f = x;

+      n[3].f = y;

+   }

+

+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);

+   ctx->ListState.ActiveAttribSize[attr] = 2;

+   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, 0, 1);

+

+   if (ctx->ExecuteFlag) {

+      CALL_VertexAttrib2fNV(ctx->Exec, (attr, x, y));

+   }

+}

+

+static void

+save_Attr3fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_ATTR_3F_NV, 4);

+   if (n) {

+      n[1].e = attr;

+      n[2].f = x;

+      n[3].f = y;

+      n[4].f = z;

+   }

+

+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);

+   ctx->ListState.ActiveAttribSize[attr] = 3;

+   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, 1);

+

+   if (ctx->ExecuteFlag) {

+      CALL_VertexAttrib3fNV(ctx->Exec, (attr, x, y, z));

+   }

+}

+

+static void

+save_Attr4fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_ATTR_4F_NV, 5);

+   if (n) {

+      n[1].e = attr;

+      n[2].f = x;

+      n[3].f = y;

+      n[4].f = z;

+      n[5].f = w;

+   }

+

+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);

+   ctx->ListState.ActiveAttribSize[attr] = 4;

+   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, w);

+

+   if (ctx->ExecuteFlag) {

+      CALL_VertexAttrib4fNV(ctx->Exec, (attr, x, y, z, w));

+   }

+}

+

+

+static void

+save_Attr1fARB(GLenum attr, GLfloat x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_ATTR_1F_ARB, 2);

+   if (n) {

+      n[1].e = attr;

+      n[2].f = x;

+   }

+

+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);

+   ctx->ListState.ActiveAttribSize[attr] = 1;

+   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1);

+

+   if (ctx->ExecuteFlag) {

+      CALL_VertexAttrib1fARB(ctx->Exec, (attr, x));

+   }

+}

+

+static void

+save_Attr2fARB(GLenum attr, GLfloat x, GLfloat y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_ATTR_2F_ARB, 3);

+   if (n) {

+      n[1].e = attr;

+      n[2].f = x;

+      n[3].f = y;

+   }

+

+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);

+   ctx->ListState.ActiveAttribSize[attr] = 2;

+   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, 0, 1);

+

+   if (ctx->ExecuteFlag) {

+      CALL_VertexAttrib2fARB(ctx->Exec, (attr, x, y));

+   }

+}

+

+static void

+save_Attr3fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_ATTR_3F_ARB, 4);

+   if (n) {

+      n[1].e = attr;

+      n[2].f = x;

+      n[3].f = y;

+      n[4].f = z;

+   }

+

+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);

+   ctx->ListState.ActiveAttribSize[attr] = 3;

+   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, 1);

+

+   if (ctx->ExecuteFlag) {

+      CALL_VertexAttrib3fARB(ctx->Exec, (attr, x, y, z));

+   }

+}

+

+static void

+save_Attr4fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_ATTR_4F_ARB, 5);

+   if (n) {

+      n[1].e = attr;

+      n[2].f = x;

+      n[3].f = y;

+      n[4].f = z;

+      n[5].f = w;

+   }

+

+   ASSERT(attr < MAX_VERTEX_GENERIC_ATTRIBS);

+   ctx->ListState.ActiveAttribSize[attr] = 4;

+   ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, w);

+

+   if (ctx->ExecuteFlag) {

+      CALL_VertexAttrib4fARB(ctx->Exec, (attr, x, y, z, w));

+   }

+}

+

+

+static void GLAPIENTRY

+save_EvalCoord1f(GLfloat x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_EVAL_C1, 1);

+   if (n) {

+      n[1].f = x;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_EvalCoord1f(ctx->Exec, (x));

+   }

+}

+

+static void GLAPIENTRY

+save_EvalCoord1fv(const GLfloat * v)

+{

+   save_EvalCoord1f(v[0]);

+}

+

+static void GLAPIENTRY

+save_EvalCoord2f(GLfloat x, GLfloat y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_EVAL_C2, 2);

+   if (n) {

+      n[1].f = x;

+      n[2].f = y;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_EvalCoord2f(ctx->Exec, (x, y));

+   }

+}

+

+static void GLAPIENTRY

+save_EvalCoord2fv(const GLfloat * v)

+{

+   save_EvalCoord2f(v[0], v[1]);

+}

+

+

+static void GLAPIENTRY

+save_EvalPoint1(GLint x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_EVAL_P1, 1);

+   if (n) {

+      n[1].i = x;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_EvalPoint1(ctx->Exec, (x));

+   }

+}

+

+static void GLAPIENTRY

+save_EvalPoint2(GLint x, GLint y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_EVAL_P2, 2);

+   if (n) {

+      n[1].i = x;

+      n[2].i = y;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_EvalPoint2(ctx->Exec, (x, y));

+   }

+}

+

+static void GLAPIENTRY

+save_Indexf(GLfloat x)

+{

+   save_Attr1fNV(VERT_ATTRIB_COLOR_INDEX, x);

+}

+

+static void GLAPIENTRY

+save_Indexfv(const GLfloat * v)

+{

+   save_Attr1fNV(VERT_ATTRIB_COLOR_INDEX, v[0]);

+}

+

+static void GLAPIENTRY

+save_EdgeFlag(GLboolean x)

+{

+   save_Attr1fNV(VERT_ATTRIB_EDGEFLAG, x ? (GLfloat)1.0 : (GLfloat)0.0);

+}

+

+static INLINE GLboolean compare4fv( const GLfloat *a,

+                                    const GLfloat *b,

+                                    GLuint count )

+{

+   return memcmp( a, b, count * sizeof(GLfloat) ) == 0;

+}

+                              

+

+static void GLAPIENTRY

+save_Materialfv(GLenum face, GLenum pname, const GLfloat * param)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   int args, i;

+   GLuint bitmask;

+

+   switch (face) {

+   case GL_BACK:

+   case GL_FRONT:

+   case GL_FRONT_AND_BACK:

+      break;

+   default:

+      _mesa_compile_error(ctx, GL_INVALID_ENUM, "material(face)");

+      return;

+   }

+

+   switch (pname) {

+   case GL_EMISSION:

+   case GL_AMBIENT:

+   case GL_DIFFUSE:

+   case GL_SPECULAR:

+   case GL_AMBIENT_AND_DIFFUSE:

+      args = 4;

+      break;

+   case GL_SHININESS:

+      args = 1;

+      break;

+   case GL_COLOR_INDEXES:

+      args = 3;

+      break;

+   default:

+      _mesa_compile_error(ctx, GL_INVALID_ENUM, "material(pname)");

+      return;

+   }

+   

+   if (ctx->ExecuteFlag) {

+      CALL_Materialfv(ctx->Exec, (face, pname, param));

+   }

+

+   bitmask = _mesa_material_bitmask(ctx, face, pname, ~0, NULL);

+

+   /* Try to eliminate redundant statechanges.  Because it is legal to

+    * call glMaterial even inside begin/end calls, don't need to worry

+    * about ctx->Driver.CurrentSavePrimitive here.

+    */

+   for (i = 0; i < MAT_ATTRIB_MAX; i++) {

+      if (bitmask & (1 << i)) {

+         if (ctx->ListState.ActiveMaterialSize[i] == args &&

+             compare4fv(ctx->ListState.CurrentMaterial[i], param, args)) {

+            bitmask &= ~(1 << i);

+         }

+         else {

+            ctx->ListState.ActiveMaterialSize[i] = args;

+            COPY_SZ_4V(ctx->ListState.CurrentMaterial[i], args, param);

+         }

+      }

+   }

+

+   /* If this call has effect, return early:

+    */

+   if (bitmask == 0)

+      return;

+

+   SAVE_FLUSH_VERTICES(ctx);

+

+   n = alloc_instruction(ctx, OPCODE_MATERIAL, 6);

+   if (n) {

+      n[1].e = face;

+      n[2].e = pname;

+      for (i = 0; i < args; i++)

+         n[3 + i].f = param[i];

+   }

+}

+

+static void GLAPIENTRY

+save_Begin(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   GLboolean error = GL_FALSE;

+

+   if ( /*mode < GL_POINTS || */ mode > GL_POLYGON) {

+      _mesa_compile_error(ctx, GL_INVALID_ENUM, "Begin (mode)");

+      error = GL_TRUE;

+   }

+   else if (ctx->Driver.CurrentSavePrimitive == PRIM_UNKNOWN) {

+      /* Typically the first begin.  This may raise an error on

+       * playback, depending on whether CallList is issued from inside

+       * a begin/end or not.

+       */

+      ctx->Driver.CurrentSavePrimitive = PRIM_INSIDE_UNKNOWN_PRIM;

+   }

+   else if (ctx->Driver.CurrentSavePrimitive == PRIM_OUTSIDE_BEGIN_END) {

+      ctx->Driver.CurrentSavePrimitive = mode;

+   }

+   else {

+      _mesa_compile_error(ctx, GL_INVALID_OPERATION, "recursive begin");

+      error = GL_TRUE;

+   }

+

+   if (!error) {

+      /* Give the driver an opportunity to hook in an optimized

+       * display list compiler.

+       */

+      if (ctx->Driver.NotifySaveBegin(ctx, mode))

+         return;

+

+      SAVE_FLUSH_VERTICES(ctx);

+      n = alloc_instruction(ctx, OPCODE_BEGIN, 1);

+      if (n) {

+         n[1].e = mode;

+      }

+   }

+

+   if (ctx->ExecuteFlag) {

+      CALL_Begin(ctx->Exec, (mode));

+   }

+}

+

+static void GLAPIENTRY

+save_End(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   SAVE_FLUSH_VERTICES(ctx);

+   (void) alloc_instruction(ctx, OPCODE_END, 0);

+   ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;

+   if (ctx->ExecuteFlag) {

+      CALL_End(ctx->Exec, ());

+   }

+}

+

+static void GLAPIENTRY

+save_Rectf(GLfloat a, GLfloat b, GLfloat c, GLfloat d)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   SAVE_FLUSH_VERTICES(ctx);

+   n = alloc_instruction(ctx, OPCODE_RECTF, 4);

+   if (n) {

+      n[1].f = a;

+      n[2].f = b;

+      n[3].f = c;

+      n[4].f = d;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Rectf(ctx->Exec, (a, b, c, d));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Vertex2f(GLfloat x, GLfloat y)

+{

+   save_Attr2fNV(VERT_ATTRIB_POS, x, y);

+}

+

+static void GLAPIENTRY

+save_Vertex2fv(const GLfloat * v)

+{

+   save_Attr2fNV(VERT_ATTRIB_POS, v[0], v[1]);

+}

+

+static void GLAPIENTRY

+save_Vertex3f(GLfloat x, GLfloat y, GLfloat z)

+{

+   save_Attr3fNV(VERT_ATTRIB_POS, x, y, z);

+}

+

+static void GLAPIENTRY

+save_Vertex3fv(const GLfloat * v)

+{

+   save_Attr3fNV(VERT_ATTRIB_POS, v[0], v[1], v[2]);

+}

+

+static void GLAPIENTRY

+save_Vertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   save_Attr4fNV(VERT_ATTRIB_POS, x, y, z, w);

+}

+

+static void GLAPIENTRY

+save_Vertex4fv(const GLfloat * v)

+{

+   save_Attr4fNV(VERT_ATTRIB_POS, v[0], v[1], v[2], v[3]);

+}

+

+static void GLAPIENTRY

+save_TexCoord1f(GLfloat x)

+{

+   save_Attr1fNV(VERT_ATTRIB_TEX0, x);

+}

+

+static void GLAPIENTRY

+save_TexCoord1fv(const GLfloat * v)

+{

+   save_Attr1fNV(VERT_ATTRIB_TEX0, v[0]);

+}

+

+static void GLAPIENTRY

+save_TexCoord2f(GLfloat x, GLfloat y)

+{

+   save_Attr2fNV(VERT_ATTRIB_TEX0, x, y);

+}

+

+static void GLAPIENTRY

+save_TexCoord2fv(const GLfloat * v)

+{

+   save_Attr2fNV(VERT_ATTRIB_TEX0, v[0], v[1]);

+}

+

+static void GLAPIENTRY

+save_TexCoord3f(GLfloat x, GLfloat y, GLfloat z)

+{

+   save_Attr3fNV(VERT_ATTRIB_TEX0, x, y, z);

+}

+

+static void GLAPIENTRY

+save_TexCoord3fv(const GLfloat * v)

+{

+   save_Attr3fNV(VERT_ATTRIB_TEX0, v[0], v[1], v[2]);

+}

+

+static void GLAPIENTRY

+save_TexCoord4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   save_Attr4fNV(VERT_ATTRIB_TEX0, x, y, z, w);

+}

+

+static void GLAPIENTRY

+save_TexCoord4fv(const GLfloat * v)

+{

+   save_Attr4fNV(VERT_ATTRIB_TEX0, v[0], v[1], v[2], v[3]);

+}

+

+static void GLAPIENTRY

+save_Normal3f(GLfloat x, GLfloat y, GLfloat z)

+{

+   save_Attr3fNV(VERT_ATTRIB_NORMAL, x, y, z);

+}

+

+static void GLAPIENTRY

+save_Normal3fv(const GLfloat * v)

+{

+   save_Attr3fNV(VERT_ATTRIB_NORMAL, v[0], v[1], v[2]);

+}

+

+static void GLAPIENTRY

+save_FogCoordfEXT(GLfloat x)

+{

+   save_Attr1fNV(VERT_ATTRIB_FOG, x);

+}

+

+static void GLAPIENTRY

+save_FogCoordfvEXT(const GLfloat * v)

+{

+   save_Attr1fNV(VERT_ATTRIB_FOG, v[0]);

+}

+

+static void GLAPIENTRY

+save_Color3f(GLfloat x, GLfloat y, GLfloat z)

+{

+   save_Attr3fNV(VERT_ATTRIB_COLOR0, x, y, z);

+}

+

+static void GLAPIENTRY

+save_Color3fv(const GLfloat * v)

+{

+   save_Attr3fNV(VERT_ATTRIB_COLOR0, v[0], v[1], v[2]);

+}

+

+static void GLAPIENTRY

+save_Color4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   save_Attr4fNV(VERT_ATTRIB_COLOR0, x, y, z, w);

+}

+

+static void GLAPIENTRY

+save_Color4fv(const GLfloat * v)

+{

+   save_Attr4fNV(VERT_ATTRIB_COLOR0, v[0], v[1], v[2], v[3]);

+}

+

+static void GLAPIENTRY

+save_SecondaryColor3fEXT(GLfloat x, GLfloat y, GLfloat z)

+{

+   save_Attr3fNV(VERT_ATTRIB_COLOR1, x, y, z);

+}

+

+static void GLAPIENTRY

+save_SecondaryColor3fvEXT(const GLfloat * v)

+{

+   save_Attr3fNV(VERT_ATTRIB_COLOR1, v[0], v[1], v[2]);

+}

+

+

+/* Just call the respective ATTR for texcoord

+ */

+static void GLAPIENTRY

+save_MultiTexCoord1f(GLenum target, GLfloat x)

+{

+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;

+   save_Attr1fNV(attr, x);

+}

+

+static void GLAPIENTRY

+save_MultiTexCoord1fv(GLenum target, const GLfloat * v)

+{

+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;

+   save_Attr1fNV(attr, v[0]);

+}

+

+static void GLAPIENTRY

+save_MultiTexCoord2f(GLenum target, GLfloat x, GLfloat y)

+{

+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;

+   save_Attr2fNV(attr, x, y);

+}

+

+static void GLAPIENTRY

+save_MultiTexCoord2fv(GLenum target, const GLfloat * v)

+{

+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;

+   save_Attr2fNV(attr, v[0], v[1]);

+}

+

+static void GLAPIENTRY

+save_MultiTexCoord3f(GLenum target, GLfloat x, GLfloat y, GLfloat z)

+{

+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;

+   save_Attr3fNV(attr, x, y, z);

+}

+

+static void GLAPIENTRY

+save_MultiTexCoord3fv(GLenum target, const GLfloat * v)

+{

+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;

+   save_Attr3fNV(attr, v[0], v[1], v[2]);

+}

+

+static void GLAPIENTRY

+save_MultiTexCoord4f(GLenum target, GLfloat x, GLfloat y,

+                     GLfloat z, GLfloat w)

+{

+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;

+   save_Attr4fNV(attr, x, y, z, w);

+}

+

+static void GLAPIENTRY

+save_MultiTexCoord4fv(GLenum target, const GLfloat * v)

+{

+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;

+   save_Attr4fNV(attr, v[0], v[1], v[2], v[3]);

+}

+

+

+/**

+ * Record a GL_INVALID_VALUE error when a invalid vertex attribute

+ * index is found.

+ */

+static void

+index_error(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_error(ctx, GL_INVALID_VALUE, "VertexAttribf(index)");

+}

+

+

+/* First level for NV_vertex_program:

+ *

+ * Check for errors at compile time?.

+ */

+static void GLAPIENTRY

+save_VertexAttrib1fNV(GLuint index, GLfloat x)

+{

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)

+      save_Attr1fNV(index, x);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib1fvNV(GLuint index, const GLfloat * v)

+{

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)

+      save_Attr1fNV(index, v[0]);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib2fNV(GLuint index, GLfloat x, GLfloat y)

+{

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)

+      save_Attr2fNV(index, x, y);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib2fvNV(GLuint index, const GLfloat * v)

+{

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)

+      save_Attr2fNV(index, v[0], v[1]);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib3fNV(GLuint index, GLfloat x, GLfloat y, GLfloat z)

+{

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)

+      save_Attr3fNV(index, x, y, z);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib3fvNV(GLuint index, const GLfloat * v)

+{

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)

+      save_Attr3fNV(index, v[0], v[1], v[2]);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib4fNV(GLuint index, GLfloat x, GLfloat y,

+                      GLfloat z, GLfloat w)

+{

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)

+      save_Attr4fNV(index, x, y, z, w);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib4fvNV(GLuint index, const GLfloat * v)

+{

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS)

+      save_Attr4fNV(index, v[0], v[1], v[2], v[3]);

+   else

+      index_error();

+}

+

+

+

+

+static void GLAPIENTRY

+save_VertexAttrib1fARB(GLuint index, GLfloat x)

+{

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      save_Attr1fARB(index, x);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib1fvARB(GLuint index, const GLfloat * v)

+{

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      save_Attr1fARB(index, v[0]);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib2fARB(GLuint index, GLfloat x, GLfloat y)

+{

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      save_Attr2fARB(index, x, y);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib2fvARB(GLuint index, const GLfloat * v)

+{

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      save_Attr2fARB(index, v[0], v[1]);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib3fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z)

+{

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      save_Attr3fARB(index, x, y, z);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib3fvARB(GLuint index, const GLfloat * v)

+{

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      save_Attr3fARB(index, v[0], v[1], v[2]);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib4fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z,

+                       GLfloat w)

+{

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      save_Attr4fARB(index, x, y, z, w);

+   else

+      index_error();

+}

+

+static void GLAPIENTRY

+save_VertexAttrib4fvARB(GLuint index, const GLfloat * v)

+{

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      save_Attr4fARB(index, v[0], v[1], v[2], v[3]);

+   else

+      index_error();

+}

+

+

+/* GL_ARB_shader_objects, GL_ARB_vertex/fragment_shader */

+

+static void GLAPIENTRY

+exec_BindAttribLocationARB(GLuint program, GLuint index, const GLchar *name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_BindAttribLocationARB(ctx->Exec, (program, index, name));

+}

+

+static GLint GLAPIENTRY

+exec_GetAttribLocationARB(GLuint program, const GLchar *name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   return CALL_GetAttribLocationARB(ctx->Exec, (program, name));

+}

+

+static GLint GLAPIENTRY

+exec_GetUniformLocationARB(GLuint program, const GLchar *name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   return CALL_GetUniformLocationARB(ctx->Exec, (program, name));

+}

+/* XXX more shader functions needed here */

+

+

+#if FEATURE_EXT_framebuffer_blit

+static void GLAPIENTRY

+save_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

+                        GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

+                        GLbitfield mask, GLenum filter)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BLIT_FRAMEBUFFER, 10);

+   if (n) {

+      n[1].i = srcX0;

+      n[2].i = srcY0;

+      n[3].i = srcX1;

+      n[4].i = srcY1;

+      n[5].i = dstX0;

+      n[6].i = dstY0;

+      n[7].i = dstX1;

+      n[8].i = dstY1;

+      n[9].i = mask;

+      n[10].e = filter;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BlitFramebufferEXT(ctx->Exec, (srcX0, srcY0, srcX1, srcY1,

+                                          dstX0, dstY0, dstX1, dstY1,

+                                          mask, filter));

+   }

+}

+#endif

+

+

+/** GL_EXT_provoking_vertex */

+static void GLAPIENTRY

+save_ProvokingVertexEXT(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_PROVOKING_VERTEX, 1);

+   if (n) {

+      n[1].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_ProvokingVertexEXT(ctx->Exec, (mode));*/

+      _mesa_ProvokingVertexEXT(mode);

+   }

+}

+

+

+/** GL_EXT_transform_feedback */

+static void GLAPIENTRY

+save_BeginTransformFeedback(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_BEGIN_TRANSFORM_FEEDBACK, 1);

+   if (n) {

+      n[1].e = mode;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_BeginTransformFeedbackEXT(ctx->Exec, (mode));

+   }

+}

+

+

+/** GL_EXT_transform_feedback */

+static void GLAPIENTRY

+save_EndTransformFeedback(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   (void) alloc_instruction(ctx, OPCODE_END_TRANSFORM_FEEDBACK, 0);

+   if (ctx->ExecuteFlag) {

+      CALL_EndTransformFeedbackEXT(ctx->Exec, ());

+   }

+}

+

+

+/* aka UseProgram() */

+static void GLAPIENTRY

+save_UseProgramObjectARB(GLhandleARB program)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_USE_PROGRAM, 1);

+   if (n) {

+      n[1].ui = program;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_UseProgramObjectARB(ctx->Exec, (program));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Uniform1fARB(GLint location, GLfloat x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_1F, 2);

+   if (n) {

+      n[1].i = location;

+      n[2].f = x;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform1fARB(ctx->Exec, (location, x));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Uniform2fARB(GLint location, GLfloat x, GLfloat y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_2F, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].f = x;

+      n[3].f = y;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform2fARB(ctx->Exec, (location, x, y));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Uniform3fARB(GLint location, GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_3F, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].f = x;

+      n[3].f = y;

+      n[4].f = z;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform3fARB(ctx->Exec, (location, x, y, z));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Uniform4fARB(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_4F, 5);

+   if (n) {

+      n[1].i = location;

+      n[2].f = x;

+      n[3].f = y;

+      n[4].f = z;

+      n[5].f = w;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform4fARB(ctx->Exec, (location, x, y, z, w));

+   }

+}

+

+

+/** Return copy of memory */

+static void *

+memdup(const void *src, GLsizei bytes)

+{

+   void *b = bytes >= 0 ? malloc(bytes) : NULL;

+   if (b)

+      memcpy(b, src, bytes);

+   return b;

+}

+

+

+static void GLAPIENTRY

+save_Uniform1fvARB(GLint location, GLsizei count, const GLfloat *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_1FV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 1 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform1fvARB(ctx->Exec, (location, count, v));

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform2fvARB(GLint location, GLsizei count, const GLfloat *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_2FV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 2 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform2fvARB(ctx->Exec, (location, count, v));

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform3fvARB(GLint location, GLsizei count, const GLfloat *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_3FV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 3 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform3fvARB(ctx->Exec, (location, count, v));

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform4fvARB(GLint location, GLsizei count, const GLfloat *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_4FV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 4 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform4fvARB(ctx->Exec, (location, count, v));

+   }

+}

+

+

+static void GLAPIENTRY

+save_Uniform1iARB(GLint location, GLint x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_1I, 2);

+   if (n) {

+      n[1].i = location;

+      n[2].i = x;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform1iARB(ctx->Exec, (location, x));

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform2iARB(GLint location, GLint x, GLint y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_2I, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = x;

+      n[3].i = y;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform2iARB(ctx->Exec, (location, x, y));

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform3iARB(GLint location, GLint x, GLint y, GLint z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_3I, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].i = x;

+      n[3].i = y;

+      n[4].i = z;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform3iARB(ctx->Exec, (location, x, y, z));

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform4iARB(GLint location, GLint x, GLint y, GLint z, GLint w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_4I, 5);

+   if (n) {

+      n[1].i = location;

+      n[2].i = x;

+      n[3].i = y;

+      n[4].i = z;

+      n[5].i = w;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform4iARB(ctx->Exec, (location, x, y, z, w));

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_Uniform1ivARB(GLint location, GLsizei count, const GLint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_1IV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 1 * sizeof(GLint));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform1ivARB(ctx->Exec, (location, count, v));

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform2ivARB(GLint location, GLsizei count, const GLint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_2IV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 2 * sizeof(GLint));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform2ivARB(ctx->Exec, (location, count, v));

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform3ivARB(GLint location, GLsizei count, const GLint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_3IV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 3 * sizeof(GLint));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform3ivARB(ctx->Exec, (location, count, v));

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform4ivARB(GLint location, GLsizei count, const GLint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_4IV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 4 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_Uniform4ivARB(ctx->Exec, (location, count, v));

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_Uniform1ui(GLint location, GLuint x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_1UI, 2);

+   if (n) {

+      n[1].i = location;

+      n[2].i = x;

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_Uniform1ui(ctx->Exec, (location, x));*/

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform2ui(GLint location, GLuint x, GLuint y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_2UI, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = x;

+      n[3].i = y;

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_Uniform2ui(ctx->Exec, (location, x, y));*/

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform3ui(GLint location, GLuint x, GLuint y, GLuint z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_3UI, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].i = x;

+      n[3].i = y;

+      n[4].i = z;

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_Uniform3ui(ctx->Exec, (location, x, y, z));*/

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform4ui(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_4UI, 5);

+   if (n) {

+      n[1].i = location;

+      n[2].i = x;

+      n[3].i = y;

+      n[4].i = z;

+      n[5].i = w;

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_Uniform4ui(ctx->Exec, (location, x, y, z, w));*/

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_Uniform1uiv(GLint location, GLsizei count, const GLuint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_1UIV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 1 * sizeof(*v));

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_Uniform1uiv(ctx->Exec, (location, count, v));*/

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform2uiv(GLint location, GLsizei count, const GLuint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_2UIV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 2 * sizeof(*v));

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_Uniform2uiv(ctx->Exec, (location, count, v));*/

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform3uiv(GLint location, GLsizei count, const GLuint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_3UIV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 3 * sizeof(*v));

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_Uniform3uiv(ctx->Exec, (location, count, v));*/

+   }

+}

+

+static void GLAPIENTRY

+save_Uniform4uiv(GLint location, GLsizei count, const GLuint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_4UIV, 3);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].data = memdup(v, count * 4 * sizeof(*v));

+   }

+   if (ctx->ExecuteFlag) {

+      /*CALL_Uniform4uiv(ctx->Exec, (location, count, v));*/

+   }

+}

+

+

+

+static void GLAPIENTRY

+save_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *m)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX22, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].b = transpose;

+      n[4].data = memdup(m, count * 2 * 2 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_UniformMatrix2fvARB(ctx->Exec, (location, count, transpose, m));

+   }

+}

+

+static void GLAPIENTRY

+save_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *m)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX33, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].b = transpose;

+      n[4].data = memdup(m, count * 3 * 3 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_UniformMatrix3fvARB(ctx->Exec, (location, count, transpose, m));

+   }

+}

+

+static void GLAPIENTRY

+save_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *m)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX44, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].b = transpose;

+      n[4].data = memdup(m, count * 4 * 4 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_UniformMatrix4fvARB(ctx->Exec, (location, count, transpose, m));

+   }

+}

+

+

+static void GLAPIENTRY

+save_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,

+                        const GLfloat *m)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX23, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].b = transpose;

+      n[4].data = memdup(m, count * 2 * 3 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_UniformMatrix2x3fv(ctx->Exec, (location, count, transpose, m));

+   }

+}

+

+static void GLAPIENTRY

+save_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,

+                        const GLfloat *m)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX32, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].b = transpose;

+      n[4].data = memdup(m, count * 3 * 2 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_UniformMatrix3x2fv(ctx->Exec, (location, count, transpose, m));

+   }

+}

+

+

+static void GLAPIENTRY

+save_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,

+                        const GLfloat *m)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX24, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].b = transpose;

+      n[4].data = memdup(m, count * 2 * 4 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_UniformMatrix2x4fv(ctx->Exec, (location, count, transpose, m));

+   }

+}

+

+static void GLAPIENTRY

+save_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,

+                        const GLfloat *m)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX42, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].b = transpose;

+      n[4].data = memdup(m, count * 4 * 2 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_UniformMatrix4x2fv(ctx->Exec, (location, count, transpose, m));

+   }

+}

+

+

+static void GLAPIENTRY

+save_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,

+                        const GLfloat *m)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX34, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].b = transpose;

+      n[4].data = memdup(m, count * 3 * 4 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_UniformMatrix3x4fv(ctx->Exec, (location, count, transpose, m));

+   }

+}

+

+static void GLAPIENTRY

+save_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,

+                        const GLfloat *m)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_UNIFORM_MATRIX43, 4);

+   if (n) {

+      n[1].i = location;

+      n[2].i = count;

+      n[3].b = transpose;

+      n[4].data = memdup(m, count * 4 * 3 * sizeof(GLfloat));

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_UniformMatrix4x3fv(ctx->Exec, (location, count, transpose, m));

+   }

+}

+

+static void GLAPIENTRY

+save_ClampColorARB(GLenum target, GLenum clamp)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLAMP_COLOR, 2);

+   if (n) {

+      n[1].e = target;

+      n[2].e = clamp;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ClampColorARB(ctx->Exec, (target, clamp));

+   }

+}

+

+static void GLAPIENTRY

+save_UseShaderProgramEXT(GLenum type, GLuint program)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_USE_SHADER_PROGRAM_EXT, 2);

+   if (n) {

+      n[1].ui = type;

+      n[2].ui = program;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_UseShaderProgramEXT(ctx->Exec, (type, program));

+   }

+}

+

+static void GLAPIENTRY

+save_ActiveProgramEXT(GLuint program)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_ACTIVE_PROGRAM_EXT, 1);

+   if (n) {

+      n[1].ui = program;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ActiveProgramEXT(ctx->Exec, (program));

+   }

+}

+

+/** GL_EXT_texture_integer */

+static void GLAPIENTRY

+save_ClearColorIi(GLint red, GLint green, GLint blue, GLint alpha)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEARCOLOR_I, 4);

+   if (n) {

+      n[1].i = red;

+      n[2].i = green;

+      n[3].i = blue;

+      n[4].i = alpha;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ClearColorIiEXT(ctx->Exec, (red, green, blue, alpha));

+   }

+}

+

+/** GL_EXT_texture_integer */

+static void GLAPIENTRY

+save_ClearColorIui(GLuint red, GLuint green, GLuint blue, GLuint alpha)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_CLEARCOLOR_UI, 4);

+   if (n) {

+      n[1].ui = red;

+      n[2].ui = green;

+      n[3].ui = blue;

+      n[4].ui = alpha;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_ClearColorIuiEXT(ctx->Exec, (red, green, blue, alpha));

+   }

+}

+

+/** GL_EXT_texture_integer */

+static void GLAPIENTRY

+save_TexParameterIiv(GLenum target, GLenum pname, const GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_TEXPARAMETER_I, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].e = pname;

+      n[3].i = params[0];

+      n[4].i = params[1];

+      n[5].i = params[2];

+      n[6].i = params[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_TexParameterIivEXT(ctx->Exec, (target, pname, params));

+   }

+}

+

+/** GL_EXT_texture_integer */

+static void GLAPIENTRY

+save_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_TEXPARAMETER_UI, 6);

+   if (n) {

+      n[1].e = target;

+      n[2].e = pname;

+      n[3].ui = params[0];

+      n[4].ui = params[1];

+      n[5].ui = params[2];

+      n[6].ui = params[3];

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_TexParameterIuivEXT(ctx->Exec, (target, pname, params));

+   }

+}

+

+/** GL_EXT_texture_integer */

+static void GLAPIENTRY

+exec_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexParameterIivEXT(ctx->Exec, (target, pname, params));

+}

+

+/** GL_EXT_texture_integer */

+static void GLAPIENTRY

+exec_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexParameterIuivEXT(ctx->Exec, (target, pname, params));

+}

+

+

+/* GL_ARB_instanced_arrays */

+static void

+save_VertexAttribDivisor(GLuint index, GLuint divisor)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   Node *n;

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   n = alloc_instruction(ctx, OPCODE_VERTEX_ATTRIB_DIVISOR, 2);

+   if (n) {

+      n[1].ui = index;

+      n[2].ui = divisor;

+   }

+   if (ctx->ExecuteFlag) {

+      CALL_VertexAttribDivisorARB(ctx->Exec, (index, divisor));

+   }

+}

+

+

+/* GL_NV_texture_barrier */

+static void

+save_TextureBarrierNV(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

+   alloc_instruction(ctx, OPCODE_TEXTURE_BARRIER_NV, 0);

+   if (ctx->ExecuteFlag) {

+      CALL_TextureBarrierNV(ctx->Exec, ());

+   }

+}

+

+

+/**

+ * Save an error-generating command into display list.

+ *

+ * KW: Will appear in the list before the vertex buffer containing the

+ * command that provoked the error.  I don't see this as a problem.

+ */

+static void

+save_error(struct gl_context *ctx, GLenum error, const char *s)

+{

+   Node *n;

+   n = alloc_instruction(ctx, OPCODE_ERROR, 2);

+   if (n) {

+      n[1].e = error;

+      n[2].data = (void *) s;

+   }

+}

+

+

+/**

+ * Compile an error into current display list.

+ */

+void

+_mesa_compile_error(struct gl_context *ctx, GLenum error, const char *s)

+{

+   if (ctx->CompileFlag)

+      save_error(ctx, error, s);

+   if (ctx->ExecuteFlag)

+      _mesa_error(ctx, error, "%s", s);

+}

+

+

+/**

+ * Test if ID names a display list.

+ */

+static GLboolean

+islist(struct gl_context *ctx, GLuint list)

+{

+   if (list > 0 && lookup_list(ctx, list)) {

+      return GL_TRUE;

+   }

+   else {

+      return GL_FALSE;

+   }

+}

+

+

+

+/**********************************************************************/

+/*                     Display list execution                         */

+/**********************************************************************/

+

+

+/*

+ * Execute a display list.  Note that the ListBase offset must have already

+ * been added before calling this function.  I.e. the list argument is

+ * the absolute list number, not relative to ListBase.

+ * \param list - display list number

+ */

+static void

+execute_list(struct gl_context *ctx, GLuint list)

+{

+   struct gl_display_list *dlist;

+   Node *n;

+   GLboolean done;

+

+   if (list == 0 || !islist(ctx, list))

+      return;

+

+   if (ctx->ListState.CallDepth == MAX_LIST_NESTING) {

+      /* raise an error? */

+      return;

+   }

+

+   dlist = lookup_list(ctx, list);

+   if (!dlist)

+      return;

+

+   ctx->ListState.CallDepth++;

+

+   if (ctx->Driver.BeginCallList)

+      ctx->Driver.BeginCallList(ctx, dlist);

+

+   n = dlist->Head;

+

+   done = GL_FALSE;

+   while (!done) {

+      const OpCode opcode = n[0].opcode;

+

+      if (is_ext_opcode(opcode)) {

+         n += ext_opcode_execute(ctx, n);

+      }

+      else {

+         switch (opcode) {

+         case OPCODE_ERROR:

+            _mesa_error(ctx, n[1].e, "%s", (const char *) n[2].data);

+            break;

+         case OPCODE_ACCUM:

+            CALL_Accum(ctx->Exec, (n[1].e, n[2].f));

+            break;

+         case OPCODE_ALPHA_FUNC:

+            CALL_AlphaFunc(ctx->Exec, (n[1].e, n[2].f));

+            break;

+         case OPCODE_BIND_TEXTURE:

+            CALL_BindTexture(ctx->Exec, (n[1].e, n[2].ui));

+            break;

+         case OPCODE_BITMAP:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_Bitmap(ctx->Exec, ((GLsizei) n[1].i, (GLsizei) n[2].i,

+                                       n[3].f, n[4].f, n[5].f, n[6].f,

+                                       (const GLubyte *) n[7].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_BLEND_COLOR:

+            CALL_BlendColor(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));

+            break;

+         case OPCODE_BLEND_EQUATION:

+            CALL_BlendEquation(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_BLEND_EQUATION_SEPARATE:

+            CALL_BlendEquationSeparateEXT(ctx->Exec, (n[1].e, n[2].e));

+            break;

+         case OPCODE_BLEND_FUNC_SEPARATE:

+            CALL_BlendFuncSeparateEXT(ctx->Exec,

+                                      (n[1].e, n[2].e, n[3].e, n[4].e));

+            break;

+

+         case OPCODE_BLEND_FUNC_I:

+            /* GL_ARB_draw_buffers_blend */

+            CALL_BlendFunciARB(ctx->Exec, (n[1].ui, n[2].e, n[3].e));

+            break;

+         case OPCODE_BLEND_FUNC_SEPARATE_I:

+            /* GL_ARB_draw_buffers_blend */

+            CALL_BlendFuncSeparateiARB(ctx->Exec, (n[1].ui, n[2].e, n[3].e,

+                                                   n[4].e, n[5].e));

+            break;

+         case OPCODE_BLEND_EQUATION_I:

+            /* GL_ARB_draw_buffers_blend */

+            CALL_BlendEquationiARB(ctx->Exec, (n[1].ui, n[2].e));

+            break;

+         case OPCODE_BLEND_EQUATION_SEPARATE_I:

+            /* GL_ARB_draw_buffers_blend */

+            CALL_BlendEquationSeparateiARB(ctx->Exec,

+                                           (n[1].ui, n[2].e, n[3].e));

+            break;

+

+         case OPCODE_CALL_LIST:

+            /* Generated by glCallList(), don't add ListBase */

+            if (ctx->ListState.CallDepth < MAX_LIST_NESTING) {

+               execute_list(ctx, n[1].ui);

+            }

+            break;

+         case OPCODE_CALL_LIST_OFFSET:

+            /* Generated by glCallLists() so we must add ListBase */

+            if (n[2].b) {

+               /* user specified a bad data type at compile time */

+               _mesa_error(ctx, GL_INVALID_ENUM, "glCallLists(type)");

+            }

+            else if (ctx->ListState.CallDepth < MAX_LIST_NESTING) {

+               GLuint list = (GLuint) (ctx->List.ListBase + n[1].i);

+               execute_list(ctx, list);

+            }

+            break;

+         case OPCODE_CLEAR:

+            CALL_Clear(ctx->Exec, (n[1].bf));

+            break;

+         case OPCODE_CLEAR_BUFFER_IV:

+            {

+               GLint value[4];

+               value[0] = n[3].i;

+               value[1] = n[4].i;

+               value[2] = n[5].i;

+               value[3] = n[6].i;

+               /*CALL_ClearBufferiv(ctx->Exec, (n[1].e, n[2].i, value));*/

+            }

+            break;

+         case OPCODE_CLEAR_BUFFER_UIV:

+            {

+               GLuint value[4];

+               value[0] = n[3].ui;

+               value[1] = n[4].ui;

+               value[2] = n[5].ui;

+               value[3] = n[6].ui;

+               /*CALL_ClearBufferiv(ctx->Exec, (n[1].e, n[2].i, value));*/

+            }

+            break;

+         case OPCODE_CLEAR_BUFFER_FV:

+            {

+               GLfloat value[4];

+               value[0] = n[3].f;

+               value[1] = n[4].f;

+               value[2] = n[5].f;

+               value[3] = n[6].f;

+               /*CALL_ClearBufferfv(ctx->Exec, (n[1].e, n[2].i, value));*/

+            }

+            break;

+         case OPCODE_CLEAR_BUFFER_FI:

+            /*CALL_ClearBufferfi(ctx->Exec, (n[1].e, n[2].i, n[3].f, n[4].i));*/

+            break;

+         case OPCODE_CLEAR_COLOR:

+            CALL_ClearColor(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));

+            break;

+         case OPCODE_CLEAR_ACCUM:

+            CALL_ClearAccum(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));

+            break;

+         case OPCODE_CLEAR_DEPTH:

+            CALL_ClearDepth(ctx->Exec, ((GLclampd) n[1].f));

+            break;

+         case OPCODE_CLEAR_INDEX:

+            CALL_ClearIndex(ctx->Exec, ((GLfloat) n[1].ui));

+            break;

+         case OPCODE_CLEAR_STENCIL:

+            CALL_ClearStencil(ctx->Exec, (n[1].i));

+            break;

+         case OPCODE_CLIP_PLANE:

+            {

+               GLdouble eq[4];

+               eq[0] = n[2].f;

+               eq[1] = n[3].f;

+               eq[2] = n[4].f;

+               eq[3] = n[5].f;

+               CALL_ClipPlane(ctx->Exec, (n[1].e, eq));

+            }

+            break;

+         case OPCODE_COLOR_MASK:

+            CALL_ColorMask(ctx->Exec, (n[1].b, n[2].b, n[3].b, n[4].b));

+            break;

+         case OPCODE_COLOR_MASK_INDEXED:

+            CALL_ColorMaskIndexedEXT(ctx->Exec, (n[1].ui, n[2].b, n[3].b,

+                                                 n[4].b, n[5].b));

+            break;

+         case OPCODE_COLOR_MATERIAL:

+            CALL_ColorMaterial(ctx->Exec, (n[1].e, n[2].e));

+            break;

+         case OPCODE_COLOR_TABLE:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_ColorTable(ctx->Exec, (n[1].e, n[2].e, n[3].i, n[4].e,

+                                           n[5].e, n[6].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_COLOR_TABLE_PARAMETER_FV:

+            {

+               GLfloat params[4];

+               params[0] = n[3].f;

+               params[1] = n[4].f;

+               params[2] = n[5].f;

+               params[3] = n[6].f;

+               CALL_ColorTableParameterfv(ctx->Exec,

+                                          (n[1].e, n[2].e, params));

+            }

+            break;

+         case OPCODE_COLOR_TABLE_PARAMETER_IV:

+            {

+               GLint params[4];

+               params[0] = n[3].i;

+               params[1] = n[4].i;

+               params[2] = n[5].i;

+               params[3] = n[6].i;

+               CALL_ColorTableParameteriv(ctx->Exec,

+                                          (n[1].e, n[2].e, params));

+            }

+            break;

+         case OPCODE_COLOR_SUB_TABLE:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_ColorSubTable(ctx->Exec, (n[1].e, n[2].i, n[3].i,

+                                              n[4].e, n[5].e, n[6].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_CONVOLUTION_FILTER_1D:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_ConvolutionFilter1D(ctx->Exec, (n[1].e, n[2].i, n[3].i,

+                                                    n[4].e, n[5].e,

+                                                    n[6].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_CONVOLUTION_FILTER_2D:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_ConvolutionFilter2D(ctx->Exec, (n[1].e, n[2].i, n[3].i,

+                                                    n[4].i, n[5].e, n[6].e,

+                                                    n[7].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_CONVOLUTION_PARAMETER_I:

+            CALL_ConvolutionParameteri(ctx->Exec, (n[1].e, n[2].e, n[3].i));

+            break;

+         case OPCODE_CONVOLUTION_PARAMETER_IV:

+            {

+               GLint params[4];

+               params[0] = n[3].i;

+               params[1] = n[4].i;

+               params[2] = n[5].i;

+               params[3] = n[6].i;

+               CALL_ConvolutionParameteriv(ctx->Exec,

+                                           (n[1].e, n[2].e, params));

+            }

+            break;

+         case OPCODE_CONVOLUTION_PARAMETER_F:

+            CALL_ConvolutionParameterf(ctx->Exec, (n[1].e, n[2].e, n[3].f));

+            break;

+         case OPCODE_CONVOLUTION_PARAMETER_FV:

+            {

+               GLfloat params[4];

+               params[0] = n[3].f;

+               params[1] = n[4].f;

+               params[2] = n[5].f;

+               params[3] = n[6].f;

+               CALL_ConvolutionParameterfv(ctx->Exec,

+                                           (n[1].e, n[2].e, params));

+            }

+            break;

+         case OPCODE_COPY_COLOR_SUB_TABLE:

+            CALL_CopyColorSubTable(ctx->Exec, (n[1].e, n[2].i,

+                                               n[3].i, n[4].i, n[5].i));

+            break;

+         case OPCODE_COPY_COLOR_TABLE:

+            CALL_CopyColorSubTable(ctx->Exec, (n[1].e, n[2].i,

+                                               n[3].i, n[4].i, n[5].i));

+            break;

+         case OPCODE_COPY_PIXELS:

+            CALL_CopyPixels(ctx->Exec, (n[1].i, n[2].i,

+                                        (GLsizei) n[3].i, (GLsizei) n[4].i,

+                                        n[5].e));

+            break;

+         case OPCODE_COPY_TEX_IMAGE1D:

+            CALL_CopyTexImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].i,

+                                            n[5].i, n[6].i, n[7].i));

+            break;

+         case OPCODE_COPY_TEX_IMAGE2D:

+            CALL_CopyTexImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].i,

+                                            n[5].i, n[6].i, n[7].i, n[8].i));

+            break;

+         case OPCODE_COPY_TEX_SUB_IMAGE1D:

+            CALL_CopyTexSubImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].i,

+                                               n[4].i, n[5].i, n[6].i));

+            break;

+         case OPCODE_COPY_TEX_SUB_IMAGE2D:

+            CALL_CopyTexSubImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].i,

+                                               n[4].i, n[5].i, n[6].i, n[7].i,

+                                               n[8].i));

+            break;

+         case OPCODE_COPY_TEX_SUB_IMAGE3D:

+            CALL_CopyTexSubImage3D(ctx->Exec, (n[1].e, n[2].i, n[3].i,

+                                               n[4].i, n[5].i, n[6].i, n[7].i,

+                                               n[8].i, n[9].i));

+            break;

+         case OPCODE_CULL_FACE:

+            CALL_CullFace(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_DEPTH_FUNC:

+            CALL_DepthFunc(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_DEPTH_MASK:

+            CALL_DepthMask(ctx->Exec, (n[1].b));

+            break;

+         case OPCODE_DEPTH_RANGE:

+            CALL_DepthRange(ctx->Exec,

+                            ((GLclampd) n[1].f, (GLclampd) n[2].f));

+            break;

+         case OPCODE_DISABLE:

+            CALL_Disable(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_DISABLE_INDEXED:

+            CALL_DisableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e));

+            break;

+         case OPCODE_DRAW_BUFFER:

+            CALL_DrawBuffer(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_DRAW_PIXELS:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_DrawPixels(ctx->Exec, (n[1].i, n[2].i, n[3].e, n[4].e,

+                                           n[5].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_ENABLE:

+            CALL_Enable(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_ENABLE_INDEXED:

+            CALL_EnableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e));

+            break;

+         case OPCODE_EVALMESH1:

+            CALL_EvalMesh1(ctx->Exec, (n[1].e, n[2].i, n[3].i));

+            break;

+         case OPCODE_EVALMESH2:

+            CALL_EvalMesh2(ctx->Exec,

+                           (n[1].e, n[2].i, n[3].i, n[4].i, n[5].i));

+            break;

+         case OPCODE_FOG:

+            {

+               GLfloat p[4];

+               p[0] = n[2].f;

+               p[1] = n[3].f;

+               p[2] = n[4].f;

+               p[3] = n[5].f;

+               CALL_Fogfv(ctx->Exec, (n[1].e, p));

+            }

+            break;

+         case OPCODE_FRONT_FACE:

+            CALL_FrontFace(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_FRUSTUM:

+            CALL_Frustum(ctx->Exec,

+                         (n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f));

+            break;

+         case OPCODE_HINT:

+            CALL_Hint(ctx->Exec, (n[1].e, n[2].e));

+            break;

+         case OPCODE_HISTOGRAM:

+            CALL_Histogram(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].b));

+            break;

+         case OPCODE_INDEX_MASK:

+            CALL_IndexMask(ctx->Exec, (n[1].ui));

+            break;

+         case OPCODE_INIT_NAMES:

+            CALL_InitNames(ctx->Exec, ());

+            break;

+         case OPCODE_LIGHT:

+            {

+               GLfloat p[4];

+               p[0] = n[3].f;

+               p[1] = n[4].f;

+               p[2] = n[5].f;

+               p[3] = n[6].f;

+               CALL_Lightfv(ctx->Exec, (n[1].e, n[2].e, p));

+            }

+            break;

+         case OPCODE_LIGHT_MODEL:

+            {

+               GLfloat p[4];

+               p[0] = n[2].f;

+               p[1] = n[3].f;

+               p[2] = n[4].f;

+               p[3] = n[5].f;

+               CALL_LightModelfv(ctx->Exec, (n[1].e, p));

+            }

+            break;

+         case OPCODE_LINE_STIPPLE:

+            CALL_LineStipple(ctx->Exec, (n[1].i, n[2].us));

+            break;

+         case OPCODE_LINE_WIDTH:

+            CALL_LineWidth(ctx->Exec, (n[1].f));

+            break;

+         case OPCODE_LIST_BASE:

+            CALL_ListBase(ctx->Exec, (n[1].ui));

+            break;

+         case OPCODE_LOAD_IDENTITY:

+            CALL_LoadIdentity(ctx->Exec, ());

+            break;

+         case OPCODE_LOAD_MATRIX:

+            if (sizeof(Node) == sizeof(GLfloat)) {

+               CALL_LoadMatrixf(ctx->Exec, (&n[1].f));

+            }

+            else {

+               GLfloat m[16];

+               GLuint i;

+               for (i = 0; i < 16; i++) {

+                  m[i] = n[1 + i].f;

+               }

+               CALL_LoadMatrixf(ctx->Exec, (m));

+            }

+            break;

+         case OPCODE_LOAD_NAME:

+            CALL_LoadName(ctx->Exec, (n[1].ui));

+            break;

+         case OPCODE_LOGIC_OP:

+            CALL_LogicOp(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_MAP1:

+            {

+               GLenum target = n[1].e;

+               GLint ustride = _mesa_evaluator_components(target);

+               GLint uorder = n[5].i;

+               GLfloat u1 = n[2].f;

+               GLfloat u2 = n[3].f;

+               CALL_Map1f(ctx->Exec, (target, u1, u2, ustride, uorder,

+                                      (GLfloat *) n[6].data));

+            }

+            break;

+         case OPCODE_MAP2:

+            {

+               GLenum target = n[1].e;

+               GLfloat u1 = n[2].f;

+               GLfloat u2 = n[3].f;

+               GLfloat v1 = n[4].f;

+               GLfloat v2 = n[5].f;

+               GLint ustride = n[6].i;

+               GLint vstride = n[7].i;

+               GLint uorder = n[8].i;

+               GLint vorder = n[9].i;

+               CALL_Map2f(ctx->Exec, (target, u1, u2, ustride, uorder,

+                                      v1, v2, vstride, vorder,

+                                      (GLfloat *) n[10].data));

+            }

+            break;

+         case OPCODE_MAPGRID1:

+            CALL_MapGrid1f(ctx->Exec, (n[1].i, n[2].f, n[3].f));

+            break;

+         case OPCODE_MAPGRID2:

+            CALL_MapGrid2f(ctx->Exec,

+                           (n[1].i, n[2].f, n[3].f, n[4].i, n[5].f, n[6].f));

+            break;

+         case OPCODE_MATRIX_MODE:

+            CALL_MatrixMode(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_MIN_MAX:

+            CALL_Minmax(ctx->Exec, (n[1].e, n[2].e, n[3].b));

+            break;

+         case OPCODE_MULT_MATRIX:

+            if (sizeof(Node) == sizeof(GLfloat)) {

+               CALL_MultMatrixf(ctx->Exec, (&n[1].f));

+            }

+            else {

+               GLfloat m[16];

+               GLuint i;

+               for (i = 0; i < 16; i++) {

+                  m[i] = n[1 + i].f;

+               }

+               CALL_MultMatrixf(ctx->Exec, (m));

+            }

+            break;

+         case OPCODE_ORTHO:

+            CALL_Ortho(ctx->Exec,

+                       (n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f));

+            break;

+         case OPCODE_PASSTHROUGH:

+            CALL_PassThrough(ctx->Exec, (n[1].f));

+            break;

+         case OPCODE_PIXEL_MAP:

+            CALL_PixelMapfv(ctx->Exec,

+                            (n[1].e, n[2].i, (GLfloat *) n[3].data));

+            break;

+         case OPCODE_PIXEL_TRANSFER:

+            CALL_PixelTransferf(ctx->Exec, (n[1].e, n[2].f));

+            break;

+         case OPCODE_PIXEL_ZOOM:

+            CALL_PixelZoom(ctx->Exec, (n[1].f, n[2].f));

+            break;

+         case OPCODE_POINT_SIZE:

+            CALL_PointSize(ctx->Exec, (n[1].f));

+            break;

+         case OPCODE_POINT_PARAMETERS:

+            {

+               GLfloat params[3];

+               params[0] = n[2].f;

+               params[1] = n[3].f;

+               params[2] = n[4].f;

+               CALL_PointParameterfvEXT(ctx->Exec, (n[1].e, params));

+            }

+            break;

+         case OPCODE_POLYGON_MODE:

+            CALL_PolygonMode(ctx->Exec, (n[1].e, n[2].e));

+            break;

+         case OPCODE_POLYGON_STIPPLE:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_PolygonStipple(ctx->Exec, ((GLubyte *) n[1].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_POLYGON_OFFSET:

+            CALL_PolygonOffset(ctx->Exec, (n[1].f, n[2].f));

+            break;

+         case OPCODE_POP_ATTRIB:

+            CALL_PopAttrib(ctx->Exec, ());

+            break;

+         case OPCODE_POP_MATRIX:

+            CALL_PopMatrix(ctx->Exec, ());

+            break;

+         case OPCODE_POP_NAME:

+            CALL_PopName(ctx->Exec, ());

+            break;

+         case OPCODE_PRIORITIZE_TEXTURE:

+            CALL_PrioritizeTextures(ctx->Exec, (1, &n[1].ui, &n[2].f));

+            break;

+         case OPCODE_PUSH_ATTRIB:

+            CALL_PushAttrib(ctx->Exec, (n[1].bf));

+            break;

+         case OPCODE_PUSH_MATRIX:

+            CALL_PushMatrix(ctx->Exec, ());

+            break;

+         case OPCODE_PUSH_NAME:

+            CALL_PushName(ctx->Exec, (n[1].ui));

+            break;

+         case OPCODE_RASTER_POS:

+            CALL_RasterPos4f(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));

+            break;

+         case OPCODE_READ_BUFFER:

+            CALL_ReadBuffer(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_RESET_HISTOGRAM:

+            CALL_ResetHistogram(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_RESET_MIN_MAX:

+            CALL_ResetMinmax(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_ROTATE:

+            CALL_Rotatef(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));

+            break;

+         case OPCODE_SCALE:

+            CALL_Scalef(ctx->Exec, (n[1].f, n[2].f, n[3].f));

+            break;

+         case OPCODE_SCISSOR:

+            CALL_Scissor(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));

+            break;

+         case OPCODE_SHADE_MODEL:

+            CALL_ShadeModel(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_PROVOKING_VERTEX:

+            CALL_ProvokingVertexEXT(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_BEGIN_TRANSFORM_FEEDBACK:

+            CALL_BeginTransformFeedbackEXT(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_END_TRANSFORM_FEEDBACK:

+            CALL_EndTransformFeedbackEXT(ctx->Exec, ());

+            break;

+         case OPCODE_STENCIL_FUNC:

+            CALL_StencilFunc(ctx->Exec, (n[1].e, n[2].i, n[3].ui));

+            break;

+         case OPCODE_STENCIL_MASK:

+            CALL_StencilMask(ctx->Exec, (n[1].ui));

+            break;

+         case OPCODE_STENCIL_OP:

+            CALL_StencilOp(ctx->Exec, (n[1].e, n[2].e, n[3].e));

+            break;

+         case OPCODE_STENCIL_FUNC_SEPARATE:

+            CALL_StencilFuncSeparate(ctx->Exec,

+                                     (n[1].e, n[2].e, n[3].i, n[4].ui));

+            break;

+         case OPCODE_STENCIL_MASK_SEPARATE:

+            CALL_StencilMaskSeparate(ctx->Exec, (n[1].e, n[2].ui));

+            break;

+         case OPCODE_STENCIL_OP_SEPARATE:

+            CALL_StencilOpSeparate(ctx->Exec,

+                                   (n[1].e, n[2].e, n[3].e, n[4].e));

+            break;

+         case OPCODE_TEXENV:

+            {

+               GLfloat params[4];

+               params[0] = n[3].f;

+               params[1] = n[4].f;

+               params[2] = n[5].f;

+               params[3] = n[6].f;

+               CALL_TexEnvfv(ctx->Exec, (n[1].e, n[2].e, params));

+            }

+            break;

+         case OPCODE_TEXGEN:

+            {

+               GLfloat params[4];

+               params[0] = n[3].f;

+               params[1] = n[4].f;

+               params[2] = n[5].f;

+               params[3] = n[6].f;

+               CALL_TexGenfv(ctx->Exec, (n[1].e, n[2].e, params));

+            }

+            break;

+         case OPCODE_TEXPARAMETER:

+            {

+               GLfloat params[4];

+               params[0] = n[3].f;

+               params[1] = n[4].f;

+               params[2] = n[5].f;

+               params[3] = n[6].f;

+               CALL_TexParameterfv(ctx->Exec, (n[1].e, n[2].e, params));

+            }

+            break;

+         case OPCODE_TEX_IMAGE1D:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_TexImage1D(ctx->Exec, (n[1].e,      /* target */

+                                           n[2].i,      /* level */

+                                           n[3].i,      /* components */

+                                           n[4].i,      /* width */

+                                           n[5].e,      /* border */

+                                           n[6].e,      /* format */

+                                           n[7].e,      /* type */

+                                           n[8].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_TEX_IMAGE2D:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_TexImage2D(ctx->Exec, (n[1].e,      /* target */

+                                           n[2].i,      /* level */

+                                           n[3].i,      /* components */

+                                           n[4].i,      /* width */

+                                           n[5].i,      /* height */

+                                           n[6].e,      /* border */

+                                           n[7].e,      /* format */

+                                           n[8].e,      /* type */

+                                           n[9].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_TEX_IMAGE3D:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_TexImage3D(ctx->Exec, (n[1].e,      /* target */

+                                           n[2].i,      /* level */

+                                           n[3].i,      /* components */

+                                           n[4].i,      /* width */

+                                           n[5].i,      /* height */

+                                           n[6].i,      /* depth  */

+                                           n[7].e,      /* border */

+                                           n[8].e,      /* format */

+                                           n[9].e,      /* type */

+                                           n[10].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_TEX_SUB_IMAGE1D:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_TexSubImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].i,

+                                              n[4].i, n[5].e,

+                                              n[6].e, n[7].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_TEX_SUB_IMAGE2D:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_TexSubImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].i,

+                                              n[4].i, n[5].e,

+                                              n[6].i, n[7].e, n[8].e,

+                                              n[9].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_TEX_SUB_IMAGE3D:

+            {

+               const struct gl_pixelstore_attrib save = ctx->Unpack;

+               ctx->Unpack = ctx->DefaultPacking;

+               CALL_TexSubImage3D(ctx->Exec, (n[1].e, n[2].i, n[3].i,

+                                              n[4].i, n[5].i, n[6].i, n[7].i,

+                                              n[8].i, n[9].e, n[10].e,

+                                              n[11].data));

+               ctx->Unpack = save;      /* restore */

+            }

+            break;

+         case OPCODE_TRANSLATE:

+            CALL_Translatef(ctx->Exec, (n[1].f, n[2].f, n[3].f));

+            break;

+         case OPCODE_VIEWPORT:

+            CALL_Viewport(ctx->Exec, (n[1].i, n[2].i,

+                                      (GLsizei) n[3].i, (GLsizei) n[4].i));

+            break;

+         case OPCODE_WINDOW_POS:

+            CALL_WindowPos4fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));

+            break;

+         case OPCODE_ACTIVE_TEXTURE:   /* GL_ARB_multitexture */

+            CALL_ActiveTextureARB(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_COMPRESSED_TEX_IMAGE_1D:  /* GL_ARB_texture_compression */

+            CALL_CompressedTexImage1DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,

+                                                     n[4].i, n[5].i, n[6].i,

+                                                     n[7].data));

+            break;

+         case OPCODE_COMPRESSED_TEX_IMAGE_2D:  /* GL_ARB_texture_compression */

+            CALL_CompressedTexImage2DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,

+                                                     n[4].i, n[5].i, n[6].i,

+                                                     n[7].i, n[8].data));

+            break;

+         case OPCODE_COMPRESSED_TEX_IMAGE_3D:  /* GL_ARB_texture_compression */

+            CALL_CompressedTexImage3DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,

+                                                     n[4].i, n[5].i, n[6].i,

+                                                     n[7].i, n[8].i,

+                                                     n[9].data));

+            break;

+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D:      /* GL_ARB_texture_compress */

+            CALL_CompressedTexSubImage1DARB(ctx->Exec,

+                                            (n[1].e, n[2].i, n[3].i, n[4].i,

+                                             n[5].e, n[6].i, n[7].data));

+            break;

+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D:      /* GL_ARB_texture_compress */

+            CALL_CompressedTexSubImage2DARB(ctx->Exec,

+                                            (n[1].e, n[2].i, n[3].i, n[4].i,

+                                             n[5].i, n[6].i, n[7].e, n[8].i,

+                                             n[9].data));

+            break;

+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D:      /* GL_ARB_texture_compress */

+            CALL_CompressedTexSubImage3DARB(ctx->Exec,

+                                            (n[1].e, n[2].i, n[3].i, n[4].i,

+                                             n[5].i, n[6].i, n[7].i, n[8].i,

+                                             n[9].e, n[10].i, n[11].data));

+            break;

+         case OPCODE_SAMPLE_COVERAGE:  /* GL_ARB_multisample */

+            CALL_SampleCoverageARB(ctx->Exec, (n[1].f, n[2].b));

+            break;

+         case OPCODE_WINDOW_POS_ARB:   /* GL_ARB_window_pos */

+            CALL_WindowPos3fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f));

+            break;

+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+         case OPCODE_BIND_PROGRAM_NV:  /* GL_NV_vertex_program */

+            CALL_BindProgramNV(ctx->Exec, (n[1].e, n[2].ui));

+            break;

+#endif

+#if FEATURE_NV_vertex_program

+         case OPCODE_EXECUTE_PROGRAM_NV:

+            {

+               GLfloat v[4];

+               v[0] = n[3].f;

+               v[1] = n[4].f;

+               v[2] = n[5].f;

+               v[3] = n[6].f;

+               CALL_ExecuteProgramNV(ctx->Exec, (n[1].e, n[2].ui, v));

+            }

+            break;

+         case OPCODE_REQUEST_RESIDENT_PROGRAMS_NV:

+            CALL_RequestResidentProgramsNV(ctx->Exec, (n[1].ui,

+                                                       (GLuint *) n[2].data));

+            break;

+         case OPCODE_LOAD_PROGRAM_NV:

+            CALL_LoadProgramNV(ctx->Exec, (n[1].e, n[2].ui, n[3].i,

+                                           (const GLubyte *) n[4].data));

+            break;

+         case OPCODE_TRACK_MATRIX_NV:

+            CALL_TrackMatrixNV(ctx->Exec, (n[1].e, n[2].ui, n[3].e, n[4].e));

+            break;

+#endif

+

+#if FEATURE_NV_fragment_program

+         case OPCODE_PROGRAM_LOCAL_PARAMETER_ARB:

+            CALL_ProgramLocalParameter4fARB(ctx->Exec,

+                                            (n[1].e, n[2].ui, n[3].f, n[4].f,

+                                             n[5].f, n[6].f));

+            break;

+         case OPCODE_PROGRAM_NAMED_PARAMETER_NV:

+            CALL_ProgramNamedParameter4fNV(ctx->Exec, (n[1].ui, n[2].i,

+                                                       (const GLubyte *) n[3].

+                                                       data, n[4].f, n[5].f,

+                                                       n[6].f, n[7].f));

+            break;

+#endif

+

+         case OPCODE_ACTIVE_STENCIL_FACE_EXT:

+            CALL_ActiveStencilFaceEXT(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_DEPTH_BOUNDS_EXT:

+            CALL_DepthBoundsEXT(ctx->Exec, (n[1].f, n[2].f));

+            break;

+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+         case OPCODE_PROGRAM_STRING_ARB:

+            CALL_ProgramStringARB(ctx->Exec,

+                                  (n[1].e, n[2].e, n[3].i, n[4].data));

+            break;

+#endif

+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program || FEATURE_NV_vertex_program

+         case OPCODE_PROGRAM_ENV_PARAMETER_ARB:

+            CALL_ProgramEnvParameter4fARB(ctx->Exec, (n[1].e, n[2].ui, n[3].f,

+                                                      n[4].f, n[5].f,

+                                                      n[6].f));

+            break;

+#endif

+#if FEATURE_queryobj

+         case OPCODE_BEGIN_QUERY_ARB:

+            CALL_BeginQueryARB(ctx->Exec, (n[1].e, n[2].ui));

+            break;

+         case OPCODE_END_QUERY_ARB:

+            CALL_EndQueryARB(ctx->Exec, (n[1].e));

+            break;

+#endif

+         case OPCODE_DRAW_BUFFERS_ARB:

+            {

+               GLenum buffers[MAX_DRAW_BUFFERS];

+               GLint i, count = MIN2(n[1].i, MAX_DRAW_BUFFERS);

+               for (i = 0; i < count; i++)

+                  buffers[i] = n[2 + i].e;

+               CALL_DrawBuffersARB(ctx->Exec, (n[1].i, buffers));

+            }

+            break;

+#if FEATURE_EXT_framebuffer_blit

+	 case OPCODE_BLIT_FRAMEBUFFER:

+	    CALL_BlitFramebufferEXT(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i,

+                                                n[5].i, n[6].i, n[7].i, n[8].i,

+                                                n[9].i, n[10].e));

+	    break;

+#endif

+

+	 case OPCODE_USE_PROGRAM:

+	    CALL_UseProgramObjectARB(ctx->Exec, (n[1].ui));

+	    break;

+	 case OPCODE_USE_SHADER_PROGRAM_EXT:

+	    CALL_UseShaderProgramEXT(ctx->Exec, (n[1].ui, n[2].ui));

+	    break;

+	 case OPCODE_ACTIVE_PROGRAM_EXT:

+	    CALL_ActiveProgramEXT(ctx->Exec, (n[1].ui));

+	    break;

+	 case OPCODE_UNIFORM_1F:

+	    CALL_Uniform1fARB(ctx->Exec, (n[1].i, n[2].f));

+	    break;

+	 case OPCODE_UNIFORM_2F:

+	    CALL_Uniform2fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f));

+	    break;

+	 case OPCODE_UNIFORM_3F:

+	    CALL_Uniform3fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f));

+	    break;

+	 case OPCODE_UNIFORM_4F:

+	    CALL_Uniform4fARB(ctx->Exec,

+                              (n[1].i, n[2].f, n[3].f, n[4].f, n[5].f));

+	    break;

+	 case OPCODE_UNIFORM_1FV:

+	    CALL_Uniform1fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));

+	    break;

+	 case OPCODE_UNIFORM_2FV:

+	    CALL_Uniform2fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));

+	    break;

+	 case OPCODE_UNIFORM_3FV:

+	    CALL_Uniform3fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));

+	    break;

+	 case OPCODE_UNIFORM_4FV:

+	    CALL_Uniform4fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));

+	    break;

+	 case OPCODE_UNIFORM_1I:

+	    CALL_Uniform1iARB(ctx->Exec, (n[1].i, n[2].i));

+	    break;

+	 case OPCODE_UNIFORM_2I:

+	    CALL_Uniform2iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i));

+	    break;

+	 case OPCODE_UNIFORM_3I:

+	    CALL_Uniform3iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));

+	    break;

+	 case OPCODE_UNIFORM_4I:

+	    CALL_Uniform4iARB(ctx->Exec,

+                              (n[1].i, n[2].i, n[3].i, n[4].i, n[5].i));

+	    break;

+	 case OPCODE_UNIFORM_1IV:

+	    CALL_Uniform1ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));

+	    break;

+	 case OPCODE_UNIFORM_2IV:

+	    CALL_Uniform2ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));

+	    break;

+	 case OPCODE_UNIFORM_3IV:

+	    CALL_Uniform3ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));

+	    break;

+	 case OPCODE_UNIFORM_4IV:

+	    CALL_Uniform4ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));

+	    break;

+	 case OPCODE_UNIFORM_1UI:

+	    /*CALL_Uniform1uiARB(ctx->Exec, (n[1].i, n[2].i));*/

+	    break;

+	 case OPCODE_UNIFORM_2UI:

+	    /*CALL_Uniform2uiARB(ctx->Exec, (n[1].i, n[2].i, n[3].i));*/

+	    break;

+	 case OPCODE_UNIFORM_3UI:

+	    /*CALL_Uniform3uiARB(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));*/

+	    break;

+	 case OPCODE_UNIFORM_4UI:

+	    /*CALL_Uniform4uiARB(ctx->Exec,

+                              (n[1].i, n[2].i, n[3].i, n[4].i, n[5].i));

+            */

+	    break;

+	 case OPCODE_UNIFORM_1UIV:

+	    /*CALL_Uniform1uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/

+	    break;

+	 case OPCODE_UNIFORM_2UIV:

+	    /*CALL_Uniform2uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/

+	    break;

+	 case OPCODE_UNIFORM_3UIV:

+	    /*CALL_Uniform3uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/

+	    break;

+	 case OPCODE_UNIFORM_4UIV:

+	    /*CALL_Uniform4uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/

+	    break;

+	 case OPCODE_UNIFORM_MATRIX22:

+	    CALL_UniformMatrix2fvARB(ctx->Exec,

+                                     (n[1].i, n[2].i, n[3].b, n[4].data));

+	    break;

+	 case OPCODE_UNIFORM_MATRIX33:

+	    CALL_UniformMatrix3fvARB(ctx->Exec,

+                                     (n[1].i, n[2].i, n[3].b, n[4].data));

+	    break;

+	 case OPCODE_UNIFORM_MATRIX44:

+	    CALL_UniformMatrix4fvARB(ctx->Exec,

+                                     (n[1].i, n[2].i, n[3].b, n[4].data));

+	    break;

+	 case OPCODE_UNIFORM_MATRIX23:

+	    CALL_UniformMatrix2x3fv(ctx->Exec,

+                                    (n[1].i, n[2].i, n[3].b, n[4].data));

+	    break;

+	 case OPCODE_UNIFORM_MATRIX32:

+	    CALL_UniformMatrix3x2fv(ctx->Exec,

+                                    (n[1].i, n[2].i, n[3].b, n[4].data));

+	    break;

+	 case OPCODE_UNIFORM_MATRIX24:

+	    CALL_UniformMatrix2x4fv(ctx->Exec,

+                                    (n[1].i, n[2].i, n[3].b, n[4].data));

+	    break;

+	 case OPCODE_UNIFORM_MATRIX42:

+	    CALL_UniformMatrix4x2fv(ctx->Exec,

+                                    (n[1].i, n[2].i, n[3].b, n[4].data));

+	    break;

+	 case OPCODE_UNIFORM_MATRIX34:

+	    CALL_UniformMatrix3x4fv(ctx->Exec,

+                                    (n[1].i, n[2].i, n[3].b, n[4].data));

+	    break;

+	 case OPCODE_UNIFORM_MATRIX43:

+	    CALL_UniformMatrix4x3fv(ctx->Exec,

+                                    (n[1].i, n[2].i, n[3].b, n[4].data));

+	    break;

+

+         case OPCODE_CLAMP_COLOR:

+            CALL_ClampColorARB(ctx->Exec, (n[1].e, n[2].e));

+            break;

+

+         case OPCODE_TEX_BUMP_PARAMETER_ATI:

+            {

+               GLfloat values[4];

+               GLuint i, pname = n[1].ui;

+

+               for (i = 0; i < 4; i++)

+                  values[i] = n[1 + i].f;

+               CALL_TexBumpParameterfvATI(ctx->Exec, (pname, values));

+            }

+            break;

+#if FEATURE_ATI_fragment_shader

+         case OPCODE_BIND_FRAGMENT_SHADER_ATI:

+            CALL_BindFragmentShaderATI(ctx->Exec, (n[1].i));

+            break;

+         case OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI:

+            {

+               GLfloat values[4];

+               GLuint i, dst = n[1].ui;

+

+               for (i = 0; i < 4; i++)

+                  values[i] = n[1 + i].f;

+               CALL_SetFragmentShaderConstantATI(ctx->Exec, (dst, values));

+            }

+            break;

+#endif

+         case OPCODE_ATTR_1F_NV:

+            CALL_VertexAttrib1fNV(ctx->Exec, (n[1].e, n[2].f));

+            break;

+         case OPCODE_ATTR_2F_NV:

+            /* Really shouldn't have to do this - the Node structure

+             * is convenient, but it would be better to store the data

+             * packed appropriately so that it can be sent directly

+             * on.  With x86_64 becoming common, this will start to

+             * matter more.

+             */

+            if (sizeof(Node) == sizeof(GLfloat))

+               CALL_VertexAttrib2fvNV(ctx->Exec, (n[1].e, &n[2].f));

+            else

+               CALL_VertexAttrib2fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f));

+            break;

+         case OPCODE_ATTR_3F_NV:

+            if (sizeof(Node) == sizeof(GLfloat))

+               CALL_VertexAttrib3fvNV(ctx->Exec, (n[1].e, &n[2].f));

+            else

+               CALL_VertexAttrib3fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f,

+                                                 n[4].f));

+            break;

+         case OPCODE_ATTR_4F_NV:

+            if (sizeof(Node) == sizeof(GLfloat))

+               CALL_VertexAttrib4fvNV(ctx->Exec, (n[1].e, &n[2].f));

+            else

+               CALL_VertexAttrib4fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f,

+                                                 n[4].f, n[5].f));

+            break;

+         case OPCODE_ATTR_1F_ARB:

+            CALL_VertexAttrib1fARB(ctx->Exec, (n[1].e, n[2].f));

+            break;

+         case OPCODE_ATTR_2F_ARB:

+            /* Really shouldn't have to do this - the Node structure

+             * is convenient, but it would be better to store the data

+             * packed appropriately so that it can be sent directly

+             * on.  With x86_64 becoming common, this will start to

+             * matter more.

+             */

+            if (sizeof(Node) == sizeof(GLfloat))

+               CALL_VertexAttrib2fvARB(ctx->Exec, (n[1].e, &n[2].f));

+            else

+               CALL_VertexAttrib2fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f));

+            break;

+         case OPCODE_ATTR_3F_ARB:

+            if (sizeof(Node) == sizeof(GLfloat))

+               CALL_VertexAttrib3fvARB(ctx->Exec, (n[1].e, &n[2].f));

+            else

+               CALL_VertexAttrib3fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f,

+                                                  n[4].f));

+            break;

+         case OPCODE_ATTR_4F_ARB:

+            if (sizeof(Node) == sizeof(GLfloat))

+               CALL_VertexAttrib4fvARB(ctx->Exec, (n[1].e, &n[2].f));

+            else

+               CALL_VertexAttrib4fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f,

+                                                  n[4].f, n[5].f));

+            break;

+         case OPCODE_MATERIAL:

+            if (sizeof(Node) == sizeof(GLfloat))

+               CALL_Materialfv(ctx->Exec, (n[1].e, n[2].e, &n[3].f));

+            else {

+               GLfloat f[4];

+               f[0] = n[3].f;

+               f[1] = n[4].f;

+               f[2] = n[5].f;

+               f[3] = n[6].f;

+               CALL_Materialfv(ctx->Exec, (n[1].e, n[2].e, f));

+            }

+            break;

+         case OPCODE_BEGIN:

+            CALL_Begin(ctx->Exec, (n[1].e));

+            break;

+         case OPCODE_END:

+            CALL_End(ctx->Exec, ());

+            break;

+         case OPCODE_RECTF:

+            CALL_Rectf(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));

+            break;

+         case OPCODE_EVAL_C1:

+            CALL_EvalCoord1f(ctx->Exec, (n[1].f));

+            break;

+         case OPCODE_EVAL_C2:

+            CALL_EvalCoord2f(ctx->Exec, (n[1].f, n[2].f));

+            break;

+         case OPCODE_EVAL_P1:

+            CALL_EvalPoint1(ctx->Exec, (n[1].i));

+            break;

+         case OPCODE_EVAL_P2:

+            CALL_EvalPoint2(ctx->Exec, (n[1].i, n[2].i));

+            break;

+

+         /* GL_EXT_texture_integer */

+         case OPCODE_CLEARCOLOR_I:

+            CALL_ClearColorIiEXT(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));

+            break;

+         case OPCODE_CLEARCOLOR_UI:

+            CALL_ClearColorIuiEXT(ctx->Exec,

+                                  (n[1].ui, n[2].ui, n[3].ui, n[4].ui));

+            break;

+         case OPCODE_TEXPARAMETER_I:

+            {

+               GLint params[4];

+               params[0] = n[3].i;

+               params[1] = n[4].i;

+               params[2] = n[5].i;

+               params[3] = n[6].i;

+               CALL_TexParameterIivEXT(ctx->Exec, (n[1].e, n[2].e, params));

+            }

+            break;

+         case OPCODE_TEXPARAMETER_UI:

+            {

+               GLuint params[4];

+               params[0] = n[3].ui;

+               params[1] = n[4].ui;

+               params[2] = n[5].ui;

+               params[3] = n[6].ui;

+               CALL_TexParameterIuivEXT(ctx->Exec, (n[1].e, n[2].e, params));

+            }

+            break;

+

+         case OPCODE_VERTEX_ATTRIB_DIVISOR:

+            /* GL_ARB_instanced_arrays */

+            CALL_VertexAttribDivisorARB(ctx->Exec, (n[1].ui, n[2].ui));

+            break;

+

+         case OPCODE_TEXTURE_BARRIER_NV:

+            CALL_TextureBarrierNV(ctx->Exec, ());

+            break;

+

+         case OPCODE_CONTINUE:

+            n = (Node *) n[1].next;

+            break;

+         case OPCODE_END_OF_LIST:

+            done = GL_TRUE;

+            break;

+         default:

+            {

+               char msg[1000];

+               _mesa_snprintf(msg, sizeof(msg), "Error in execute_list: opcode=%d",

+                             (int) opcode);

+               _mesa_problem(ctx, "%s", msg);

+            }

+            done = GL_TRUE;

+         }

+

+         /* increment n to point to next compiled command */

+         if (opcode != OPCODE_CONTINUE) {

+            n += InstSize[opcode];

+         }

+      }

+   }

+

+   if (ctx->Driver.EndCallList)

+      ctx->Driver.EndCallList(ctx);

+

+   ctx->ListState.CallDepth--;

+}

+

+

+

+/**********************************************************************/

+/*                           GL functions                             */

+/**********************************************************************/

+

+/**

+ * Test if a display list number is valid.

+ */

+static GLboolean GLAPIENTRY

+_mesa_IsList(GLuint list)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);      /* must be called before assert */

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+   return islist(ctx, list);

+}

+

+

+/**

+ * Delete a sequence of consecutive display lists.

+ */

+static void GLAPIENTRY

+_mesa_DeleteLists(GLuint list, GLsizei range)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint i;

+   FLUSH_VERTICES(ctx, 0);      /* must be called before assert */

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (range < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteLists");

+      return;

+   }

+   for (i = list; i < list + range; i++) {

+      destroy_list(ctx, i);

+   }

+}

+

+

+/**

+ * Return a display list number, n, such that lists n through n+range-1

+ * are free.

+ */

+static GLuint GLAPIENTRY

+_mesa_GenLists(GLsizei range)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint base;

+   FLUSH_VERTICES(ctx, 0);      /* must be called before assert */

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

+

+   if (range < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenLists");

+      return 0;

+   }

+   if (range == 0) {

+      return 0;

+   }

+

+   /*

+    * Make this an atomic operation

+    */

+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+

+   base = _mesa_HashFindFreeKeyBlock(ctx->Shared->DisplayList, range);

+   if (base) {

+      /* reserve the list IDs by with empty/dummy lists */

+      GLint i;

+      for (i = 0; i < range; i++) {

+         _mesa_HashInsert(ctx->Shared->DisplayList, base + i,

+                          make_list(base + i, 1));

+      }

+   }

+

+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+

+   return base;

+}

+

+

+/**

+ * Begin a new display list.

+ */

+static void GLAPIENTRY

+_mesa_NewList(GLuint name, GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   FLUSH_CURRENT(ctx, 0);       /* must be called before assert */

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glNewList %u %s\n", name,

+                  _mesa_lookup_enum_by_nr(mode));

+

+   if (name == 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glNewList");

+      return;

+   }

+

+   if (mode != GL_COMPILE && mode != GL_COMPILE_AND_EXECUTE) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glNewList");

+      return;

+   }

+

+   if (ctx->ListState.CurrentList) {

+      /* already compiling a display list */

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glNewList");

+      return;

+   }

+

+   ctx->CompileFlag = GL_TRUE;

+   ctx->ExecuteFlag = (mode == GL_COMPILE_AND_EXECUTE);

+

+   /* Reset acumulated list state:

+    */

+   invalidate_saved_current_state( ctx );

+

+   /* Allocate new display list */

+   ctx->ListState.CurrentList = make_list(name, BLOCK_SIZE);

+   ctx->ListState.CurrentBlock = ctx->ListState.CurrentList->Head;

+   ctx->ListState.CurrentPos = 0;

+

+   ctx->Driver.NewList(ctx, name, mode);

+

+   ctx->CurrentDispatch = ctx->Save;

+   _glapi_set_dispatch(ctx->CurrentDispatch);

+}

+

+

+/**

+ * End definition of current display list. 

+ */

+static void GLAPIENTRY

+_mesa_EndList(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   SAVE_FLUSH_VERTICES(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glEndList\n");

+

+   /* Check that a list is under construction */

+   if (!ctx->ListState.CurrentList) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glEndList");

+      return;

+   }

+   

+   /* Call before emitting END_OF_LIST, in case the driver wants to

+    * emit opcodes itself.

+    */

+   ctx->Driver.EndList(ctx);

+

+   (void) alloc_instruction(ctx, OPCODE_END_OF_LIST, 0);

+

+   /* Destroy old list, if any */

+   destroy_list(ctx, ctx->ListState.CurrentList->Name);

+

+   /* Install the new list */

+   _mesa_HashInsert(ctx->Shared->DisplayList,

+                    ctx->ListState.CurrentList->Name,

+                    ctx->ListState.CurrentList);

+

+

+   if (MESA_VERBOSE & VERBOSE_DISPLAY_LIST)

+      mesa_print_display_list(ctx->ListState.CurrentList->Name);

+

+   ctx->ListState.CurrentList = NULL;

+   ctx->ExecuteFlag = GL_TRUE;

+   ctx->CompileFlag = GL_FALSE;

+

+   ctx->CurrentDispatch = ctx->Exec;

+   _glapi_set_dispatch(ctx->CurrentDispatch);

+}

+

+

+void GLAPIENTRY

+_mesa_CallList(GLuint list)

+{

+   GLboolean save_compile_flag;

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_CURRENT(ctx, 0);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glCallList %d\n", list);

+

+   if (list == 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glCallList(list==0)");

+      return;

+   }

+

+   if (0)

+      mesa_print_display_list( list );

+

+   /* VERY IMPORTANT:  Save the CompileFlag status, turn it off,

+    * execute the display list, and restore the CompileFlag.

+    */

+   save_compile_flag = ctx->CompileFlag;

+   if (save_compile_flag) {

+      ctx->CompileFlag = GL_FALSE;

+   }

+

+   execute_list(ctx, list);

+   ctx->CompileFlag = save_compile_flag;

+

+   /* also restore API function pointers to point to "save" versions */

+   if (save_compile_flag) {

+      ctx->CurrentDispatch = ctx->Save;

+      _glapi_set_dispatch(ctx->CurrentDispatch);

+   }

+}

+

+

+/**

+ * Execute glCallLists:  call multiple display lists.

+ */

+void GLAPIENTRY

+_mesa_CallLists(GLsizei n, GLenum type, const GLvoid * lists)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+   GLboolean save_compile_flag;

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glCallLists %d\n", n);

+

+   switch (type) {

+   case GL_BYTE:

+   case GL_UNSIGNED_BYTE:

+   case GL_SHORT:

+   case GL_UNSIGNED_SHORT:

+   case GL_INT:

+   case GL_UNSIGNED_INT:

+   case GL_FLOAT:

+   case GL_2_BYTES:

+   case GL_3_BYTES:

+   case GL_4_BYTES:

+      /* OK */

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glCallLists(type)");

+      return;

+   }

+

+   /* Save the CompileFlag status, turn it off, execute display list,

+    * and restore the CompileFlag.

+    */

+   save_compile_flag = ctx->CompileFlag;

+   ctx->CompileFlag = GL_FALSE;

+

+   for (i = 0; i < n; i++) {

+      GLuint list = (GLuint) (ctx->List.ListBase + translate_id(i, type, lists));

+      execute_list(ctx, list);

+   }

+

+   ctx->CompileFlag = save_compile_flag;

+

+   /* also restore API function pointers to point to "save" versions */

+   if (save_compile_flag) {

+      ctx->CurrentDispatch = ctx->Save;

+      _glapi_set_dispatch(ctx->CurrentDispatch);

+   }

+}

+

+

+/**

+ * Set the offset added to list numbers in glCallLists.

+ */

+static void GLAPIENTRY

+_mesa_ListBase(GLuint base)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);      /* must be called before assert */

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+   ctx->List.ListBase = base;

+}

+

+

+/* Can no longer assume ctx->Exec->Func is equal to _mesa_Func.

+ */

+static void GLAPIENTRY

+exec_Finish(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_Finish(ctx->Exec, ());

+}

+

+static void GLAPIENTRY

+exec_Flush(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_Flush(ctx->Exec, ());

+}

+

+static void GLAPIENTRY

+exec_GetBooleanv(GLenum pname, GLboolean *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetBooleanv(ctx->Exec, (pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetClipPlane(GLenum plane, GLdouble * equation)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetClipPlane(ctx->Exec, (plane, equation));

+}

+

+static void GLAPIENTRY

+exec_GetDoublev(GLenum pname, GLdouble *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetDoublev(ctx->Exec, (pname, params));

+}

+

+static GLenum GLAPIENTRY

+exec_GetError(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   return CALL_GetError(ctx->Exec, ());

+}

+

+static void GLAPIENTRY

+exec_GetFloatv(GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetFloatv(ctx->Exec, (pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetIntegerv(GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetIntegerv(ctx->Exec, (pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetLightfv(GLenum light, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetLightfv(ctx->Exec, (light, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetLightiv(GLenum light, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetLightiv(ctx->Exec, (light, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetMapdv(GLenum target, GLenum query, GLdouble * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetMapdv(ctx->Exec, (target, query, v));

+}

+

+static void GLAPIENTRY

+exec_GetMapfv(GLenum target, GLenum query, GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetMapfv(ctx->Exec, (target, query, v));

+}

+

+static void GLAPIENTRY

+exec_GetMapiv(GLenum target, GLenum query, GLint * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetMapiv(ctx->Exec, (target, query, v));

+}

+

+static void GLAPIENTRY

+exec_GetMaterialfv(GLenum face, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetMaterialfv(ctx->Exec, (face, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetMaterialiv(GLenum face, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetMaterialiv(ctx->Exec, (face, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetPixelMapfv(GLenum map, GLfloat *values)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetPixelMapfv(ctx->Exec, (map, values));

+}

+

+static void GLAPIENTRY

+exec_GetPixelMapuiv(GLenum map, GLuint *values)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetPixelMapuiv(ctx->Exec, (map, values));

+}

+

+static void GLAPIENTRY

+exec_GetPixelMapusv(GLenum map, GLushort *values)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetPixelMapusv(ctx->Exec, (map, values));

+}

+

+static void GLAPIENTRY

+exec_GetPolygonStipple(GLubyte * dest)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetPolygonStipple(ctx->Exec, (dest));

+}

+

+static const GLubyte *GLAPIENTRY

+exec_GetString(GLenum name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   return CALL_GetString(ctx->Exec, (name));

+}

+

+static void GLAPIENTRY

+exec_GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexEnvfv(ctx->Exec, (target, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetTexEnviv(GLenum target, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexEnviv(ctx->Exec, (target, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetTexGendv(GLenum coord, GLenum pname, GLdouble *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexGendv(ctx->Exec, (coord, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexGenfv(ctx->Exec, (coord, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetTexGeniv(GLenum coord, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexGeniv(ctx->Exec, (coord, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetTexImage(GLenum target, GLint level, GLenum format,

+                 GLenum type, GLvoid * pixels)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexImage(ctx->Exec, (target, level, format, type, pixels));

+}

+

+static void GLAPIENTRY

+exec_GetTexLevelParameterfv(GLenum target, GLint level,

+                            GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexLevelParameterfv(ctx->Exec, (target, level, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetTexLevelParameteriv(GLenum target, GLint level,

+                            GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexLevelParameteriv(ctx->Exec, (target, level, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexParameterfv(ctx->Exec, (target, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetTexParameteriv(GLenum target, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetTexParameteriv(ctx->Exec, (target, pname, params));

+}

+

+static GLboolean GLAPIENTRY

+exec_IsEnabled(GLenum cap)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   return CALL_IsEnabled(ctx->Exec, (cap));

+}

+

+static void GLAPIENTRY

+exec_PixelStoref(GLenum pname, GLfloat param)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_PixelStoref(ctx->Exec, (pname, param));

+}

+

+static void GLAPIENTRY

+exec_PixelStorei(GLenum pname, GLint param)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_PixelStorei(ctx->Exec, (pname, param));

+}

+

+static void GLAPIENTRY

+exec_ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,

+                GLenum format, GLenum type, GLvoid * pixels)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_ReadPixels(ctx->Exec, (x, y, width, height, format, type, pixels));

+}

+

+static GLint GLAPIENTRY

+exec_RenderMode(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   return CALL_RenderMode(ctx->Exec, (mode));

+}

+

+static void GLAPIENTRY

+exec_FeedbackBuffer(GLsizei size, GLenum type, GLfloat * buffer)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_FeedbackBuffer(ctx->Exec, (size, type, buffer));

+}

+

+static void GLAPIENTRY

+exec_SelectBuffer(GLsizei size, GLuint * buffer)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_SelectBuffer(ctx->Exec, (size, buffer));

+}

+

+static GLboolean GLAPIENTRY

+exec_AreTexturesResident(GLsizei n, const GLuint * texName,

+                         GLboolean * residences)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   return CALL_AreTexturesResident(ctx->Exec, (n, texName, residences));

+}

+

+static void GLAPIENTRY

+exec_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_ColorPointer(ctx->Exec, (size, type, stride, ptr));

+}

+

+static void GLAPIENTRY

+exec_DeleteTextures(GLsizei n, const GLuint * texName)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_DeleteTextures(ctx->Exec, (n, texName));

+}

+

+static void GLAPIENTRY

+exec_DisableClientState(GLenum cap)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_DisableClientState(ctx->Exec, (cap));

+}

+

+static void GLAPIENTRY

+exec_EdgeFlagPointer(GLsizei stride, const GLvoid * vptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_EdgeFlagPointer(ctx->Exec, (stride, vptr));

+}

+

+static void GLAPIENTRY

+exec_EnableClientState(GLenum cap)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_EnableClientState(ctx->Exec, (cap));

+}

+

+static void GLAPIENTRY

+exec_GenTextures(GLsizei n, GLuint * texName)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GenTextures(ctx->Exec, (n, texName));

+}

+

+static void GLAPIENTRY

+exec_GetPointerv(GLenum pname, GLvoid **params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetPointerv(ctx->Exec, (pname, params));

+}

+

+static void GLAPIENTRY

+exec_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_IndexPointer(ctx->Exec, (type, stride, ptr));

+}

+

+static void GLAPIENTRY

+exec_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid * pointer)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_InterleavedArrays(ctx->Exec, (format, stride, pointer));

+}

+

+static GLboolean GLAPIENTRY

+exec_IsTexture(GLuint texture)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   return CALL_IsTexture(ctx->Exec, (texture));

+}

+

+static void GLAPIENTRY

+exec_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_NormalPointer(ctx->Exec, (type, stride, ptr));

+}

+

+static void GLAPIENTRY

+exec_PopClientAttrib(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_PopClientAttrib(ctx->Exec, ());

+}

+

+static void GLAPIENTRY

+exec_PushClientAttrib(GLbitfield mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_PushClientAttrib(ctx->Exec, (mask));

+}

+

+static void GLAPIENTRY

+exec_TexCoordPointer(GLint size, GLenum type, GLsizei stride,

+                     const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_TexCoordPointer(ctx->Exec, (size, type, stride, ptr));

+}

+

+static void GLAPIENTRY

+exec_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid * img)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetCompressedTexImageARB(ctx->Exec, (target, level, img));

+}

+

+static void GLAPIENTRY

+exec_VertexPointer(GLint size, GLenum type, GLsizei stride,

+                   const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_VertexPointer(ctx->Exec, (size, type, stride, ptr));

+}

+

+static void GLAPIENTRY

+exec_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat,

+                             GLint x, GLint y, GLsizei width)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_CopyConvolutionFilter1D(ctx->Exec,

+                                (target, internalFormat, x, y, width));

+}

+

+static void GLAPIENTRY

+exec_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat,

+                             GLint x, GLint y, GLsizei width, GLsizei height)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_CopyConvolutionFilter2D(ctx->Exec,

+                                (target, internalFormat, x, y, width,

+                                 height));

+}

+

+static void GLAPIENTRY

+exec_GetColorTable(GLenum target, GLenum format, GLenum type, GLvoid * data)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetColorTable(ctx->Exec, (target, format, type, data));

+}

+

+static void GLAPIENTRY

+exec_GetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetColorTableParameterfv(ctx->Exec, (target, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetColorTableParameteriv(ctx->Exec, (target, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,

+                          GLvoid * image)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetConvolutionFilter(ctx->Exec, (target, format, type, image));

+}

+

+static void GLAPIENTRY

+exec_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetConvolutionParameterfv(ctx->Exec, (target, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetConvolutionParameteriv(ctx->Exec, (target, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetHistogram(GLenum target, GLboolean reset, GLenum format,

+                  GLenum type, GLvoid *values)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetHistogram(ctx->Exec, (target, reset, format, type, values));

+}

+

+static void GLAPIENTRY

+exec_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetHistogramParameterfv(ctx->Exec, (target, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetHistogramParameteriv(ctx->Exec, (target, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetMinmax(GLenum target, GLboolean reset, GLenum format,

+               GLenum type, GLvoid *values)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetMinmax(ctx->Exec, (target, reset, format, type, values));

+}

+

+static void GLAPIENTRY

+exec_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetMinmaxParameterfv(ctx->Exec, (target, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetMinmaxParameteriv(ctx->Exec, (target, pname, params));

+}

+

+static void GLAPIENTRY

+exec_GetSeparableFilter(GLenum target, GLenum format, GLenum type,

+                        GLvoid *row, GLvoid *column, GLvoid *span)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_GetSeparableFilter(ctx->Exec,

+                           (target, format, type, row, column, span));

+}

+

+static void GLAPIENTRY

+exec_SeparableFilter2D(GLenum target, GLenum internalFormat,

+                       GLsizei width, GLsizei height, GLenum format,

+                       GLenum type, const GLvoid *row, const GLvoid *column)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_SeparableFilter2D(ctx->Exec,

+                          (target, internalFormat, width, height, format,

+                           type, row, column));

+}

+

+static void GLAPIENTRY

+exec_ColorPointerEXT(GLint size, GLenum type, GLsizei stride,

+                     GLsizei count, const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_ColorPointerEXT(ctx->Exec, (size, type, stride, count, ptr));

+}

+

+static void GLAPIENTRY

+exec_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_EdgeFlagPointerEXT(ctx->Exec, (stride, count, ptr));

+}

+

+static void GLAPIENTRY

+exec_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,

+                     const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_IndexPointerEXT(ctx->Exec, (type, stride, count, ptr));

+}

+

+static void GLAPIENTRY

+exec_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,

+                      const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_NormalPointerEXT(ctx->Exec, (type, stride, count, ptr));

+}

+

+static void GLAPIENTRY

+exec_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,

+                        GLsizei count, const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_TexCoordPointerEXT(ctx->Exec, (size, type, stride, count, ptr));

+}

+

+static void GLAPIENTRY

+exec_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,

+                      GLsizei count, const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_VertexPointerEXT(ctx->Exec, (size, type, stride, count, ptr));

+}

+

+static void GLAPIENTRY

+exec_LockArraysEXT(GLint first, GLsizei count)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_LockArraysEXT(ctx->Exec, (first, count));

+}

+

+static void GLAPIENTRY

+exec_UnlockArraysEXT(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_UnlockArraysEXT(ctx->Exec, ());

+}

+

+static void GLAPIENTRY

+exec_ClientActiveTextureARB(GLenum target)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_ClientActiveTextureARB(ctx->Exec, (target));

+}

+

+static void GLAPIENTRY

+exec_SecondaryColorPointerEXT(GLint size, GLenum type,

+                              GLsizei stride, const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_SecondaryColorPointerEXT(ctx->Exec, (size, type, stride, ptr));

+}

+

+static void GLAPIENTRY

+exec_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_FogCoordPointerEXT(ctx->Exec, (type, stride, ptr));

+}

+

+/* GL_EXT_multi_draw_arrays */

+static void GLAPIENTRY

+exec_MultiDrawArraysEXT(GLenum mode, const GLint *first,

+                        const GLsizei *count, GLsizei primcount)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_MultiDrawArraysEXT(ctx->Exec, (mode, first, count, primcount));

+}

+

+/* GL_IBM_multimode_draw_arrays */

+static void GLAPIENTRY

+exec_MultiModeDrawArraysIBM(const GLenum * mode, const GLint * first,

+                            const GLsizei * count, GLsizei primcount,

+                            GLint modestride)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_MultiModeDrawArraysIBM(ctx->Exec,

+                               (mode, first, count, primcount, modestride));

+}

+

+/* GL_IBM_multimode_draw_arrays */

+static void GLAPIENTRY

+exec_MultiModeDrawElementsIBM(const GLenum * mode,

+                              const GLsizei * count,

+                              GLenum type,

+                              const GLvoid * const *indices,

+                              GLsizei primcount, GLint modestride)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   FLUSH_VERTICES(ctx, 0);

+   CALL_MultiModeDrawElementsIBM(ctx->Exec,

+                                 (mode, count, type, indices, primcount,

+                                  modestride));

+}

+

+

+

+/**

+ * Setup the given dispatch table to point to Mesa's display list

+ * building functions.

+ *

+ * This does not include any of the tnl functions - they are

+ * initialized from _mesa_init_api_defaults and from the active vtxfmt

+ * struct.

+ */

+struct _glapi_table *

+_mesa_create_save_table(void)

+{

+   struct _glapi_table *table;

+

+   table = _mesa_alloc_dispatch_table(_gloffset_COUNT);

+   if (table == NULL)

+      return NULL;

+

+   _mesa_loopback_init_api_table(table);

+

+   /* GL 1.0 */

+   SET_Accum(table, save_Accum);

+   SET_AlphaFunc(table, save_AlphaFunc);

+   SET_Bitmap(table, save_Bitmap);

+   SET_BlendFunc(table, save_BlendFunc);

+   SET_CallList(table, save_CallList);

+   SET_CallLists(table, save_CallLists);

+   SET_Clear(table, save_Clear);

+   SET_ClearAccum(table, save_ClearAccum);

+   SET_ClearColor(table, save_ClearColor);

+   SET_ClearDepth(table, save_ClearDepth);

+   SET_ClearIndex(table, save_ClearIndex);

+   SET_ClearStencil(table, save_ClearStencil);

+   SET_ClipPlane(table, save_ClipPlane);

+   SET_ColorMask(table, save_ColorMask);

+   SET_ColorMaskIndexedEXT(table, save_ColorMaskIndexed);

+   SET_ColorMaterial(table, save_ColorMaterial);

+   SET_CopyPixels(table, save_CopyPixels);

+   SET_CullFace(table, save_CullFace);

+   SET_DeleteLists(table, _mesa_DeleteLists);

+   SET_DepthFunc(table, save_DepthFunc);

+   SET_DepthMask(table, save_DepthMask);

+   SET_DepthRange(table, save_DepthRange);

+   SET_Disable(table, save_Disable);

+   SET_DisableIndexedEXT(table, save_DisableIndexed);

+   SET_DrawBuffer(table, save_DrawBuffer);

+   SET_DrawPixels(table, save_DrawPixels);

+   SET_Enable(table, save_Enable);

+   SET_EnableIndexedEXT(table, save_EnableIndexed);

+   SET_EndList(table, _mesa_EndList);

+   SET_EvalMesh1(table, save_EvalMesh1);

+   SET_EvalMesh2(table, save_EvalMesh2);

+   SET_Finish(table, exec_Finish);

+   SET_Flush(table, exec_Flush);

+   SET_Fogf(table, save_Fogf);

+   SET_Fogfv(table, save_Fogfv);

+   SET_Fogi(table, save_Fogi);

+   SET_Fogiv(table, save_Fogiv);

+   SET_FrontFace(table, save_FrontFace);

+   SET_Frustum(table, save_Frustum);

+   SET_GenLists(table, _mesa_GenLists);

+   SET_GetBooleanv(table, exec_GetBooleanv);

+   SET_GetClipPlane(table, exec_GetClipPlane);

+   SET_GetDoublev(table, exec_GetDoublev);

+   SET_GetError(table, exec_GetError);

+   SET_GetFloatv(table, exec_GetFloatv);

+   SET_GetIntegerv(table, exec_GetIntegerv);

+   SET_GetLightfv(table, exec_GetLightfv);

+   SET_GetLightiv(table, exec_GetLightiv);

+   SET_GetMapdv(table, exec_GetMapdv);

+   SET_GetMapfv(table, exec_GetMapfv);

+   SET_GetMapiv(table, exec_GetMapiv);

+   SET_GetMaterialfv(table, exec_GetMaterialfv);

+   SET_GetMaterialiv(table, exec_GetMaterialiv);

+   SET_GetPixelMapfv(table, exec_GetPixelMapfv);

+   SET_GetPixelMapuiv(table, exec_GetPixelMapuiv);

+   SET_GetPixelMapusv(table, exec_GetPixelMapusv);

+   SET_GetPolygonStipple(table, exec_GetPolygonStipple);

+   SET_GetString(table, exec_GetString);

+   SET_GetTexEnvfv(table, exec_GetTexEnvfv);

+   SET_GetTexEnviv(table, exec_GetTexEnviv);

+   SET_GetTexGendv(table, exec_GetTexGendv);

+   SET_GetTexGenfv(table, exec_GetTexGenfv);

+   SET_GetTexGeniv(table, exec_GetTexGeniv);

+   SET_GetTexImage(table, exec_GetTexImage);

+   SET_GetTexLevelParameterfv(table, exec_GetTexLevelParameterfv);

+   SET_GetTexLevelParameteriv(table, exec_GetTexLevelParameteriv);

+   SET_GetTexParameterfv(table, exec_GetTexParameterfv);

+   SET_GetTexParameteriv(table, exec_GetTexParameteriv);

+   SET_Hint(table, save_Hint);

+   SET_IndexMask(table, save_IndexMask);

+   SET_InitNames(table, save_InitNames);

+   SET_IsEnabled(table, exec_IsEnabled);

+   SET_IsList(table, _mesa_IsList);

+   SET_LightModelf(table, save_LightModelf);

+   SET_LightModelfv(table, save_LightModelfv);

+   SET_LightModeli(table, save_LightModeli);

+   SET_LightModeliv(table, save_LightModeliv);

+   SET_Lightf(table, save_Lightf);

+   SET_Lightfv(table, save_Lightfv);

+   SET_Lighti(table, save_Lighti);

+   SET_Lightiv(table, save_Lightiv);

+   SET_LineStipple(table, save_LineStipple);

+   SET_LineWidth(table, save_LineWidth);

+   SET_ListBase(table, save_ListBase);

+   SET_LoadIdentity(table, save_LoadIdentity);

+   SET_LoadMatrixd(table, save_LoadMatrixd);

+   SET_LoadMatrixf(table, save_LoadMatrixf);

+   SET_LoadName(table, save_LoadName);

+   SET_LogicOp(table, save_LogicOp);

+   SET_Map1d(table, save_Map1d);

+   SET_Map1f(table, save_Map1f);

+   SET_Map2d(table, save_Map2d);

+   SET_Map2f(table, save_Map2f);

+   SET_MapGrid1d(table, save_MapGrid1d);

+   SET_MapGrid1f(table, save_MapGrid1f);

+   SET_MapGrid2d(table, save_MapGrid2d);

+   SET_MapGrid2f(table, save_MapGrid2f);

+   SET_MatrixMode(table, save_MatrixMode);

+   SET_MultMatrixd(table, save_MultMatrixd);

+   SET_MultMatrixf(table, save_MultMatrixf);

+   SET_NewList(table, save_NewList);

+   SET_Ortho(table, save_Ortho);

+   SET_PassThrough(table, save_PassThrough);

+   SET_PixelMapfv(table, save_PixelMapfv);

+   SET_PixelMapuiv(table, save_PixelMapuiv);

+   SET_PixelMapusv(table, save_PixelMapusv);

+   SET_PixelStoref(table, exec_PixelStoref);

+   SET_PixelStorei(table, exec_PixelStorei);

+   SET_PixelTransferf(table, save_PixelTransferf);

+   SET_PixelTransferi(table, save_PixelTransferi);

+   SET_PixelZoom(table, save_PixelZoom);

+   SET_PointSize(table, save_PointSize);

+   SET_PolygonMode(table, save_PolygonMode);

+   SET_PolygonOffset(table, save_PolygonOffset);

+   SET_PolygonStipple(table, save_PolygonStipple);

+   SET_PopAttrib(table, save_PopAttrib);

+   SET_PopMatrix(table, save_PopMatrix);

+   SET_PopName(table, save_PopName);

+   SET_PushAttrib(table, save_PushAttrib);

+   SET_PushMatrix(table, save_PushMatrix);

+   SET_PushName(table, save_PushName);

+   SET_RasterPos2d(table, save_RasterPos2d);

+   SET_RasterPos2dv(table, save_RasterPos2dv);

+   SET_RasterPos2f(table, save_RasterPos2f);

+   SET_RasterPos2fv(table, save_RasterPos2fv);

+   SET_RasterPos2i(table, save_RasterPos2i);

+   SET_RasterPos2iv(table, save_RasterPos2iv);

+   SET_RasterPos2s(table, save_RasterPos2s);

+   SET_RasterPos2sv(table, save_RasterPos2sv);

+   SET_RasterPos3d(table, save_RasterPos3d);

+   SET_RasterPos3dv(table, save_RasterPos3dv);

+   SET_RasterPos3f(table, save_RasterPos3f);

+   SET_RasterPos3fv(table, save_RasterPos3fv);

+   SET_RasterPos3i(table, save_RasterPos3i);

+   SET_RasterPos3iv(table, save_RasterPos3iv);

+   SET_RasterPos3s(table, save_RasterPos3s);

+   SET_RasterPos3sv(table, save_RasterPos3sv);

+   SET_RasterPos4d(table, save_RasterPos4d);

+   SET_RasterPos4dv(table, save_RasterPos4dv);

+   SET_RasterPos4f(table, save_RasterPos4f);

+   SET_RasterPos4fv(table, save_RasterPos4fv);

+   SET_RasterPos4i(table, save_RasterPos4i);

+   SET_RasterPos4iv(table, save_RasterPos4iv);

+   SET_RasterPos4s(table, save_RasterPos4s);

+   SET_RasterPos4sv(table, save_RasterPos4sv);

+   SET_ReadBuffer(table, save_ReadBuffer);

+   SET_ReadPixels(table, exec_ReadPixels);

+   SET_RenderMode(table, exec_RenderMode);

+   SET_Rotated(table, save_Rotated);

+   SET_Rotatef(table, save_Rotatef);

+   SET_Scaled(table, save_Scaled);

+   SET_Scalef(table, save_Scalef);

+   SET_Scissor(table, save_Scissor);

+   SET_FeedbackBuffer(table, exec_FeedbackBuffer);

+   SET_SelectBuffer(table, exec_SelectBuffer);

+   SET_ShadeModel(table, save_ShadeModel);

+   SET_StencilFunc(table, save_StencilFunc);

+   SET_StencilMask(table, save_StencilMask);

+   SET_StencilOp(table, save_StencilOp);

+   SET_TexEnvf(table, save_TexEnvf);

+   SET_TexEnvfv(table, save_TexEnvfv);

+   SET_TexEnvi(table, save_TexEnvi);

+   SET_TexEnviv(table, save_TexEnviv);

+   SET_TexGend(table, save_TexGend);

+   SET_TexGendv(table, save_TexGendv);

+   SET_TexGenf(table, save_TexGenf);

+   SET_TexGenfv(table, save_TexGenfv);

+   SET_TexGeni(table, save_TexGeni);

+   SET_TexGeniv(table, save_TexGeniv);

+   SET_TexImage1D(table, save_TexImage1D);

+   SET_TexImage2D(table, save_TexImage2D);

+   SET_TexParameterf(table, save_TexParameterf);

+   SET_TexParameterfv(table, save_TexParameterfv);

+   SET_TexParameteri(table, save_TexParameteri);

+   SET_TexParameteriv(table, save_TexParameteriv);

+   SET_Translated(table, save_Translated);

+   SET_Translatef(table, save_Translatef);

+   SET_Viewport(table, save_Viewport);

+

+   /* GL 1.1 */

+   SET_AreTexturesResident(table, exec_AreTexturesResident);

+   SET_BindTexture(table, save_BindTexture);

+   SET_ColorPointer(table, exec_ColorPointer);

+   SET_CopyTexImage1D(table, save_CopyTexImage1D);

+   SET_CopyTexImage2D(table, save_CopyTexImage2D);

+   SET_CopyTexSubImage1D(table, save_CopyTexSubImage1D);

+   SET_CopyTexSubImage2D(table, save_CopyTexSubImage2D);

+   SET_DeleteTextures(table, exec_DeleteTextures);

+   SET_DisableClientState(table, exec_DisableClientState);

+   SET_EdgeFlagPointer(table, exec_EdgeFlagPointer);

+   SET_EnableClientState(table, exec_EnableClientState);

+   SET_GenTextures(table, exec_GenTextures);

+   SET_GetPointerv(table, exec_GetPointerv);

+   SET_IndexPointer(table, exec_IndexPointer);

+   SET_InterleavedArrays(table, exec_InterleavedArrays);

+   SET_IsTexture(table, exec_IsTexture);

+   SET_NormalPointer(table, exec_NormalPointer);

+   SET_PopClientAttrib(table, exec_PopClientAttrib);

+   SET_PrioritizeTextures(table, save_PrioritizeTextures);

+   SET_PushClientAttrib(table, exec_PushClientAttrib);

+   SET_TexCoordPointer(table, exec_TexCoordPointer);

+   SET_TexSubImage1D(table, save_TexSubImage1D);

+   SET_TexSubImage2D(table, save_TexSubImage2D);

+   SET_VertexPointer(table, exec_VertexPointer);

+

+   /* GL 1.2 */

+   SET_CopyTexSubImage3D(table, save_CopyTexSubImage3D);

+   SET_TexImage3D(table, save_TexImage3D);

+   SET_TexSubImage3D(table, save_TexSubImage3D);

+

+   /* GL 2.0 */

+   SET_StencilFuncSeparate(table, save_StencilFuncSeparate);

+   SET_StencilMaskSeparate(table, save_StencilMaskSeparate);

+   SET_StencilOpSeparate(table, save_StencilOpSeparate);

+

+   /* ATI_separate_stencil */ 

+   SET_StencilFuncSeparateATI(table, save_StencilFuncSeparateATI);

+

+   /* GL_ARB_imaging */

+   /* Not all are supported */

+   SET_BlendColor(table, save_BlendColor);

+   SET_BlendEquation(table, save_BlendEquation);

+   SET_ColorSubTable(table, save_ColorSubTable);

+   SET_ColorTable(table, save_ColorTable);

+   SET_ColorTableParameterfv(table, save_ColorTableParameterfv);

+   SET_ColorTableParameteriv(table, save_ColorTableParameteriv);

+   SET_ConvolutionFilter1D(table, save_ConvolutionFilter1D);

+   SET_ConvolutionFilter2D(table, save_ConvolutionFilter2D);

+   SET_ConvolutionParameterf(table, save_ConvolutionParameterf);

+   SET_ConvolutionParameterfv(table, save_ConvolutionParameterfv);

+   SET_ConvolutionParameteri(table, save_ConvolutionParameteri);

+   SET_ConvolutionParameteriv(table, save_ConvolutionParameteriv);

+   SET_CopyColorSubTable(table, save_CopyColorSubTable);

+   SET_CopyColorTable(table, save_CopyColorTable);

+   SET_CopyConvolutionFilter1D(table, exec_CopyConvolutionFilter1D);

+   SET_CopyConvolutionFilter2D(table, exec_CopyConvolutionFilter2D);

+   SET_GetColorTable(table, exec_GetColorTable);

+   SET_GetColorTableParameterfv(table, exec_GetColorTableParameterfv);

+   SET_GetColorTableParameteriv(table, exec_GetColorTableParameteriv);

+   SET_GetConvolutionFilter(table, exec_GetConvolutionFilter);

+   SET_GetConvolutionParameterfv(table, exec_GetConvolutionParameterfv);

+   SET_GetConvolutionParameteriv(table, exec_GetConvolutionParameteriv);

+   SET_GetHistogram(table, exec_GetHistogram);

+   SET_GetHistogramParameterfv(table, exec_GetHistogramParameterfv);

+   SET_GetHistogramParameteriv(table, exec_GetHistogramParameteriv);

+   SET_GetMinmax(table, exec_GetMinmax);

+   SET_GetMinmaxParameterfv(table, exec_GetMinmaxParameterfv);

+   SET_GetMinmaxParameteriv(table, exec_GetMinmaxParameteriv);

+   SET_GetSeparableFilter(table, exec_GetSeparableFilter);

+   SET_Histogram(table, save_Histogram);

+   SET_Minmax(table, save_Minmax);

+   SET_ResetHistogram(table, save_ResetHistogram);

+   SET_ResetMinmax(table, save_ResetMinmax);

+   SET_SeparableFilter2D(table, exec_SeparableFilter2D);

+

+   /* 2. GL_EXT_blend_color */

+#if 0

+   SET_BlendColorEXT(table, save_BlendColorEXT);

+#endif

+

+   /* 3. GL_EXT_polygon_offset */

+   SET_PolygonOffsetEXT(table, save_PolygonOffsetEXT);

+

+   /* 6. GL_EXT_texture3d */

+#if 0

+   SET_CopyTexSubImage3DEXT(table, save_CopyTexSubImage3D);

+   SET_TexImage3DEXT(table, save_TexImage3DEXT);

+   SET_TexSubImage3DEXT(table, save_TexSubImage3D);

+#endif

+

+   /* 14. GL_SGI_color_table */

+#if 0

+   SET_ColorTableSGI(table, save_ColorTable);

+   SET_ColorSubTableSGI(table, save_ColorSubTable);

+   SET_GetColorTableSGI(table, exec_GetColorTable);

+   SET_GetColorTableParameterfvSGI(table, exec_GetColorTableParameterfv);

+   SET_GetColorTableParameterivSGI(table, exec_GetColorTableParameteriv);

+#endif

+

+   /* 30. GL_EXT_vertex_array */

+   SET_ColorPointerEXT(table, exec_ColorPointerEXT);

+   SET_EdgeFlagPointerEXT(table, exec_EdgeFlagPointerEXT);

+   SET_IndexPointerEXT(table, exec_IndexPointerEXT);

+   SET_NormalPointerEXT(table, exec_NormalPointerEXT);

+   SET_TexCoordPointerEXT(table, exec_TexCoordPointerEXT);

+   SET_VertexPointerEXT(table, exec_VertexPointerEXT);

+

+   /* 37. GL_EXT_blend_minmax */

+#if 0

+   SET_BlendEquationEXT(table, save_BlendEquationEXT);

+#endif

+

+   /* 54. GL_EXT_point_parameters */

+   SET_PointParameterfEXT(table, save_PointParameterfEXT);

+   SET_PointParameterfvEXT(table, save_PointParameterfvEXT);

+

+   /* 97. GL_EXT_compiled_vertex_array */

+   SET_LockArraysEXT(table, exec_LockArraysEXT);

+   SET_UnlockArraysEXT(table, exec_UnlockArraysEXT);

+

+   /* 145. GL_EXT_secondary_color */

+   SET_SecondaryColorPointerEXT(table, exec_SecondaryColorPointerEXT);

+

+   /* 148. GL_EXT_multi_draw_arrays */

+   SET_MultiDrawArraysEXT(table, exec_MultiDrawArraysEXT);

+

+   /* 149. GL_EXT_fog_coord */

+   SET_FogCoordPointerEXT(table, exec_FogCoordPointerEXT);

+

+   /* 173. GL_EXT_blend_func_separate */

+   SET_BlendFuncSeparateEXT(table, save_BlendFuncSeparateEXT);

+

+   /* 196. GL_MESA_resize_buffers */

+   SET_ResizeBuffersMESA(table, _mesa_ResizeBuffersMESA);

+

+   /* 197. GL_MESA_window_pos */

+   SET_WindowPos2dMESA(table, save_WindowPos2dMESA);

+   SET_WindowPos2dvMESA(table, save_WindowPos2dvMESA);

+   SET_WindowPos2fMESA(table, save_WindowPos2fMESA);

+   SET_WindowPos2fvMESA(table, save_WindowPos2fvMESA);

+   SET_WindowPos2iMESA(table, save_WindowPos2iMESA);

+   SET_WindowPos2ivMESA(table, save_WindowPos2ivMESA);

+   SET_WindowPos2sMESA(table, save_WindowPos2sMESA);

+   SET_WindowPos2svMESA(table, save_WindowPos2svMESA);

+   SET_WindowPos3dMESA(table, save_WindowPos3dMESA);

+   SET_WindowPos3dvMESA(table, save_WindowPos3dvMESA);

+   SET_WindowPos3fMESA(table, save_WindowPos3fMESA);

+   SET_WindowPos3fvMESA(table, save_WindowPos3fvMESA);

+   SET_WindowPos3iMESA(table, save_WindowPos3iMESA);

+   SET_WindowPos3ivMESA(table, save_WindowPos3ivMESA);

+   SET_WindowPos3sMESA(table, save_WindowPos3sMESA);

+   SET_WindowPos3svMESA(table, save_WindowPos3svMESA);

+   SET_WindowPos4dMESA(table, save_WindowPos4dMESA);

+   SET_WindowPos4dvMESA(table, save_WindowPos4dvMESA);

+   SET_WindowPos4fMESA(table, save_WindowPos4fMESA);

+   SET_WindowPos4fvMESA(table, save_WindowPos4fvMESA);

+   SET_WindowPos4iMESA(table, save_WindowPos4iMESA);

+   SET_WindowPos4ivMESA(table, save_WindowPos4ivMESA);

+   SET_WindowPos4sMESA(table, save_WindowPos4sMESA);

+   SET_WindowPos4svMESA(table, save_WindowPos4svMESA);

+

+   /* 200. GL_IBM_multimode_draw_arrays */

+   SET_MultiModeDrawArraysIBM(table, exec_MultiModeDrawArraysIBM);

+   SET_MultiModeDrawElementsIBM(table, exec_MultiModeDrawElementsIBM);

+

+#if FEATURE_NV_vertex_program

+   /* 233. GL_NV_vertex_program */

+   /* The following commands DO NOT go into display lists:

+    * AreProgramsResidentNV, IsProgramNV, GenProgramsNV, DeleteProgramsNV,

+    * VertexAttribPointerNV, GetProgram*, GetVertexAttrib*

+    */

+   SET_BindProgramNV(table, save_BindProgramNV);

+   SET_DeleteProgramsNV(table, _mesa_DeletePrograms);

+   SET_ExecuteProgramNV(table, save_ExecuteProgramNV);

+   SET_GenProgramsNV(table, _mesa_GenPrograms);

+   SET_AreProgramsResidentNV(table, _mesa_AreProgramsResidentNV);

+   SET_RequestResidentProgramsNV(table, save_RequestResidentProgramsNV);

+   SET_GetProgramParameterfvNV(table, _mesa_GetProgramParameterfvNV);

+   SET_GetProgramParameterdvNV(table, _mesa_GetProgramParameterdvNV);

+   SET_GetProgramivNV(table, _mesa_GetProgramivNV);

+   SET_GetProgramStringNV(table, _mesa_GetProgramStringNV);

+   SET_GetTrackMatrixivNV(table, _mesa_GetTrackMatrixivNV);

+   SET_GetVertexAttribdvNV(table, _mesa_GetVertexAttribdvNV);

+   SET_GetVertexAttribfvNV(table, _mesa_GetVertexAttribfvNV);

+   SET_GetVertexAttribivNV(table, _mesa_GetVertexAttribivNV);

+   SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervNV);

+   SET_IsProgramNV(table, _mesa_IsProgramARB);

+   SET_LoadProgramNV(table, save_LoadProgramNV);

+   SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB);

+   SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB);

+   SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB);

+   SET_ProgramEnvParameter4fvARB(table, save_ProgramEnvParameter4fvARB);

+   SET_ProgramParameters4dvNV(table, save_ProgramParameters4dvNV);

+   SET_ProgramParameters4fvNV(table, save_ProgramParameters4fvNV);

+   SET_TrackMatrixNV(table, save_TrackMatrixNV);

+   SET_VertexAttribPointerNV(table, _mesa_VertexAttribPointerNV);

+#endif

+

+   /* 244. GL_ATI_envmap_bumpmap */

+   SET_TexBumpParameterivATI(table, save_TexBumpParameterivATI);

+   SET_TexBumpParameterfvATI(table, save_TexBumpParameterfvATI);

+

+   /* 245. GL_ATI_fragment_shader */

+#if FEATURE_ATI_fragment_shader

+   SET_BindFragmentShaderATI(table, save_BindFragmentShaderATI);

+   SET_SetFragmentShaderConstantATI(table, save_SetFragmentShaderConstantATI);

+#endif

+

+   /* 282. GL_NV_fragment_program */

+#if FEATURE_NV_fragment_program

+   SET_ProgramNamedParameter4fNV(table, save_ProgramNamedParameter4fNV);

+   SET_ProgramNamedParameter4dNV(table, save_ProgramNamedParameter4dNV);

+   SET_ProgramNamedParameter4fvNV(table, save_ProgramNamedParameter4fvNV);

+   SET_ProgramNamedParameter4dvNV(table, save_ProgramNamedParameter4dvNV);

+   SET_GetProgramNamedParameterfvNV(table,

+                                    _mesa_GetProgramNamedParameterfvNV);

+   SET_GetProgramNamedParameterdvNV(table,

+                                    _mesa_GetProgramNamedParameterdvNV);

+   SET_ProgramLocalParameter4dARB(table, save_ProgramLocalParameter4dARB);

+   SET_ProgramLocalParameter4dvARB(table, save_ProgramLocalParameter4dvARB);

+   SET_ProgramLocalParameter4fARB(table, save_ProgramLocalParameter4fARB);

+   SET_ProgramLocalParameter4fvARB(table, save_ProgramLocalParameter4fvARB);

+   SET_GetProgramLocalParameterdvARB(table,

+                                     _mesa_GetProgramLocalParameterdvARB);

+   SET_GetProgramLocalParameterfvARB(table,

+                                     _mesa_GetProgramLocalParameterfvARB);

+#endif

+

+   /* 262. GL_NV_point_sprite */

+   SET_PointParameteriNV(table, save_PointParameteriNV);

+   SET_PointParameterivNV(table, save_PointParameterivNV);

+

+   /* 268. GL_EXT_stencil_two_side */

+   SET_ActiveStencilFaceEXT(table, save_ActiveStencilFaceEXT);

+

+   /* 273. GL_APPLE_vertex_array_object */

+   SET_BindVertexArrayAPPLE(table, _mesa_BindVertexArrayAPPLE);

+   SET_DeleteVertexArraysAPPLE(table, _mesa_DeleteVertexArraysAPPLE);

+   SET_GenVertexArraysAPPLE(table, _mesa_GenVertexArraysAPPLE);

+   SET_IsVertexArrayAPPLE(table, _mesa_IsVertexArrayAPPLE);

+

+   /* ???. GL_EXT_depth_bounds_test */

+   SET_DepthBoundsEXT(table, save_DepthBoundsEXT);

+

+   /* ARB 1. GL_ARB_multitexture */

+   SET_ActiveTextureARB(table, save_ActiveTextureARB);

+   SET_ClientActiveTextureARB(table, exec_ClientActiveTextureARB);

+

+   /* ARB 3. GL_ARB_transpose_matrix */

+   SET_LoadTransposeMatrixdARB(table, save_LoadTransposeMatrixdARB);

+   SET_LoadTransposeMatrixfARB(table, save_LoadTransposeMatrixfARB);

+   SET_MultTransposeMatrixdARB(table, save_MultTransposeMatrixdARB);

+   SET_MultTransposeMatrixfARB(table, save_MultTransposeMatrixfARB);

+

+   /* ARB 5. GL_ARB_multisample */

+   SET_SampleCoverageARB(table, save_SampleCoverageARB);

+

+   /* ARB 12. GL_ARB_texture_compression */

+   SET_CompressedTexImage3DARB(table, save_CompressedTexImage3DARB);

+   SET_CompressedTexImage2DARB(table, save_CompressedTexImage2DARB);

+   SET_CompressedTexImage1DARB(table, save_CompressedTexImage1DARB);

+   SET_CompressedTexSubImage3DARB(table, save_CompressedTexSubImage3DARB);

+   SET_CompressedTexSubImage2DARB(table, save_CompressedTexSubImage2DARB);

+   SET_CompressedTexSubImage1DARB(table, save_CompressedTexSubImage1DARB);

+   SET_GetCompressedTexImageARB(table, exec_GetCompressedTexImageARB);

+

+   /* ARB 14. GL_ARB_point_parameters */

+   /* aliased with EXT_point_parameters functions */

+

+   /* ARB 25. GL_ARB_window_pos */

+   /* aliased with MESA_window_pos functions */

+

+   /* ARB 26. GL_ARB_vertex_program */

+   /* ARB 27. GL_ARB_fragment_program */

+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+   /* glVertexAttrib* functions alias the NV ones, handled elsewhere */

+   SET_VertexAttribPointerARB(table, _mesa_VertexAttribPointerARB);

+   SET_EnableVertexAttribArrayARB(table, _mesa_EnableVertexAttribArrayARB);

+   SET_DisableVertexAttribArrayARB(table, _mesa_DisableVertexAttribArrayARB);

+   SET_ProgramStringARB(table, save_ProgramStringARB);

+   SET_BindProgramNV(table, save_BindProgramNV);

+   SET_DeleteProgramsNV(table, _mesa_DeletePrograms);

+   SET_GenProgramsNV(table, _mesa_GenPrograms);

+   SET_IsProgramNV(table, _mesa_IsProgramARB);

+   SET_GetVertexAttribdvNV(table, _mesa_GetVertexAttribdvNV);

+   SET_GetVertexAttribfvNV(table, _mesa_GetVertexAttribfvNV);

+   SET_GetVertexAttribivNV(table, _mesa_GetVertexAttribivNV);

+   SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervNV);

+   SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB);

+   SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB);

+   SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB);

+   SET_ProgramEnvParameter4fvARB(table, save_ProgramEnvParameter4fvARB);

+   SET_ProgramLocalParameter4dARB(table, save_ProgramLocalParameter4dARB);

+   SET_ProgramLocalParameter4dvARB(table, save_ProgramLocalParameter4dvARB);

+   SET_ProgramLocalParameter4fARB(table, save_ProgramLocalParameter4fARB);

+   SET_ProgramLocalParameter4fvARB(table, save_ProgramLocalParameter4fvARB);

+   SET_GetProgramEnvParameterdvARB(table, _mesa_GetProgramEnvParameterdvARB);

+   SET_GetProgramEnvParameterfvARB(table, _mesa_GetProgramEnvParameterfvARB);

+   SET_GetProgramLocalParameterdvARB(table,

+                                     _mesa_GetProgramLocalParameterdvARB);

+   SET_GetProgramLocalParameterfvARB(table,

+                                     _mesa_GetProgramLocalParameterfvARB);

+   SET_GetProgramivARB(table, _mesa_GetProgramivARB);

+   SET_GetProgramStringARB(table, _mesa_GetProgramStringARB);

+#endif

+

+   /* ARB 28. GL_ARB_vertex_buffer_object */

+#if FEATURE_ARB_vertex_buffer_object

+   /* None of the extension's functions get compiled */

+   SET_BindBufferARB(table, _mesa_BindBufferARB);

+   SET_BufferDataARB(table, _mesa_BufferDataARB);

+   SET_BufferSubDataARB(table, _mesa_BufferSubDataARB);

+   SET_DeleteBuffersARB(table, _mesa_DeleteBuffersARB);

+   SET_GenBuffersARB(table, _mesa_GenBuffersARB);

+   SET_GetBufferParameterivARB(table, _mesa_GetBufferParameterivARB);

+   SET_GetBufferPointervARB(table, _mesa_GetBufferPointervARB);

+   SET_GetBufferSubDataARB(table, _mesa_GetBufferSubDataARB);

+   SET_IsBufferARB(table, _mesa_IsBufferARB);

+   SET_MapBufferARB(table, _mesa_MapBufferARB);

+   SET_UnmapBufferARB(table, _mesa_UnmapBufferARB);

+#endif

+

+#if FEATURE_queryobj

+   SET_BeginQueryARB(table, save_BeginQueryARB);

+   SET_EndQueryARB(table, save_EndQueryARB);

+   SET_GenQueriesARB(table, _mesa_GenQueriesARB);

+   SET_DeleteQueriesARB(table, _mesa_DeleteQueriesARB);

+   SET_IsQueryARB(table, _mesa_IsQueryARB);

+   SET_GetQueryivARB(table, _mesa_GetQueryivARB);

+   SET_GetQueryObjectivARB(table, _mesa_GetQueryObjectivARB);

+   SET_GetQueryObjectuivARB(table, _mesa_GetQueryObjectuivARB);

+#endif

+   SET_DrawBuffersARB(table, save_DrawBuffersARB);

+

+#if FEATURE_EXT_framebuffer_blit

+   SET_BlitFramebufferEXT(table, save_BlitFramebufferEXT);

+#endif

+

+   /* GL_ARB_shader_objects */

+   SET_UseProgramObjectARB(table, save_UseProgramObjectARB);

+   SET_Uniform1fARB(table, save_Uniform1fARB);

+   SET_Uniform2fARB(table, save_Uniform2fARB);

+   SET_Uniform3fARB(table, save_Uniform3fARB);

+   SET_Uniform4fARB(table, save_Uniform4fARB);

+   SET_Uniform1fvARB(table, save_Uniform1fvARB);

+   SET_Uniform2fvARB(table, save_Uniform2fvARB);

+   SET_Uniform3fvARB(table, save_Uniform3fvARB);

+   SET_Uniform4fvARB(table, save_Uniform4fvARB);

+   SET_Uniform1iARB(table, save_Uniform1iARB);

+   SET_Uniform2iARB(table, save_Uniform2iARB);

+   SET_Uniform3iARB(table, save_Uniform3iARB);

+   SET_Uniform4iARB(table, save_Uniform4iARB);

+   SET_Uniform1ivARB(table, save_Uniform1ivARB);

+   SET_Uniform2ivARB(table, save_Uniform2ivARB);

+   SET_Uniform3ivARB(table, save_Uniform3ivARB);

+   SET_Uniform4ivARB(table, save_Uniform4ivARB);

+   SET_UniformMatrix2fvARB(table, save_UniformMatrix2fvARB);

+   SET_UniformMatrix3fvARB(table, save_UniformMatrix3fvARB);

+   SET_UniformMatrix4fvARB(table, save_UniformMatrix4fvARB);

+   SET_UniformMatrix2x3fv(table, save_UniformMatrix2x3fv);

+   SET_UniformMatrix3x2fv(table, save_UniformMatrix3x2fv);

+   SET_UniformMatrix2x4fv(table, save_UniformMatrix2x4fv);

+   SET_UniformMatrix4x2fv(table, save_UniformMatrix4x2fv);

+   SET_UniformMatrix3x4fv(table, save_UniformMatrix3x4fv);

+   SET_UniformMatrix4x3fv(table, save_UniformMatrix4x3fv);

+

+   /* ARB 30/31/32. GL_ARB_shader_objects, GL_ARB_vertex/fragment_shader */

+   SET_BindAttribLocationARB(table, exec_BindAttribLocationARB);

+   SET_GetAttribLocationARB(table, exec_GetAttribLocationARB);

+   SET_GetUniformLocationARB(table, exec_GetUniformLocationARB);

+   /* XXX additional functions need to be implemented here! */

+

+   /* 299. GL_EXT_blend_equation_separate */

+   SET_BlendEquationSeparateEXT(table, save_BlendEquationSeparateEXT);

+

+   /* GL_EXT_gpu_program_parameters */

+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+   SET_ProgramEnvParameters4fvEXT(table, save_ProgramEnvParameters4fvEXT);

+   SET_ProgramLocalParameters4fvEXT(table, save_ProgramLocalParameters4fvEXT);

+#endif

+

+   /* ARB 50. GL_ARB_map_buffer_range */

+#if FEATURE_ARB_map_buffer_range

+   SET_MapBufferRange(table, _mesa_MapBufferRange); /* no dlist save */

+   SET_FlushMappedBufferRange(table, _mesa_FlushMappedBufferRange); /* no dl */

+#endif

+

+   /* ARB 59. GL_ARB_copy_buffer */

+   SET_CopyBufferSubData(table, _mesa_CopyBufferSubData); /* no dlist save */

+

+   /* 352. GL_EXT_transform_feedback */

+#if FEATURE_EXT_transform_feedback

+   SET_BeginTransformFeedbackEXT(table, save_BeginTransformFeedback);

+   SET_EndTransformFeedbackEXT(table, save_EndTransformFeedback);

+#endif

+

+   /* 364. GL_EXT_provoking_vertex */

+   SET_ProvokingVertexEXT(table, save_ProvokingVertexEXT);

+

+   /* 371. GL_APPLE_object_purgeable */

+#if FEATURE_APPLE_object_purgeable

+   SET_ObjectPurgeableAPPLE(table, _mesa_ObjectPurgeableAPPLE);

+   SET_ObjectUnpurgeableAPPLE(table, _mesa_ObjectUnpurgeableAPPLE);

+#endif

+

+   /* GL_EXT_texture_integer */

+   SET_ClearColorIiEXT(table, save_ClearColorIi);

+   SET_ClearColorIuiEXT(table, save_ClearColorIui);

+   SET_TexParameterIivEXT(table, save_TexParameterIiv);

+   SET_TexParameterIuivEXT(table, save_TexParameterIuiv);

+   SET_GetTexParameterIivEXT(table, exec_GetTexParameterIiv);

+   SET_GetTexParameterIuivEXT(table, exec_GetTexParameterIuiv);

+

+   /* 377. GL_EXT_separate_shader_objects */

+   SET_UseShaderProgramEXT(table, save_UseShaderProgramEXT);

+   SET_ActiveProgramEXT(table, save_ActiveProgramEXT);

+

+   /* GL_ARB_color_buffer_float */

+   SET_ClampColorARB(table, save_ClampColorARB);

+   SET_ClampColor(table, save_ClampColorARB);

+

+   /* GL 3.0 */

+#if 0

+   SET_ClearBufferiv(table, save_ClearBufferiv);

+   SET_ClearBufferuiv(table, save_ClearBufferuiv);

+   SET_ClearBufferfv(table, save_ClearBufferfv);

+   SET_ClearBufferfi(table, save_ClearBufferfi);

+   SET_Uniform1ui(table, save_Uniform1ui);

+   SET_Uniform2ui(table, save_Uniform2ui);

+   SET_Uniform3ui(table, save_Uniform3ui);

+   SET_Uniform4ui(table, save_Uniform4ui);

+   SET_Uniform1uiv(table, save_Uniform1uiv);

+   SET_Uniform2uiv(table, save_Uniform2uiv);

+   SET_Uniform3uiv(table, save_Uniform3uiv);

+   SET_Uniform4uiv(table, save_Uniform4uiv);

+#else

+   (void) save_ClearBufferiv;

+   (void) save_ClearBufferuiv;

+   (void) save_ClearBufferfv;

+   (void) save_ClearBufferfi;

+   (void) save_Uniform1ui;

+   (void) save_Uniform2ui;

+   (void) save_Uniform3ui;

+   (void) save_Uniform4ui;

+   (void) save_Uniform1uiv;

+   (void) save_Uniform2uiv;

+   (void) save_Uniform3uiv;

+   (void) save_Uniform4uiv;

+#endif

+

+   /* GL_ARB_instanced_arrays */

+   SET_VertexAttribDivisorARB(table, save_VertexAttribDivisor);

+

+   /* GL_NV_texture_barrier */

+   SET_TextureBarrierNV(table, save_TextureBarrierNV);

+

+   /* GL_ARB_draw_buffer_blend */

+   SET_BlendFunciARB(table, save_BlendFunci);

+   SET_BlendFuncSeparateiARB(table, save_BlendFuncSeparatei);

+   SET_BlendEquationiARB(table, save_BlendEquationi);

+   SET_BlendEquationSeparateiARB(table, save_BlendEquationSeparatei);

+

+   return table;

+}

+

+

+

+static const char *

+enum_string(GLenum k)

+{

+   return _mesa_lookup_enum_by_nr(k);

+}

+

+

+/**

+ * Print the commands in a display list.  For debugging only.

+ * TODO: many commands aren't handled yet.

+ */

+static void GLAPIENTRY

+print_list(struct gl_context *ctx, GLuint list)

+{

+   struct gl_display_list *dlist;

+   Node *n;

+   GLboolean done;

+

+   if (!islist(ctx, list)) {

+      printf("%u is not a display list ID\n", list);

+      return;

+   }

+

+   dlist = lookup_list(ctx, list);

+   if (!dlist)

+      return;

+

+   n = dlist->Head;

+

+   printf("START-LIST %u, address %p\n", list, (void *) n);

+

+   done = n ? GL_FALSE : GL_TRUE;

+   while (!done) {

+      const OpCode opcode = n[0].opcode;

+

+      if (is_ext_opcode(opcode)) {

+         n += ext_opcode_print(ctx, n);

+      }

+      else {

+         switch (opcode) {

+         case OPCODE_ACCUM:

+            printf("Accum %s %g\n", enum_string(n[1].e), n[2].f);

+            break;

+         case OPCODE_BITMAP:

+            printf("Bitmap %d %d %g %g %g %g %p\n", n[1].i, n[2].i,

+                         n[3].f, n[4].f, n[5].f, n[6].f, (void *) n[7].data);

+            break;

+         case OPCODE_CALL_LIST:

+            printf("CallList %d\n", (int) n[1].ui);

+            break;

+         case OPCODE_CALL_LIST_OFFSET:

+            printf("CallList %d + offset %u = %u\n", (int) n[1].ui,

+                         ctx->List.ListBase, ctx->List.ListBase + n[1].ui);

+            break;

+         case OPCODE_COLOR_TABLE_PARAMETER_FV:

+            printf("ColorTableParameterfv %s %s %f %f %f %f\n",

+                         enum_string(n[1].e), enum_string(n[2].e),

+                         n[3].f, n[4].f, n[5].f, n[6].f);

+            break;

+         case OPCODE_COLOR_TABLE_PARAMETER_IV:

+            printf("ColorTableParameteriv %s %s %d %d %d %d\n",

+                         enum_string(n[1].e), enum_string(n[2].e),

+                         n[3].i, n[4].i, n[5].i, n[6].i);

+            break;

+         case OPCODE_DISABLE:

+            printf("Disable %s\n", enum_string(n[1].e));

+            break;

+         case OPCODE_ENABLE:

+            printf("Enable %s\n", enum_string(n[1].e));

+            break;

+         case OPCODE_FRUSTUM:

+            printf("Frustum %g %g %g %g %g %g\n",

+                         n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f);

+            break;

+         case OPCODE_LINE_STIPPLE:

+            printf("LineStipple %d %x\n", n[1].i, (int) n[2].us);

+            break;

+         case OPCODE_LOAD_IDENTITY:

+            printf("LoadIdentity\n");

+            break;

+         case OPCODE_LOAD_MATRIX:

+            printf("LoadMatrix\n");

+            printf("  %8f %8f %8f %8f\n",

+                         n[1].f, n[5].f, n[9].f, n[13].f);

+            printf("  %8f %8f %8f %8f\n",

+                         n[2].f, n[6].f, n[10].f, n[14].f);

+            printf("  %8f %8f %8f %8f\n",

+                         n[3].f, n[7].f, n[11].f, n[15].f);

+            printf("  %8f %8f %8f %8f\n",

+                         n[4].f, n[8].f, n[12].f, n[16].f);

+            break;

+         case OPCODE_MULT_MATRIX:

+            printf("MultMatrix (or Rotate)\n");

+            printf("  %8f %8f %8f %8f\n",

+                         n[1].f, n[5].f, n[9].f, n[13].f);

+            printf("  %8f %8f %8f %8f\n",

+                         n[2].f, n[6].f, n[10].f, n[14].f);

+            printf("  %8f %8f %8f %8f\n",

+                         n[3].f, n[7].f, n[11].f, n[15].f);

+            printf("  %8f %8f %8f %8f\n",

+                         n[4].f, n[8].f, n[12].f, n[16].f);

+            break;

+         case OPCODE_ORTHO:

+            printf("Ortho %g %g %g %g %g %g\n",

+                         n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f);

+            break;

+         case OPCODE_POP_ATTRIB:

+            printf("PopAttrib\n");

+            break;

+         case OPCODE_POP_MATRIX:

+            printf("PopMatrix\n");

+            break;

+         case OPCODE_POP_NAME:

+            printf("PopName\n");

+            break;

+         case OPCODE_PUSH_ATTRIB:

+            printf("PushAttrib %x\n", n[1].bf);

+            break;

+         case OPCODE_PUSH_MATRIX:

+            printf("PushMatrix\n");

+            break;

+         case OPCODE_PUSH_NAME:

+            printf("PushName %d\n", (int) n[1].ui);

+            break;

+         case OPCODE_RASTER_POS:

+            printf("RasterPos %g %g %g %g\n",

+                         n[1].f, n[2].f, n[3].f, n[4].f);

+            break;

+         case OPCODE_ROTATE:

+            printf("Rotate %g %g %g %g\n",

+                         n[1].f, n[2].f, n[3].f, n[4].f);

+            break;

+         case OPCODE_SCALE:

+            printf("Scale %g %g %g\n", n[1].f, n[2].f, n[3].f);

+            break;

+         case OPCODE_TRANSLATE:

+            printf("Translate %g %g %g\n", n[1].f, n[2].f, n[3].f);

+            break;

+         case OPCODE_BIND_TEXTURE:

+            printf("BindTexture %s %d\n",

+                         _mesa_lookup_enum_by_nr(n[1].ui), n[2].ui);

+            break;

+         case OPCODE_SHADE_MODEL:

+            printf("ShadeModel %s\n", _mesa_lookup_enum_by_nr(n[1].ui));

+            break;

+         case OPCODE_MAP1:

+            printf("Map1 %s %.3f %.3f %d %d\n",

+                         _mesa_lookup_enum_by_nr(n[1].ui),

+                         n[2].f, n[3].f, n[4].i, n[5].i);

+            break;

+         case OPCODE_MAP2:

+            printf("Map2 %s %.3f %.3f %.3f %.3f %d %d %d %d\n",

+                         _mesa_lookup_enum_by_nr(n[1].ui),

+                         n[2].f, n[3].f, n[4].f, n[5].f,

+                         n[6].i, n[7].i, n[8].i, n[9].i);

+            break;

+         case OPCODE_MAPGRID1:

+            printf("MapGrid1 %d %.3f %.3f\n", n[1].i, n[2].f, n[3].f);

+            break;

+         case OPCODE_MAPGRID2:

+            printf("MapGrid2 %d %.3f %.3f, %d %.3f %.3f\n",

+                         n[1].i, n[2].f, n[3].f, n[4].i, n[5].f, n[6].f);

+            break;

+         case OPCODE_EVALMESH1:

+            printf("EvalMesh1 %d %d\n", n[1].i, n[2].i);

+            break;

+         case OPCODE_EVALMESH2:

+            printf("EvalMesh2 %d %d %d %d\n",

+                         n[1].i, n[2].i, n[3].i, n[4].i);

+            break;

+

+         case OPCODE_ATTR_1F_NV:

+            printf("ATTR_1F_NV attr %d: %f\n", n[1].i, n[2].f);

+            break;

+         case OPCODE_ATTR_2F_NV:

+            printf("ATTR_2F_NV attr %d: %f %f\n",

+                         n[1].i, n[2].f, n[3].f);

+            break;

+         case OPCODE_ATTR_3F_NV:

+            printf("ATTR_3F_NV attr %d: %f %f %f\n",

+                         n[1].i, n[2].f, n[3].f, n[4].f);

+            break;

+         case OPCODE_ATTR_4F_NV:

+            printf("ATTR_4F_NV attr %d: %f %f %f %f\n",

+                         n[1].i, n[2].f, n[3].f, n[4].f, n[5].f);

+            break;

+         case OPCODE_ATTR_1F_ARB:

+            printf("ATTR_1F_ARB attr %d: %f\n", n[1].i, n[2].f);

+            break;

+         case OPCODE_ATTR_2F_ARB:

+            printf("ATTR_2F_ARB attr %d: %f %f\n",

+                         n[1].i, n[2].f, n[3].f);

+            break;

+         case OPCODE_ATTR_3F_ARB:

+            printf("ATTR_3F_ARB attr %d: %f %f %f\n",

+                         n[1].i, n[2].f, n[3].f, n[4].f);

+            break;

+         case OPCODE_ATTR_4F_ARB:

+            printf("ATTR_4F_ARB attr %d: %f %f %f %f\n",

+                         n[1].i, n[2].f, n[3].f, n[4].f, n[5].f);

+            break;

+

+         case OPCODE_MATERIAL:

+            printf("MATERIAL %x %x: %f %f %f %f\n",

+                         n[1].i, n[2].i, n[3].f, n[4].f, n[5].f, n[6].f);

+            break;

+         case OPCODE_BEGIN:

+            printf("BEGIN %x\n", n[1].i);

+            break;

+         case OPCODE_END:

+            printf("END\n");

+            break;

+         case OPCODE_RECTF:

+            printf("RECTF %f %f %f %f\n", n[1].f, n[2].f, n[3].f,

+                         n[4].f);

+            break;

+         case OPCODE_EVAL_C1:

+            printf("EVAL_C1 %f\n", n[1].f);

+            break;

+         case OPCODE_EVAL_C2:

+            printf("EVAL_C2 %f %f\n", n[1].f, n[2].f);

+            break;

+         case OPCODE_EVAL_P1:

+            printf("EVAL_P1 %d\n", n[1].i);

+            break;

+         case OPCODE_EVAL_P2:

+            printf("EVAL_P2 %d %d\n", n[1].i, n[2].i);

+            break;

+

+         case OPCODE_PROVOKING_VERTEX:

+            printf("ProvokingVertex %s\n",

+                         _mesa_lookup_enum_by_nr(n[1].ui));

+            break;

+

+            /*

+             * meta opcodes/commands

+             */

+         case OPCODE_ERROR:

+            printf("Error: %s %s\n",

+                         enum_string(n[1].e), (const char *) n[2].data);

+            break;

+         case OPCODE_CONTINUE:

+            printf("DISPLAY-LIST-CONTINUE\n");

+            n = (Node *) n[1].next;

+            break;

+         case OPCODE_END_OF_LIST:

+            printf("END-LIST %u\n", list);

+            done = GL_TRUE;

+            break;

+         default:

+            if (opcode < 0 || opcode > OPCODE_END_OF_LIST) {

+               printf

+                  ("ERROR IN DISPLAY LIST: opcode = %d, address = %p\n",

+                   opcode, (void *) n);

+               return;

+            }

+            else {

+               printf("command %d, %u operands\n", opcode,

+                            InstSize[opcode]);

+            }

+         }

+         /* increment n to point to next compiled command */

+         if (opcode != OPCODE_CONTINUE) {

+            n += InstSize[opcode];

+         }

+      }

+   }

+}

+

+

+

+/**

+ * Clients may call this function to help debug display list problems.

+ * This function is _ONLY_FOR_DEBUGGING_PURPOSES_.  It may be removed,

+ * changed, or break in the future without notice.

+ */

+void

+mesa_print_display_list(GLuint list)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   print_list(ctx, list);

+}

+

+

+/**********************************************************************/

+/*****                      Initialization                        *****/

+/**********************************************************************/

+

+void

+_mesa_save_vtxfmt_init(GLvertexformat * vfmt)

+{

+   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);

+

+   vfmt->Begin = save_Begin;

+

+   _MESA_INIT_DLIST_VTXFMT(vfmt, save_);

+

+   vfmt->Color3f = save_Color3f;

+   vfmt->Color3fv = save_Color3fv;

+   vfmt->Color4f = save_Color4f;

+   vfmt->Color4fv = save_Color4fv;

+   vfmt->EdgeFlag = save_EdgeFlag;

+   vfmt->End = save_End;

+

+   _MESA_INIT_EVAL_VTXFMT(vfmt, save_);

+

+   vfmt->FogCoordfEXT = save_FogCoordfEXT;

+   vfmt->FogCoordfvEXT = save_FogCoordfvEXT;

+   vfmt->Indexf = save_Indexf;

+   vfmt->Indexfv = save_Indexfv;

+   vfmt->Materialfv = save_Materialfv;

+   vfmt->MultiTexCoord1fARB = save_MultiTexCoord1f;

+   vfmt->MultiTexCoord1fvARB = save_MultiTexCoord1fv;

+   vfmt->MultiTexCoord2fARB = save_MultiTexCoord2f;

+   vfmt->MultiTexCoord2fvARB = save_MultiTexCoord2fv;

+   vfmt->MultiTexCoord3fARB = save_MultiTexCoord3f;

+   vfmt->MultiTexCoord3fvARB = save_MultiTexCoord3fv;

+   vfmt->MultiTexCoord4fARB = save_MultiTexCoord4f;

+   vfmt->MultiTexCoord4fvARB = save_MultiTexCoord4fv;

+   vfmt->Normal3f = save_Normal3f;

+   vfmt->Normal3fv = save_Normal3fv;

+   vfmt->SecondaryColor3fEXT = save_SecondaryColor3fEXT;

+   vfmt->SecondaryColor3fvEXT = save_SecondaryColor3fvEXT;

+   vfmt->TexCoord1f = save_TexCoord1f;

+   vfmt->TexCoord1fv = save_TexCoord1fv;

+   vfmt->TexCoord2f = save_TexCoord2f;

+   vfmt->TexCoord2fv = save_TexCoord2fv;

+   vfmt->TexCoord3f = save_TexCoord3f;

+   vfmt->TexCoord3fv = save_TexCoord3fv;

+   vfmt->TexCoord4f = save_TexCoord4f;

+   vfmt->TexCoord4fv = save_TexCoord4fv;

+   vfmt->Vertex2f = save_Vertex2f;

+   vfmt->Vertex2fv = save_Vertex2fv;

+   vfmt->Vertex3f = save_Vertex3f;

+   vfmt->Vertex3fv = save_Vertex3fv;

+   vfmt->Vertex4f = save_Vertex4f;

+   vfmt->Vertex4fv = save_Vertex4fv;

+   vfmt->VertexAttrib1fNV = save_VertexAttrib1fNV;

+   vfmt->VertexAttrib1fvNV = save_VertexAttrib1fvNV;

+   vfmt->VertexAttrib2fNV = save_VertexAttrib2fNV;

+   vfmt->VertexAttrib2fvNV = save_VertexAttrib2fvNV;

+   vfmt->VertexAttrib3fNV = save_VertexAttrib3fNV;

+   vfmt->VertexAttrib3fvNV = save_VertexAttrib3fvNV;

+   vfmt->VertexAttrib4fNV = save_VertexAttrib4fNV;

+   vfmt->VertexAttrib4fvNV = save_VertexAttrib4fvNV;

+   vfmt->VertexAttrib1fARB = save_VertexAttrib1fARB;

+   vfmt->VertexAttrib1fvARB = save_VertexAttrib1fvARB;

+   vfmt->VertexAttrib2fARB = save_VertexAttrib2fARB;

+   vfmt->VertexAttrib2fvARB = save_VertexAttrib2fvARB;

+   vfmt->VertexAttrib3fARB = save_VertexAttrib3fARB;

+   vfmt->VertexAttrib3fvARB = save_VertexAttrib3fvARB;

+   vfmt->VertexAttrib4fARB = save_VertexAttrib4fARB;

+   vfmt->VertexAttrib4fvARB = save_VertexAttrib4fvARB;

+

+   vfmt->Rectf = save_Rectf;

+

+   /* The driver is required to implement these as

+    * 1) They can probably do a better job.

+    * 2) A lot of new mechanisms would have to be added to this module

+    *     to support it.  That code would probably never get used,

+    *     because of (1).

+    */

+#if 0

+   vfmt->DrawArrays = 0;

+   vfmt->DrawElements = 0;

+   vfmt->DrawRangeElements = 0;

+   vfmt->MultiDrawElemementsEXT = 0;

+   vfmt->DrawElementsBaseVertex = 0;

+   vfmt->DrawRangeElementsBaseVertex = 0;

+   vfmt->MultiDrawElemementsBaseVertex = 0;

+#endif

+}

+

+

+void

+_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,

+                           const GLvertexformat *vfmt)

+{

+   SET_CallList(disp, vfmt->CallList);

+   SET_CallLists(disp, vfmt->CallLists);

+}

+

+

+void _mesa_init_dlist_dispatch(struct _glapi_table *disp)

+{

+   SET_CallList(disp, _mesa_CallList);

+   SET_CallLists(disp, _mesa_CallLists);

+

+   SET_DeleteLists(disp, _mesa_DeleteLists);

+   SET_EndList(disp, _mesa_EndList);

+   SET_GenLists(disp, _mesa_GenLists);

+   SET_IsList(disp, _mesa_IsList);

+   SET_ListBase(disp, _mesa_ListBase);

+   SET_NewList(disp, _mesa_NewList);

+}

+

+

+#endif /* FEATURE_dlist */

+

+

+/**

+ * Initialize display list state for given context.

+ */

+void

+_mesa_init_display_list(struct gl_context *ctx)

+{

+   static GLboolean tableInitialized = GL_FALSE;

+

+   /* zero-out the instruction size table, just once */

+   if (!tableInitialized) {

+      memset(InstSize, 0, sizeof(InstSize));

+      tableInitialized = GL_TRUE;

+   }

+

+   /* extension info */

+   ctx->ListExt = CALLOC_STRUCT(gl_list_extensions);

+

+   /* Display list */

+   ctx->ListState.CallDepth = 0;

+   ctx->ExecuteFlag = GL_TRUE;

+   ctx->CompileFlag = GL_FALSE;

+   ctx->ListState.CurrentBlock = NULL;

+   ctx->ListState.CurrentPos = 0;

+

+   /* Display List group */

+   ctx->List.ListBase = 0;

+

+#if FEATURE_dlist

+   _mesa_save_vtxfmt_init(&ctx->ListState.ListVtxfmt);

+#endif

+}

+

+

+void

+_mesa_free_display_list_data(struct gl_context *ctx)

+{

+   free(ctx->ListExt);

+   ctx->ListExt = NULL;

+}

diff --git a/mesalib/src/mesa/main/dlopen.c b/mesalib/src/mesa/main/dlopen.c
index 57a33292e..62d9023a9 100644
--- a/mesalib/src/mesa/main/dlopen.c
+++ b/mesalib/src/mesa/main/dlopen.c
@@ -51,7 +51,7 @@ _mesa_dlopen(const char *libname, int flags)
 #elif defined(_GNU_SOURCE)
    flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
    return dlopen(libname, flags);
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) | defined(_MSC_VER)
    return LoadLibraryA(libname);
 #else
    return NULL;
@@ -82,7 +82,7 @@ _mesa_dlsym(void *handle, const char *fname)
    u.v = dlsym(handle, fname2);
 #elif defined(_GNU_SOURCE)
    u.v = dlsym(handle, fname);
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) | defined(_MSC_VER)
    u.v = (void *) GetProcAddress(handle, fname);
 #else
    u.v = NULL;
@@ -101,7 +101,7 @@ _mesa_dlclose(void *handle)
    (void) handle;
 #elif defined(_GNU_SOURCE)
    dlclose(handle);
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) | defined(_MSC_VER)
    FreeLibrary(handle);
 #else
    (void) handle;
diff --git a/mesalib/src/mesa/main/drawpix.c b/mesalib/src/mesa/main/drawpix.c
index fb86036a1..ab6e61fe3 100644
--- a/mesalib/src/mesa/main/drawpix.c
+++ b/mesalib/src/mesa/main/drawpix.c
@@ -1,302 +1,302 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-#include "glheader.h"
-#include "imports.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "drawpix.h"
-#include "enums.h"
-#include "feedback.h"
-#include "framebuffer.h"
-#include "mfeatures.h"
-#include "pbo.h"
-#include "readpix.h"
-#include "state.h"
-#include "dispatch.h"
-
-
-#if FEATURE_drawpix
-
-
-/*
- * Execute glDrawPixels
- */
-static void GLAPIENTRY
-_mesa_DrawPixels( GLsizei width, GLsizei height,
-                  GLenum format, GLenum type, const GLvoid *pixels )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glDrawPixels(%d, %d, %s, %s, %p) // to %s at %d, %d\n",
-                  width, height,
-                  _mesa_lookup_enum_by_nr(format),
-                  _mesa_lookup_enum_by_nr(type),
-                  pixels,
-                  _mesa_lookup_enum_by_nr(ctx->DrawBuffer->ColorDrawBuffer[0]),
-                  IROUND(ctx->Current.RasterPos[0]),
-                  IROUND(ctx->Current.RasterPos[1]));
-
-
-   if (width < 0 || height < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glDrawPixels(width or height < 0" );
-      return;
-   }
-
-   /* We're not using the current vertex program, and the driver may install
-    * its own.  Note: this may dirty some state.
-    */
-   _mesa_set_vp_override(ctx, GL_TRUE);
-
-   /* Note: this call does state validation */
-   if (!_mesa_valid_to_render(ctx, "glDrawPixels")) {
-      goto end;      /* the error code was recorded */
-   }
-
-   if (_mesa_error_check_format_type(ctx, format, type, GL_TRUE)) {
-      goto end;      /* the error code was recorded */
-   }
-
-   if (!ctx->Current.RasterPosValid) {
-      goto end;  /* no-op, not an error */
-   }
-
-   if (ctx->RenderMode == GL_RENDER) {
-      if (width > 0 && height > 0) {
-         /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
-         GLint x = IROUND(ctx->Current.RasterPos[0]);
-         GLint y = IROUND(ctx->Current.RasterPos[1]);
-
-         if (ctx->Unpack.BufferObj->Name) {
-            /* unpack from PBO */
-            if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
-                                           format, type, pixels)) {
-               _mesa_error(ctx, GL_INVALID_OPERATION,
-                           "glDrawPixels(invalid PBO access)");
-               goto end;
-            }
-            if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
-               /* buffer is mapped - that's an error */
-               _mesa_error(ctx, GL_INVALID_OPERATION,
-                           "glDrawPixels(PBO is mapped)");
-               goto end;
-            }
-         }
-
-         ctx->Driver.DrawPixels(ctx, x, y, width, height, format, type,
-                                &ctx->Unpack, pixels);
-      }
-   }
-   else if (ctx->RenderMode == GL_FEEDBACK) {
-      /* Feedback the current raster pos info */
-      FLUSH_CURRENT( ctx, 0 );
-      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_DRAW_PIXEL_TOKEN );
-      _mesa_feedback_vertex( ctx,
-                             ctx->Current.RasterPos,
-                             ctx->Current.RasterColor,
-                             ctx->Current.RasterTexCoords[0] );
-   }
-   else {
-      ASSERT(ctx->RenderMode == GL_SELECT);
-      /* Do nothing.  See OpenGL Spec, Appendix B, Corollary 6. */
-   }
-
-end:
-   _mesa_set_vp_override(ctx, GL_FALSE);
-}
-
-
-static void GLAPIENTRY
-_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
-                  GLenum type )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx,
-                  "glCopyPixels(%d, %d, %d, %d, %s) // from %s to %s at %d, %d\n",
-                  srcx, srcy, width, height,
-                  _mesa_lookup_enum_by_nr(type),
-                  _mesa_lookup_enum_by_nr(ctx->ReadBuffer->ColorReadBuffer),
-                  _mesa_lookup_enum_by_nr(ctx->DrawBuffer->ColorDrawBuffer[0]),
-                  IROUND(ctx->Current.RasterPos[0]),
-                  IROUND(ctx->Current.RasterPos[1]));
-
-   if (width < 0 || height < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyPixels(width or height < 0)");
-      return;
-   }
-
-   /* Note: more detailed 'type' checking is done by the
-    * _mesa_source/dest_buffer_exists() calls below.  That's where we
-    * check if the stencil buffer exists, etc.
-    */
-   if (type != GL_COLOR &&
-       type != GL_DEPTH &&
-       type != GL_STENCIL &&
-       type != GL_DEPTH_STENCIL) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyPixels(type=%s)",
-                  _mesa_lookup_enum_by_nr(type));
-      return;
-   }
-
-   /* We're not using the current vertex program, and the driver may install
-    * it's own.  Note: this may dirty some state.
-    */
-   _mesa_set_vp_override(ctx, GL_TRUE);
-
-   /* Note: this call does state validation */
-   if (!_mesa_valid_to_render(ctx, "glCopyPixels")) {
-      goto end;      /* the error code was recorded */
-   }
-
-   /* Check read buffer's status (draw buffer was already checked) */
-   if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glCopyPixels(incomplete framebuffer)" );
-      goto end;
-   }
-
-   if (!_mesa_source_buffer_exists(ctx, type) ||
-       !_mesa_dest_buffer_exists(ctx, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCopyPixels(missing source or dest buffer)");
-      goto end;
-   }
-
-   if (!ctx->Current.RasterPosValid || width ==0 || height == 0) {
-      goto end; /* no-op, not an error */
-   }
-
-   if (ctx->RenderMode == GL_RENDER) {
-      /* Round to satisfy conformance tests (matches SGI's OpenGL) */
-      if (width > 0 && height > 0) {
-         GLint destx = IROUND(ctx->Current.RasterPos[0]);
-         GLint desty = IROUND(ctx->Current.RasterPos[1]);
-         ctx->Driver.CopyPixels( ctx, srcx, srcy, width, height, destx, desty,
-                                 type );
-      }
-   }
-   else if (ctx->RenderMode == GL_FEEDBACK) {
-      FLUSH_CURRENT( ctx, 0 );
-      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_COPY_PIXEL_TOKEN );
-      _mesa_feedback_vertex( ctx, 
-                             ctx->Current.RasterPos,
-                             ctx->Current.RasterColor,
-                             ctx->Current.RasterTexCoords[0] );
-   }
-   else {
-      ASSERT(ctx->RenderMode == GL_SELECT);
-      /* Do nothing.  See OpenGL Spec, Appendix B, Corollary 6. */
-   }
-
-end:
-   _mesa_set_vp_override(ctx, GL_FALSE);
-}
-
-
-static void GLAPIENTRY
-_mesa_Bitmap( GLsizei width, GLsizei height,
-              GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
-              const GLubyte *bitmap )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (width < 0 || height < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glBitmap(width or height < 0)" );
-      return;
-   }
-
-   if (!ctx->Current.RasterPosValid) {
-      return;    /* do nothing */
-   }
-
-   /* Note: this call does state validation */
-   if (!_mesa_valid_to_render(ctx, "glBitmap")) {
-      /* the error code was recorded */
-      return;
-   }
-
-   if (ctx->RenderMode == GL_RENDER) {
-      /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
-      if (width > 0 && height > 0) {
-         const GLfloat epsilon = 0.0001F;
-         GLint x = IFLOOR(ctx->Current.RasterPos[0] + epsilon - xorig);
-         GLint y = IFLOOR(ctx->Current.RasterPos[1] + epsilon - yorig);
-
-         if (ctx->Unpack.BufferObj->Name) {
-            /* unpack from PBO */
-            if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
-                                           GL_COLOR_INDEX, GL_BITMAP,
-                                           (GLvoid *) bitmap)) {
-               _mesa_error(ctx, GL_INVALID_OPERATION,
-                           "glBitmap(invalid PBO access)");
-               return;
-            }
-            if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
-               /* buffer is mapped - that's an error */
-               _mesa_error(ctx, GL_INVALID_OPERATION,
-                           "glBitmap(PBO is mapped)");
-               return;
-            }
-         }
-
-         ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
-      }
-   }
-#if _HAVE_FULL_GL
-   else if (ctx->RenderMode == GL_FEEDBACK) {
-      FLUSH_CURRENT(ctx, 0);
-      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_BITMAP_TOKEN );
-      _mesa_feedback_vertex( ctx,
-                             ctx->Current.RasterPos,
-                             ctx->Current.RasterColor,
-                             ctx->Current.RasterTexCoords[0] );
-   }
-   else {
-      ASSERT(ctx->RenderMode == GL_SELECT);
-      /* Do nothing.  See OpenGL Spec, Appendix B, Corollary 6. */
-   }
-#endif
-
-   /* update raster position */
-   ctx->Current.RasterPos[0] += xmove;
-   ctx->Current.RasterPos[1] += ymove;
-}
-
-
-void
-_mesa_init_drawpix_dispatch(struct _glapi_table *disp)
-{
-   SET_Bitmap(disp, _mesa_Bitmap);
-   SET_CopyPixels(disp, _mesa_CopyPixels);
-   SET_DrawPixels(disp, _mesa_DrawPixels);
-}
-
-
-#endif /* FEATURE_drawpix */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+#include "glheader.h"

+#include "imports.h"

+#include "bufferobj.h"

+#include "context.h"

+#include "drawpix.h"

+#include "enums.h"

+#include "feedback.h"

+#include "framebuffer.h"

+#include "mfeatures.h"

+#include "pbo.h"

+#include "readpix.h"

+#include "state.h"

+#include "dispatch.h"

+

+

+#if FEATURE_drawpix

+

+

+/*

+ * Execute glDrawPixels

+ */

+static void GLAPIENTRY

+_mesa_DrawPixels( GLsizei width, GLsizei height,

+                  GLenum format, GLenum type, const GLvoid *pixels )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glDrawPixels(%d, %d, %s, %s, %p) // to %s at %d, %d\n",

+                  width, height,

+                  _mesa_lookup_enum_by_nr(format),

+                  _mesa_lookup_enum_by_nr(type),

+                  pixels,

+                  _mesa_lookup_enum_by_nr(ctx->DrawBuffer->ColorDrawBuffer[0]),

+                  IROUND(ctx->Current.RasterPos[0]),

+                  IROUND(ctx->Current.RasterPos[1]));

+

+

+   if (width < 0 || height < 0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glDrawPixels(width or height < 0" );

+      return;

+   }

+

+   /* We're not using the current vertex program, and the driver may install

+    * its own.  Note: this may dirty some state.

+    */

+   _mesa_set_vp_override(ctx, GL_TRUE);

+

+   /* Note: this call does state validation */

+   if (!_mesa_valid_to_render(ctx, "glDrawPixels")) {

+      goto end;      /* the error code was recorded */

+   }

+

+   if (_mesa_error_check_format_type(ctx, format, type, GL_TRUE)) {

+      goto end;      /* the error code was recorded */

+   }

+

+   if (!ctx->Current.RasterPosValid) {

+      goto end;  /* no-op, not an error */

+   }

+

+   if (ctx->RenderMode == GL_RENDER) {

+      if (width > 0 && height > 0) {

+         /* Round, to satisfy conformance tests (matches SGI's OpenGL) */

+         GLint x = IROUND(ctx->Current.RasterPos[0]);

+         GLint y = IROUND(ctx->Current.RasterPos[1]);

+

+         if (ctx->Unpack.BufferObj->Name) {

+            /* unpack from PBO */

+            if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,

+                                           format, type, pixels)) {

+               _mesa_error(ctx, GL_INVALID_OPERATION,

+                           "glDrawPixels(invalid PBO access)");

+               goto end;

+            }

+            if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {

+               /* buffer is mapped - that's an error */

+               _mesa_error(ctx, GL_INVALID_OPERATION,

+                           "glDrawPixels(PBO is mapped)");

+               goto end;

+            }

+         }

+

+         ctx->Driver.DrawPixels(ctx, x, y, width, height, format, type,

+                                &ctx->Unpack, pixels);

+      }

+   }

+   else if (ctx->RenderMode == GL_FEEDBACK) {

+      /* Feedback the current raster pos info */

+      FLUSH_CURRENT( ctx, 0 );

+      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_DRAW_PIXEL_TOKEN );

+      _mesa_feedback_vertex( ctx,

+                             ctx->Current.RasterPos,

+                             ctx->Current.RasterColor,

+                             ctx->Current.RasterTexCoords[0] );

+   }

+   else {

+      ASSERT(ctx->RenderMode == GL_SELECT);

+      /* Do nothing.  See OpenGL Spec, Appendix B, Corollary 6. */

+   }

+

+end:

+   _mesa_set_vp_override(ctx, GL_FALSE);

+}

+

+

+static void GLAPIENTRY

+_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,

+                  GLenum type )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx,

+                  "glCopyPixels(%d, %d, %d, %d, %s) // from %s to %s at %d, %d\n",

+                  srcx, srcy, width, height,

+                  _mesa_lookup_enum_by_nr(type),

+                  _mesa_lookup_enum_by_nr(ctx->ReadBuffer->ColorReadBuffer),

+                  _mesa_lookup_enum_by_nr(ctx->DrawBuffer->ColorDrawBuffer[0]),

+                  IROUND(ctx->Current.RasterPos[0]),

+                  IROUND(ctx->Current.RasterPos[1]));

+

+   if (width < 0 || height < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyPixels(width or height < 0)");

+      return;

+   }

+

+   /* Note: more detailed 'type' checking is done by the

+    * _mesa_source/dest_buffer_exists() calls below.  That's where we

+    * check if the stencil buffer exists, etc.

+    */

+   if (type != GL_COLOR &&

+       type != GL_DEPTH &&

+       type != GL_STENCIL &&

+       type != GL_DEPTH_STENCIL) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyPixels(type=%s)",

+                  _mesa_lookup_enum_by_nr(type));

+      return;

+   }

+

+   /* We're not using the current vertex program, and the driver may install

+    * it's own.  Note: this may dirty some state.

+    */

+   _mesa_set_vp_override(ctx, GL_TRUE);

+

+   /* Note: this call does state validation */

+   if (!_mesa_valid_to_render(ctx, "glCopyPixels")) {

+      goto end;      /* the error code was recorded */

+   }

+

+   /* Check read buffer's status (draw buffer was already checked) */

+   if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,

+                  "glCopyPixels(incomplete framebuffer)" );

+      goto end;

+   }

+

+   if (!_mesa_source_buffer_exists(ctx, type) ||

+       !_mesa_dest_buffer_exists(ctx, type)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glCopyPixels(missing source or dest buffer)");

+      goto end;

+   }

+

+   if (!ctx->Current.RasterPosValid || width ==0 || height == 0) {

+      goto end; /* no-op, not an error */

+   }

+

+   if (ctx->RenderMode == GL_RENDER) {

+      /* Round to satisfy conformance tests (matches SGI's OpenGL) */

+      if (width > 0 && height > 0) {

+         GLint destx = IROUND(ctx->Current.RasterPos[0]);

+         GLint desty = IROUND(ctx->Current.RasterPos[1]);

+         ctx->Driver.CopyPixels( ctx, srcx, srcy, width, height, destx, desty,

+                                 type );

+      }

+   }

+   else if (ctx->RenderMode == GL_FEEDBACK) {

+      FLUSH_CURRENT( ctx, 0 );

+      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_COPY_PIXEL_TOKEN );

+      _mesa_feedback_vertex( ctx, 

+                             ctx->Current.RasterPos,

+                             ctx->Current.RasterColor,

+                             ctx->Current.RasterTexCoords[0] );

+   }

+   else {

+      ASSERT(ctx->RenderMode == GL_SELECT);

+      /* Do nothing.  See OpenGL Spec, Appendix B, Corollary 6. */

+   }

+

+end:

+   _mesa_set_vp_override(ctx, GL_FALSE);

+}

+

+

+static void GLAPIENTRY

+_mesa_Bitmap( GLsizei width, GLsizei height,

+              GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,

+              const GLubyte *bitmap )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (width < 0 || height < 0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glBitmap(width or height < 0)" );

+      return;

+   }

+

+   if (!ctx->Current.RasterPosValid) {

+      return;    /* do nothing */

+   }

+

+   /* Note: this call does state validation */

+   if (!_mesa_valid_to_render(ctx, "glBitmap")) {

+      /* the error code was recorded */

+      return;

+   }

+

+   if (ctx->RenderMode == GL_RENDER) {

+      /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */

+      if (width > 0 && height > 0) {

+         const GLfloat epsilon = 0.0001F;

+         GLint x = IFLOOR(ctx->Current.RasterPos[0] + epsilon - xorig);

+         GLint y = IFLOOR(ctx->Current.RasterPos[1] + epsilon - yorig);

+

+         if (ctx->Unpack.BufferObj->Name) {

+            /* unpack from PBO */

+            if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,

+                                           GL_COLOR_INDEX, GL_BITMAP,

+                                           (GLvoid *) bitmap)) {

+               _mesa_error(ctx, GL_INVALID_OPERATION,

+                           "glBitmap(invalid PBO access)");

+               return;

+            }

+            if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {

+               /* buffer is mapped - that's an error */

+               _mesa_error(ctx, GL_INVALID_OPERATION,

+                           "glBitmap(PBO is mapped)");

+               return;

+            }

+         }

+

+         ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );

+      }

+   }

+#if _HAVE_FULL_GL

+   else if (ctx->RenderMode == GL_FEEDBACK) {

+      FLUSH_CURRENT(ctx, 0);

+      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_BITMAP_TOKEN );

+      _mesa_feedback_vertex( ctx,

+                             ctx->Current.RasterPos,

+                             ctx->Current.RasterColor,

+                             ctx->Current.RasterTexCoords[0] );

+   }

+   else {

+      ASSERT(ctx->RenderMode == GL_SELECT);

+      /* Do nothing.  See OpenGL Spec, Appendix B, Corollary 6. */

+   }

+#endif

+

+   /* update raster position */

+   ctx->Current.RasterPos[0] += xmove;

+   ctx->Current.RasterPos[1] += ymove;

+}

+

+

+void

+_mesa_init_drawpix_dispatch(struct _glapi_table *disp)

+{

+   SET_Bitmap(disp, _mesa_Bitmap);

+   SET_CopyPixels(disp, _mesa_CopyPixels);

+   SET_DrawPixels(disp, _mesa_DrawPixels);

+}

+

+

+#endif /* FEATURE_drawpix */

diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 285e08d75..0c37141cb 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -1,996 +1,996 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.6
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file
- * \brief Extension handling
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "extensions.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-
-enum {
-   DISABLE = 0,
-   GL  = 1 << API_OPENGL,
-   ES1 = 1 << API_OPENGLES,
-   ES2 = 1 << API_OPENGLES2,
-};
-
-/**
- * \brief An element of the \c extension_table.
- */
-struct extension {
-   /** Name of extension, such as "GL_ARB_depth_clamp". */
-   const char *name;
-
-   /** Offset (in bytes) of the corresponding member in struct gl_extensions. */
-   size_t offset;
-
-   /** Set of API's in which the extension exists, as a bitset. */
-   uint8_t api_set;
-
-   /** Year the extension was proposed or approved.  Used to sort the 
-    * extension string chronologically. */
-   uint16_t year;
-};
-
-
-/**
- * Given a member \c x of struct gl_extensions, return offset of
- * \c x in bytes.
- */
-#define o(x) offsetof(struct gl_extensions, x)
-
-
-/**
- * \brief Table of supported OpenGL extensions for all API's.
- *
- * Note: The GL_MESAX_* extensions are placeholders for future ARB extensions.
- */
-static const struct extension extension_table[] = {
-   /* ARB Extensions */
-   { "GL_ARB_ES2_compatibility",                   o(ARB_ES2_compatibility),                   GL,             2009 },
-   { "GL_ARB_blend_func_extended",                 o(ARB_blend_func_extended),                 GL,             2009 },
-   { "GL_ARB_color_buffer_float",                  o(ARB_color_buffer_float),                  GL,             2004 },
-   { "GL_ARB_copy_buffer",                         o(ARB_copy_buffer),                         GL,             2008 },
-   { "GL_ARB_depth_buffer_float",                  o(ARB_depth_buffer_float),                  GL,             2008 },
-   { "GL_ARB_depth_clamp",                         o(ARB_depth_clamp),                         GL,             2003 },
-   { "GL_ARB_depth_texture",                       o(ARB_depth_texture),                       GL,             2001 },
-   { "GL_ARB_draw_buffers",                        o(ARB_draw_buffers),                        GL,             2002 },
-   { "GL_ARB_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL,             2009 },
-   { "GL_ARB_draw_elements_base_vertex",           o(ARB_draw_elements_base_vertex),           GL,             2009 },
-   { "GL_ARB_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2008 },
-   { "GL_ARB_explicit_attrib_location",            o(ARB_explicit_attrib_location),            GL,             2009 },
-   { "GL_ARB_fragment_coord_conventions",          o(ARB_fragment_coord_conventions),          GL,             2009 },
-   { "GL_ARB_fragment_program",                    o(ARB_fragment_program),                    GL,             2002 },
-   { "GL_ARB_fragment_program_shadow",             o(ARB_fragment_program_shadow),             GL,             2003 },
-   { "GL_ARB_fragment_shader",                     o(ARB_fragment_shader),                     GL,             2002 },
-   { "GL_ARB_framebuffer_object",                  o(ARB_framebuffer_object),                  GL,             2005 },
-   { "GL_ARB_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },
-   { "GL_ARB_half_float_pixel",                    o(ARB_half_float_pixel),                    GL,             2003 },
-   { "GL_ARB_half_float_vertex",                   o(ARB_half_float_vertex),                   GL,             2008 },
-   { "GL_ARB_instanced_arrays",                    o(ARB_instanced_arrays),                    GL,             2008 },
-   { "GL_ARB_map_buffer_range",                    o(ARB_map_buffer_range),                    GL,             2008 },
-   { "GL_ARB_multisample",                         o(ARB_multisample),                         GL,             1994 },
-   { "GL_ARB_multitexture",                        o(ARB_multitexture),                        GL,             1998 },
-   { "GL_ARB_occlusion_query2",                    o(ARB_occlusion_query2),                    GL,             2003 },
-   { "GL_ARB_occlusion_query",                     o(ARB_occlusion_query),                     GL,             2001 },
-   { "GL_ARB_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },
-   { "GL_ARB_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },
-   { "GL_ARB_point_sprite",                        o(ARB_point_sprite),                        GL,             2003 },
-   { "GL_ARB_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },
-   { "GL_ARB_sampler_objects",                     o(ARB_sampler_objects),                     GL,             2009 },
-   { "GL_ARB_seamless_cube_map",                   o(ARB_seamless_cube_map),                   GL,             2009 },
-   { "GL_ARB_shader_objects",                      o(ARB_shader_objects),                      GL,             2002 },
-   { "GL_ARB_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },
-   { "GL_ARB_shading_language_100",                o(ARB_shading_language_100),                GL,             2003 },
-   { "GL_ARB_shadow_ambient",                      o(ARB_shadow_ambient),                      GL,             2001 },
-   { "GL_ARB_shadow",                              o(ARB_shadow),                              GL,             2001 },
-   { "GL_ARB_sync",                                o(ARB_sync),                                GL,             2003 },
-   { "GL_ARB_texture_border_clamp",                o(ARB_texture_border_clamp),                GL,             2000 },
-   { "GL_ARB_texture_buffer_object",               o(ARB_texture_buffer_object),               GL,             2008 },
-   { "GL_ARB_texture_compression",                 o(ARB_texture_compression),                 GL,             2000 },
-   { "GL_ARB_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },
-   { "GL_ARB_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             1999 },
-   { "GL_ARB_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },
-   { "GL_ARB_texture_env_combine",                 o(ARB_texture_env_combine),                 GL,             2001 },
-   { "GL_ARB_texture_env_crossbar",                o(ARB_texture_env_crossbar),                GL,             2001 },
-   { "GL_ARB_texture_env_dot3",                    o(ARB_texture_env_dot3),                    GL,             2001 },
-   { "GL_ARB_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             2001 },
-   { "GL_ARB_texture_multisample",                 o(ARB_texture_multisample),                 GL,             2009 },
-   { "GL_ARB_texture_non_power_of_two",            o(ARB_texture_non_power_of_two),            GL,             2003 },
-   { "GL_ARB_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },
-   { "GL_ARB_texture_rgb10_a2ui",                  o(ARB_texture_rgb10_a2ui),                  GL,             2009 },
-   { "GL_ARB_texture_rg",                          o(ARB_texture_rg),                          GL,             2008 },
-   { "GL_ARB_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },
-   { "GL_ARB_transform_feedback2",                 o(ARB_transform_feedback2),                 GL,             2010 },
-   { "GL_ARB_transpose_matrix",                    o(ARB_transpose_matrix),                    GL,             1999 },
-   { "GL_ARB_uniform_buffer_object",               o(ARB_uniform_buffer_object),               GL,             2002 },
-   { "GL_ARB_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },
-   { "GL_ARB_vertex_array_object",                 o(ARB_vertex_array_object),                 GL,             2006 },
-   { "GL_ARB_vertex_buffer_object",                o(ARB_vertex_buffer_object),                GL,             2003 },
-   { "GL_ARB_vertex_program",                      o(ARB_vertex_program),                      GL,             2002 },
-   { "GL_ARB_vertex_shader",                       o(ARB_vertex_shader),                       GL,             2002 },
-   { "GL_ARB_vertex_type_2_10_10_10_rev",          o(ARB_vertex_type_2_10_10_10_rev),          GL,             2009 },
-   { "GL_ARB_window_pos",                          o(ARB_window_pos),                          GL,             2001 },
-
-   /* EXT extensions */
-   { "GL_EXT_abgr",                                o(EXT_abgr),                                GL,             1995 },
-   { "GL_EXT_bgra",                                o(EXT_bgra),                                GL,             1995 },
-   { "GL_EXT_blend_color",                         o(EXT_blend_color),                         GL,             1995 },
-   { "GL_EXT_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },
-   { "GL_EXT_blend_func_separate",                 o(EXT_blend_func_separate),                 GL,             1999 },
-   { "GL_EXT_blend_logic_op",                      o(EXT_blend_logic_op),                      GL,             1995 },
-   { "GL_EXT_blend_minmax",                        o(EXT_blend_minmax),                        GL | ES1 | ES2, 1995 },
-   { "GL_EXT_blend_subtract",                      o(EXT_blend_subtract),                      GL,             1995 },
-   { "GL_EXT_clip_volume_hint",                    o(EXT_clip_volume_hint),                    GL,             1996 },
-   { "GL_EXT_compiled_vertex_array",               o(EXT_compiled_vertex_array),               GL,             1996 },
-   { "GL_EXT_copy_texture",                        o(EXT_copy_texture),                        GL,             1995 },
-   { "GL_EXT_depth_bounds_test",                   o(EXT_depth_bounds_test),                   GL,             2002 },
-   { "GL_EXT_draw_buffers2",                       o(EXT_draw_buffers2),                       GL,             2006 },
-   { "GL_EXT_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2006 },
-   { "GL_EXT_draw_range_elements",                 o(EXT_draw_range_elements),                 GL,             1997 },
-   { "GL_EXT_fog_coord",                           o(EXT_fog_coord),                           GL,             1999 },
-   { "GL_EXT_framebuffer_blit",                    o(EXT_framebuffer_blit),                    GL,             2005 },
-   { "GL_EXT_framebuffer_multisample",             o(EXT_framebuffer_multisample),             GL,             2005 },
-   { "GL_EXT_framebuffer_object",                  o(EXT_framebuffer_object),                  GL,             2000 },
-   { "GL_EXT_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },
-   { "GL_EXT_gpu_program_parameters",              o(EXT_gpu_program_parameters),              GL,             2006 },
-   { "GL_EXT_gpu_shader4",                         o(EXT_gpu_shader4),                         GL,             2006 },
-   { "GL_EXT_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL | ES1 | ES2, 1999 },
-   { "GL_EXT_packed_depth_stencil",                o(EXT_packed_depth_stencil),                GL,             2005 },
-   { "GL_EXT_packed_float",                        o(EXT_packed_float),                        GL,             2004 },
-   { "GL_EXT_packed_pixels",                       o(EXT_packed_pixels),                       GL,             1997 },
-   { "GL_EXT_paletted_texture",                    o(EXT_paletted_texture),                    GL,             1995 },
-   { "GL_EXT_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },
-   { "GL_EXT_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },
-   { "GL_EXT_polygon_offset",                      o(EXT_polygon_offset),                      GL,             1995 },
-   { "GL_EXT_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },
-   { "GL_EXT_rescale_normal",                      o(EXT_rescale_normal),                      GL,             1997 },
-   { "GL_EXT_secondary_color",                     o(EXT_secondary_color),                     GL,             1999 },
-   { "GL_EXT_separate_shader_objects",             o(EXT_separate_shader_objects),             GL,             2008 },
-   { "GL_EXT_separate_specular_color",             o(EXT_separate_specular_color),             GL,             1997 },
-   { "GL_EXT_shadow_funcs",                        o(EXT_shadow_funcs),                        GL,             2002 },
-   { "GL_EXT_shared_texture_palette",              o(EXT_shared_texture_palette),              GL,             2000 },
-   { "GL_EXT_stencil_two_side",                    o(EXT_stencil_two_side),                    GL,             2001 },
-   { "GL_EXT_stencil_wrap",                        o(EXT_stencil_wrap),                        GL,             2002 },
-   { "GL_EXT_subtexture",                          o(EXT_subtexture),                          GL,             1995 },
-   { "GL_EXT_texture3D",                           o(EXT_texture3D),                           GL,             1996 },
-   { "GL_EXT_texture_array",                       o(EXT_texture_array),                       GL,             2006 },
-   { "GL_EXT_texture_compression_dxt1",            o(EXT_texture_compression_s3tc),            GL | ES1 | ES2, 2004 },
-   { "GL_EXT_texture_compression_latc",            o(EXT_texture_compression_latc),            GL,             2006 },
-   { "GL_EXT_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },
-   { "GL_EXT_texture_compression_s3tc",            o(EXT_texture_compression_s3tc),            GL,             2000 },
-   { "GL_EXT_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             2001 },
-   { "GL_EXT_texture_edge_clamp",                  o(SGIS_texture_edge_clamp),                 GL,             1997 },
-   { "GL_EXT_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },
-   { "GL_EXT_texture_env_combine",                 o(EXT_texture_env_combine),                 GL,             2006 },
-   { "GL_EXT_texture_env_dot3",                    o(EXT_texture_env_dot3),                    GL,             2000 },
-   { "GL_EXT_texture_filter_anisotropic",          o(EXT_texture_filter_anisotropic),          GL | ES1 | ES2, 1999 },
-   { "GL_EXT_texture_format_BGRA8888",             o(EXT_texture_format_BGRA8888),                  ES1 | ES2, 2009 },
-   { "GL_EXT_texture_integer",                     o(EXT_texture_integer),                     GL,             2006 },
-   { "GL_EXT_texture_lod_bias",                    o(EXT_texture_lod_bias),                    GL | ES1,       1999 },
-   { "GL_EXT_texture_mirror_clamp",                o(EXT_texture_mirror_clamp),                GL,             2004 },
-   { "GL_EXT_texture_object",                      o(EXT_texture_object),                      GL,             1995 },
-   { "GL_EXT_texture",                             o(EXT_texture),                             GL,             1996 },
-   { "GL_EXT_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },
-   { "GL_EXT_texture_shared_exponent",             o(EXT_texture_shared_exponent),             GL,             2004 },
-   { "GL_EXT_texture_snorm",                       o(EXT_texture_snorm),                       GL,             2009 },
-   { "GL_EXT_texture_sRGB",                        o(EXT_texture_sRGB),                        GL,             2004 },
-   { "GL_EXT_texture_sRGB_decode",                 o(EXT_texture_sRGB_decode),                        GL,      2006 },
-   { "GL_EXT_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },
-   { "GL_EXT_texture_type_2_10_10_10_REV",         o(dummy_true),                                         ES2, 2008 },
-   { "GL_EXT_timer_query",                         o(EXT_timer_query),                         GL,             2006 },
-   { "GL_EXT_transform_feedback",                  o(EXT_transform_feedback),                  GL,             2011 },
-   { "GL_EXT_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },
-   { "GL_EXT_vertex_array",                        o(EXT_vertex_array),                        GL,             1995 },
-   { "GL_EXT_vertex_array_set",                    o(EXT_vertex_array_set),                    GL,             1997 },
-
-   /* OES extensions */
-   { "GL_OES_blend_equation_separate",             o(EXT_blend_equation_separate),                  ES1,       2009 },
-   { "GL_OES_blend_func_separate",                 o(EXT_blend_func_separate),                      ES1,       2009 },
-   { "GL_OES_blend_subtract",                      o(EXT_blend_subtract),                           ES1,       2009 },
-   { "GL_OES_byte_coordinates",                    o(dummy_true),                                   ES1,       2002 },
-   { "GL_OES_compressed_paletted_texture",         o(dummy_false),                     DISABLE,                2003 },
-   { "GL_OES_depth24",                             o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },
-   { "GL_OES_depth32",                             o(dummy_false),                     DISABLE,                2005 },
-   { "GL_OES_depth_texture",                       o(ARB_depth_texture),                                  ES2, 2006 },
-#if FEATURE_OES_draw_texture
-   { "GL_OES_draw_texture",                        o(OES_draw_texture),                             ES1 | ES2, 2004 },
-#endif
-#if FEATURE_OES_EGL_image
-   /*  FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */
-   { "GL_OES_EGL_image",                           o(OES_EGL_image),                           GL | ES1 | ES2, 2006 },
-#endif
-   { "GL_OES_element_index_uint",                  o(EXT_vertex_array),                             ES1 | ES2, 2005 },
-   { "GL_OES_fbo_render_mipmap",                   o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },
-   { "GL_OES_fixed_point",                         o(dummy_true),                                   ES1,       2002 },
-   { "GL_OES_framebuffer_object",                  o(EXT_framebuffer_object),                       ES1,       2005 },
-   { "GL_OES_mapbuffer",                           o(ARB_vertex_buffer_object),                     ES1 | ES2, 2005 },
-   { "GL_OES_matrix_get",                          o(dummy_true),                                   ES1,       2004 },
-   { "GL_OES_packed_depth_stencil",                o(EXT_packed_depth_stencil),                     ES1 | ES2, 2007 },
-   { "GL_OES_point_size_array",                    o(dummy_true),                                   ES1,       2004 },
-   { "GL_OES_point_sprite",                        o(ARB_point_sprite),                             ES1,       2004 },
-   { "GL_OES_query_matrix",                        o(dummy_true),                                   ES1,       2003 },
-   { "GL_OES_read_format",                         o(OES_read_format),                         GL | ES1,       2003 },
-   { "GL_OES_rgb8_rgba8",                          o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },
-   { "GL_OES_single_precision",                    o(dummy_true),                                   ES1,       2003 },
-   { "GL_OES_standard_derivatives",                o(OES_standard_derivatives),                           ES2, 2005 },
-   { "GL_OES_stencil1",                            o(dummy_false),                     DISABLE,                2005 },
-   { "GL_OES_stencil4",                            o(dummy_false),                     DISABLE,                2005 },
-   { "GL_OES_stencil8",                            o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },
-   { "GL_OES_stencil_wrap",                        o(EXT_stencil_wrap),                             ES1,       2002 },
-   { "GL_OES_texture_3D",                          o(EXT_texture3D),                                      ES2, 2005 },
-   { "GL_OES_texture_cube_map",                    o(ARB_texture_cube_map),                         ES1,       2007 },
-   { "GL_OES_texture_env_crossbar",                o(ARB_texture_env_crossbar),                     ES1,       2005 },
-   { "GL_OES_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),                  ES1,       2005 },
-   { "GL_OES_texture_npot",                        o(ARB_texture_non_power_of_two),                       ES2, 2005 },
-
-   /* Vendor extensions */
-   { "GL_3DFX_texture_compression_FXT1",           o(TDFX_texture_compression_FXT1),           GL,             1999 },
-   { "GL_AMD_conservative_depth",                  o(AMD_conservative_depth),                  GL,             2009 },
-   { "GL_APPLE_client_storage",                    o(APPLE_client_storage),                    GL,             2002 },
-   { "GL_APPLE_object_purgeable",                  o(APPLE_object_purgeable),                  GL,             2006 },
-   { "GL_APPLE_packed_pixels",                     o(APPLE_packed_pixels),                     GL,             2002 },
-   { "GL_APPLE_vertex_array_object",               o(APPLE_vertex_array_object),               GL,             2002 },
-   { "GL_ATI_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },
-   { "GL_ATI_envmap_bumpmap",                      o(ATI_envmap_bumpmap),                      GL,             2001 },
-   { "GL_ATI_fragment_shader",                     o(ATI_fragment_shader),                     GL,             2001 },
-   { "GL_ATI_separate_stencil",                    o(ATI_separate_stencil),                    GL,             2006 },
-   { "GL_ATI_texture_compression_3dc",             o(ATI_texture_compression_3dc),             GL,             2004 },
-   { "GL_ATI_texture_env_combine3",                o(ATI_texture_env_combine3),                GL,             2002 },
-   { "GL_ATI_texture_mirror_once",                 o(ATI_texture_mirror_once),                 GL,             2006 },
-   { "GL_IBM_multimode_draw_arrays",               o(IBM_multimode_draw_arrays),               GL,             1998 },
-   { "GL_IBM_rasterpos_clip",                      o(IBM_rasterpos_clip),                      GL,             1996 },
-   { "GL_IBM_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             1998 },
-   { "GL_INGR_blend_func_separate",                o(EXT_blend_func_separate),                 GL,             1999 },
-   { "GL_MESA_pack_invert",                        o(MESA_pack_invert),                        GL,             2002 },
-   { "GL_MESA_resize_buffers",                     o(MESA_resize_buffers),                     GL,             1999 },
-   { "GL_MESA_texture_array",                      o(MESA_texture_array),                      GL,             2007 },
-   { "GL_MESA_texture_signed_rgba",                o(EXT_texture_snorm),                       GL,             2009 },
-   { "GL_MESA_window_pos",                         o(ARB_window_pos),                          GL,             2000 },
-   { "GL_MESAX_texture_float",                     o(ARB_texture_float),                       GL,             2009 },
-   { "GL_MESA_ycbcr_texture",                      o(MESA_ycbcr_texture),                      GL,             2002 },
-   { "GL_NV_blend_square",                         o(NV_blend_square),                         GL,             1999 },
-   { "GL_NV_conditional_render",                   o(NV_conditional_render),                   GL,             2008 },
-   { "GL_NV_depth_clamp",                          o(ARB_depth_clamp),                         GL,             2001 },
-   { "GL_NV_fragment_program",                     o(NV_fragment_program),                     GL,             2001 },
-   { "GL_NV_fragment_program_option",              o(NV_fragment_program_option),              GL,             2005 },
-   { "GL_NV_light_max_exponent",                   o(NV_light_max_exponent),                   GL,             1999 },
-   { "GL_NV_packed_depth_stencil",                 o(EXT_packed_depth_stencil),                GL,             2000 },
-   { "GL_NV_point_sprite",                         o(NV_point_sprite),                         GL,             2001 },
-   { "GL_NV_primitive_restart",                    o(NV_primitive_restart),                    GL,             2002 },
-   { "GL_NV_texgen_reflection",                    o(NV_texgen_reflection),                    GL,             1999 },
-   { "GL_NV_texture_barrier",                      o(NV_texture_barrier),                      GL,             2009 },
-   { "GL_NV_texture_env_combine4",                 o(NV_texture_env_combine4),                 GL,             1999 },
-   { "GL_NV_texture_rectangle",                    o(NV_texture_rectangle),                    GL,             2000 },
-   { "GL_NV_vertex_program1_1",                    o(NV_vertex_program1_1),                    GL,             2001 },
-   { "GL_NV_vertex_program",                       o(NV_vertex_program),                       GL,             2000 },
-   { "GL_S3_s3tc",                                 o(S3_s3tc),                                 GL,             1999 },
-   { "GL_SGIS_generate_mipmap",                    o(SGIS_generate_mipmap),                    GL,             1997 },
-   { "GL_SGIS_texture_border_clamp",               o(ARB_texture_border_clamp),                GL,             1997 },
-   { "GL_SGIS_texture_edge_clamp",                 o(SGIS_texture_edge_clamp),                 GL,             1997 },
-   { "GL_SGIS_texture_lod",                        o(SGIS_texture_lod),                        GL,             1997 },
-   { "GL_SUN_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL,             1999 },
-
-   { 0, 0, 0, 0 },
-};
-
-
-/**
- * Given an extension name, lookup up the corresponding member of struct
- * gl_extensions and return that member's offset (in bytes).  If the name is
- * not found in the \c extension_table, return 0.
- *
- * \param name Name of extension.
- * \return Offset of member in struct gl_extensions.
- */
-static size_t
-name_to_offset(const char* name)
-{
-   const struct extension *i;
-
-   if (name == 0)
-      return 0;
-
-   for (i = extension_table; i->name != 0; ++i) {
-      if (strcmp(name, i->name) == 0)
-	 return i->offset;
-   }
-
-   return 0;
-}
-
-
-/**
- * \brief Extensions enabled by default.
- *
- * These extensions are enabled by _mesa_init_extensions().
- *
- * XXX: Should these defaults also apply to GLES?
- */
-static const size_t default_extensions[] = {
-   o(ARB_copy_buffer),
-   o(ARB_draw_buffers),
-   o(ARB_multisample),
-   o(ARB_texture_compression),
-   o(ARB_transpose_matrix),
-   o(ARB_vertex_buffer_object),
-   o(ARB_window_pos),
-
-   o(EXT_abgr),
-   o(EXT_bgra),
-   o(EXT_compiled_vertex_array),
-   o(EXT_copy_texture),
-   o(EXT_draw_range_elements),
-   o(EXT_multi_draw_arrays),
-   o(EXT_packed_pixels),
-   o(EXT_polygon_offset),
-   o(EXT_rescale_normal),
-   o(EXT_separate_specular_color),
-   o(EXT_subtexture),
-   o(EXT_texture),
-   o(EXT_texture3D),
-   o(EXT_texture_object),
-   o(EXT_vertex_array),
-
-   o(OES_read_format),
-   o(OES_standard_derivatives),
-
-   /* Vendor Extensions */
-   o(APPLE_packed_pixels),
-   o(IBM_multimode_draw_arrays),
-   o(IBM_rasterpos_clip),
-   o(NV_light_max_exponent),
-   o(NV_texgen_reflection),
-   o(SGIS_generate_mipmap),
-   o(SGIS_texture_edge_clamp),
-   o(SGIS_texture_lod),
-
-   0,
-};
-
-
-/**
- * Enable all extensions suitable for a software-only renderer.
- * This is a convenience function used by the XMesa, OSMesa, GGI drivers, etc.
- */
-void
-_mesa_enable_sw_extensions(struct gl_context *ctx)
-{
-   /*ctx->Extensions.ARB_copy_buffer = GL_TRUE;*/
-   ctx->Extensions.ARB_depth_clamp = GL_TRUE;
-   ctx->Extensions.ARB_depth_texture = GL_TRUE;
-   /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
-   ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;
-   ctx->Extensions.ARB_draw_instanced = GL_TRUE;
-   ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE;
-   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;
-#if FEATURE_ARB_fragment_program
-   ctx->Extensions.ARB_fragment_program = GL_TRUE;
-   ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;
-#endif
-#if FEATURE_ARB_fragment_shader
-   ctx->Extensions.ARB_fragment_shader = GL_TRUE;
-#endif
-#if FEATURE_ARB_framebuffer_object
-   ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
-#endif
-#if FEATURE_ARB_geometry_shader4 && 0
-   /* XXX re-enable when GLSL compiler again supports geometry shaders */
-   ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;
-#endif
-   ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
-   ctx->Extensions.ARB_half_float_vertex = GL_TRUE;
-   ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
-   ctx->Extensions.ARB_multitexture = GL_TRUE;
-#if FEATURE_queryobj
-   ctx->Extensions.ARB_occlusion_query = GL_TRUE;
-   ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;
-#endif
-   ctx->Extensions.ARB_point_sprite = GL_TRUE;
-#if FEATURE_ARB_shader_objects
-   ctx->Extensions.ARB_shader_objects = GL_TRUE;
-   ctx->Extensions.EXT_separate_shader_objects = GL_TRUE;
-#endif
-#if FEATURE_ARB_shading_language_100
-   ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
-#endif
-   ctx->Extensions.ARB_shadow = GL_TRUE;
-   ctx->Extensions.ARB_shadow_ambient = GL_TRUE;
-   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
-   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
-   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
-   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
-   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
-   /*ctx->Extensions.ARB_texture_float = GL_TRUE;*/
-   ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
-   ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
-   ctx->Extensions.ARB_texture_rg = GL_TRUE;
-   ctx->Extensions.ARB_texture_compression_rgtc = GL_TRUE;
-   ctx->Extensions.ARB_vertex_array_object = GL_TRUE;
-#if FEATURE_ARB_vertex_program
-   ctx->Extensions.ARB_vertex_program = GL_TRUE;
-#endif
-#if FEATURE_ARB_vertex_shader
-   ctx->Extensions.ARB_vertex_shader = GL_TRUE;
-#endif
-#if FEATURE_ARB_vertex_buffer_object
-   /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
-#endif
-#if FEATURE_ARB_sync
-   ctx->Extensions.ARB_sync = GL_TRUE;
-#endif
-   ctx->Extensions.APPLE_vertex_array_object = GL_TRUE;
-#if FEATURE_APPLE_object_purgeable
-   ctx->Extensions.APPLE_object_purgeable = GL_TRUE;
-#endif
-   ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE;
-#if FEATURE_ATI_fragment_shader
-   ctx->Extensions.ATI_fragment_shader = GL_TRUE;
-#endif
-   ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;
-   ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;
-   ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;
-   ctx->Extensions.ATI_separate_stencil = GL_TRUE;
-   ctx->Extensions.EXT_blend_color = GL_TRUE;
-   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
-   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
-   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
-   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
-   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
-   ctx->Extensions.EXT_depth_bounds_test = GL_TRUE;
-   ctx->Extensions.EXT_draw_buffers2 = GL_TRUE;
-   ctx->Extensions.EXT_fog_coord = GL_TRUE;
-#if FEATURE_EXT_framebuffer_object
-   ctx->Extensions.EXT_framebuffer_object = GL_TRUE;
-#endif
-#if FEATURE_EXT_framebuffer_blit
-   ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;
-#endif
-#if FEATURE_ARB_framebuffer_object
-   ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
-#endif
-   /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/
-   ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
-   ctx->Extensions.EXT_paletted_texture = GL_TRUE;
-#if FEATURE_EXT_pixel_buffer_object
-   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
-#endif
-   ctx->Extensions.EXT_point_parameters = GL_TRUE;
-   ctx->Extensions.EXT_provoking_vertex = GL_TRUE;
-   ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
-   ctx->Extensions.EXT_secondary_color = GL_TRUE;
-   ctx->Extensions.EXT_shared_texture_palette = GL_TRUE;
-   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
-   ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
-   ctx->Extensions.EXT_texture_array = GL_TRUE;
-   ctx->Extensions.EXT_texture_compression_latc = GL_TRUE;
-   ctx->Extensions.EXT_texture_env_add = GL_TRUE;
-   ctx->Extensions.EXT_texture_env_combine = GL_TRUE;
-   ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;
-   ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;
-   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
-#if FEATURE_EXT_texture_sRGB
-   ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
-   ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE;
-#endif
-   ctx->Extensions.EXT_texture_swizzle = GL_TRUE;
-#if FEATURE_EXT_transform_feedback
-   /*ctx->Extensions.EXT_transform_feedback = GL_TRUE;*/
-#endif
-   ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;
-   /*ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;*/
-   ctx->Extensions.MESA_pack_invert = GL_TRUE;
-   ctx->Extensions.MESA_resize_buffers = GL_TRUE;
-   ctx->Extensions.MESA_texture_array = GL_TRUE;
-   ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;
-   ctx->Extensions.NV_blend_square = GL_TRUE;
-   ctx->Extensions.NV_conditional_render = GL_TRUE;
-   /*ctx->Extensions.NV_light_max_exponent = GL_TRUE;*/
-   ctx->Extensions.NV_point_sprite = GL_TRUE;
-   ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;
-   ctx->Extensions.NV_texture_rectangle = GL_TRUE;
-   /*ctx->Extensions.NV_texgen_reflection = GL_TRUE;*/
-#if FEATURE_NV_vertex_program
-   ctx->Extensions.NV_vertex_program = GL_TRUE;
-   ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;
-#endif
-#if FEATURE_NV_fragment_program
-   ctx->Extensions.NV_fragment_program = GL_TRUE;
-#endif
-#if FEATURE_NV_fragment_program && FEATURE_ARB_fragment_program
-   ctx->Extensions.NV_fragment_program_option = GL_TRUE;
-#endif
-   /*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/
-   ctx->Extensions.SGIS_texture_edge_clamp = GL_TRUE;
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-   ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
-#endif
-#if FEATURE_texture_fxt1
-   _mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1");
-#endif
-#if FEATURE_texture_s3tc
-   if (ctx->Mesa_DXTn) {
-      _mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");
-      _mesa_enable_extension(ctx, "GL_S3_s3tc");
-   }
-#endif
-}
-
-
-/**
- * Enable common EXT extensions in the ARB_imaging subset.
- */
-void
-_mesa_enable_imaging_extensions(struct gl_context *ctx)
-{
-   ctx->Extensions.EXT_blend_color = GL_TRUE;
-   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
-   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
-   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
-}
-
-
-
-/**
- * Enable all OpenGL 1.3 features and extensions.
- * A convenience function to be called by drivers.
- */
-void
-_mesa_enable_1_3_extensions(struct gl_context *ctx)
-{
-   /*ctx->Extensions.ARB_multisample = GL_TRUE;*/
-   ctx->Extensions.ARB_multitexture = GL_TRUE;
-   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
-   /*ctx->Extensions.ARB_texture_compression = GL_TRUE;*/
-   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
-   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
-   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
-   ctx->Extensions.EXT_texture_env_add = GL_TRUE;
-   /*ctx->Extensions.ARB_transpose_matrix = GL_TRUE;*/
-}
-
-
-
-/**
- * Enable all OpenGL 1.4 features and extensions.
- * A convenience function to be called by drivers.
- */
-void
-_mesa_enable_1_4_extensions(struct gl_context *ctx)
-{
-   ctx->Extensions.ARB_depth_texture = GL_TRUE;
-   ctx->Extensions.ARB_shadow = GL_TRUE;
-   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
-   ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
-   ctx->Extensions.ARB_window_pos = GL_TRUE;
-   ctx->Extensions.EXT_blend_color = GL_TRUE;
-   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
-   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
-   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
-   ctx->Extensions.EXT_fog_coord = GL_TRUE;
-   /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/
-   ctx->Extensions.EXT_point_parameters = GL_TRUE;
-   ctx->Extensions.EXT_secondary_color = GL_TRUE;
-   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
-   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
-   /*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/
-}
-
-
-/**
- * Enable all OpenGL 1.5 features and extensions.
- * A convenience function to be called by drivers.
- */
-void
-_mesa_enable_1_5_extensions(struct gl_context *ctx)
-{
-   ctx->Extensions.ARB_occlusion_query = GL_TRUE;
-   /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
-   ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
-}
-
-
-/**
- * Enable all OpenGL 2.0 features and extensions.
- * A convenience function to be called by drivers.
- */
-void
-_mesa_enable_2_0_extensions(struct gl_context *ctx)
-{
-   /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
-#if FEATURE_ARB_fragment_shader
-   ctx->Extensions.ARB_fragment_shader = GL_TRUE;
-#endif
-   ctx->Extensions.ARB_point_sprite = GL_TRUE;
-   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
-   ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
-#if FEATURE_ARB_shader_objects
-   ctx->Extensions.ARB_shader_objects = GL_TRUE;
-#endif
-#if FEATURE_ARB_shading_language_100
-   ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
-#endif
-   ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
-#if FEATURE_ARB_vertex_shader
-   ctx->Extensions.ARB_vertex_shader = GL_TRUE;
-#endif
-}
-
-
-/**
- * Enable all OpenGL 2.1 features and extensions.
- * A convenience function to be called by drivers.
- */
-void
-_mesa_enable_2_1_extensions(struct gl_context *ctx)
-{
-#if FEATURE_EXT_pixel_buffer_object
-   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
-#endif
-#if FEATURE_EXT_texture_sRGB
-   ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
-#endif
-}
-
-
-/**
- * Either enable or disable the named extension.
- * \return GL_TRUE for success, GL_FALSE if invalid extension name
- */
-static GLboolean
-set_extension( struct gl_context *ctx, const char *name, GLboolean state )
-{
-   size_t offset;
-
-   if (ctx->Extensions.String) {
-      /* The string was already queried - can't change it now! */
-      _mesa_problem(ctx, "Trying to enable/disable extension after glGetString(GL_EXTENSIONS): %s", name);
-      return GL_FALSE;
-   }
-
-   offset = name_to_offset(name);
-   if (offset == 0) {
-      _mesa_problem(ctx, "Trying to enable/disable unknown extension %s",
-	            name);
-      return GL_FALSE;
-   } else if (offset == o(dummy_true) && state == GL_FALSE) {
-      _mesa_problem(ctx, "Trying to disable a permanently enabled extension: "
-	                  "%s", name);
-      return GL_FALSE;
-   } else {
-      GLboolean *base = (GLboolean *) &ctx->Extensions;
-      base[offset] = state;
-      return GL_TRUE;
-   }
-}
-
-
-/**
- * Enable the named extension.
- * Typically called by drivers.
- */
-void
-_mesa_enable_extension( struct gl_context *ctx, const char *name )
-{
-   if (!set_extension(ctx, name, GL_TRUE))
-      _mesa_problem(ctx, "Trying to enable unknown extension: %s", name);
-}
-
-
-/**
- * Disable the named extension.
- * XXX is this really needed???
- */
-void
-_mesa_disable_extension( struct gl_context *ctx, const char *name )
-{
-   if (!set_extension(ctx, name, GL_FALSE))
-      _mesa_problem(ctx, "Trying to disable unknown extension: %s", name);
-}
-
-
-/**
- * Test if the named extension is enabled in this context.
- */
-GLboolean
-_mesa_extension_is_enabled( struct gl_context *ctx, const char *name )
-{
-   size_t offset;
-   GLboolean *base;
-
-   if (name == 0)
-      return GL_FALSE;
-
-   offset = name_to_offset(name);
-   if (offset == 0)
-      return GL_FALSE;
-   base = (GLboolean *) &ctx->Extensions;
-   return base[offset];
-}
-
-
-/**
- * \brief Apply the \c MESA_EXTENSION_OVERRIDE environment variable.
- *
- * \c MESA_EXTENSION_OVERRIDE is a space-separated list of extensions to
- * enable or disable. The list is processed thus:
- *    - Enable recognized extension names that are prefixed with '+'.
- *    - Disable recognized extension names that are prefixed with '-'.
- *    - Enable recognized extension names that are not prefixed.
- *    - Collect unrecognized extension names in a new string.
- *
- * \return Space-separated list of unrecognized extension names (which must
- *    be freed). Does not return \c NULL.
- */
-static char *
-get_extension_override( struct gl_context *ctx )
-{
-   const char *env_const = _mesa_getenv("MESA_EXTENSION_OVERRIDE");
-   char *env;
-   char *ext;
-   char *extra_exts;
-   int len;
-
-   if (env_const == NULL) {
-      /* Return the empty string rather than NULL. This simplifies the logic
-       * of client functions. */
-      return calloc(1, sizeof(char));
-   }
-
-   /* extra_exts: List of unrecognized extensions. */
-   extra_exts = calloc(strlen(env_const), sizeof(char));
-
-   /* Copy env_const because strtok() is destructive. */
-   env = strdup(env_const);
-   for (ext = strtok(env, " "); ext != NULL; ext = strtok(NULL, " ")) {
-      int enable;
-      int recognized;
-      switch (ext[0]) {
-      case '+':
-         enable = 1;
-         ++ext;
-         break;
-      case '-':
-         enable = 0;
-         ++ext;
-         break;
-      default:
-         enable = 1;
-         break;
-      }
-      recognized = set_extension(ctx, ext, enable);
-      if (!recognized) {
-         strcat(extra_exts, ext);
-         strcat(extra_exts, " ");
-      }
-   }
-
-   /* Remove trailing space. */
-   len = strlen(extra_exts);
-   if (extra_exts[len - 1] == ' ')
-      extra_exts[len - 1] = '\0';
-
-   return extra_exts;
-}
-
-
-/**
- * \brief Initialize extension tables and enable default extensions.
- *
- * This should be called during context initialization.
- * Note: Sets gl_extensions.dummy_true to true.
- */
-void
-_mesa_init_extensions( struct gl_context *ctx )
-{
-   GLboolean *base = (GLboolean *) &ctx->Extensions;
-   GLboolean *sentinel = base + o(extension_sentinel);
-   GLboolean *i;
-   const size_t *j;
-
-   /* First, turn all extensions off. */
-   for (i = base; i != sentinel; ++i)
-      *i = GL_FALSE;
-
-   /* Then, selectively turn default extensions on. */
-   ctx->Extensions.dummy_true = GL_TRUE;
-   for (j = default_extensions; *j != 0; ++j)
-      base[*j] = GL_TRUE;
-}
-
-
-typedef unsigned short extension_index;
-
-
-/**
- * Compare two entries of the extensions table.  Sorts first by year,
- * then by name.
- *
- * Arguments are indices into extension_table.
- */
-static int
-extension_compare(const void *p1, const void *p2)
-{
-   extension_index i1 = * (const extension_index *) p1;
-   extension_index i2 = * (const extension_index *) p2;
-   const struct extension *e1 = &extension_table[i1];
-   const struct extension *e2 = &extension_table[i2];
-   int res;
-
-   res = (int)e1->year - (int)e2->year;
-
-   if (res == 0) {
-      res = strcmp(e1->name, e2->name);
-   }
-
-   return res;
-}
-
-
-/**
- * Construct the GL_EXTENSIONS string.  Called the first time that
- * glGetString(GL_EXTENSIONS) is called.
- */
-GLubyte*
-_mesa_make_extension_string(struct gl_context *ctx)
-{
-   /* The extension string. */
-   char *exts = 0;
-   /* Length of extension string. */
-   size_t length = 0;
-   /* Number of extensions */
-   unsigned count;
-   /* Indices of the extensions sorted by year */
-   extension_index *extension_indices;
-   /* String of extra extensions. */
-   char *extra_extensions = get_extension_override(ctx);
-   GLboolean *base = (GLboolean *) &ctx->Extensions;
-   const struct extension *i;
-   unsigned j;
-   unsigned maxYear = ~0;
-
-   /* Check if the MESA_EXTENSION_MAX_YEAR env var is set */
-   {
-      const char *env = getenv("MESA_EXTENSION_MAX_YEAR");
-      if (env) {
-         maxYear = atoi(env);
-         _mesa_debug(ctx, "Note: limiting GL extensions to %u or earlier\n",
-                     maxYear);
-      }
-   }
-
-   /* Compute length of the extension string. */
-   count = 0;
-   for (i = extension_table; i->name != 0; ++i) {
-      if (base[i->offset] &&
-          i->year <= maxYear &&
-          (i->api_set & (1 << ctx->API))) {
-	 length += strlen(i->name) + 1; /* +1 for space */
-	 ++count;
-      }
-   }
-   if (extra_extensions != NULL)
-      length += 1 + strlen(extra_extensions); /* +1 for space */
-
-   exts = (char *) calloc(length + 1, sizeof(char));
-   if (exts == NULL) {
-      free(extra_extensions);
-      return NULL;
-   }
-
-   extension_indices = malloc(count * sizeof extension_indices);
-   if (extension_indices == NULL) {
-      free(exts);
-      free(extra_extensions);
-      return NULL;
-   }
-
-   /* Sort extensions in chronological order because certain old applications (e.g.,
-    * Quake3 demo) store the extension list in a static size buffer so chronologically
-    * order ensure that the extensions that such applications expect will fit into
-    * that buffer.
-    */
-   j = 0;
-   for (i = extension_table; i->name != 0; ++i) {
-      if (base[i->offset] &&
-          i->year <= maxYear &&
-          (i->api_set & (1 << ctx->API))) {
-         extension_indices[j++] = i - extension_table;
-      }
-   }
-   assert(j == count);
-   qsort(extension_indices, count, sizeof *extension_indices, extension_compare);
-
-   /* Build the extension string.*/
-   for (j = 0; j < count; ++j) {
-      i = &extension_table[extension_indices[j]];
-      assert(base[i->offset] && (i->api_set & (1 << ctx->API)));
-      strcat(exts, i->name);
-      strcat(exts, " ");
-   }
-   free(extension_indices);
-   if (extra_extensions != 0) {
-      strcat(exts, extra_extensions);
-      free(extra_extensions);
-   }
-
-   return (GLubyte *) exts;
-}
-
-/**
- * Return number of enabled extensions.
- */
-GLuint
-_mesa_get_extension_count(struct gl_context *ctx)
-{
-   GLboolean *base;
-   const struct extension *i;
-
-   /* only count once */
-   if (ctx->Extensions.Count != 0)
-      return ctx->Extensions.Count;
-
-   base = (GLboolean *) &ctx->Extensions;
-   for (i = extension_table; i->name != 0; ++i) {
-      if (base[i->offset]) {
-	 ctx->Extensions.Count++;
-      }
-   }
-   return ctx->Extensions.Count;
-}
-
-/**
- * Return name of i-th enabled extension
- */
-const GLubyte *
-_mesa_get_enabled_extension(struct gl_context *ctx, GLuint index)
-{
-   const GLboolean *base;
-   size_t n;
-   const struct extension *i;
-
-   if (index < 0)
-      return NULL;
-
-   base = (GLboolean*) &ctx->Extensions;
-   n = 0;
-   for (i = extension_table; i->name != 0; ++i) {
-      if (n == index && base[i->offset]) {
-	 return (GLubyte*) i->name;
-      } else if (base[i->offset]) {
-	 ++n;
-      }
-   }
-
-   return NULL;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.6

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file

+ * \brief Extension handling

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "context.h"

+#include "extensions.h"

+#include "mfeatures.h"

+#include "mtypes.h"

+

+enum {

+   DISABLE = 0,

+   GL  = 1 << API_OPENGL,

+   ES1 = 1 << API_OPENGLES,

+   ES2 = 1 << API_OPENGLES2,

+};

+

+/**

+ * \brief An element of the \c extension_table.

+ */

+struct extension {

+   /** Name of extension, such as "GL_ARB_depth_clamp". */

+   const char *name;

+

+   /** Offset (in bytes) of the corresponding member in struct gl_extensions. */

+   size_t offset;

+

+   /** Set of API's in which the extension exists, as a bitset. */

+   uint8_t api_set;

+

+   /** Year the extension was proposed or approved.  Used to sort the 

+    * extension string chronologically. */

+   uint16_t year;

+};

+

+

+/**

+ * Given a member \c x of struct gl_extensions, return offset of

+ * \c x in bytes.

+ */

+#define o(x) offsetof(struct gl_extensions, x)

+

+

+/**

+ * \brief Table of supported OpenGL extensions for all API's.

+ *

+ * Note: The GL_MESAX_* extensions are placeholders for future ARB extensions.

+ */

+static const struct extension extension_table[] = {

+   /* ARB Extensions */

+   { "GL_ARB_ES2_compatibility",                   o(ARB_ES2_compatibility),                   GL,             2009 },

+   { "GL_ARB_blend_func_extended",                 o(ARB_blend_func_extended),                 GL,             2009 },

+   { "GL_ARB_color_buffer_float",                  o(ARB_color_buffer_float),                  GL,             2004 },

+   { "GL_ARB_copy_buffer",                         o(ARB_copy_buffer),                         GL,             2008 },

+   { "GL_ARB_depth_buffer_float",                  o(ARB_depth_buffer_float),                  GL,             2008 },

+   { "GL_ARB_depth_clamp",                         o(ARB_depth_clamp),                         GL,             2003 },

+   { "GL_ARB_depth_texture",                       o(ARB_depth_texture),                       GL,             2001 },

+   { "GL_ARB_draw_buffers",                        o(ARB_draw_buffers),                        GL,             2002 },

+   { "GL_ARB_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL,             2009 },

+   { "GL_ARB_draw_elements_base_vertex",           o(ARB_draw_elements_base_vertex),           GL,             2009 },

+   { "GL_ARB_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2008 },

+   { "GL_ARB_explicit_attrib_location",            o(ARB_explicit_attrib_location),            GL,             2009 },

+   { "GL_ARB_fragment_coord_conventions",          o(ARB_fragment_coord_conventions),          GL,             2009 },

+   { "GL_ARB_fragment_program",                    o(ARB_fragment_program),                    GL,             2002 },

+   { "GL_ARB_fragment_program_shadow",             o(ARB_fragment_program_shadow),             GL,             2003 },

+   { "GL_ARB_fragment_shader",                     o(ARB_fragment_shader),                     GL,             2002 },

+   { "GL_ARB_framebuffer_object",                  o(ARB_framebuffer_object),                  GL,             2005 },

+   { "GL_ARB_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },

+   { "GL_ARB_half_float_pixel",                    o(ARB_half_float_pixel),                    GL,             2003 },

+   { "GL_ARB_half_float_vertex",                   o(ARB_half_float_vertex),                   GL,             2008 },

+   { "GL_ARB_instanced_arrays",                    o(ARB_instanced_arrays),                    GL,             2008 },

+   { "GL_ARB_map_buffer_range",                    o(ARB_map_buffer_range),                    GL,             2008 },

+   { "GL_ARB_multisample",                         o(ARB_multisample),                         GL,             1994 },

+   { "GL_ARB_multitexture",                        o(ARB_multitexture),                        GL,             1998 },

+   { "GL_ARB_occlusion_query2",                    o(ARB_occlusion_query2),                    GL,             2003 },

+   { "GL_ARB_occlusion_query",                     o(ARB_occlusion_query),                     GL,             2001 },

+   { "GL_ARB_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },

+   { "GL_ARB_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },

+   { "GL_ARB_point_sprite",                        o(ARB_point_sprite),                        GL,             2003 },

+   { "GL_ARB_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },

+   { "GL_ARB_sampler_objects",                     o(ARB_sampler_objects),                     GL,             2009 },

+   { "GL_ARB_seamless_cube_map",                   o(ARB_seamless_cube_map),                   GL,             2009 },

+   { "GL_ARB_shader_objects",                      o(ARB_shader_objects),                      GL,             2002 },

+   { "GL_ARB_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },

+   { "GL_ARB_shading_language_100",                o(ARB_shading_language_100),                GL,             2003 },

+   { "GL_ARB_shadow_ambient",                      o(ARB_shadow_ambient),                      GL,             2001 },

+   { "GL_ARB_shadow",                              o(ARB_shadow),                              GL,             2001 },

+   { "GL_ARB_sync",                                o(ARB_sync),                                GL,             2003 },

+   { "GL_ARB_texture_border_clamp",                o(ARB_texture_border_clamp),                GL,             2000 },

+   { "GL_ARB_texture_buffer_object",               o(ARB_texture_buffer_object),               GL,             2008 },

+   { "GL_ARB_texture_compression",                 o(ARB_texture_compression),                 GL,             2000 },

+   { "GL_ARB_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },

+   { "GL_ARB_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             1999 },

+   { "GL_ARB_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },

+   { "GL_ARB_texture_env_combine",                 o(ARB_texture_env_combine),                 GL,             2001 },

+   { "GL_ARB_texture_env_crossbar",                o(ARB_texture_env_crossbar),                GL,             2001 },

+   { "GL_ARB_texture_env_dot3",                    o(ARB_texture_env_dot3),                    GL,             2001 },

+   { "GL_ARB_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             2001 },

+   { "GL_ARB_texture_multisample",                 o(ARB_texture_multisample),                 GL,             2009 },

+   { "GL_ARB_texture_non_power_of_two",            o(ARB_texture_non_power_of_two),            GL,             2003 },

+   { "GL_ARB_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },

+   { "GL_ARB_texture_rgb10_a2ui",                  o(ARB_texture_rgb10_a2ui),                  GL,             2009 },

+   { "GL_ARB_texture_rg",                          o(ARB_texture_rg),                          GL,             2008 },

+   { "GL_ARB_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },

+   { "GL_ARB_transform_feedback2",                 o(ARB_transform_feedback2),                 GL,             2010 },

+   { "GL_ARB_transpose_matrix",                    o(ARB_transpose_matrix),                    GL,             1999 },

+   { "GL_ARB_uniform_buffer_object",               o(ARB_uniform_buffer_object),               GL,             2002 },

+   { "GL_ARB_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },

+   { "GL_ARB_vertex_array_object",                 o(ARB_vertex_array_object),                 GL,             2006 },

+   { "GL_ARB_vertex_buffer_object",                o(ARB_vertex_buffer_object),                GL,             2003 },

+   { "GL_ARB_vertex_program",                      o(ARB_vertex_program),                      GL,             2002 },

+   { "GL_ARB_vertex_shader",                       o(ARB_vertex_shader),                       GL,             2002 },

+   { "GL_ARB_vertex_type_2_10_10_10_rev",          o(ARB_vertex_type_2_10_10_10_rev),          GL,             2009 },

+   { "GL_ARB_window_pos",                          o(ARB_window_pos),                          GL,             2001 },

+

+   /* EXT extensions */

+   { "GL_EXT_abgr",                                o(EXT_abgr),                                GL,             1995 },

+   { "GL_EXT_bgra",                                o(EXT_bgra),                                GL,             1995 },

+   { "GL_EXT_blend_color",                         o(EXT_blend_color),                         GL,             1995 },

+   { "GL_EXT_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },

+   { "GL_EXT_blend_func_separate",                 o(EXT_blend_func_separate),                 GL,             1999 },

+   { "GL_EXT_blend_logic_op",                      o(EXT_blend_logic_op),                      GL,             1995 },

+   { "GL_EXT_blend_minmax",                        o(EXT_blend_minmax),                        GL | ES1 | ES2, 1995 },

+   { "GL_EXT_blend_subtract",                      o(EXT_blend_subtract),                      GL,             1995 },

+   { "GL_EXT_clip_volume_hint",                    o(EXT_clip_volume_hint),                    GL,             1996 },

+   { "GL_EXT_compiled_vertex_array",               o(EXT_compiled_vertex_array),               GL,             1996 },

+   { "GL_EXT_copy_texture",                        o(EXT_copy_texture),                        GL,             1995 },

+   { "GL_EXT_depth_bounds_test",                   o(EXT_depth_bounds_test),                   GL,             2002 },

+   { "GL_EXT_draw_buffers2",                       o(EXT_draw_buffers2),                       GL,             2006 },

+   { "GL_EXT_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2006 },

+   { "GL_EXT_draw_range_elements",                 o(EXT_draw_range_elements),                 GL,             1997 },

+   { "GL_EXT_fog_coord",                           o(EXT_fog_coord),                           GL,             1999 },

+   { "GL_EXT_framebuffer_blit",                    o(EXT_framebuffer_blit),                    GL,             2005 },

+   { "GL_EXT_framebuffer_multisample",             o(EXT_framebuffer_multisample),             GL,             2005 },

+   { "GL_EXT_framebuffer_object",                  o(EXT_framebuffer_object),                  GL,             2000 },

+   { "GL_EXT_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },

+   { "GL_EXT_gpu_program_parameters",              o(EXT_gpu_program_parameters),              GL,             2006 },

+   { "GL_EXT_gpu_shader4",                         o(EXT_gpu_shader4),                         GL,             2006 },

+   { "GL_EXT_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL | ES1 | ES2, 1999 },

+   { "GL_EXT_packed_depth_stencil",                o(EXT_packed_depth_stencil),                GL,             2005 },

+   { "GL_EXT_packed_float",                        o(EXT_packed_float),                        GL,             2004 },

+   { "GL_EXT_packed_pixels",                       o(EXT_packed_pixels),                       GL,             1997 },

+   { "GL_EXT_paletted_texture",                    o(EXT_paletted_texture),                    GL,             1995 },

+   { "GL_EXT_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },

+   { "GL_EXT_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },

+   { "GL_EXT_polygon_offset",                      o(EXT_polygon_offset),                      GL,             1995 },

+   { "GL_EXT_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },

+   { "GL_EXT_rescale_normal",                      o(EXT_rescale_normal),                      GL,             1997 },

+   { "GL_EXT_secondary_color",                     o(EXT_secondary_color),                     GL,             1999 },

+   { "GL_EXT_separate_shader_objects",             o(EXT_separate_shader_objects),             GL,             2008 },

+   { "GL_EXT_separate_specular_color",             o(EXT_separate_specular_color),             GL,             1997 },

+   { "GL_EXT_shadow_funcs",                        o(EXT_shadow_funcs),                        GL,             2002 },

+   { "GL_EXT_shared_texture_palette",              o(EXT_shared_texture_palette),              GL,             2000 },

+   { "GL_EXT_stencil_two_side",                    o(EXT_stencil_two_side),                    GL,             2001 },

+   { "GL_EXT_stencil_wrap",                        o(EXT_stencil_wrap),                        GL,             2002 },

+   { "GL_EXT_subtexture",                          o(EXT_subtexture),                          GL,             1995 },

+   { "GL_EXT_texture3D",                           o(EXT_texture3D),                           GL,             1996 },

+   { "GL_EXT_texture_array",                       o(EXT_texture_array),                       GL,             2006 },

+   { "GL_EXT_texture_compression_dxt1",            o(EXT_texture_compression_s3tc),            GL | ES1 | ES2, 2004 },

+   { "GL_EXT_texture_compression_latc",            o(EXT_texture_compression_latc),            GL,             2006 },

+   { "GL_EXT_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },

+   { "GL_EXT_texture_compression_s3tc",            o(EXT_texture_compression_s3tc),            GL,             2000 },

+   { "GL_EXT_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             2001 },

+   { "GL_EXT_texture_edge_clamp",                  o(SGIS_texture_edge_clamp),                 GL,             1997 },

+   { "GL_EXT_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },

+   { "GL_EXT_texture_env_combine",                 o(EXT_texture_env_combine),                 GL,             2006 },

+   { "GL_EXT_texture_env_dot3",                    o(EXT_texture_env_dot3),                    GL,             2000 },

+   { "GL_EXT_texture_filter_anisotropic",          o(EXT_texture_filter_anisotropic),          GL | ES1 | ES2, 1999 },

+   { "GL_EXT_texture_format_BGRA8888",             o(EXT_texture_format_BGRA8888),                  ES1 | ES2, 2009 },

+   { "GL_EXT_texture_integer",                     o(EXT_texture_integer),                     GL,             2006 },

+   { "GL_EXT_texture_lod_bias",                    o(EXT_texture_lod_bias),                    GL | ES1,       1999 },

+   { "GL_EXT_texture_mirror_clamp",                o(EXT_texture_mirror_clamp),                GL,             2004 },

+   { "GL_EXT_texture_object",                      o(EXT_texture_object),                      GL,             1995 },

+   { "GL_EXT_texture",                             o(EXT_texture),                             GL,             1996 },

+   { "GL_EXT_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },

+   { "GL_EXT_texture_shared_exponent",             o(EXT_texture_shared_exponent),             GL,             2004 },

+   { "GL_EXT_texture_snorm",                       o(EXT_texture_snorm),                       GL,             2009 },

+   { "GL_EXT_texture_sRGB",                        o(EXT_texture_sRGB),                        GL,             2004 },

+   { "GL_EXT_texture_sRGB_decode",                 o(EXT_texture_sRGB_decode),                        GL,      2006 },

+   { "GL_EXT_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },

+   { "GL_EXT_texture_type_2_10_10_10_REV",         o(dummy_true),                                         ES2, 2008 },

+   { "GL_EXT_timer_query",                         o(EXT_timer_query),                         GL,             2006 },

+   { "GL_EXT_transform_feedback",                  o(EXT_transform_feedback),                  GL,             2011 },

+   { "GL_EXT_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },

+   { "GL_EXT_vertex_array",                        o(EXT_vertex_array),                        GL,             1995 },

+   { "GL_EXT_vertex_array_set",                    o(EXT_vertex_array_set),                    GL,             1997 },

+

+   /* OES extensions */

+   { "GL_OES_blend_equation_separate",             o(EXT_blend_equation_separate),                  ES1,       2009 },

+   { "GL_OES_blend_func_separate",                 o(EXT_blend_func_separate),                      ES1,       2009 },

+   { "GL_OES_blend_subtract",                      o(EXT_blend_subtract),                           ES1,       2009 },

+   { "GL_OES_byte_coordinates",                    o(dummy_true),                                   ES1,       2002 },

+   { "GL_OES_compressed_paletted_texture",         o(dummy_false),                     DISABLE,                2003 },

+   { "GL_OES_depth24",                             o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_depth32",                             o(dummy_false),                     DISABLE,                2005 },

+   { "GL_OES_depth_texture",                       o(ARB_depth_texture),                                  ES2, 2006 },

+#if FEATURE_OES_draw_texture

+   { "GL_OES_draw_texture",                        o(OES_draw_texture),                             ES1 | ES2, 2004 },

+#endif

+#if FEATURE_OES_EGL_image

+   /*  FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */

+   { "GL_OES_EGL_image",                           o(OES_EGL_image),                           GL | ES1 | ES2, 2006 },

+#endif

+   { "GL_OES_element_index_uint",                  o(EXT_vertex_array),                             ES1 | ES2, 2005 },

+   { "GL_OES_fbo_render_mipmap",                   o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_fixed_point",                         o(dummy_true),                                   ES1,       2002 },

+   { "GL_OES_framebuffer_object",                  o(EXT_framebuffer_object),                       ES1,       2005 },

+   { "GL_OES_mapbuffer",                           o(ARB_vertex_buffer_object),                     ES1 | ES2, 2005 },

+   { "GL_OES_matrix_get",                          o(dummy_true),                                   ES1,       2004 },

+   { "GL_OES_packed_depth_stencil",                o(EXT_packed_depth_stencil),                     ES1 | ES2, 2007 },

+   { "GL_OES_point_size_array",                    o(dummy_true),                                   ES1,       2004 },

+   { "GL_OES_point_sprite",                        o(ARB_point_sprite),                             ES1,       2004 },

+   { "GL_OES_query_matrix",                        o(dummy_true),                                   ES1,       2003 },

+   { "GL_OES_read_format",                         o(OES_read_format),                         GL | ES1,       2003 },

+   { "GL_OES_rgb8_rgba8",                          o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_single_precision",                    o(dummy_true),                                   ES1,       2003 },

+   { "GL_OES_standard_derivatives",                o(OES_standard_derivatives),                           ES2, 2005 },

+   { "GL_OES_stencil1",                            o(dummy_false),                     DISABLE,                2005 },

+   { "GL_OES_stencil4",                            o(dummy_false),                     DISABLE,                2005 },

+   { "GL_OES_stencil8",                            o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_stencil_wrap",                        o(EXT_stencil_wrap),                             ES1,       2002 },

+   { "GL_OES_texture_3D",                          o(EXT_texture3D),                                      ES2, 2005 },

+   { "GL_OES_texture_cube_map",                    o(ARB_texture_cube_map),                         ES1,       2007 },

+   { "GL_OES_texture_env_crossbar",                o(ARB_texture_env_crossbar),                     ES1,       2005 },

+   { "GL_OES_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),                  ES1,       2005 },

+   { "GL_OES_texture_npot",                        o(ARB_texture_non_power_of_two),                       ES2, 2005 },

+

+   /* Vendor extensions */

+   { "GL_3DFX_texture_compression_FXT1",           o(TDFX_texture_compression_FXT1),           GL,             1999 },

+   { "GL_AMD_conservative_depth",                  o(AMD_conservative_depth),                  GL,             2009 },

+   { "GL_APPLE_client_storage",                    o(APPLE_client_storage),                    GL,             2002 },

+   { "GL_APPLE_object_purgeable",                  o(APPLE_object_purgeable),                  GL,             2006 },

+   { "GL_APPLE_packed_pixels",                     o(APPLE_packed_pixels),                     GL,             2002 },

+   { "GL_APPLE_vertex_array_object",               o(APPLE_vertex_array_object),               GL,             2002 },

+   { "GL_ATI_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },

+   { "GL_ATI_envmap_bumpmap",                      o(ATI_envmap_bumpmap),                      GL,             2001 },

+   { "GL_ATI_fragment_shader",                     o(ATI_fragment_shader),                     GL,             2001 },

+   { "GL_ATI_separate_stencil",                    o(ATI_separate_stencil),                    GL,             2006 },

+   { "GL_ATI_texture_compression_3dc",             o(ATI_texture_compression_3dc),             GL,             2004 },

+   { "GL_ATI_texture_env_combine3",                o(ATI_texture_env_combine3),                GL,             2002 },

+   { "GL_ATI_texture_mirror_once",                 o(ATI_texture_mirror_once),                 GL,             2006 },

+   { "GL_IBM_multimode_draw_arrays",               o(IBM_multimode_draw_arrays),               GL,             1998 },

+   { "GL_IBM_rasterpos_clip",                      o(IBM_rasterpos_clip),                      GL,             1996 },

+   { "GL_IBM_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             1998 },

+   { "GL_INGR_blend_func_separate",                o(EXT_blend_func_separate),                 GL,             1999 },

+   { "GL_MESA_pack_invert",                        o(MESA_pack_invert),                        GL,             2002 },

+   { "GL_MESA_resize_buffers",                     o(MESA_resize_buffers),                     GL,             1999 },

+   { "GL_MESA_texture_array",                      o(MESA_texture_array),                      GL,             2007 },

+   { "GL_MESA_texture_signed_rgba",                o(EXT_texture_snorm),                       GL,             2009 },

+   { "GL_MESA_window_pos",                         o(ARB_window_pos),                          GL,             2000 },

+   { "GL_MESAX_texture_float",                     o(ARB_texture_float),                       GL,             2009 },

+   { "GL_MESA_ycbcr_texture",                      o(MESA_ycbcr_texture),                      GL,             2002 },

+   { "GL_NV_blend_square",                         o(NV_blend_square),                         GL,             1999 },

+   { "GL_NV_conditional_render",                   o(NV_conditional_render),                   GL,             2008 },

+   { "GL_NV_depth_clamp",                          o(ARB_depth_clamp),                         GL,             2001 },

+   { "GL_NV_fragment_program",                     o(NV_fragment_program),                     GL,             2001 },

+   { "GL_NV_fragment_program_option",              o(NV_fragment_program_option),              GL,             2005 },

+   { "GL_NV_light_max_exponent",                   o(NV_light_max_exponent),                   GL,             1999 },

+   { "GL_NV_packed_depth_stencil",                 o(EXT_packed_depth_stencil),                GL,             2000 },

+   { "GL_NV_point_sprite",                         o(NV_point_sprite),                         GL,             2001 },

+   { "GL_NV_primitive_restart",                    o(NV_primitive_restart),                    GL,             2002 },

+   { "GL_NV_texgen_reflection",                    o(NV_texgen_reflection),                    GL,             1999 },

+   { "GL_NV_texture_barrier",                      o(NV_texture_barrier),                      GL,             2009 },

+   { "GL_NV_texture_env_combine4",                 o(NV_texture_env_combine4),                 GL,             1999 },

+   { "GL_NV_texture_rectangle",                    o(NV_texture_rectangle),                    GL,             2000 },

+   { "GL_NV_vertex_program1_1",                    o(NV_vertex_program1_1),                    GL,             2001 },

+   { "GL_NV_vertex_program",                       o(NV_vertex_program),                       GL,             2000 },

+   { "GL_S3_s3tc",                                 o(S3_s3tc),                                 GL,             1999 },

+   { "GL_SGIS_generate_mipmap",                    o(SGIS_generate_mipmap),                    GL,             1997 },

+   { "GL_SGIS_texture_border_clamp",               o(ARB_texture_border_clamp),                GL,             1997 },

+   { "GL_SGIS_texture_edge_clamp",                 o(SGIS_texture_edge_clamp),                 GL,             1997 },

+   { "GL_SGIS_texture_lod",                        o(SGIS_texture_lod),                        GL,             1997 },

+   { "GL_SUN_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL,             1999 },

+

+   { 0, 0, 0, 0 },

+};

+

+

+/**

+ * Given an extension name, lookup up the corresponding member of struct

+ * gl_extensions and return that member's offset (in bytes).  If the name is

+ * not found in the \c extension_table, return 0.

+ *

+ * \param name Name of extension.

+ * \return Offset of member in struct gl_extensions.

+ */

+static size_t

+name_to_offset(const char* name)

+{

+   const struct extension *i;

+

+   if (name == 0)

+      return 0;

+

+   for (i = extension_table; i->name != 0; ++i) {

+      if (strcmp(name, i->name) == 0)

+	 return i->offset;

+   }

+

+   return 0;

+}

+

+

+/**

+ * \brief Extensions enabled by default.

+ *

+ * These extensions are enabled by _mesa_init_extensions().

+ *

+ * XXX: Should these defaults also apply to GLES?

+ */

+static const size_t default_extensions[] = {

+   o(ARB_copy_buffer),

+   o(ARB_draw_buffers),

+   o(ARB_multisample),

+   o(ARB_texture_compression),

+   o(ARB_transpose_matrix),

+   o(ARB_vertex_buffer_object),

+   o(ARB_window_pos),

+

+   o(EXT_abgr),

+   o(EXT_bgra),

+   o(EXT_compiled_vertex_array),

+   o(EXT_copy_texture),

+   o(EXT_draw_range_elements),

+   o(EXT_multi_draw_arrays),

+   o(EXT_packed_pixels),

+   o(EXT_polygon_offset),

+   o(EXT_rescale_normal),

+   o(EXT_separate_specular_color),

+   o(EXT_subtexture),

+   o(EXT_texture),

+   o(EXT_texture3D),

+   o(EXT_texture_object),

+   o(EXT_vertex_array),

+

+   o(OES_read_format),

+   o(OES_standard_derivatives),

+

+   /* Vendor Extensions */

+   o(APPLE_packed_pixels),

+   o(IBM_multimode_draw_arrays),

+   o(IBM_rasterpos_clip),

+   o(NV_light_max_exponent),

+   o(NV_texgen_reflection),

+   o(SGIS_generate_mipmap),

+   o(SGIS_texture_edge_clamp),

+   o(SGIS_texture_lod),

+

+   0,

+};

+

+

+/**

+ * Enable all extensions suitable for a software-only renderer.

+ * This is a convenience function used by the XMesa, OSMesa, GGI drivers, etc.

+ */

+void

+_mesa_enable_sw_extensions(struct gl_context *ctx)

+{

+   /*ctx->Extensions.ARB_copy_buffer = GL_TRUE;*/

+   ctx->Extensions.ARB_depth_clamp = GL_TRUE;

+   ctx->Extensions.ARB_depth_texture = GL_TRUE;

+   /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/

+   ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;

+   ctx->Extensions.ARB_draw_instanced = GL_TRUE;

+   ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE;

+   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;

+#if FEATURE_ARB_fragment_program

+   ctx->Extensions.ARB_fragment_program = GL_TRUE;

+   ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;

+#endif

+#if FEATURE_ARB_fragment_shader

+   ctx->Extensions.ARB_fragment_shader = GL_TRUE;

+#endif

+#if FEATURE_ARB_framebuffer_object

+   ctx->Extensions.ARB_framebuffer_object = GL_TRUE;

+#endif

+#if FEATURE_ARB_geometry_shader4 && 0

+   /* XXX re-enable when GLSL compiler again supports geometry shaders */

+   ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;

+#endif

+   ctx->Extensions.ARB_half_float_pixel = GL_TRUE;

+   ctx->Extensions.ARB_half_float_vertex = GL_TRUE;

+   ctx->Extensions.ARB_map_buffer_range = GL_TRUE;

+   ctx->Extensions.ARB_multitexture = GL_TRUE;

+#if FEATURE_queryobj

+   ctx->Extensions.ARB_occlusion_query = GL_TRUE;

+   ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;

+#endif

+   ctx->Extensions.ARB_point_sprite = GL_TRUE;

+#if FEATURE_ARB_shader_objects

+   ctx->Extensions.ARB_shader_objects = GL_TRUE;

+   ctx->Extensions.EXT_separate_shader_objects = GL_TRUE;

+#endif

+#if FEATURE_ARB_shading_language_100

+   ctx->Extensions.ARB_shading_language_100 = GL_TRUE;

+#endif

+   ctx->Extensions.ARB_shadow = GL_TRUE;

+   ctx->Extensions.ARB_shadow_ambient = GL_TRUE;

+   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;

+   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;

+   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;

+   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;

+   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;

+   /*ctx->Extensions.ARB_texture_float = GL_TRUE;*/

+   ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;

+   ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;

+   ctx->Extensions.ARB_texture_rg = GL_TRUE;

+   ctx->Extensions.ARB_texture_compression_rgtc = GL_TRUE;

+   ctx->Extensions.ARB_vertex_array_object = GL_TRUE;

+#if FEATURE_ARB_vertex_program

+   ctx->Extensions.ARB_vertex_program = GL_TRUE;

+#endif

+#if FEATURE_ARB_vertex_shader

+   ctx->Extensions.ARB_vertex_shader = GL_TRUE;

+#endif

+#if FEATURE_ARB_vertex_buffer_object

+   /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/

+#endif

+#if FEATURE_ARB_sync

+   ctx->Extensions.ARB_sync = GL_TRUE;

+#endif

+   ctx->Extensions.APPLE_vertex_array_object = GL_TRUE;

+#if FEATURE_APPLE_object_purgeable

+   ctx->Extensions.APPLE_object_purgeable = GL_TRUE;

+#endif

+   ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE;

+#if FEATURE_ATI_fragment_shader

+   ctx->Extensions.ATI_fragment_shader = GL_TRUE;

+#endif

+   ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;

+   ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;

+   ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;

+   ctx->Extensions.ATI_separate_stencil = GL_TRUE;

+   ctx->Extensions.EXT_blend_color = GL_TRUE;

+   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;

+   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;

+   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;

+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;

+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;

+   ctx->Extensions.EXT_depth_bounds_test = GL_TRUE;

+   ctx->Extensions.EXT_draw_buffers2 = GL_TRUE;

+   ctx->Extensions.EXT_fog_coord = GL_TRUE;

+#if FEATURE_EXT_framebuffer_object

+   ctx->Extensions.EXT_framebuffer_object = GL_TRUE;

+#endif

+#if FEATURE_EXT_framebuffer_blit

+   ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;

+#endif

+#if FEATURE_ARB_framebuffer_object

+   ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;

+#endif

+   /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/

+   ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;

+   ctx->Extensions.EXT_paletted_texture = GL_TRUE;

+#if FEATURE_EXT_pixel_buffer_object

+   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;

+#endif

+   ctx->Extensions.EXT_point_parameters = GL_TRUE;

+   ctx->Extensions.EXT_provoking_vertex = GL_TRUE;

+   ctx->Extensions.EXT_shadow_funcs = GL_TRUE;

+   ctx->Extensions.EXT_secondary_color = GL_TRUE;

+   ctx->Extensions.EXT_shared_texture_palette = GL_TRUE;

+   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;

+   ctx->Extensions.EXT_stencil_two_side = GL_TRUE;

+   ctx->Extensions.EXT_texture_array = GL_TRUE;

+   ctx->Extensions.EXT_texture_compression_latc = GL_TRUE;

+   ctx->Extensions.EXT_texture_env_add = GL_TRUE;

+   ctx->Extensions.EXT_texture_env_combine = GL_TRUE;

+   ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;

+   ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;

+   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;

+#if FEATURE_EXT_texture_sRGB

+   ctx->Extensions.EXT_texture_sRGB = GL_TRUE;

+   ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE;

+#endif

+   ctx->Extensions.EXT_texture_swizzle = GL_TRUE;

+#if FEATURE_EXT_transform_feedback

+   /*ctx->Extensions.EXT_transform_feedback = GL_TRUE;*/

+#endif

+   ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;

+   /*ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;*/

+   ctx->Extensions.MESA_pack_invert = GL_TRUE;

+   ctx->Extensions.MESA_resize_buffers = GL_TRUE;

+   ctx->Extensions.MESA_texture_array = GL_TRUE;

+   ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;

+   ctx->Extensions.NV_blend_square = GL_TRUE;

+   ctx->Extensions.NV_conditional_render = GL_TRUE;

+   /*ctx->Extensions.NV_light_max_exponent = GL_TRUE;*/

+   ctx->Extensions.NV_point_sprite = GL_TRUE;

+   ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;

+   ctx->Extensions.NV_texture_rectangle = GL_TRUE;

+   /*ctx->Extensions.NV_texgen_reflection = GL_TRUE;*/

+#if FEATURE_NV_vertex_program

+   ctx->Extensions.NV_vertex_program = GL_TRUE;

+   ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;

+#endif

+#if FEATURE_NV_fragment_program

+   ctx->Extensions.NV_fragment_program = GL_TRUE;

+#endif

+#if FEATURE_NV_fragment_program && FEATURE_ARB_fragment_program

+   ctx->Extensions.NV_fragment_program_option = GL_TRUE;

+#endif

+   /*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/

+   ctx->Extensions.SGIS_texture_edge_clamp = GL_TRUE;

+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+   ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;

+#endif

+#if FEATURE_texture_fxt1

+   _mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1");

+#endif

+#if FEATURE_texture_s3tc

+   if (ctx->Mesa_DXTn) {

+      _mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");

+      _mesa_enable_extension(ctx, "GL_S3_s3tc");

+   }

+#endif

+}

+

+

+/**

+ * Enable common EXT extensions in the ARB_imaging subset.

+ */

+void

+_mesa_enable_imaging_extensions(struct gl_context *ctx)

+{

+   ctx->Extensions.EXT_blend_color = GL_TRUE;

+   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;

+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;

+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;

+}

+

+

+

+/**

+ * Enable all OpenGL 1.3 features and extensions.

+ * A convenience function to be called by drivers.

+ */

+void

+_mesa_enable_1_3_extensions(struct gl_context *ctx)

+{

+   /*ctx->Extensions.ARB_multisample = GL_TRUE;*/

+   ctx->Extensions.ARB_multitexture = GL_TRUE;

+   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;

+   /*ctx->Extensions.ARB_texture_compression = GL_TRUE;*/

+   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;

+   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;

+   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;

+   ctx->Extensions.EXT_texture_env_add = GL_TRUE;

+   /*ctx->Extensions.ARB_transpose_matrix = GL_TRUE;*/

+}

+

+

+

+/**

+ * Enable all OpenGL 1.4 features and extensions.

+ * A convenience function to be called by drivers.

+ */

+void

+_mesa_enable_1_4_extensions(struct gl_context *ctx)

+{

+   ctx->Extensions.ARB_depth_texture = GL_TRUE;

+   ctx->Extensions.ARB_shadow = GL_TRUE;

+   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;

+   ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;

+   ctx->Extensions.ARB_window_pos = GL_TRUE;

+   ctx->Extensions.EXT_blend_color = GL_TRUE;

+   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;

+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;

+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;

+   ctx->Extensions.EXT_fog_coord = GL_TRUE;

+   /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/

+   ctx->Extensions.EXT_point_parameters = GL_TRUE;

+   ctx->Extensions.EXT_secondary_color = GL_TRUE;

+   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;

+   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;

+   /*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/

+}

+

+

+/**

+ * Enable all OpenGL 1.5 features and extensions.

+ * A convenience function to be called by drivers.

+ */

+void

+_mesa_enable_1_5_extensions(struct gl_context *ctx)

+{

+   ctx->Extensions.ARB_occlusion_query = GL_TRUE;

+   /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/

+   ctx->Extensions.EXT_shadow_funcs = GL_TRUE;

+}

+

+

+/**

+ * Enable all OpenGL 2.0 features and extensions.

+ * A convenience function to be called by drivers.

+ */

+void

+_mesa_enable_2_0_extensions(struct gl_context *ctx)

+{

+   /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/

+#if FEATURE_ARB_fragment_shader

+   ctx->Extensions.ARB_fragment_shader = GL_TRUE;

+#endif

+   ctx->Extensions.ARB_point_sprite = GL_TRUE;

+   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;

+   ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;

+#if FEATURE_ARB_shader_objects

+   ctx->Extensions.ARB_shader_objects = GL_TRUE;

+#endif

+#if FEATURE_ARB_shading_language_100

+   ctx->Extensions.ARB_shading_language_100 = GL_TRUE;

+#endif

+   ctx->Extensions.EXT_stencil_two_side = GL_TRUE;

+#if FEATURE_ARB_vertex_shader

+   ctx->Extensions.ARB_vertex_shader = GL_TRUE;

+#endif

+}

+

+

+/**

+ * Enable all OpenGL 2.1 features and extensions.

+ * A convenience function to be called by drivers.

+ */

+void

+_mesa_enable_2_1_extensions(struct gl_context *ctx)

+{

+#if FEATURE_EXT_pixel_buffer_object

+   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;

+#endif

+#if FEATURE_EXT_texture_sRGB

+   ctx->Extensions.EXT_texture_sRGB = GL_TRUE;

+#endif

+}

+

+

+/**

+ * Either enable or disable the named extension.

+ * \return GL_TRUE for success, GL_FALSE if invalid extension name

+ */

+static GLboolean

+set_extension( struct gl_context *ctx, const char *name, GLboolean state )

+{

+   size_t offset;

+

+   if (ctx->Extensions.String) {

+      /* The string was already queried - can't change it now! */

+      _mesa_problem(ctx, "Trying to enable/disable extension after glGetString(GL_EXTENSIONS): %s", name);

+      return GL_FALSE;

+   }

+

+   offset = name_to_offset(name);

+   if (offset == 0) {

+      _mesa_problem(ctx, "Trying to enable/disable unknown extension %s",

+	            name);

+      return GL_FALSE;

+   } else if (offset == o(dummy_true) && state == GL_FALSE) {

+      _mesa_problem(ctx, "Trying to disable a permanently enabled extension: "

+	                  "%s", name);

+      return GL_FALSE;

+   } else {

+      GLboolean *base = (GLboolean *) &ctx->Extensions;

+      base[offset] = state;

+      return GL_TRUE;

+   }

+}

+

+

+/**

+ * Enable the named extension.

+ * Typically called by drivers.

+ */

+void

+_mesa_enable_extension( struct gl_context *ctx, const char *name )

+{

+   if (!set_extension(ctx, name, GL_TRUE))

+      _mesa_problem(ctx, "Trying to enable unknown extension: %s", name);

+}

+

+

+/**

+ * Disable the named extension.

+ * XXX is this really needed???

+ */

+void

+_mesa_disable_extension( struct gl_context *ctx, const char *name )

+{

+   if (!set_extension(ctx, name, GL_FALSE))

+      _mesa_problem(ctx, "Trying to disable unknown extension: %s", name);

+}

+

+

+/**

+ * Test if the named extension is enabled in this context.

+ */

+GLboolean

+_mesa_extension_is_enabled( struct gl_context *ctx, const char *name )

+{

+   size_t offset;

+   GLboolean *base;

+

+   if (name == 0)

+      return GL_FALSE;

+

+   offset = name_to_offset(name);

+   if (offset == 0)

+      return GL_FALSE;

+   base = (GLboolean *) &ctx->Extensions;

+   return base[offset];

+}

+

+

+/**

+ * \brief Apply the \c MESA_EXTENSION_OVERRIDE environment variable.

+ *

+ * \c MESA_EXTENSION_OVERRIDE is a space-separated list of extensions to

+ * enable or disable. The list is processed thus:

+ *    - Enable recognized extension names that are prefixed with '+'.

+ *    - Disable recognized extension names that are prefixed with '-'.

+ *    - Enable recognized extension names that are not prefixed.

+ *    - Collect unrecognized extension names in a new string.

+ *

+ * \return Space-separated list of unrecognized extension names (which must

+ *    be freed). Does not return \c NULL.

+ */

+static char *

+get_extension_override( struct gl_context *ctx )

+{

+   const char *env_const = _mesa_getenv("MESA_EXTENSION_OVERRIDE");

+   char *env;

+   char *ext;

+   char *extra_exts;

+   int len;

+

+   if (env_const == NULL) {

+      /* Return the empty string rather than NULL. This simplifies the logic

+       * of client functions. */

+      return calloc(1, sizeof(char));

+   }

+

+   /* extra_exts: List of unrecognized extensions. */

+   extra_exts = calloc(strlen(env_const), sizeof(char));

+

+   /* Copy env_const because strtok() is destructive. */

+   env = strdup(env_const);

+   for (ext = strtok(env, " "); ext != NULL; ext = strtok(NULL, " ")) {

+      int enable;

+      int recognized;

+      switch (ext[0]) {

+      case '+':

+         enable = 1;

+         ++ext;

+         break;

+      case '-':

+         enable = 0;

+         ++ext;

+         break;

+      default:

+         enable = 1;

+         break;

+      }

+      recognized = set_extension(ctx, ext, enable);

+      if (!recognized) {

+         strcat(extra_exts, ext);

+         strcat(extra_exts, " ");

+      }

+   }

+

+   /* Remove trailing space. */

+   len = strlen(extra_exts);

+   if (extra_exts[len - 1] == ' ')

+      extra_exts[len - 1] = '\0';

+

+   return extra_exts;

+}

+

+

+/**

+ * \brief Initialize extension tables and enable default extensions.

+ *

+ * This should be called during context initialization.

+ * Note: Sets gl_extensions.dummy_true to true.

+ */

+void

+_mesa_init_extensions( struct gl_context *ctx )

+{

+   GLboolean *base = (GLboolean *) &ctx->Extensions;

+   GLboolean *sentinel = base + o(extension_sentinel);

+   GLboolean *i;

+   const size_t *j;

+

+   /* First, turn all extensions off. */

+   for (i = base; i != sentinel; ++i)

+      *i = GL_FALSE;

+

+   /* Then, selectively turn default extensions on. */

+   ctx->Extensions.dummy_true = GL_TRUE;

+   for (j = default_extensions; *j != 0; ++j)

+      base[*j] = GL_TRUE;

+}

+

+

+typedef unsigned short extension_index;

+

+

+/**

+ * Compare two entries of the extensions table.  Sorts first by year,

+ * then by name.

+ *

+ * Arguments are indices into extension_table.

+ */

+static int

+extension_compare(const void *p1, const void *p2)

+{

+   extension_index i1 = * (const extension_index *) p1;

+   extension_index i2 = * (const extension_index *) p2;

+   const struct extension *e1 = &extension_table[i1];

+   const struct extension *e2 = &extension_table[i2];

+   int res;

+

+   res = (int)e1->year - (int)e2->year;

+

+   if (res == 0) {

+      res = strcmp(e1->name, e2->name);

+   }

+

+   return res;

+}

+

+

+/**

+ * Construct the GL_EXTENSIONS string.  Called the first time that

+ * glGetString(GL_EXTENSIONS) is called.

+ */

+GLubyte*

+_mesa_make_extension_string(struct gl_context *ctx)

+{

+   /* The extension string. */

+   char *exts = 0;

+   /* Length of extension string. */

+   size_t length = 0;

+   /* Number of extensions */

+   unsigned count;

+   /* Indices of the extensions sorted by year */

+   extension_index *extension_indices;

+   /* String of extra extensions. */

+   char *extra_extensions = get_extension_override(ctx);

+   GLboolean *base = (GLboolean *) &ctx->Extensions;

+   const struct extension *i;

+   unsigned j;

+   unsigned maxYear = ~0;

+

+   /* Check if the MESA_EXTENSION_MAX_YEAR env var is set */

+   {

+      const char *env = getenv("MESA_EXTENSION_MAX_YEAR");

+      if (env) {

+         maxYear = atoi(env);

+         _mesa_debug(ctx, "Note: limiting GL extensions to %u or earlier\n",

+                     maxYear);

+      }

+   }

+

+   /* Compute length of the extension string. */

+   count = 0;

+   for (i = extension_table; i->name != 0; ++i) {

+      if (base[i->offset] &&

+          i->year <= maxYear &&

+          (i->api_set & (1 << ctx->API))) {

+	 length += strlen(i->name) + 1; /* +1 for space */

+	 ++count;

+      }

+   }

+   if (extra_extensions != NULL)

+      length += 1 + strlen(extra_extensions); /* +1 for space */

+

+   exts = (char *) calloc(length + 1, sizeof(char));

+   if (exts == NULL) {

+      free(extra_extensions);

+      return NULL;

+   }

+

+   extension_indices = malloc(count * sizeof extension_indices);

+   if (extension_indices == NULL) {

+      free(exts);

+      free(extra_extensions);

+      return NULL;

+   }

+

+   /* Sort extensions in chronological order because certain old applications (e.g.,

+    * Quake3 demo) store the extension list in a static size buffer so chronologically

+    * order ensure that the extensions that such applications expect will fit into

+    * that buffer.

+    */

+   j = 0;

+   for (i = extension_table; i->name != 0; ++i) {

+      if (base[i->offset] &&

+          i->year <= maxYear &&

+          (i->api_set & (1 << ctx->API))) {

+         extension_indices[j++] = i - extension_table;

+      }

+   }

+   assert(j == count);

+   qsort(extension_indices, count, sizeof *extension_indices, extension_compare);

+

+   /* Build the extension string.*/

+   for (j = 0; j < count; ++j) {

+      i = &extension_table[extension_indices[j]];

+      assert(base[i->offset] && (i->api_set & (1 << ctx->API)));

+      strcat(exts, i->name);

+      strcat(exts, " ");

+   }

+   free(extension_indices);

+   if (extra_extensions != 0) {

+      strcat(exts, extra_extensions);

+      free(extra_extensions);

+   }

+

+   return (GLubyte *) exts;

+}

+

+/**

+ * Return number of enabled extensions.

+ */

+GLuint

+_mesa_get_extension_count(struct gl_context *ctx)

+{

+   GLboolean *base;

+   const struct extension *i;

+

+   /* only count once */

+   if (ctx->Extensions.Count != 0)

+      return ctx->Extensions.Count;

+

+   base = (GLboolean *) &ctx->Extensions;

+   for (i = extension_table; i->name != 0; ++i) {

+      if (base[i->offset]) {

+	 ctx->Extensions.Count++;

+      }

+   }

+   return ctx->Extensions.Count;

+}

+

+/**

+ * Return name of i-th enabled extension

+ */

+const GLubyte *

+_mesa_get_enabled_extension(struct gl_context *ctx, GLuint index)

+{

+   const GLboolean *base;

+   size_t n;

+   const struct extension *i;

+

+   if (index < 0)

+      return NULL;

+

+   base = (GLboolean*) &ctx->Extensions;

+   n = 0;

+   for (i = extension_table; i->name != 0; ++i) {

+      if (n == index && base[i->offset]) {

+	 return (GLubyte*) i->name;

+      } else if (base[i->offset]) {

+	 ++n;

+      }

+   }

+

+   return NULL;

+}

diff --git a/mesalib/src/mesa/main/ff_fragment_shader.cpp b/mesalib/src/mesa/main/ff_fragment_shader.cpp
index bf65a4f64..401e72c89 100644
--- a/mesalib/src/mesa/main/ff_fragment_shader.cpp
+++ b/mesalib/src/mesa/main/ff_fragment_shader.cpp
@@ -1,1623 +1,1623 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * Copyright 2009 VMware, Inc.  All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
-extern "C" {
-#include "glheader.h"
-#include "imports.h"
-#include "mtypes.h"
-#include "program/program.h"
-#include "program/prog_parameter.h"
-#include "program/prog_cache.h"
-#include "program/prog_instruction.h"
-#include "program/prog_print.h"
-#include "program/prog_statevars.h"
-#include "program/programopt.h"
-#include "texenvprogram.h"
-}
-
-/*
- * Note on texture units:
- *
- * The number of texture units supported by fixed-function fragment
- * processing is MAX_TEXTURE_COORD_UNITS, not MAX_TEXTURE_IMAGE_UNITS.
- * That's because there's a one-to-one correspondence between texture
- * coordinates and samplers in fixed-function processing.
- *
- * Since fixed-function vertex processing is limited to MAX_TEXTURE_COORD_UNITS
- * sets of texcoords, so is fixed-function fragment processing.
- *
- * We can safely use ctx->Const.MaxTextureUnits for loop bounds.
- */
-
-
-struct texenvprog_cache_item
-{
-   GLuint hash;
-   void *key;
-   struct gl_fragment_program *data;
-   struct texenvprog_cache_item *next;
-};
-
-static GLboolean
-texenv_doing_secondary_color(struct gl_context *ctx)
-{
-   if (ctx->Light.Enabled &&
-       (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR))
-      return GL_TRUE;
-
-   if (ctx->Fog.ColorSumEnabled)
-      return GL_TRUE;
-
-   return GL_FALSE;
-}
-
-/**
- * Up to nine instructions per tex unit, plus fog, specular color.
- */
-#define MAX_INSTRUCTIONS ((MAX_TEXTURE_COORD_UNITS * 9) + 12)
-
-#define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
-
-struct mode_opt {
-#ifdef __GNUC__
-   __extension__ GLubyte Source:4;  /**< SRC_x */
-   __extension__ GLubyte Operand:3; /**< OPR_x */
-#else
-   GLubyte Source;  /**< SRC_x */
-   GLubyte Operand; /**< OPR_x */
-#endif
-};
-
-struct state_key {
-   GLuint nr_enabled_units:8;
-   GLuint enabled_units:8;
-   GLuint separate_specular:1;
-   GLuint fog_enabled:1;
-   GLuint fog_mode:2;          /**< FOG_x */
-   GLuint inputs_available:12;
-   GLuint num_draw_buffers:4;
-
-   /* NOTE: This array of structs must be last! (see "keySize" below) */
-   struct {
-      GLuint enabled:1;
-      GLuint source_index:3;   /**< TEXTURE_x_INDEX */
-      GLuint shadow:1;
-      GLuint ScaleShiftRGB:2;
-      GLuint ScaleShiftA:2;
-
-      GLuint NumArgsRGB:3;  /**< up to MAX_COMBINER_TERMS */
-      GLuint ModeRGB:5;     /**< MODE_x */
-
-      GLuint NumArgsA:3;  /**< up to MAX_COMBINER_TERMS */
-      GLuint ModeA:5;     /**< MODE_x */
-
-      GLuint texture_cyl_wrap:1; /**< For gallium test/debug only */
-
-      struct mode_opt OptRGB[MAX_COMBINER_TERMS];
-      struct mode_opt OptA[MAX_COMBINER_TERMS];
-   } unit[MAX_TEXTURE_UNITS];
-};
-
-#define FOG_LINEAR  0
-#define FOG_EXP     1
-#define FOG_EXP2    2
-#define FOG_UNKNOWN 3
-
-static GLuint translate_fog_mode( GLenum mode )
-{
-   switch (mode) {
-   case GL_LINEAR: return FOG_LINEAR;
-   case GL_EXP: return FOG_EXP;
-   case GL_EXP2: return FOG_EXP2;
-   default: return FOG_UNKNOWN;
-   }
-}
-
-#define OPR_SRC_COLOR           0
-#define OPR_ONE_MINUS_SRC_COLOR 1
-#define OPR_SRC_ALPHA           2
-#define OPR_ONE_MINUS_SRC_ALPHA	3
-#define OPR_ZERO                4
-#define OPR_ONE                 5
-#define OPR_UNKNOWN             7
-
-static GLuint translate_operand( GLenum operand )
-{
-   switch (operand) {
-   case GL_SRC_COLOR: return OPR_SRC_COLOR;
-   case GL_ONE_MINUS_SRC_COLOR: return OPR_ONE_MINUS_SRC_COLOR;
-   case GL_SRC_ALPHA: return OPR_SRC_ALPHA;
-   case GL_ONE_MINUS_SRC_ALPHA: return OPR_ONE_MINUS_SRC_ALPHA;
-   case GL_ZERO: return OPR_ZERO;
-   case GL_ONE: return OPR_ONE;
-   default:
-      assert(0);
-      return OPR_UNKNOWN;
-   }
-}
-
-#define SRC_TEXTURE  0
-#define SRC_TEXTURE0 1
-#define SRC_TEXTURE1 2
-#define SRC_TEXTURE2 3
-#define SRC_TEXTURE3 4
-#define SRC_TEXTURE4 5
-#define SRC_TEXTURE5 6
-#define SRC_TEXTURE6 7
-#define SRC_TEXTURE7 8
-#define SRC_CONSTANT 9
-#define SRC_PRIMARY_COLOR 10
-#define SRC_PREVIOUS 11
-#define SRC_ZERO     12
-#define SRC_UNKNOWN  15
-
-static GLuint translate_source( GLenum src )
-{
-   switch (src) {
-   case GL_TEXTURE: return SRC_TEXTURE;
-   case GL_TEXTURE0:
-   case GL_TEXTURE1:
-   case GL_TEXTURE2:
-   case GL_TEXTURE3:
-   case GL_TEXTURE4:
-   case GL_TEXTURE5:
-   case GL_TEXTURE6:
-   case GL_TEXTURE7: return SRC_TEXTURE0 + (src - GL_TEXTURE0);
-   case GL_CONSTANT: return SRC_CONSTANT;
-   case GL_PRIMARY_COLOR: return SRC_PRIMARY_COLOR;
-   case GL_PREVIOUS: return SRC_PREVIOUS;
-   case GL_ZERO:
-      return SRC_ZERO;
-   default:
-      assert(0);
-      return SRC_UNKNOWN;
-   }
-}
-
-#define MODE_REPLACE                     0  /* r = a0 */
-#define MODE_MODULATE                    1  /* r = a0 * a1 */
-#define MODE_ADD                         2  /* r = a0 + a1 */
-#define MODE_ADD_SIGNED                  3  /* r = a0 + a1 - 0.5 */
-#define MODE_INTERPOLATE                 4  /* r = a0 * a2 + a1 * (1 - a2) */
-#define MODE_SUBTRACT                    5  /* r = a0 - a1 */
-#define MODE_DOT3_RGB                    6  /* r = a0 . a1 */
-#define MODE_DOT3_RGB_EXT                7  /* r = a0 . a1 */
-#define MODE_DOT3_RGBA                   8  /* r = a0 . a1 */
-#define MODE_DOT3_RGBA_EXT               9  /* r = a0 . a1 */
-#define MODE_MODULATE_ADD_ATI           10  /* r = a0 * a2 + a1 */
-#define MODE_MODULATE_SIGNED_ADD_ATI    11  /* r = a0 * a2 + a1 - 0.5 */
-#define MODE_MODULATE_SUBTRACT_ATI      12  /* r = a0 * a2 - a1 */
-#define MODE_ADD_PRODUCTS               13  /* r = a0 * a1 + a2 * a3 */
-#define MODE_ADD_PRODUCTS_SIGNED        14  /* r = a0 * a1 + a2 * a3 - 0.5 */
-#define MODE_BUMP_ENVMAP_ATI            15  /* special */
-#define MODE_UNKNOWN                    16
-
-/**
- * Translate GL combiner state into a MODE_x value
- */
-static GLuint translate_mode( GLenum envMode, GLenum mode )
-{
-   switch (mode) {
-   case GL_REPLACE: return MODE_REPLACE;
-   case GL_MODULATE: return MODE_MODULATE;
-   case GL_ADD:
-      if (envMode == GL_COMBINE4_NV)
-         return MODE_ADD_PRODUCTS;
-      else
-         return MODE_ADD;
-   case GL_ADD_SIGNED:
-      if (envMode == GL_COMBINE4_NV)
-         return MODE_ADD_PRODUCTS_SIGNED;
-      else
-         return MODE_ADD_SIGNED;
-   case GL_INTERPOLATE: return MODE_INTERPOLATE;
-   case GL_SUBTRACT: return MODE_SUBTRACT;
-   case GL_DOT3_RGB: return MODE_DOT3_RGB;
-   case GL_DOT3_RGB_EXT: return MODE_DOT3_RGB_EXT;
-   case GL_DOT3_RGBA: return MODE_DOT3_RGBA;
-   case GL_DOT3_RGBA_EXT: return MODE_DOT3_RGBA_EXT;
-   case GL_MODULATE_ADD_ATI: return MODE_MODULATE_ADD_ATI;
-   case GL_MODULATE_SIGNED_ADD_ATI: return MODE_MODULATE_SIGNED_ADD_ATI;
-   case GL_MODULATE_SUBTRACT_ATI: return MODE_MODULATE_SUBTRACT_ATI;
-   case GL_BUMP_ENVMAP_ATI: return MODE_BUMP_ENVMAP_ATI;
-   default:
-      assert(0);
-      return MODE_UNKNOWN;
-   }
-}
-
-
-/**
- * Do we need to clamp the results of the given texture env/combine mode?
- * If the inputs to the mode are in [0,1] we don't always have to clamp
- * the results.
- */
-static GLboolean
-need_saturate( GLuint mode )
-{
-   switch (mode) {
-   case MODE_REPLACE:
-   case MODE_MODULATE:
-   case MODE_INTERPOLATE:
-      return GL_FALSE;
-   case MODE_ADD:
-   case MODE_ADD_SIGNED:
-   case MODE_SUBTRACT:
-   case MODE_DOT3_RGB:
-   case MODE_DOT3_RGB_EXT:
-   case MODE_DOT3_RGBA:
-   case MODE_DOT3_RGBA_EXT:
-   case MODE_MODULATE_ADD_ATI:
-   case MODE_MODULATE_SIGNED_ADD_ATI:
-   case MODE_MODULATE_SUBTRACT_ATI:
-   case MODE_ADD_PRODUCTS:
-   case MODE_ADD_PRODUCTS_SIGNED:
-   case MODE_BUMP_ENVMAP_ATI:
-      return GL_TRUE;
-   default:
-      assert(0);
-      return GL_FALSE;
-   }
-}
-
-
-
-/**
- * Translate TEXTURE_x_BIT to TEXTURE_x_INDEX.
- */
-static GLuint translate_tex_src_bit( GLbitfield bit )
-{
-   ASSERT(bit);
-   return _mesa_ffs(bit) - 1;
-}
-
-
-#define VERT_BIT_TEX_ANY    (0xff << VERT_ATTRIB_TEX0)
-#define VERT_RESULT_TEX_ANY (0xff << VERT_RESULT_TEX0)
-
-/**
- * Identify all possible varying inputs.  The fragment program will
- * never reference non-varying inputs, but will track them via state
- * constants instead.
- *
- * This function figures out all the inputs that the fragment program
- * has access to.  The bitmask is later reduced to just those which
- * are actually referenced.
- */
-static GLbitfield get_fp_input_mask( struct gl_context *ctx )
-{
-   /* _NEW_PROGRAM */
-   const GLboolean vertexShader =
-      (ctx->Shader.CurrentVertexProgram &&
-       ctx->Shader.CurrentVertexProgram->LinkStatus &&
-       ctx->Shader.CurrentVertexProgram->VertexProgram);
-   const GLboolean vertexProgram = ctx->VertexProgram._Enabled;
-   GLbitfield fp_inputs = 0x0;
-
-   if (ctx->VertexProgram._Overriden) {
-      /* Somebody's messing with the vertex program and we don't have
-       * a clue what's happening.  Assume that it could be producing
-       * all possible outputs.
-       */
-      fp_inputs = ~0;
-   }
-   else if (ctx->RenderMode == GL_FEEDBACK) {
-      /* _NEW_RENDERMODE */
-      fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
-   }
-   else if (!(vertexProgram || vertexShader) ||
-            !ctx->VertexProgram._Current) {
-      /* Fixed function vertex logic */
-      /* _NEW_ARRAY */
-      GLbitfield varying_inputs = ctx->varying_vp_inputs;
-
-      /* These get generated in the setup routine regardless of the
-       * vertex program:
-       */
-      /* _NEW_POINT */
-      if (ctx->Point.PointSprite)
-         varying_inputs |= FRAG_BITS_TEX_ANY;
-
-      /* First look at what values may be computed by the generated
-       * vertex program:
-       */
-      /* _NEW_LIGHT */
-      if (ctx->Light.Enabled) {
-         fp_inputs |= FRAG_BIT_COL0;
-
-         if (texenv_doing_secondary_color(ctx))
-            fp_inputs |= FRAG_BIT_COL1;
-      }
-
-      /* _NEW_TEXTURE */
-      fp_inputs |= (ctx->Texture._TexGenEnabled |
-                    ctx->Texture._TexMatEnabled) << FRAG_ATTRIB_TEX0;
-
-      /* Then look at what might be varying as a result of enabled
-       * arrays, etc:
-       */
-      if (varying_inputs & VERT_BIT_COLOR0)
-         fp_inputs |= FRAG_BIT_COL0;
-      if (varying_inputs & VERT_BIT_COLOR1)
-         fp_inputs |= FRAG_BIT_COL1;
-
-      fp_inputs |= (((varying_inputs & VERT_BIT_TEX_ANY) >> VERT_ATTRIB_TEX0) 
-                    << FRAG_ATTRIB_TEX0);
-
-   }
-   else {
-      /* calculate from vp->outputs */
-      struct gl_vertex_program *vprog;
-      GLbitfield64 vp_outputs;
-
-      /* Choose GLSL vertex shader over ARB vertex program.  Need this
-       * since vertex shader state validation comes after fragment state
-       * validation (see additional comments in state.c).
-       */
-      if (vertexShader)
-         vprog = ctx->Shader.CurrentVertexProgram->VertexProgram;
-      else
-         vprog = ctx->VertexProgram.Current;
-
-      vp_outputs = vprog->Base.OutputsWritten;
-
-      /* These get generated in the setup routine regardless of the
-       * vertex program:
-       */
-      /* _NEW_POINT */
-      if (ctx->Point.PointSprite)
-         vp_outputs |= FRAG_BITS_TEX_ANY;
-
-      if (vp_outputs & (1 << VERT_RESULT_COL0))
-         fp_inputs |= FRAG_BIT_COL0;
-      if (vp_outputs & (1 << VERT_RESULT_COL1))
-         fp_inputs |= FRAG_BIT_COL1;
-
-      fp_inputs |= (((vp_outputs & VERT_RESULT_TEX_ANY) >> VERT_RESULT_TEX0) 
-                    << FRAG_ATTRIB_TEX0);
-   }
-   
-   return fp_inputs;
-}
-
-
-/**
- * Examine current texture environment state and generate a unique
- * key to identify it.
- */
-static GLuint make_state_key( struct gl_context *ctx,  struct state_key *key )
-{
-   GLuint i, j;
-   GLbitfield inputs_referenced = FRAG_BIT_COL0;
-   const GLbitfield inputs_available = get_fp_input_mask( ctx );
-   GLuint keySize;
-
-   memset(key, 0, sizeof(*key));
-
-   /* _NEW_TEXTURE */
-   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
-      const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
-      const struct gl_texture_object *texObj = texUnit->_Current;
-      const struct gl_tex_env_combine_state *comb = texUnit->_CurrentCombine;
-      GLenum format;
-
-      if (!texUnit->_ReallyEnabled || !texUnit->Enabled)
-         continue;
-
-      format = texObj->Image[0][texObj->BaseLevel]->_BaseFormat;
-
-      key->unit[i].enabled = 1;
-      key->enabled_units |= (1<<i);
-      key->nr_enabled_units = i + 1;
-      inputs_referenced |= FRAG_BIT_TEX(i);
-
-      key->unit[i].source_index =
-         translate_tex_src_bit(texUnit->_ReallyEnabled);
-
-      key->unit[i].shadow = ((texObj->CompareMode == GL_COMPARE_R_TO_TEXTURE) &&
-                             ((format == GL_DEPTH_COMPONENT) || 
-                              (format == GL_DEPTH_STENCIL_EXT)));
-
-      key->unit[i].NumArgsRGB = comb->_NumArgsRGB;
-      key->unit[i].NumArgsA = comb->_NumArgsA;
-
-      key->unit[i].ModeRGB =
-	 translate_mode(texUnit->EnvMode, comb->ModeRGB);
-      key->unit[i].ModeA =
-	 translate_mode(texUnit->EnvMode, comb->ModeA);
-
-      key->unit[i].ScaleShiftRGB = comb->ScaleShiftRGB;
-      key->unit[i].ScaleShiftA = comb->ScaleShiftA;
-
-      for (j = 0; j < MAX_COMBINER_TERMS; j++) {
-         key->unit[i].OptRGB[j].Operand = translate_operand(comb->OperandRGB[j]);
-         key->unit[i].OptA[j].Operand = translate_operand(comb->OperandA[j]);
-         key->unit[i].OptRGB[j].Source = translate_source(comb->SourceRGB[j]);
-         key->unit[i].OptA[j].Source = translate_source(comb->SourceA[j]);
-      }
-
-      if (key->unit[i].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
-         /* requires some special translation */
-         key->unit[i].NumArgsRGB = 2;
-         key->unit[i].ScaleShiftRGB = 0;
-         key->unit[i].OptRGB[0].Operand = OPR_SRC_COLOR;
-         key->unit[i].OptRGB[0].Source = SRC_TEXTURE;
-         key->unit[i].OptRGB[1].Operand = OPR_SRC_COLOR;
-         key->unit[i].OptRGB[1].Source = texUnit->BumpTarget - GL_TEXTURE0 + SRC_TEXTURE0;
-       }
-
-      /* this is a back-door for enabling cylindrical texture wrap mode */
-      if (texObj->Priority == 0.125)
-         key->unit[i].texture_cyl_wrap = 1;
-   }
-
-   /* _NEW_LIGHT | _NEW_FOG */
-   if (texenv_doing_secondary_color(ctx)) {
-      key->separate_specular = 1;
-      inputs_referenced |= FRAG_BIT_COL1;
-   }
-
-   /* _NEW_FOG */
-   if (ctx->Fog.Enabled) {
-      key->fog_enabled = 1;
-      key->fog_mode = translate_fog_mode(ctx->Fog.Mode);
-      inputs_referenced |= FRAG_BIT_FOGC; /* maybe */
-   }
-
-   /* _NEW_BUFFERS */
-   key->num_draw_buffers = ctx->DrawBuffer->_NumColorDrawBuffers;
-
-   key->inputs_available = (inputs_available & inputs_referenced);
-
-   /* compute size of state key, ignoring unused texture units */
-   keySize = sizeof(*key) - sizeof(key->unit)
-      + key->nr_enabled_units * sizeof(key->unit[0]);
-
-   return keySize;
-}
-
-
-/**
- * Use uregs to represent registers internally, translate to Mesa's
- * expected formats on emit.  
- *
- * NOTE: These are passed by value extensively in this file rather
- * than as usual by pointer reference.  If this disturbs you, try
- * remembering they are just 32bits in size.
- *
- * GCC is smart enough to deal with these dword-sized structures in
- * much the same way as if I had defined them as dwords and was using
- * macros to access and set the fields.  This is much nicer and easier
- * to evolve.
- */
-struct ureg {
-   GLuint file:4;
-   GLuint idx:8;
-   GLuint negatebase:1;
-   GLuint swz:12;
-   GLuint pad:7;
-};
-
-static const struct ureg undef = { 
-   PROGRAM_UNDEFINED,
-   255,
-   0,
-   0,
-   0
-};
-
-
-/** State used to build the fragment program:
- */
-struct texenv_fragment_program {
-   struct gl_fragment_program *program;
-   struct state_key *state;
-
-   GLbitfield alu_temps;	/**< Track texture indirections, see spec. */
-   GLbitfield temps_output;	/**< Track texture indirections, see spec. */
-   GLbitfield temp_in_use;	/**< Tracks temporary regs which are in use. */
-   GLboolean error;
-
-   struct ureg src_texture[MAX_TEXTURE_COORD_UNITS];   
-   /* Reg containing each texture unit's sampled texture color,
-    * else undef.
-    */
-
-   struct ureg texcoord_tex[MAX_TEXTURE_COORD_UNITS];
-   /* Reg containing texcoord for a texture unit,
-    * needed for bump mapping, else undef.
-    */
-
-   struct ureg src_previous;	/**< Reg containing color from previous 
-				 * stage.  May need to be decl'd.
-				 */
-
-   GLuint last_tex_stage;	/**< Number of last enabled texture unit */
-
-   struct ureg half;
-   struct ureg one;
-   struct ureg zero;
-};
-
-
-
-static struct ureg make_ureg(GLuint file, GLuint idx)
-{
-   struct ureg reg;
-   reg.file = file;
-   reg.idx = idx;
-   reg.negatebase = 0;
-   reg.swz = SWIZZLE_NOOP;
-   reg.pad = 0;
-   return reg;
-}
-
-static struct ureg swizzle( struct ureg reg, int x, int y, int z, int w )
-{
-   reg.swz = MAKE_SWIZZLE4(GET_SWZ(reg.swz, x),
-			   GET_SWZ(reg.swz, y),
-			   GET_SWZ(reg.swz, z),
-			   GET_SWZ(reg.swz, w));
-
-   return reg;
-}
-
-static struct ureg swizzle1( struct ureg reg, int x )
-{
-   return swizzle(reg, x, x, x, x);
-}
-
-static struct ureg negate( struct ureg reg )
-{
-   reg.negatebase ^= 1;
-   return reg;
-}
-
-static GLboolean is_undef( struct ureg reg )
-{
-   return reg.file == PROGRAM_UNDEFINED;
-}
-
-
-static struct ureg get_temp( struct texenv_fragment_program *p )
-{
-   GLint bit;
-   
-   /* First try and reuse temps which have been used already:
-    */
-   bit = _mesa_ffs( ~p->temp_in_use & p->alu_temps );
-
-   /* Then any unused temporary:
-    */
-   if (!bit)
-      bit = _mesa_ffs( ~p->temp_in_use );
-
-   if (!bit) {
-      _mesa_problem(NULL, "%s: out of temporaries\n", __FILE__);
-      exit(1);
-   }
-
-   if ((GLuint) bit > p->program->Base.NumTemporaries)
-      p->program->Base.NumTemporaries = bit;
-
-   p->temp_in_use |= 1<<(bit-1);
-   return make_ureg(PROGRAM_TEMPORARY, (bit-1));
-}
-
-static struct ureg get_tex_temp( struct texenv_fragment_program *p )
-{
-   int bit;
-   
-   /* First try to find available temp not previously used (to avoid
-    * starting a new texture indirection).  According to the spec, the
-    * ~p->temps_output isn't necessary, but will keep it there for
-    * now:
-    */
-   bit = _mesa_ffs( ~p->temp_in_use & ~p->alu_temps & ~p->temps_output );
-
-   /* Then any unused temporary:
-    */
-   if (!bit) 
-      bit = _mesa_ffs( ~p->temp_in_use );
-
-   if (!bit) {
-      _mesa_problem(NULL, "%s: out of temporaries\n", __FILE__);
-      exit(1);
-   }
-
-   if ((GLuint) bit > p->program->Base.NumTemporaries)
-      p->program->Base.NumTemporaries = bit;
-
-   p->temp_in_use |= 1<<(bit-1);
-   return make_ureg(PROGRAM_TEMPORARY, (bit-1));
-}
-
-
-/** Mark a temp reg as being no longer allocatable. */
-static void reserve_temp( struct texenv_fragment_program *p, struct ureg r )
-{
-   if (r.file == PROGRAM_TEMPORARY)
-      p->temps_output |= (1 << r.idx);
-}
-
-
-static void release_temps(struct gl_context *ctx, struct texenv_fragment_program *p )
-{
-   GLuint max_temp = ctx->Const.FragmentProgram.MaxTemps;
-
-   /* KW: To support tex_env_crossbar, don't release the registers in
-    * temps_output.
-    */
-   if (max_temp >= sizeof(int) * 8)
-      p->temp_in_use = p->temps_output;
-   else
-      p->temp_in_use = ~((1<<max_temp)-1) | p->temps_output;
-}
-
-
-static struct ureg register_param5( struct texenv_fragment_program *p, 
-				    GLint s0,
-				    GLint s1,
-				    GLint s2,
-				    GLint s3,
-				    GLint s4)
-{
-   int tokens[STATE_LENGTH];
-   GLuint idx;
-   tokens[0] = s0;
-   tokens[1] = s1;
-   tokens[2] = s2;
-   tokens[3] = s3;
-   tokens[4] = s4;
-   idx = _mesa_add_state_reference(p->program->Base.Parameters,
-				   (gl_state_index *)tokens);
-   return make_ureg(PROGRAM_STATE_VAR, idx);
-}
-
-
-#define register_param1(p,s0)          register_param5(p,s0,0,0,0,0)
-#define register_param2(p,s0,s1)       register_param5(p,s0,s1,0,0,0)
-#define register_param3(p,s0,s1,s2)    register_param5(p,s0,s1,s2,0,0)
-#define register_param4(p,s0,s1,s2,s3) register_param5(p,s0,s1,s2,s3,0)
-
-static GLuint frag_to_vert_attrib( GLuint attrib )
-{
-   switch (attrib) {
-   case FRAG_ATTRIB_COL0: return VERT_ATTRIB_COLOR0;
-   case FRAG_ATTRIB_COL1: return VERT_ATTRIB_COLOR1;
-   default:
-      assert(attrib >= FRAG_ATTRIB_TEX0);
-      assert(attrib <= FRAG_ATTRIB_TEX7);
-      return attrib - FRAG_ATTRIB_TEX0 + VERT_ATTRIB_TEX0;
-   }
-}
-
-
-static struct ureg register_input( struct texenv_fragment_program *p, GLuint input )
-{
-   if (p->state->inputs_available & (1<<input)) {
-      p->program->Base.InputsRead |= (1 << input);
-      return make_ureg(PROGRAM_INPUT, input);
-   }
-   else {
-      GLuint idx = frag_to_vert_attrib( input );
-      return register_param3( p, STATE_INTERNAL, STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED, idx );
-   }
-}
-
-
-static void emit_arg( struct prog_src_register *reg,
-		      struct ureg ureg )
-{
-   reg->File = ureg.file;
-   reg->Index = ureg.idx;
-   reg->Swizzle = ureg.swz;
-   reg->Negate = ureg.negatebase ? NEGATE_XYZW : NEGATE_NONE;
-   reg->Abs = GL_FALSE;
-}
-
-static void emit_dst( struct prog_dst_register *dst,
-		      struct ureg ureg, GLuint mask )
-{
-   dst->File = ureg.file;
-   dst->Index = ureg.idx;
-   dst->WriteMask = mask;
-   dst->CondMask = COND_TR;  /* always pass cond test */
-   dst->CondSwizzle = SWIZZLE_NOOP;
-}
-
-static struct prog_instruction *
-emit_op(struct texenv_fragment_program *p,
-	enum prog_opcode op,
-	struct ureg dest,
-	GLuint mask,
-	GLboolean saturate,
-	struct ureg src0,
-	struct ureg src1,
-	struct ureg src2 )
-{
-   const GLuint nr = p->program->Base.NumInstructions++;
-   struct prog_instruction *inst = &p->program->Base.Instructions[nr];
-
-   assert(nr < MAX_INSTRUCTIONS);
-
-   _mesa_init_instructions(inst, 1);
-   inst->Opcode = op;
-   
-   emit_arg( &inst->SrcReg[0], src0 );
-   emit_arg( &inst->SrcReg[1], src1 );
-   emit_arg( &inst->SrcReg[2], src2 );
-   
-   inst->SaturateMode = saturate ? SATURATE_ZERO_ONE : SATURATE_OFF;
-
-   emit_dst( &inst->DstReg, dest, mask );
-
-#if 0
-   /* Accounting for indirection tracking:
-    */
-   if (dest.file == PROGRAM_TEMPORARY)
-      p->temps_output |= 1 << dest.idx;
-#endif
-
-   return inst;
-}
-   
-
-static struct ureg emit_arith( struct texenv_fragment_program *p,
-			       enum prog_opcode op,
-			       struct ureg dest,
-			       GLuint mask,
-			       GLboolean saturate,
-			       struct ureg src0,
-			       struct ureg src1,
-			       struct ureg src2 )
-{
-   emit_op(p, op, dest, mask, saturate, src0, src1, src2);
-   
-   /* Accounting for indirection tracking:
-    */
-   if (src0.file == PROGRAM_TEMPORARY)
-      p->alu_temps |= 1 << src0.idx;
-
-   if (!is_undef(src1) && src1.file == PROGRAM_TEMPORARY)
-      p->alu_temps |= 1 << src1.idx;
-
-   if (!is_undef(src2) && src2.file == PROGRAM_TEMPORARY)
-      p->alu_temps |= 1 << src2.idx;
-
-   if (dest.file == PROGRAM_TEMPORARY)
-      p->alu_temps |= 1 << dest.idx;
-       
-   p->program->Base.NumAluInstructions++;
-   return dest;
-}
-
-static struct ureg emit_texld( struct texenv_fragment_program *p,
-			       enum prog_opcode op,
-			       struct ureg dest,
-			       GLuint destmask,
-			       GLuint tex_unit,
-			       GLuint tex_idx,
-                               GLuint tex_shadow,
-			       struct ureg coord )
-{
-   struct prog_instruction *inst = emit_op( p, op, 
-					  dest, destmask, 
-					  GL_FALSE,	/* don't saturate? */
-					  coord, 	/* arg 0? */
-					  undef,
-					  undef);
-   
-   inst->TexSrcTarget = tex_idx;
-   inst->TexSrcUnit = tex_unit;
-   inst->TexShadow = tex_shadow;
-
-   p->program->Base.NumTexInstructions++;
-
-   /* Accounting for indirection tracking:
-    */
-   reserve_temp(p, dest);
-
-#if 0
-   /* Is this a texture indirection?
-    */
-   if ((coord.file == PROGRAM_TEMPORARY &&
-	(p->temps_output & (1<<coord.idx))) ||
-       (dest.file == PROGRAM_TEMPORARY &&
-	(p->alu_temps & (1<<dest.idx)))) {
-      p->program->Base.NumTexIndirections++;
-      p->temps_output = 1<<coord.idx;
-      p->alu_temps = 0;
-      assert(0);		/* KW: texture env crossbar */
-   }
-#endif
-
-   return dest;
-}
-
-
-static struct ureg register_const4f( struct texenv_fragment_program *p, 
-				     GLfloat s0,
-				     GLfloat s1,
-				     GLfloat s2,
-				     GLfloat s3)
-{
-   GLfloat values[4];
-   GLuint idx, swizzle;
-   struct ureg r;
-   values[0] = s0;
-   values[1] = s1;
-   values[2] = s2;
-   values[3] = s3;
-   idx = _mesa_add_unnamed_constant( p->program->Base.Parameters, values, 4,
-                                     &swizzle );
-   r = make_ureg(PROGRAM_CONSTANT, idx);
-   r.swz = swizzle;
-   return r;
-}
-
-#define register_scalar_const(p, s0)    register_const4f(p, s0, s0, s0, s0)
-#define register_const1f(p, s0)         register_const4f(p, s0, 0, 0, 1)
-#define register_const2f(p, s0, s1)     register_const4f(p, s0, s1, 0, 1)
-#define register_const3f(p, s0, s1, s2) register_const4f(p, s0, s1, s2, 1)
-
-
-static struct ureg get_one( struct texenv_fragment_program *p )
-{
-   if (is_undef(p->one)) 
-      p->one = register_scalar_const(p, 1.0);
-   return p->one;
-}
-
-static struct ureg get_half( struct texenv_fragment_program *p )
-{
-   if (is_undef(p->half)) 
-      p->half = register_scalar_const(p, 0.5);
-   return p->half;
-}
-
-static struct ureg get_zero( struct texenv_fragment_program *p )
-{
-   if (is_undef(p->zero)) 
-      p->zero = register_scalar_const(p, 0.0);
-   return p->zero;
-}
-
-
-static void program_error( struct texenv_fragment_program *p, const char *msg )
-{
-   _mesa_problem(NULL, "%s", msg);
-   p->error = 1;
-}
-
-static struct ureg get_source( struct texenv_fragment_program *p, 
-			       GLuint src, GLuint unit )
-{
-   switch (src) {
-   case SRC_TEXTURE: 
-      assert(!is_undef(p->src_texture[unit]));
-      return p->src_texture[unit];
-
-   case SRC_TEXTURE0:
-   case SRC_TEXTURE1:
-   case SRC_TEXTURE2:
-   case SRC_TEXTURE3:
-   case SRC_TEXTURE4:
-   case SRC_TEXTURE5:
-   case SRC_TEXTURE6:
-   case SRC_TEXTURE7: 
-      assert(!is_undef(p->src_texture[src - SRC_TEXTURE0]));
-      return p->src_texture[src - SRC_TEXTURE0];
-
-   case SRC_CONSTANT:
-      return register_param2(p, STATE_TEXENV_COLOR, unit);
-
-   case SRC_PRIMARY_COLOR:
-      return register_input(p, FRAG_ATTRIB_COL0);
-
-   case SRC_ZERO:
-      return get_zero(p);
-
-   case SRC_PREVIOUS:
-      if (is_undef(p->src_previous))
-	 return register_input(p, FRAG_ATTRIB_COL0);
-      else
-	 return p->src_previous;
-
-   default:
-      assert(0);
-      return undef;
-   }
-}
-
-static struct ureg emit_combine_source( struct texenv_fragment_program *p, 
-					GLuint mask,
-					GLuint unit,
-					GLuint source, 
-					GLuint operand )
-{
-   struct ureg arg, src, one;
-
-   src = get_source(p, source, unit);
-
-   switch (operand) {
-   case OPR_ONE_MINUS_SRC_COLOR: 
-      /* Get unused tmp,
-       * Emit tmp = 1.0 - arg.xyzw
-       */
-      arg = get_temp( p );
-      one = get_one( p );
-      return emit_arith( p, OPCODE_SUB, arg, mask, 0, one, src, undef);
-
-   case OPR_SRC_ALPHA: 
-      if (mask == WRITEMASK_W)
-	 return src;
-      else
-	 return swizzle1( src, SWIZZLE_W );
-   case OPR_ONE_MINUS_SRC_ALPHA: 
-      /* Get unused tmp,
-       * Emit tmp = 1.0 - arg.wwww
-       */
-      arg = get_temp(p);
-      one = get_one(p);
-      return emit_arith(p, OPCODE_SUB, arg, mask, 0,
-			one, swizzle1(src, SWIZZLE_W), undef);
-   case OPR_ZERO:
-      return get_zero(p);
-   case OPR_ONE:
-      return get_one(p);
-   case OPR_SRC_COLOR: 
-      return src;
-   default:
-      assert(0);
-      return src;
-   }
-}
-
-/**
- * Check if the RGB and Alpha sources and operands match for the given
- * texture unit's combinder state.  When the RGB and A sources and
- * operands match, we can emit fewer instructions.
- */
-static GLboolean args_match( const struct state_key *key, GLuint unit )
-{
-   GLuint i, numArgs = key->unit[unit].NumArgsRGB;
-
-   for (i = 0; i < numArgs; i++) {
-      if (key->unit[unit].OptA[i].Source != key->unit[unit].OptRGB[i].Source) 
-	 return GL_FALSE;
-
-      switch (key->unit[unit].OptA[i].Operand) {
-      case OPR_SRC_ALPHA: 
-	 switch (key->unit[unit].OptRGB[i].Operand) {
-	 case OPR_SRC_COLOR: 
-	 case OPR_SRC_ALPHA: 
-	    break;
-	 default:
-	    return GL_FALSE;
-	 }
-	 break;
-      case OPR_ONE_MINUS_SRC_ALPHA: 
-	 switch (key->unit[unit].OptRGB[i].Operand) {
-	 case OPR_ONE_MINUS_SRC_COLOR: 
-	 case OPR_ONE_MINUS_SRC_ALPHA: 
-	    break;
-	 default:
-	    return GL_FALSE;
-	 }
-	 break;
-      default: 
-	 return GL_FALSE;	/* impossible */
-      }
-   }
-
-   return GL_TRUE;
-}
-
-static struct ureg emit_combine( struct texenv_fragment_program *p,
-				 struct ureg dest,
-				 GLuint mask,
-				 GLboolean saturate,
-				 GLuint unit,
-				 GLuint nr,
-				 GLuint mode,
-				 const struct mode_opt *opt)
-{
-   struct ureg src[MAX_COMBINER_TERMS];
-   struct ureg tmp, half;
-   GLuint i;
-
-   assert(nr <= MAX_COMBINER_TERMS);
-
-   for (i = 0; i < nr; i++)
-      src[i] = emit_combine_source( p, mask, unit, opt[i].Source, opt[i].Operand );
-
-   switch (mode) {
-   case MODE_REPLACE: 
-      if (mask == WRITEMASK_XYZW && !saturate)
-	 return src[0];
-      else
-	 return emit_arith( p, OPCODE_MOV, dest, mask, saturate, src[0], undef, undef );
-   case MODE_MODULATE: 
-      return emit_arith( p, OPCODE_MUL, dest, mask, saturate,
-			 src[0], src[1], undef );
-   case MODE_ADD: 
-      return emit_arith( p, OPCODE_ADD, dest, mask, saturate, 
-			 src[0], src[1], undef );
-   case MODE_ADD_SIGNED:
-      /* tmp = arg0 + arg1
-       * result = tmp - .5
-       */
-      half = get_half(p);
-      tmp = get_temp( p );
-      emit_arith( p, OPCODE_ADD, tmp, mask, 0, src[0], src[1], undef );
-      emit_arith( p, OPCODE_SUB, dest, mask, saturate, tmp, half, undef );
-      return dest;
-   case MODE_INTERPOLATE: 
-      /* Arg0 * (Arg2) + Arg1 * (1-Arg2) -- note arguments are reordered:
-       */
-      return emit_arith( p, OPCODE_LRP, dest, mask, saturate, src[2], src[0], src[1] );
-
-   case MODE_SUBTRACT: 
-      return emit_arith( p, OPCODE_SUB, dest, mask, saturate, src[0], src[1], undef );
-
-   case MODE_DOT3_RGBA:
-   case MODE_DOT3_RGBA_EXT: 
-   case MODE_DOT3_RGB_EXT:
-   case MODE_DOT3_RGB: {
-      struct ureg tmp0 = get_temp( p );
-      struct ureg tmp1 = get_temp( p );
-      struct ureg neg1 = register_scalar_const(p, -1);
-      struct ureg two  = register_scalar_const(p, 2);
-
-      /* tmp0 = 2*src0 - 1
-       * tmp1 = 2*src1 - 1
-       *
-       * dst = tmp0 dot3 tmp1 
-       */
-      emit_arith( p, OPCODE_MAD, tmp0, WRITEMASK_XYZW, 0, 
-		  two, src[0], neg1);
-
-      if (memcmp(&src[0], &src[1], sizeof(struct ureg)) == 0)
-	 tmp1 = tmp0;
-      else
-	 emit_arith( p, OPCODE_MAD, tmp1, WRITEMASK_XYZW, 0, 
-		     two, src[1], neg1);
-      emit_arith( p, OPCODE_DP3, dest, mask, saturate, tmp0, tmp1, undef);
-      return dest;
-   }
-   case MODE_MODULATE_ADD_ATI:
-      /* Arg0 * Arg2 + Arg1 */
-      return emit_arith( p, OPCODE_MAD, dest, mask, saturate,
-			 src[0], src[2], src[1] );
-   case MODE_MODULATE_SIGNED_ADD_ATI: {
-      /* Arg0 * Arg2 + Arg1 - 0.5 */
-      struct ureg tmp0 = get_temp(p);
-      half = get_half(p);
-      emit_arith( p, OPCODE_MAD, tmp0, mask, 0, src[0], src[2], src[1] );
-      emit_arith( p, OPCODE_SUB, dest, mask, saturate, tmp0, half, undef );
-      return dest;
-   }
-   case MODE_MODULATE_SUBTRACT_ATI:
-      /* Arg0 * Arg2 - Arg1 */
-      emit_arith( p, OPCODE_MAD, dest, mask, 0, src[0], src[2], negate(src[1]) );
-      return dest;
-   case MODE_ADD_PRODUCTS:
-      /* Arg0 * Arg1 + Arg2 * Arg3 */
-      {
-         struct ureg tmp0 = get_temp(p);
-         emit_arith( p, OPCODE_MUL, tmp0, mask, 0, src[0], src[1], undef );
-         emit_arith( p, OPCODE_MAD, dest, mask, saturate, src[2], src[3], tmp0 );
-      }
-      return dest;
-   case MODE_ADD_PRODUCTS_SIGNED:
-      /* Arg0 * Arg1 + Arg2 * Arg3 - 0.5 */
-      {
-         struct ureg tmp0 = get_temp(p);
-         half = get_half(p);
-         emit_arith( p, OPCODE_MUL, tmp0, mask, 0, src[0], src[1], undef );
-         emit_arith( p, OPCODE_MAD, tmp0, mask, 0, src[2], src[3], tmp0 );
-         emit_arith( p, OPCODE_SUB, dest, mask, saturate, tmp0, half, undef );
-      }
-      return dest;
-   case MODE_BUMP_ENVMAP_ATI:
-      /* special - not handled here */
-      assert(0);
-      return src[0];
-   default: 
-      assert(0);
-      return src[0];
-   }
-}
-
-
-/**
- * Generate instructions for one texture unit's env/combiner mode.
- */
-static struct ureg
-emit_texenv(struct texenv_fragment_program *p, GLuint unit)
-{
-   const struct state_key *key = p->state;
-   GLboolean rgb_saturate, alpha_saturate;
-   GLuint rgb_shift, alpha_shift;
-   struct ureg out, dest;
-
-   if (!key->unit[unit].enabled) {
-      return get_source(p, SRC_PREVIOUS, 0);
-   }
-   if (key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
-      /* this isn't really a env stage delivering a color and handled elsewhere */
-      return get_source(p, SRC_PREVIOUS, 0);
-   }
-   
-   switch (key->unit[unit].ModeRGB) {
-   case MODE_DOT3_RGB_EXT:
-      alpha_shift = key->unit[unit].ScaleShiftA;
-      rgb_shift = 0;
-      break;
-   case MODE_DOT3_RGBA_EXT:
-      alpha_shift = 0;
-      rgb_shift = 0;
-      break;
-   default:
-      rgb_shift = key->unit[unit].ScaleShiftRGB;
-      alpha_shift = key->unit[unit].ScaleShiftA;
-      break;
-   }
-   
-   /* If we'll do rgb/alpha shifting don't saturate in emit_combine().
-    * We don't want to clamp twice.
-    */
-   if (rgb_shift)
-      rgb_saturate = GL_FALSE;  /* saturate after rgb shift */
-   else if (need_saturate(key->unit[unit].ModeRGB))
-      rgb_saturate = GL_TRUE;
-   else
-      rgb_saturate = GL_FALSE;
-
-   if (alpha_shift)
-      alpha_saturate = GL_FALSE;  /* saturate after alpha shift */
-   else if (need_saturate(key->unit[unit].ModeA))
-      alpha_saturate = GL_TRUE;
-   else
-      alpha_saturate = GL_FALSE;
-
-   /* If this is the very last calculation (and various other conditions
-    * are met), emit directly to the color output register.  Otherwise,
-    * emit to a temporary register.
-    */
-   if (key->separate_specular ||
-       unit != p->last_tex_stage ||
-       alpha_shift ||
-       key->num_draw_buffers != 1 ||
-       rgb_shift)
-      dest = get_temp( p );
-   else
-      dest = make_ureg(PROGRAM_OUTPUT, FRAG_RESULT_COLOR);
-
-   /* Emit the RGB and A combine ops
-    */
-   if (key->unit[unit].ModeRGB == key->unit[unit].ModeA &&
-       args_match(key, unit)) {
-      out = emit_combine( p, dest, WRITEMASK_XYZW, rgb_saturate,
-			  unit,
-			  key->unit[unit].NumArgsRGB,
-			  key->unit[unit].ModeRGB,
-			  key->unit[unit].OptRGB);
-   }
-   else if (key->unit[unit].ModeRGB == MODE_DOT3_RGBA_EXT ||
-	    key->unit[unit].ModeRGB == MODE_DOT3_RGBA) {
-      out = emit_combine( p, dest, WRITEMASK_XYZW, rgb_saturate,
-			  unit,
-			  key->unit[unit].NumArgsRGB,
-			  key->unit[unit].ModeRGB,
-			  key->unit[unit].OptRGB);
-   }
-   else {
-      /* Need to do something to stop from re-emitting identical
-       * argument calculations here:
-       */
-      out = emit_combine( p, dest, WRITEMASK_XYZ, rgb_saturate,
-			  unit,
-			  key->unit[unit].NumArgsRGB,
-			  key->unit[unit].ModeRGB,
-			  key->unit[unit].OptRGB);
-      out = emit_combine( p, dest, WRITEMASK_W, alpha_saturate,
-			  unit,
-			  key->unit[unit].NumArgsA,
-			  key->unit[unit].ModeA,
-			  key->unit[unit].OptA);
-   }
-
-   /* Deal with the final shift:
-    */
-   if (alpha_shift || rgb_shift) {
-      struct ureg shift;
-      GLboolean saturate = GL_TRUE;  /* always saturate at this point */
-
-      if (rgb_shift == alpha_shift) {
-	 shift = register_scalar_const(p, (GLfloat)(1<<rgb_shift));
-      }
-      else {
-	 shift = register_const4f(p, 
-				  (GLfloat)(1<<rgb_shift),
-				  (GLfloat)(1<<rgb_shift),
-				  (GLfloat)(1<<rgb_shift),
-				  (GLfloat)(1<<alpha_shift));
-      }
-      return emit_arith( p, OPCODE_MUL, dest, WRITEMASK_XYZW, 
-			 saturate, out, shift, undef );
-   }
-   else
-      return out;
-}
-
-
-/**
- * Generate instruction for getting a texture source term.
- */
-static void load_texture( struct texenv_fragment_program *p, GLuint unit )
-{
-   if (is_undef(p->src_texture[unit])) {
-      const GLuint texTarget = p->state->unit[unit].source_index;
-      struct ureg texcoord;
-      struct ureg tmp = get_tex_temp( p );
-
-      if (is_undef(p->texcoord_tex[unit])) {
-         texcoord = register_input(p, FRAG_ATTRIB_TEX0+unit);
-      }
-      else {
-         /* might want to reuse this reg for tex output actually */
-         texcoord = p->texcoord_tex[unit];
-      }
-
-      /* TODO: Use D0_MASK_XY where possible.
-       */
-      if (p->state->unit[unit].enabled) {
-         GLboolean shadow = GL_FALSE;
-
-	 if (p->state->unit[unit].shadow) {
-	    p->program->Base.ShadowSamplers |= 1 << unit;
-            shadow = GL_TRUE;
-         }
-
-	 p->src_texture[unit] = emit_texld( p, OPCODE_TXP,
-					    tmp, WRITEMASK_XYZW, 
-					    unit, texTarget, shadow,
-                                            texcoord );
-
-         p->program->Base.SamplersUsed |= (1 << unit);
-         /* This identity mapping should already be in place
-          * (see _mesa_init_program_struct()) but let's be safe.
-          */
-         p->program->Base.SamplerUnits[unit] = unit;
-      }
-      else
-	 p->src_texture[unit] = get_zero(p);
-
-      if (p->state->unit[unit].texture_cyl_wrap) {
-         /* set flag which is checked by Mesa->Gallium program translation */
-         p->program->Base.InputFlags[0] |= PROG_PARAM_BIT_CYL_WRAP;
-      }
-
-   }
-}
-
-static GLboolean load_texenv_source( struct texenv_fragment_program *p, 
-				     GLuint src, GLuint unit )
-{
-   switch (src) {
-   case SRC_TEXTURE:
-      load_texture(p, unit);
-      break;
-
-   case SRC_TEXTURE0:
-   case SRC_TEXTURE1:
-   case SRC_TEXTURE2:
-   case SRC_TEXTURE3:
-   case SRC_TEXTURE4:
-   case SRC_TEXTURE5:
-   case SRC_TEXTURE6:
-   case SRC_TEXTURE7:       
-      load_texture(p, src - SRC_TEXTURE0);
-      break;
-      
-   default:
-      /* not a texture src - do nothing */
-      break;
-   }
- 
-   return GL_TRUE;
-}
-
-
-/**
- * Generate instructions for loading all texture source terms.
- */
-static GLboolean
-load_texunit_sources( struct texenv_fragment_program *p, GLuint unit )
-{
-   const struct state_key *key = p->state;
-   GLuint i;
-
-   for (i = 0; i < key->unit[unit].NumArgsRGB; i++) {
-      load_texenv_source( p, key->unit[unit].OptRGB[i].Source, unit );
-   }
-
-   for (i = 0; i < key->unit[unit].NumArgsA; i++) {
-      load_texenv_source( p, key->unit[unit].OptA[i].Source, unit );
-   }
-
-   return GL_TRUE;
-}
-
-/**
- * Generate instructions for loading bump map textures.
- */
-static GLboolean
-load_texunit_bumpmap( struct texenv_fragment_program *p, GLuint unit )
-{
-   const struct state_key *key = p->state;
-   GLuint bumpedUnitNr = key->unit[unit].OptRGB[1].Source - SRC_TEXTURE0;
-   struct ureg texcDst, bumpMapRes;
-   struct ureg constdudvcolor = register_const4f(p, 0.0, 0.0, 0.0, 1.0);
-   struct ureg texcSrc = register_input(p, FRAG_ATTRIB_TEX0 + bumpedUnitNr);
-   struct ureg rotMat0 = register_param3( p, STATE_INTERNAL, STATE_ROT_MATRIX_0, unit );
-   struct ureg rotMat1 = register_param3( p, STATE_INTERNAL, STATE_ROT_MATRIX_1, unit );
-
-   load_texenv_source( p, unit + SRC_TEXTURE0, unit );
-
-   bumpMapRes = get_source(p, key->unit[unit].OptRGB[0].Source, unit);
-   texcDst = get_tex_temp( p );
-   p->texcoord_tex[bumpedUnitNr] = texcDst;
-
-   /* Apply rot matrix and add coords to be available in next phase.
-    * dest = (Arg0.xxxx * rotMat0 + Arg1) + (Arg0.yyyy * rotMat1)
-    * note only 2 coords are affected the rest are left unchanged (mul by 0)
-    */
-   emit_arith( p, OPCODE_MAD, texcDst, WRITEMASK_XYZW, 0,
-               swizzle1(bumpMapRes, SWIZZLE_X), rotMat0, texcSrc );
-   emit_arith( p, OPCODE_MAD, texcDst, WRITEMASK_XYZW, 0,
-               swizzle1(bumpMapRes, SWIZZLE_Y), rotMat1, texcDst );
-
-   /* Move 0,0,0,1 into bumpmap src if someone (crossbar) is foolish
-    * enough to access this later, should optimize away.
-    */
-   emit_arith( p, OPCODE_MOV, bumpMapRes, WRITEMASK_XYZW, 0,
-               constdudvcolor, undef, undef );
-
-   return GL_TRUE;
-}
-
-/**
- * Generate a new fragment program which implements the context's
- * current texture env/combine mode.
- */
-static void
-create_new_program(struct gl_context *ctx, struct state_key *key,
-                   struct gl_fragment_program *program)
-{
-   struct prog_instruction instBuffer[MAX_INSTRUCTIONS];
-   struct texenv_fragment_program p;
-   GLuint unit;
-   struct ureg cf, out;
-   int i;
-
-   memset(&p, 0, sizeof(p));
-   p.state = key;
-   p.program = program;
-
-   /* During code generation, use locally-allocated instruction buffer,
-    * then alloc dynamic storage below.
-    */
-   p.program->Base.Instructions = instBuffer;
-   p.program->Base.Target = GL_FRAGMENT_PROGRAM_ARB;
-   p.program->Base.String = NULL;
-   p.program->Base.NumTexIndirections = 1; /* is this right? */
-   p.program->Base.NumTexInstructions = 0;
-   p.program->Base.NumAluInstructions = 0;
-   p.program->Base.NumInstructions = 0;
-   p.program->Base.NumTemporaries = 0;
-   p.program->Base.NumParameters = 0;
-   p.program->Base.NumAttributes = 0;
-   p.program->Base.NumAddressRegs = 0;
-   p.program->Base.Parameters = _mesa_new_parameter_list();
-   p.program->Base.InputsRead = 0x0;
-
-   if (key->num_draw_buffers == 1)
-      p.program->Base.OutputsWritten = 1 << FRAG_RESULT_COLOR;
-   else {
-      for (i = 0; i < key->num_draw_buffers; i++)
-	 p.program->Base.OutputsWritten |= (1 << (FRAG_RESULT_DATA0 + i));
-   }
-
-   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
-      p.src_texture[unit] = undef;
-      p.texcoord_tex[unit] = undef;
-   }
-
-   p.src_previous = undef;
-   p.half = undef;
-   p.zero = undef;
-   p.one = undef;
-
-   p.last_tex_stage = 0;
-   release_temps(ctx, &p);
-
-   if (key->enabled_units && key->num_draw_buffers) {
-      GLboolean needbumpstage = GL_FALSE;
-
-      /* Zeroth pass - bump map textures first */
-      for (unit = 0; unit < key->nr_enabled_units; unit++)
-	 if (key->unit[unit].enabled &&
-             key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
-	    needbumpstage = GL_TRUE;
-	    load_texunit_bumpmap( &p, unit );
-	 }
-      if (needbumpstage)
-	 p.program->Base.NumTexIndirections++;
-
-      /* First pass - to support texture_env_crossbar, first identify
-       * all referenced texture sources and emit texld instructions
-       * for each:
-       */
-      for (unit = 0; unit < key->nr_enabled_units; unit++)
-	 if (key->unit[unit].enabled) {
-	    load_texunit_sources( &p, unit );
-	    p.last_tex_stage = unit;
-	 }
-
-      /* Second pass - emit combine instructions to build final color:
-       */
-      for (unit = 0; unit < key->nr_enabled_units; unit++)
-	 if (key->unit[unit].enabled) {
-	    p.src_previous = emit_texenv( &p, unit );
-            reserve_temp(&p, p.src_previous); /* don't re-use this temp reg */
-	    release_temps(ctx, &p);	/* release all temps */
-	 }
-   }
-
-   cf = get_source( &p, SRC_PREVIOUS, 0 );
-
-   for (i = 0; i < key->num_draw_buffers; i++) {
-      if (key->num_draw_buffers == 1)
-	 out = make_ureg( PROGRAM_OUTPUT, FRAG_RESULT_COLOR );
-      else {
-	 out = make_ureg( PROGRAM_OUTPUT, FRAG_RESULT_DATA0 + i );
-      }
-
-      if (key->separate_specular) {
-	 /* Emit specular add.
-	  */
-	 struct ureg s = register_input(&p, FRAG_ATTRIB_COL1);
-	 emit_arith( &p, OPCODE_ADD, out, WRITEMASK_XYZ, 0, cf, s, undef );
-	 emit_arith( &p, OPCODE_MOV, out, WRITEMASK_W, 0, cf, undef, undef );
-      }
-      else if (memcmp(&cf, &out, sizeof(cf)) != 0) {
-	 /* Will wind up in here if no texture enabled or a couple of
-	  * other scenarios (GL_REPLACE for instance).
-	  */
-	 emit_arith( &p, OPCODE_MOV, out, WRITEMASK_XYZW, 0, cf, undef, undef );
-      }
-   }
-   /* Finish up:
-    */
-   emit_arith( &p, OPCODE_END, undef, WRITEMASK_XYZW, 0, undef, undef, undef);
-
-   if (key->fog_enabled) {
-      /* Pull fog mode from struct gl_context, the value in the state key is
-       * a reduced value and not what is expected in FogOption
-       */
-      p.program->FogOption = ctx->Fog.Mode;
-      p.program->Base.InputsRead |= FRAG_BIT_FOGC;
-   }
-   else {
-      p.program->FogOption = GL_NONE;
-   }
-
-   if (p.program->Base.NumTexIndirections > ctx->Const.FragmentProgram.MaxTexIndirections) 
-      program_error(&p, "Exceeded max nr indirect texture lookups");
-
-   if (p.program->Base.NumTexInstructions > ctx->Const.FragmentProgram.MaxTexInstructions)
-      program_error(&p, "Exceeded max TEX instructions");
-
-   if (p.program->Base.NumAluInstructions > ctx->Const.FragmentProgram.MaxAluInstructions)
-      program_error(&p, "Exceeded max ALU instructions");
-
-   ASSERT(p.program->Base.NumInstructions <= MAX_INSTRUCTIONS);
-
-   /* Allocate final instruction array */
-   p.program->Base.Instructions
-      = _mesa_alloc_instructions(p.program->Base.NumInstructions);
-   if (!p.program->Base.Instructions) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                  "generating tex env program");
-      return;
-   }
-   _mesa_copy_instructions(p.program->Base.Instructions, instBuffer,
-                           p.program->Base.NumInstructions);
-
-   if (key->num_draw_buffers && p.program->FogOption) {
-      _mesa_append_fog_code(ctx, p.program, GL_FALSE);
-      p.program->FogOption = GL_NONE;
-   }
-
-
-   /* Notify driver the fragment program has (actually) changed.
-    */
-   if (ctx->Driver.ProgramStringNotify) {
-      GLboolean ok = ctx->Driver.ProgramStringNotify(ctx,
-                                                     GL_FRAGMENT_PROGRAM_ARB, 
-                                                     &p.program->Base);
-      /* Driver should be able to handle any texenv programs as long as
-       * the driver correctly reported max number of texture units correctly,
-       * etc.
-       */
-      ASSERT(ok);
-      (void) ok; /* silence unused var warning */
-   }
-
-   if (DISASSEM) {
-      _mesa_print_program(&p.program->Base);
-      printf("\n");
-   }
-}
-
-extern "C" {
-
-/**
- * Return a fragment program which implements the current
- * fixed-function texture, fog and color-sum operations.
- */
-struct gl_fragment_program *
-_mesa_get_fixed_func_fragment_program(struct gl_context *ctx)
-{
-   struct gl_fragment_program *prog;
-   struct state_key key;
-   GLuint keySize;
-	
-   keySize = make_state_key(ctx, &key);
-      
-   prog = (struct gl_fragment_program *)
-      _mesa_search_program_cache(ctx->FragmentProgram.Cache,
-                                 &key, keySize);
-
-   if (!prog) {
-      prog = (struct gl_fragment_program *) 
-         ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
-
-      create_new_program(ctx, &key, prog);
-
-      _mesa_program_cache_insert(ctx, ctx->FragmentProgram.Cache,
-                                 &key, keySize, &prog->Base);
-   }
-
-   return prog;
-}
-
-}
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * Copyright 2009 VMware, Inc.  All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+extern "C" {

+#include "glheader.h"

+#include "imports.h"

+#include "mtypes.h"

+#include "program/program.h"

+#include "program/prog_parameter.h"

+#include "program/prog_cache.h"

+#include "program/prog_instruction.h"

+#include "program/prog_print.h"

+#include "program/prog_statevars.h"

+#include "program/programopt.h"

+#include "texenvprogram.h"

+}

+

+/*

+ * Note on texture units:

+ *

+ * The number of texture units supported by fixed-function fragment

+ * processing is MAX_TEXTURE_COORD_UNITS, not MAX_TEXTURE_IMAGE_UNITS.

+ * That's because there's a one-to-one correspondence between texture

+ * coordinates and samplers in fixed-function processing.

+ *

+ * Since fixed-function vertex processing is limited to MAX_TEXTURE_COORD_UNITS

+ * sets of texcoords, so is fixed-function fragment processing.

+ *

+ * We can safely use ctx->Const.MaxTextureUnits for loop bounds.

+ */

+

+

+struct texenvprog_cache_item

+{

+   GLuint hash;

+   void *key;

+   struct gl_fragment_program *data;

+   struct texenvprog_cache_item *next;

+};

+

+static GLboolean

+texenv_doing_secondary_color(struct gl_context *ctx)

+{

+   if (ctx->Light.Enabled &&

+       (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR))

+      return GL_TRUE;

+

+   if (ctx->Fog.ColorSumEnabled)

+      return GL_TRUE;

+

+   return GL_FALSE;

+}

+

+/**

+ * Up to nine instructions per tex unit, plus fog, specular color.

+ */

+#define MAX_INSTRUCTIONS ((MAX_TEXTURE_COORD_UNITS * 9) + 12)

+

+#define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)

+

+struct mode_opt {

+#ifdef __GNUC__

+   __extension__ GLubyte Source:4;  /**< SRC_x */

+   __extension__ GLubyte Operand:3; /**< OPR_x */

+#else

+   GLubyte Source;  /**< SRC_x */

+   GLubyte Operand; /**< OPR_x */

+#endif

+};

+

+struct state_key {

+   GLuint nr_enabled_units:8;

+   GLuint enabled_units:8;

+   GLuint separate_specular:1;

+   GLuint fog_enabled:1;

+   GLuint fog_mode:2;          /**< FOG_x */

+   GLuint inputs_available:12;

+   GLuint num_draw_buffers:4;

+

+   /* NOTE: This array of structs must be last! (see "keySize" below) */

+   struct {

+      GLuint enabled:1;

+      GLuint source_index:3;   /**< TEXTURE_x_INDEX */

+      GLuint shadow:1;

+      GLuint ScaleShiftRGB:2;

+      GLuint ScaleShiftA:2;

+

+      GLuint NumArgsRGB:3;  /**< up to MAX_COMBINER_TERMS */

+      GLuint ModeRGB:5;     /**< MODE_x */

+

+      GLuint NumArgsA:3;  /**< up to MAX_COMBINER_TERMS */

+      GLuint ModeA:5;     /**< MODE_x */

+

+      GLuint texture_cyl_wrap:1; /**< For gallium test/debug only */

+

+      struct mode_opt OptRGB[MAX_COMBINER_TERMS];

+      struct mode_opt OptA[MAX_COMBINER_TERMS];

+   } unit[MAX_TEXTURE_UNITS];

+};

+

+#define FOG_LINEAR  0

+#define FOG_EXP     1

+#define FOG_EXP2    2

+#define FOG_UNKNOWN 3

+

+static GLuint translate_fog_mode( GLenum mode )

+{

+   switch (mode) {

+   case GL_LINEAR: return FOG_LINEAR;

+   case GL_EXP: return FOG_EXP;

+   case GL_EXP2: return FOG_EXP2;

+   default: return FOG_UNKNOWN;

+   }

+}

+

+#define OPR_SRC_COLOR           0

+#define OPR_ONE_MINUS_SRC_COLOR 1

+#define OPR_SRC_ALPHA           2

+#define OPR_ONE_MINUS_SRC_ALPHA	3

+#define OPR_ZERO                4

+#define OPR_ONE                 5

+#define OPR_UNKNOWN             7

+

+static GLuint translate_operand( GLenum operand )

+{

+   switch (operand) {

+   case GL_SRC_COLOR: return OPR_SRC_COLOR;

+   case GL_ONE_MINUS_SRC_COLOR: return OPR_ONE_MINUS_SRC_COLOR;

+   case GL_SRC_ALPHA: return OPR_SRC_ALPHA;

+   case GL_ONE_MINUS_SRC_ALPHA: return OPR_ONE_MINUS_SRC_ALPHA;

+   case GL_ZERO: return OPR_ZERO;

+   case GL_ONE: return OPR_ONE;

+   default:

+      assert(0);

+      return OPR_UNKNOWN;

+   }

+}

+

+#define SRC_TEXTURE  0

+#define SRC_TEXTURE0 1

+#define SRC_TEXTURE1 2

+#define SRC_TEXTURE2 3

+#define SRC_TEXTURE3 4

+#define SRC_TEXTURE4 5

+#define SRC_TEXTURE5 6

+#define SRC_TEXTURE6 7

+#define SRC_TEXTURE7 8

+#define SRC_CONSTANT 9

+#define SRC_PRIMARY_COLOR 10

+#define SRC_PREVIOUS 11

+#define SRC_ZERO     12

+#define SRC_UNKNOWN  15

+

+static GLuint translate_source( GLenum src )

+{

+   switch (src) {

+   case GL_TEXTURE: return SRC_TEXTURE;

+   case GL_TEXTURE0:

+   case GL_TEXTURE1:

+   case GL_TEXTURE2:

+   case GL_TEXTURE3:

+   case GL_TEXTURE4:

+   case GL_TEXTURE5:

+   case GL_TEXTURE6:

+   case GL_TEXTURE7: return SRC_TEXTURE0 + (src - GL_TEXTURE0);

+   case GL_CONSTANT: return SRC_CONSTANT;

+   case GL_PRIMARY_COLOR: return SRC_PRIMARY_COLOR;

+   case GL_PREVIOUS: return SRC_PREVIOUS;

+   case GL_ZERO:

+      return SRC_ZERO;

+   default:

+      assert(0);

+      return SRC_UNKNOWN;

+   }

+}

+

+#define MODE_REPLACE                     0  /* r = a0 */

+#define MODE_MODULATE                    1  /* r = a0 * a1 */

+#define MODE_ADD                         2  /* r = a0 + a1 */

+#define MODE_ADD_SIGNED                  3  /* r = a0 + a1 - 0.5 */

+#define MODE_INTERPOLATE                 4  /* r = a0 * a2 + a1 * (1 - a2) */

+#define MODE_SUBTRACT                    5  /* r = a0 - a1 */

+#define MODE_DOT3_RGB                    6  /* r = a0 . a1 */

+#define MODE_DOT3_RGB_EXT                7  /* r = a0 . a1 */

+#define MODE_DOT3_RGBA                   8  /* r = a0 . a1 */

+#define MODE_DOT3_RGBA_EXT               9  /* r = a0 . a1 */

+#define MODE_MODULATE_ADD_ATI           10  /* r = a0 * a2 + a1 */

+#define MODE_MODULATE_SIGNED_ADD_ATI    11  /* r = a0 * a2 + a1 - 0.5 */

+#define MODE_MODULATE_SUBTRACT_ATI      12  /* r = a0 * a2 - a1 */

+#define MODE_ADD_PRODUCTS               13  /* r = a0 * a1 + a2 * a3 */

+#define MODE_ADD_PRODUCTS_SIGNED        14  /* r = a0 * a1 + a2 * a3 - 0.5 */

+#define MODE_BUMP_ENVMAP_ATI            15  /* special */

+#define MODE_UNKNOWN                    16

+

+/**

+ * Translate GL combiner state into a MODE_x value

+ */

+static GLuint translate_mode( GLenum envMode, GLenum mode )

+{

+   switch (mode) {

+   case GL_REPLACE: return MODE_REPLACE;

+   case GL_MODULATE: return MODE_MODULATE;

+   case GL_ADD:

+      if (envMode == GL_COMBINE4_NV)

+         return MODE_ADD_PRODUCTS;

+      else

+         return MODE_ADD;

+   case GL_ADD_SIGNED:

+      if (envMode == GL_COMBINE4_NV)

+         return MODE_ADD_PRODUCTS_SIGNED;

+      else

+         return MODE_ADD_SIGNED;

+   case GL_INTERPOLATE: return MODE_INTERPOLATE;

+   case GL_SUBTRACT: return MODE_SUBTRACT;

+   case GL_DOT3_RGB: return MODE_DOT3_RGB;

+   case GL_DOT3_RGB_EXT: return MODE_DOT3_RGB_EXT;

+   case GL_DOT3_RGBA: return MODE_DOT3_RGBA;

+   case GL_DOT3_RGBA_EXT: return MODE_DOT3_RGBA_EXT;

+   case GL_MODULATE_ADD_ATI: return MODE_MODULATE_ADD_ATI;

+   case GL_MODULATE_SIGNED_ADD_ATI: return MODE_MODULATE_SIGNED_ADD_ATI;

+   case GL_MODULATE_SUBTRACT_ATI: return MODE_MODULATE_SUBTRACT_ATI;

+   case GL_BUMP_ENVMAP_ATI: return MODE_BUMP_ENVMAP_ATI;

+   default:

+      assert(0);

+      return MODE_UNKNOWN;

+   }

+}

+

+

+/**

+ * Do we need to clamp the results of the given texture env/combine mode?

+ * If the inputs to the mode are in [0,1] we don't always have to clamp

+ * the results.

+ */

+static GLboolean

+need_saturate( GLuint mode )

+{

+   switch (mode) {

+   case MODE_REPLACE:

+   case MODE_MODULATE:

+   case MODE_INTERPOLATE:

+      return GL_FALSE;

+   case MODE_ADD:

+   case MODE_ADD_SIGNED:

+   case MODE_SUBTRACT:

+   case MODE_DOT3_RGB:

+   case MODE_DOT3_RGB_EXT:

+   case MODE_DOT3_RGBA:

+   case MODE_DOT3_RGBA_EXT:

+   case MODE_MODULATE_ADD_ATI:

+   case MODE_MODULATE_SIGNED_ADD_ATI:

+   case MODE_MODULATE_SUBTRACT_ATI:

+   case MODE_ADD_PRODUCTS:

+   case MODE_ADD_PRODUCTS_SIGNED:

+   case MODE_BUMP_ENVMAP_ATI:

+      return GL_TRUE;

+   default:

+      assert(0);

+      return GL_FALSE;

+   }

+}

+

+

+

+/**

+ * Translate TEXTURE_x_BIT to TEXTURE_x_INDEX.

+ */

+static GLuint translate_tex_src_bit( GLbitfield bit )

+{

+   ASSERT(bit);

+   return _mesa_ffs(bit) - 1;

+}

+

+

+#define VERT_BIT_TEX_ANY    (0xff << VERT_ATTRIB_TEX0)

+#define VERT_RESULT_TEX_ANY (0xff << VERT_RESULT_TEX0)

+

+/**

+ * Identify all possible varying inputs.  The fragment program will

+ * never reference non-varying inputs, but will track them via state

+ * constants instead.

+ *

+ * This function figures out all the inputs that the fragment program

+ * has access to.  The bitmask is later reduced to just those which

+ * are actually referenced.

+ */

+static GLbitfield get_fp_input_mask( struct gl_context *ctx )

+{

+   /* _NEW_PROGRAM */

+   const GLboolean vertexShader =

+      (ctx->Shader.CurrentVertexProgram &&

+       ctx->Shader.CurrentVertexProgram->LinkStatus &&

+       ctx->Shader.CurrentVertexProgram->VertexProgram);

+   const GLboolean vertexProgram = ctx->VertexProgram._Enabled;

+   GLbitfield fp_inputs = 0x0;

+

+   if (ctx->VertexProgram._Overriden) {

+      /* Somebody's messing with the vertex program and we don't have

+       * a clue what's happening.  Assume that it could be producing

+       * all possible outputs.

+       */

+      fp_inputs = ~0;

+   }

+   else if (ctx->RenderMode == GL_FEEDBACK) {

+      /* _NEW_RENDERMODE */

+      fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);

+   }

+   else if (!(vertexProgram || vertexShader) ||

+            !ctx->VertexProgram._Current) {

+      /* Fixed function vertex logic */

+      /* _NEW_ARRAY */

+      GLbitfield varying_inputs = ctx->varying_vp_inputs;

+

+      /* These get generated in the setup routine regardless of the

+       * vertex program:

+       */

+      /* _NEW_POINT */

+      if (ctx->Point.PointSprite)

+         varying_inputs |= FRAG_BITS_TEX_ANY;

+

+      /* First look at what values may be computed by the generated

+       * vertex program:

+       */

+      /* _NEW_LIGHT */

+      if (ctx->Light.Enabled) {

+         fp_inputs |= FRAG_BIT_COL0;

+

+         if (texenv_doing_secondary_color(ctx))

+            fp_inputs |= FRAG_BIT_COL1;

+      }

+

+      /* _NEW_TEXTURE */

+      fp_inputs |= (ctx->Texture._TexGenEnabled |

+                    ctx->Texture._TexMatEnabled) << FRAG_ATTRIB_TEX0;

+

+      /* Then look at what might be varying as a result of enabled

+       * arrays, etc:

+       */

+      if (varying_inputs & VERT_BIT_COLOR0)

+         fp_inputs |= FRAG_BIT_COL0;

+      if (varying_inputs & VERT_BIT_COLOR1)

+         fp_inputs |= FRAG_BIT_COL1;

+

+      fp_inputs |= (((varying_inputs & VERT_BIT_TEX_ANY) >> VERT_ATTRIB_TEX0) 

+                    << FRAG_ATTRIB_TEX0);

+

+   }

+   else {

+      /* calculate from vp->outputs */

+      struct gl_vertex_program *vprog;

+      GLbitfield64 vp_outputs;

+

+      /* Choose GLSL vertex shader over ARB vertex program.  Need this

+       * since vertex shader state validation comes after fragment state

+       * validation (see additional comments in state.c).

+       */

+      if (vertexShader)

+         vprog = ctx->Shader.CurrentVertexProgram->VertexProgram;

+      else

+         vprog = ctx->VertexProgram.Current;

+

+      vp_outputs = vprog->Base.OutputsWritten;

+

+      /* These get generated in the setup routine regardless of the

+       * vertex program:

+       */

+      /* _NEW_POINT */

+      if (ctx->Point.PointSprite)

+         vp_outputs |= FRAG_BITS_TEX_ANY;

+

+      if (vp_outputs & (1 << VERT_RESULT_COL0))

+         fp_inputs |= FRAG_BIT_COL0;

+      if (vp_outputs & (1 << VERT_RESULT_COL1))

+         fp_inputs |= FRAG_BIT_COL1;

+

+      fp_inputs |= (((vp_outputs & VERT_RESULT_TEX_ANY) >> VERT_RESULT_TEX0) 

+                    << FRAG_ATTRIB_TEX0);

+   }

+   

+   return fp_inputs;

+}

+

+

+/**

+ * Examine current texture environment state and generate a unique

+ * key to identify it.

+ */

+static GLuint make_state_key( struct gl_context *ctx,  struct state_key *key )

+{

+   GLuint i, j;

+   GLbitfield inputs_referenced = FRAG_BIT_COL0;

+   const GLbitfield inputs_available = get_fp_input_mask( ctx );

+   GLuint keySize;

+

+   memset(key, 0, sizeof(*key));

+

+   /* _NEW_TEXTURE */

+   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {

+      const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];

+      const struct gl_texture_object *texObj = texUnit->_Current;

+      const struct gl_tex_env_combine_state *comb = texUnit->_CurrentCombine;

+      GLenum format;

+

+      if (!texUnit->_ReallyEnabled || !texUnit->Enabled)

+         continue;

+

+      format = texObj->Image[0][texObj->BaseLevel]->_BaseFormat;

+

+      key->unit[i].enabled = 1;

+      key->enabled_units |= (1<<i);

+      key->nr_enabled_units = i + 1;

+      inputs_referenced |= FRAG_BIT_TEX(i);

+

+      key->unit[i].source_index =

+         translate_tex_src_bit(texUnit->_ReallyEnabled);

+

+      key->unit[i].shadow = ((texObj->CompareMode == GL_COMPARE_R_TO_TEXTURE) &&

+                             ((format == GL_DEPTH_COMPONENT) || 

+                              (format == GL_DEPTH_STENCIL_EXT)));

+

+      key->unit[i].NumArgsRGB = comb->_NumArgsRGB;

+      key->unit[i].NumArgsA = comb->_NumArgsA;

+

+      key->unit[i].ModeRGB =

+	 translate_mode(texUnit->EnvMode, comb->ModeRGB);

+      key->unit[i].ModeA =

+	 translate_mode(texUnit->EnvMode, comb->ModeA);

+

+      key->unit[i].ScaleShiftRGB = comb->ScaleShiftRGB;

+      key->unit[i].ScaleShiftA = comb->ScaleShiftA;

+

+      for (j = 0; j < MAX_COMBINER_TERMS; j++) {

+         key->unit[i].OptRGB[j].Operand = translate_operand(comb->OperandRGB[j]);

+         key->unit[i].OptA[j].Operand = translate_operand(comb->OperandA[j]);

+         key->unit[i].OptRGB[j].Source = translate_source(comb->SourceRGB[j]);

+         key->unit[i].OptA[j].Source = translate_source(comb->SourceA[j]);

+      }

+

+      if (key->unit[i].ModeRGB == MODE_BUMP_ENVMAP_ATI) {

+         /* requires some special translation */

+         key->unit[i].NumArgsRGB = 2;

+         key->unit[i].ScaleShiftRGB = 0;

+         key->unit[i].OptRGB[0].Operand = OPR_SRC_COLOR;

+         key->unit[i].OptRGB[0].Source = SRC_TEXTURE;

+         key->unit[i].OptRGB[1].Operand = OPR_SRC_COLOR;

+         key->unit[i].OptRGB[1].Source = texUnit->BumpTarget - GL_TEXTURE0 + SRC_TEXTURE0;

+       }

+

+      /* this is a back-door for enabling cylindrical texture wrap mode */

+      if (texObj->Priority == 0.125)

+         key->unit[i].texture_cyl_wrap = 1;

+   }

+

+   /* _NEW_LIGHT | _NEW_FOG */

+   if (texenv_doing_secondary_color(ctx)) {

+      key->separate_specular = 1;

+      inputs_referenced |= FRAG_BIT_COL1;

+   }

+

+   /* _NEW_FOG */

+   if (ctx->Fog.Enabled) {

+      key->fog_enabled = 1;

+      key->fog_mode = translate_fog_mode(ctx->Fog.Mode);

+      inputs_referenced |= FRAG_BIT_FOGC; /* maybe */

+   }

+

+   /* _NEW_BUFFERS */

+   key->num_draw_buffers = ctx->DrawBuffer->_NumColorDrawBuffers;

+

+   key->inputs_available = (inputs_available & inputs_referenced);

+

+   /* compute size of state key, ignoring unused texture units */

+   keySize = sizeof(*key) - sizeof(key->unit)

+      + key->nr_enabled_units * sizeof(key->unit[0]);

+

+   return keySize;

+}

+

+

+/**

+ * Use uregs to represent registers internally, translate to Mesa's

+ * expected formats on emit.  

+ *

+ * NOTE: These are passed by value extensively in this file rather

+ * than as usual by pointer reference.  If this disturbs you, try

+ * remembering they are just 32bits in size.

+ *

+ * GCC is smart enough to deal with these dword-sized structures in

+ * much the same way as if I had defined them as dwords and was using

+ * macros to access and set the fields.  This is much nicer and easier

+ * to evolve.

+ */

+struct ureg {

+   GLuint file:4;

+   GLuint idx:8;

+   GLuint negatebase:1;

+   GLuint swz:12;

+   GLuint pad:7;

+};

+

+static const struct ureg undef = { 

+   PROGRAM_UNDEFINED,

+   255,

+   0,

+   0,

+   0

+};

+

+

+/** State used to build the fragment program:

+ */

+struct texenv_fragment_program {

+   struct gl_fragment_program *program;

+   struct state_key *state;

+

+   GLbitfield alu_temps;	/**< Track texture indirections, see spec. */

+   GLbitfield temps_output;	/**< Track texture indirections, see spec. */

+   GLbitfield temp_in_use;	/**< Tracks temporary regs which are in use. */

+   GLboolean error;

+

+   struct ureg src_texture[MAX_TEXTURE_COORD_UNITS];   

+   /* Reg containing each texture unit's sampled texture color,

+    * else undef.

+    */

+

+   struct ureg texcoord_tex[MAX_TEXTURE_COORD_UNITS];

+   /* Reg containing texcoord for a texture unit,

+    * needed for bump mapping, else undef.

+    */

+

+   struct ureg src_previous;	/**< Reg containing color from previous 

+				 * stage.  May need to be decl'd.

+				 */

+

+   GLuint last_tex_stage;	/**< Number of last enabled texture unit */

+

+   struct ureg half;

+   struct ureg one;

+   struct ureg zero;

+};

+

+

+

+static struct ureg make_ureg(GLuint file, GLuint idx)

+{

+   struct ureg reg;

+   reg.file = file;

+   reg.idx = idx;

+   reg.negatebase = 0;

+   reg.swz = SWIZZLE_NOOP;

+   reg.pad = 0;

+   return reg;

+}

+

+static struct ureg swizzle( struct ureg reg, int x, int y, int z, int w )

+{

+   reg.swz = MAKE_SWIZZLE4(GET_SWZ(reg.swz, x),

+			   GET_SWZ(reg.swz, y),

+			   GET_SWZ(reg.swz, z),

+			   GET_SWZ(reg.swz, w));

+

+   return reg;

+}

+

+static struct ureg swizzle1( struct ureg reg, int x )

+{

+   return swizzle(reg, x, x, x, x);

+}

+

+static struct ureg negate( struct ureg reg )

+{

+   reg.negatebase ^= 1;

+   return reg;

+}

+

+static GLboolean is_undef( struct ureg reg )

+{

+   return reg.file == PROGRAM_UNDEFINED;

+}

+

+

+static struct ureg get_temp( struct texenv_fragment_program *p )

+{

+   GLint bit;

+   

+   /* First try and reuse temps which have been used already:

+    */

+   bit = _mesa_ffs( ~p->temp_in_use & p->alu_temps );

+

+   /* Then any unused temporary:

+    */

+   if (!bit)

+      bit = _mesa_ffs( ~p->temp_in_use );

+

+   if (!bit) {

+      _mesa_problem(NULL, "%s: out of temporaries\n", __FILE__);

+      exit(1);

+   }

+

+   if ((GLuint) bit > p->program->Base.NumTemporaries)

+      p->program->Base.NumTemporaries = bit;

+

+   p->temp_in_use |= 1<<(bit-1);

+   return make_ureg(PROGRAM_TEMPORARY, (bit-1));

+}

+

+static struct ureg get_tex_temp( struct texenv_fragment_program *p )

+{

+   int bit;

+   

+   /* First try to find available temp not previously used (to avoid

+    * starting a new texture indirection).  According to the spec, the

+    * ~p->temps_output isn't necessary, but will keep it there for

+    * now:

+    */

+   bit = _mesa_ffs( ~p->temp_in_use & ~p->alu_temps & ~p->temps_output );

+

+   /* Then any unused temporary:

+    */

+   if (!bit) 

+      bit = _mesa_ffs( ~p->temp_in_use );

+

+   if (!bit) {

+      _mesa_problem(NULL, "%s: out of temporaries\n", __FILE__);

+      exit(1);

+   }

+

+   if ((GLuint) bit > p->program->Base.NumTemporaries)

+      p->program->Base.NumTemporaries = bit;

+

+   p->temp_in_use |= 1<<(bit-1);

+   return make_ureg(PROGRAM_TEMPORARY, (bit-1));

+}

+

+

+/** Mark a temp reg as being no longer allocatable. */

+static void reserve_temp( struct texenv_fragment_program *p, struct ureg r )

+{

+   if (r.file == PROGRAM_TEMPORARY)

+      p->temps_output |= (1 << r.idx);

+}

+

+

+static void release_temps(struct gl_context *ctx, struct texenv_fragment_program *p )

+{

+   GLuint max_temp = ctx->Const.FragmentProgram.MaxTemps;

+

+   /* KW: To support tex_env_crossbar, don't release the registers in

+    * temps_output.

+    */

+   if (max_temp >= sizeof(int) * 8)

+      p->temp_in_use = p->temps_output;

+   else

+      p->temp_in_use = ~((1<<max_temp)-1) | p->temps_output;

+}

+

+

+static struct ureg register_param5( struct texenv_fragment_program *p, 

+				    GLint s0,

+				    GLint s1,

+				    GLint s2,

+				    GLint s3,

+				    GLint s4)

+{

+   int tokens[STATE_LENGTH];

+   GLuint idx;

+   tokens[0] = s0;

+   tokens[1] = s1;

+   tokens[2] = s2;

+   tokens[3] = s3;

+   tokens[4] = s4;

+   idx = _mesa_add_state_reference(p->program->Base.Parameters,

+				   (gl_state_index *)tokens);

+   return make_ureg(PROGRAM_STATE_VAR, idx);

+}

+

+

+#define register_param1(p,s0)          register_param5(p,s0,0,0,0,0)

+#define register_param2(p,s0,s1)       register_param5(p,s0,s1,0,0,0)

+#define register_param3(p,s0,s1,s2)    register_param5(p,s0,s1,s2,0,0)

+#define register_param4(p,s0,s1,s2,s3) register_param5(p,s0,s1,s2,s3,0)

+

+static GLuint frag_to_vert_attrib( GLuint attrib )

+{

+   switch (attrib) {

+   case FRAG_ATTRIB_COL0: return VERT_ATTRIB_COLOR0;

+   case FRAG_ATTRIB_COL1: return VERT_ATTRIB_COLOR1;

+   default:

+      assert(attrib >= FRAG_ATTRIB_TEX0);

+      assert(attrib <= FRAG_ATTRIB_TEX7);

+      return attrib - FRAG_ATTRIB_TEX0 + VERT_ATTRIB_TEX0;

+   }

+}

+

+

+static struct ureg register_input( struct texenv_fragment_program *p, GLuint input )

+{

+   if (p->state->inputs_available & (1<<input)) {

+      p->program->Base.InputsRead |= (1 << input);

+      return make_ureg(PROGRAM_INPUT, input);

+   }

+   else {

+      GLuint idx = frag_to_vert_attrib( input );

+      return register_param3( p, STATE_INTERNAL, STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED, idx );

+   }

+}

+

+

+static void emit_arg( struct prog_src_register *reg,

+		      struct ureg ureg )

+{

+   reg->File = ureg.file;

+   reg->Index = ureg.idx;

+   reg->Swizzle = ureg.swz;

+   reg->Negate = ureg.negatebase ? NEGATE_XYZW : NEGATE_NONE;

+   reg->Abs = GL_FALSE;

+}

+

+static void emit_dst( struct prog_dst_register *dst,

+		      struct ureg ureg, GLuint mask )

+{

+   dst->File = ureg.file;

+   dst->Index = ureg.idx;

+   dst->WriteMask = mask;

+   dst->CondMask = COND_TR;  /* always pass cond test */

+   dst->CondSwizzle = SWIZZLE_NOOP;

+}

+

+static struct prog_instruction *

+emit_op(struct texenv_fragment_program *p,

+	enum prog_opcode op,

+	struct ureg dest,

+	GLuint mask,

+	GLboolean saturate,

+	struct ureg src0,

+	struct ureg src1,

+	struct ureg src2 )

+{

+   const GLuint nr = p->program->Base.NumInstructions++;

+   struct prog_instruction *inst = &p->program->Base.Instructions[nr];

+

+   assert(nr < MAX_INSTRUCTIONS);

+

+   _mesa_init_instructions(inst, 1);

+   inst->Opcode = op;

+   

+   emit_arg( &inst->SrcReg[0], src0 );

+   emit_arg( &inst->SrcReg[1], src1 );

+   emit_arg( &inst->SrcReg[2], src2 );

+   

+   inst->SaturateMode = saturate ? SATURATE_ZERO_ONE : SATURATE_OFF;

+

+   emit_dst( &inst->DstReg, dest, mask );

+

+#if 0

+   /* Accounting for indirection tracking:

+    */

+   if (dest.file == PROGRAM_TEMPORARY)

+      p->temps_output |= 1 << dest.idx;

+#endif

+

+   return inst;

+}

+   

+

+static struct ureg emit_arith( struct texenv_fragment_program *p,

+			       enum prog_opcode op,

+			       struct ureg dest,

+			       GLuint mask,

+			       GLboolean saturate,

+			       struct ureg src0,

+			       struct ureg src1,

+			       struct ureg src2 )

+{

+   emit_op(p, op, dest, mask, saturate, src0, src1, src2);

+   

+   /* Accounting for indirection tracking:

+    */

+   if (src0.file == PROGRAM_TEMPORARY)

+      p->alu_temps |= 1 << src0.idx;

+

+   if (!is_undef(src1) && src1.file == PROGRAM_TEMPORARY)

+      p->alu_temps |= 1 << src1.idx;

+

+   if (!is_undef(src2) && src2.file == PROGRAM_TEMPORARY)

+      p->alu_temps |= 1 << src2.idx;

+

+   if (dest.file == PROGRAM_TEMPORARY)

+      p->alu_temps |= 1 << dest.idx;

+       

+   p->program->Base.NumAluInstructions++;

+   return dest;

+}

+

+static struct ureg emit_texld( struct texenv_fragment_program *p,

+			       enum prog_opcode op,

+			       struct ureg dest,

+			       GLuint destmask,

+			       GLuint tex_unit,

+			       GLuint tex_idx,

+                               GLuint tex_shadow,

+			       struct ureg coord )

+{

+   struct prog_instruction *inst = emit_op( p, op, 

+					  dest, destmask, 

+					  GL_FALSE,	/* don't saturate? */

+					  coord, 	/* arg 0? */

+					  undef,

+					  undef);

+   

+   inst->TexSrcTarget = tex_idx;

+   inst->TexSrcUnit = tex_unit;

+   inst->TexShadow = tex_shadow;

+

+   p->program->Base.NumTexInstructions++;

+

+   /* Accounting for indirection tracking:

+    */

+   reserve_temp(p, dest);

+

+#if 0

+   /* Is this a texture indirection?

+    */

+   if ((coord.file == PROGRAM_TEMPORARY &&

+	(p->temps_output & (1<<coord.idx))) ||

+       (dest.file == PROGRAM_TEMPORARY &&

+	(p->alu_temps & (1<<dest.idx)))) {

+      p->program->Base.NumTexIndirections++;

+      p->temps_output = 1<<coord.idx;

+      p->alu_temps = 0;

+      assert(0);		/* KW: texture env crossbar */

+   }

+#endif

+

+   return dest;

+}

+

+

+static struct ureg register_const4f( struct texenv_fragment_program *p, 

+				     GLfloat s0,

+				     GLfloat s1,

+				     GLfloat s2,

+				     GLfloat s3)

+{

+   GLfloat values[4];

+   GLuint idx, swizzle;

+   struct ureg r;

+   values[0] = s0;

+   values[1] = s1;

+   values[2] = s2;

+   values[3] = s3;

+   idx = _mesa_add_unnamed_constant( p->program->Base.Parameters, values, 4,

+                                     &swizzle );

+   r = make_ureg(PROGRAM_CONSTANT, idx);

+   r.swz = swizzle;

+   return r;

+}

+

+#define register_scalar_const(p, s0)    register_const4f(p, s0, s0, s0, s0)

+#define register_const1f(p, s0)         register_const4f(p, s0, 0, 0, 1)

+#define register_const2f(p, s0, s1)     register_const4f(p, s0, s1, 0, 1)

+#define register_const3f(p, s0, s1, s2) register_const4f(p, s0, s1, s2, 1)

+

+

+static struct ureg get_one( struct texenv_fragment_program *p )

+{

+   if (is_undef(p->one)) 

+      p->one = register_scalar_const(p, 1.0);

+   return p->one;

+}

+

+static struct ureg get_half( struct texenv_fragment_program *p )

+{

+   if (is_undef(p->half)) 

+      p->half = register_scalar_const(p, 0.5);

+   return p->half;

+}

+

+static struct ureg get_zero( struct texenv_fragment_program *p )

+{

+   if (is_undef(p->zero)) 

+      p->zero = register_scalar_const(p, 0.0);

+   return p->zero;

+}

+

+

+static void program_error( struct texenv_fragment_program *p, const char *msg )

+{

+   _mesa_problem(NULL, "%s", msg);

+   p->error = 1;

+}

+

+static struct ureg get_source( struct texenv_fragment_program *p, 

+			       GLuint src, GLuint unit )

+{

+   switch (src) {

+   case SRC_TEXTURE: 

+      assert(!is_undef(p->src_texture[unit]));

+      return p->src_texture[unit];

+

+   case SRC_TEXTURE0:

+   case SRC_TEXTURE1:

+   case SRC_TEXTURE2:

+   case SRC_TEXTURE3:

+   case SRC_TEXTURE4:

+   case SRC_TEXTURE5:

+   case SRC_TEXTURE6:

+   case SRC_TEXTURE7: 

+      assert(!is_undef(p->src_texture[src - SRC_TEXTURE0]));

+      return p->src_texture[src - SRC_TEXTURE0];

+

+   case SRC_CONSTANT:

+      return register_param2(p, STATE_TEXENV_COLOR, unit);

+

+   case SRC_PRIMARY_COLOR:

+      return register_input(p, FRAG_ATTRIB_COL0);

+

+   case SRC_ZERO:

+      return get_zero(p);

+

+   case SRC_PREVIOUS:

+      if (is_undef(p->src_previous))

+	 return register_input(p, FRAG_ATTRIB_COL0);

+      else

+	 return p->src_previous;

+

+   default:

+      assert(0);

+      return undef;

+   }

+}

+

+static struct ureg emit_combine_source( struct texenv_fragment_program *p, 

+					GLuint mask,

+					GLuint unit,

+					GLuint source, 

+					GLuint operand )

+{

+   struct ureg arg, src, one;

+

+   src = get_source(p, source, unit);

+

+   switch (operand) {

+   case OPR_ONE_MINUS_SRC_COLOR: 

+      /* Get unused tmp,

+       * Emit tmp = 1.0 - arg.xyzw

+       */

+      arg = get_temp( p );

+      one = get_one( p );

+      return emit_arith( p, OPCODE_SUB, arg, mask, 0, one, src, undef);

+

+   case OPR_SRC_ALPHA: 

+      if (mask == WRITEMASK_W)

+	 return src;

+      else

+	 return swizzle1( src, SWIZZLE_W );

+   case OPR_ONE_MINUS_SRC_ALPHA: 

+      /* Get unused tmp,

+       * Emit tmp = 1.0 - arg.wwww

+       */

+      arg = get_temp(p);

+      one = get_one(p);

+      return emit_arith(p, OPCODE_SUB, arg, mask, 0,

+			one, swizzle1(src, SWIZZLE_W), undef);

+   case OPR_ZERO:

+      return get_zero(p);

+   case OPR_ONE:

+      return get_one(p);

+   case OPR_SRC_COLOR: 

+      return src;

+   default:

+      assert(0);

+      return src;

+   }

+}

+

+/**

+ * Check if the RGB and Alpha sources and operands match for the given

+ * texture unit's combinder state.  When the RGB and A sources and

+ * operands match, we can emit fewer instructions.

+ */

+static GLboolean args_match( const struct state_key *key, GLuint unit )

+{

+   GLuint i, numArgs = key->unit[unit].NumArgsRGB;

+

+   for (i = 0; i < numArgs; i++) {

+      if (key->unit[unit].OptA[i].Source != key->unit[unit].OptRGB[i].Source) 

+	 return GL_FALSE;

+

+      switch (key->unit[unit].OptA[i].Operand) {

+      case OPR_SRC_ALPHA: 

+	 switch (key->unit[unit].OptRGB[i].Operand) {

+	 case OPR_SRC_COLOR: 

+	 case OPR_SRC_ALPHA: 

+	    break;

+	 default:

+	    return GL_FALSE;

+	 }

+	 break;

+      case OPR_ONE_MINUS_SRC_ALPHA: 

+	 switch (key->unit[unit].OptRGB[i].Operand) {

+	 case OPR_ONE_MINUS_SRC_COLOR: 

+	 case OPR_ONE_MINUS_SRC_ALPHA: 

+	    break;

+	 default:

+	    return GL_FALSE;

+	 }

+	 break;

+      default: 

+	 return GL_FALSE;	/* impossible */

+      }

+   }

+

+   return GL_TRUE;

+}

+

+static struct ureg emit_combine( struct texenv_fragment_program *p,

+				 struct ureg dest,

+				 GLuint mask,

+				 GLboolean saturate,

+				 GLuint unit,

+				 GLuint nr,

+				 GLuint mode,

+				 const struct mode_opt *opt)

+{

+   struct ureg src[MAX_COMBINER_TERMS];

+   struct ureg tmp, half;

+   GLuint i;

+

+   assert(nr <= MAX_COMBINER_TERMS);

+

+   for (i = 0; i < nr; i++)

+      src[i] = emit_combine_source( p, mask, unit, opt[i].Source, opt[i].Operand );

+

+   switch (mode) {

+   case MODE_REPLACE: 

+      if (mask == WRITEMASK_XYZW && !saturate)

+	 return src[0];

+      else

+	 return emit_arith( p, OPCODE_MOV, dest, mask, saturate, src[0], undef, undef );

+   case MODE_MODULATE: 

+      return emit_arith( p, OPCODE_MUL, dest, mask, saturate,

+			 src[0], src[1], undef );

+   case MODE_ADD: 

+      return emit_arith( p, OPCODE_ADD, dest, mask, saturate, 

+			 src[0], src[1], undef );

+   case MODE_ADD_SIGNED:

+      /* tmp = arg0 + arg1

+       * result = tmp - .5

+       */

+      half = get_half(p);

+      tmp = get_temp( p );

+      emit_arith( p, OPCODE_ADD, tmp, mask, 0, src[0], src[1], undef );

+      emit_arith( p, OPCODE_SUB, dest, mask, saturate, tmp, half, undef );

+      return dest;

+   case MODE_INTERPOLATE: 

+      /* Arg0 * (Arg2) + Arg1 * (1-Arg2) -- note arguments are reordered:

+       */

+      return emit_arith( p, OPCODE_LRP, dest, mask, saturate, src[2], src[0], src[1] );

+

+   case MODE_SUBTRACT: 

+      return emit_arith( p, OPCODE_SUB, dest, mask, saturate, src[0], src[1], undef );

+

+   case MODE_DOT3_RGBA:

+   case MODE_DOT3_RGBA_EXT: 

+   case MODE_DOT3_RGB_EXT:

+   case MODE_DOT3_RGB: {

+      struct ureg tmp0 = get_temp( p );

+      struct ureg tmp1 = get_temp( p );

+      struct ureg neg1 = register_scalar_const(p, -1);

+      struct ureg two  = register_scalar_const(p, 2);

+

+      /* tmp0 = 2*src0 - 1

+       * tmp1 = 2*src1 - 1

+       *

+       * dst = tmp0 dot3 tmp1 

+       */

+      emit_arith( p, OPCODE_MAD, tmp0, WRITEMASK_XYZW, 0, 

+		  two, src[0], neg1);

+

+      if (memcmp(&src[0], &src[1], sizeof(struct ureg)) == 0)

+	 tmp1 = tmp0;

+      else

+	 emit_arith( p, OPCODE_MAD, tmp1, WRITEMASK_XYZW, 0, 

+		     two, src[1], neg1);

+      emit_arith( p, OPCODE_DP3, dest, mask, saturate, tmp0, tmp1, undef);

+      return dest;

+   }

+   case MODE_MODULATE_ADD_ATI:

+      /* Arg0 * Arg2 + Arg1 */

+      return emit_arith( p, OPCODE_MAD, dest, mask, saturate,

+			 src[0], src[2], src[1] );

+   case MODE_MODULATE_SIGNED_ADD_ATI: {

+      /* Arg0 * Arg2 + Arg1 - 0.5 */

+      struct ureg tmp0 = get_temp(p);

+      half = get_half(p);

+      emit_arith( p, OPCODE_MAD, tmp0, mask, 0, src[0], src[2], src[1] );

+      emit_arith( p, OPCODE_SUB, dest, mask, saturate, tmp0, half, undef );

+      return dest;

+   }

+   case MODE_MODULATE_SUBTRACT_ATI:

+      /* Arg0 * Arg2 - Arg1 */

+      emit_arith( p, OPCODE_MAD, dest, mask, 0, src[0], src[2], negate(src[1]) );

+      return dest;

+   case MODE_ADD_PRODUCTS:

+      /* Arg0 * Arg1 + Arg2 * Arg3 */

+      {

+         struct ureg tmp0 = get_temp(p);

+         emit_arith( p, OPCODE_MUL, tmp0, mask, 0, src[0], src[1], undef );

+         emit_arith( p, OPCODE_MAD, dest, mask, saturate, src[2], src[3], tmp0 );

+      }

+      return dest;

+   case MODE_ADD_PRODUCTS_SIGNED:

+      /* Arg0 * Arg1 + Arg2 * Arg3 - 0.5 */

+      {

+         struct ureg tmp0 = get_temp(p);

+         half = get_half(p);

+         emit_arith( p, OPCODE_MUL, tmp0, mask, 0, src[0], src[1], undef );

+         emit_arith( p, OPCODE_MAD, tmp0, mask, 0, src[2], src[3], tmp0 );

+         emit_arith( p, OPCODE_SUB, dest, mask, saturate, tmp0, half, undef );

+      }

+      return dest;

+   case MODE_BUMP_ENVMAP_ATI:

+      /* special - not handled here */

+      assert(0);

+      return src[0];

+   default: 

+      assert(0);

+      return src[0];

+   }

+}

+

+

+/**

+ * Generate instructions for one texture unit's env/combiner mode.

+ */

+static struct ureg

+emit_texenv(struct texenv_fragment_program *p, GLuint unit)

+{

+   const struct state_key *key = p->state;

+   GLboolean rgb_saturate, alpha_saturate;

+   GLuint rgb_shift, alpha_shift;

+   struct ureg out, dest;

+

+   if (!key->unit[unit].enabled) {

+      return get_source(p, SRC_PREVIOUS, 0);

+   }

+   if (key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {

+      /* this isn't really a env stage delivering a color and handled elsewhere */

+      return get_source(p, SRC_PREVIOUS, 0);

+   }

+   

+   switch (key->unit[unit].ModeRGB) {

+   case MODE_DOT3_RGB_EXT:

+      alpha_shift = key->unit[unit].ScaleShiftA;

+      rgb_shift = 0;

+      break;

+   case MODE_DOT3_RGBA_EXT:

+      alpha_shift = 0;

+      rgb_shift = 0;

+      break;

+   default:

+      rgb_shift = key->unit[unit].ScaleShiftRGB;

+      alpha_shift = key->unit[unit].ScaleShiftA;

+      break;

+   }

+   

+   /* If we'll do rgb/alpha shifting don't saturate in emit_combine().

+    * We don't want to clamp twice.

+    */

+   if (rgb_shift)

+      rgb_saturate = GL_FALSE;  /* saturate after rgb shift */

+   else if (need_saturate(key->unit[unit].ModeRGB))

+      rgb_saturate = GL_TRUE;

+   else

+      rgb_saturate = GL_FALSE;

+

+   if (alpha_shift)

+      alpha_saturate = GL_FALSE;  /* saturate after alpha shift */

+   else if (need_saturate(key->unit[unit].ModeA))

+      alpha_saturate = GL_TRUE;

+   else

+      alpha_saturate = GL_FALSE;

+

+   /* If this is the very last calculation (and various other conditions

+    * are met), emit directly to the color output register.  Otherwise,

+    * emit to a temporary register.

+    */

+   if (key->separate_specular ||

+       unit != p->last_tex_stage ||

+       alpha_shift ||

+       key->num_draw_buffers != 1 ||

+       rgb_shift)

+      dest = get_temp( p );

+   else

+      dest = make_ureg(PROGRAM_OUTPUT, FRAG_RESULT_COLOR);

+

+   /* Emit the RGB and A combine ops

+    */

+   if (key->unit[unit].ModeRGB == key->unit[unit].ModeA &&

+       args_match(key, unit)) {

+      out = emit_combine( p, dest, WRITEMASK_XYZW, rgb_saturate,

+			  unit,

+			  key->unit[unit].NumArgsRGB,

+			  key->unit[unit].ModeRGB,

+			  key->unit[unit].OptRGB);

+   }

+   else if (key->unit[unit].ModeRGB == MODE_DOT3_RGBA_EXT ||

+	    key->unit[unit].ModeRGB == MODE_DOT3_RGBA) {

+      out = emit_combine( p, dest, WRITEMASK_XYZW, rgb_saturate,

+			  unit,

+			  key->unit[unit].NumArgsRGB,

+			  key->unit[unit].ModeRGB,

+			  key->unit[unit].OptRGB);

+   }

+   else {

+      /* Need to do something to stop from re-emitting identical

+       * argument calculations here:

+       */

+      out = emit_combine( p, dest, WRITEMASK_XYZ, rgb_saturate,

+			  unit,

+			  key->unit[unit].NumArgsRGB,

+			  key->unit[unit].ModeRGB,

+			  key->unit[unit].OptRGB);

+      out = emit_combine( p, dest, WRITEMASK_W, alpha_saturate,

+			  unit,

+			  key->unit[unit].NumArgsA,

+			  key->unit[unit].ModeA,

+			  key->unit[unit].OptA);

+   }

+

+   /* Deal with the final shift:

+    */

+   if (alpha_shift || rgb_shift) {

+      struct ureg shift;

+      GLboolean saturate = GL_TRUE;  /* always saturate at this point */

+

+      if (rgb_shift == alpha_shift) {

+	 shift = register_scalar_const(p, (GLfloat)(1<<rgb_shift));

+      }

+      else {

+	 shift = register_const4f(p, 

+				  (GLfloat)(1<<rgb_shift),

+				  (GLfloat)(1<<rgb_shift),

+				  (GLfloat)(1<<rgb_shift),

+				  (GLfloat)(1<<alpha_shift));

+      }

+      return emit_arith( p, OPCODE_MUL, dest, WRITEMASK_XYZW, 

+			 saturate, out, shift, undef );

+   }

+   else

+      return out;

+}

+

+

+/**

+ * Generate instruction for getting a texture source term.

+ */

+static void load_texture( struct texenv_fragment_program *p, GLuint unit )

+{

+   if (is_undef(p->src_texture[unit])) {

+      const GLuint texTarget = p->state->unit[unit].source_index;

+      struct ureg texcoord;

+      struct ureg tmp = get_tex_temp( p );

+

+      if (is_undef(p->texcoord_tex[unit])) {

+         texcoord = register_input(p, FRAG_ATTRIB_TEX0+unit);

+      }

+      else {

+         /* might want to reuse this reg for tex output actually */

+         texcoord = p->texcoord_tex[unit];

+      }

+

+      /* TODO: Use D0_MASK_XY where possible.

+       */

+      if (p->state->unit[unit].enabled) {

+         GLboolean shadow = GL_FALSE;

+

+	 if (p->state->unit[unit].shadow) {

+	    p->program->Base.ShadowSamplers |= 1 << unit;

+            shadow = GL_TRUE;

+         }

+

+	 p->src_texture[unit] = emit_texld( p, OPCODE_TXP,

+					    tmp, WRITEMASK_XYZW, 

+					    unit, texTarget, shadow,

+                                            texcoord );

+

+         p->program->Base.SamplersUsed |= (1 << unit);

+         /* This identity mapping should already be in place

+          * (see _mesa_init_program_struct()) but let's be safe.

+          */

+         p->program->Base.SamplerUnits[unit] = unit;

+      }

+      else

+	 p->src_texture[unit] = get_zero(p);

+

+      if (p->state->unit[unit].texture_cyl_wrap) {

+         /* set flag which is checked by Mesa->Gallium program translation */

+         p->program->Base.InputFlags[0] |= PROG_PARAM_BIT_CYL_WRAP;

+      }

+

+   }

+}

+

+static GLboolean load_texenv_source( struct texenv_fragment_program *p, 

+				     GLuint src, GLuint unit )

+{

+   switch (src) {

+   case SRC_TEXTURE:

+      load_texture(p, unit);

+      break;

+

+   case SRC_TEXTURE0:

+   case SRC_TEXTURE1:

+   case SRC_TEXTURE2:

+   case SRC_TEXTURE3:

+   case SRC_TEXTURE4:

+   case SRC_TEXTURE5:

+   case SRC_TEXTURE6:

+   case SRC_TEXTURE7:       

+      load_texture(p, src - SRC_TEXTURE0);

+      break;

+      

+   default:

+      /* not a texture src - do nothing */

+      break;

+   }

+ 

+   return GL_TRUE;

+}

+

+

+/**

+ * Generate instructions for loading all texture source terms.

+ */

+static GLboolean

+load_texunit_sources( struct texenv_fragment_program *p, GLuint unit )

+{

+   const struct state_key *key = p->state;

+   GLuint i;

+

+   for (i = 0; i < key->unit[unit].NumArgsRGB; i++) {

+      load_texenv_source( p, key->unit[unit].OptRGB[i].Source, unit );

+   }

+

+   for (i = 0; i < key->unit[unit].NumArgsA; i++) {

+      load_texenv_source( p, key->unit[unit].OptA[i].Source, unit );

+   }

+

+   return GL_TRUE;

+}

+

+/**

+ * Generate instructions for loading bump map textures.

+ */

+static GLboolean

+load_texunit_bumpmap( struct texenv_fragment_program *p, GLuint unit )

+{

+   const struct state_key *key = p->state;

+   GLuint bumpedUnitNr = key->unit[unit].OptRGB[1].Source - SRC_TEXTURE0;

+   struct ureg texcDst, bumpMapRes;

+   struct ureg constdudvcolor = register_const4f(p, 0.0, 0.0, 0.0, 1.0);

+   struct ureg texcSrc = register_input(p, FRAG_ATTRIB_TEX0 + bumpedUnitNr);

+   struct ureg rotMat0 = register_param3( p, STATE_INTERNAL, STATE_ROT_MATRIX_0, unit );

+   struct ureg rotMat1 = register_param3( p, STATE_INTERNAL, STATE_ROT_MATRIX_1, unit );

+

+   load_texenv_source( p, unit + SRC_TEXTURE0, unit );

+

+   bumpMapRes = get_source(p, key->unit[unit].OptRGB[0].Source, unit);

+   texcDst = get_tex_temp( p );

+   p->texcoord_tex[bumpedUnitNr] = texcDst;

+

+   /* Apply rot matrix and add coords to be available in next phase.

+    * dest = (Arg0.xxxx * rotMat0 + Arg1) + (Arg0.yyyy * rotMat1)

+    * note only 2 coords are affected the rest are left unchanged (mul by 0)

+    */

+   emit_arith( p, OPCODE_MAD, texcDst, WRITEMASK_XYZW, 0,

+               swizzle1(bumpMapRes, SWIZZLE_X), rotMat0, texcSrc );

+   emit_arith( p, OPCODE_MAD, texcDst, WRITEMASK_XYZW, 0,

+               swizzle1(bumpMapRes, SWIZZLE_Y), rotMat1, texcDst );

+

+   /* Move 0,0,0,1 into bumpmap src if someone (crossbar) is foolish

+    * enough to access this later, should optimize away.

+    */

+   emit_arith( p, OPCODE_MOV, bumpMapRes, WRITEMASK_XYZW, 0,

+               constdudvcolor, undef, undef );

+

+   return GL_TRUE;

+}

+

+/**

+ * Generate a new fragment program which implements the context's

+ * current texture env/combine mode.

+ */

+static void

+create_new_program(struct gl_context *ctx, struct state_key *key,

+                   struct gl_fragment_program *program)

+{

+   struct prog_instruction instBuffer[MAX_INSTRUCTIONS];

+   struct texenv_fragment_program p;

+   GLuint unit;

+   struct ureg cf, out;

+   int i;

+

+   memset(&p, 0, sizeof(p));

+   p.state = key;

+   p.program = program;

+

+   /* During code generation, use locally-allocated instruction buffer,

+    * then alloc dynamic storage below.

+    */

+   p.program->Base.Instructions = instBuffer;

+   p.program->Base.Target = GL_FRAGMENT_PROGRAM_ARB;

+   p.program->Base.String = NULL;

+   p.program->Base.NumTexIndirections = 1; /* is this right? */

+   p.program->Base.NumTexInstructions = 0;

+   p.program->Base.NumAluInstructions = 0;

+   p.program->Base.NumInstructions = 0;

+   p.program->Base.NumTemporaries = 0;

+   p.program->Base.NumParameters = 0;

+   p.program->Base.NumAttributes = 0;

+   p.program->Base.NumAddressRegs = 0;

+   p.program->Base.Parameters = _mesa_new_parameter_list();

+   p.program->Base.InputsRead = 0x0;

+

+   if (key->num_draw_buffers == 1)

+      p.program->Base.OutputsWritten = 1 << FRAG_RESULT_COLOR;

+   else {

+      for (i = 0; i < key->num_draw_buffers; i++)

+	 p.program->Base.OutputsWritten |= (1 << (FRAG_RESULT_DATA0 + i));

+   }

+

+   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {

+      p.src_texture[unit] = undef;

+      p.texcoord_tex[unit] = undef;

+   }

+

+   p.src_previous = undef;

+   p.half = undef;

+   p.zero = undef;

+   p.one = undef;

+

+   p.last_tex_stage = 0;

+   release_temps(ctx, &p);

+

+   if (key->enabled_units && key->num_draw_buffers) {

+      GLboolean needbumpstage = GL_FALSE;

+

+      /* Zeroth pass - bump map textures first */

+      for (unit = 0; unit < key->nr_enabled_units; unit++)

+	 if (key->unit[unit].enabled &&

+             key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {

+	    needbumpstage = GL_TRUE;

+	    load_texunit_bumpmap( &p, unit );

+	 }

+      if (needbumpstage)

+	 p.program->Base.NumTexIndirections++;

+

+      /* First pass - to support texture_env_crossbar, first identify

+       * all referenced texture sources and emit texld instructions

+       * for each:

+       */

+      for (unit = 0; unit < key->nr_enabled_units; unit++)

+	 if (key->unit[unit].enabled) {

+	    load_texunit_sources( &p, unit );

+	    p.last_tex_stage = unit;

+	 }

+

+      /* Second pass - emit combine instructions to build final color:

+       */

+      for (unit = 0; unit < key->nr_enabled_units; unit++)

+	 if (key->unit[unit].enabled) {

+	    p.src_previous = emit_texenv( &p, unit );

+            reserve_temp(&p, p.src_previous); /* don't re-use this temp reg */

+	    release_temps(ctx, &p);	/* release all temps */

+	 }

+   }

+

+   cf = get_source( &p, SRC_PREVIOUS, 0 );

+

+   for (i = 0; i < key->num_draw_buffers; i++) {

+      if (key->num_draw_buffers == 1)

+	 out = make_ureg( PROGRAM_OUTPUT, FRAG_RESULT_COLOR );

+      else {

+	 out = make_ureg( PROGRAM_OUTPUT, FRAG_RESULT_DATA0 + i );

+      }

+

+      if (key->separate_specular) {

+	 /* Emit specular add.

+	  */

+	 struct ureg s = register_input(&p, FRAG_ATTRIB_COL1);

+	 emit_arith( &p, OPCODE_ADD, out, WRITEMASK_XYZ, 0, cf, s, undef );

+	 emit_arith( &p, OPCODE_MOV, out, WRITEMASK_W, 0, cf, undef, undef );

+      }

+      else if (memcmp(&cf, &out, sizeof(cf)) != 0) {

+	 /* Will wind up in here if no texture enabled or a couple of

+	  * other scenarios (GL_REPLACE for instance).

+	  */

+	 emit_arith( &p, OPCODE_MOV, out, WRITEMASK_XYZW, 0, cf, undef, undef );

+      }

+   }

+   /* Finish up:

+    */

+   emit_arith( &p, OPCODE_END, undef, WRITEMASK_XYZW, 0, undef, undef, undef);

+

+   if (key->fog_enabled) {

+      /* Pull fog mode from struct gl_context, the value in the state key is

+       * a reduced value and not what is expected in FogOption

+       */

+      p.program->FogOption = ctx->Fog.Mode;

+      p.program->Base.InputsRead |= FRAG_BIT_FOGC;

+   }

+   else {

+      p.program->FogOption = GL_NONE;

+   }

+

+   if (p.program->Base.NumTexIndirections > ctx->Const.FragmentProgram.MaxTexIndirections) 

+      program_error(&p, "Exceeded max nr indirect texture lookups");

+

+   if (p.program->Base.NumTexInstructions > ctx->Const.FragmentProgram.MaxTexInstructions)

+      program_error(&p, "Exceeded max TEX instructions");

+

+   if (p.program->Base.NumAluInstructions > ctx->Const.FragmentProgram.MaxAluInstructions)

+      program_error(&p, "Exceeded max ALU instructions");

+

+   ASSERT(p.program->Base.NumInstructions <= MAX_INSTRUCTIONS);

+

+   /* Allocate final instruction array */

+   p.program->Base.Instructions

+      = _mesa_alloc_instructions(p.program->Base.NumInstructions);

+   if (!p.program->Base.Instructions) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY,

+                  "generating tex env program");

+      return;

+   }

+   _mesa_copy_instructions(p.program->Base.Instructions, instBuffer,

+                           p.program->Base.NumInstructions);

+

+   if (key->num_draw_buffers && p.program->FogOption) {

+      _mesa_append_fog_code(ctx, p.program, GL_FALSE);

+      p.program->FogOption = GL_NONE;

+   }

+

+

+   /* Notify driver the fragment program has (actually) changed.

+    */

+   if (ctx->Driver.ProgramStringNotify) {

+      GLboolean ok = ctx->Driver.ProgramStringNotify(ctx,

+                                                     GL_FRAGMENT_PROGRAM_ARB, 

+                                                     &p.program->Base);

+      /* Driver should be able to handle any texenv programs as long as

+       * the driver correctly reported max number of texture units correctly,

+       * etc.

+       */

+      ASSERT(ok);

+      (void) ok; /* silence unused var warning */

+   }

+

+   if (DISASSEM) {

+      _mesa_print_program(&p.program->Base);

+      printf("\n");

+   }

+}

+

+extern "C" {

+

+/**

+ * Return a fragment program which implements the current

+ * fixed-function texture, fog and color-sum operations.

+ */

+struct gl_fragment_program *

+_mesa_get_fixed_func_fragment_program(struct gl_context *ctx)

+{

+   struct gl_fragment_program *prog;

+   struct state_key key;

+   GLuint keySize;

+	

+   keySize = make_state_key(ctx, &key);

+      

+   prog = (struct gl_fragment_program *)

+      _mesa_search_program_cache(ctx->FragmentProgram.Cache,

+                                 &key, keySize);

+

+   if (!prog) {

+      prog = (struct gl_fragment_program *) 

+         ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);

+

+      create_new_program(ctx, &key, prog);

+

+      _mesa_program_cache_insert(ctx, ctx->FragmentProgram.Cache,

+                                 &key, keySize, &prog->Base);

+   }

+

+   return prog;

+}

+

+}

diff --git a/mesalib/src/mesa/main/fog.c b/mesalib/src/mesa/main/fog.c
index 88aa31a7f..cc3c9d12f 100644
--- a/mesalib/src/mesa/main/fog.c
+++ b/mesalib/src/mesa/main/fog.c
@@ -1,204 +1,204 @@
-/*
- * Mesa 3-D graphics library
- * Version:  5.1
- *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#include "glheader.h"
-#include "colormac.h"
-#include "context.h"
-#include "fog.h"
-#include "macros.h"
-#include "mtypes.h"
-
-
-
-void GLAPIENTRY
-_mesa_Fogf(GLenum pname, GLfloat param)
-{
-   GLfloat fparam[4];
-   fparam[0] = param;
-   fparam[1] = fparam[2] = fparam[3] = 0.0F;
-   _mesa_Fogfv(pname, fparam);
-}
-
-
-void GLAPIENTRY
-_mesa_Fogi(GLenum pname, GLint param )
-{
-   GLfloat fparam[4];
-   fparam[0] = (GLfloat) param;
-   fparam[1] = fparam[2] = fparam[3] = 0.0F;
-   _mesa_Fogfv(pname, fparam);
-}
-
-
-void GLAPIENTRY
-_mesa_Fogiv(GLenum pname, const GLint *params )
-{
-   GLfloat p[4];
-   switch (pname) {
-      case GL_FOG_MODE:
-      case GL_FOG_DENSITY:
-      case GL_FOG_START:
-      case GL_FOG_END:
-      case GL_FOG_INDEX:
-      case GL_FOG_COORDINATE_SOURCE_EXT:
-	 p[0] = (GLfloat) *params;
-	 break;
-      case GL_FOG_COLOR:
-	 p[0] = INT_TO_FLOAT( params[0] );
-	 p[1] = INT_TO_FLOAT( params[1] );
-	 p[2] = INT_TO_FLOAT( params[2] );
-	 p[3] = INT_TO_FLOAT( params[3] );
-	 break;
-      default:
-         /* Error will be caught later in _mesa_Fogfv */
-         ASSIGN_4V(p, 0.0F, 0.0F, 0.0F, 0.0F);
-   }
-   _mesa_Fogfv(pname, p);
-}
-
-
-/**
- * Update the gl_fog_attrib::_Scale field.
- */
-static void
-update_fog_scale(struct gl_context *ctx)
-{
-   if (ctx->Fog.End == ctx->Fog.Start)
-      ctx->Fog._Scale = 1.0f;
-   else
-      ctx->Fog._Scale = 1.0f / (ctx->Fog.End - ctx->Fog.Start);
-}
-
-
-void GLAPIENTRY
-_mesa_Fogfv( GLenum pname, const GLfloat *params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLenum m;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (pname) {
-      case GL_FOG_MODE:
-         m = (GLenum) (GLint) *params;
-	 switch (m) {
-	 case GL_LINEAR:
-	 case GL_EXP:
-	 case GL_EXP2:
-	    break;
-	 default:
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glFog" );
-            return;
-	 }
-	 if (ctx->Fog.Mode == m)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_FOG);
-	 ctx->Fog.Mode = m;
-	 break;
-      case GL_FOG_DENSITY:
-	 if (*params<0.0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glFog" );
-            return;
-	 }
-	 if (ctx->Fog.Density == *params)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_FOG);
-	 ctx->Fog.Density = *params;
-	 break;
-      case GL_FOG_START:
-         if (ctx->Fog.Start == *params)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_FOG);
-         ctx->Fog.Start = *params;
-         update_fog_scale(ctx);
-         break;
-      case GL_FOG_END:
-         if (ctx->Fog.End == *params)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_FOG);
-         ctx->Fog.End = *params;
-         update_fog_scale(ctx);
-         break;
-      case GL_FOG_INDEX:
- 	 if (ctx->Fog.Index == *params)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_FOG);
- 	 ctx->Fog.Index = *params;
-	 break;
-      case GL_FOG_COLOR:
-	 if (TEST_EQ_4V(ctx->Fog.Color, params))
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_FOG);
-	 ctx->Fog.ColorUnclamped[0] = params[0];
-	 ctx->Fog.ColorUnclamped[1] = params[1];
-	 ctx->Fog.ColorUnclamped[2] = params[2];
-	 ctx->Fog.ColorUnclamped[3] = params[3];
-	 ctx->Fog.Color[0] = CLAMP(params[0], 0.0F, 1.0F);
-	 ctx->Fog.Color[1] = CLAMP(params[1], 0.0F, 1.0F);
-	 ctx->Fog.Color[2] = CLAMP(params[2], 0.0F, 1.0F);
-	 ctx->Fog.Color[3] = CLAMP(params[3], 0.0F, 1.0F);
-         break;
-      case GL_FOG_COORDINATE_SOURCE_EXT: {
-	 GLenum p = (GLenum) (GLint) *params;
-         if (!ctx->Extensions.EXT_fog_coord ||
-             (p != GL_FOG_COORDINATE_EXT && p != GL_FRAGMENT_DEPTH_EXT)) {
-	    _mesa_error(ctx, GL_INVALID_ENUM, "glFog");
-	    return;
-	 }
-	 if (ctx->Fog.FogCoordinateSource == p)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_FOG);
-	 ctx->Fog.FogCoordinateSource = p;
-	 break;
-      }
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glFog" );
-         return;
-   }
-
-   if (ctx->Driver.Fogfv) {
-      (*ctx->Driver.Fogfv)( ctx, pname, params );
-   }
-}
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-void _mesa_init_fog( struct gl_context * ctx )
-{
-   /* Fog group */
-   ctx->Fog.Enabled = GL_FALSE;
-   ctx->Fog.Mode = GL_EXP;
-   ASSIGN_4V( ctx->Fog.Color, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( ctx->Fog.ColorUnclamped, 0.0, 0.0, 0.0, 0.0 );
-   ctx->Fog.Index = 0.0;
-   ctx->Fog.Density = 1.0;
-   ctx->Fog.Start = 0.0;
-   ctx->Fog.End = 1.0;
-   ctx->Fog.ColorSumEnabled = GL_FALSE;
-   ctx->Fog.FogCoordinateSource = GL_FRAGMENT_DEPTH_EXT;
-   ctx->Fog._Scale = 1.0f;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  5.1

+ *

+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include "glheader.h"

+#include "colormac.h"

+#include "context.h"

+#include "fog.h"

+#include "macros.h"

+#include "mtypes.h"

+

+

+

+void GLAPIENTRY

+_mesa_Fogf(GLenum pname, GLfloat param)

+{

+   GLfloat fparam[4];

+   fparam[0] = param;

+   fparam[1] = fparam[2] = fparam[3] = 0.0F;

+   _mesa_Fogfv(pname, fparam);

+}

+

+

+void GLAPIENTRY

+_mesa_Fogi(GLenum pname, GLint param )

+{

+   GLfloat fparam[4];

+   fparam[0] = (GLfloat) param;

+   fparam[1] = fparam[2] = fparam[3] = 0.0F;

+   _mesa_Fogfv(pname, fparam);

+}

+

+

+void GLAPIENTRY

+_mesa_Fogiv(GLenum pname, const GLint *params )

+{

+   GLfloat p[4];

+   switch (pname) {

+      case GL_FOG_MODE:

+      case GL_FOG_DENSITY:

+      case GL_FOG_START:

+      case GL_FOG_END:

+      case GL_FOG_INDEX:

+      case GL_FOG_COORDINATE_SOURCE_EXT:

+	 p[0] = (GLfloat) *params;

+	 break;

+      case GL_FOG_COLOR:

+	 p[0] = INT_TO_FLOAT( params[0] );

+	 p[1] = INT_TO_FLOAT( params[1] );

+	 p[2] = INT_TO_FLOAT( params[2] );

+	 p[3] = INT_TO_FLOAT( params[3] );

+	 break;

+      default:

+         /* Error will be caught later in _mesa_Fogfv */

+         ASSIGN_4V(p, 0.0F, 0.0F, 0.0F, 0.0F);

+   }

+   _mesa_Fogfv(pname, p);

+}

+

+

+/**

+ * Update the gl_fog_attrib::_Scale field.

+ */

+static void

+update_fog_scale(struct gl_context *ctx)

+{

+   if (ctx->Fog.End == ctx->Fog.Start)

+      ctx->Fog._Scale = 1.0f;

+   else

+      ctx->Fog._Scale = 1.0f / (ctx->Fog.End - ctx->Fog.Start);

+}

+

+

+void GLAPIENTRY

+_mesa_Fogfv( GLenum pname, const GLfloat *params )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLenum m;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   switch (pname) {

+      case GL_FOG_MODE:

+         m = (GLenum) (GLint) *params;

+	 switch (m) {

+	 case GL_LINEAR:

+	 case GL_EXP:

+	 case GL_EXP2:

+	    break;

+	 default:

+	    _mesa_error( ctx, GL_INVALID_ENUM, "glFog" );

+            return;

+	 }

+	 if (ctx->Fog.Mode == m)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_FOG);

+	 ctx->Fog.Mode = m;

+	 break;

+      case GL_FOG_DENSITY:

+	 if (*params<0.0) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glFog" );

+            return;

+	 }

+	 if (ctx->Fog.Density == *params)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_FOG);

+	 ctx->Fog.Density = *params;

+	 break;

+      case GL_FOG_START:

+         if (ctx->Fog.Start == *params)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_FOG);

+         ctx->Fog.Start = *params;

+         update_fog_scale(ctx);

+         break;

+      case GL_FOG_END:

+         if (ctx->Fog.End == *params)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_FOG);

+         ctx->Fog.End = *params;

+         update_fog_scale(ctx);

+         break;

+      case GL_FOG_INDEX:

+ 	 if (ctx->Fog.Index == *params)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_FOG);

+ 	 ctx->Fog.Index = *params;

+	 break;

+      case GL_FOG_COLOR:

+	 if (TEST_EQ_4V(ctx->Fog.Color, params))

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_FOG);

+	 ctx->Fog.ColorUnclamped[0] = params[0];

+	 ctx->Fog.ColorUnclamped[1] = params[1];

+	 ctx->Fog.ColorUnclamped[2] = params[2];

+	 ctx->Fog.ColorUnclamped[3] = params[3];

+	 ctx->Fog.Color[0] = CLAMP(params[0], 0.0F, 1.0F);

+	 ctx->Fog.Color[1] = CLAMP(params[1], 0.0F, 1.0F);

+	 ctx->Fog.Color[2] = CLAMP(params[2], 0.0F, 1.0F);

+	 ctx->Fog.Color[3] = CLAMP(params[3], 0.0F, 1.0F);

+         break;

+      case GL_FOG_COORDINATE_SOURCE_EXT: {

+	 GLenum p = (GLenum) (GLint) *params;

+         if (!ctx->Extensions.EXT_fog_coord ||

+             (p != GL_FOG_COORDINATE_EXT && p != GL_FRAGMENT_DEPTH_EXT)) {

+	    _mesa_error(ctx, GL_INVALID_ENUM, "glFog");

+	    return;

+	 }

+	 if (ctx->Fog.FogCoordinateSource == p)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_FOG);

+	 ctx->Fog.FogCoordinateSource = p;

+	 break;

+      }

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glFog" );

+         return;

+   }

+

+   if (ctx->Driver.Fogfv) {

+      (*ctx->Driver.Fogfv)( ctx, pname, params );

+   }

+}

+

+

+/**********************************************************************/

+/*****                      Initialization                        *****/

+/**********************************************************************/

+

+void _mesa_init_fog( struct gl_context * ctx )

+{

+   /* Fog group */

+   ctx->Fog.Enabled = GL_FALSE;

+   ctx->Fog.Mode = GL_EXP;

+   ASSIGN_4V( ctx->Fog.Color, 0.0, 0.0, 0.0, 0.0 );

+   ASSIGN_4V( ctx->Fog.ColorUnclamped, 0.0, 0.0, 0.0, 0.0 );

+   ctx->Fog.Index = 0.0;

+   ctx->Fog.Density = 1.0;

+   ctx->Fog.Start = 0.0;

+   ctx->Fog.End = 1.0;

+   ctx->Fog.ColorSumEnabled = GL_FALSE;

+   ctx->Fog.FogCoordinateSource = GL_FRAGMENT_DEPTH_EXT;

+   ctx->Fog._Scale = 1.0f;

+}

diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index e62170b71..8d2d4bfc1 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -1,1780 +1,1780 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.7
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (c) 2008-2009  VMware, Inc.
- *
- * 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
- * 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.
- */
-
-
-#include "imports.h"
-#include "formats.h"
-#include "mfeatures.h"
-
-
-/**
- * Information about texture formats.
- */
-struct gl_format_info
-{
-   gl_format Name;
-
-   /** text name for debugging */
-   const char *StrName;
-
-   /**
-    * Base format is one of GL_RED, GL_RG, GL_RGB, GL_RGBA, GL_ALPHA,
-    * GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_YCBCR_MESA,
-    * GL_COLOR_INDEX, GL_DEPTH_COMPONENT, GL_STENCIL_INDEX,
-    * GL_DEPTH_STENCIL, GL_DUDV_ATI.
-    */
-   GLenum BaseFormat;
-
-   /**
-    * Logical data type: one of  GL_UNSIGNED_NORMALIZED, GL_SIGNED_NORMALED,
-    * GL_UNSIGNED_INT, GL_INT, GL_FLOAT.
-    */
-   GLenum DataType;
-
-   GLubyte RedBits;
-   GLubyte GreenBits;
-   GLubyte BlueBits;
-   GLubyte AlphaBits;
-   GLubyte LuminanceBits;
-   GLubyte IntensityBits;
-   GLubyte IndexBits;
-   GLubyte DepthBits;
-   GLubyte StencilBits;
-
-   /**
-    * To describe compressed formats.  If not compressed, Width=Height=1.
-    */
-   GLubyte BlockWidth, BlockHeight;
-   GLubyte BytesPerBlock;
-};
-
-
-/**
- * Info about each format.
- * These must be in the same order as the MESA_FORMAT_* enums so that
- * we can do lookups without searching.
- */
-static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
-{
-   {
-      MESA_FORMAT_NONE,            /* Name */
-      "MESA_FORMAT_NONE",          /* StrName */
-      GL_NONE,                     /* BaseFormat */
-      GL_NONE,                     /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      0, 0, 0                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_RGBA8888,        /* Name */
-      "MESA_FORMAT_RGBA8888",      /* StrName */
-      GL_RGBA,                     /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      8, 8, 8, 8,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_RGBA8888_REV,    /* Name */
-      "MESA_FORMAT_RGBA8888_REV",  /* StrName */
-      GL_RGBA,                     /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      8, 8, 8, 8,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_ARGB8888,        /* Name */
-      "MESA_FORMAT_ARGB8888",      /* StrName */
-      GL_RGBA,                     /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      8, 8, 8, 8,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_ARGB8888_REV,    /* Name */
-      "MESA_FORMAT_ARGB8888_REV",  /* StrName */
-      GL_RGBA,                     /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      8, 8, 8, 8,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_XRGB8888,        /* Name */
-      "MESA_FORMAT_XRGB8888",      /* StrName */
-      GL_RGB,                      /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      8, 8, 8, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_XRGB8888_REV,    /* Name */
-      "MESA_FORMAT_XRGB8888_REV",  /* StrName */
-      GL_RGB,                      /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      8, 8, 8, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_RGB888,          /* Name */
-      "MESA_FORMAT_RGB888",        /* StrName */
-      GL_RGB,                      /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      8, 8, 8, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 3                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_BGR888,          /* Name */
-      "MESA_FORMAT_BGR888",        /* StrName */
-      GL_RGB,                      /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      8, 8, 8, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 3                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_RGB565,          /* Name */
-      "MESA_FORMAT_RGB565",        /* StrName */
-      GL_RGB,                      /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      5, 6, 5, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_RGB565_REV,      /* Name */
-      "MESA_FORMAT_RGB565_REV",    /* StrName */
-      GL_RGB,                      /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      5, 6, 5, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_ARGB4444,        /* Name */
-      "MESA_FORMAT_ARGB4444",      /* StrName */
-      GL_RGBA,                     /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      4, 4, 4, 4,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_ARGB4444_REV,    /* Name */
-      "MESA_FORMAT_ARGB4444_REV",  /* StrName */
-      GL_RGBA,                     /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      4, 4, 4, 4,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_RGBA5551,        /* Name */
-      "MESA_FORMAT_RGBA5551",      /* StrName */
-      GL_RGBA,                     /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      5, 5, 5, 1,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_ARGB1555,        /* Name */
-      "MESA_FORMAT_ARGB1555",      /* StrName */
-      GL_RGBA,                     /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      5, 5, 5, 1,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_ARGB1555_REV,    /* Name */
-      "MESA_FORMAT_ARGB1555_REV",  /* StrName */
-      GL_RGBA,                     /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      5, 5, 5, 1,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_AL44,            /* Name */
-      "MESA_FORMAT_AL44",          /* StrName */
-      GL_LUMINANCE_ALPHA,          /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 4,                  /* Red/Green/Blue/AlphaBits */
-      4, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 1                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_AL88,            /* Name */
-      "MESA_FORMAT_AL88",          /* StrName */
-      GL_LUMINANCE_ALPHA,          /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 8,                  /* Red/Green/Blue/AlphaBits */
-      8, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_AL88_REV,        /* Name */
-      "MESA_FORMAT_AL88_REV",      /* StrName */
-      GL_LUMINANCE_ALPHA,          /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 8,                  /* Red/Green/Blue/AlphaBits */
-      8, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_AL1616,          /* Name */
-      "MESA_FORMAT_AL1616",        /* StrName */
-      GL_LUMINANCE_ALPHA,          /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 16,                 /* Red/Green/Blue/AlphaBits */
-      16, 0, 0, 0, 0,              /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_AL1616_REV,      /* Name */
-      "MESA_FORMAT_AL1616_REV",    /* StrName */
-      GL_LUMINANCE_ALPHA,          /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 16,                 /* Red/Green/Blue/AlphaBits */
-      16, 0, 0, 0, 0,              /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_RGB332,          /* Name */
-      "MESA_FORMAT_RGB332",        /* StrName */
-      GL_RGB,                      /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      3, 3, 2, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 1                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_A8,              /* Name */
-      "MESA_FORMAT_A8",            /* StrName */
-      GL_ALPHA,                    /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 8,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 1                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_A16,             /* Name */
-      "MESA_FORMAT_A16",           /* StrName */
-      GL_ALPHA,                    /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 16,                 /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_L8,              /* Name */
-      "MESA_FORMAT_L8",            /* StrName */
-      GL_LUMINANCE,                /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      8, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 1                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_L16,             /* Name */
-      "MESA_FORMAT_L16",           /* StrName */
-      GL_LUMINANCE,                /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      16, 0, 0, 0, 0,              /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_I8,              /* Name */
-      "MESA_FORMAT_I8",            /* StrName */
-      GL_INTENSITY,                /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 8, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 1                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_I16,             /* Name */
-      "MESA_FORMAT_I16",           /* StrName */
-      GL_INTENSITY,                /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 16, 0, 0, 0,              /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_CI8,             /* Name */
-      "MESA_FORMAT_CI8",           /* StrName */
-      GL_COLOR_INDEX,              /* BaseFormat */
-      GL_UNSIGNED_INT,             /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 8, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 1                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_YCBCR,           /* Name */
-      "MESA_FORMAT_YCBCR",         /* StrName */
-      GL_YCBCR_MESA,               /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_YCBCR_REV,       /* Name */
-      "MESA_FORMAT_YCBCR_REV",     /* StrName */
-      GL_YCBCR_MESA,               /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_R8,
-      "MESA_FORMAT_R8",
-      GL_RED,
-      GL_UNSIGNED_NORMALIZED,
-      8, 0, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 1
-   },
-   {
-      MESA_FORMAT_RG88,
-      "MESA_FORMAT_RG88",
-      GL_RG,
-      GL_UNSIGNED_NORMALIZED,
-      8, 8, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_RG88_REV,
-      "MESA_FORMAT_RG88_REV",
-      GL_RG,
-      GL_UNSIGNED_NORMALIZED,
-      8, 8, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_R16,
-      "MESA_FORMAT_R16",
-      GL_RED,
-      GL_UNSIGNED_NORMALIZED,
-      16, 0, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_RG1616,
-      "MESA_FORMAT_RG1616",
-      GL_RG,
-      GL_UNSIGNED_NORMALIZED,
-      16, 16, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_RG1616_REV,
-      "MESA_FORMAT_RG1616_REV",
-      GL_RG,
-      GL_UNSIGNED_NORMALIZED,
-      16, 16, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_ARGB2101010,
-      "MESA_FORMAT_ARGB2101010",
-      GL_RGBA,
-      GL_UNSIGNED_NORMALIZED,
-      10, 10, 10, 2,
-      0, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_Z24_S8,          /* Name */
-      "MESA_FORMAT_Z24_S8",        /* StrName */
-      GL_DEPTH_STENCIL,            /* BaseFormat */
-      GL_UNSIGNED_INT,             /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 24, 8,              /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_S8_Z24,          /* Name */
-      "MESA_FORMAT_S8_Z24",        /* StrName */
-      GL_DEPTH_STENCIL,            /* BaseFormat */
-      GL_UNSIGNED_INT,             /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 24, 8,              /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_Z16,             /* Name */
-      "MESA_FORMAT_Z16",           /* StrName */
-      GL_DEPTH_COMPONENT,          /* BaseFormat */
-      GL_UNSIGNED_INT,             /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 16, 0,              /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 2                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_X8_Z24,          /* Name */
-      "MESA_FORMAT_X8_Z24",        /* StrName */
-      GL_DEPTH_COMPONENT,          /* BaseFormat */
-      GL_UNSIGNED_INT,             /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 24, 0,              /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_Z24_X8,          /* Name */
-      "MESA_FORMAT_Z24_X8",        /* StrName */
-      GL_DEPTH_COMPONENT,          /* BaseFormat */
-      GL_UNSIGNED_INT,             /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 24, 0,              /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_Z32,             /* Name */
-      "MESA_FORMAT_Z32",           /* StrName */
-      GL_DEPTH_COMPONENT,          /* BaseFormat */
-      GL_UNSIGNED_INT,             /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 32, 0,              /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 4                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_S8,              /* Name */
-      "MESA_FORMAT_S8",            /* StrName */
-      GL_STENCIL_INDEX,            /* BaseFormat */
-      GL_UNSIGNED_INT,             /* DataType */
-      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 8,               /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 1                      /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_SRGB8,
-      "MESA_FORMAT_SRGB8",
-      GL_RGB,
-      GL_UNSIGNED_NORMALIZED,
-      8, 8, 8, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 3
-   },
-   {
-      MESA_FORMAT_SRGBA8,
-      "MESA_FORMAT_SRGBA8",
-      GL_RGBA,
-      GL_UNSIGNED_NORMALIZED,    
-      8, 8, 8, 8,
-      0, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_SARGB8,
-      "MESA_FORMAT_SARGB8",
-      GL_RGBA,
-      GL_UNSIGNED_NORMALIZED,    
-      8, 8, 8, 8,
-      0, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_SL8,
-      "MESA_FORMAT_SL8",
-      GL_LUMINANCE,
-      GL_UNSIGNED_NORMALIZED,    
-      0, 0, 0, 0,
-      8, 0, 0, 0, 0,
-      1, 1, 1
-   },
-   {
-      MESA_FORMAT_SLA8,
-      "MESA_FORMAT_SLA8",
-      GL_LUMINANCE_ALPHA,
-      GL_UNSIGNED_NORMALIZED,    
-      0, 0, 0, 8,
-      8, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_SRGB_DXT1,       /* Name */
-      "MESA_FORMAT_SRGB_DXT1",     /* StrName */
-      GL_RGB,                      /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      4, 4, 4, 0,                  /* approx Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      4, 4, 8                      /* 8 bytes per 4x4 block */
-   },
-   {
-      MESA_FORMAT_SRGBA_DXT1,
-      "MESA_FORMAT_SRGBA_DXT1",
-      GL_RGBA,
-      GL_UNSIGNED_NORMALIZED,
-      4, 4, 4, 4,
-      0, 0, 0, 0, 0,
-      4, 4, 8                      /* 8 bytes per 4x4 block */
-   },
-   {
-      MESA_FORMAT_SRGBA_DXT3,
-      "MESA_FORMAT_SRGBA_DXT3",
-      GL_RGBA,
-      GL_UNSIGNED_NORMALIZED,
-      4, 4, 4, 4,
-      0, 0, 0, 0, 0,
-      4, 4, 16                     /* 16 bytes per 4x4 block */
-   },
-   {
-      MESA_FORMAT_SRGBA_DXT5,
-      "MESA_FORMAT_SRGBA_DXT5",
-      GL_RGBA,
-      GL_UNSIGNED_NORMALIZED,
-      4, 4, 4, 4,
-      0, 0, 0, 0, 0,
-      4, 4, 16                     /* 16 bytes per 4x4 block */
-   },
-
-   {
-      MESA_FORMAT_RGB_FXT1,
-      "MESA_FORMAT_RGB_FXT1",
-      GL_RGB,
-      GL_UNSIGNED_NORMALIZED,
-      4, 4, 4, 0,                  /* approx Red/Green/BlueBits */
-      0, 0, 0, 0, 0,
-      8, 4, 16                     /* 16 bytes per 8x4 block */
-   },
-   {
-      MESA_FORMAT_RGBA_FXT1,
-      "MESA_FORMAT_RGBA_FXT1",
-      GL_RGBA,
-      GL_UNSIGNED_NORMALIZED,
-      4, 4, 4, 1,                  /* approx Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,
-      8, 4, 16                     /* 16 bytes per 8x4 block */
-   },
-
-   {
-      MESA_FORMAT_RGB_DXT1,        /* Name */
-      "MESA_FORMAT_RGB_DXT1",      /* StrName */
-      GL_RGB,                      /* BaseFormat */
-      GL_UNSIGNED_NORMALIZED,      /* DataType */
-      4, 4, 4, 0,                  /* approx Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */
-      4, 4, 8                      /* 8 bytes per 4x4 block */
-   },
-   {
-      MESA_FORMAT_RGBA_DXT1,
-      "MESA_FORMAT_RGBA_DXT1",
-      GL_RGBA,
-      GL_UNSIGNED_NORMALIZED,    
-      4, 4, 4, 4,
-      0, 0, 0, 0, 0,
-      4, 4, 8                      /* 8 bytes per 4x4 block */
-   },
-   {
-      MESA_FORMAT_RGBA_DXT3,
-      "MESA_FORMAT_RGBA_DXT3",
-      GL_RGBA,
-      GL_UNSIGNED_NORMALIZED,    
-      4, 4, 4, 4,
-      0, 0, 0, 0, 0,
-      4, 4, 16                     /* 16 bytes per 4x4 block */
-   },
-   {
-      MESA_FORMAT_RGBA_DXT5,
-      "MESA_FORMAT_RGBA_DXT5",
-      GL_RGBA,
-      GL_UNSIGNED_NORMALIZED,    
-      4, 4, 4, 4,
-      0, 0, 0, 0, 0,
-      4, 4, 16                     /* 16 bytes per 4x4 block */
-   },
-   {
-      MESA_FORMAT_RGBA_FLOAT32,
-      "MESA_FORMAT_RGBA_FLOAT32",
-      GL_RGBA,
-      GL_FLOAT,
-      32, 32, 32, 32,
-      0, 0, 0, 0, 0,
-      1, 1, 16
-   },
-   {
-      MESA_FORMAT_RGBA_FLOAT16,
-      "MESA_FORMAT_RGBA_FLOAT16",
-      GL_RGBA,
-      GL_FLOAT,
-      16, 16, 16, 16,
-      0, 0, 0, 0, 0,
-      1, 1, 8
-   },
-   {
-      MESA_FORMAT_RGB_FLOAT32,
-      "MESA_FORMAT_RGB_FLOAT32",
-      GL_RGB,
-      GL_FLOAT,
-      32, 32, 32, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 12
-   },
-   {
-      MESA_FORMAT_RGB_FLOAT16,
-      "MESA_FORMAT_RGB_FLOAT16",
-      GL_RGB,
-      GL_FLOAT,
-      16, 16, 16, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 6
-   },
-   {
-      MESA_FORMAT_ALPHA_FLOAT32,
-      "MESA_FORMAT_ALPHA_FLOAT32",
-      GL_ALPHA,
-      GL_FLOAT,
-      0, 0, 0, 32,
-      0, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_ALPHA_FLOAT16,
-      "MESA_FORMAT_ALPHA_FLOAT16",
-      GL_ALPHA,
-      GL_FLOAT,
-      0, 0, 0, 16,
-      0, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_LUMINANCE_FLOAT32,
-      "MESA_FORMAT_LUMINANCE_FLOAT32",
-      GL_ALPHA,
-      GL_FLOAT,
-      0, 0, 0, 0,
-      32, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_LUMINANCE_FLOAT16,
-      "MESA_FORMAT_LUMINANCE_FLOAT16",
-      GL_ALPHA,
-      GL_FLOAT,
-      0, 0, 0, 0,
-      16, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,
-      "MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32",
-      GL_LUMINANCE_ALPHA,
-      GL_FLOAT,
-      0, 0, 0, 32,
-      32, 0, 0, 0, 0,
-      1, 1, 8
-   },
-   {
-      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,
-      "MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16",
-      GL_LUMINANCE_ALPHA,
-      GL_FLOAT,
-      0, 0, 0, 16,
-      16, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_INTENSITY_FLOAT32,
-      "MESA_FORMAT_INTENSITY_FLOAT32",
-      GL_INTENSITY,
-      GL_FLOAT,
-      0, 0, 0, 0,
-      0, 32, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_INTENSITY_FLOAT16,
-      "MESA_FORMAT_INTENSITY_FLOAT16",
-      GL_INTENSITY,
-      GL_FLOAT,
-      0, 0, 0, 0,
-      0, 16, 0, 0, 0,
-      1, 1, 2
-   },
-
-   /* unnormalized signed int formats */
-   {
-      MESA_FORMAT_RGBA_INT8,
-      "MESA_FORMAT_RGBA_INT8",
-      GL_RGBA,
-      GL_INT,
-      8, 8, 8, 8,
-      0, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_RGBA_INT16,
-      "MESA_FORMAT_RGBA_INT16",
-      GL_RGBA,
-      GL_INT,
-      16, 16, 16, 16,
-      0, 0, 0, 0, 0,
-      1, 1, 8
-   },
-   {
-      MESA_FORMAT_RGBA_INT32,
-      "MESA_FORMAT_RGBA_INT32",
-      GL_RGBA,
-      GL_INT,
-      32, 32, 32, 32,
-      0, 0, 0, 0, 0,
-      1, 1, 16
-   },
-
-   /* unnormalized unsigned int formats */
-   {
-      MESA_FORMAT_RGBA_UINT8,
-      "MESA_FORMAT_RGBA_UINT8",
-      GL_RGBA,
-      GL_UNSIGNED_INT,
-      8, 8, 8, 8,
-      0, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_RGBA_UINT16,
-      "MESA_FORMAT_RGBA_UINT16",
-      GL_RGBA,
-      GL_UNSIGNED_INT,
-      16, 16, 16, 16,
-      0, 0, 0, 0, 0,
-      1, 1, 8
-   },
-   {
-      MESA_FORMAT_RGBA_UINT32,
-      "MESA_FORMAT_RGBA_UINT32",
-      GL_RGBA,
-      GL_UNSIGNED_INT,
-      32, 32, 32, 32,
-      0, 0, 0, 0, 0,
-      1, 1, 16
-   },
-
-
-   {
-      MESA_FORMAT_DUDV8,
-      "MESA_FORMAT_DUDV8",
-      GL_DUDV_ATI,
-      GL_SIGNED_NORMALIZED,
-      0, 0, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 2
-   },
-
-   /* Signed 8 bits / channel */
-   {
-      MESA_FORMAT_SIGNED_R8,        /* Name */
-      "MESA_FORMAT_SIGNED_R8",      /* StrName */
-      GL_RED,                       /* BaseFormat */
-      GL_SIGNED_NORMALIZED,         /* DataType */
-      8, 0, 0, 0,                   /* Red/Green/Blue/AlphaBits */
-      0, 0, 0, 0, 0,                /* Lum/Int/Index/Depth/StencilBits */
-      1, 1, 1                       /* BlockWidth/Height,Bytes */
-   },
-   {
-      MESA_FORMAT_SIGNED_RG88_REV,
-      "MESA_FORMAT_SIGNED_RG88_REV",
-      GL_RG,
-      GL_SIGNED_NORMALIZED,
-      8, 8, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBX8888,
-      "MESA_FORMAT_SIGNED_RGBX8888",
-      GL_RGB,
-      GL_SIGNED_NORMALIZED,
-      8, 8, 8, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 4                       /* 4 bpp, but no alpha */
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBA8888,
-      "MESA_FORMAT_SIGNED_RGBA8888",
-      GL_RGBA,
-      GL_SIGNED_NORMALIZED,
-      8, 8, 8, 8,
-      0, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBA8888_REV,
-      "MESA_FORMAT_SIGNED_RGBA8888_REV",
-      GL_RGBA,
-      GL_SIGNED_NORMALIZED,
-      8, 8, 8, 8,
-      0, 0, 0, 0, 0,
-      1, 1, 4
-   },
-
-   /* Signed 16 bits / channel */
-   {
-      MESA_FORMAT_SIGNED_R16,
-      "MESA_FORMAT_SIGNED_R16",
-      GL_RED,
-      GL_SIGNED_NORMALIZED,
-      16, 0, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_SIGNED_GR1616,
-      "MESA_FORMAT_SIGNED_GR1616",
-      GL_RG,
-      GL_SIGNED_NORMALIZED,
-      16, 16, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_SIGNED_RGB_16,
-      "MESA_FORMAT_SIGNED_RGB_16",
-      GL_RGB,
-      GL_SIGNED_NORMALIZED,
-      16, 16, 16, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 6
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBA_16,
-      "MESA_FORMAT_SIGNED_RGBA_16",
-      GL_RGBA,
-      GL_SIGNED_NORMALIZED,
-      16, 16, 16, 16,
-      0, 0, 0, 0, 0,
-      1, 1, 8
-   },
-   {
-      MESA_FORMAT_RGBA_16,
-      "MESA_FORMAT_RGBA_16",
-      GL_RGBA,
-      GL_UNSIGNED_NORMALIZED,
-      16, 16, 16, 16,
-      0, 0, 0, 0, 0,
-      1, 1, 8
-   },
-   {
-     MESA_FORMAT_RED_RGTC1,
-     "MESA_FORMAT_RED_RGTC1",
-     GL_RED,
-     GL_UNSIGNED_NORMALIZED,
-     4, 0, 0, 0,
-     0, 0, 0, 0, 0,
-     4, 4, 8                     /* 8 bytes per 4x4 block */
-   },
-   {
-     MESA_FORMAT_SIGNED_RED_RGTC1,
-     "MESA_FORMAT_SIGNED_RED_RGTC1",
-     GL_RED,
-     GL_SIGNED_NORMALIZED,
-     4, 0, 0, 0,
-     0, 0, 0, 0, 0,
-     4, 4, 8                     /* 8 bytes per 4x4 block */
-   },
-   {
-     MESA_FORMAT_RG_RGTC2,
-     "MESA_FORMAT_RG_RGTC2",
-     GL_RG,
-     GL_UNSIGNED_NORMALIZED,
-     4, 4, 0, 0,
-     0, 0, 0, 0, 0,
-     4, 4, 16                     /* 16 bytes per 4x4 block */
-   },
-   {
-     MESA_FORMAT_SIGNED_RG_RGTC2,
-     "MESA_FORMAT_SIGNED_RG_RGTC2",
-     GL_RG,
-     GL_SIGNED_NORMALIZED,
-     4, 4, 0, 0,
-     0, 0, 0, 0, 0,
-     4, 4, 16                     /* 16 bytes per 4x4 block */
-   },
-   {
-     MESA_FORMAT_L_LATC1,
-     "MESA_FORMAT_L_LATC1",
-     GL_LUMINANCE,
-     GL_UNSIGNED_NORMALIZED,
-     0, 0, 0, 0,
-     4, 0, 0, 0, 0,
-     4, 4, 8                     /* 8 bytes per 4x4 block */
-   },
-   {
-     MESA_FORMAT_SIGNED_L_LATC1,
-     "MESA_FORMAT_SIGNED_L_LATC1",
-     GL_LUMINANCE,
-     GL_SIGNED_NORMALIZED,
-     0, 0, 0, 0,
-     4, 0, 0, 0, 0,
-     4, 4, 8                     /* 8 bytes per 4x4 block */
-   },
-   {
-     MESA_FORMAT_LA_LATC2,
-     "MESA_FORMAT_LA_LATC2",
-     GL_LUMINANCE_ALPHA,
-     GL_UNSIGNED_NORMALIZED,
-     0, 0, 0, 4,
-     4, 0, 0, 0, 0,
-     4, 4, 16                     /* 16 bytes per 4x4 block */
-   },
-   {
-     MESA_FORMAT_SIGNED_LA_LATC2,
-     "MESA_FORMAT_SIGNED_LA_LATC2",
-     GL_LUMINANCE_ALPHA,
-     GL_SIGNED_NORMALIZED,
-     0, 0, 0, 4,
-     4, 0, 0, 0, 0,
-     4, 4, 16                     /* 16 bytes per 4x4 block */
-   },
-
-   /* Signed formats from EXT_texture_snorm that are not in GL3.1 */
-   {
-      MESA_FORMAT_SIGNED_A8,
-      "MESA_FORMAT_SIGNED_A8",
-      GL_ALPHA,
-      GL_SIGNED_NORMALIZED,
-      0, 0, 0, 8,
-      0, 0, 0, 0, 0,
-      1, 1, 1
-   },
-   {
-      MESA_FORMAT_SIGNED_L8,
-      "MESA_FORMAT_SIGNED_L8",
-      GL_LUMINANCE,
-      GL_SIGNED_NORMALIZED,
-      0, 0, 0, 0,
-      8, 0, 0, 0, 0,
-      1, 1, 1
-   },
-   {
-      MESA_FORMAT_SIGNED_AL88,
-      "MESA_FORMAT_SIGNED_AL88",
-      GL_LUMINANCE_ALPHA,
-      GL_SIGNED_NORMALIZED,
-      0, 0, 0, 8,
-      8, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_SIGNED_I8,
-      "MESA_FORMAT_SIGNED_I8",
-      GL_INTENSITY,
-      GL_SIGNED_NORMALIZED,
-      0, 0, 0, 0,
-      0, 8, 0, 0, 0,
-      1, 1, 1
-   },
-   {
-      MESA_FORMAT_SIGNED_A16,
-      "MESA_FORMAT_SIGNED_A16",
-      GL_ALPHA,
-      GL_SIGNED_NORMALIZED,
-      0, 0, 0, 16,
-      0, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_SIGNED_L16,
-      "MESA_FORMAT_SIGNED_L16",
-      GL_LUMINANCE,
-      GL_SIGNED_NORMALIZED,
-      0, 0, 0, 0,
-      16, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_SIGNED_AL1616,
-      "MESA_FORMAT_SIGNED_AL1616",
-      GL_LUMINANCE_ALPHA,
-      GL_SIGNED_NORMALIZED,
-      0, 0, 0, 16,
-      16, 0, 0, 0, 0,
-      1, 1, 4
-   },
-   {
-      MESA_FORMAT_SIGNED_I16,
-      "MESA_FORMAT_SIGNED_I16",
-      GL_INTENSITY,
-      GL_SIGNED_NORMALIZED,
-      0, 0, 0, 0,
-      0, 16, 0, 0, 0,
-      1, 1, 2
-   }
-};
-
-
-
-static const struct gl_format_info *
-_mesa_get_format_info(gl_format format)
-{
-   const struct gl_format_info *info = &format_info[format];
-   assert(info->Name == format);
-   return info;
-}
-
-
-/** Return string name of format (for debugging) */
-const char *
-_mesa_get_format_name(gl_format format)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-   return info->StrName;
-}
-
-
-
-/**
- * Return bytes needed to store a block of pixels in the given format.
- * Normally, a block is 1x1 (a single pixel).  But for compressed formats
- * a block may be 4x4 or 8x4, etc.
- */
-GLuint
-_mesa_get_format_bytes(gl_format format)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-   ASSERT(info->BytesPerBlock);
-   return info->BytesPerBlock;
-}
-
-
-/**
- * Return bits per component for the given format.
- * \param format  one of MESA_FORMAT_x
- * \param pname  the component, such as GL_RED_BITS, GL_TEXTURE_BLUE_BITS, etc.
- */
-GLint
-_mesa_get_format_bits(gl_format format, GLenum pname)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-
-   switch (pname) {
-   case GL_RED_BITS:
-   case GL_TEXTURE_RED_SIZE:
-   case GL_RENDERBUFFER_RED_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:
-      return info->RedBits;
-   case GL_GREEN_BITS:
-   case GL_TEXTURE_GREEN_SIZE:
-   case GL_RENDERBUFFER_GREEN_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:
-      return info->GreenBits;
-   case GL_BLUE_BITS:
-   case GL_TEXTURE_BLUE_SIZE:
-   case GL_RENDERBUFFER_BLUE_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:
-      return info->BlueBits;
-   case GL_ALPHA_BITS:
-   case GL_TEXTURE_ALPHA_SIZE:
-   case GL_RENDERBUFFER_ALPHA_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE:
-      return info->AlphaBits;
-   case GL_TEXTURE_INTENSITY_SIZE:
-      return info->IntensityBits;
-   case GL_TEXTURE_LUMINANCE_SIZE:
-      return info->LuminanceBits;
-   case GL_INDEX_BITS:
-   case GL_TEXTURE_INDEX_SIZE_EXT:
-      return info->IndexBits;
-   case GL_DEPTH_BITS:
-   case GL_TEXTURE_DEPTH_SIZE_ARB:
-   case GL_RENDERBUFFER_DEPTH_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE:
-      return info->DepthBits;
-   case GL_STENCIL_BITS:
-   case GL_TEXTURE_STENCIL_SIZE_EXT:
-   case GL_RENDERBUFFER_STENCIL_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE:
-      return info->StencilBits;
-   default:
-      _mesa_problem(NULL, "bad pname in _mesa_get_format_bits()");
-      return 0;
-   }
-}
-
-
-/**
- * Return the data type (or more specifically, the data representation)
- * for the given format.
- * The return value will be one of:
- *    GL_UNSIGNED_NORMALIZED = unsigned int representing [0,1]
- *    GL_SIGNED_NORMALIZED = signed int representing [-1, 1]
- *    GL_UNSIGNED_INT = an ordinary unsigned integer
- *    GL_INT = an ordinary signed integer
- *    GL_FLOAT = an ordinary float
- */
-GLenum
-_mesa_get_format_datatype(gl_format format)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-   return info->DataType;
-}
-
-
-/**
- * Return the basic format for the given type.  The result will be
- * one of GL_RGB, GL_RGBA, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA,
- * GL_INTENSITY, GL_YCBCR_MESA, GL_COLOR_INDEX, GL_DEPTH_COMPONENT,
- * GL_STENCIL_INDEX, GL_DEPTH_STENCIL.
- */
-GLenum
-_mesa_get_format_base_format(gl_format format)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-   return info->BaseFormat;
-}
-
-
-/**
- * Return the block size (in pixels) for the given format.  Normally
- * the block size is 1x1.  But compressed formats will have block sizes
- * of 4x4 or 8x4 pixels, etc.
- * \param bw  returns block width in pixels
- * \param bh  returns block height in pixels
- */
-void
-_mesa_get_format_block_size(gl_format format, GLuint *bw, GLuint *bh)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-   *bw = info->BlockWidth;
-   *bh = info->BlockHeight;
-}
-
-
-/** Is the given format a compressed format? */
-GLboolean
-_mesa_is_format_compressed(gl_format format)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-   return info->BlockWidth > 1 || info->BlockHeight > 1;
-}
-
-
-/**
- * Determine if the given format represents a packed depth/stencil buffer.
- */
-GLboolean
-_mesa_is_format_packed_depth_stencil(gl_format format)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-
-   return info->BaseFormat == GL_DEPTH_STENCIL;
-}
-
-
-/**
- * Is the given format a signed/unsigned integer color format?
- */
-GLboolean
-_mesa_is_format_integer_color(gl_format format)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-   return (info->DataType == GL_INT || info->DataType == GL_UNSIGNED_INT) &&
-      info->BaseFormat != GL_DEPTH_COMPONENT &&
-      info->BaseFormat != GL_DEPTH_STENCIL &&
-      info->BaseFormat != GL_STENCIL_INDEX;
-}
-
-
-/**
- * Return color encoding for given format.
- * \return GL_LINEAR or GL_SRGB
- */
-GLenum
-_mesa_get_format_color_encoding(gl_format format)
-{
-   /* XXX this info should be encoded in gl_format_info */
-   switch (format) {
-   case MESA_FORMAT_SRGB8:
-   case MESA_FORMAT_SRGBA8:
-   case MESA_FORMAT_SARGB8:
-   case MESA_FORMAT_SL8:
-   case MESA_FORMAT_SLA8:
-   case MESA_FORMAT_SRGB_DXT1:
-   case MESA_FORMAT_SRGBA_DXT1:
-   case MESA_FORMAT_SRGBA_DXT3:
-   case MESA_FORMAT_SRGBA_DXT5:
-      return GL_SRGB;
-   default:
-      return GL_LINEAR;
-   }
-}
-
-
-/**
- * For an sRGB format, return the corresponding linear color space format.
- * For non-sRGB formats, return the format as-is.
- */
-gl_format
-_mesa_get_srgb_format_linear(gl_format format)
-{
-   switch (format) {
-   case MESA_FORMAT_SRGB8:
-      format = MESA_FORMAT_RGB888;
-      break;
-   case MESA_FORMAT_SRGBA8:
-      format = MESA_FORMAT_RGBA8888;
-      break;
-   case MESA_FORMAT_SARGB8:
-      format = MESA_FORMAT_ARGB8888;
-      break;
-   case MESA_FORMAT_SL8:
-      format = MESA_FORMAT_L8;
-      break;
-   case MESA_FORMAT_SLA8:
-      format = MESA_FORMAT_AL88;
-      break;
-   case MESA_FORMAT_SRGB_DXT1:
-      format = MESA_FORMAT_RGB_DXT1;
-      break;
-   case MESA_FORMAT_SRGBA_DXT1:
-      format = MESA_FORMAT_RGBA_DXT1;
-      break;
-   case MESA_FORMAT_SRGBA_DXT3:
-      format = MESA_FORMAT_RGBA_DXT3;
-      break;
-   case MESA_FORMAT_SRGBA_DXT5:
-      format = MESA_FORMAT_RGBA_DXT5;
-      break;
-   default:
-      break;
-   }
-   return format;
-}
-
-
-/**
- * Return number of bytes needed to store an image of the given size
- * in the given format.
- */
-GLuint
-_mesa_format_image_size(gl_format format, GLsizei width,
-                        GLsizei height, GLsizei depth)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-   /* Strictly speaking, a conditional isn't needed here */
-   if (info->BlockWidth > 1 || info->BlockHeight > 1) {
-      /* compressed format (2D only for now) */
-      const GLuint bw = info->BlockWidth, bh = info->BlockHeight;
-      const GLuint wblocks = (width + bw - 1) / bw;
-      const GLuint hblocks = (height + bh - 1) / bh;
-      const GLuint sz = wblocks * hblocks * info->BytesPerBlock;
-      assert(depth == 1);
-      return sz;
-   }
-   else {
-      /* non-compressed */
-      const GLuint sz = width * height * depth * info->BytesPerBlock;
-      return sz;
-   }
-}
-
-
-/**
- * Same as _mesa_format_image_size() but returns a 64-bit value to
- * accomodate very large textures.
- */
-uint64_t
-_mesa_format_image_size64(gl_format format, GLsizei width,
-                          GLsizei height, GLsizei depth)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-   /* Strictly speaking, a conditional isn't needed here */
-   if (info->BlockWidth > 1 || info->BlockHeight > 1) {
-      /* compressed format (2D only for now) */
-      const uint64_t bw = info->BlockWidth, bh = info->BlockHeight;
-      const uint64_t wblocks = (width + bw - 1) / bw;
-      const uint64_t hblocks = (height + bh - 1) / bh;
-      const uint64_t sz = wblocks * hblocks * info->BytesPerBlock;
-      assert(depth == 1);
-      return sz;
-   }
-   else {
-      /* non-compressed */
-      const uint64_t sz = ((uint64_t) width *
-                           (uint64_t) height *
-                           (uint64_t) depth *
-                           info->BytesPerBlock);
-      return sz;
-   }
-}
-
-
-
-GLint
-_mesa_format_row_stride(gl_format format, GLsizei width)
-{
-   const struct gl_format_info *info = _mesa_get_format_info(format);
-   /* Strictly speaking, a conditional isn't needed here */
-   if (info->BlockWidth > 1 || info->BlockHeight > 1) {
-      /* compressed format */
-      const GLuint bw = info->BlockWidth;
-      const GLuint wblocks = (width + bw - 1) / bw;
-      const GLint stride = wblocks * info->BytesPerBlock;
-      return stride;
-   }
-   else {
-      const GLint stride = width * info->BytesPerBlock;
-      return stride;
-   }
-}
-
-
-/**
- * Debug/test: check that all formats are handled in the
- * _mesa_format_to_type_and_comps() function.  When new pixel formats
- * are added to Mesa, that function needs to be updated.
- * This is a no-op after the first call.
- */
-static void
-check_format_to_type_and_comps(void)
-{
-   gl_format f;
-
-   for (f = MESA_FORMAT_NONE + 1; f < MESA_FORMAT_COUNT; f++) {
-      GLenum datatype = 0;
-      GLuint comps = 0;
-      /* This function will emit a problem/warning if the format is
-       * not handled.
-       */
-      _mesa_format_to_type_and_comps(f, &datatype, &comps);
-   }
-}
-
-
-/**
- * Do sanity checking of the format info table.
- */
-void
-_mesa_test_formats(void)
-{
-   GLuint i;
-
-   assert(Elements(format_info) == MESA_FORMAT_COUNT);
-
-   for (i = 0; i < MESA_FORMAT_COUNT; i++) {
-      const struct gl_format_info *info = _mesa_get_format_info(i);
-      assert(info);
-
-      assert(info->Name == i);
-
-      if (info->Name == MESA_FORMAT_NONE)
-         continue;
-
-      if (info->BlockWidth == 1 && info->BlockHeight == 1) {
-         if (info->RedBits > 0) {
-            GLuint t = info->RedBits + info->GreenBits
-               + info->BlueBits + info->AlphaBits;
-            assert(t / 8 <= info->BytesPerBlock);
-            (void) t;
-         }
-      }
-
-      assert(info->DataType == GL_UNSIGNED_NORMALIZED ||
-             info->DataType == GL_SIGNED_NORMALIZED ||
-             info->DataType == GL_UNSIGNED_INT ||
-             info->DataType == GL_INT ||
-             info->DataType == GL_FLOAT);
-
-      if (info->BaseFormat == GL_RGB) {
-         assert(info->RedBits > 0);
-         assert(info->GreenBits > 0);
-         assert(info->BlueBits > 0);
-         assert(info->AlphaBits == 0);
-         assert(info->LuminanceBits == 0);
-         assert(info->IntensityBits == 0);
-      }
-      else if (info->BaseFormat == GL_RGBA) {
-         assert(info->RedBits > 0);
-         assert(info->GreenBits > 0);
-         assert(info->BlueBits > 0);
-         assert(info->AlphaBits > 0);
-         assert(info->LuminanceBits == 0);
-         assert(info->IntensityBits == 0);
-      }
-      else if (info->BaseFormat == GL_RG) {
-         assert(info->RedBits > 0);
-         assert(info->GreenBits > 0);
-         assert(info->BlueBits == 0);
-         assert(info->AlphaBits == 0);
-         assert(info->LuminanceBits == 0);
-         assert(info->IntensityBits == 0);
-      }
-      else if (info->BaseFormat == GL_RED) {
-         assert(info->RedBits > 0);
-         assert(info->GreenBits == 0);
-         assert(info->BlueBits == 0);
-         assert(info->AlphaBits == 0);
-         assert(info->LuminanceBits == 0);
-         assert(info->IntensityBits == 0);
-      }
-      else if (info->BaseFormat == GL_LUMINANCE) {
-         assert(info->RedBits == 0);
-         assert(info->GreenBits == 0);
-         assert(info->BlueBits == 0);
-         assert(info->AlphaBits == 0);
-         assert(info->LuminanceBits > 0);
-         assert(info->IntensityBits == 0);
-      }
-      else if (info->BaseFormat == GL_INTENSITY) {
-         assert(info->RedBits == 0);
-         assert(info->GreenBits == 0);
-         assert(info->BlueBits == 0);
-         assert(info->AlphaBits == 0);
-         assert(info->LuminanceBits == 0);
-         assert(info->IntensityBits > 0);
-      }
-   }
-
-   check_format_to_type_and_comps();
-}
-
-
-
-/**
- * Return datatype and number of components per texel for the given gl_format.
- * Only used for mipmap generation code.
- */
-void
-_mesa_format_to_type_and_comps(gl_format format,
-                               GLenum *datatype, GLuint *comps)
-{
-   switch (format) {
-   case MESA_FORMAT_RGBA8888:
-   case MESA_FORMAT_RGBA8888_REV:
-   case MESA_FORMAT_ARGB8888:
-   case MESA_FORMAT_ARGB8888_REV:
-   case MESA_FORMAT_XRGB8888:
-   case MESA_FORMAT_XRGB8888_REV:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_RGB888:
-   case MESA_FORMAT_BGR888:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 3;
-      return;
-   case MESA_FORMAT_RGB565:
-   case MESA_FORMAT_RGB565_REV:
-      *datatype = GL_UNSIGNED_SHORT_5_6_5;
-      *comps = 3;
-      return;
-
-   case MESA_FORMAT_ARGB4444:
-   case MESA_FORMAT_ARGB4444_REV:
-      *datatype = GL_UNSIGNED_SHORT_4_4_4_4;
-      *comps = 4;
-      return;
-
-   case MESA_FORMAT_ARGB1555:
-   case MESA_FORMAT_ARGB1555_REV:
-      *datatype = GL_UNSIGNED_SHORT_1_5_5_5_REV;
-      *comps = 4;
-      return;
-
-   case MESA_FORMAT_ARGB2101010:
-      *datatype = GL_UNSIGNED_INT_2_10_10_10_REV;
-      *comps = 4;
-      return;
-
-   case MESA_FORMAT_RGBA5551:
-      *datatype = GL_UNSIGNED_SHORT_5_5_5_1;
-      *comps = 4;
-      return;
-
-   case MESA_FORMAT_AL44:
-      *datatype = MESA_UNSIGNED_BYTE_4_4;
-      *comps = 2;
-      return;
-
-   case MESA_FORMAT_AL88:
-   case MESA_FORMAT_AL88_REV:
-   case MESA_FORMAT_RG88:
-   case MESA_FORMAT_RG88_REV:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 2;
-      return;
-
-   case MESA_FORMAT_AL1616:
-   case MESA_FORMAT_AL1616_REV:
-   case MESA_FORMAT_RG1616:
-   case MESA_FORMAT_RG1616_REV:
-      *datatype = GL_UNSIGNED_SHORT;
-      *comps = 2;
-      return;
-
-   case MESA_FORMAT_R16:
-   case MESA_FORMAT_A16:
-   case MESA_FORMAT_L16:
-   case MESA_FORMAT_I16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *comps = 1;
-      return;
-
-   case MESA_FORMAT_RGB332:
-      *datatype = GL_UNSIGNED_BYTE_3_3_2;
-      *comps = 3;
-      return;
-
-   case MESA_FORMAT_A8:
-   case MESA_FORMAT_L8:
-   case MESA_FORMAT_I8:
-   case MESA_FORMAT_CI8:
-   case MESA_FORMAT_R8:
-   case MESA_FORMAT_S8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 1;
-      return;
-
-   case MESA_FORMAT_YCBCR:
-   case MESA_FORMAT_YCBCR_REV:
-      *datatype = GL_UNSIGNED_SHORT;
-      *comps = 2;
-      return;
-
-   case MESA_FORMAT_Z24_S8:
-      *datatype = GL_UNSIGNED_INT;
-      *comps = 1; /* XXX OK? */
-      return;
-
-   case MESA_FORMAT_S8_Z24:
-      *datatype = GL_UNSIGNED_INT;
-      *comps = 1; /* XXX OK? */
-      return;
-
-   case MESA_FORMAT_Z16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *comps = 1;
-      return;
-
-   case MESA_FORMAT_X8_Z24:
-      *datatype = GL_UNSIGNED_INT;
-      *comps = 1;
-      return;
-
-   case MESA_FORMAT_Z24_X8:
-      *datatype = GL_UNSIGNED_INT;
-      *comps = 1;
-      return;
-
-   case MESA_FORMAT_Z32:
-      *datatype = GL_UNSIGNED_INT;
-      *comps = 1;
-      return;
-
-   case MESA_FORMAT_DUDV8:
-      *datatype = GL_BYTE;
-      *comps = 2;
-      return;
-
-   case MESA_FORMAT_SIGNED_R8:
-   case MESA_FORMAT_SIGNED_A8:
-   case MESA_FORMAT_SIGNED_L8:
-   case MESA_FORMAT_SIGNED_I8:
-      *datatype = GL_BYTE;
-      *comps = 1;
-      return;
-   case MESA_FORMAT_SIGNED_RG88_REV:
-   case MESA_FORMAT_SIGNED_AL88:
-      *datatype = GL_BYTE;
-      *comps = 2;
-      return;
-   case MESA_FORMAT_SIGNED_RGBA8888:
-   case MESA_FORMAT_SIGNED_RGBA8888_REV:
-   case MESA_FORMAT_SIGNED_RGBX8888:
-      *datatype = GL_BYTE;
-      *comps = 4;
-      return;
-
-   case MESA_FORMAT_RGBA_16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *comps = 4;
-      return;
-
-   case MESA_FORMAT_SIGNED_R16:
-   case MESA_FORMAT_SIGNED_A16:
-   case MESA_FORMAT_SIGNED_L16:
-   case MESA_FORMAT_SIGNED_I16:
-      *datatype = GL_SHORT;
-      *comps = 1;
-      return;
-   case MESA_FORMAT_SIGNED_GR1616:
-   case MESA_FORMAT_SIGNED_AL1616:
-      *datatype = GL_SHORT;
-      *comps = 2;
-      return;
-   case MESA_FORMAT_SIGNED_RGB_16:
-      *datatype = GL_SHORT;
-      *comps = 3;
-      return;
-   case MESA_FORMAT_SIGNED_RGBA_16:
-      *datatype = GL_SHORT;
-      *comps = 4;
-      return;
-
-#if FEATURE_EXT_texture_sRGB
-   case MESA_FORMAT_SRGB8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 3;
-      return;
-   case MESA_FORMAT_SRGBA8:
-   case MESA_FORMAT_SARGB8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_SL8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 1;
-      return;
-   case MESA_FORMAT_SLA8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 2;
-      return;
-#endif
-
-#if FEATURE_texture_fxt1
-   case MESA_FORMAT_RGB_FXT1:
-   case MESA_FORMAT_RGBA_FXT1:
-#endif
-#if FEATURE_texture_s3tc
-   case MESA_FORMAT_RGB_DXT1:
-   case MESA_FORMAT_RGBA_DXT1:
-   case MESA_FORMAT_RGBA_DXT3:
-   case MESA_FORMAT_RGBA_DXT5:
-#if FEATURE_EXT_texture_sRGB
-   case MESA_FORMAT_SRGB_DXT1:
-   case MESA_FORMAT_SRGBA_DXT1:
-   case MESA_FORMAT_SRGBA_DXT3:
-   case MESA_FORMAT_SRGBA_DXT5:
-#endif
-#endif
-   case MESA_FORMAT_RED_RGTC1:
-   case MESA_FORMAT_SIGNED_RED_RGTC1:
-   case MESA_FORMAT_RG_RGTC2:
-   case MESA_FORMAT_SIGNED_RG_RGTC2:
-   case MESA_FORMAT_L_LATC1:
-   case MESA_FORMAT_SIGNED_L_LATC1:
-   case MESA_FORMAT_LA_LATC2:
-   case MESA_FORMAT_SIGNED_LA_LATC2:
-      /* XXX generate error instead? */
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 0;
-      return;
-
-   case MESA_FORMAT_RGBA_FLOAT32:
-      *datatype = GL_FLOAT;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_RGBA_FLOAT16:
-      *datatype = GL_HALF_FLOAT_ARB;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_RGB_FLOAT32:
-      *datatype = GL_FLOAT;
-      *comps = 3;
-      return;
-   case MESA_FORMAT_RGB_FLOAT16:
-      *datatype = GL_HALF_FLOAT_ARB;
-      *comps = 3;
-      return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32:
-      *datatype = GL_FLOAT;
-      *comps = 2;
-      return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16:
-      *datatype = GL_HALF_FLOAT_ARB;
-      *comps = 2;
-      return;
-   case MESA_FORMAT_ALPHA_FLOAT32:
-   case MESA_FORMAT_LUMINANCE_FLOAT32:
-   case MESA_FORMAT_INTENSITY_FLOAT32:
-      *datatype = GL_FLOAT;
-      *comps = 1;
-      return;
-   case MESA_FORMAT_ALPHA_FLOAT16:
-   case MESA_FORMAT_LUMINANCE_FLOAT16:
-   case MESA_FORMAT_INTENSITY_FLOAT16:
-      *datatype = GL_HALF_FLOAT_ARB;
-      *comps = 1;
-      return;
-
-   case MESA_FORMAT_RGBA_INT8:
-      *datatype = GL_BYTE;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_RGBA_INT16:
-      *datatype = GL_SHORT;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_RGBA_INT32:
-      *datatype = GL_INT;
-      *comps = 4;
-      return;
-
-   /**
-    * \name Non-normalized unsigned integer formats.
-    */
-   case MESA_FORMAT_RGBA_UINT8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_RGBA_UINT16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *comps = 4;
-      return;
-   case MESA_FORMAT_RGBA_UINT32:
-      *datatype = GL_UNSIGNED_INT;
-      *comps = 4;
-      return;
-
-   case MESA_FORMAT_COUNT:
-      assert(0);
-      return;
-
-   case MESA_FORMAT_NONE:
-   /* For debug builds, warn if any formats are not handled */
-#ifdef DEBUG
-   default:
-#endif
-      _mesa_problem(NULL, "bad format %s in _mesa_format_to_type_and_comps",
-                    _mesa_get_format_name(format));
-      *datatype = 0;
-      *comps = 1;
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.7

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (c) 2008-2009  VMware, Inc.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include "imports.h"

+#include "formats.h"

+#include "mfeatures.h"

+

+

+/**

+ * Information about texture formats.

+ */

+struct gl_format_info

+{

+   gl_format Name;

+

+   /** text name for debugging */

+   const char *StrName;

+

+   /**

+    * Base format is one of GL_RED, GL_RG, GL_RGB, GL_RGBA, GL_ALPHA,

+    * GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_YCBCR_MESA,

+    * GL_COLOR_INDEX, GL_DEPTH_COMPONENT, GL_STENCIL_INDEX,

+    * GL_DEPTH_STENCIL, GL_DUDV_ATI.

+    */

+   GLenum BaseFormat;

+

+   /**

+    * Logical data type: one of  GL_UNSIGNED_NORMALIZED, GL_SIGNED_NORMALED,

+    * GL_UNSIGNED_INT, GL_INT, GL_FLOAT.

+    */

+   GLenum DataType;

+

+   GLubyte RedBits;

+   GLubyte GreenBits;

+   GLubyte BlueBits;

+   GLubyte AlphaBits;

+   GLubyte LuminanceBits;

+   GLubyte IntensityBits;

+   GLubyte IndexBits;

+   GLubyte DepthBits;

+   GLubyte StencilBits;

+

+   /**

+    * To describe compressed formats.  If not compressed, Width=Height=1.

+    */

+   GLubyte BlockWidth, BlockHeight;

+   GLubyte BytesPerBlock;

+};

+

+

+/**

+ * Info about each format.

+ * These must be in the same order as the MESA_FORMAT_* enums so that

+ * we can do lookups without searching.

+ */

+static struct gl_format_info format_info[MESA_FORMAT_COUNT] =

+{

+   {

+      MESA_FORMAT_NONE,            /* Name */

+      "MESA_FORMAT_NONE",          /* StrName */

+      GL_NONE,                     /* BaseFormat */

+      GL_NONE,                     /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      0, 0, 0                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_RGBA8888,        /* Name */

+      "MESA_FORMAT_RGBA8888",      /* StrName */

+      GL_RGBA,                     /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      8, 8, 8, 8,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_RGBA8888_REV,    /* Name */

+      "MESA_FORMAT_RGBA8888_REV",  /* StrName */

+      GL_RGBA,                     /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      8, 8, 8, 8,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_ARGB8888,        /* Name */

+      "MESA_FORMAT_ARGB8888",      /* StrName */

+      GL_RGBA,                     /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      8, 8, 8, 8,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_ARGB8888_REV,    /* Name */

+      "MESA_FORMAT_ARGB8888_REV",  /* StrName */

+      GL_RGBA,                     /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      8, 8, 8, 8,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_XRGB8888,        /* Name */

+      "MESA_FORMAT_XRGB8888",      /* StrName */

+      GL_RGB,                      /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      8, 8, 8, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_XRGB8888_REV,    /* Name */

+      "MESA_FORMAT_XRGB8888_REV",  /* StrName */

+      GL_RGB,                      /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      8, 8, 8, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_RGB888,          /* Name */

+      "MESA_FORMAT_RGB888",        /* StrName */

+      GL_RGB,                      /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      8, 8, 8, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 3                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_BGR888,          /* Name */

+      "MESA_FORMAT_BGR888",        /* StrName */

+      GL_RGB,                      /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      8, 8, 8, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 3                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_RGB565,          /* Name */

+      "MESA_FORMAT_RGB565",        /* StrName */

+      GL_RGB,                      /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      5, 6, 5, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_RGB565_REV,      /* Name */

+      "MESA_FORMAT_RGB565_REV",    /* StrName */

+      GL_RGB,                      /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      5, 6, 5, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_ARGB4444,        /* Name */

+      "MESA_FORMAT_ARGB4444",      /* StrName */

+      GL_RGBA,                     /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      4, 4, 4, 4,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_ARGB4444_REV,    /* Name */

+      "MESA_FORMAT_ARGB4444_REV",  /* StrName */

+      GL_RGBA,                     /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      4, 4, 4, 4,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_RGBA5551,        /* Name */

+      "MESA_FORMAT_RGBA5551",      /* StrName */

+      GL_RGBA,                     /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      5, 5, 5, 1,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_ARGB1555,        /* Name */

+      "MESA_FORMAT_ARGB1555",      /* StrName */

+      GL_RGBA,                     /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      5, 5, 5, 1,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_ARGB1555_REV,    /* Name */

+      "MESA_FORMAT_ARGB1555_REV",  /* StrName */

+      GL_RGBA,                     /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      5, 5, 5, 1,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_AL44,            /* Name */

+      "MESA_FORMAT_AL44",          /* StrName */

+      GL_LUMINANCE_ALPHA,          /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 4,                  /* Red/Green/Blue/AlphaBits */

+      4, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 1                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_AL88,            /* Name */

+      "MESA_FORMAT_AL88",          /* StrName */

+      GL_LUMINANCE_ALPHA,          /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 8,                  /* Red/Green/Blue/AlphaBits */

+      8, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_AL88_REV,        /* Name */

+      "MESA_FORMAT_AL88_REV",      /* StrName */

+      GL_LUMINANCE_ALPHA,          /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 8,                  /* Red/Green/Blue/AlphaBits */

+      8, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_AL1616,          /* Name */

+      "MESA_FORMAT_AL1616",        /* StrName */

+      GL_LUMINANCE_ALPHA,          /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 16,                 /* Red/Green/Blue/AlphaBits */

+      16, 0, 0, 0, 0,              /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_AL1616_REV,      /* Name */

+      "MESA_FORMAT_AL1616_REV",    /* StrName */

+      GL_LUMINANCE_ALPHA,          /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 16,                 /* Red/Green/Blue/AlphaBits */

+      16, 0, 0, 0, 0,              /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_RGB332,          /* Name */

+      "MESA_FORMAT_RGB332",        /* StrName */

+      GL_RGB,                      /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      3, 3, 2, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 1                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_A8,              /* Name */

+      "MESA_FORMAT_A8",            /* StrName */

+      GL_ALPHA,                    /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 8,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 1                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_A16,             /* Name */

+      "MESA_FORMAT_A16",           /* StrName */

+      GL_ALPHA,                    /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 16,                 /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_L8,              /* Name */

+      "MESA_FORMAT_L8",            /* StrName */

+      GL_LUMINANCE,                /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      8, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 1                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_L16,             /* Name */

+      "MESA_FORMAT_L16",           /* StrName */

+      GL_LUMINANCE,                /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      16, 0, 0, 0, 0,              /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_I8,              /* Name */

+      "MESA_FORMAT_I8",            /* StrName */

+      GL_INTENSITY,                /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 8, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 1                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_I16,             /* Name */

+      "MESA_FORMAT_I16",           /* StrName */

+      GL_INTENSITY,                /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 16, 0, 0, 0,              /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_CI8,             /* Name */

+      "MESA_FORMAT_CI8",           /* StrName */

+      GL_COLOR_INDEX,              /* BaseFormat */

+      GL_UNSIGNED_INT,             /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 8, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 1                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_YCBCR,           /* Name */

+      "MESA_FORMAT_YCBCR",         /* StrName */

+      GL_YCBCR_MESA,               /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_YCBCR_REV,       /* Name */

+      "MESA_FORMAT_YCBCR_REV",     /* StrName */

+      GL_YCBCR_MESA,               /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_R8,

+      "MESA_FORMAT_R8",

+      GL_RED,

+      GL_UNSIGNED_NORMALIZED,

+      8, 0, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 1

+   },

+   {

+      MESA_FORMAT_RG88,

+      "MESA_FORMAT_RG88",

+      GL_RG,

+      GL_UNSIGNED_NORMALIZED,

+      8, 8, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_RG88_REV,

+      "MESA_FORMAT_RG88_REV",

+      GL_RG,

+      GL_UNSIGNED_NORMALIZED,

+      8, 8, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_R16,

+      "MESA_FORMAT_R16",

+      GL_RED,

+      GL_UNSIGNED_NORMALIZED,

+      16, 0, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_RG1616,

+      "MESA_FORMAT_RG1616",

+      GL_RG,

+      GL_UNSIGNED_NORMALIZED,

+      16, 16, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_RG1616_REV,

+      "MESA_FORMAT_RG1616_REV",

+      GL_RG,

+      GL_UNSIGNED_NORMALIZED,

+      16, 16, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_ARGB2101010,

+      "MESA_FORMAT_ARGB2101010",

+      GL_RGBA,

+      GL_UNSIGNED_NORMALIZED,

+      10, 10, 10, 2,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_Z24_S8,          /* Name */

+      "MESA_FORMAT_Z24_S8",        /* StrName */

+      GL_DEPTH_STENCIL,            /* BaseFormat */

+      GL_UNSIGNED_INT,             /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 24, 8,              /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_S8_Z24,          /* Name */

+      "MESA_FORMAT_S8_Z24",        /* StrName */

+      GL_DEPTH_STENCIL,            /* BaseFormat */

+      GL_UNSIGNED_INT,             /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 24, 8,              /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_Z16,             /* Name */

+      "MESA_FORMAT_Z16",           /* StrName */

+      GL_DEPTH_COMPONENT,          /* BaseFormat */

+      GL_UNSIGNED_INT,             /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 16, 0,              /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 2                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_X8_Z24,          /* Name */

+      "MESA_FORMAT_X8_Z24",        /* StrName */

+      GL_DEPTH_COMPONENT,          /* BaseFormat */

+      GL_UNSIGNED_INT,             /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 24, 0,              /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_Z24_X8,          /* Name */

+      "MESA_FORMAT_Z24_X8",        /* StrName */

+      GL_DEPTH_COMPONENT,          /* BaseFormat */

+      GL_UNSIGNED_INT,             /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 24, 0,              /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_Z32,             /* Name */

+      "MESA_FORMAT_Z32",           /* StrName */

+      GL_DEPTH_COMPONENT,          /* BaseFormat */

+      GL_UNSIGNED_INT,             /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 32, 0,              /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 4                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_S8,              /* Name */

+      "MESA_FORMAT_S8",            /* StrName */

+      GL_STENCIL_INDEX,            /* BaseFormat */

+      GL_UNSIGNED_INT,             /* DataType */

+      0, 0, 0, 0,                  /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 8,               /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 1                      /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_SRGB8,

+      "MESA_FORMAT_SRGB8",

+      GL_RGB,

+      GL_UNSIGNED_NORMALIZED,

+      8, 8, 8, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 3

+   },

+   {

+      MESA_FORMAT_SRGBA8,

+      "MESA_FORMAT_SRGBA8",

+      GL_RGBA,

+      GL_UNSIGNED_NORMALIZED,    

+      8, 8, 8, 8,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_SARGB8,

+      "MESA_FORMAT_SARGB8",

+      GL_RGBA,

+      GL_UNSIGNED_NORMALIZED,    

+      8, 8, 8, 8,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_SL8,

+      "MESA_FORMAT_SL8",

+      GL_LUMINANCE,

+      GL_UNSIGNED_NORMALIZED,    

+      0, 0, 0, 0,

+      8, 0, 0, 0, 0,

+      1, 1, 1

+   },

+   {

+      MESA_FORMAT_SLA8,

+      "MESA_FORMAT_SLA8",

+      GL_LUMINANCE_ALPHA,

+      GL_UNSIGNED_NORMALIZED,    

+      0, 0, 0, 8,

+      8, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_SRGB_DXT1,       /* Name */

+      "MESA_FORMAT_SRGB_DXT1",     /* StrName */

+      GL_RGB,                      /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      4, 4, 4, 0,                  /* approx Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      4, 4, 8                      /* 8 bytes per 4x4 block */

+   },

+   {

+      MESA_FORMAT_SRGBA_DXT1,

+      "MESA_FORMAT_SRGBA_DXT1",

+      GL_RGBA,

+      GL_UNSIGNED_NORMALIZED,

+      4, 4, 4, 4,

+      0, 0, 0, 0, 0,

+      4, 4, 8                      /* 8 bytes per 4x4 block */

+   },

+   {

+      MESA_FORMAT_SRGBA_DXT3,

+      "MESA_FORMAT_SRGBA_DXT3",

+      GL_RGBA,

+      GL_UNSIGNED_NORMALIZED,

+      4, 4, 4, 4,

+      0, 0, 0, 0, 0,

+      4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

+   {

+      MESA_FORMAT_SRGBA_DXT5,

+      "MESA_FORMAT_SRGBA_DXT5",

+      GL_RGBA,

+      GL_UNSIGNED_NORMALIZED,

+      4, 4, 4, 4,

+      0, 0, 0, 0, 0,

+      4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

+

+   {

+      MESA_FORMAT_RGB_FXT1,

+      "MESA_FORMAT_RGB_FXT1",

+      GL_RGB,

+      GL_UNSIGNED_NORMALIZED,

+      4, 4, 4, 0,                  /* approx Red/Green/BlueBits */

+      0, 0, 0, 0, 0,

+      8, 4, 16                     /* 16 bytes per 8x4 block */

+   },

+   {

+      MESA_FORMAT_RGBA_FXT1,

+      "MESA_FORMAT_RGBA_FXT1",

+      GL_RGBA,

+      GL_UNSIGNED_NORMALIZED,

+      4, 4, 4, 1,                  /* approx Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,

+      8, 4, 16                     /* 16 bytes per 8x4 block */

+   },

+

+   {

+      MESA_FORMAT_RGB_DXT1,        /* Name */

+      "MESA_FORMAT_RGB_DXT1",      /* StrName */

+      GL_RGB,                      /* BaseFormat */

+      GL_UNSIGNED_NORMALIZED,      /* DataType */

+      4, 4, 4, 0,                  /* approx Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,               /* Lum/Int/Index/Depth/StencilBits */

+      4, 4, 8                      /* 8 bytes per 4x4 block */

+   },

+   {

+      MESA_FORMAT_RGBA_DXT1,

+      "MESA_FORMAT_RGBA_DXT1",

+      GL_RGBA,

+      GL_UNSIGNED_NORMALIZED,    

+      4, 4, 4, 4,

+      0, 0, 0, 0, 0,

+      4, 4, 8                      /* 8 bytes per 4x4 block */

+   },

+   {

+      MESA_FORMAT_RGBA_DXT3,

+      "MESA_FORMAT_RGBA_DXT3",

+      GL_RGBA,

+      GL_UNSIGNED_NORMALIZED,    

+      4, 4, 4, 4,

+      0, 0, 0, 0, 0,

+      4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

+   {

+      MESA_FORMAT_RGBA_DXT5,

+      "MESA_FORMAT_RGBA_DXT5",

+      GL_RGBA,

+      GL_UNSIGNED_NORMALIZED,    

+      4, 4, 4, 4,

+      0, 0, 0, 0, 0,

+      4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

+   {

+      MESA_FORMAT_RGBA_FLOAT32,

+      "MESA_FORMAT_RGBA_FLOAT32",

+      GL_RGBA,

+      GL_FLOAT,

+      32, 32, 32, 32,

+      0, 0, 0, 0, 0,

+      1, 1, 16

+   },

+   {

+      MESA_FORMAT_RGBA_FLOAT16,

+      "MESA_FORMAT_RGBA_FLOAT16",

+      GL_RGBA,

+      GL_FLOAT,

+      16, 16, 16, 16,

+      0, 0, 0, 0, 0,

+      1, 1, 8

+   },

+   {

+      MESA_FORMAT_RGB_FLOAT32,

+      "MESA_FORMAT_RGB_FLOAT32",

+      GL_RGB,

+      GL_FLOAT,

+      32, 32, 32, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 12

+   },

+   {

+      MESA_FORMAT_RGB_FLOAT16,

+      "MESA_FORMAT_RGB_FLOAT16",

+      GL_RGB,

+      GL_FLOAT,

+      16, 16, 16, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 6

+   },

+   {

+      MESA_FORMAT_ALPHA_FLOAT32,

+      "MESA_FORMAT_ALPHA_FLOAT32",

+      GL_ALPHA,

+      GL_FLOAT,

+      0, 0, 0, 32,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_ALPHA_FLOAT16,

+      "MESA_FORMAT_ALPHA_FLOAT16",

+      GL_ALPHA,

+      GL_FLOAT,

+      0, 0, 0, 16,

+      0, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_LUMINANCE_FLOAT32,

+      "MESA_FORMAT_LUMINANCE_FLOAT32",

+      GL_ALPHA,

+      GL_FLOAT,

+      0, 0, 0, 0,

+      32, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_LUMINANCE_FLOAT16,

+      "MESA_FORMAT_LUMINANCE_FLOAT16",

+      GL_ALPHA,

+      GL_FLOAT,

+      0, 0, 0, 0,

+      16, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,

+      "MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32",

+      GL_LUMINANCE_ALPHA,

+      GL_FLOAT,

+      0, 0, 0, 32,

+      32, 0, 0, 0, 0,

+      1, 1, 8

+   },

+   {

+      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,

+      "MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16",

+      GL_LUMINANCE_ALPHA,

+      GL_FLOAT,

+      0, 0, 0, 16,

+      16, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_INTENSITY_FLOAT32,

+      "MESA_FORMAT_INTENSITY_FLOAT32",

+      GL_INTENSITY,

+      GL_FLOAT,

+      0, 0, 0, 0,

+      0, 32, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_INTENSITY_FLOAT16,

+      "MESA_FORMAT_INTENSITY_FLOAT16",

+      GL_INTENSITY,

+      GL_FLOAT,

+      0, 0, 0, 0,

+      0, 16, 0, 0, 0,

+      1, 1, 2

+   },

+

+   /* unnormalized signed int formats */

+   {

+      MESA_FORMAT_RGBA_INT8,

+      "MESA_FORMAT_RGBA_INT8",

+      GL_RGBA,

+      GL_INT,

+      8, 8, 8, 8,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_RGBA_INT16,

+      "MESA_FORMAT_RGBA_INT16",

+      GL_RGBA,

+      GL_INT,

+      16, 16, 16, 16,

+      0, 0, 0, 0, 0,

+      1, 1, 8

+   },

+   {

+      MESA_FORMAT_RGBA_INT32,

+      "MESA_FORMAT_RGBA_INT32",

+      GL_RGBA,

+      GL_INT,

+      32, 32, 32, 32,

+      0, 0, 0, 0, 0,

+      1, 1, 16

+   },

+

+   /* unnormalized unsigned int formats */

+   {

+      MESA_FORMAT_RGBA_UINT8,

+      "MESA_FORMAT_RGBA_UINT8",

+      GL_RGBA,

+      GL_UNSIGNED_INT,

+      8, 8, 8, 8,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_RGBA_UINT16,

+      "MESA_FORMAT_RGBA_UINT16",

+      GL_RGBA,

+      GL_UNSIGNED_INT,

+      16, 16, 16, 16,

+      0, 0, 0, 0, 0,

+      1, 1, 8

+   },

+   {

+      MESA_FORMAT_RGBA_UINT32,

+      "MESA_FORMAT_RGBA_UINT32",

+      GL_RGBA,

+      GL_UNSIGNED_INT,

+      32, 32, 32, 32,

+      0, 0, 0, 0, 0,

+      1, 1, 16

+   },

+

+

+   {

+      MESA_FORMAT_DUDV8,

+      "MESA_FORMAT_DUDV8",

+      GL_DUDV_ATI,

+      GL_SIGNED_NORMALIZED,

+      0, 0, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 2

+   },

+

+   /* Signed 8 bits / channel */

+   {

+      MESA_FORMAT_SIGNED_R8,        /* Name */

+      "MESA_FORMAT_SIGNED_R8",      /* StrName */

+      GL_RED,                       /* BaseFormat */

+      GL_SIGNED_NORMALIZED,         /* DataType */

+      8, 0, 0, 0,                   /* Red/Green/Blue/AlphaBits */

+      0, 0, 0, 0, 0,                /* Lum/Int/Index/Depth/StencilBits */

+      1, 1, 1                       /* BlockWidth/Height,Bytes */

+   },

+   {

+      MESA_FORMAT_SIGNED_RG88_REV,

+      "MESA_FORMAT_SIGNED_RG88_REV",

+      GL_RG,

+      GL_SIGNED_NORMALIZED,

+      8, 8, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_SIGNED_RGBX8888,

+      "MESA_FORMAT_SIGNED_RGBX8888",

+      GL_RGB,

+      GL_SIGNED_NORMALIZED,

+      8, 8, 8, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 4                       /* 4 bpp, but no alpha */

+   },

+   {

+      MESA_FORMAT_SIGNED_RGBA8888,

+      "MESA_FORMAT_SIGNED_RGBA8888",

+      GL_RGBA,

+      GL_SIGNED_NORMALIZED,

+      8, 8, 8, 8,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_SIGNED_RGBA8888_REV,

+      "MESA_FORMAT_SIGNED_RGBA8888_REV",

+      GL_RGBA,

+      GL_SIGNED_NORMALIZED,

+      8, 8, 8, 8,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+

+   /* Signed 16 bits / channel */

+   {

+      MESA_FORMAT_SIGNED_R16,

+      "MESA_FORMAT_SIGNED_R16",

+      GL_RED,

+      GL_SIGNED_NORMALIZED,

+      16, 0, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_SIGNED_GR1616,

+      "MESA_FORMAT_SIGNED_GR1616",

+      GL_RG,

+      GL_SIGNED_NORMALIZED,

+      16, 16, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_SIGNED_RGB_16,

+      "MESA_FORMAT_SIGNED_RGB_16",

+      GL_RGB,

+      GL_SIGNED_NORMALIZED,

+      16, 16, 16, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 6

+   },

+   {

+      MESA_FORMAT_SIGNED_RGBA_16,

+      "MESA_FORMAT_SIGNED_RGBA_16",

+      GL_RGBA,

+      GL_SIGNED_NORMALIZED,

+      16, 16, 16, 16,

+      0, 0, 0, 0, 0,

+      1, 1, 8

+   },

+   {

+      MESA_FORMAT_RGBA_16,

+      "MESA_FORMAT_RGBA_16",

+      GL_RGBA,

+      GL_UNSIGNED_NORMALIZED,

+      16, 16, 16, 16,

+      0, 0, 0, 0, 0,

+      1, 1, 8

+   },

+   {

+     MESA_FORMAT_RED_RGTC1,

+     "MESA_FORMAT_RED_RGTC1",

+     GL_RED,

+     GL_UNSIGNED_NORMALIZED,

+     4, 0, 0, 0,

+     0, 0, 0, 0, 0,

+     4, 4, 8                     /* 8 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_SIGNED_RED_RGTC1,

+     "MESA_FORMAT_SIGNED_RED_RGTC1",

+     GL_RED,

+     GL_SIGNED_NORMALIZED,

+     4, 0, 0, 0,

+     0, 0, 0, 0, 0,

+     4, 4, 8                     /* 8 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_RG_RGTC2,

+     "MESA_FORMAT_RG_RGTC2",

+     GL_RG,

+     GL_UNSIGNED_NORMALIZED,

+     4, 4, 0, 0,

+     0, 0, 0, 0, 0,

+     4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_SIGNED_RG_RGTC2,

+     "MESA_FORMAT_SIGNED_RG_RGTC2",

+     GL_RG,

+     GL_SIGNED_NORMALIZED,

+     4, 4, 0, 0,

+     0, 0, 0, 0, 0,

+     4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_L_LATC1,

+     "MESA_FORMAT_L_LATC1",

+     GL_LUMINANCE,

+     GL_UNSIGNED_NORMALIZED,

+     0, 0, 0, 0,

+     4, 0, 0, 0, 0,

+     4, 4, 8                     /* 8 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_SIGNED_L_LATC1,

+     "MESA_FORMAT_SIGNED_L_LATC1",

+     GL_LUMINANCE,

+     GL_SIGNED_NORMALIZED,

+     0, 0, 0, 0,

+     4, 0, 0, 0, 0,

+     4, 4, 8                     /* 8 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_LA_LATC2,

+     "MESA_FORMAT_LA_LATC2",

+     GL_LUMINANCE_ALPHA,

+     GL_UNSIGNED_NORMALIZED,

+     0, 0, 0, 4,

+     4, 0, 0, 0, 0,

+     4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_SIGNED_LA_LATC2,

+     "MESA_FORMAT_SIGNED_LA_LATC2",

+     GL_LUMINANCE_ALPHA,

+     GL_SIGNED_NORMALIZED,

+     0, 0, 0, 4,

+     4, 0, 0, 0, 0,

+     4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

+

+   /* Signed formats from EXT_texture_snorm that are not in GL3.1 */

+   {

+      MESA_FORMAT_SIGNED_A8,

+      "MESA_FORMAT_SIGNED_A8",

+      GL_ALPHA,

+      GL_SIGNED_NORMALIZED,

+      0, 0, 0, 8,

+      0, 0, 0, 0, 0,

+      1, 1, 1

+   },

+   {

+      MESA_FORMAT_SIGNED_L8,

+      "MESA_FORMAT_SIGNED_L8",

+      GL_LUMINANCE,

+      GL_SIGNED_NORMALIZED,

+      0, 0, 0, 0,

+      8, 0, 0, 0, 0,

+      1, 1, 1

+   },

+   {

+      MESA_FORMAT_SIGNED_AL88,

+      "MESA_FORMAT_SIGNED_AL88",

+      GL_LUMINANCE_ALPHA,

+      GL_SIGNED_NORMALIZED,

+      0, 0, 0, 8,

+      8, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_SIGNED_I8,

+      "MESA_FORMAT_SIGNED_I8",

+      GL_INTENSITY,

+      GL_SIGNED_NORMALIZED,

+      0, 0, 0, 0,

+      0, 8, 0, 0, 0,

+      1, 1, 1

+   },

+   {

+      MESA_FORMAT_SIGNED_A16,

+      "MESA_FORMAT_SIGNED_A16",

+      GL_ALPHA,

+      GL_SIGNED_NORMALIZED,

+      0, 0, 0, 16,

+      0, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_SIGNED_L16,

+      "MESA_FORMAT_SIGNED_L16",

+      GL_LUMINANCE,

+      GL_SIGNED_NORMALIZED,

+      0, 0, 0, 0,

+      16, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_SIGNED_AL1616,

+      "MESA_FORMAT_SIGNED_AL1616",

+      GL_LUMINANCE_ALPHA,

+      GL_SIGNED_NORMALIZED,

+      0, 0, 0, 16,

+      16, 0, 0, 0, 0,

+      1, 1, 4

+   },

+   {

+      MESA_FORMAT_SIGNED_I16,

+      "MESA_FORMAT_SIGNED_I16",

+      GL_INTENSITY,

+      GL_SIGNED_NORMALIZED,

+      0, 0, 0, 0,

+      0, 16, 0, 0, 0,

+      1, 1, 2

+   }

+};

+

+

+

+static const struct gl_format_info *

+_mesa_get_format_info(gl_format format)

+{

+   const struct gl_format_info *info = &format_info[format];

+   assert(info->Name == format);

+   return info;

+}

+

+

+/** Return string name of format (for debugging) */

+const char *

+_mesa_get_format_name(gl_format format)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+   return info->StrName;

+}

+

+

+

+/**

+ * Return bytes needed to store a block of pixels in the given format.

+ * Normally, a block is 1x1 (a single pixel).  But for compressed formats

+ * a block may be 4x4 or 8x4, etc.

+ */

+GLuint

+_mesa_get_format_bytes(gl_format format)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+   ASSERT(info->BytesPerBlock);

+   return info->BytesPerBlock;

+}

+

+

+/**

+ * Return bits per component for the given format.

+ * \param format  one of MESA_FORMAT_x

+ * \param pname  the component, such as GL_RED_BITS, GL_TEXTURE_BLUE_BITS, etc.

+ */

+GLint

+_mesa_get_format_bits(gl_format format, GLenum pname)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+

+   switch (pname) {

+   case GL_RED_BITS:

+   case GL_TEXTURE_RED_SIZE:

+   case GL_RENDERBUFFER_RED_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:

+      return info->RedBits;

+   case GL_GREEN_BITS:

+   case GL_TEXTURE_GREEN_SIZE:

+   case GL_RENDERBUFFER_GREEN_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:

+      return info->GreenBits;

+   case GL_BLUE_BITS:

+   case GL_TEXTURE_BLUE_SIZE:

+   case GL_RENDERBUFFER_BLUE_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:

+      return info->BlueBits;

+   case GL_ALPHA_BITS:

+   case GL_TEXTURE_ALPHA_SIZE:

+   case GL_RENDERBUFFER_ALPHA_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE:

+      return info->AlphaBits;

+   case GL_TEXTURE_INTENSITY_SIZE:

+      return info->IntensityBits;

+   case GL_TEXTURE_LUMINANCE_SIZE:

+      return info->LuminanceBits;

+   case GL_INDEX_BITS:

+   case GL_TEXTURE_INDEX_SIZE_EXT:

+      return info->IndexBits;

+   case GL_DEPTH_BITS:

+   case GL_TEXTURE_DEPTH_SIZE_ARB:

+   case GL_RENDERBUFFER_DEPTH_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE:

+      return info->DepthBits;

+   case GL_STENCIL_BITS:

+   case GL_TEXTURE_STENCIL_SIZE_EXT:

+   case GL_RENDERBUFFER_STENCIL_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE:

+      return info->StencilBits;

+   default:

+      _mesa_problem(NULL, "bad pname in _mesa_get_format_bits()");

+      return 0;

+   }

+}

+

+

+/**

+ * Return the data type (or more specifically, the data representation)

+ * for the given format.

+ * The return value will be one of:

+ *    GL_UNSIGNED_NORMALIZED = unsigned int representing [0,1]

+ *    GL_SIGNED_NORMALIZED = signed int representing [-1, 1]

+ *    GL_UNSIGNED_INT = an ordinary unsigned integer

+ *    GL_INT = an ordinary signed integer

+ *    GL_FLOAT = an ordinary float

+ */

+GLenum

+_mesa_get_format_datatype(gl_format format)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+   return info->DataType;

+}

+

+

+/**

+ * Return the basic format for the given type.  The result will be

+ * one of GL_RGB, GL_RGBA, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA,

+ * GL_INTENSITY, GL_YCBCR_MESA, GL_COLOR_INDEX, GL_DEPTH_COMPONENT,

+ * GL_STENCIL_INDEX, GL_DEPTH_STENCIL.

+ */

+GLenum

+_mesa_get_format_base_format(gl_format format)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+   return info->BaseFormat;

+}

+

+

+/**

+ * Return the block size (in pixels) for the given format.  Normally

+ * the block size is 1x1.  But compressed formats will have block sizes

+ * of 4x4 or 8x4 pixels, etc.

+ * \param bw  returns block width in pixels

+ * \param bh  returns block height in pixels

+ */

+void

+_mesa_get_format_block_size(gl_format format, GLuint *bw, GLuint *bh)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+   *bw = info->BlockWidth;

+   *bh = info->BlockHeight;

+}

+

+

+/** Is the given format a compressed format? */

+GLboolean

+_mesa_is_format_compressed(gl_format format)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+   return info->BlockWidth > 1 || info->BlockHeight > 1;

+}

+

+

+/**

+ * Determine if the given format represents a packed depth/stencil buffer.

+ */

+GLboolean

+_mesa_is_format_packed_depth_stencil(gl_format format)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+

+   return info->BaseFormat == GL_DEPTH_STENCIL;

+}

+

+

+/**

+ * Is the given format a signed/unsigned integer color format?

+ */

+GLboolean

+_mesa_is_format_integer_color(gl_format format)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+   return (info->DataType == GL_INT || info->DataType == GL_UNSIGNED_INT) &&

+      info->BaseFormat != GL_DEPTH_COMPONENT &&

+      info->BaseFormat != GL_DEPTH_STENCIL &&

+      info->BaseFormat != GL_STENCIL_INDEX;

+}

+

+

+/**

+ * Return color encoding for given format.

+ * \return GL_LINEAR or GL_SRGB

+ */

+GLenum

+_mesa_get_format_color_encoding(gl_format format)

+{

+   /* XXX this info should be encoded in gl_format_info */

+   switch (format) {

+   case MESA_FORMAT_SRGB8:

+   case MESA_FORMAT_SRGBA8:

+   case MESA_FORMAT_SARGB8:

+   case MESA_FORMAT_SL8:

+   case MESA_FORMAT_SLA8:

+   case MESA_FORMAT_SRGB_DXT1:

+   case MESA_FORMAT_SRGBA_DXT1:

+   case MESA_FORMAT_SRGBA_DXT3:

+   case MESA_FORMAT_SRGBA_DXT5:

+      return GL_SRGB;

+   default:

+      return GL_LINEAR;

+   }

+}

+

+

+/**

+ * For an sRGB format, return the corresponding linear color space format.

+ * For non-sRGB formats, return the format as-is.

+ */

+gl_format

+_mesa_get_srgb_format_linear(gl_format format)

+{

+   switch (format) {

+   case MESA_FORMAT_SRGB8:

+      format = MESA_FORMAT_RGB888;

+      break;

+   case MESA_FORMAT_SRGBA8:

+      format = MESA_FORMAT_RGBA8888;

+      break;

+   case MESA_FORMAT_SARGB8:

+      format = MESA_FORMAT_ARGB8888;

+      break;

+   case MESA_FORMAT_SL8:

+      format = MESA_FORMAT_L8;

+      break;

+   case MESA_FORMAT_SLA8:

+      format = MESA_FORMAT_AL88;

+      break;

+   case MESA_FORMAT_SRGB_DXT1:

+      format = MESA_FORMAT_RGB_DXT1;

+      break;

+   case MESA_FORMAT_SRGBA_DXT1:

+      format = MESA_FORMAT_RGBA_DXT1;

+      break;

+   case MESA_FORMAT_SRGBA_DXT3:

+      format = MESA_FORMAT_RGBA_DXT3;

+      break;

+   case MESA_FORMAT_SRGBA_DXT5:

+      format = MESA_FORMAT_RGBA_DXT5;

+      break;

+   default:

+      break;

+   }

+   return format;

+}

+

+

+/**

+ * Return number of bytes needed to store an image of the given size

+ * in the given format.

+ */

+GLuint

+_mesa_format_image_size(gl_format format, GLsizei width,

+                        GLsizei height, GLsizei depth)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+   /* Strictly speaking, a conditional isn't needed here */

+   if (info->BlockWidth > 1 || info->BlockHeight > 1) {

+      /* compressed format (2D only for now) */

+      const GLuint bw = info->BlockWidth, bh = info->BlockHeight;

+      const GLuint wblocks = (width + bw - 1) / bw;

+      const GLuint hblocks = (height + bh - 1) / bh;

+      const GLuint sz = wblocks * hblocks * info->BytesPerBlock;

+      assert(depth == 1);

+      return sz;

+   }

+   else {

+      /* non-compressed */

+      const GLuint sz = width * height * depth * info->BytesPerBlock;

+      return sz;

+   }

+}

+

+

+/**

+ * Same as _mesa_format_image_size() but returns a 64-bit value to

+ * accomodate very large textures.

+ */

+uint64_t

+_mesa_format_image_size64(gl_format format, GLsizei width,

+                          GLsizei height, GLsizei depth)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+   /* Strictly speaking, a conditional isn't needed here */

+   if (info->BlockWidth > 1 || info->BlockHeight > 1) {

+      /* compressed format (2D only for now) */

+      const uint64_t bw = info->BlockWidth, bh = info->BlockHeight;

+      const uint64_t wblocks = (width + bw - 1) / bw;

+      const uint64_t hblocks = (height + bh - 1) / bh;

+      const uint64_t sz = wblocks * hblocks * info->BytesPerBlock;

+      assert(depth == 1);

+      return sz;

+   }

+   else {

+      /* non-compressed */

+      const uint64_t sz = ((uint64_t) width *

+                           (uint64_t) height *

+                           (uint64_t) depth *

+                           info->BytesPerBlock);

+      return sz;

+   }

+}

+

+

+

+GLint

+_mesa_format_row_stride(gl_format format, GLsizei width)

+{

+   const struct gl_format_info *info = _mesa_get_format_info(format);

+   /* Strictly speaking, a conditional isn't needed here */

+   if (info->BlockWidth > 1 || info->BlockHeight > 1) {

+      /* compressed format */

+      const GLuint bw = info->BlockWidth;

+      const GLuint wblocks = (width + bw - 1) / bw;

+      const GLint stride = wblocks * info->BytesPerBlock;

+      return stride;

+   }

+   else {

+      const GLint stride = width * info->BytesPerBlock;

+      return stride;

+   }

+}

+

+

+/**

+ * Debug/test: check that all formats are handled in the

+ * _mesa_format_to_type_and_comps() function.  When new pixel formats

+ * are added to Mesa, that function needs to be updated.

+ * This is a no-op after the first call.

+ */

+static void

+check_format_to_type_and_comps(void)

+{

+   gl_format f;

+

+   for (f = MESA_FORMAT_NONE + 1; f < MESA_FORMAT_COUNT; f++) {

+      GLenum datatype = 0;

+      GLuint comps = 0;

+      /* This function will emit a problem/warning if the format is

+       * not handled.

+       */

+      _mesa_format_to_type_and_comps(f, &datatype, &comps);

+   }

+}

+

+

+/**

+ * Do sanity checking of the format info table.

+ */

+void

+_mesa_test_formats(void)

+{

+   GLuint i;

+

+   assert(Elements(format_info) == MESA_FORMAT_COUNT);

+

+   for (i = 0; i < MESA_FORMAT_COUNT; i++) {

+      const struct gl_format_info *info = _mesa_get_format_info(i);

+      assert(info);

+

+      assert(info->Name == i);

+

+      if (info->Name == MESA_FORMAT_NONE)

+         continue;

+

+      if (info->BlockWidth == 1 && info->BlockHeight == 1) {

+         if (info->RedBits > 0) {

+            GLuint t = info->RedBits + info->GreenBits

+               + info->BlueBits + info->AlphaBits;

+            assert(t / 8 <= info->BytesPerBlock);

+            (void) t;

+         }

+      }

+

+      assert(info->DataType == GL_UNSIGNED_NORMALIZED ||

+             info->DataType == GL_SIGNED_NORMALIZED ||

+             info->DataType == GL_UNSIGNED_INT ||

+             info->DataType == GL_INT ||

+             info->DataType == GL_FLOAT);

+

+      if (info->BaseFormat == GL_RGB) {

+         assert(info->RedBits > 0);

+         assert(info->GreenBits > 0);

+         assert(info->BlueBits > 0);

+         assert(info->AlphaBits == 0);

+         assert(info->LuminanceBits == 0);

+         assert(info->IntensityBits == 0);

+      }

+      else if (info->BaseFormat == GL_RGBA) {

+         assert(info->RedBits > 0);

+         assert(info->GreenBits > 0);

+         assert(info->BlueBits > 0);

+         assert(info->AlphaBits > 0);

+         assert(info->LuminanceBits == 0);

+         assert(info->IntensityBits == 0);

+      }

+      else if (info->BaseFormat == GL_RG) {

+         assert(info->RedBits > 0);

+         assert(info->GreenBits > 0);

+         assert(info->BlueBits == 0);

+         assert(info->AlphaBits == 0);

+         assert(info->LuminanceBits == 0);

+         assert(info->IntensityBits == 0);

+      }

+      else if (info->BaseFormat == GL_RED) {

+         assert(info->RedBits > 0);

+         assert(info->GreenBits == 0);

+         assert(info->BlueBits == 0);

+         assert(info->AlphaBits == 0);

+         assert(info->LuminanceBits == 0);

+         assert(info->IntensityBits == 0);

+      }

+      else if (info->BaseFormat == GL_LUMINANCE) {

+         assert(info->RedBits == 0);

+         assert(info->GreenBits == 0);

+         assert(info->BlueBits == 0);

+         assert(info->AlphaBits == 0);

+         assert(info->LuminanceBits > 0);

+         assert(info->IntensityBits == 0);

+      }

+      else if (info->BaseFormat == GL_INTENSITY) {

+         assert(info->RedBits == 0);

+         assert(info->GreenBits == 0);

+         assert(info->BlueBits == 0);

+         assert(info->AlphaBits == 0);

+         assert(info->LuminanceBits == 0);

+         assert(info->IntensityBits > 0);

+      }

+   }

+

+   check_format_to_type_and_comps();

+}

+

+

+

+/**

+ * Return datatype and number of components per texel for the given gl_format.

+ * Only used for mipmap generation code.

+ */

+void

+_mesa_format_to_type_and_comps(gl_format format,

+                               GLenum *datatype, GLuint *comps)

+{

+   switch (format) {

+   case MESA_FORMAT_RGBA8888:

+   case MESA_FORMAT_RGBA8888_REV:

+   case MESA_FORMAT_ARGB8888:

+   case MESA_FORMAT_ARGB8888_REV:

+   case MESA_FORMAT_XRGB8888:

+   case MESA_FORMAT_XRGB8888_REV:

+      *datatype = GL_UNSIGNED_BYTE;

+      *comps = 4;

+      return;

+   case MESA_FORMAT_RGB888:

+   case MESA_FORMAT_BGR888:

+      *datatype = GL_UNSIGNED_BYTE;

+      *comps = 3;

+      return;

+   case MESA_FORMAT_RGB565:

+   case MESA_FORMAT_RGB565_REV:

+      *datatype = GL_UNSIGNED_SHORT_5_6_5;

+      *comps = 3;

+      return;

+

+   case MESA_FORMAT_ARGB4444:

+   case MESA_FORMAT_ARGB4444_REV:

+      *datatype = GL_UNSIGNED_SHORT_4_4_4_4;

+      *comps = 4;

+      return;

+

+   case MESA_FORMAT_ARGB1555:

+   case MESA_FORMAT_ARGB1555_REV:

+      *datatype = GL_UNSIGNED_SHORT_1_5_5_5_REV;

+      *comps = 4;

+      return;

+

+   case MESA_FORMAT_ARGB2101010:

+      *datatype = GL_UNSIGNED_INT_2_10_10_10_REV;

+      *comps = 4;

+      return;

+

+   case MESA_FORMAT_RGBA5551:

+      *datatype = GL_UNSIGNED_SHORT_5_5_5_1;

+      *comps = 4;

+      return;

+

+   case MESA_FORMAT_AL44:

+      *datatype = MESA_UNSIGNED_BYTE_4_4;

+      *comps = 2;

+      return;

+

+   case MESA_FORMAT_AL88:

+   case MESA_FORMAT_AL88_REV:

+   case MESA_FORMAT_RG88:

+   case MESA_FORMAT_RG88_REV:

+      *datatype = GL_UNSIGNED_BYTE;

+      *comps = 2;

+      return;

+

+   case MESA_FORMAT_AL1616:

+   case MESA_FORMAT_AL1616_REV:

+   case MESA_FORMAT_RG1616:

+   case MESA_FORMAT_RG1616_REV:

+      *datatype = GL_UNSIGNED_SHORT;

+      *comps = 2;

+      return;

+

+   case MESA_FORMAT_R16:

+   case MESA_FORMAT_A16:

+   case MESA_FORMAT_L16:

+   case MESA_FORMAT_I16:

+      *datatype = GL_UNSIGNED_SHORT;

+      *comps = 1;

+      return;

+

+   case MESA_FORMAT_RGB332:

+      *datatype = GL_UNSIGNED_BYTE_3_3_2;

+      *comps = 3;

+      return;

+

+   case MESA_FORMAT_A8:

+   case MESA_FORMAT_L8:

+   case MESA_FORMAT_I8:

+   case MESA_FORMAT_CI8:

+   case MESA_FORMAT_R8:

+   case MESA_FORMAT_S8:

+      *datatype = GL_UNSIGNED_BYTE;

+      *comps = 1;

+      return;

+

+   case MESA_FORMAT_YCBCR:

+   case MESA_FORMAT_YCBCR_REV:

+      *datatype = GL_UNSIGNED_SHORT;

+      *comps = 2;

+      return;

+

+   case MESA_FORMAT_Z24_S8:

+      *datatype = GL_UNSIGNED_INT;

+      *comps = 1; /* XXX OK? */

+      return;

+

+   case MESA_FORMAT_S8_Z24:

+      *datatype = GL_UNSIGNED_INT;

+      *comps = 1; /* XXX OK? */

+      return;

+

+   case MESA_FORMAT_Z16:

+      *datatype = GL_UNSIGNED_SHORT;

+      *comps = 1;

+      return;

+

+   case MESA_FORMAT_X8_Z24:

+      *datatype = GL_UNSIGNED_INT;

+      *comps = 1;

+      return;

+

+   case MESA_FORMAT_Z24_X8:

+      *datatype = GL_UNSIGNED_INT;

+      *comps = 1;

+      return;

+

+   case MESA_FORMAT_Z32:

+      *datatype = GL_UNSIGNED_INT;

+      *comps = 1;

+      return;

+

+   case MESA_FORMAT_DUDV8:

+      *datatype = GL_BYTE;

+      *comps = 2;

+      return;

+

+   case MESA_FORMAT_SIGNED_R8:

+   case MESA_FORMAT_SIGNED_A8:

+   case MESA_FORMAT_SIGNED_L8:

+   case MESA_FORMAT_SIGNED_I8:

+      *datatype = GL_BYTE;

+      *comps = 1;

+      return;

+   case MESA_FORMAT_SIGNED_RG88_REV:

+   case MESA_FORMAT_SIGNED_AL88:

+      *datatype = GL_BYTE;

+      *comps = 2;

+      return;

+   case MESA_FORMAT_SIGNED_RGBA8888:

+   case MESA_FORMAT_SIGNED_RGBA8888_REV:

+   case MESA_FORMAT_SIGNED_RGBX8888:

+      *datatype = GL_BYTE;

+      *comps = 4;

+      return;

+

+   case MESA_FORMAT_RGBA_16:

+      *datatype = GL_UNSIGNED_SHORT;

+      *comps = 4;

+      return;

+

+   case MESA_FORMAT_SIGNED_R16:

+   case MESA_FORMAT_SIGNED_A16:

+   case MESA_FORMAT_SIGNED_L16:

+   case MESA_FORMAT_SIGNED_I16:

+      *datatype = GL_SHORT;

+      *comps = 1;

+      return;

+   case MESA_FORMAT_SIGNED_GR1616:

+   case MESA_FORMAT_SIGNED_AL1616:

+      *datatype = GL_SHORT;

+      *comps = 2;

+      return;

+   case MESA_FORMAT_SIGNED_RGB_16:

+      *datatype = GL_SHORT;

+      *comps = 3;

+      return;

+   case MESA_FORMAT_SIGNED_RGBA_16:

+      *datatype = GL_SHORT;

+      *comps = 4;

+      return;

+

+#if FEATURE_EXT_texture_sRGB

+   case MESA_FORMAT_SRGB8:

+      *datatype = GL_UNSIGNED_BYTE;

+      *comps = 3;

+      return;

+   case MESA_FORMAT_SRGBA8:

+   case MESA_FORMAT_SARGB8:

+      *datatype = GL_UNSIGNED_BYTE;

+      *comps = 4;

+      return;

+   case MESA_FORMAT_SL8:

+      *datatype = GL_UNSIGNED_BYTE;

+      *comps = 1;

+      return;

+   case MESA_FORMAT_SLA8:

+      *datatype = GL_UNSIGNED_BYTE;

+      *comps = 2;

+      return;

+#endif

+

+#if FEATURE_texture_fxt1

+   case MESA_FORMAT_RGB_FXT1:

+   case MESA_FORMAT_RGBA_FXT1:

+#endif

+#if FEATURE_texture_s3tc

+   case MESA_FORMAT_RGB_DXT1:

+   case MESA_FORMAT_RGBA_DXT1:

+   case MESA_FORMAT_RGBA_DXT3:

+   case MESA_FORMAT_RGBA_DXT5:

+#if FEATURE_EXT_texture_sRGB

+   case MESA_FORMAT_SRGB_DXT1:

+   case MESA_FORMAT_SRGBA_DXT1:

+   case MESA_FORMAT_SRGBA_DXT3:

+   case MESA_FORMAT_SRGBA_DXT5:

+#endif

+#endif

+   case MESA_FORMAT_RED_RGTC1:

+   case MESA_FORMAT_SIGNED_RED_RGTC1:

+   case MESA_FORMAT_RG_RGTC2:

+   case MESA_FORMAT_SIGNED_RG_RGTC2:

+   case MESA_FORMAT_L_LATC1:

+   case MESA_FORMAT_SIGNED_L_LATC1:

+   case MESA_FORMAT_LA_LATC2:

+   case MESA_FORMAT_SIGNED_LA_LATC2:

+      /* XXX generate error instead? */

+      *datatype = GL_UNSIGNED_BYTE;

+      *comps = 0;

+      return;

+

+   case MESA_FORMAT_RGBA_FLOAT32:

+      *datatype = GL_FLOAT;

+      *comps = 4;

+      return;

+   case MESA_FORMAT_RGBA_FLOAT16:

+      *datatype = GL_HALF_FLOAT_ARB;

+      *comps = 4;

+      return;

+   case MESA_FORMAT_RGB_FLOAT32:

+      *datatype = GL_FLOAT;

+      *comps = 3;

+      return;

+   case MESA_FORMAT_RGB_FLOAT16:

+      *datatype = GL_HALF_FLOAT_ARB;

+      *comps = 3;

+      return;

+   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32:

+      *datatype = GL_FLOAT;

+      *comps = 2;

+      return;

+   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16:

+      *datatype = GL_HALF_FLOAT_ARB;

+      *comps = 2;

+      return;

+   case MESA_FORMAT_ALPHA_FLOAT32:

+   case MESA_FORMAT_LUMINANCE_FLOAT32:

+   case MESA_FORMAT_INTENSITY_FLOAT32:

+      *datatype = GL_FLOAT;

+      *comps = 1;

+      return;

+   case MESA_FORMAT_ALPHA_FLOAT16:

+   case MESA_FORMAT_LUMINANCE_FLOAT16:

+   case MESA_FORMAT_INTENSITY_FLOAT16:

+      *datatype = GL_HALF_FLOAT_ARB;

+      *comps = 1;

+      return;

+

+   case MESA_FORMAT_RGBA_INT8:

+      *datatype = GL_BYTE;

+      *comps = 4;

+      return;

+   case MESA_FORMAT_RGBA_INT16:

+      *datatype = GL_SHORT;

+      *comps = 4;

+      return;

+   case MESA_FORMAT_RGBA_INT32:

+      *datatype = GL_INT;

+      *comps = 4;

+      return;

+

+   /**

+    * \name Non-normalized unsigned integer formats.

+    */

+   case MESA_FORMAT_RGBA_UINT8:

+      *datatype = GL_UNSIGNED_BYTE;

+      *comps = 4;

+      return;

+   case MESA_FORMAT_RGBA_UINT16:

+      *datatype = GL_UNSIGNED_SHORT;

+      *comps = 4;

+      return;

+   case MESA_FORMAT_RGBA_UINT32:

+      *datatype = GL_UNSIGNED_INT;

+      *comps = 4;

+      return;

+

+   case MESA_FORMAT_COUNT:

+      assert(0);

+      return;

+

+   case MESA_FORMAT_NONE:

+   /* For debug builds, warn if any formats are not handled */

+#ifdef DEBUG

+   default:

+#endif

+      _mesa_problem(NULL, "bad format %s in _mesa_format_to_type_and_comps",

+                    _mesa_get_format_name(format));

+      *datatype = 0;

+      *comps = 1;

+   }

+}

diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h
index e0c2acbb9..1eaca9b4c 100644
--- a/mesalib/src/mesa/main/formats.h
+++ b/mesalib/src/mesa/main/formats.h
@@ -1,260 +1,260 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.7
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (c) 2008-2009  VMware, Inc.
- *
- * 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
- * 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.
- */
-
-/*
- * Authors:
- *   Brian Paul
- */
-
-
-#ifndef FORMATS_H
-#define FORMATS_H
-
-
-#include <GL/gl.h>
-
-/* OpenGL doesn't have GL_UNSIGNED_BYTE_4_4, so we must define our own type
- * for GL_LUMINANCE4_ALPHA4. */
-#define MESA_UNSIGNED_BYTE_4_4 (GL_UNSIGNED_BYTE<<1)
-
-
-/**
- * Mesa texture/renderbuffer image formats.
- */
-typedef enum
-{
-   MESA_FORMAT_NONE = 0,
-
-   /** 
-    * \name Basic hardware formats
-    */
-   /*@{*/
-				/* msb <------ TEXEL BITS -----------> lsb */
-				/* ---- ---- ---- ---- ---- ---- ---- ---- */
-   MESA_FORMAT_RGBA8888,	/* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
-   MESA_FORMAT_RGBA8888_REV,	/* AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
-   MESA_FORMAT_ARGB8888,	/* AAAA AAAA RRRR RRRR GGGG GGGG BBBB BBBB */
-   MESA_FORMAT_ARGB8888_REV,	/* BBBB BBBB GGGG GGGG RRRR RRRR AAAA AAAA */
-   MESA_FORMAT_XRGB8888,	/* xxxx xxxx RRRR RRRR GGGG GGGG BBBB BBBB */
-   MESA_FORMAT_XRGB8888_REV,	/* BBBB BBBB GGGG GGGG RRRR RRRR xxxx xxxx */
-   MESA_FORMAT_RGB888,		/*           RRRR RRRR GGGG GGGG BBBB BBBB */
-   MESA_FORMAT_BGR888,		/*           BBBB BBBB GGGG GGGG RRRR RRRR */
-   MESA_FORMAT_RGB565,		/*                     RRRR RGGG GGGB BBBB */
-   MESA_FORMAT_RGB565_REV,	/*                     GGGB BBBB RRRR RGGG */
-   MESA_FORMAT_ARGB4444,	/*                     AAAA RRRR GGGG BBBB */
-   MESA_FORMAT_ARGB4444_REV,	/*                     GGGG BBBB AAAA RRRR */
-   MESA_FORMAT_RGBA5551,        /*                     RRRR RGGG GGBB BBBA */
-   MESA_FORMAT_ARGB1555,	/*                     ARRR RRGG GGGB BBBB */
-   MESA_FORMAT_ARGB1555_REV,	/*                     GGGB BBBB ARRR RRGG */
-   MESA_FORMAT_AL44,		/*                               AAAA LLLL */
-   MESA_FORMAT_AL88,		/*                     AAAA AAAA LLLL LLLL */
-   MESA_FORMAT_AL88_REV,	/*                     LLLL LLLL AAAA AAAA */
-   MESA_FORMAT_AL1616,          /* AAAA AAAA AAAA AAAA LLLL LLLL LLLL LLLL */
-   MESA_FORMAT_AL1616_REV,      /* LLLL LLLL LLLL LLLL AAAA AAAA AAAA AAAA */
-   MESA_FORMAT_RGB332,		/*                               RRRG GGBB */
-   MESA_FORMAT_A8,		/*                               AAAA AAAA */
-   MESA_FORMAT_A16,             /*                     AAAA AAAA AAAA AAAA */
-   MESA_FORMAT_L8,		/*                               LLLL LLLL */
-   MESA_FORMAT_L16,             /*                     LLLL LLLL LLLL LLLL */
-   MESA_FORMAT_I8,		/*                               IIII IIII */
-   MESA_FORMAT_I16,             /*                     IIII IIII IIII IIII */
-   MESA_FORMAT_CI8,		/*                               CCCC CCCC */
-   MESA_FORMAT_YCBCR,		/*                     YYYY YYYY UorV UorV */
-   MESA_FORMAT_YCBCR_REV,	/*                     UorV UorV YYYY YYYY */
-   MESA_FORMAT_R8,		/*                               RRRR RRRR */
-   MESA_FORMAT_RG88,		/*                     RRRR RRRR GGGG GGGG */
-   MESA_FORMAT_RG88_REV,	/*                     GGGG GGGG RRRR RRRR */
-   MESA_FORMAT_R16,		/*                     RRRR RRRR RRRR RRRR */
-   MESA_FORMAT_RG1616,		/* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */
-   MESA_FORMAT_RG1616_REV,	/* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */
-   MESA_FORMAT_ARGB2101010,     /* AARR RRRR RRRR GGGG GGGG GGBB BBBB BBBB */
-   MESA_FORMAT_Z24_S8,          /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ SSSS SSSS */
-   MESA_FORMAT_S8_Z24,          /* SSSS SSSS ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
-   MESA_FORMAT_Z16,             /*                     ZZZZ ZZZZ ZZZZ ZZZZ */
-   MESA_FORMAT_X8_Z24,          /* xxxx xxxx ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
-   MESA_FORMAT_Z24_X8,          /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ xxxx xxxx */
-   MESA_FORMAT_Z32,             /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
-   MESA_FORMAT_S8,              /*                               SSSS SSSS */
-   /*@}*/
-
-   /**
-    * \name 8-bit/channel sRGB formats
-    */
-   /*@{*/
-   MESA_FORMAT_SRGB8,
-   MESA_FORMAT_SRGBA8,
-   MESA_FORMAT_SARGB8,
-   MESA_FORMAT_SL8,
-   MESA_FORMAT_SLA8,
-   MESA_FORMAT_SRGB_DXT1,
-   MESA_FORMAT_SRGBA_DXT1,
-   MESA_FORMAT_SRGBA_DXT3,
-   MESA_FORMAT_SRGBA_DXT5,
-   /*@}*/
-
-   /**
-    * \name Compressed texture formats.
-    */
-   /*@{*/
-   MESA_FORMAT_RGB_FXT1,
-   MESA_FORMAT_RGBA_FXT1,
-   MESA_FORMAT_RGB_DXT1,
-   MESA_FORMAT_RGBA_DXT1,
-   MESA_FORMAT_RGBA_DXT3,
-   MESA_FORMAT_RGBA_DXT5,
-   /*@}*/
-
-   /**
-    * \name Floating point texture formats.
-    */
-   /*@{*/
-   MESA_FORMAT_RGBA_FLOAT32,
-   MESA_FORMAT_RGBA_FLOAT16,
-   MESA_FORMAT_RGB_FLOAT32,
-   MESA_FORMAT_RGB_FLOAT16,
-   MESA_FORMAT_ALPHA_FLOAT32,
-   MESA_FORMAT_ALPHA_FLOAT16,
-   MESA_FORMAT_LUMINANCE_FLOAT32,
-   MESA_FORMAT_LUMINANCE_FLOAT16,
-   MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,
-   MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,
-   MESA_FORMAT_INTENSITY_FLOAT32,
-   MESA_FORMAT_INTENSITY_FLOAT16,
-   /*@}*/
-
-   /**
-    * \name Non-normalized signed integer formats.
-    * XXX Note: these are just stand-ins for some better hardware
-    * formats TBD such as BGRA or ARGB.
-    */
-   MESA_FORMAT_RGBA_INT8,
-   MESA_FORMAT_RGBA_INT16,
-   MESA_FORMAT_RGBA_INT32,
-
-   /**
-    * \name Non-normalized unsigned integer formats.
-    */
-   MESA_FORMAT_RGBA_UINT8,
-   MESA_FORMAT_RGBA_UINT16,
-   MESA_FORMAT_RGBA_UINT32,
-
-                                  /* msb <------ TEXEL BITS -----------> lsb */
-                                  /* ---- ---- ---- ---- ---- ---- ---- ---- */
-   /**
-    * \name Signed fixed point texture formats.
-    */
-   /*@{*/
-   MESA_FORMAT_DUDV8,             /*                     DUDU DUDU DVDV DVDV */
-   MESA_FORMAT_SIGNED_R8,         /*                               RRRR RRRR */
-   MESA_FORMAT_SIGNED_RG88_REV,   /*                     GGGG GGGG RRRR RRRR */
-   MESA_FORMAT_SIGNED_RGBX8888,   /* RRRR RRRR GGGG GGGG BBBB BBBB xxxx xxxx */
-   MESA_FORMAT_SIGNED_RGBA8888,   /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
-   MESA_FORMAT_SIGNED_RGBA8888_REV,/*AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
-   MESA_FORMAT_SIGNED_R16,        /*                     RRRR RRRR RRRR RRRR */
-   MESA_FORMAT_SIGNED_GR1616,     /* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */
-   MESA_FORMAT_SIGNED_RGB_16,     /* ushort[0]=R, ushort[1]=G, ushort[2]=B */
-   MESA_FORMAT_SIGNED_RGBA_16,    /* ... */
-   MESA_FORMAT_RGBA_16,           /* ... */
-   /*@}*/
-
-   /*@{*/
-   MESA_FORMAT_RED_RGTC1,
-   MESA_FORMAT_SIGNED_RED_RGTC1,
-   MESA_FORMAT_RG_RGTC2,
-   MESA_FORMAT_SIGNED_RG_RGTC2,
-   /*@}*/
-
-   /*@{*/
-   MESA_FORMAT_L_LATC1,
-   MESA_FORMAT_SIGNED_L_LATC1,
-   MESA_FORMAT_LA_LATC2,
-   MESA_FORMAT_SIGNED_LA_LATC2,
-   /*@}*/
-
-   MESA_FORMAT_SIGNED_A8,         /*                               AAAA AAAA */
-   MESA_FORMAT_SIGNED_L8,         /*                               LLLL LLLL */
-   MESA_FORMAT_SIGNED_AL88,       /*                     AAAA AAAA LLLL LLLL */
-   MESA_FORMAT_SIGNED_I8,         /*                               IIII IIII */
-   MESA_FORMAT_SIGNED_A16,        /*                     AAAA AAAA AAAA AAAA */
-   MESA_FORMAT_SIGNED_L16,        /*                     LLLL LLLL LLLL LLLL */
-   MESA_FORMAT_SIGNED_AL1616,     /* AAAA AAAA AAAA AAAA LLLL LLLL LLLL LLLL */
-   MESA_FORMAT_SIGNED_I16,        /*                     IIII IIII IIII IIII */
-
-   MESA_FORMAT_COUNT
-} gl_format;
-
-
-extern const char *
-_mesa_get_format_name(gl_format format);
-
-extern GLuint
-_mesa_get_format_bytes(gl_format format);
-
-extern GLint
-_mesa_get_format_bits(gl_format format, GLenum pname);
-
-extern GLenum
-_mesa_get_format_datatype(gl_format format);
-
-extern GLenum
-_mesa_get_format_base_format(gl_format format);
-
-extern void
-_mesa_get_format_block_size(gl_format format, GLuint *bw, GLuint *bh);
-
-extern GLboolean
-_mesa_is_format_compressed(gl_format format);
-
-extern GLboolean
-_mesa_is_format_packed_depth_stencil(gl_format format);
-
-extern GLboolean
-_mesa_is_format_integer_color(gl_format format);
-
-extern GLenum
-_mesa_get_format_color_encoding(gl_format format);
-
-extern GLuint
-_mesa_format_image_size(gl_format format, GLsizei width,
-                        GLsizei height, GLsizei depth);
-
-extern uint64_t
-_mesa_format_image_size64(gl_format format, GLsizei width,
-                          GLsizei height, GLsizei depth);
-
-extern GLint
-_mesa_format_row_stride(gl_format format, GLsizei width);
-
-extern void
-_mesa_format_to_type_and_comps(gl_format format,
-                               GLenum *datatype, GLuint *comps);
-
-extern void
-_mesa_test_formats(void);
-
-extern gl_format
-_mesa_get_srgb_format_linear(gl_format format);
-
-#endif /* FORMATS_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.7

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (c) 2008-2009  VMware, Inc.

+ *

+ * 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

+ * 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.

+ */

+

+/*

+ * Authors:

+ *   Brian Paul

+ */

+

+

+#ifndef FORMATS_H

+#define FORMATS_H

+

+

+#include <GL/gl.h>

+

+/* OpenGL doesn't have GL_UNSIGNED_BYTE_4_4, so we must define our own type

+ * for GL_LUMINANCE4_ALPHA4. */

+#define MESA_UNSIGNED_BYTE_4_4 (GL_UNSIGNED_BYTE<<1)

+

+

+/**

+ * Mesa texture/renderbuffer image formats.

+ */

+typedef enum

+{

+   MESA_FORMAT_NONE = 0,

+

+   /** 

+    * \name Basic hardware formats

+    */

+   /*@{*/

+				/* msb <------ TEXEL BITS -----------> lsb */

+				/* ---- ---- ---- ---- ---- ---- ---- ---- */

+   MESA_FORMAT_RGBA8888,	/* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */

+   MESA_FORMAT_RGBA8888_REV,	/* AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */

+   MESA_FORMAT_ARGB8888,	/* AAAA AAAA RRRR RRRR GGGG GGGG BBBB BBBB */

+   MESA_FORMAT_ARGB8888_REV,	/* BBBB BBBB GGGG GGGG RRRR RRRR AAAA AAAA */

+   MESA_FORMAT_XRGB8888,	/* xxxx xxxx RRRR RRRR GGGG GGGG BBBB BBBB */

+   MESA_FORMAT_XRGB8888_REV,	/* BBBB BBBB GGGG GGGG RRRR RRRR xxxx xxxx */

+   MESA_FORMAT_RGB888,		/*           RRRR RRRR GGGG GGGG BBBB BBBB */

+   MESA_FORMAT_BGR888,		/*           BBBB BBBB GGGG GGGG RRRR RRRR */

+   MESA_FORMAT_RGB565,		/*                     RRRR RGGG GGGB BBBB */

+   MESA_FORMAT_RGB565_REV,	/*                     GGGB BBBB RRRR RGGG */

+   MESA_FORMAT_ARGB4444,	/*                     AAAA RRRR GGGG BBBB */

+   MESA_FORMAT_ARGB4444_REV,	/*                     GGGG BBBB AAAA RRRR */

+   MESA_FORMAT_RGBA5551,        /*                     RRRR RGGG GGBB BBBA */

+   MESA_FORMAT_ARGB1555,	/*                     ARRR RRGG GGGB BBBB */

+   MESA_FORMAT_ARGB1555_REV,	/*                     GGGB BBBB ARRR RRGG */

+   MESA_FORMAT_AL44,		/*                               AAAA LLLL */

+   MESA_FORMAT_AL88,		/*                     AAAA AAAA LLLL LLLL */

+   MESA_FORMAT_AL88_REV,	/*                     LLLL LLLL AAAA AAAA */

+   MESA_FORMAT_AL1616,          /* AAAA AAAA AAAA AAAA LLLL LLLL LLLL LLLL */

+   MESA_FORMAT_AL1616_REV,      /* LLLL LLLL LLLL LLLL AAAA AAAA AAAA AAAA */

+   MESA_FORMAT_RGB332,		/*                               RRRG GGBB */

+   MESA_FORMAT_A8,		/*                               AAAA AAAA */

+   MESA_FORMAT_A16,             /*                     AAAA AAAA AAAA AAAA */

+   MESA_FORMAT_L8,		/*                               LLLL LLLL */

+   MESA_FORMAT_L16,             /*                     LLLL LLLL LLLL LLLL */

+   MESA_FORMAT_I8,		/*                               IIII IIII */

+   MESA_FORMAT_I16,             /*                     IIII IIII IIII IIII */

+   MESA_FORMAT_CI8,		/*                               CCCC CCCC */

+   MESA_FORMAT_YCBCR,		/*                     YYYY YYYY UorV UorV */

+   MESA_FORMAT_YCBCR_REV,	/*                     UorV UorV YYYY YYYY */

+   MESA_FORMAT_R8,		/*                               RRRR RRRR */

+   MESA_FORMAT_RG88,		/*                     RRRR RRRR GGGG GGGG */

+   MESA_FORMAT_RG88_REV,	/*                     GGGG GGGG RRRR RRRR */

+   MESA_FORMAT_R16,		/*                     RRRR RRRR RRRR RRRR */

+   MESA_FORMAT_RG1616,		/* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */

+   MESA_FORMAT_RG1616_REV,	/* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */

+   MESA_FORMAT_ARGB2101010,     /* AARR RRRR RRRR GGGG GGGG GGBB BBBB BBBB */

+   MESA_FORMAT_Z24_S8,          /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ SSSS SSSS */

+   MESA_FORMAT_S8_Z24,          /* SSSS SSSS ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */

+   MESA_FORMAT_Z16,             /*                     ZZZZ ZZZZ ZZZZ ZZZZ */

+   MESA_FORMAT_X8_Z24,          /* xxxx xxxx ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */

+   MESA_FORMAT_Z24_X8,          /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ xxxx xxxx */

+   MESA_FORMAT_Z32,             /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */

+   MESA_FORMAT_S8,              /*                               SSSS SSSS */

+   /*@}*/

+

+   /**

+    * \name 8-bit/channel sRGB formats

+    */

+   /*@{*/

+   MESA_FORMAT_SRGB8,

+   MESA_FORMAT_SRGBA8,

+   MESA_FORMAT_SARGB8,

+   MESA_FORMAT_SL8,

+   MESA_FORMAT_SLA8,

+   MESA_FORMAT_SRGB_DXT1,

+   MESA_FORMAT_SRGBA_DXT1,

+   MESA_FORMAT_SRGBA_DXT3,

+   MESA_FORMAT_SRGBA_DXT5,

+   /*@}*/

+

+   /**

+    * \name Compressed texture formats.

+    */

+   /*@{*/

+   MESA_FORMAT_RGB_FXT1,

+   MESA_FORMAT_RGBA_FXT1,

+   MESA_FORMAT_RGB_DXT1,

+   MESA_FORMAT_RGBA_DXT1,

+   MESA_FORMAT_RGBA_DXT3,

+   MESA_FORMAT_RGBA_DXT5,

+   /*@}*/

+

+   /**

+    * \name Floating point texture formats.

+    */

+   /*@{*/

+   MESA_FORMAT_RGBA_FLOAT32,

+   MESA_FORMAT_RGBA_FLOAT16,

+   MESA_FORMAT_RGB_FLOAT32,

+   MESA_FORMAT_RGB_FLOAT16,

+   MESA_FORMAT_ALPHA_FLOAT32,

+   MESA_FORMAT_ALPHA_FLOAT16,

+   MESA_FORMAT_LUMINANCE_FLOAT32,

+   MESA_FORMAT_LUMINANCE_FLOAT16,

+   MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,

+   MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,

+   MESA_FORMAT_INTENSITY_FLOAT32,

+   MESA_FORMAT_INTENSITY_FLOAT16,

+   /*@}*/

+

+   /**

+    * \name Non-normalized signed integer formats.

+    * XXX Note: these are just stand-ins for some better hardware

+    * formats TBD such as BGRA or ARGB.

+    */

+   MESA_FORMAT_RGBA_INT8,

+   MESA_FORMAT_RGBA_INT16,

+   MESA_FORMAT_RGBA_INT32,

+

+   /**

+    * \name Non-normalized unsigned integer formats.

+    */

+   MESA_FORMAT_RGBA_UINT8,

+   MESA_FORMAT_RGBA_UINT16,

+   MESA_FORMAT_RGBA_UINT32,

+

+                                  /* msb <------ TEXEL BITS -----------> lsb */

+                                  /* ---- ---- ---- ---- ---- ---- ---- ---- */

+   /**

+    * \name Signed fixed point texture formats.

+    */

+   /*@{*/

+   MESA_FORMAT_DUDV8,             /*                     DUDU DUDU DVDV DVDV */

+   MESA_FORMAT_SIGNED_R8,         /*                               RRRR RRRR */

+   MESA_FORMAT_SIGNED_RG88_REV,   /*                     GGGG GGGG RRRR RRRR */

+   MESA_FORMAT_SIGNED_RGBX8888,   /* RRRR RRRR GGGG GGGG BBBB BBBB xxxx xxxx */

+   MESA_FORMAT_SIGNED_RGBA8888,   /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */

+   MESA_FORMAT_SIGNED_RGBA8888_REV,/*AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */

+   MESA_FORMAT_SIGNED_R16,        /*                     RRRR RRRR RRRR RRRR */

+   MESA_FORMAT_SIGNED_GR1616,     /* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */

+   MESA_FORMAT_SIGNED_RGB_16,     /* ushort[0]=R, ushort[1]=G, ushort[2]=B */

+   MESA_FORMAT_SIGNED_RGBA_16,    /* ... */

+   MESA_FORMAT_RGBA_16,           /* ... */

+   /*@}*/

+

+   /*@{*/

+   MESA_FORMAT_RED_RGTC1,

+   MESA_FORMAT_SIGNED_RED_RGTC1,

+   MESA_FORMAT_RG_RGTC2,

+   MESA_FORMAT_SIGNED_RG_RGTC2,

+   /*@}*/

+

+   /*@{*/

+   MESA_FORMAT_L_LATC1,

+   MESA_FORMAT_SIGNED_L_LATC1,

+   MESA_FORMAT_LA_LATC2,

+   MESA_FORMAT_SIGNED_LA_LATC2,

+   /*@}*/

+

+   MESA_FORMAT_SIGNED_A8,         /*                               AAAA AAAA */

+   MESA_FORMAT_SIGNED_L8,         /*                               LLLL LLLL */

+   MESA_FORMAT_SIGNED_AL88,       /*                     AAAA AAAA LLLL LLLL */

+   MESA_FORMAT_SIGNED_I8,         /*                               IIII IIII */

+   MESA_FORMAT_SIGNED_A16,        /*                     AAAA AAAA AAAA AAAA */

+   MESA_FORMAT_SIGNED_L16,        /*                     LLLL LLLL LLLL LLLL */

+   MESA_FORMAT_SIGNED_AL1616,     /* AAAA AAAA AAAA AAAA LLLL LLLL LLLL LLLL */

+   MESA_FORMAT_SIGNED_I16,        /*                     IIII IIII IIII IIII */

+

+   MESA_FORMAT_COUNT

+} gl_format;

+

+

+extern const char *

+_mesa_get_format_name(gl_format format);

+

+extern GLuint

+_mesa_get_format_bytes(gl_format format);

+

+extern GLint

+_mesa_get_format_bits(gl_format format, GLenum pname);

+

+extern GLenum

+_mesa_get_format_datatype(gl_format format);

+

+extern GLenum

+_mesa_get_format_base_format(gl_format format);

+

+extern void

+_mesa_get_format_block_size(gl_format format, GLuint *bw, GLuint *bh);

+

+extern GLboolean

+_mesa_is_format_compressed(gl_format format);

+

+extern GLboolean

+_mesa_is_format_packed_depth_stencil(gl_format format);

+

+extern GLboolean

+_mesa_is_format_integer_color(gl_format format);

+

+extern GLenum

+_mesa_get_format_color_encoding(gl_format format);

+

+extern GLuint

+_mesa_format_image_size(gl_format format, GLsizei width,

+                        GLsizei height, GLsizei depth);

+

+extern uint64_t

+_mesa_format_image_size64(gl_format format, GLsizei width,

+                          GLsizei height, GLsizei depth);

+

+extern GLint

+_mesa_format_row_stride(gl_format format, GLsizei width);

+

+extern void

+_mesa_format_to_type_and_comps(gl_format format,

+                               GLenum *datatype, GLuint *comps);

+

+extern void

+_mesa_test_formats(void);

+

+extern gl_format

+_mesa_get_srgb_format_linear(gl_format format);

+

+#endif /* FORMATS_H */

diff --git a/mesalib/src/mesa/main/glheader.h b/mesalib/src/mesa/main/glheader.h
index 0df811986..dc78ccbf6 100644
--- a/mesalib/src/mesa/main/glheader.h
+++ b/mesalib/src/mesa/main/glheader.h
@@ -1,167 +1,167 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file glheader.h
- * Wrapper for GL/gl.h and GL/glext.h
- */
-
-
-#ifndef GLHEADER_H
-#define GLHEADER_H
-
-
-#ifdef WGLAPI
-#undef WGLAPI
-#endif
-
-
-#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
-#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
-#    define WGLAPI __declspec(dllexport)
-#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
-#    define WGLAPI __declspec(dllimport)
-#  else /* for use with static link lib build of Win32 edition only */
-#    define WGLAPI __declspec(dllimport)
-#  endif /* _STATIC_MESA support */
-#endif /* WIN32 / CYGWIN bracket */
-
-
-#define GL_GLEXT_PROTOTYPES
-#include "GL/gl.h"
-#include "GL/glext.h"
-
-
-/**
- * GL_FIXED is defined in glext.h version 64 but these typedefs aren't (yet).
- */
-typedef int GLfixed;
-typedef int GLclampx;
-
-
-#ifndef GL_OES_EGL_image
-typedef void *GLeglImageOES;
-#endif
-
-
-#ifndef GL_OES_point_size_array
-#define GL_POINT_SIZE_ARRAY_OES                                 0x8B9C
-#define GL_POINT_SIZE_ARRAY_TYPE_OES                            0x898A
-#define GL_POINT_SIZE_ARRAY_STRIDE_OES                          0x898B
-#define GL_POINT_SIZE_ARRAY_POINTER_OES                         0x898C
-#define GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES                  0x8B9F
-#endif
-
-
-#ifndef GL_OES_draw_texture
-#define GL_TEXTURE_CROP_RECT_OES  0x8B9D
-#endif
-
-
-#ifndef GL_PROGRAM_BINARY_LENGTH_OES
-#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741
-#endif
-
-/* GLES 2.0 tokens */
-#ifndef GL_RGB565
-#define GL_RGB565 0x8D62
-#endif
-
-#ifndef GL_TEXTURE_GEN_STR_OES
-#define GL_TEXTURE_GEN_STR_OES                                  0x8D60
-#endif
-
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_PALETTE4_RGB8_OES                                    0x8B90
-#define GL_PALETTE4_RGBA8_OES                                   0x8B91
-#define GL_PALETTE4_R5_G6_B5_OES                                0x8B92
-#define GL_PALETTE4_RGBA4_OES                                   0x8B93
-#define GL_PALETTE4_RGB5_A1_OES                                 0x8B94
-#define GL_PALETTE8_RGB8_OES                                    0x8B95
-#define GL_PALETTE8_RGBA8_OES                                   0x8B96
-#define GL_PALETTE8_R5_G6_B5_OES                                0x8B97
-#define GL_PALETTE8_RGBA4_OES                                   0x8B98
-#define GL_PALETTE8_RGB5_A1_OES                                 0x8B99
-#endif
-
-#ifndef GL_OES_matrix_get
-#define GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES               0x898D
-#define GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES              0x898E
-#define GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES                 0x898F
-#endif
-
-#ifndef GL_ES_VERSION_2_0
-#define GL_SHADER_BINARY_FORMATS            0x8DF8
-#define GL_NUM_SHADER_BINARY_FORMATS        0x8DF9
-#define GL_SHADER_COMPILER                  0x8DFA
-#define GL_MAX_VERTEX_UNIFORM_VECTORS       0x8DFB
-#define GL_MAX_VARYING_VECTORS              0x8DFC
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD
-#endif
-
-#ifndef GL_ATI_texture_compression_3dc
-#define GL_ATI_texture_compression_3dc 1
-#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837
-#endif
-
-
-/**
- * Internal token to represent a GLSL shader program (a collection of
- * one or more shaders that get linked together).  Note that GLSL
- * shaders and shader programs share one name space (one hash table)
- * so we need a value that's different from any of the
- * GL_VERTEX/FRAGMENT/GEOMETRY_PROGRAM tokens.
- */
-#define GL_SHADER_PROGRAM_MESA 0x9999
-
-
-/**
- * Internal token for geometry programs.
- * Use the value for GL_GEOMETRY_PROGRAM_NV for now.
- */
-#define MESA_GEOMETRY_PROGRAM 0x8c26
-
-/* Several fields of struct gl_config can take these as values.  Since
- * GLX header files may not be available everywhere they need to be used,
- * redefine them here.
- */
-#define GLX_NONE                           0x8000
-#define GLX_SLOW_CONFIG                    0x8001
-#define GLX_TRUE_COLOR                     0x8002
-#define GLX_DIRECT_COLOR                   0x8003
-#define GLX_PSEUDO_COLOR                   0x8004
-#define GLX_STATIC_COLOR                   0x8005
-#define GLX_GRAY_SCALE                     0x8006
-#define GLX_STATIC_GRAY                    0x8007
-#define GLX_TRANSPARENT_RGB                0x8008
-#define GLX_TRANSPARENT_INDEX              0x8009
-#define GLX_NON_CONFORMANT_CONFIG          0x800D
-#define GLX_SWAP_EXCHANGE_OML              0x8061
-#define GLX_SWAP_COPY_OML                  0x8062
-#define GLX_SWAP_UNDEFINED_OML             0x8063
-
-#define GLX_DONT_CARE                      0xFFFFFFFF
-
-#endif /* GLHEADER_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file glheader.h

+ * Wrapper for GL/gl.h and GL/glext.h

+ */

+

+

+#ifndef GLHEADER_H

+#define GLHEADER_H

+

+

+#ifdef WGLAPI

+#undef WGLAPI

+#endif

+

+

+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)

+#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */

+#    define WGLAPI __declspec(dllexport)

+#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */

+#    define WGLAPI __declspec(dllimport)

+#  else /* for use with static link lib build of Win32 edition only */

+#    define WGLAPI __declspec(dllimport)

+#  endif /* _STATIC_MESA support */

+#endif /* WIN32 / CYGWIN bracket */

+

+

+#define GL_GLEXT_PROTOTYPES

+#include "GL/gl.h"

+#include "GL/glext.h"

+

+

+/**

+ * GL_FIXED is defined in glext.h version 64 but these typedefs aren't (yet).

+ */

+typedef int GLfixed;

+typedef int GLclampx;

+

+

+#ifndef GL_OES_EGL_image

+typedef void *GLeglImageOES;

+#endif

+

+

+#ifndef GL_OES_point_size_array

+#define GL_POINT_SIZE_ARRAY_OES                                 0x8B9C

+#define GL_POINT_SIZE_ARRAY_TYPE_OES                            0x898A

+#define GL_POINT_SIZE_ARRAY_STRIDE_OES                          0x898B

+#define GL_POINT_SIZE_ARRAY_POINTER_OES                         0x898C

+#define GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES                  0x8B9F

+#endif

+

+

+#ifndef GL_OES_draw_texture

+#define GL_TEXTURE_CROP_RECT_OES  0x8B9D

+#endif

+

+

+#ifndef GL_PROGRAM_BINARY_LENGTH_OES

+#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741

+#endif

+

+/* GLES 2.0 tokens */

+#ifndef GL_RGB565

+#define GL_RGB565 0x8D62

+#endif

+

+#ifndef GL_TEXTURE_GEN_STR_OES

+#define GL_TEXTURE_GEN_STR_OES                                  0x8D60

+#endif

+

+#ifndef GL_OES_compressed_paletted_texture

+#define GL_PALETTE4_RGB8_OES                                    0x8B90

+#define GL_PALETTE4_RGBA8_OES                                   0x8B91

+#define GL_PALETTE4_R5_G6_B5_OES                                0x8B92

+#define GL_PALETTE4_RGBA4_OES                                   0x8B93

+#define GL_PALETTE4_RGB5_A1_OES                                 0x8B94

+#define GL_PALETTE8_RGB8_OES                                    0x8B95

+#define GL_PALETTE8_RGBA8_OES                                   0x8B96

+#define GL_PALETTE8_R5_G6_B5_OES                                0x8B97

+#define GL_PALETTE8_RGBA4_OES                                   0x8B98

+#define GL_PALETTE8_RGB5_A1_OES                                 0x8B99

+#endif

+

+#ifndef GL_OES_matrix_get

+#define GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES               0x898D

+#define GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES              0x898E

+#define GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES                 0x898F

+#endif

+

+#ifndef GL_ES_VERSION_2_0

+#define GL_SHADER_BINARY_FORMATS            0x8DF8

+#define GL_NUM_SHADER_BINARY_FORMATS        0x8DF9

+#define GL_SHADER_COMPILER                  0x8DFA

+#define GL_MAX_VERTEX_UNIFORM_VECTORS       0x8DFB

+#define GL_MAX_VARYING_VECTORS              0x8DFC

+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD

+#endif

+

+#ifndef GL_ATI_texture_compression_3dc

+#define GL_ATI_texture_compression_3dc 1

+#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837

+#endif

+

+

+/**

+ * Internal token to represent a GLSL shader program (a collection of

+ * one or more shaders that get linked together).  Note that GLSL

+ * shaders and shader programs share one name space (one hash table)

+ * so we need a value that's different from any of the

+ * GL_VERTEX/FRAGMENT/GEOMETRY_PROGRAM tokens.

+ */

+#define GL_SHADER_PROGRAM_MESA 0x9999

+

+

+/**

+ * Internal token for geometry programs.

+ * Use the value for GL_GEOMETRY_PROGRAM_NV for now.

+ */

+#define MESA_GEOMETRY_PROGRAM 0x8c26

+

+/* Several fields of struct gl_config can take these as values.  Since

+ * GLX header files may not be available everywhere they need to be used,

+ * redefine them here.

+ */

+#define GLX_NONE                           0x8000

+#define GLX_SLOW_CONFIG                    0x8001

+#define GLX_TRUE_COLOR                     0x8002

+#define GLX_DIRECT_COLOR                   0x8003

+#define GLX_PSEUDO_COLOR                   0x8004

+#define GLX_STATIC_COLOR                   0x8005

+#define GLX_GRAY_SCALE                     0x8006

+#define GLX_STATIC_GRAY                    0x8007

+#define GLX_TRANSPARENT_RGB                0x8008

+#define GLX_TRANSPARENT_INDEX              0x8009

+#define GLX_NON_CONFORMANT_CONFIG          0x800D

+#define GLX_SWAP_EXCHANGE_OML              0x8061

+#define GLX_SWAP_COPY_OML                  0x8062

+#define GLX_SWAP_UNDEFINED_OML             0x8063

+

+#define GLX_DONT_CARE                      0xFFFFFFFF

+

+#endif /* GLHEADER_H */

diff --git a/mesalib/src/mesa/main/hint.c b/mesalib/src/mesa/main/hint.c
index ff8d88fff..aea0d7022 100644
--- a/mesalib/src/mesa/main/hint.c
+++ b/mesalib/src/mesa/main/hint.c
@@ -1,147 +1,147 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  4.1
- *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#include "glheader.h"
-#include "enums.h"
-#include "context.h"
-#include "hint.h"
-#include "imports.h"
-#include "mtypes.h"
-
-
-
-void GLAPIENTRY
-_mesa_Hint( GLenum target, GLenum mode )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glHint %s %s\n",
-                  _mesa_lookup_enum_by_nr(target),
-                  _mesa_lookup_enum_by_nr(mode));
-
-   if (mode != GL_NICEST && mode != GL_FASTEST && mode != GL_DONT_CARE) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glHint(mode)");
-      return;
-   }
-
-   switch (target) {
-      case GL_FOG_HINT:
-         if (ctx->Hint.Fog == mode)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_HINT);
-         ctx->Hint.Fog = mode;
-         break;
-      case GL_LINE_SMOOTH_HINT:
-         if (ctx->Hint.LineSmooth == mode)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_HINT);
-         ctx->Hint.LineSmooth = mode;
-         break;
-      case GL_PERSPECTIVE_CORRECTION_HINT:
-         if (ctx->Hint.PerspectiveCorrection == mode)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_HINT);
-         ctx->Hint.PerspectiveCorrection = mode;
-         break;
-      case GL_POINT_SMOOTH_HINT:
-         if (ctx->Hint.PointSmooth == mode)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_HINT);
-         ctx->Hint.PointSmooth = mode;
-         break;
-      case GL_POLYGON_SMOOTH_HINT:
-         if (ctx->Hint.PolygonSmooth == mode)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_HINT);
-         ctx->Hint.PolygonSmooth = mode;
-         break;
-
-      /* GL_EXT_clip_volume_hint */
-      case GL_CLIP_VOLUME_CLIPPING_HINT_EXT:
-         if (ctx->Hint.ClipVolumeClipping == mode)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_HINT);
-         ctx->Hint.ClipVolumeClipping = mode;
-         break;
-
-      /* GL_ARB_texture_compression */
-      case GL_TEXTURE_COMPRESSION_HINT_ARB:
-	 if (ctx->Hint.TextureCompression == mode)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_HINT);
-	 ctx->Hint.TextureCompression = mode;
-         break;
-
-      /* GL_SGIS_generate_mipmap */
-      case GL_GENERATE_MIPMAP_HINT_SGIS:
-         if (ctx->Hint.GenerateMipmap == mode)
-            return;
-	 FLUSH_VERTICES(ctx, _NEW_HINT);
-	 ctx->Hint.GenerateMipmap = mode;
-         break;
-
-      /* GL_ARB_fragment_shader */
-      case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:
-         if (!ctx->Extensions.ARB_fragment_shader) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
-            return;
-         }
-         if (ctx->Hint.FragmentShaderDerivative == mode)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_HINT);
-         ctx->Hint.FragmentShaderDerivative = mode;
-         break;
-
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
-         return;
-   }
-
-   if (ctx->Driver.Hint) {
-      (*ctx->Driver.Hint)( ctx, target, mode );
-   }
-}
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-void _mesa_init_hint( struct gl_context * ctx )
-{
-   /* Hint group */
-   ctx->Hint.PerspectiveCorrection = GL_DONT_CARE;
-   ctx->Hint.PointSmooth = GL_DONT_CARE;
-   ctx->Hint.LineSmooth = GL_DONT_CARE;
-   ctx->Hint.PolygonSmooth = GL_DONT_CARE;
-   ctx->Hint.Fog = GL_DONT_CARE;
-   ctx->Hint.ClipVolumeClipping = GL_DONT_CARE;
-   ctx->Hint.TextureCompression = GL_DONT_CARE;
-   ctx->Hint.GenerateMipmap = GL_DONT_CARE;
-   ctx->Hint.FragmentShaderDerivative = GL_DONT_CARE;
-}
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  4.1

+ *

+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include "glheader.h"

+#include "enums.h"

+#include "context.h"

+#include "hint.h"

+#include "imports.h"

+#include "mtypes.h"

+

+

+

+void GLAPIENTRY

+_mesa_Hint( GLenum target, GLenum mode )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glHint %s %s\n",

+                  _mesa_lookup_enum_by_nr(target),

+                  _mesa_lookup_enum_by_nr(mode));

+

+   if (mode != GL_NICEST && mode != GL_FASTEST && mode != GL_DONT_CARE) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glHint(mode)");

+      return;

+   }

+

+   switch (target) {

+      case GL_FOG_HINT:

+         if (ctx->Hint.Fog == mode)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_HINT);

+         ctx->Hint.Fog = mode;

+         break;

+      case GL_LINE_SMOOTH_HINT:

+         if (ctx->Hint.LineSmooth == mode)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_HINT);

+         ctx->Hint.LineSmooth = mode;

+         break;

+      case GL_PERSPECTIVE_CORRECTION_HINT:

+         if (ctx->Hint.PerspectiveCorrection == mode)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_HINT);

+         ctx->Hint.PerspectiveCorrection = mode;

+         break;

+      case GL_POINT_SMOOTH_HINT:

+         if (ctx->Hint.PointSmooth == mode)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_HINT);

+         ctx->Hint.PointSmooth = mode;

+         break;

+      case GL_POLYGON_SMOOTH_HINT:

+         if (ctx->Hint.PolygonSmooth == mode)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_HINT);

+         ctx->Hint.PolygonSmooth = mode;

+         break;

+

+      /* GL_EXT_clip_volume_hint */

+      case GL_CLIP_VOLUME_CLIPPING_HINT_EXT:

+         if (ctx->Hint.ClipVolumeClipping == mode)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_HINT);

+         ctx->Hint.ClipVolumeClipping = mode;

+         break;

+

+      /* GL_ARB_texture_compression */

+      case GL_TEXTURE_COMPRESSION_HINT_ARB:

+	 if (ctx->Hint.TextureCompression == mode)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_HINT);

+	 ctx->Hint.TextureCompression = mode;

+         break;

+

+      /* GL_SGIS_generate_mipmap */

+      case GL_GENERATE_MIPMAP_HINT_SGIS:

+         if (ctx->Hint.GenerateMipmap == mode)

+            return;

+	 FLUSH_VERTICES(ctx, _NEW_HINT);

+	 ctx->Hint.GenerateMipmap = mode;

+         break;

+

+      /* GL_ARB_fragment_shader */

+      case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:

+         if (!ctx->Extensions.ARB_fragment_shader) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");

+            return;

+         }

+         if (ctx->Hint.FragmentShaderDerivative == mode)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_HINT);

+         ctx->Hint.FragmentShaderDerivative = mode;

+         break;

+

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");

+         return;

+   }

+

+   if (ctx->Driver.Hint) {

+      (*ctx->Driver.Hint)( ctx, target, mode );

+   }

+}

+

+

+/**********************************************************************/

+/*****                      Initialization                        *****/

+/**********************************************************************/

+

+void _mesa_init_hint( struct gl_context * ctx )

+{

+   /* Hint group */

+   ctx->Hint.PerspectiveCorrection = GL_DONT_CARE;

+   ctx->Hint.PointSmooth = GL_DONT_CARE;

+   ctx->Hint.LineSmooth = GL_DONT_CARE;

+   ctx->Hint.PolygonSmooth = GL_DONT_CARE;

+   ctx->Hint.Fog = GL_DONT_CARE;

+   ctx->Hint.ClipVolumeClipping = GL_DONT_CARE;

+   ctx->Hint.TextureCompression = GL_DONT_CARE;

+   ctx->Hint.GenerateMipmap = GL_DONT_CARE;

+   ctx->Hint.FragmentShaderDerivative = GL_DONT_CARE;

+}

diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c
index 28841c251..4bbbbdb37 100644
--- a/mesalib/src/mesa/main/image.c
+++ b/mesalib/src/mesa/main/image.c
@@ -1,1913 +1,1913 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file image.c
- * Image handling.
- */
-
-
-#include "glheader.h"
-#include "colormac.h"
-#include "image.h"
-#include "imports.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-
-
-/**
- * NOTE:
- * Normally, BYTE_TO_FLOAT(0) returns 0.00392  That causes problems when
- * we later convert the float to a packed integer value (such as for
- * GL_RGB5_A1) because we'll wind up with a non-zero value.
- *
- * We redefine the macros here so zero is handled correctly.
- */
-#undef BYTE_TO_FLOAT
-#define BYTE_TO_FLOAT(B)    ((B) == 0 ? 0.0F : ((2.0F * (B) + 1.0F) * (1.0F/255.0F)))
-
-#undef SHORT_TO_FLOAT
-#define SHORT_TO_FLOAT(S)   ((S) == 0 ? 0.0F : ((2.0F * (S) + 1.0F) * (1.0F/65535.0F)))
-
-
-
-/** Compute ceiling of integer quotient of A divided by B. */
-#define CEILING( A, B )  ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 )
-
-
-/**
- * \return GL_TRUE if type is packed pixel type, GL_FALSE otherwise.
- */
-GLboolean
-_mesa_type_is_packed(GLenum type)
-{
-   switch (type) {
-   case GL_UNSIGNED_BYTE_3_3_2:
-   case GL_UNSIGNED_BYTE_2_3_3_REV:
-   case MESA_UNSIGNED_BYTE_4_4:
-   case GL_UNSIGNED_SHORT_5_6_5:
-   case GL_UNSIGNED_SHORT_5_6_5_REV:
-   case GL_UNSIGNED_SHORT_4_4_4_4:
-   case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-   case GL_UNSIGNED_SHORT_5_5_5_1:
-   case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-   case GL_UNSIGNED_INT_8_8_8_8:
-   case GL_UNSIGNED_INT_8_8_8_8_REV:
-   case GL_UNSIGNED_INT_10_10_10_2:
-   case GL_UNSIGNED_INT_2_10_10_10_REV:
-   case GL_UNSIGNED_SHORT_8_8_MESA:
-   case GL_UNSIGNED_SHORT_8_8_REV_MESA:
-   case GL_UNSIGNED_INT_24_8_EXT:
-      return GL_TRUE;
-   }
-
-   return GL_FALSE;
-}
-
-
-
-/**
- * Flip the order of the 2 bytes in each word in the given array.
- *
- * \param p array.
- * \param n number of words.
- */
-void
-_mesa_swap2( GLushort *p, GLuint n )
-{
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      p[i] = (p[i] >> 8) | ((p[i] << 8) & 0xff00);
-   }
-}
-
-
-
-/*
- * Flip the order of the 4 bytes in each word in the given array.
- */
-void
-_mesa_swap4( GLuint *p, GLuint n )
-{
-   GLuint i, a, b;
-   for (i = 0; i < n; i++) {
-      b = p[i];
-      a =  (b >> 24)
-	| ((b >> 8) & 0xff00)
-	| ((b << 8) & 0xff0000)
-	| ((b << 24) & 0xff000000);
-      p[i] = a;
-   }
-}
-
-
-/**
- * Get the size of a GL data type.
- *
- * \param type GL data type.
- *
- * \return the size, in bytes, of the given data type, 0 if a GL_BITMAP, or -1
- * if an invalid type enum.
- */
-GLint
-_mesa_sizeof_type( GLenum type )
-{
-   switch (type) {
-      case GL_BITMAP:
-	 return 0;
-      case GL_UNSIGNED_BYTE:
-         return sizeof(GLubyte);
-      case GL_BYTE:
-	 return sizeof(GLbyte);
-      case GL_UNSIGNED_SHORT:
-	 return sizeof(GLushort);
-      case GL_SHORT:
-	 return sizeof(GLshort);
-      case GL_UNSIGNED_INT:
-	 return sizeof(GLuint);
-      case GL_INT:
-	 return sizeof(GLint);
-      case GL_FLOAT:
-	 return sizeof(GLfloat);
-      case GL_DOUBLE:
-	 return sizeof(GLdouble);
-      case GL_HALF_FLOAT_ARB:
-	 return sizeof(GLhalfARB);
-      case GL_FIXED:
-	 return sizeof(GLfixed);
-      default:
-         return -1;
-   }
-}
-
-
-/**
- * Same as _mesa_sizeof_type() but also accepting the packed pixel
- * format data types.
- */
-GLint
-_mesa_sizeof_packed_type( GLenum type )
-{
-   switch (type) {
-      case GL_BITMAP:
-	 return 0;
-      case GL_UNSIGNED_BYTE:
-         return sizeof(GLubyte);
-      case GL_BYTE:
-	 return sizeof(GLbyte);
-      case GL_UNSIGNED_SHORT:
-	 return sizeof(GLushort);
-      case GL_SHORT:
-	 return sizeof(GLshort);
-      case GL_UNSIGNED_INT:
-	 return sizeof(GLuint);
-      case GL_INT:
-	 return sizeof(GLint);
-      case GL_HALF_FLOAT_ARB:
-	 return sizeof(GLhalfARB);
-      case GL_FLOAT:
-	 return sizeof(GLfloat);
-      case GL_UNSIGNED_BYTE_3_3_2:
-         return sizeof(GLubyte);
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-         return sizeof(GLubyte);
-      case MESA_UNSIGNED_BYTE_4_4:
-         return sizeof(GLubyte);
-      case GL_UNSIGNED_SHORT_5_6_5:
-         return sizeof(GLushort);
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-         return sizeof(GLushort);
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-         return sizeof(GLushort);
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-         return sizeof(GLushort);
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-         return sizeof(GLushort);
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-         return sizeof(GLushort);
-      case GL_UNSIGNED_INT_8_8_8_8:
-         return sizeof(GLuint);
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-         return sizeof(GLuint);
-      case GL_UNSIGNED_INT_10_10_10_2:
-         return sizeof(GLuint);
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-         return sizeof(GLuint);
-      case GL_UNSIGNED_SHORT_8_8_MESA:
-      case GL_UNSIGNED_SHORT_8_8_REV_MESA:
-         return sizeof(GLushort);      
-      case GL_UNSIGNED_INT_24_8_EXT:
-         return sizeof(GLuint);
-      default:
-         return -1;
-   }
-}
-
-
-/**
- * Get the number of components in a pixel format.
- *
- * \param format pixel format.
- *
- * \return the number of components in the given format, or -1 if a bad format.
- */
-GLint
-_mesa_components_in_format( GLenum format )
-{
-   switch (format) {
-      case GL_COLOR_INDEX:
-      case GL_COLOR_INDEX1_EXT:
-      case GL_COLOR_INDEX2_EXT:
-      case GL_COLOR_INDEX4_EXT:
-      case GL_COLOR_INDEX8_EXT:
-      case GL_COLOR_INDEX12_EXT:
-      case GL_COLOR_INDEX16_EXT:
-      case GL_STENCIL_INDEX:
-      case GL_DEPTH_COMPONENT:
-      case GL_RED:
-      case GL_RED_INTEGER_EXT:
-      case GL_GREEN:
-      case GL_GREEN_INTEGER_EXT:
-      case GL_BLUE:
-      case GL_BLUE_INTEGER_EXT:
-      case GL_ALPHA:
-      case GL_ALPHA_INTEGER_EXT:
-      case GL_LUMINANCE:
-      case GL_LUMINANCE_INTEGER_EXT:
-      case GL_INTENSITY:
-         return 1;
-      case GL_LUMINANCE_ALPHA:
-      case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-      case GL_RG:
-	 return 2;
-      case GL_RGB:
-      case GL_RGB_INTEGER_EXT:
-	 return 3;
-      case GL_RGBA:
-      case GL_RGBA_INTEGER_EXT:
-	 return 4;
-      case GL_BGR:
-	 return 3;
-      case GL_BGRA:
-	 return 4;
-      case GL_ABGR_EXT:
-         return 4;
-      case GL_YCBCR_MESA:
-         return 2;
-      case GL_DEPTH_STENCIL_EXT:
-         return 2;
-      case GL_DUDV_ATI:
-      case GL_DU8DV8_ATI:
-         return 2;
-      default:
-         return -1;
-   }
-}
-
-
-/**
- * Get the bytes per pixel of pixel format type pair.
- *
- * \param format pixel format.
- * \param type pixel type.
- *
- * \return bytes per pixel, or -1 if a bad format or type was given.
- */
-GLint
-_mesa_bytes_per_pixel( GLenum format, GLenum type )
-{
-   GLint comps = _mesa_components_in_format( format );
-   if (comps < 0)
-      return -1;
-
-   switch (type) {
-      case GL_BITMAP:
-         return 0;  /* special case */
-      case GL_BYTE:
-      case GL_UNSIGNED_BYTE:
-         return comps * sizeof(GLubyte);
-      case GL_SHORT:
-      case GL_UNSIGNED_SHORT:
-         return comps * sizeof(GLshort);
-      case GL_INT:
-      case GL_UNSIGNED_INT:
-         return comps * sizeof(GLint);
-      case GL_FLOAT:
-         return comps * sizeof(GLfloat);
-      case GL_HALF_FLOAT_ARB:
-         return comps * sizeof(GLhalfARB);
-      case GL_UNSIGNED_BYTE_3_3_2:
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-         if (format == GL_RGB || format == GL_BGR ||
-             format == GL_RGB_INTEGER_EXT || format == GL_BGR_INTEGER_EXT)
-            return sizeof(GLubyte);
-         else
-            return -1;  /* error */
-      case GL_UNSIGNED_SHORT_5_6_5:
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-         if (format == GL_RGB || format == GL_BGR ||
-             format == GL_RGB_INTEGER_EXT || format == GL_BGR_INTEGER_EXT)
-            return sizeof(GLushort);
-         else
-            return -1;  /* error */
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-         if (format == GL_RGBA || format == GL_BGRA || format == GL_ABGR_EXT ||
-             format == GL_RGBA_INTEGER_EXT || format == GL_BGRA_INTEGER_EXT)
-            return sizeof(GLushort);
-         else
-            return -1;
-      case GL_UNSIGNED_INT_8_8_8_8:
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-      case GL_UNSIGNED_INT_10_10_10_2:
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-         if (format == GL_RGBA || format == GL_BGRA || format == GL_ABGR_EXT ||
-             format == GL_RGBA_INTEGER_EXT || format == GL_BGRA_INTEGER_EXT)
-            return sizeof(GLuint);
-         else
-            return -1;
-      case GL_UNSIGNED_SHORT_8_8_MESA:
-      case GL_UNSIGNED_SHORT_8_8_REV_MESA:
-         if (format == GL_YCBCR_MESA)
-            return sizeof(GLushort);
-         else
-            return -1;
-      case GL_UNSIGNED_INT_24_8_EXT:
-         if (format == GL_DEPTH_STENCIL_EXT)
-            return sizeof(GLuint);
-         else
-            return -1;
-      default:
-         return -1;
-   }
-}
-
-
-/**
- * Test for a legal pixel format and type.
- *
- * \param format pixel format.
- * \param type pixel type.
- *
- * \return GL_TRUE if the given pixel format and type are legal, or GL_FALSE
- * otherwise.
- */
-GLboolean
-_mesa_is_legal_format_and_type(const struct gl_context *ctx,
-                               GLenum format, GLenum type)
-{
-   switch (format) {
-      case GL_COLOR_INDEX:
-      case GL_STENCIL_INDEX:
-         switch (type) {
-            case GL_BITMAP:
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-            case GL_FLOAT:
-               return GL_TRUE;
-            case GL_HALF_FLOAT_ARB:
-               return ctx->Extensions.ARB_half_float_pixel;
-            default:
-               return GL_FALSE;
-         }
-      case GL_RED:
-      case GL_GREEN:
-      case GL_BLUE:
-      case GL_ALPHA:
-#if 0 /* not legal!  see table 3.6 of the 1.5 spec */
-      case GL_INTENSITY:
-#endif
-      case GL_LUMINANCE:
-      case GL_LUMINANCE_ALPHA:
-      case GL_DEPTH_COMPONENT:
-         switch (type) {
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-            case GL_FLOAT:
-               return GL_TRUE;
-            case GL_HALF_FLOAT_ARB:
-               return ctx->Extensions.ARB_half_float_pixel;
-            default:
-               return GL_FALSE;
-         }
-      case GL_RG:
-	 if (!ctx->Extensions.ARB_texture_rg)
-	    return GL_FALSE;
-
-         switch (type) {
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-            case GL_FLOAT:
-               return GL_TRUE;
-            case GL_HALF_FLOAT_ARB:
-               return ctx->Extensions.ARB_half_float_pixel;
-            default:
-               return GL_FALSE;
-         }
-      case GL_RGB:
-         switch (type) {
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-            case GL_FLOAT:
-            case GL_UNSIGNED_BYTE_3_3_2:
-            case GL_UNSIGNED_BYTE_2_3_3_REV:
-            case GL_UNSIGNED_SHORT_5_6_5:
-            case GL_UNSIGNED_SHORT_5_6_5_REV:
-               return GL_TRUE;
-            case GL_HALF_FLOAT_ARB:
-               return ctx->Extensions.ARB_half_float_pixel;
-            default:
-               return GL_FALSE;
-         }
-      case GL_BGR:
-         switch (type) {
-            /* NOTE: no packed types are supported with BGR.  That's
-             * intentional, according to the GL spec.
-             */
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-            case GL_FLOAT:
-               return GL_TRUE;
-            case GL_HALF_FLOAT_ARB:
-               return ctx->Extensions.ARB_half_float_pixel;
-            default:
-               return GL_FALSE;
-         }
-      case GL_RGBA:
-      case GL_BGRA:
-      case GL_ABGR_EXT:
-         switch (type) {
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-            case GL_FLOAT:
-            case GL_UNSIGNED_SHORT_4_4_4_4:
-            case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-            case GL_UNSIGNED_SHORT_5_5_5_1:
-            case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-            case GL_UNSIGNED_INT_8_8_8_8:
-            case GL_UNSIGNED_INT_8_8_8_8_REV:
-            case GL_UNSIGNED_INT_10_10_10_2:
-            case GL_UNSIGNED_INT_2_10_10_10_REV:
-               return GL_TRUE;
-            case GL_HALF_FLOAT_ARB:
-               return ctx->Extensions.ARB_half_float_pixel;
-            default:
-               return GL_FALSE;
-         }
-      case GL_YCBCR_MESA:
-         if (type == GL_UNSIGNED_SHORT_8_8_MESA ||
-             type == GL_UNSIGNED_SHORT_8_8_REV_MESA)
-            return GL_TRUE;
-         else
-            return GL_FALSE;
-      case GL_DEPTH_STENCIL_EXT:
-         if (ctx->Extensions.EXT_packed_depth_stencil
-             && type == GL_UNSIGNED_INT_24_8_EXT)
-            return GL_TRUE;
-         else
-            return GL_FALSE;
-      case GL_DUDV_ATI:
-      case GL_DU8DV8_ATI:
-         switch (type) {
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-            case GL_FLOAT:
-               return GL_TRUE;
-            default:
-               return GL_FALSE;
-         }
-
-      /* integer-valued formats */
-      case GL_RED_INTEGER_EXT:
-      case GL_GREEN_INTEGER_EXT:
-      case GL_BLUE_INTEGER_EXT:
-      case GL_ALPHA_INTEGER_EXT:
-         switch (type) {
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-               return ctx->Extensions.EXT_texture_integer;
-            default:
-               return GL_FALSE;
-         }
-
-      case GL_RGB_INTEGER_EXT:
-         switch (type) {
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-            case GL_UNSIGNED_BYTE_3_3_2:
-            case GL_UNSIGNED_BYTE_2_3_3_REV:
-            case GL_UNSIGNED_SHORT_5_6_5:
-            case GL_UNSIGNED_SHORT_5_6_5_REV:
-               return ctx->Extensions.EXT_texture_integer;
-            default:
-               return GL_FALSE;
-         }
-
-      case GL_BGR_INTEGER_EXT:
-         switch (type) {
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-            /* NOTE: no packed formats w/ BGR format */
-               return ctx->Extensions.EXT_texture_integer;
-            default:
-               return GL_FALSE;
-         }
-
-      case GL_RGBA_INTEGER_EXT:
-      case GL_BGRA_INTEGER_EXT:
-         switch (type) {
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-            case GL_UNSIGNED_SHORT_4_4_4_4:
-            case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-            case GL_UNSIGNED_SHORT_5_5_5_1:
-            case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-            case GL_UNSIGNED_INT_8_8_8_8:
-            case GL_UNSIGNED_INT_8_8_8_8_REV:
-            case GL_UNSIGNED_INT_10_10_10_2:
-            case GL_UNSIGNED_INT_2_10_10_10_REV:
-               return ctx->Extensions.EXT_texture_integer;
-            default:
-               return GL_FALSE;
-         }
-
-      case GL_LUMINANCE_INTEGER_EXT:
-      case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-         switch (type) {
-            case GL_BYTE:
-            case GL_UNSIGNED_BYTE:
-            case GL_SHORT:
-            case GL_UNSIGNED_SHORT:
-            case GL_INT:
-            case GL_UNSIGNED_INT:
-               return ctx->Extensions.EXT_texture_integer;
-            default:
-               return GL_FALSE;
-         }
-
-      default:
-         ; /* fall-through */
-   }
-   return GL_FALSE;
-}
-
-
-/**
- * Test if the given image format is a color/RGBA format (i.e., not color
- * index, depth, stencil, etc).
- * \param format  the image format value (may by an internal texture format)
- * \return GL_TRUE if its a color/RGBA format, GL_FALSE otherwise.
- */
-GLboolean
-_mesa_is_color_format(GLenum format)
-{
-   switch (format) {
-      case GL_RED:
-      case GL_GREEN:
-      case GL_BLUE:
-      case GL_ALPHA:
-      case GL_ALPHA4:
-      case GL_ALPHA8:
-      case GL_ALPHA12:
-      case GL_ALPHA16:
-      case 1:
-      case GL_LUMINANCE:
-      case GL_LUMINANCE4:
-      case GL_LUMINANCE8:
-      case GL_LUMINANCE12:
-      case GL_LUMINANCE16:
-      case 2:
-      case GL_LUMINANCE_ALPHA:
-      case GL_LUMINANCE4_ALPHA4:
-      case GL_LUMINANCE6_ALPHA2:
-      case GL_LUMINANCE8_ALPHA8:
-      case GL_LUMINANCE12_ALPHA4:
-      case GL_LUMINANCE12_ALPHA12:
-      case GL_LUMINANCE16_ALPHA16:
-      case GL_INTENSITY:
-      case GL_INTENSITY4:
-      case GL_INTENSITY8:
-      case GL_INTENSITY12:
-      case GL_INTENSITY16:
-      case GL_R8:
-      case GL_R16:
-      case GL_RG:
-      case GL_RG8:
-      case GL_RG16:
-      case 3:
-      case GL_RGB:
-      case GL_BGR:
-      case GL_R3_G3_B2:
-      case GL_RGB4:
-      case GL_RGB5:
-      case GL_RGB8:
-      case GL_RGB10:
-      case GL_RGB12:
-      case GL_RGB16:
-      case 4:
-      case GL_ABGR_EXT:
-      case GL_RGBA:
-      case GL_BGRA:
-      case GL_RGBA2:
-      case GL_RGBA4:
-      case GL_RGB5_A1:
-      case GL_RGBA8:
-      case GL_RGB10_A2:
-      case GL_RGBA12:
-      case GL_RGBA16:
-      /* float texture formats */
-      case GL_ALPHA16F_ARB:
-      case GL_ALPHA32F_ARB:
-      case GL_LUMINANCE16F_ARB:
-      case GL_LUMINANCE32F_ARB:
-      case GL_LUMINANCE_ALPHA16F_ARB:
-      case GL_LUMINANCE_ALPHA32F_ARB:
-      case GL_INTENSITY16F_ARB:
-      case GL_INTENSITY32F_ARB:
-      case GL_R16F:
-      case GL_R32F:
-      case GL_RG16F:
-      case GL_RG32F:
-      case GL_RGB16F_ARB:
-      case GL_RGB32F_ARB:
-      case GL_RGBA16F_ARB:
-      case GL_RGBA32F_ARB:
-      /* compressed formats */
-      case GL_COMPRESSED_ALPHA:
-      case GL_COMPRESSED_LUMINANCE:
-      case GL_COMPRESSED_LUMINANCE_ALPHA:
-      case GL_COMPRESSED_INTENSITY:
-      case GL_COMPRESSED_RED:
-      case GL_COMPRESSED_RG:
-      case GL_COMPRESSED_RGB:
-      case GL_COMPRESSED_RGBA:
-      case GL_RGB_S3TC:
-      case GL_RGB4_S3TC:
-      case GL_RGBA_S3TC:
-      case GL_RGBA4_S3TC:
-      case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-      case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-      case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-      case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-      case GL_COMPRESSED_RGB_FXT1_3DFX:
-      case GL_COMPRESSED_RGBA_FXT1_3DFX:
-#if FEATURE_EXT_texture_sRGB
-      case GL_SRGB_EXT:
-      case GL_SRGB8_EXT:
-      case GL_SRGB_ALPHA_EXT:
-      case GL_SRGB8_ALPHA8_EXT:
-      case GL_SLUMINANCE_ALPHA_EXT:
-      case GL_SLUMINANCE8_ALPHA8_EXT:
-      case GL_SLUMINANCE_EXT:
-      case GL_SLUMINANCE8_EXT:
-      case GL_COMPRESSED_SRGB_EXT:
-      case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-      case GL_COMPRESSED_SRGB_ALPHA_EXT:
-      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
-      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-      case GL_COMPRESSED_SLUMINANCE_EXT:
-      case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
-#endif /* FEATURE_EXT_texture_sRGB */
-      case GL_COMPRESSED_RED_RGTC1:
-      case GL_COMPRESSED_SIGNED_RED_RGTC1:
-      case GL_COMPRESSED_RG_RGTC2:
-      case GL_COMPRESSED_SIGNED_RG_RGTC2:
-      case GL_COMPRESSED_LUMINANCE_LATC1_EXT:
-      case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:
-      case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
-      case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
-      case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
-      /* generic integer formats */
-      case GL_RED_INTEGER_EXT:
-      case GL_GREEN_INTEGER_EXT:
-      case GL_BLUE_INTEGER_EXT:
-      case GL_ALPHA_INTEGER_EXT:
-      case GL_RGB_INTEGER_EXT:
-      case GL_RGBA_INTEGER_EXT:
-      case GL_BGR_INTEGER_EXT:
-      case GL_BGRA_INTEGER_EXT:
-      case GL_LUMINANCE_INTEGER_EXT:
-      case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-      /* sized integer formats */
-      case GL_RGBA32UI_EXT:
-      case GL_RGB32UI_EXT:
-      case GL_ALPHA32UI_EXT:
-      case GL_INTENSITY32UI_EXT:
-      case GL_LUMINANCE32UI_EXT:
-      case GL_LUMINANCE_ALPHA32UI_EXT:
-      case GL_RGBA16UI_EXT:
-      case GL_RGB16UI_EXT:
-      case GL_ALPHA16UI_EXT:
-      case GL_INTENSITY16UI_EXT:
-      case GL_LUMINANCE16UI_EXT:
-      case GL_LUMINANCE_ALPHA16UI_EXT:
-      case GL_RGBA8UI_EXT:
-      case GL_RGB8UI_EXT:
-      case GL_ALPHA8UI_EXT:
-      case GL_INTENSITY8UI_EXT:
-      case GL_LUMINANCE8UI_EXT:
-      case GL_LUMINANCE_ALPHA8UI_EXT:
-      case GL_RGBA32I_EXT:
-      case GL_RGB32I_EXT:
-      case GL_ALPHA32I_EXT:
-      case GL_INTENSITY32I_EXT:
-      case GL_LUMINANCE32I_EXT:
-      case GL_LUMINANCE_ALPHA32I_EXT:
-      case GL_RGBA16I_EXT:
-      case GL_RGB16I_EXT:
-      case GL_ALPHA16I_EXT:
-      case GL_INTENSITY16I_EXT:
-      case GL_LUMINANCE16I_EXT:
-      case GL_LUMINANCE_ALPHA16I_EXT:
-      case GL_RGBA8I_EXT:
-      case GL_RGB8I_EXT:
-      case GL_ALPHA8I_EXT:
-      case GL_INTENSITY8I_EXT:
-      case GL_LUMINANCE8I_EXT:
-      case GL_LUMINANCE_ALPHA8I_EXT:
-      /* signed, normalized texture formats */
-      case GL_RED_SNORM:
-      case GL_R8_SNORM:
-      case GL_R16_SNORM:
-      case GL_RG_SNORM:
-      case GL_RG8_SNORM:
-      case GL_RG16_SNORM:
-      case GL_RGB_SNORM:
-      case GL_RGB8_SNORM:
-      case GL_RGB16_SNORM:
-      case GL_RGBA_SNORM:
-      case GL_RGBA8_SNORM:
-      case GL_RGBA16_SNORM:
-      case GL_ALPHA_SNORM:
-      case GL_ALPHA8_SNORM:
-      case GL_ALPHA16_SNORM:
-      case GL_LUMINANCE_SNORM:
-      case GL_LUMINANCE8_SNORM:
-      case GL_LUMINANCE16_SNORM:
-      case GL_LUMINANCE_ALPHA_SNORM:
-      case GL_LUMINANCE8_ALPHA8_SNORM:
-      case GL_LUMINANCE16_ALPHA16_SNORM:
-      case GL_INTENSITY_SNORM:
-      case GL_INTENSITY8_SNORM:
-      case GL_INTENSITY16_SNORM:
-         return GL_TRUE;
-      case GL_YCBCR_MESA:  /* not considered to be RGB */
-         /* fall-through */
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given image format is a color index format.
- */
-GLboolean
-_mesa_is_index_format(GLenum format)
-{
-   switch (format) {
-      case GL_COLOR_INDEX:
-      case GL_COLOR_INDEX1_EXT:
-      case GL_COLOR_INDEX2_EXT:
-      case GL_COLOR_INDEX4_EXT:
-      case GL_COLOR_INDEX8_EXT:
-      case GL_COLOR_INDEX12_EXT:
-      case GL_COLOR_INDEX16_EXT:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given image format is a depth component format.
- */
-GLboolean
-_mesa_is_depth_format(GLenum format)
-{
-   switch (format) {
-      case GL_DEPTH_COMPONENT:
-      case GL_DEPTH_COMPONENT16:
-      case GL_DEPTH_COMPONENT24:
-      case GL_DEPTH_COMPONENT32:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given image format is a stencil format.
- */
-GLboolean
-_mesa_is_stencil_format(GLenum format)
-{
-   switch (format) {
-      case GL_STENCIL_INDEX:
-      case GL_DEPTH_STENCIL:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given image format is a YCbCr format.
- */
-GLboolean
-_mesa_is_ycbcr_format(GLenum format)
-{
-   switch (format) {
-      case GL_YCBCR_MESA:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given image format is a depth+stencil format.
- */
-GLboolean
-_mesa_is_depthstencil_format(GLenum format)
-{
-   switch (format) {
-      case GL_DEPTH24_STENCIL8_EXT:
-      case GL_DEPTH_STENCIL_EXT:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given image format is a depth or stencil format.
- */
-GLboolean
-_mesa_is_depth_or_stencil_format(GLenum format)
-{
-   switch (format) {
-      case GL_DEPTH_COMPONENT:
-      case GL_DEPTH_COMPONENT16:
-      case GL_DEPTH_COMPONENT24:
-      case GL_DEPTH_COMPONENT32:
-      case GL_STENCIL_INDEX:
-      case GL_STENCIL_INDEX1_EXT:
-      case GL_STENCIL_INDEX4_EXT:
-      case GL_STENCIL_INDEX8_EXT:
-      case GL_STENCIL_INDEX16_EXT:
-      case GL_DEPTH_STENCIL_EXT:
-      case GL_DEPTH24_STENCIL8_EXT:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given image format is a dudv format.
- */
-GLboolean
-_mesa_is_dudv_format(GLenum format)
-{
-   switch (format) {
-      case GL_DUDV_ATI:
-      case GL_DU8DV8_ATI:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given format is an integer (non-normalized) format.
- */
-GLboolean
-_mesa_is_integer_format(GLenum format)
-{
-   switch (format) {
-   /* generic integer formats */
-   case GL_RED_INTEGER_EXT:
-   case GL_GREEN_INTEGER_EXT:
-   case GL_BLUE_INTEGER_EXT:
-   case GL_ALPHA_INTEGER_EXT:
-   case GL_RGB_INTEGER_EXT:
-   case GL_RGBA_INTEGER_EXT:
-   case GL_BGR_INTEGER_EXT:
-   case GL_BGRA_INTEGER_EXT:
-   case GL_LUMINANCE_INTEGER_EXT:
-   case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-   /* specific integer formats */
-   case GL_RGBA32UI_EXT:
-   case GL_RGB32UI_EXT:
-   case GL_ALPHA32UI_EXT:
-   case GL_INTENSITY32UI_EXT:
-   case GL_LUMINANCE32UI_EXT:
-   case GL_LUMINANCE_ALPHA32UI_EXT:
-   case GL_RGBA16UI_EXT:
-   case GL_RGB16UI_EXT:
-   case GL_ALPHA16UI_EXT:
-   case GL_INTENSITY16UI_EXT:
-   case GL_LUMINANCE16UI_EXT:
-   case GL_LUMINANCE_ALPHA16UI_EXT:
-   case GL_RGBA8UI_EXT:
-   case GL_RGB8UI_EXT:
-   case GL_ALPHA8UI_EXT:
-   case GL_INTENSITY8UI_EXT:
-   case GL_LUMINANCE8UI_EXT:
-   case GL_LUMINANCE_ALPHA8UI_EXT:
-   case GL_RGBA32I_EXT:
-   case GL_RGB32I_EXT:
-   case GL_ALPHA32I_EXT:
-   case GL_INTENSITY32I_EXT:
-   case GL_LUMINANCE32I_EXT:
-   case GL_LUMINANCE_ALPHA32I_EXT:
-   case GL_RGBA16I_EXT:
-   case GL_RGB16I_EXT:
-   case GL_ALPHA16I_EXT:
-   case GL_INTENSITY16I_EXT:
-   case GL_LUMINANCE16I_EXT:
-   case GL_LUMINANCE_ALPHA16I_EXT:
-   case GL_RGBA8I_EXT:
-   case GL_RGB8I_EXT:
-   case GL_ALPHA8I_EXT:
-   case GL_INTENSITY8I_EXT:
-   case GL_LUMINANCE8I_EXT:
-   case GL_LUMINANCE_ALPHA8I_EXT:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if an image format is a supported compressed format.
- * \param format the internal format token provided by the user.
- * \return GL_TRUE if compressed, GL_FALSE if uncompressed
- */
-GLboolean
-_mesa_is_compressed_format(struct gl_context *ctx, GLenum format)
-{
-   switch (format) {
-   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-      return ctx->Extensions.EXT_texture_compression_s3tc;
-   case GL_RGB_S3TC:
-   case GL_RGB4_S3TC:
-   case GL_RGBA_S3TC:
-   case GL_RGBA4_S3TC:
-      return ctx->Extensions.S3_s3tc;
-   case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
-   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-      return ctx->Extensions.EXT_texture_sRGB
-         && ctx->Extensions.EXT_texture_compression_s3tc;
-   case GL_COMPRESSED_RGB_FXT1_3DFX:
-   case GL_COMPRESSED_RGBA_FXT1_3DFX:
-      return ctx->Extensions.TDFX_texture_compression_FXT1;
-   case GL_COMPRESSED_RED_RGTC1:
-   case GL_COMPRESSED_SIGNED_RED_RGTC1:
-   case GL_COMPRESSED_RG_RGTC2:
-   case GL_COMPRESSED_SIGNED_RG_RGTC2:
-      return ctx->Extensions.ARB_texture_compression_rgtc;
-   case GL_COMPRESSED_LUMINANCE_LATC1_EXT:
-   case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:
-   case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
-   case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
-      return ctx->Extensions.EXT_texture_compression_latc;
-   case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
-      return ctx->Extensions.ATI_texture_compression_3dc;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Return the address of a specific pixel in an image (1D, 2D or 3D).
- *
- * Pixel unpacking/packing parameters are observed according to \p packing.
- *
- * \param dimensions either 1, 2 or 3 to indicate dimensionality of image
- * \param image  starting address of image data
- * \param width  the image width
- * \param height  theimage height
- * \param format  the pixel format
- * \param type  the pixel data type
- * \param packing  the pixelstore attributes
- * \param img  which image in the volume (0 for 1D or 2D images)
- * \param row  row of pixel in the image (0 for 1D images)
- * \param column column of pixel in the image
- * 
- * \return address of pixel on success, or NULL on error.
- *
- * \sa gl_pixelstore_attrib.
- */
-GLvoid *
-_mesa_image_address( GLuint dimensions,
-                     const struct gl_pixelstore_attrib *packing,
-                     const GLvoid *image,
-                     GLsizei width, GLsizei height,
-                     GLenum format, GLenum type,
-                     GLint img, GLint row, GLint column )
-{
-   GLint alignment;        /* 1, 2 or 4 */
-   GLint pixels_per_row;
-   GLint rows_per_image;
-   GLint skiprows;
-   GLint skippixels;
-   GLint skipimages;       /* for 3-D volume images */
-   GLubyte *pixel_addr;
-
-   ASSERT(dimensions >= 1 && dimensions <= 3);
-
-   alignment = packing->Alignment;
-   if (packing->RowLength > 0) {
-      pixels_per_row = packing->RowLength;
-   }
-   else {
-      pixels_per_row = width;
-   }
-   if (packing->ImageHeight > 0) {
-      rows_per_image = packing->ImageHeight;
-   }
-   else {
-      rows_per_image = height;
-   }
-
-   skippixels = packing->SkipPixels;
-   /* Note: SKIP_ROWS _is_ used for 1D images */
-   skiprows = packing->SkipRows;
-   /* Note: SKIP_IMAGES is only used for 3D images */
-   skipimages = (dimensions == 3) ? packing->SkipImages : 0;
-
-   if (type == GL_BITMAP) {
-      /* BITMAP data */
-      GLint comp_per_pixel;   /* components per pixel */
-      GLint bytes_per_comp;   /* bytes per component */
-      GLint bytes_per_row;
-      GLint bytes_per_image;
-
-      /* Compute bytes per component */
-      bytes_per_comp = _mesa_sizeof_packed_type( type );
-      if (bytes_per_comp < 0) {
-         return NULL;
-      }
-
-      /* Compute number of components per pixel */
-      comp_per_pixel = _mesa_components_in_format( format );
-      if (comp_per_pixel < 0) {
-         return NULL;
-      }
-
-      bytes_per_row = alignment
-                    * CEILING( comp_per_pixel*pixels_per_row, 8*alignment );
-
-      bytes_per_image = bytes_per_row * rows_per_image;
-
-      pixel_addr = (GLubyte *) image
-                 + (skipimages + img) * bytes_per_image
-                 + (skiprows + row) * bytes_per_row
-                 + (skippixels + column) / 8;
-   }
-   else {
-      /* Non-BITMAP data */
-      GLint bytes_per_pixel, bytes_per_row, remainder, bytes_per_image;
-      GLint topOfImage;
-
-      bytes_per_pixel = _mesa_bytes_per_pixel( format, type );
-
-      /* The pixel type and format should have been error checked earlier */
-      assert(bytes_per_pixel > 0);
-
-      bytes_per_row = pixels_per_row * bytes_per_pixel;
-      remainder = bytes_per_row % alignment;
-      if (remainder > 0)
-         bytes_per_row += (alignment - remainder);
-
-      ASSERT(bytes_per_row % alignment == 0);
-
-      bytes_per_image = bytes_per_row * rows_per_image;
-
-      if (packing->Invert) {
-         /* set pixel_addr to the last row */
-         topOfImage = bytes_per_row * (height - 1);
-         bytes_per_row = -bytes_per_row;
-      }
-      else {
-         topOfImage = 0;
-      }
-
-      /* compute final pixel address */
-      pixel_addr = (GLubyte *) image
-                 + (skipimages + img) * bytes_per_image
-                 + topOfImage
-                 + (skiprows + row) * bytes_per_row
-                 + (skippixels + column) * bytes_per_pixel;
-   }
-
-   return (GLvoid *) pixel_addr;
-}
-
-
-GLvoid *
-_mesa_image_address1d( const struct gl_pixelstore_attrib *packing,
-                       const GLvoid *image,
-                       GLsizei width,
-                       GLenum format, GLenum type,
-                       GLint column )
-{
-   return _mesa_image_address(1, packing, image, width, 1,
-                              format, type, 0, 0, column);
-}
-
-
-GLvoid *
-_mesa_image_address2d( const struct gl_pixelstore_attrib *packing,
-                       const GLvoid *image,
-                       GLsizei width, GLsizei height,
-                       GLenum format, GLenum type,
-                       GLint row, GLint column )
-{
-   return _mesa_image_address(2, packing, image, width, height,
-                              format, type, 0, row, column);
-}
-
-
-GLvoid *
-_mesa_image_address3d( const struct gl_pixelstore_attrib *packing,
-                       const GLvoid *image,
-                       GLsizei width, GLsizei height,
-                       GLenum format, GLenum type,
-                       GLint img, GLint row, GLint column )
-{
-   return _mesa_image_address(3, packing, image, width, height,
-                              format, type, img, row, column);
-}
-
-
-
-/**
- * Compute the stride (in bytes) between image rows.
- *
- * \param packing the pixelstore attributes
- * \param width image width.
- * \param format pixel format.
- * \param type pixel data type.
- * 
- * \return the stride in bytes for the given parameters, or -1 if error
- */
-GLint
-_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
-                        GLint width, GLenum format, GLenum type )
-{
-   GLint bytesPerRow, remainder;
-
-   ASSERT(packing);
-
-   if (type == GL_BITMAP) {
-      if (packing->RowLength == 0) {
-         bytesPerRow = (width + 7) / 8;
-      }
-      else {
-         bytesPerRow = (packing->RowLength + 7) / 8;
-      }
-   }
-   else {
-      /* Non-BITMAP data */
-      const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);
-      if (bytesPerPixel <= 0)
-         return -1;  /* error */
-      if (packing->RowLength == 0) {
-         bytesPerRow = bytesPerPixel * width;
-      }
-      else {
-         bytesPerRow = bytesPerPixel * packing->RowLength;
-      }
-   }
-
-   remainder = bytesPerRow % packing->Alignment;
-   if (remainder > 0) {
-      bytesPerRow += (packing->Alignment - remainder);
-   }
-
-   if (packing->Invert) {
-      /* negate the bytes per row (negative row stride) */
-      bytesPerRow = -bytesPerRow;
-   }
-
-   return bytesPerRow;
-}
-
-
-/*
- * Compute the stride between images in a 3D texture (in bytes) for the given
- * pixel packing parameters and image width, format and type.
- */
-GLint
-_mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,
-                          GLint width, GLint height,
-                          GLenum format, GLenum type )
-{
-   GLint bytesPerRow, bytesPerImage, remainder;
-
-   ASSERT(packing);
-
-   if (type == GL_BITMAP) {
-      if (packing->RowLength == 0) {
-         bytesPerRow = (width + 7) / 8;
-      }
-      else {
-         bytesPerRow = (packing->RowLength + 7) / 8;
-      }
-   }
-   else {
-      const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);
-
-      if (bytesPerPixel <= 0)
-         return -1;  /* error */
-      if (packing->RowLength == 0) {
-         bytesPerRow = bytesPerPixel * width;
-      }
-      else {
-         bytesPerRow = bytesPerPixel * packing->RowLength;
-      }
-   }
-
-   remainder = bytesPerRow % packing->Alignment;
-   if (remainder > 0)
-      bytesPerRow += (packing->Alignment - remainder);
-
-   if (packing->ImageHeight == 0)
-      bytesPerImage = bytesPerRow * height;
-   else
-      bytesPerImage = bytesPerRow * packing->ImageHeight;
-
-   return bytesPerImage;
-}
-
-
-
-/**
- * "Expand" a bitmap from 1-bit per pixel to 8-bits per pixel.
- * This is typically used to convert a bitmap into a GLubyte/pixel texture.
- * "On" bits will set texels to \p onValue.
- * "Off" bits will not modify texels.
- * \param width  src bitmap width in pixels
- * \param height  src bitmap height in pixels
- * \param unpack  bitmap unpacking state
- * \param bitmap  the src bitmap data
- * \param destBuffer  start of dest buffer
- * \param destStride  row stride in dest buffer
- * \param onValue  if bit is 1, set destBuffer pixel to this value
- */
-void
-_mesa_expand_bitmap(GLsizei width, GLsizei height,
-                    const struct gl_pixelstore_attrib *unpack,
-                    const GLubyte *bitmap,
-                    GLubyte *destBuffer, GLint destStride,
-                    GLubyte onValue)
-{
-   const GLubyte *srcRow = (const GLubyte *)
-      _mesa_image_address2d(unpack, bitmap, width, height,
-                            GL_COLOR_INDEX, GL_BITMAP, 0, 0);
-   const GLint srcStride = _mesa_image_row_stride(unpack, width,
-                                                  GL_COLOR_INDEX, GL_BITMAP);
-   GLint row, col;
-
-#define SET_PIXEL(COL, ROW) \
-   destBuffer[(ROW) * destStride + (COL)] = onValue;
-
-   for (row = 0; row < height; row++) {
-      const GLubyte *src = srcRow;
-
-      if (unpack->LsbFirst) {
-         /* Lsb first */
-         GLubyte mask = 1U << (unpack->SkipPixels & 0x7);
-         for (col = 0; col < width; col++) {
-
-            if (*src & mask) {
-               SET_PIXEL(col, row);
-            }
-
-            if (mask == 128U) {
-               src++;
-               mask = 1U;
-            }
-            else {
-               mask = mask << 1;
-            }
-         }
-
-         /* get ready for next row */
-         if (mask != 1)
-            src++;
-      }
-      else {
-         /* Msb first */
-         GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
-         for (col = 0; col < width; col++) {
-
-            if (*src & mask) {
-               SET_PIXEL(col, row);
-            }
-
-            if (mask == 1U) {
-               src++;
-               mask = 128U;
-            }
-            else {
-               mask = mask >> 1;
-            }
-         }
-
-         /* get ready for next row */
-         if (mask != 128)
-            src++;
-      }
-
-      srcRow += srcStride;
-   } /* row */
-
-#undef SET_PIXEL
-}
-
-
-
-
-/**
- * Convert an array of RGBA colors from one datatype to another.
- * NOTE: src may equal dst.  In that case, we use a temporary buffer.
- */
-void
-_mesa_convert_colors(GLenum srcType, const GLvoid *src,
-                     GLenum dstType, GLvoid *dst,
-                     GLuint count, const GLubyte mask[])
-{
-   GLuint tempBuffer[MAX_WIDTH][4];
-   const GLboolean useTemp = (src == dst);
-
-   ASSERT(srcType != dstType);
-
-   switch (srcType) {
-   case GL_UNSIGNED_BYTE:
-      if (dstType == GL_UNSIGNED_SHORT) {
-         const GLubyte (*src1)[4] = (const GLubyte (*)[4]) src;
-         GLushort (*dst2)[4] = (GLushort (*)[4]) (useTemp ? tempBuffer : dst);
-         GLuint i;
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst2[i][RCOMP] = UBYTE_TO_USHORT(src1[i][RCOMP]);
-               dst2[i][GCOMP] = UBYTE_TO_USHORT(src1[i][GCOMP]);
-               dst2[i][BCOMP] = UBYTE_TO_USHORT(src1[i][BCOMP]);
-               dst2[i][ACOMP] = UBYTE_TO_USHORT(src1[i][ACOMP]);
-            }
-         }
-         if (useTemp)
-            memcpy(dst, tempBuffer, count * 4 * sizeof(GLushort));
-      }
-      else {
-         const GLubyte (*src1)[4] = (const GLubyte (*)[4]) src;
-         GLfloat (*dst4)[4] = (GLfloat (*)[4]) (useTemp ? tempBuffer : dst);
-         GLuint i;
-         ASSERT(dstType == GL_FLOAT);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst4[i][RCOMP] = UBYTE_TO_FLOAT(src1[i][RCOMP]);
-               dst4[i][GCOMP] = UBYTE_TO_FLOAT(src1[i][GCOMP]);
-               dst4[i][BCOMP] = UBYTE_TO_FLOAT(src1[i][BCOMP]);
-               dst4[i][ACOMP] = UBYTE_TO_FLOAT(src1[i][ACOMP]);
-            }
-         }
-         if (useTemp)
-            memcpy(dst, tempBuffer, count * 4 * sizeof(GLfloat));
-      }
-      break;
-   case GL_UNSIGNED_SHORT:
-      if (dstType == GL_UNSIGNED_BYTE) {
-         const GLushort (*src2)[4] = (const GLushort (*)[4]) src;
-         GLubyte (*dst1)[4] = (GLubyte (*)[4]) (useTemp ? tempBuffer : dst);
-         GLuint i;
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst1[i][RCOMP] = USHORT_TO_UBYTE(src2[i][RCOMP]);
-               dst1[i][GCOMP] = USHORT_TO_UBYTE(src2[i][GCOMP]);
-               dst1[i][BCOMP] = USHORT_TO_UBYTE(src2[i][BCOMP]);
-               dst1[i][ACOMP] = USHORT_TO_UBYTE(src2[i][ACOMP]);
-            }
-         }
-         if (useTemp)
-            memcpy(dst, tempBuffer, count * 4 * sizeof(GLubyte));
-      }
-      else {
-         const GLushort (*src2)[4] = (const GLushort (*)[4]) src;
-         GLfloat (*dst4)[4] = (GLfloat (*)[4]) (useTemp ? tempBuffer : dst);
-         GLuint i;
-         ASSERT(dstType == GL_FLOAT);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst4[i][RCOMP] = USHORT_TO_FLOAT(src2[i][RCOMP]);
-               dst4[i][GCOMP] = USHORT_TO_FLOAT(src2[i][GCOMP]);
-               dst4[i][BCOMP] = USHORT_TO_FLOAT(src2[i][BCOMP]);
-               dst4[i][ACOMP] = USHORT_TO_FLOAT(src2[i][ACOMP]);
-            }
-         }
-         if (useTemp)
-            memcpy(dst, tempBuffer, count * 4 * sizeof(GLfloat));
-      }
-      break;
-   case GL_FLOAT:
-      if (dstType == GL_UNSIGNED_BYTE) {
-         const GLfloat (*src4)[4] = (const GLfloat (*)[4]) src;
-         GLubyte (*dst1)[4] = (GLubyte (*)[4]) (useTemp ? tempBuffer : dst);
-         GLuint i;
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][RCOMP], src4[i][RCOMP]);
-               UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][GCOMP], src4[i][GCOMP]);
-               UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][BCOMP], src4[i][BCOMP]);
-               UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][ACOMP], src4[i][ACOMP]);
-            }
-         }
-         if (useTemp)
-            memcpy(dst, tempBuffer, count * 4 * sizeof(GLubyte));
-      }
-      else {
-         const GLfloat (*src4)[4] = (const GLfloat (*)[4]) src;
-         GLushort (*dst2)[4] = (GLushort (*)[4]) (useTemp ? tempBuffer : dst);
-         GLuint i;
-         ASSERT(dstType == GL_UNSIGNED_SHORT);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               UNCLAMPED_FLOAT_TO_USHORT(dst2[i][RCOMP], src4[i][RCOMP]);
-               UNCLAMPED_FLOAT_TO_USHORT(dst2[i][GCOMP], src4[i][GCOMP]);
-               UNCLAMPED_FLOAT_TO_USHORT(dst2[i][BCOMP], src4[i][BCOMP]);
-               UNCLAMPED_FLOAT_TO_USHORT(dst2[i][ACOMP], src4[i][ACOMP]);
-            }
-         }
-         if (useTemp)
-            memcpy(dst, tempBuffer, count * 4 * sizeof(GLushort));
-      }
-      break;
-   default:
-      _mesa_problem(NULL, "Invalid datatype in _mesa_convert_colors");
-   }
-}
-
-
-
-
-/**
- * Perform basic clipping for glDrawPixels.  The image's position and size
- * and the unpack SkipPixels and SkipRows are adjusted so that the image
- * region is entirely within the window and scissor bounds.
- * NOTE: this will only work when glPixelZoom is (1, 1) or (1, -1).
- * If Pixel.ZoomY is -1, *destY will be changed to be the first row which
- * we'll actually write.  Beforehand, *destY-1 is the first drawing row.
- *
- * \return  GL_TRUE if image is ready for drawing or
- *          GL_FALSE if image was completely clipped away (draw nothing)
- */
-GLboolean
-_mesa_clip_drawpixels(const struct gl_context *ctx,
-                      GLint *destX, GLint *destY,
-                      GLsizei *width, GLsizei *height,
-                      struct gl_pixelstore_attrib *unpack)
-{
-   const struct gl_framebuffer *buffer = ctx->DrawBuffer;
-
-   if (unpack->RowLength == 0) {
-      unpack->RowLength = *width;
-   }
-
-   ASSERT(ctx->Pixel.ZoomX == 1.0F);
-   ASSERT(ctx->Pixel.ZoomY == 1.0F || ctx->Pixel.ZoomY == -1.0F);
-
-   /* left clipping */
-   if (*destX < buffer->_Xmin) {
-      unpack->SkipPixels += (buffer->_Xmin - *destX);
-      *width -= (buffer->_Xmin - *destX);
-      *destX = buffer->_Xmin;
-   }
-   /* right clipping */
-   if (*destX + *width > buffer->_Xmax)
-      *width -= (*destX + *width - buffer->_Xmax);
-
-   if (*width <= 0)
-      return GL_FALSE;
-
-   if (ctx->Pixel.ZoomY == 1.0F) {
-      /* bottom clipping */
-      if (*destY < buffer->_Ymin) {
-         unpack->SkipRows += (buffer->_Ymin - *destY);
-         *height -= (buffer->_Ymin - *destY);
-         *destY = buffer->_Ymin;
-      }
-      /* top clipping */
-      if (*destY + *height > buffer->_Ymax)
-         *height -= (*destY + *height - buffer->_Ymax);
-   }
-   else { /* upside down */
-      /* top clipping */
-      if (*destY > buffer->_Ymax) {
-         unpack->SkipRows += (*destY - buffer->_Ymax);
-         *height -= (*destY - buffer->_Ymax);
-         *destY = buffer->_Ymax;
-      }
-      /* bottom clipping */
-      if (*destY - *height < buffer->_Ymin)
-         *height -= (buffer->_Ymin - (*destY - *height));
-      /* adjust destY so it's the first row to write to */
-      (*destY)--;
-   }
-
-   if (*height <= 0)
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Perform clipping for glReadPixels.  The image's window position
- * and size, and the pack skipPixels, skipRows and rowLength are adjusted
- * so that the image region is entirely within the window bounds.
- * Note: this is different from _mesa_clip_drawpixels() in that the
- * scissor box is ignored, and we use the bounds of the current readbuffer
- * surface.
- *
- * \return  GL_TRUE if region to read is in bounds
- *          GL_FALSE if region is completely out of bounds (nothing to read)
- */
-GLboolean
-_mesa_clip_readpixels(const struct gl_context *ctx,
-                      GLint *srcX, GLint *srcY,
-                      GLsizei *width, GLsizei *height,
-                      struct gl_pixelstore_attrib *pack)
-{
-   const struct gl_framebuffer *buffer = ctx->ReadBuffer;
-
-   if (pack->RowLength == 0) {
-      pack->RowLength = *width;
-   }
-
-   /* left clipping */
-   if (*srcX < 0) {
-      pack->SkipPixels += (0 - *srcX);
-      *width -= (0 - *srcX);
-      *srcX = 0;
-   }
-   /* right clipping */
-   if (*srcX + *width > (GLsizei) buffer->Width)
-      *width -= (*srcX + *width - buffer->Width);
-
-   if (*width <= 0)
-      return GL_FALSE;
-
-   /* bottom clipping */
-   if (*srcY < 0) {
-      pack->SkipRows += (0 - *srcY);
-      *height -= (0 - *srcY);
-      *srcY = 0;
-   }
-   /* top clipping */
-   if (*srcY + *height > (GLsizei) buffer->Height)
-      *height -= (*srcY + *height - buffer->Height);
-
-   if (*height <= 0)
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Do clipping for a glCopyTexSubImage call.
- * The framebuffer source region might extend outside the framebuffer
- * bounds.  Clip the source region against the framebuffer bounds and
- * adjust the texture/dest position and size accordingly.
- *
- * \return GL_FALSE if region is totally clipped, GL_TRUE otherwise.
- */
-GLboolean
-_mesa_clip_copytexsubimage(const struct gl_context *ctx,
-                           GLint *destX, GLint *destY,
-                           GLint *srcX, GLint *srcY,
-                           GLsizei *width, GLsizei *height)
-{
-   const struct gl_framebuffer *fb = ctx->ReadBuffer;
-   const GLint srcX0 = *srcX, srcY0 = *srcY;
-
-   if (_mesa_clip_to_region(0, 0, fb->Width, fb->Height,
-                            srcX, srcY, width, height)) {
-      *destX = *destX + *srcX - srcX0;
-      *destY = *destY + *srcY - srcY0;
-
-      return GL_TRUE;
-   }
-   else {
-      return GL_FALSE;
-   }
-}
-
-
-
-/**
- * Clip the rectangle defined by (x, y, width, height) against the bounds
- * specified by [xmin, xmax) and [ymin, ymax).
- * \return GL_FALSE if rect is totally clipped, GL_TRUE otherwise.
- */
-GLboolean
-_mesa_clip_to_region(GLint xmin, GLint ymin,
-                     GLint xmax, GLint ymax,
-                     GLint *x, GLint *y,
-                     GLsizei *width, GLsizei *height )
-{
-   /* left clipping */
-   if (*x < xmin) {
-      *width -= (xmin - *x);
-      *x = xmin;
-   }
-
-   /* right clipping */
-   if (*x + *width > xmax)
-      *width -= (*x + *width - xmax);
-
-   if (*width <= 0)
-      return GL_FALSE;
-
-   /* bottom (or top) clipping */
-   if (*y < ymin) {
-      *height -= (ymin - *y);
-      *y = ymin;
-   }
-
-   /* top (or bottom) clipping */
-   if (*y + *height > ymax)
-      *height -= (*y + *height - ymax);
-
-   if (*height <= 0)
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Clip dst coords against Xmax (or Ymax).
- */
-static INLINE void
-clip_right_or_top(GLint *srcX0, GLint *srcX1,
-                  GLint *dstX0, GLint *dstX1,
-                  GLint maxValue)
-{
-   GLfloat t, bias;
-
-   if (*dstX1 > maxValue) {
-      /* X1 outside right edge */
-      ASSERT(*dstX0 < maxValue); /* X0 should be inside right edge */
-      t = (GLfloat) (maxValue - *dstX0) / (GLfloat) (*dstX1 - *dstX0);
-      /* chop off [t, 1] part */
-      ASSERT(t >= 0.0 && t <= 1.0);
-      *dstX1 = maxValue;
-      bias = (*srcX0 < *srcX1) ? 0.5F : -0.5F;
-      *srcX1 = *srcX0 + (GLint) (t * (*srcX1 - *srcX0) + bias);
-   }
-   else if (*dstX0 > maxValue) {
-      /* X0 outside right edge */
-      ASSERT(*dstX1 < maxValue); /* X1 should be inside right edge */
-      t = (GLfloat) (maxValue - *dstX1) / (GLfloat) (*dstX0 - *dstX1);
-      /* chop off [t, 1] part */
-      ASSERT(t >= 0.0 && t <= 1.0);
-      *dstX0 = maxValue;
-      bias = (*srcX0 < *srcX1) ? -0.5F : 0.5F;
-      *srcX0 = *srcX1 + (GLint) (t * (*srcX0 - *srcX1) + bias);
-   }
-}
-
-
-/**
- * Clip dst coords against Xmin (or Ymin).
- */
-static INLINE void
-clip_left_or_bottom(GLint *srcX0, GLint *srcX1,
-                    GLint *dstX0, GLint *dstX1,
-                    GLint minValue)
-{
-   GLfloat t, bias;
-
-   if (*dstX0 < minValue) {
-      /* X0 outside left edge */
-      ASSERT(*dstX1 > minValue); /* X1 should be inside left edge */
-      t = (GLfloat) (minValue - *dstX0) / (GLfloat) (*dstX1 - *dstX0);
-      /* chop off [0, t] part */
-      ASSERT(t >= 0.0 && t <= 1.0);
-      *dstX0 = minValue;
-      bias = (*srcX0 < *srcX1) ? 0.5F : -0.5F; /* flipped??? */
-      *srcX0 = *srcX0 + (GLint) (t * (*srcX1 - *srcX0) + bias);
-   }
-   else if (*dstX1 < minValue) {
-      /* X1 outside left edge */
-      ASSERT(*dstX0 > minValue); /* X0 should be inside left edge */
-      t = (GLfloat) (minValue - *dstX1) / (GLfloat) (*dstX0 - *dstX1);
-      /* chop off [0, t] part */
-      ASSERT(t >= 0.0 && t <= 1.0);
-      *dstX1 = minValue;
-      bias = (*srcX0 < *srcX1) ? 0.5F : -0.5F;
-      *srcX1 = *srcX1 + (GLint) (t * (*srcX0 - *srcX1) + bias);
-   }
-}
-
-
-/**
- * Do clipping of blit src/dest rectangles.
- * The dest rect is clipped against both the buffer bounds and scissor bounds.
- * The src rect is just clipped against the buffer bounds.
- *
- * When either the src or dest rect is clipped, the other is also clipped
- * proportionately!
- *
- * Note that X0 need not be less than X1 (same for Y) for either the source
- * and dest rects.  That makes the clipping a little trickier.
- *
- * \return GL_TRUE if anything is left to draw, GL_FALSE if totally clipped
- */
-GLboolean
-_mesa_clip_blit(struct gl_context *ctx,
-                GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,
-                GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1)
-{
-   const GLint srcXmin = 0;
-   const GLint srcXmax = ctx->ReadBuffer->Width;
-   const GLint srcYmin = 0;
-   const GLint srcYmax = ctx->ReadBuffer->Height;
-
-   /* these include scissor bounds */
-   const GLint dstXmin = ctx->DrawBuffer->_Xmin;
-   const GLint dstXmax = ctx->DrawBuffer->_Xmax;
-   const GLint dstYmin = ctx->DrawBuffer->_Ymin;
-   const GLint dstYmax = ctx->DrawBuffer->_Ymax;
-
-   /*
-   printf("PreClipX:  src: %d .. %d  dst: %d .. %d\n",
-          *srcX0, *srcX1, *dstX0, *dstX1);
-   printf("PreClipY:  src: %d .. %d  dst: %d .. %d\n",
-          *srcY0, *srcY1, *dstY0, *dstY1);
-   */
-
-   /* trivial rejection tests */
-   if (*dstX0 == *dstX1)
-      return GL_FALSE; /* no width */
-   if (*dstX0 <= dstXmin && *dstX1 <= dstXmin)
-      return GL_FALSE; /* totally out (left) of bounds */
-   if (*dstX0 >= dstXmax && *dstX1 >= dstXmax)
-      return GL_FALSE; /* totally out (right) of bounds */
-
-   if (*dstY0 == *dstY1)
-      return GL_FALSE;
-   if (*dstY0 <= dstYmin && *dstY1 <= dstYmin)
-      return GL_FALSE;
-   if (*dstY0 >= dstYmax && *dstY1 >= dstYmax)
-      return GL_FALSE;
-
-   if (*srcX0 == *srcX1)
-      return GL_FALSE;
-   if (*srcX0 <= srcXmin && *srcX1 <= srcXmin)
-      return GL_FALSE;
-   if (*srcX0 >= srcXmax && *srcX1 >= srcXmax)
-      return GL_FALSE;
-
-   if (*srcY0 == *srcY1)
-      return GL_FALSE;
-   if (*srcY0 <= srcYmin && *srcY1 <= srcYmin)
-      return GL_FALSE;
-   if (*srcY0 >= srcYmax && *srcY1 >= srcYmax)
-      return GL_FALSE;
-
-   /*
-    * dest clip
-    */
-   clip_right_or_top(srcX0, srcX1, dstX0, dstX1, dstXmax);
-   clip_right_or_top(srcY0, srcY1, dstY0, dstY1, dstYmax);
-   clip_left_or_bottom(srcX0, srcX1, dstX0, dstX1, dstXmin);
-   clip_left_or_bottom(srcY0, srcY1, dstY0, dstY1, dstYmin);
-
-   /*
-    * src clip (just swap src/dst values from above)
-    */
-   clip_right_or_top(dstX0, dstX1, srcX0, srcX1, srcXmax);
-   clip_right_or_top(dstY0, dstY1, srcY0, srcY1, srcYmax);
-   clip_left_or_bottom(dstX0, dstX1, srcX0, srcX1, srcXmin);
-   clip_left_or_bottom(dstY0, dstY1, srcY0, srcY1, srcYmin);
-
-   /*
-   printf("PostClipX: src: %d .. %d  dst: %d .. %d\n",
-          *srcX0, *srcX1, *dstX0, *dstX1);
-   printf("PostClipY: src: %d .. %d  dst: %d .. %d\n",
-          *srcY0, *srcY1, *dstY0, *dstY1);
-   */
-
-   ASSERT(*dstX0 >= dstXmin);
-   ASSERT(*dstX0 <= dstXmax);
-   ASSERT(*dstX1 >= dstXmin);
-   ASSERT(*dstX1 <= dstXmax);
-
-   ASSERT(*dstY0 >= dstYmin);
-   ASSERT(*dstY0 <= dstYmax);
-   ASSERT(*dstY1 >= dstYmin);
-   ASSERT(*dstY1 <= dstYmax);
-
-   ASSERT(*srcX0 >= srcXmin);
-   ASSERT(*srcX0 <= srcXmax);
-   ASSERT(*srcX1 >= srcXmin);
-   ASSERT(*srcX1 <= srcXmax);
-
-   ASSERT(*srcY0 >= srcYmin);
-   ASSERT(*srcY0 <= srcYmax);
-   ASSERT(*srcY1 >= srcYmin);
-   ASSERT(*srcY1 <= srcYmax);
-
-   return GL_TRUE;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file image.c

+ * Image handling.

+ */

+

+

+#include "glheader.h"

+#include "colormac.h"

+#include "image.h"

+#include "imports.h"

+#include "macros.h"

+#include "mfeatures.h"

+#include "mtypes.h"

+

+

+/**

+ * NOTE:

+ * Normally, BYTE_TO_FLOAT(0) returns 0.00392  That causes problems when

+ * we later convert the float to a packed integer value (such as for

+ * GL_RGB5_A1) because we'll wind up with a non-zero value.

+ *

+ * We redefine the macros here so zero is handled correctly.

+ */

+#undef BYTE_TO_FLOAT

+#define BYTE_TO_FLOAT(B)    ((B) == 0 ? 0.0F : ((2.0F * (B) + 1.0F) * (1.0F/255.0F)))

+

+#undef SHORT_TO_FLOAT

+#define SHORT_TO_FLOAT(S)   ((S) == 0 ? 0.0F : ((2.0F * (S) + 1.0F) * (1.0F/65535.0F)))

+

+

+

+/** Compute ceiling of integer quotient of A divided by B. */

+#define CEILING( A, B )  ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 )

+

+

+/**

+ * \return GL_TRUE if type is packed pixel type, GL_FALSE otherwise.

+ */

+GLboolean

+_mesa_type_is_packed(GLenum type)

+{

+   switch (type) {

+   case GL_UNSIGNED_BYTE_3_3_2:

+   case GL_UNSIGNED_BYTE_2_3_3_REV:

+   case MESA_UNSIGNED_BYTE_4_4:

+   case GL_UNSIGNED_SHORT_5_6_5:

+   case GL_UNSIGNED_SHORT_5_6_5_REV:

+   case GL_UNSIGNED_SHORT_4_4_4_4:

+   case GL_UNSIGNED_SHORT_4_4_4_4_REV:

+   case GL_UNSIGNED_SHORT_5_5_5_1:

+   case GL_UNSIGNED_SHORT_1_5_5_5_REV:

+   case GL_UNSIGNED_INT_8_8_8_8:

+   case GL_UNSIGNED_INT_8_8_8_8_REV:

+   case GL_UNSIGNED_INT_10_10_10_2:

+   case GL_UNSIGNED_INT_2_10_10_10_REV:

+   case GL_UNSIGNED_SHORT_8_8_MESA:

+   case GL_UNSIGNED_SHORT_8_8_REV_MESA:

+   case GL_UNSIGNED_INT_24_8_EXT:

+      return GL_TRUE;

+   }

+

+   return GL_FALSE;

+}

+

+

+

+/**

+ * Flip the order of the 2 bytes in each word in the given array.

+ *

+ * \param p array.

+ * \param n number of words.

+ */

+void

+_mesa_swap2( GLushort *p, GLuint n )

+{

+   GLuint i;

+   for (i = 0; i < n; i++) {

+      p[i] = (p[i] >> 8) | ((p[i] << 8) & 0xff00);

+   }

+}

+

+

+

+/*

+ * Flip the order of the 4 bytes in each word in the given array.

+ */

+void

+_mesa_swap4( GLuint *p, GLuint n )

+{

+   GLuint i, a, b;

+   for (i = 0; i < n; i++) {

+      b = p[i];

+      a =  (b >> 24)

+	| ((b >> 8) & 0xff00)

+	| ((b << 8) & 0xff0000)

+	| ((b << 24) & 0xff000000);

+      p[i] = a;

+   }

+}

+

+

+/**

+ * Get the size of a GL data type.

+ *

+ * \param type GL data type.

+ *

+ * \return the size, in bytes, of the given data type, 0 if a GL_BITMAP, or -1

+ * if an invalid type enum.

+ */

+GLint

+_mesa_sizeof_type( GLenum type )

+{

+   switch (type) {

+      case GL_BITMAP:

+	 return 0;

+      case GL_UNSIGNED_BYTE:

+         return sizeof(GLubyte);

+      case GL_BYTE:

+	 return sizeof(GLbyte);

+      case GL_UNSIGNED_SHORT:

+	 return sizeof(GLushort);

+      case GL_SHORT:

+	 return sizeof(GLshort);

+      case GL_UNSIGNED_INT:

+	 return sizeof(GLuint);

+      case GL_INT:

+	 return sizeof(GLint);

+      case GL_FLOAT:

+	 return sizeof(GLfloat);

+      case GL_DOUBLE:

+	 return sizeof(GLdouble);

+      case GL_HALF_FLOAT_ARB:

+	 return sizeof(GLhalfARB);

+      case GL_FIXED:

+	 return sizeof(GLfixed);

+      default:

+         return -1;

+   }

+}

+

+

+/**

+ * Same as _mesa_sizeof_type() but also accepting the packed pixel

+ * format data types.

+ */

+GLint

+_mesa_sizeof_packed_type( GLenum type )

+{

+   switch (type) {

+      case GL_BITMAP:

+	 return 0;

+      case GL_UNSIGNED_BYTE:

+         return sizeof(GLubyte);

+      case GL_BYTE:

+	 return sizeof(GLbyte);

+      case GL_UNSIGNED_SHORT:

+	 return sizeof(GLushort);

+      case GL_SHORT:

+	 return sizeof(GLshort);

+      case GL_UNSIGNED_INT:

+	 return sizeof(GLuint);

+      case GL_INT:

+	 return sizeof(GLint);

+      case GL_HALF_FLOAT_ARB:

+	 return sizeof(GLhalfARB);

+      case GL_FLOAT:

+	 return sizeof(GLfloat);

+      case GL_UNSIGNED_BYTE_3_3_2:

+         return sizeof(GLubyte);

+      case GL_UNSIGNED_BYTE_2_3_3_REV:

+         return sizeof(GLubyte);

+      case MESA_UNSIGNED_BYTE_4_4:

+         return sizeof(GLubyte);

+      case GL_UNSIGNED_SHORT_5_6_5:

+         return sizeof(GLushort);

+      case GL_UNSIGNED_SHORT_5_6_5_REV:

+         return sizeof(GLushort);

+      case GL_UNSIGNED_SHORT_4_4_4_4:

+         return sizeof(GLushort);

+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:

+         return sizeof(GLushort);

+      case GL_UNSIGNED_SHORT_5_5_5_1:

+         return sizeof(GLushort);

+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:

+         return sizeof(GLushort);

+      case GL_UNSIGNED_INT_8_8_8_8:

+         return sizeof(GLuint);

+      case GL_UNSIGNED_INT_8_8_8_8_REV:

+         return sizeof(GLuint);

+      case GL_UNSIGNED_INT_10_10_10_2:

+         return sizeof(GLuint);

+      case GL_UNSIGNED_INT_2_10_10_10_REV:

+         return sizeof(GLuint);

+      case GL_UNSIGNED_SHORT_8_8_MESA:

+      case GL_UNSIGNED_SHORT_8_8_REV_MESA:

+         return sizeof(GLushort);      

+      case GL_UNSIGNED_INT_24_8_EXT:

+         return sizeof(GLuint);

+      default:

+         return -1;

+   }

+}

+

+

+/**

+ * Get the number of components in a pixel format.

+ *

+ * \param format pixel format.

+ *

+ * \return the number of components in the given format, or -1 if a bad format.

+ */

+GLint

+_mesa_components_in_format( GLenum format )

+{

+   switch (format) {

+      case GL_COLOR_INDEX:

+      case GL_COLOR_INDEX1_EXT:

+      case GL_COLOR_INDEX2_EXT:

+      case GL_COLOR_INDEX4_EXT:

+      case GL_COLOR_INDEX8_EXT:

+      case GL_COLOR_INDEX12_EXT:

+      case GL_COLOR_INDEX16_EXT:

+      case GL_STENCIL_INDEX:

+      case GL_DEPTH_COMPONENT:

+      case GL_RED:

+      case GL_RED_INTEGER_EXT:

+      case GL_GREEN:

+      case GL_GREEN_INTEGER_EXT:

+      case GL_BLUE:

+      case GL_BLUE_INTEGER_EXT:

+      case GL_ALPHA:

+      case GL_ALPHA_INTEGER_EXT:

+      case GL_LUMINANCE:

+      case GL_LUMINANCE_INTEGER_EXT:

+      case GL_INTENSITY:

+         return 1;

+      case GL_LUMINANCE_ALPHA:

+      case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+      case GL_RG:

+	 return 2;

+      case GL_RGB:

+      case GL_RGB_INTEGER_EXT:

+	 return 3;

+      case GL_RGBA:

+      case GL_RGBA_INTEGER_EXT:

+	 return 4;

+      case GL_BGR:

+	 return 3;

+      case GL_BGRA:

+	 return 4;

+      case GL_ABGR_EXT:

+         return 4;

+      case GL_YCBCR_MESA:

+         return 2;

+      case GL_DEPTH_STENCIL_EXT:

+         return 2;

+      case GL_DUDV_ATI:

+      case GL_DU8DV8_ATI:

+         return 2;

+      default:

+         return -1;

+   }

+}

+

+

+/**

+ * Get the bytes per pixel of pixel format type pair.

+ *

+ * \param format pixel format.

+ * \param type pixel type.

+ *

+ * \return bytes per pixel, or -1 if a bad format or type was given.

+ */

+GLint

+_mesa_bytes_per_pixel( GLenum format, GLenum type )

+{

+   GLint comps = _mesa_components_in_format( format );

+   if (comps < 0)

+      return -1;

+

+   switch (type) {

+      case GL_BITMAP:

+         return 0;  /* special case */

+      case GL_BYTE:

+      case GL_UNSIGNED_BYTE:

+         return comps * sizeof(GLubyte);

+      case GL_SHORT:

+      case GL_UNSIGNED_SHORT:

+         return comps * sizeof(GLshort);

+      case GL_INT:

+      case GL_UNSIGNED_INT:

+         return comps * sizeof(GLint);

+      case GL_FLOAT:

+         return comps * sizeof(GLfloat);

+      case GL_HALF_FLOAT_ARB:

+         return comps * sizeof(GLhalfARB);

+      case GL_UNSIGNED_BYTE_3_3_2:

+      case GL_UNSIGNED_BYTE_2_3_3_REV:

+         if (format == GL_RGB || format == GL_BGR ||

+             format == GL_RGB_INTEGER_EXT || format == GL_BGR_INTEGER_EXT)

+            return sizeof(GLubyte);

+         else

+            return -1;  /* error */

+      case GL_UNSIGNED_SHORT_5_6_5:

+      case GL_UNSIGNED_SHORT_5_6_5_REV:

+         if (format == GL_RGB || format == GL_BGR ||

+             format == GL_RGB_INTEGER_EXT || format == GL_BGR_INTEGER_EXT)

+            return sizeof(GLushort);

+         else

+            return -1;  /* error */

+      case GL_UNSIGNED_SHORT_4_4_4_4:

+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:

+      case GL_UNSIGNED_SHORT_5_5_5_1:

+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:

+         if (format == GL_RGBA || format == GL_BGRA || format == GL_ABGR_EXT ||

+             format == GL_RGBA_INTEGER_EXT || format == GL_BGRA_INTEGER_EXT)

+            return sizeof(GLushort);

+         else

+            return -1;

+      case GL_UNSIGNED_INT_8_8_8_8:

+      case GL_UNSIGNED_INT_8_8_8_8_REV:

+      case GL_UNSIGNED_INT_10_10_10_2:

+      case GL_UNSIGNED_INT_2_10_10_10_REV:

+         if (format == GL_RGBA || format == GL_BGRA || format == GL_ABGR_EXT ||

+             format == GL_RGBA_INTEGER_EXT || format == GL_BGRA_INTEGER_EXT)

+            return sizeof(GLuint);

+         else

+            return -1;

+      case GL_UNSIGNED_SHORT_8_8_MESA:

+      case GL_UNSIGNED_SHORT_8_8_REV_MESA:

+         if (format == GL_YCBCR_MESA)

+            return sizeof(GLushort);

+         else

+            return -1;

+      case GL_UNSIGNED_INT_24_8_EXT:

+         if (format == GL_DEPTH_STENCIL_EXT)

+            return sizeof(GLuint);

+         else

+            return -1;

+      default:

+         return -1;

+   }

+}

+

+

+/**

+ * Test for a legal pixel format and type.

+ *

+ * \param format pixel format.

+ * \param type pixel type.

+ *

+ * \return GL_TRUE if the given pixel format and type are legal, or GL_FALSE

+ * otherwise.

+ */

+GLboolean

+_mesa_is_legal_format_and_type(const struct gl_context *ctx,

+                               GLenum format, GLenum type)

+{

+   switch (format) {

+      case GL_COLOR_INDEX:

+      case GL_STENCIL_INDEX:

+         switch (type) {

+            case GL_BITMAP:

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+            case GL_FLOAT:

+               return GL_TRUE;

+            case GL_HALF_FLOAT_ARB:

+               return ctx->Extensions.ARB_half_float_pixel;

+            default:

+               return GL_FALSE;

+         }

+      case GL_RED:

+      case GL_GREEN:

+      case GL_BLUE:

+      case GL_ALPHA:

+#if 0 /* not legal!  see table 3.6 of the 1.5 spec */

+      case GL_INTENSITY:

+#endif

+      case GL_LUMINANCE:

+      case GL_LUMINANCE_ALPHA:

+      case GL_DEPTH_COMPONENT:

+         switch (type) {

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+            case GL_FLOAT:

+               return GL_TRUE;

+            case GL_HALF_FLOAT_ARB:

+               return ctx->Extensions.ARB_half_float_pixel;

+            default:

+               return GL_FALSE;

+         }

+      case GL_RG:

+	 if (!ctx->Extensions.ARB_texture_rg)

+	    return GL_FALSE;

+

+         switch (type) {

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+            case GL_FLOAT:

+               return GL_TRUE;

+            case GL_HALF_FLOAT_ARB:

+               return ctx->Extensions.ARB_half_float_pixel;

+            default:

+               return GL_FALSE;

+         }

+      case GL_RGB:

+         switch (type) {

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+            case GL_FLOAT:

+            case GL_UNSIGNED_BYTE_3_3_2:

+            case GL_UNSIGNED_BYTE_2_3_3_REV:

+            case GL_UNSIGNED_SHORT_5_6_5:

+            case GL_UNSIGNED_SHORT_5_6_5_REV:

+               return GL_TRUE;

+            case GL_HALF_FLOAT_ARB:

+               return ctx->Extensions.ARB_half_float_pixel;

+            default:

+               return GL_FALSE;

+         }

+      case GL_BGR:

+         switch (type) {

+            /* NOTE: no packed types are supported with BGR.  That's

+             * intentional, according to the GL spec.

+             */

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+            case GL_FLOAT:

+               return GL_TRUE;

+            case GL_HALF_FLOAT_ARB:

+               return ctx->Extensions.ARB_half_float_pixel;

+            default:

+               return GL_FALSE;

+         }

+      case GL_RGBA:

+      case GL_BGRA:

+      case GL_ABGR_EXT:

+         switch (type) {

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+            case GL_FLOAT:

+            case GL_UNSIGNED_SHORT_4_4_4_4:

+            case GL_UNSIGNED_SHORT_4_4_4_4_REV:

+            case GL_UNSIGNED_SHORT_5_5_5_1:

+            case GL_UNSIGNED_SHORT_1_5_5_5_REV:

+            case GL_UNSIGNED_INT_8_8_8_8:

+            case GL_UNSIGNED_INT_8_8_8_8_REV:

+            case GL_UNSIGNED_INT_10_10_10_2:

+            case GL_UNSIGNED_INT_2_10_10_10_REV:

+               return GL_TRUE;

+            case GL_HALF_FLOAT_ARB:

+               return ctx->Extensions.ARB_half_float_pixel;

+            default:

+               return GL_FALSE;

+         }

+      case GL_YCBCR_MESA:

+         if (type == GL_UNSIGNED_SHORT_8_8_MESA ||

+             type == GL_UNSIGNED_SHORT_8_8_REV_MESA)

+            return GL_TRUE;

+         else

+            return GL_FALSE;

+      case GL_DEPTH_STENCIL_EXT:

+         if (ctx->Extensions.EXT_packed_depth_stencil

+             && type == GL_UNSIGNED_INT_24_8_EXT)

+            return GL_TRUE;

+         else

+            return GL_FALSE;

+      case GL_DUDV_ATI:

+      case GL_DU8DV8_ATI:

+         switch (type) {

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+            case GL_FLOAT:

+               return GL_TRUE;

+            default:

+               return GL_FALSE;

+         }

+

+      /* integer-valued formats */

+      case GL_RED_INTEGER_EXT:

+      case GL_GREEN_INTEGER_EXT:

+      case GL_BLUE_INTEGER_EXT:

+      case GL_ALPHA_INTEGER_EXT:

+         switch (type) {

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+               return ctx->Extensions.EXT_texture_integer;

+            default:

+               return GL_FALSE;

+         }

+

+      case GL_RGB_INTEGER_EXT:

+         switch (type) {

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+            case GL_UNSIGNED_BYTE_3_3_2:

+            case GL_UNSIGNED_BYTE_2_3_3_REV:

+            case GL_UNSIGNED_SHORT_5_6_5:

+            case GL_UNSIGNED_SHORT_5_6_5_REV:

+               return ctx->Extensions.EXT_texture_integer;

+            default:

+               return GL_FALSE;

+         }

+

+      case GL_BGR_INTEGER_EXT:

+         switch (type) {

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+            /* NOTE: no packed formats w/ BGR format */

+               return ctx->Extensions.EXT_texture_integer;

+            default:

+               return GL_FALSE;

+         }

+

+      case GL_RGBA_INTEGER_EXT:

+      case GL_BGRA_INTEGER_EXT:

+         switch (type) {

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+            case GL_UNSIGNED_SHORT_4_4_4_4:

+            case GL_UNSIGNED_SHORT_4_4_4_4_REV:

+            case GL_UNSIGNED_SHORT_5_5_5_1:

+            case GL_UNSIGNED_SHORT_1_5_5_5_REV:

+            case GL_UNSIGNED_INT_8_8_8_8:

+            case GL_UNSIGNED_INT_8_8_8_8_REV:

+            case GL_UNSIGNED_INT_10_10_10_2:

+            case GL_UNSIGNED_INT_2_10_10_10_REV:

+               return ctx->Extensions.EXT_texture_integer;

+            default:

+               return GL_FALSE;

+         }

+

+      case GL_LUMINANCE_INTEGER_EXT:

+      case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+         switch (type) {

+            case GL_BYTE:

+            case GL_UNSIGNED_BYTE:

+            case GL_SHORT:

+            case GL_UNSIGNED_SHORT:

+            case GL_INT:

+            case GL_UNSIGNED_INT:

+               return ctx->Extensions.EXT_texture_integer;

+            default:

+               return GL_FALSE;

+         }

+

+      default:

+         ; /* fall-through */

+   }

+   return GL_FALSE;

+}

+

+

+/**

+ * Test if the given image format is a color/RGBA format (i.e., not color

+ * index, depth, stencil, etc).

+ * \param format  the image format value (may by an internal texture format)

+ * \return GL_TRUE if its a color/RGBA format, GL_FALSE otherwise.

+ */

+GLboolean

+_mesa_is_color_format(GLenum format)

+{

+   switch (format) {

+      case GL_RED:

+      case GL_GREEN:

+      case GL_BLUE:

+      case GL_ALPHA:

+      case GL_ALPHA4:

+      case GL_ALPHA8:

+      case GL_ALPHA12:

+      case GL_ALPHA16:

+      case 1:

+      case GL_LUMINANCE:

+      case GL_LUMINANCE4:

+      case GL_LUMINANCE8:

+      case GL_LUMINANCE12:

+      case GL_LUMINANCE16:

+      case 2:

+      case GL_LUMINANCE_ALPHA:

+      case GL_LUMINANCE4_ALPHA4:

+      case GL_LUMINANCE6_ALPHA2:

+      case GL_LUMINANCE8_ALPHA8:

+      case GL_LUMINANCE12_ALPHA4:

+      case GL_LUMINANCE12_ALPHA12:

+      case GL_LUMINANCE16_ALPHA16:

+      case GL_INTENSITY:

+      case GL_INTENSITY4:

+      case GL_INTENSITY8:

+      case GL_INTENSITY12:

+      case GL_INTENSITY16:

+      case GL_R8:

+      case GL_R16:

+      case GL_RG:

+      case GL_RG8:

+      case GL_RG16:

+      case 3:

+      case GL_RGB:

+      case GL_BGR:

+      case GL_R3_G3_B2:

+      case GL_RGB4:

+      case GL_RGB5:

+      case GL_RGB8:

+      case GL_RGB10:

+      case GL_RGB12:

+      case GL_RGB16:

+      case 4:

+      case GL_ABGR_EXT:

+      case GL_RGBA:

+      case GL_BGRA:

+      case GL_RGBA2:

+      case GL_RGBA4:

+      case GL_RGB5_A1:

+      case GL_RGBA8:

+      case GL_RGB10_A2:

+      case GL_RGBA12:

+      case GL_RGBA16:

+      /* float texture formats */

+      case GL_ALPHA16F_ARB:

+      case GL_ALPHA32F_ARB:

+      case GL_LUMINANCE16F_ARB:

+      case GL_LUMINANCE32F_ARB:

+      case GL_LUMINANCE_ALPHA16F_ARB:

+      case GL_LUMINANCE_ALPHA32F_ARB:

+      case GL_INTENSITY16F_ARB:

+      case GL_INTENSITY32F_ARB:

+      case GL_R16F:

+      case GL_R32F:

+      case GL_RG16F:

+      case GL_RG32F:

+      case GL_RGB16F_ARB:

+      case GL_RGB32F_ARB:

+      case GL_RGBA16F_ARB:

+      case GL_RGBA32F_ARB:

+      /* compressed formats */

+      case GL_COMPRESSED_ALPHA:

+      case GL_COMPRESSED_LUMINANCE:

+      case GL_COMPRESSED_LUMINANCE_ALPHA:

+      case GL_COMPRESSED_INTENSITY:

+      case GL_COMPRESSED_RED:

+      case GL_COMPRESSED_RG:

+      case GL_COMPRESSED_RGB:

+      case GL_COMPRESSED_RGBA:

+      case GL_RGB_S3TC:

+      case GL_RGB4_S3TC:

+      case GL_RGBA_S3TC:

+      case GL_RGBA4_S3TC:

+      case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:

+      case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:

+      case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:

+      case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:

+      case GL_COMPRESSED_RGB_FXT1_3DFX:

+      case GL_COMPRESSED_RGBA_FXT1_3DFX:

+#if FEATURE_EXT_texture_sRGB

+      case GL_SRGB_EXT:

+      case GL_SRGB8_EXT:

+      case GL_SRGB_ALPHA_EXT:

+      case GL_SRGB8_ALPHA8_EXT:

+      case GL_SLUMINANCE_ALPHA_EXT:

+      case GL_SLUMINANCE8_ALPHA8_EXT:

+      case GL_SLUMINANCE_EXT:

+      case GL_SLUMINANCE8_EXT:

+      case GL_COMPRESSED_SRGB_EXT:

+      case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:

+      case GL_COMPRESSED_SRGB_ALPHA_EXT:

+      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:

+      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:

+      case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:

+      case GL_COMPRESSED_SLUMINANCE_EXT:

+      case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:

+#endif /* FEATURE_EXT_texture_sRGB */

+      case GL_COMPRESSED_RED_RGTC1:

+      case GL_COMPRESSED_SIGNED_RED_RGTC1:

+      case GL_COMPRESSED_RG_RGTC2:

+      case GL_COMPRESSED_SIGNED_RG_RGTC2:

+      case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

+      case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+      case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+      case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+      case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

+      /* generic integer formats */

+      case GL_RED_INTEGER_EXT:

+      case GL_GREEN_INTEGER_EXT:

+      case GL_BLUE_INTEGER_EXT:

+      case GL_ALPHA_INTEGER_EXT:

+      case GL_RGB_INTEGER_EXT:

+      case GL_RGBA_INTEGER_EXT:

+      case GL_BGR_INTEGER_EXT:

+      case GL_BGRA_INTEGER_EXT:

+      case GL_LUMINANCE_INTEGER_EXT:

+      case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+      /* sized integer formats */

+      case GL_RGBA32UI_EXT:

+      case GL_RGB32UI_EXT:

+      case GL_ALPHA32UI_EXT:

+      case GL_INTENSITY32UI_EXT:

+      case GL_LUMINANCE32UI_EXT:

+      case GL_LUMINANCE_ALPHA32UI_EXT:

+      case GL_RGBA16UI_EXT:

+      case GL_RGB16UI_EXT:

+      case GL_ALPHA16UI_EXT:

+      case GL_INTENSITY16UI_EXT:

+      case GL_LUMINANCE16UI_EXT:

+      case GL_LUMINANCE_ALPHA16UI_EXT:

+      case GL_RGBA8UI_EXT:

+      case GL_RGB8UI_EXT:

+      case GL_ALPHA8UI_EXT:

+      case GL_INTENSITY8UI_EXT:

+      case GL_LUMINANCE8UI_EXT:

+      case GL_LUMINANCE_ALPHA8UI_EXT:

+      case GL_RGBA32I_EXT:

+      case GL_RGB32I_EXT:

+      case GL_ALPHA32I_EXT:

+      case GL_INTENSITY32I_EXT:

+      case GL_LUMINANCE32I_EXT:

+      case GL_LUMINANCE_ALPHA32I_EXT:

+      case GL_RGBA16I_EXT:

+      case GL_RGB16I_EXT:

+      case GL_ALPHA16I_EXT:

+      case GL_INTENSITY16I_EXT:

+      case GL_LUMINANCE16I_EXT:

+      case GL_LUMINANCE_ALPHA16I_EXT:

+      case GL_RGBA8I_EXT:

+      case GL_RGB8I_EXT:

+      case GL_ALPHA8I_EXT:

+      case GL_INTENSITY8I_EXT:

+      case GL_LUMINANCE8I_EXT:

+      case GL_LUMINANCE_ALPHA8I_EXT:

+      /* signed, normalized texture formats */

+      case GL_RED_SNORM:

+      case GL_R8_SNORM:

+      case GL_R16_SNORM:

+      case GL_RG_SNORM:

+      case GL_RG8_SNORM:

+      case GL_RG16_SNORM:

+      case GL_RGB_SNORM:

+      case GL_RGB8_SNORM:

+      case GL_RGB16_SNORM:

+      case GL_RGBA_SNORM:

+      case GL_RGBA8_SNORM:

+      case GL_RGBA16_SNORM:

+      case GL_ALPHA_SNORM:

+      case GL_ALPHA8_SNORM:

+      case GL_ALPHA16_SNORM:

+      case GL_LUMINANCE_SNORM:

+      case GL_LUMINANCE8_SNORM:

+      case GL_LUMINANCE16_SNORM:

+      case GL_LUMINANCE_ALPHA_SNORM:

+      case GL_LUMINANCE8_ALPHA8_SNORM:

+      case GL_LUMINANCE16_ALPHA16_SNORM:

+      case GL_INTENSITY_SNORM:

+      case GL_INTENSITY8_SNORM:

+      case GL_INTENSITY16_SNORM:

+         return GL_TRUE;

+      case GL_YCBCR_MESA:  /* not considered to be RGB */

+         /* fall-through */

+      default:

+         return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if the given image format is a color index format.

+ */

+GLboolean

+_mesa_is_index_format(GLenum format)

+{

+   switch (format) {

+      case GL_COLOR_INDEX:

+      case GL_COLOR_INDEX1_EXT:

+      case GL_COLOR_INDEX2_EXT:

+      case GL_COLOR_INDEX4_EXT:

+      case GL_COLOR_INDEX8_EXT:

+      case GL_COLOR_INDEX12_EXT:

+      case GL_COLOR_INDEX16_EXT:

+         return GL_TRUE;

+      default:

+         return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if the given image format is a depth component format.

+ */

+GLboolean

+_mesa_is_depth_format(GLenum format)

+{

+   switch (format) {

+      case GL_DEPTH_COMPONENT:

+      case GL_DEPTH_COMPONENT16:

+      case GL_DEPTH_COMPONENT24:

+      case GL_DEPTH_COMPONENT32:

+         return GL_TRUE;

+      default:

+         return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if the given image format is a stencil format.

+ */

+GLboolean

+_mesa_is_stencil_format(GLenum format)

+{

+   switch (format) {

+      case GL_STENCIL_INDEX:

+      case GL_DEPTH_STENCIL:

+         return GL_TRUE;

+      default:

+         return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if the given image format is a YCbCr format.

+ */

+GLboolean

+_mesa_is_ycbcr_format(GLenum format)

+{

+   switch (format) {

+      case GL_YCBCR_MESA:

+         return GL_TRUE;

+      default:

+         return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if the given image format is a depth+stencil format.

+ */

+GLboolean

+_mesa_is_depthstencil_format(GLenum format)

+{

+   switch (format) {

+      case GL_DEPTH24_STENCIL8_EXT:

+      case GL_DEPTH_STENCIL_EXT:

+         return GL_TRUE;

+      default:

+         return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if the given image format is a depth or stencil format.

+ */

+GLboolean

+_mesa_is_depth_or_stencil_format(GLenum format)

+{

+   switch (format) {

+      case GL_DEPTH_COMPONENT:

+      case GL_DEPTH_COMPONENT16:

+      case GL_DEPTH_COMPONENT24:

+      case GL_DEPTH_COMPONENT32:

+      case GL_STENCIL_INDEX:

+      case GL_STENCIL_INDEX1_EXT:

+      case GL_STENCIL_INDEX4_EXT:

+      case GL_STENCIL_INDEX8_EXT:

+      case GL_STENCIL_INDEX16_EXT:

+      case GL_DEPTH_STENCIL_EXT:

+      case GL_DEPTH24_STENCIL8_EXT:

+         return GL_TRUE;

+      default:

+         return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if the given image format is a dudv format.

+ */

+GLboolean

+_mesa_is_dudv_format(GLenum format)

+{

+   switch (format) {

+      case GL_DUDV_ATI:

+      case GL_DU8DV8_ATI:

+         return GL_TRUE;

+      default:

+         return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if the given format is an integer (non-normalized) format.

+ */

+GLboolean

+_mesa_is_integer_format(GLenum format)

+{

+   switch (format) {

+   /* generic integer formats */

+   case GL_RED_INTEGER_EXT:

+   case GL_GREEN_INTEGER_EXT:

+   case GL_BLUE_INTEGER_EXT:

+   case GL_ALPHA_INTEGER_EXT:

+   case GL_RGB_INTEGER_EXT:

+   case GL_RGBA_INTEGER_EXT:

+   case GL_BGR_INTEGER_EXT:

+   case GL_BGRA_INTEGER_EXT:

+   case GL_LUMINANCE_INTEGER_EXT:

+   case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+   /* specific integer formats */

+   case GL_RGBA32UI_EXT:

+   case GL_RGB32UI_EXT:

+   case GL_ALPHA32UI_EXT:

+   case GL_INTENSITY32UI_EXT:

+   case GL_LUMINANCE32UI_EXT:

+   case GL_LUMINANCE_ALPHA32UI_EXT:

+   case GL_RGBA16UI_EXT:

+   case GL_RGB16UI_EXT:

+   case GL_ALPHA16UI_EXT:

+   case GL_INTENSITY16UI_EXT:

+   case GL_LUMINANCE16UI_EXT:

+   case GL_LUMINANCE_ALPHA16UI_EXT:

+   case GL_RGBA8UI_EXT:

+   case GL_RGB8UI_EXT:

+   case GL_ALPHA8UI_EXT:

+   case GL_INTENSITY8UI_EXT:

+   case GL_LUMINANCE8UI_EXT:

+   case GL_LUMINANCE_ALPHA8UI_EXT:

+   case GL_RGBA32I_EXT:

+   case GL_RGB32I_EXT:

+   case GL_ALPHA32I_EXT:

+   case GL_INTENSITY32I_EXT:

+   case GL_LUMINANCE32I_EXT:

+   case GL_LUMINANCE_ALPHA32I_EXT:

+   case GL_RGBA16I_EXT:

+   case GL_RGB16I_EXT:

+   case GL_ALPHA16I_EXT:

+   case GL_INTENSITY16I_EXT:

+   case GL_LUMINANCE16I_EXT:

+   case GL_LUMINANCE_ALPHA16I_EXT:

+   case GL_RGBA8I_EXT:

+   case GL_RGB8I_EXT:

+   case GL_ALPHA8I_EXT:

+   case GL_INTENSITY8I_EXT:

+   case GL_LUMINANCE8I_EXT:

+   case GL_LUMINANCE_ALPHA8I_EXT:

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if an image format is a supported compressed format.

+ * \param format the internal format token provided by the user.

+ * \return GL_TRUE if compressed, GL_FALSE if uncompressed

+ */

+GLboolean

+_mesa_is_compressed_format(struct gl_context *ctx, GLenum format)

+{

+   switch (format) {

+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:

+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:

+   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:

+   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:

+      return ctx->Extensions.EXT_texture_compression_s3tc;

+   case GL_RGB_S3TC:

+   case GL_RGB4_S3TC:

+   case GL_RGBA_S3TC:

+   case GL_RGBA4_S3TC:

+      return ctx->Extensions.S3_s3tc;

+   case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:

+      return ctx->Extensions.EXT_texture_sRGB

+         && ctx->Extensions.EXT_texture_compression_s3tc;

+   case GL_COMPRESSED_RGB_FXT1_3DFX:

+   case GL_COMPRESSED_RGBA_FXT1_3DFX:

+      return ctx->Extensions.TDFX_texture_compression_FXT1;

+   case GL_COMPRESSED_RED_RGTC1:

+   case GL_COMPRESSED_SIGNED_RED_RGTC1:

+   case GL_COMPRESSED_RG_RGTC2:

+   case GL_COMPRESSED_SIGNED_RG_RGTC2:

+      return ctx->Extensions.ARB_texture_compression_rgtc;

+   case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

+   case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+   case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+   case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+      return ctx->Extensions.EXT_texture_compression_latc;

+   case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

+      return ctx->Extensions.ATI_texture_compression_3dc;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Return the address of a specific pixel in an image (1D, 2D or 3D).

+ *

+ * Pixel unpacking/packing parameters are observed according to \p packing.

+ *

+ * \param dimensions either 1, 2 or 3 to indicate dimensionality of image

+ * \param image  starting address of image data

+ * \param width  the image width

+ * \param height  theimage height

+ * \param format  the pixel format

+ * \param type  the pixel data type

+ * \param packing  the pixelstore attributes

+ * \param img  which image in the volume (0 for 1D or 2D images)

+ * \param row  row of pixel in the image (0 for 1D images)

+ * \param column column of pixel in the image

+ * 

+ * \return address of pixel on success, or NULL on error.

+ *

+ * \sa gl_pixelstore_attrib.

+ */

+GLvoid *

+_mesa_image_address( GLuint dimensions,

+                     const struct gl_pixelstore_attrib *packing,

+                     const GLvoid *image,

+                     GLsizei width, GLsizei height,

+                     GLenum format, GLenum type,

+                     GLint img, GLint row, GLint column )

+{

+   GLint alignment;        /* 1, 2 or 4 */

+   GLint pixels_per_row;

+   GLint rows_per_image;

+   GLint skiprows;

+   GLint skippixels;

+   GLint skipimages;       /* for 3-D volume images */

+   GLubyte *pixel_addr;

+

+   ASSERT(dimensions >= 1 && dimensions <= 3);

+

+   alignment = packing->Alignment;

+   if (packing->RowLength > 0) {

+      pixels_per_row = packing->RowLength;

+   }

+   else {

+      pixels_per_row = width;

+   }

+   if (packing->ImageHeight > 0) {

+      rows_per_image = packing->ImageHeight;

+   }

+   else {

+      rows_per_image = height;

+   }

+

+   skippixels = packing->SkipPixels;

+   /* Note: SKIP_ROWS _is_ used for 1D images */

+   skiprows = packing->SkipRows;

+   /* Note: SKIP_IMAGES is only used for 3D images */

+   skipimages = (dimensions == 3) ? packing->SkipImages : 0;

+

+   if (type == GL_BITMAP) {

+      /* BITMAP data */

+      GLint comp_per_pixel;   /* components per pixel */

+      GLint bytes_per_comp;   /* bytes per component */

+      GLint bytes_per_row;

+      GLint bytes_per_image;

+

+      /* Compute bytes per component */

+      bytes_per_comp = _mesa_sizeof_packed_type( type );

+      if (bytes_per_comp < 0) {

+         return NULL;

+      }

+

+      /* Compute number of components per pixel */

+      comp_per_pixel = _mesa_components_in_format( format );

+      if (comp_per_pixel < 0) {

+         return NULL;

+      }

+

+      bytes_per_row = alignment

+                    * CEILING( comp_per_pixel*pixels_per_row, 8*alignment );

+

+      bytes_per_image = bytes_per_row * rows_per_image;

+

+      pixel_addr = (GLubyte *) image

+                 + (skipimages + img) * bytes_per_image

+                 + (skiprows + row) * bytes_per_row

+                 + (skippixels + column) / 8;

+   }

+   else {

+      /* Non-BITMAP data */

+      GLint bytes_per_pixel, bytes_per_row, remainder, bytes_per_image;

+      GLint topOfImage;

+

+      bytes_per_pixel = _mesa_bytes_per_pixel( format, type );

+

+      /* The pixel type and format should have been error checked earlier */

+      assert(bytes_per_pixel > 0);

+

+      bytes_per_row = pixels_per_row * bytes_per_pixel;

+      remainder = bytes_per_row % alignment;

+      if (remainder > 0)

+         bytes_per_row += (alignment - remainder);

+

+      ASSERT(bytes_per_row % alignment == 0);

+

+      bytes_per_image = bytes_per_row * rows_per_image;

+

+      if (packing->Invert) {

+         /* set pixel_addr to the last row */

+         topOfImage = bytes_per_row * (height - 1);

+         bytes_per_row = -bytes_per_row;

+      }

+      else {

+         topOfImage = 0;

+      }

+

+      /* compute final pixel address */

+      pixel_addr = (GLubyte *) image

+                 + (skipimages + img) * bytes_per_image

+                 + topOfImage

+                 + (skiprows + row) * bytes_per_row

+                 + (skippixels + column) * bytes_per_pixel;

+   }

+

+   return (GLvoid *) pixel_addr;

+}

+

+

+GLvoid *

+_mesa_image_address1d( const struct gl_pixelstore_attrib *packing,

+                       const GLvoid *image,

+                       GLsizei width,

+                       GLenum format, GLenum type,

+                       GLint column )

+{

+   return _mesa_image_address(1, packing, image, width, 1,

+                              format, type, 0, 0, column);

+}

+

+

+GLvoid *

+_mesa_image_address2d( const struct gl_pixelstore_attrib *packing,

+                       const GLvoid *image,

+                       GLsizei width, GLsizei height,

+                       GLenum format, GLenum type,

+                       GLint row, GLint column )

+{

+   return _mesa_image_address(2, packing, image, width, height,

+                              format, type, 0, row, column);

+}

+

+

+GLvoid *

+_mesa_image_address3d( const struct gl_pixelstore_attrib *packing,

+                       const GLvoid *image,

+                       GLsizei width, GLsizei height,

+                       GLenum format, GLenum type,

+                       GLint img, GLint row, GLint column )

+{

+   return _mesa_image_address(3, packing, image, width, height,

+                              format, type, img, row, column);

+}

+

+

+

+/**

+ * Compute the stride (in bytes) between image rows.

+ *

+ * \param packing the pixelstore attributes

+ * \param width image width.

+ * \param format pixel format.

+ * \param type pixel data type.

+ * 

+ * \return the stride in bytes for the given parameters, or -1 if error

+ */

+GLint

+_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,

+                        GLint width, GLenum format, GLenum type )

+{

+   GLint bytesPerRow, remainder;

+

+   ASSERT(packing);

+

+   if (type == GL_BITMAP) {

+      if (packing->RowLength == 0) {

+         bytesPerRow = (width + 7) / 8;

+      }

+      else {

+         bytesPerRow = (packing->RowLength + 7) / 8;

+      }

+   }

+   else {

+      /* Non-BITMAP data */

+      const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);

+      if (bytesPerPixel <= 0)

+         return -1;  /* error */

+      if (packing->RowLength == 0) {

+         bytesPerRow = bytesPerPixel * width;

+      }

+      else {

+         bytesPerRow = bytesPerPixel * packing->RowLength;

+      }

+   }

+

+   remainder = bytesPerRow % packing->Alignment;

+   if (remainder > 0) {

+      bytesPerRow += (packing->Alignment - remainder);

+   }

+

+   if (packing->Invert) {

+      /* negate the bytes per row (negative row stride) */

+      bytesPerRow = -bytesPerRow;

+   }

+

+   return bytesPerRow;

+}

+

+

+/*

+ * Compute the stride between images in a 3D texture (in bytes) for the given

+ * pixel packing parameters and image width, format and type.

+ */

+GLint

+_mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,

+                          GLint width, GLint height,

+                          GLenum format, GLenum type )

+{

+   GLint bytesPerRow, bytesPerImage, remainder;

+

+   ASSERT(packing);

+

+   if (type == GL_BITMAP) {

+      if (packing->RowLength == 0) {

+         bytesPerRow = (width + 7) / 8;

+      }

+      else {

+         bytesPerRow = (packing->RowLength + 7) / 8;

+      }

+   }

+   else {

+      const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);

+

+      if (bytesPerPixel <= 0)

+         return -1;  /* error */

+      if (packing->RowLength == 0) {

+         bytesPerRow = bytesPerPixel * width;

+      }

+      else {

+         bytesPerRow = bytesPerPixel * packing->RowLength;

+      }

+   }

+

+   remainder = bytesPerRow % packing->Alignment;

+   if (remainder > 0)

+      bytesPerRow += (packing->Alignment - remainder);

+

+   if (packing->ImageHeight == 0)

+      bytesPerImage = bytesPerRow * height;

+   else

+      bytesPerImage = bytesPerRow * packing->ImageHeight;

+

+   return bytesPerImage;

+}

+

+

+

+/**

+ * "Expand" a bitmap from 1-bit per pixel to 8-bits per pixel.

+ * This is typically used to convert a bitmap into a GLubyte/pixel texture.

+ * "On" bits will set texels to \p onValue.

+ * "Off" bits will not modify texels.

+ * \param width  src bitmap width in pixels

+ * \param height  src bitmap height in pixels

+ * \param unpack  bitmap unpacking state

+ * \param bitmap  the src bitmap data

+ * \param destBuffer  start of dest buffer

+ * \param destStride  row stride in dest buffer

+ * \param onValue  if bit is 1, set destBuffer pixel to this value

+ */

+void

+_mesa_expand_bitmap(GLsizei width, GLsizei height,

+                    const struct gl_pixelstore_attrib *unpack,

+                    const GLubyte *bitmap,

+                    GLubyte *destBuffer, GLint destStride,

+                    GLubyte onValue)

+{

+   const GLubyte *srcRow = (const GLubyte *)

+      _mesa_image_address2d(unpack, bitmap, width, height,

+                            GL_COLOR_INDEX, GL_BITMAP, 0, 0);

+   const GLint srcStride = _mesa_image_row_stride(unpack, width,

+                                                  GL_COLOR_INDEX, GL_BITMAP);

+   GLint row, col;

+

+#define SET_PIXEL(COL, ROW) \

+   destBuffer[(ROW) * destStride + (COL)] = onValue;

+

+   for (row = 0; row < height; row++) {

+      const GLubyte *src = srcRow;

+

+      if (unpack->LsbFirst) {

+         /* Lsb first */

+         GLubyte mask = 1U << (unpack->SkipPixels & 0x7);

+         for (col = 0; col < width; col++) {

+

+            if (*src & mask) {

+               SET_PIXEL(col, row);

+            }

+

+            if (mask == 128U) {

+               src++;

+               mask = 1U;

+            }

+            else {

+               mask = mask << 1;

+            }

+         }

+

+         /* get ready for next row */

+         if (mask != 1)

+            src++;

+      }

+      else {

+         /* Msb first */

+         GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);

+         for (col = 0; col < width; col++) {

+

+            if (*src & mask) {

+               SET_PIXEL(col, row);

+            }

+

+            if (mask == 1U) {

+               src++;

+               mask = 128U;

+            }

+            else {

+               mask = mask >> 1;

+            }

+         }

+

+         /* get ready for next row */

+         if (mask != 128)

+            src++;

+      }

+

+      srcRow += srcStride;

+   } /* row */

+

+#undef SET_PIXEL

+}

+

+

+

+

+/**

+ * Convert an array of RGBA colors from one datatype to another.

+ * NOTE: src may equal dst.  In that case, we use a temporary buffer.

+ */

+void

+_mesa_convert_colors(GLenum srcType, const GLvoid *src,

+                     GLenum dstType, GLvoid *dst,

+                     GLuint count, const GLubyte mask[])

+{

+   GLuint tempBuffer[MAX_WIDTH][4];

+   const GLboolean useTemp = (src == dst);

+

+   ASSERT(srcType != dstType);

+

+   switch (srcType) {

+   case GL_UNSIGNED_BYTE:

+      if (dstType == GL_UNSIGNED_SHORT) {

+         const GLubyte (*src1)[4] = (const GLubyte (*)[4]) src;

+         GLushort (*dst2)[4] = (GLushort (*)[4]) (useTemp ? tempBuffer : dst);

+         GLuint i;

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst2[i][RCOMP] = UBYTE_TO_USHORT(src1[i][RCOMP]);

+               dst2[i][GCOMP] = UBYTE_TO_USHORT(src1[i][GCOMP]);

+               dst2[i][BCOMP] = UBYTE_TO_USHORT(src1[i][BCOMP]);

+               dst2[i][ACOMP] = UBYTE_TO_USHORT(src1[i][ACOMP]);

+            }

+         }

+         if (useTemp)

+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLushort));

+      }

+      else {

+         const GLubyte (*src1)[4] = (const GLubyte (*)[4]) src;

+         GLfloat (*dst4)[4] = (GLfloat (*)[4]) (useTemp ? tempBuffer : dst);

+         GLuint i;

+         ASSERT(dstType == GL_FLOAT);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst4[i][RCOMP] = UBYTE_TO_FLOAT(src1[i][RCOMP]);

+               dst4[i][GCOMP] = UBYTE_TO_FLOAT(src1[i][GCOMP]);

+               dst4[i][BCOMP] = UBYTE_TO_FLOAT(src1[i][BCOMP]);

+               dst4[i][ACOMP] = UBYTE_TO_FLOAT(src1[i][ACOMP]);

+            }

+         }

+         if (useTemp)

+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLfloat));

+      }

+      break;

+   case GL_UNSIGNED_SHORT:

+      if (dstType == GL_UNSIGNED_BYTE) {

+         const GLushort (*src2)[4] = (const GLushort (*)[4]) src;

+         GLubyte (*dst1)[4] = (GLubyte (*)[4]) (useTemp ? tempBuffer : dst);

+         GLuint i;

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst1[i][RCOMP] = USHORT_TO_UBYTE(src2[i][RCOMP]);

+               dst1[i][GCOMP] = USHORT_TO_UBYTE(src2[i][GCOMP]);

+               dst1[i][BCOMP] = USHORT_TO_UBYTE(src2[i][BCOMP]);

+               dst1[i][ACOMP] = USHORT_TO_UBYTE(src2[i][ACOMP]);

+            }

+         }

+         if (useTemp)

+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLubyte));

+      }

+      else {

+         const GLushort (*src2)[4] = (const GLushort (*)[4]) src;

+         GLfloat (*dst4)[4] = (GLfloat (*)[4]) (useTemp ? tempBuffer : dst);

+         GLuint i;

+         ASSERT(dstType == GL_FLOAT);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst4[i][RCOMP] = USHORT_TO_FLOAT(src2[i][RCOMP]);

+               dst4[i][GCOMP] = USHORT_TO_FLOAT(src2[i][GCOMP]);

+               dst4[i][BCOMP] = USHORT_TO_FLOAT(src2[i][BCOMP]);

+               dst4[i][ACOMP] = USHORT_TO_FLOAT(src2[i][ACOMP]);

+            }

+         }

+         if (useTemp)

+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLfloat));

+      }

+      break;

+   case GL_FLOAT:

+      if (dstType == GL_UNSIGNED_BYTE) {

+         const GLfloat (*src4)[4] = (const GLfloat (*)[4]) src;

+         GLubyte (*dst1)[4] = (GLubyte (*)[4]) (useTemp ? tempBuffer : dst);

+         GLuint i;

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][RCOMP], src4[i][RCOMP]);

+               UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][GCOMP], src4[i][GCOMP]);

+               UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][BCOMP], src4[i][BCOMP]);

+               UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][ACOMP], src4[i][ACOMP]);

+            }

+         }

+         if (useTemp)

+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLubyte));

+      }

+      else {

+         const GLfloat (*src4)[4] = (const GLfloat (*)[4]) src;

+         GLushort (*dst2)[4] = (GLushort (*)[4]) (useTemp ? tempBuffer : dst);

+         GLuint i;

+         ASSERT(dstType == GL_UNSIGNED_SHORT);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               UNCLAMPED_FLOAT_TO_USHORT(dst2[i][RCOMP], src4[i][RCOMP]);

+               UNCLAMPED_FLOAT_TO_USHORT(dst2[i][GCOMP], src4[i][GCOMP]);

+               UNCLAMPED_FLOAT_TO_USHORT(dst2[i][BCOMP], src4[i][BCOMP]);

+               UNCLAMPED_FLOAT_TO_USHORT(dst2[i][ACOMP], src4[i][ACOMP]);

+            }

+         }

+         if (useTemp)

+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLushort));

+      }

+      break;

+   default:

+      _mesa_problem(NULL, "Invalid datatype in _mesa_convert_colors");

+   }

+}

+

+

+

+

+/**

+ * Perform basic clipping for glDrawPixels.  The image's position and size

+ * and the unpack SkipPixels and SkipRows are adjusted so that the image

+ * region is entirely within the window and scissor bounds.

+ * NOTE: this will only work when glPixelZoom is (1, 1) or (1, -1).

+ * If Pixel.ZoomY is -1, *destY will be changed to be the first row which

+ * we'll actually write.  Beforehand, *destY-1 is the first drawing row.

+ *

+ * \return  GL_TRUE if image is ready for drawing or

+ *          GL_FALSE if image was completely clipped away (draw nothing)

+ */

+GLboolean

+_mesa_clip_drawpixels(const struct gl_context *ctx,

+                      GLint *destX, GLint *destY,

+                      GLsizei *width, GLsizei *height,

+                      struct gl_pixelstore_attrib *unpack)

+{

+   const struct gl_framebuffer *buffer = ctx->DrawBuffer;

+

+   if (unpack->RowLength == 0) {

+      unpack->RowLength = *width;

+   }

+

+   ASSERT(ctx->Pixel.ZoomX == 1.0F);

+   ASSERT(ctx->Pixel.ZoomY == 1.0F || ctx->Pixel.ZoomY == -1.0F);

+

+   /* left clipping */

+   if (*destX < buffer->_Xmin) {

+      unpack->SkipPixels += (buffer->_Xmin - *destX);

+      *width -= (buffer->_Xmin - *destX);

+      *destX = buffer->_Xmin;

+   }

+   /* right clipping */

+   if (*destX + *width > buffer->_Xmax)

+      *width -= (*destX + *width - buffer->_Xmax);

+

+   if (*width <= 0)

+      return GL_FALSE;

+

+   if (ctx->Pixel.ZoomY == 1.0F) {

+      /* bottom clipping */

+      if (*destY < buffer->_Ymin) {

+         unpack->SkipRows += (buffer->_Ymin - *destY);

+         *height -= (buffer->_Ymin - *destY);

+         *destY = buffer->_Ymin;

+      }

+      /* top clipping */

+      if (*destY + *height > buffer->_Ymax)

+         *height -= (*destY + *height - buffer->_Ymax);

+   }

+   else { /* upside down */

+      /* top clipping */

+      if (*destY > buffer->_Ymax) {

+         unpack->SkipRows += (*destY - buffer->_Ymax);

+         *height -= (*destY - buffer->_Ymax);

+         *destY = buffer->_Ymax;

+      }

+      /* bottom clipping */

+      if (*destY - *height < buffer->_Ymin)

+         *height -= (buffer->_Ymin - (*destY - *height));

+      /* adjust destY so it's the first row to write to */

+      (*destY)--;

+   }

+

+   if (*height <= 0)

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Perform clipping for glReadPixels.  The image's window position

+ * and size, and the pack skipPixels, skipRows and rowLength are adjusted

+ * so that the image region is entirely within the window bounds.

+ * Note: this is different from _mesa_clip_drawpixels() in that the

+ * scissor box is ignored, and we use the bounds of the current readbuffer

+ * surface.

+ *

+ * \return  GL_TRUE if region to read is in bounds

+ *          GL_FALSE if region is completely out of bounds (nothing to read)

+ */

+GLboolean

+_mesa_clip_readpixels(const struct gl_context *ctx,

+                      GLint *srcX, GLint *srcY,

+                      GLsizei *width, GLsizei *height,

+                      struct gl_pixelstore_attrib *pack)

+{

+   const struct gl_framebuffer *buffer = ctx->ReadBuffer;

+

+   if (pack->RowLength == 0) {

+      pack->RowLength = *width;

+   }

+

+   /* left clipping */

+   if (*srcX < 0) {

+      pack->SkipPixels += (0 - *srcX);

+      *width -= (0 - *srcX);

+      *srcX = 0;

+   }

+   /* right clipping */

+   if (*srcX + *width > (GLsizei) buffer->Width)

+      *width -= (*srcX + *width - buffer->Width);

+

+   if (*width <= 0)

+      return GL_FALSE;

+

+   /* bottom clipping */

+   if (*srcY < 0) {

+      pack->SkipRows += (0 - *srcY);

+      *height -= (0 - *srcY);

+      *srcY = 0;

+   }

+   /* top clipping */

+   if (*srcY + *height > (GLsizei) buffer->Height)

+      *height -= (*srcY + *height - buffer->Height);

+

+   if (*height <= 0)

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Do clipping for a glCopyTexSubImage call.

+ * The framebuffer source region might extend outside the framebuffer

+ * bounds.  Clip the source region against the framebuffer bounds and

+ * adjust the texture/dest position and size accordingly.

+ *

+ * \return GL_FALSE if region is totally clipped, GL_TRUE otherwise.

+ */

+GLboolean

+_mesa_clip_copytexsubimage(const struct gl_context *ctx,

+                           GLint *destX, GLint *destY,

+                           GLint *srcX, GLint *srcY,

+                           GLsizei *width, GLsizei *height)

+{

+   const struct gl_framebuffer *fb = ctx->ReadBuffer;

+   const GLint srcX0 = *srcX, srcY0 = *srcY;

+

+   if (_mesa_clip_to_region(0, 0, fb->Width, fb->Height,

+                            srcX, srcY, width, height)) {

+      *destX = *destX + *srcX - srcX0;

+      *destY = *destY + *srcY - srcY0;

+

+      return GL_TRUE;

+   }

+   else {

+      return GL_FALSE;

+   }

+}

+

+

+

+/**

+ * Clip the rectangle defined by (x, y, width, height) against the bounds

+ * specified by [xmin, xmax) and [ymin, ymax).

+ * \return GL_FALSE if rect is totally clipped, GL_TRUE otherwise.

+ */

+GLboolean

+_mesa_clip_to_region(GLint xmin, GLint ymin,

+                     GLint xmax, GLint ymax,

+                     GLint *x, GLint *y,

+                     GLsizei *width, GLsizei *height )

+{

+   /* left clipping */

+   if (*x < xmin) {

+      *width -= (xmin - *x);

+      *x = xmin;

+   }

+

+   /* right clipping */

+   if (*x + *width > xmax)

+      *width -= (*x + *width - xmax);

+

+   if (*width <= 0)

+      return GL_FALSE;

+

+   /* bottom (or top) clipping */

+   if (*y < ymin) {

+      *height -= (ymin - *y);

+      *y = ymin;

+   }

+

+   /* top (or bottom) clipping */

+   if (*y + *height > ymax)

+      *height -= (*y + *height - ymax);

+

+   if (*height <= 0)

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Clip dst coords against Xmax (or Ymax).

+ */

+static INLINE void

+clip_right_or_top(GLint *srcX0, GLint *srcX1,

+                  GLint *dstX0, GLint *dstX1,

+                  GLint maxValue)

+{

+   GLfloat t, bias;

+

+   if (*dstX1 > maxValue) {

+      /* X1 outside right edge */

+      ASSERT(*dstX0 < maxValue); /* X0 should be inside right edge */

+      t = (GLfloat) (maxValue - *dstX0) / (GLfloat) (*dstX1 - *dstX0);

+      /* chop off [t, 1] part */

+      ASSERT(t >= 0.0 && t <= 1.0);

+      *dstX1 = maxValue;

+      bias = (*srcX0 < *srcX1) ? 0.5F : -0.5F;

+      *srcX1 = *srcX0 + (GLint) (t * (*srcX1 - *srcX0) + bias);

+   }

+   else if (*dstX0 > maxValue) {

+      /* X0 outside right edge */

+      ASSERT(*dstX1 < maxValue); /* X1 should be inside right edge */

+      t = (GLfloat) (maxValue - *dstX1) / (GLfloat) (*dstX0 - *dstX1);

+      /* chop off [t, 1] part */

+      ASSERT(t >= 0.0 && t <= 1.0);

+      *dstX0 = maxValue;

+      bias = (*srcX0 < *srcX1) ? -0.5F : 0.5F;

+      *srcX0 = *srcX1 + (GLint) (t * (*srcX0 - *srcX1) + bias);

+   }

+}

+

+

+/**

+ * Clip dst coords against Xmin (or Ymin).

+ */

+static INLINE void

+clip_left_or_bottom(GLint *srcX0, GLint *srcX1,

+                    GLint *dstX0, GLint *dstX1,

+                    GLint minValue)

+{

+   GLfloat t, bias;

+

+   if (*dstX0 < minValue) {

+      /* X0 outside left edge */

+      ASSERT(*dstX1 > minValue); /* X1 should be inside left edge */

+      t = (GLfloat) (minValue - *dstX0) / (GLfloat) (*dstX1 - *dstX0);

+      /* chop off [0, t] part */

+      ASSERT(t >= 0.0 && t <= 1.0);

+      *dstX0 = minValue;

+      bias = (*srcX0 < *srcX1) ? 0.5F : -0.5F; /* flipped??? */

+      *srcX0 = *srcX0 + (GLint) (t * (*srcX1 - *srcX0) + bias);

+   }

+   else if (*dstX1 < minValue) {

+      /* X1 outside left edge */

+      ASSERT(*dstX0 > minValue); /* X0 should be inside left edge */

+      t = (GLfloat) (minValue - *dstX1) / (GLfloat) (*dstX0 - *dstX1);

+      /* chop off [0, t] part */

+      ASSERT(t >= 0.0 && t <= 1.0);

+      *dstX1 = minValue;

+      bias = (*srcX0 < *srcX1) ? 0.5F : -0.5F;

+      *srcX1 = *srcX1 + (GLint) (t * (*srcX0 - *srcX1) + bias);

+   }

+}

+

+

+/**

+ * Do clipping of blit src/dest rectangles.

+ * The dest rect is clipped against both the buffer bounds and scissor bounds.

+ * The src rect is just clipped against the buffer bounds.

+ *

+ * When either the src or dest rect is clipped, the other is also clipped

+ * proportionately!

+ *

+ * Note that X0 need not be less than X1 (same for Y) for either the source

+ * and dest rects.  That makes the clipping a little trickier.

+ *

+ * \return GL_TRUE if anything is left to draw, GL_FALSE if totally clipped

+ */

+GLboolean

+_mesa_clip_blit(struct gl_context *ctx,

+                GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,

+                GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1)

+{

+   const GLint srcXmin = 0;

+   const GLint srcXmax = ctx->ReadBuffer->Width;

+   const GLint srcYmin = 0;

+   const GLint srcYmax = ctx->ReadBuffer->Height;

+

+   /* these include scissor bounds */

+   const GLint dstXmin = ctx->DrawBuffer->_Xmin;

+   const GLint dstXmax = ctx->DrawBuffer->_Xmax;

+   const GLint dstYmin = ctx->DrawBuffer->_Ymin;

+   const GLint dstYmax = ctx->DrawBuffer->_Ymax;

+

+   /*

+   printf("PreClipX:  src: %d .. %d  dst: %d .. %d\n",

+          *srcX0, *srcX1, *dstX0, *dstX1);

+   printf("PreClipY:  src: %d .. %d  dst: %d .. %d\n",

+          *srcY0, *srcY1, *dstY0, *dstY1);

+   */

+

+   /* trivial rejection tests */

+   if (*dstX0 == *dstX1)

+      return GL_FALSE; /* no width */

+   if (*dstX0 <= dstXmin && *dstX1 <= dstXmin)

+      return GL_FALSE; /* totally out (left) of bounds */

+   if (*dstX0 >= dstXmax && *dstX1 >= dstXmax)

+      return GL_FALSE; /* totally out (right) of bounds */

+

+   if (*dstY0 == *dstY1)

+      return GL_FALSE;

+   if (*dstY0 <= dstYmin && *dstY1 <= dstYmin)

+      return GL_FALSE;

+   if (*dstY0 >= dstYmax && *dstY1 >= dstYmax)

+      return GL_FALSE;

+

+   if (*srcX0 == *srcX1)

+      return GL_FALSE;

+   if (*srcX0 <= srcXmin && *srcX1 <= srcXmin)

+      return GL_FALSE;

+   if (*srcX0 >= srcXmax && *srcX1 >= srcXmax)

+      return GL_FALSE;

+

+   if (*srcY0 == *srcY1)

+      return GL_FALSE;

+   if (*srcY0 <= srcYmin && *srcY1 <= srcYmin)

+      return GL_FALSE;

+   if (*srcY0 >= srcYmax && *srcY1 >= srcYmax)

+      return GL_FALSE;

+

+   /*

+    * dest clip

+    */

+   clip_right_or_top(srcX0, srcX1, dstX0, dstX1, dstXmax);

+   clip_right_or_top(srcY0, srcY1, dstY0, dstY1, dstYmax);

+   clip_left_or_bottom(srcX0, srcX1, dstX0, dstX1, dstXmin);

+   clip_left_or_bottom(srcY0, srcY1, dstY0, dstY1, dstYmin);

+

+   /*

+    * src clip (just swap src/dst values from above)

+    */

+   clip_right_or_top(dstX0, dstX1, srcX0, srcX1, srcXmax);

+   clip_right_or_top(dstY0, dstY1, srcY0, srcY1, srcYmax);

+   clip_left_or_bottom(dstX0, dstX1, srcX0, srcX1, srcXmin);

+   clip_left_or_bottom(dstY0, dstY1, srcY0, srcY1, srcYmin);

+

+   /*

+   printf("PostClipX: src: %d .. %d  dst: %d .. %d\n",

+          *srcX0, *srcX1, *dstX0, *dstX1);

+   printf("PostClipY: src: %d .. %d  dst: %d .. %d\n",

+          *srcY0, *srcY1, *dstY0, *dstY1);

+   */

+

+   ASSERT(*dstX0 >= dstXmin);

+   ASSERT(*dstX0 <= dstXmax);

+   ASSERT(*dstX1 >= dstXmin);

+   ASSERT(*dstX1 <= dstXmax);

+

+   ASSERT(*dstY0 >= dstYmin);

+   ASSERT(*dstY0 <= dstYmax);

+   ASSERT(*dstY1 >= dstYmin);

+   ASSERT(*dstY1 <= dstYmax);

+

+   ASSERT(*srcX0 >= srcXmin);

+   ASSERT(*srcX0 <= srcXmax);

+   ASSERT(*srcX1 >= srcXmin);

+   ASSERT(*srcX1 <= srcXmax);

+

+   ASSERT(*srcY0 >= srcYmin);

+   ASSERT(*srcY0 <= srcYmax);

+   ASSERT(*srcY1 >= srcYmin);

+   ASSERT(*srcY1 <= srcYmax);

+

+   return GL_TRUE;

+}

diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h
index ce7baabe2..315c4119d 100644
--- a/mesalib/src/mesa/main/imports.h
+++ b/mesalib/src/mesa/main/imports.h
@@ -1,621 +1,621 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file imports.h
- * Standard C library function wrappers.
- *
- * This file provides wrappers for all the standard C library functions
- * like malloc(), free(), printf(), getenv(), etc.
- */
-
-
-#ifndef IMPORTS_H
-#define IMPORTS_H
-
-
-#include "compiler.h"
-#include "glheader.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/**********************************************************************/
-/** Memory macros */
-/*@{*/
-
-/** Allocate \p BYTES bytes */
-#define MALLOC(BYTES)      malloc(BYTES)
-/** Allocate and zero \p BYTES bytes */
-#define CALLOC(BYTES)      calloc(1, BYTES)
-/** Allocate a structure of type \p T */
-#define MALLOC_STRUCT(T)   (struct T *) malloc(sizeof(struct T))
-/** Allocate and zero a structure of type \p T */
-#define CALLOC_STRUCT(T)   (struct T *) calloc(1, sizeof(struct T))
-/** Free memory */
-#define FREE(PTR)          free(PTR)
-
-/*@}*/
-
-
-/*
- * For GL_ARB_vertex_buffer_object we need to treat vertex array pointers
- * as offsets into buffer stores.  Since the vertex array pointer and
- * buffer store pointer are both pointers and we need to add them, we use
- * this macro.
- * Both pointers/offsets are expressed in bytes.
- */
-#define ADD_POINTERS(A, B)  ( (GLubyte *) (A) + (uintptr_t) (B) )
-
-
-/**
- * Sometimes we treat GLfloats as GLints.  On x86 systems, moving a float
- * as a int (thereby using integer registers instead of FP registers) is
- * a performance win.  Typically, this can be done with ordinary casts.
- * But with gcc's -fstrict-aliasing flag (which defaults to on in gcc 3.0)
- * these casts generate warnings.
- * The following union typedef is used to solve that.
- */
-typedef union { GLfloat f; GLint i; } fi_type;
-
-
-
-/**********************************************************************
- * Math macros
- */
-
-#define MAX_GLUSHORT	0xffff
-#define MAX_GLUINT	0xffffffff
-
-/* Degrees to radians conversion: */
-#define DEG2RAD (M_PI/180.0)
-
-
-/***
- *** SQRTF: single-precision square root
- ***/
-#if 0 /* _mesa_sqrtf() not accurate enough - temporarily disabled */
-#  define SQRTF(X)  _mesa_sqrtf(X)
-#else
-#  define SQRTF(X)  (float) sqrt((float) (X))
-#endif
-
-
-/***
- *** INV_SQRTF: single-precision inverse square root
- ***/
-#if 0
-#define INV_SQRTF(X) _mesa_inv_sqrt(X)
-#else
-#define INV_SQRTF(X) (1.0F / SQRTF(X))  /* this is faster on a P4 */
-#endif
-
-
-/**
- * \name Work-arounds for platforms that lack C99 math functions
- */
-/*@{*/
-#if (!defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE < 600)) && !defined(_ISOC99_SOURCE) \
-   && (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)) \
-   && (!defined(_MSC_VER) || (_MSC_VER < 1400))
-#define acosf(f) ((float) acos(f))
-#define asinf(f) ((float) asin(f))
-#define atan2f(x,y) ((float) atan2(x,y))
-#define atanf(f) ((float) atan(f))
-#define cielf(f) ((float) ciel(f))
-#define cosf(f) ((float) cos(f))
-#define coshf(f) ((float) cosh(f))
-#define expf(f) ((float) exp(f))
-#define exp2f(f) ((float) exp2(f))
-#define floorf(f) ((float) floor(f))
-#define logf(f) ((float) log(f))
-#define log2f(f) ((float) log2(f))
-#define powf(x,y) ((float) pow(x,y))
-#define sinf(f) ((float) sin(f))
-#define sinhf(f) ((float) sinh(f))
-#define sqrtf(f) ((float) sqrt(f))
-#define tanf(f) ((float) tan(f))
-#define tanhf(f) ((float) tanh(f))
-#define acoshf(f) ((float) acosh(f))
-#define asinhf(f) ((float) asinh(f))
-#define atanhf(f) ((float) atanh(f))
-#endif
-
-#if defined(_MSC_VER)
-static INLINE float truncf(float x) { return x < 0.0f ? ceilf(x) : floorf(x); }
-static INLINE float exp2f(float x) { return powf(2.0f, x); }
-static INLINE float log2f(float x) { return logf(x) * 1.442695041f; }
-static INLINE float asinhf(float x) { return logf(x + sqrtf(x * x + 1.0f)); }
-static INLINE float acoshf(float x) { return logf(x + sqrtf(x * x - 1.0f)); }
-static INLINE float atanhf(float x) { return (logf(1.0f + x) - logf(1.0f - x)) / 2.0f; }
-static INLINE int isblank(int ch) { return ch == ' ' || ch == '\t'; }
-#define strtoll(p, e, b) _strtoi64(p, e, b)
-#endif
-/*@}*/
-
-/***
- *** LOG2: Log base 2 of float
- ***/
-#ifdef USE_IEEE
-#if 0
-/* This is pretty fast, but not accurate enough (only 2 fractional bits).
- * Based on code from http://www.stereopsis.com/log2.html
- */
-static INLINE GLfloat LOG2(GLfloat x)
-{
-   const GLfloat y = x * x * x * x;
-   const GLuint ix = *((GLuint *) &y);
-   const GLuint exp = (ix >> 23) & 0xFF;
-   const GLint log2 = ((GLint) exp) - 127;
-   return (GLfloat) log2 * (1.0 / 4.0);  /* 4, because of x^4 above */
-}
-#endif
-/* Pretty fast, and accurate.
- * Based on code from http://www.flipcode.com/totd/
- */
-static INLINE GLfloat LOG2(GLfloat val)
-{
-   fi_type num;
-   GLint log_2;
-   num.f = val;
-   log_2 = ((num.i >> 23) & 255) - 128;
-   num.i &= ~(255 << 23);
-   num.i += 127 << 23;
-   num.f = ((-1.0f/3) * num.f + 2) * num.f - 2.0f/3;
-   return num.f + log_2;
-}
-#else
-/*
- * NOTE: log_base_2(x) = log(x) / log(2)
- * NOTE: 1.442695 = 1/log(2).
- */
-#define LOG2(x)  ((GLfloat) (log(x) * 1.442695F))
-#endif
-
-
-/***
- *** IS_INF_OR_NAN: test if float is infinite or NaN
- ***/
-#ifdef USE_IEEE
-static INLINE int IS_INF_OR_NAN( float x )
-{
-   fi_type tmp;
-   tmp.f = x;
-   return !(int)((unsigned int)((tmp.i & 0x7fffffff)-0x7f800000) >> 31);
-}
-#elif defined(isfinite)
-#define IS_INF_OR_NAN(x)        (!isfinite(x))
-#elif defined(finite)
-#define IS_INF_OR_NAN(x)        (!finite(x))
-#elif defined(__VMS)
-#define IS_INF_OR_NAN(x)        (!finite(x))
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#define IS_INF_OR_NAN(x)        (!isfinite(x))
-#else
-#define IS_INF_OR_NAN(x)        (!finite(x))
-#endif
-
-
-/***
- *** IS_NEGATIVE: test if float is negative
- ***/
-#if defined(USE_IEEE)
-static INLINE int GET_FLOAT_BITS( float x )
-{
-   fi_type fi;
-   fi.f = x;
-   return fi.i;
-}
-#define IS_NEGATIVE(x) (GET_FLOAT_BITS(x) < 0)
-#else
-#define IS_NEGATIVE(x) (x < 0.0F)
-#endif
-
-
-/***
- *** DIFFERENT_SIGNS: test if two floats have opposite signs
- ***/
-#if defined(USE_IEEE)
-#define DIFFERENT_SIGNS(x,y) ((GET_FLOAT_BITS(x) ^ GET_FLOAT_BITS(y)) & (1<<31))
-#else
-/* Could just use (x*y<0) except for the flatshading requirements.
- * Maybe there's a better way?
- */
-#define DIFFERENT_SIGNS(x,y) ((x) * (y) <= 0.0F && (x) - (y) != 0.0F)
-#endif
-
-
-/***
- *** CEILF: ceiling of float
- *** FLOORF: floor of float
- *** FABSF: absolute value of float
- *** LOGF: the natural logarithm (base e) of the value
- *** EXPF: raise e to the value
- *** LDEXPF: multiply value by an integral power of two
- *** FREXPF: extract mantissa and exponent from value
- ***/
-#if defined(__gnu_linux__)
-/* C99 functions */
-#define CEILF(x)   ceilf(x)
-#define FLOORF(x)  floorf(x)
-#define FABSF(x)   fabsf(x)
-#define LOGF(x)    logf(x)
-#define EXPF(x)    expf(x)
-#define LDEXPF(x,y)  ldexpf(x,y)
-#define FREXPF(x,y)  frexpf(x,y)
-#else
-#define CEILF(x)   ((GLfloat) ceil(x))
-#define FLOORF(x)  ((GLfloat) floor(x))
-#define FABSF(x)   ((GLfloat) fabs(x))
-#define LOGF(x)    ((GLfloat) log(x))
-#define EXPF(x)    ((GLfloat) exp(x))
-#define LDEXPF(x,y)  ((GLfloat) ldexp(x,y))
-#define FREXPF(x,y)  ((GLfloat) frexp(x,y))
-#endif
-
-
-/***
- *** IROUND: return (as an integer) float rounded to nearest integer
- ***/
-#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)
-static INLINE int iround(float f)
-{
-   int r;
-   __asm__ ("fistpl %0" : "=m" (r) : "t" (f) : "st");
-   return r;
-}
-#define IROUND(x)  iround(x)
-#elif defined(USE_X86_ASM) && defined(_MSC_VER)
-static INLINE int iround(float f)
-{
-   int r;
-   _asm {
-	 fld f
-	 fistp r
-	}
-   return r;
-}
-#define IROUND(x)  iround(x)
-#elif defined(__WATCOMC__) && defined(__386__)
-long iround(float f);
-#pragma aux iround =                    \
-	"push   eax"                        \
-	"fistp  dword ptr [esp]"            \
-	"pop    eax"                        \
-	parm [8087]                         \
-	value [eax]                         \
-	modify exact [eax];
-#define IROUND(x)  iround(x)
-#else
-#define IROUND(f)  ((int) (((f) >= 0.0F) ? ((f) + 0.5F) : ((f) - 0.5F)))
-#endif
-
-#define IROUND64(f)  ((GLint64) (((f) >= 0.0F) ? ((f) + 0.5F) : ((f) - 0.5F)))
-
-/***
- *** IROUND_POS: return (as an integer) positive float rounded to nearest int
- ***/
-#ifdef DEBUG
-#define IROUND_POS(f) (assert((f) >= 0.0F), IROUND(f))
-#else
-#define IROUND_POS(f) (IROUND(f))
-#endif
-
-
-/***
- *** IFLOOR: return (as an integer) floor of float
- ***/
-#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)
-/*
- * IEEE floor for computers that round to nearest or even.
- * 'f' must be between -4194304 and 4194303.
- * This floor operation is done by "(iround(f + .5) + iround(f - .5)) >> 1",
- * but uses some IEEE specific tricks for better speed.
- * Contributed by Josh Vanderhoof
- */
-static INLINE int ifloor(float f)
-{
-   int ai, bi;
-   double af, bf;
-   af = (3 << 22) + 0.5 + (double)f;
-   bf = (3 << 22) + 0.5 - (double)f;
-   /* GCC generates an extra fstp/fld without this. */
-   __asm__ ("fstps %0" : "=m" (ai) : "t" (af) : "st");
-   __asm__ ("fstps %0" : "=m" (bi) : "t" (bf) : "st");
-   return (ai - bi) >> 1;
-}
-#define IFLOOR(x)  ifloor(x)
-#elif defined(USE_IEEE)
-static INLINE int ifloor(float f)
-{
-   int ai, bi;
-   double af, bf;
-   fi_type u;
-
-   af = (3 << 22) + 0.5 + (double)f;
-   bf = (3 << 22) + 0.5 - (double)f;
-   u.f = (float) af;  ai = u.i;
-   u.f = (float) bf;  bi = u.i;
-   return (ai - bi) >> 1;
-}
-#define IFLOOR(x)  ifloor(x)
-#else
-static INLINE int ifloor(float f)
-{
-   int i = IROUND(f);
-   return (i > f) ? i - 1 : i;
-}
-#define IFLOOR(x)  ifloor(x)
-#endif
-
-
-/***
- *** ICEIL: return (as an integer) ceiling of float
- ***/
-#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)
-/*
- * IEEE ceil for computers that round to nearest or even.
- * 'f' must be between -4194304 and 4194303.
- * This ceil operation is done by "(iround(f + .5) + iround(f - .5) + 1) >> 1",
- * but uses some IEEE specific tricks for better speed.
- * Contributed by Josh Vanderhoof
- */
-static INLINE int iceil(float f)
-{
-   int ai, bi;
-   double af, bf;
-   af = (3 << 22) + 0.5 + (double)f;
-   bf = (3 << 22) + 0.5 - (double)f;
-   /* GCC generates an extra fstp/fld without this. */
-   __asm__ ("fstps %0" : "=m" (ai) : "t" (af) : "st");
-   __asm__ ("fstps %0" : "=m" (bi) : "t" (bf) : "st");
-   return (ai - bi + 1) >> 1;
-}
-#define ICEIL(x)  iceil(x)
-#elif defined(USE_IEEE)
-static INLINE int iceil(float f)
-{
-   int ai, bi;
-   double af, bf;
-   fi_type u;
-   af = (3 << 22) + 0.5 + (double)f;
-   bf = (3 << 22) + 0.5 - (double)f;
-   u.f = (float) af; ai = u.i;
-   u.f = (float) bf; bi = u.i;
-   return (ai - bi + 1) >> 1;
-}
-#define ICEIL(x)  iceil(x)
-#else
-static INLINE int iceil(float f)
-{
-   int i = IROUND(f);
-   return (i < f) ? i + 1 : i;
-}
-#define ICEIL(x)  iceil(x)
-#endif
-
-
-/**
- * Is x a power of two?
- */
-static INLINE int
-_mesa_is_pow_two(int x)
-{
-   return !(x & (x - 1));
-}
-
-/**
- * Round given integer to next higer power of two
- * If X is zero result is undefined.
- *
- * Source for the fallback implementation is
- * Sean Eron Anderson's webpage "Bit Twiddling Hacks"
- * http://graphics.stanford.edu/~seander/bithacks.html
- *
- * When using builtin function have to do some work
- * for case when passed values 1 to prevent hiting
- * undefined result from __builtin_clz. Undefined
- * results would be different depending on optimization
- * level used for build.
- */
-static INLINE int32_t
-_mesa_next_pow_two_32(uint32_t x)
-{
-#if defined(__GNUC__) && \
-	((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
-	uint32_t y = (x != 1);
-	return (1 + y) << ((__builtin_clz(x - y) ^ 31) );
-#else
-	x--;
-	x |= x >> 1;
-	x |= x >> 2;
-	x |= x >> 4;
-	x |= x >> 8;
-	x |= x >> 16;
-	x++;
-	return x;
-#endif
-}
-
-static INLINE int64_t
-_mesa_next_pow_two_64(uint64_t x)
-{
-#if defined(__GNUC__) && \
-	((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
-	uint64_t y = (x != 1);
-	if (sizeof(x) == sizeof(long))
-		return (1 + y) << ((__builtin_clzl(x - y) ^ 63));
-	else
-		return (1 + y) << ((__builtin_clzll(x - y) ^ 63));
-#else
-	x--;
-	x |= x >> 1;
-	x |= x >> 2;
-	x |= x >> 4;
-	x |= x >> 8;
-	x |= x >> 16;
-	x |= x >> 32;
-	x++;
-	return x;
-#endif
-}
-
-
-/**
- * Return 1 if this is a little endian machine, 0 if big endian.
- */
-static INLINE GLboolean
-_mesa_little_endian(void)
-{
-   const GLuint ui = 1; /* intentionally not static */
-   return *((const GLubyte *) &ui);
-}
-
-
-
-/**********************************************************************
- * Functions
- */
-
-extern void *
-_mesa_align_malloc( size_t bytes, unsigned long alignment );
-
-extern void *
-_mesa_align_calloc( size_t bytes, unsigned long alignment );
-
-extern void
-_mesa_align_free( void *ptr );
-
-extern void *
-_mesa_align_realloc(void *oldBuffer, size_t oldSize, size_t newSize,
-                    unsigned long alignment);
-
-extern void *
-_mesa_exec_malloc( GLuint size );
-
-extern void 
-_mesa_exec_free( void *addr );
-
-extern void *
-_mesa_realloc( void *oldBuffer, size_t oldSize, size_t newSize );
-
-extern void
-_mesa_memset16( unsigned short *dst, unsigned short val, size_t n );
-
-extern double
-_mesa_sqrtd(double x);
-
-extern float
-_mesa_sqrtf(float x);
-
-extern float
-_mesa_inv_sqrtf(float x);
-
-extern void
-_mesa_init_sqrt_table(void);
-
-#ifdef __GNUC__
-
-#ifdef __MINGW32__
-#define ffs __builtin_ffs
-#define ffsll __builtin_ffsll
-#endif
-
-#define _mesa_ffs(i)  ffs(i)
-#define _mesa_ffsll(i)  ffsll(i)
-
-#if ((_GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
-#define _mesa_bitcount(i) __builtin_popcount(i)
-#else
-extern unsigned int
-_mesa_bitcount(unsigned int n);
-#endif
-
-#else
-extern int
-_mesa_ffs(int32_t i);
-
-extern int
-_mesa_ffsll(int64_t i);
-
-extern unsigned int
-_mesa_bitcount(unsigned int n);
-#endif
-
-extern GLhalfARB
-_mesa_float_to_half(float f);
-
-extern float
-_mesa_half_to_float(GLhalfARB h);
-
-
-extern void *
-_mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size, 
-               int (*compar)(const void *, const void *) );
-
-extern char *
-_mesa_getenv( const char *var );
-
-extern char *
-_mesa_strdup( const char *s );
-
-extern float
-_mesa_strtof( const char *s, char **end );
-
-extern unsigned int
-_mesa_str_checksum(const char *str);
-
-extern int
-_mesa_snprintf( char *str, size_t size, const char *fmt, ... ) PRINTFLIKE(3, 4);
-
-struct gl_context;
-
-extern void
-_mesa_warning( struct gl_context *gc, const char *fmtString, ... ) PRINTFLIKE(2, 3);
-
-extern void
-_mesa_problem( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
-
-extern void
-_mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... ) PRINTFLIKE(3, 4);
-
-extern void
-_mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
-
-
-#if defined(_MSC_VER) && !defined(snprintf)
-#define snprintf _snprintf
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* IMPORTS_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file imports.h

+ * Standard C library function wrappers.

+ *

+ * This file provides wrappers for all the standard C library functions

+ * like malloc(), free(), printf(), getenv(), etc.

+ */

+

+

+#ifndef IMPORTS_H

+#define IMPORTS_H

+

+

+#include "compiler.h"

+#include "glheader.h"

+

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+

+/**********************************************************************/

+/** Memory macros */

+/*@{*/

+

+/** Allocate \p BYTES bytes */

+#define MALLOC(BYTES)      malloc(BYTES)

+/** Allocate and zero \p BYTES bytes */

+#define CALLOC(BYTES)      calloc(1, BYTES)

+/** Allocate a structure of type \p T */

+#define MALLOC_STRUCT(T)   (struct T *) malloc(sizeof(struct T))

+/** Allocate and zero a structure of type \p T */

+#define CALLOC_STRUCT(T)   (struct T *) calloc(1, sizeof(struct T))

+/** Free memory */

+#define FREE(PTR)          free(PTR)

+

+/*@}*/

+

+

+/*

+ * For GL_ARB_vertex_buffer_object we need to treat vertex array pointers

+ * as offsets into buffer stores.  Since the vertex array pointer and

+ * buffer store pointer are both pointers and we need to add them, we use

+ * this macro.

+ * Both pointers/offsets are expressed in bytes.

+ */

+#define ADD_POINTERS(A, B)  ( (GLubyte *) (A) + (uintptr_t) (B) )

+

+

+/**

+ * Sometimes we treat GLfloats as GLints.  On x86 systems, moving a float

+ * as a int (thereby using integer registers instead of FP registers) is

+ * a performance win.  Typically, this can be done with ordinary casts.

+ * But with gcc's -fstrict-aliasing flag (which defaults to on in gcc 3.0)

+ * these casts generate warnings.

+ * The following union typedef is used to solve that.

+ */

+typedef union { GLfloat f; GLint i; } fi_type;

+

+

+

+/**********************************************************************

+ * Math macros

+ */

+

+#define MAX_GLUSHORT	0xffff

+#define MAX_GLUINT	0xffffffff

+

+/* Degrees to radians conversion: */

+#define DEG2RAD (M_PI/180.0)

+

+

+/***

+ *** SQRTF: single-precision square root

+ ***/

+#if 0 /* _mesa_sqrtf() not accurate enough - temporarily disabled */

+#  define SQRTF(X)  _mesa_sqrtf(X)

+#else

+#  define SQRTF(X)  (float) sqrt((float) (X))

+#endif

+

+

+/***

+ *** INV_SQRTF: single-precision inverse square root

+ ***/

+#if 0

+#define INV_SQRTF(X) _mesa_inv_sqrt(X)

+#else

+#define INV_SQRTF(X) (1.0F / SQRTF(X))  /* this is faster on a P4 */

+#endif

+

+

+/**

+ * \name Work-arounds for platforms that lack C99 math functions

+ */

+/*@{*/

+#if (!defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE < 600)) && !defined(_ISOC99_SOURCE) \

+   && (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)) \

+   && (!defined(_MSC_VER) || (_MSC_VER < 1400))

+#define acosf(f) ((float) acos(f))

+#define asinf(f) ((float) asin(f))

+#define atan2f(x,y) ((float) atan2(x,y))

+#define atanf(f) ((float) atan(f))

+#define cielf(f) ((float) ciel(f))

+#define cosf(f) ((float) cos(f))

+#define coshf(f) ((float) cosh(f))

+#define expf(f) ((float) exp(f))

+#define exp2f(f) ((float) exp2(f))

+#define floorf(f) ((float) floor(f))

+#define logf(f) ((float) log(f))

+#define log2f(f) ((float) log2(f))

+#define powf(x,y) ((float) pow(x,y))

+#define sinf(f) ((float) sin(f))

+#define sinhf(f) ((float) sinh(f))

+#define sqrtf(f) ((float) sqrt(f))

+#define tanf(f) ((float) tan(f))

+#define tanhf(f) ((float) tanh(f))

+#define acoshf(f) ((float) acosh(f))

+#define asinhf(f) ((float) asinh(f))

+#define atanhf(f) ((float) atanh(f))

+#endif

+

+#if defined(_MSC_VER)

+static INLINE float truncf(float x) { return x < 0.0f ? ceilf(x) : floorf(x); }

+static INLINE float exp2f(float x) { return powf(2.0f, x); }

+static INLINE float log2f(float x) { return logf(x) * 1.442695041f; }

+static INLINE float asinhf(float x) { return logf(x + sqrtf(x * x + 1.0f)); }

+static INLINE float acoshf(float x) { return logf(x + sqrtf(x * x - 1.0f)); }

+static INLINE float atanhf(float x) { return (logf(1.0f + x) - logf(1.0f - x)) / 2.0f; }

+static INLINE int isblank(int ch) { return ch == ' ' || ch == '\t'; }

+#define strtoll(p, e, b) _strtoi64(p, e, b)

+#endif

+/*@}*/

+

+/***

+ *** LOG2: Log base 2 of float

+ ***/

+#ifdef USE_IEEE

+#if 0

+/* This is pretty fast, but not accurate enough (only 2 fractional bits).

+ * Based on code from http://www.stereopsis.com/log2.html

+ */

+static INLINE GLfloat LOG2(GLfloat x)

+{

+   const GLfloat y = x * x * x * x;

+   const GLuint ix = *((GLuint *) &y);

+   const GLuint exp = (ix >> 23) & 0xFF;

+   const GLint log2 = ((GLint) exp) - 127;

+   return (GLfloat) log2 * (1.0 / 4.0);  /* 4, because of x^4 above */

+}

+#endif

+/* Pretty fast, and accurate.

+ * Based on code from http://www.flipcode.com/totd/

+ */

+static INLINE GLfloat LOG2(GLfloat val)

+{

+   fi_type num;

+   GLint log_2;

+   num.f = val;

+   log_2 = ((num.i >> 23) & 255) - 128;

+   num.i &= ~(255 << 23);

+   num.i += 127 << 23;

+   num.f = ((-1.0f/3) * num.f + 2) * num.f - 2.0f/3;

+   return num.f + log_2;

+}

+#else

+/*

+ * NOTE: log_base_2(x) = log(x) / log(2)

+ * NOTE: 1.442695 = 1/log(2).

+ */

+#define LOG2(x)  ((GLfloat) (log(x) * 1.442695F))

+#endif

+

+

+/***

+ *** IS_INF_OR_NAN: test if float is infinite or NaN

+ ***/

+#ifdef USE_IEEE

+static INLINE int IS_INF_OR_NAN( float x )

+{

+   fi_type tmp;

+   tmp.f = x;

+   return !(int)((unsigned int)((tmp.i & 0x7fffffff)-0x7f800000) >> 31);

+}

+#elif defined(isfinite)

+#define IS_INF_OR_NAN(x)        (!isfinite(x))

+#elif defined(finite)

+#define IS_INF_OR_NAN(x)        (!finite(x))

+#elif defined(__VMS)

+#define IS_INF_OR_NAN(x)        (!finite(x))

+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L

+#define IS_INF_OR_NAN(x)        (!isfinite(x))

+#else

+#define IS_INF_OR_NAN(x)        (!finite(x))

+#endif

+

+

+/***

+ *** IS_NEGATIVE: test if float is negative

+ ***/

+#if defined(USE_IEEE)

+static INLINE int GET_FLOAT_BITS( float x )

+{

+   fi_type fi;

+   fi.f = x;

+   return fi.i;

+}

+#define IS_NEGATIVE(x) (GET_FLOAT_BITS(x) < 0)

+#else

+#define IS_NEGATIVE(x) (x < 0.0F)

+#endif

+

+

+/***

+ *** DIFFERENT_SIGNS: test if two floats have opposite signs

+ ***/

+#if defined(USE_IEEE)

+#define DIFFERENT_SIGNS(x,y) ((GET_FLOAT_BITS(x) ^ GET_FLOAT_BITS(y)) & (1<<31))

+#else

+/* Could just use (x*y<0) except for the flatshading requirements.

+ * Maybe there's a better way?

+ */

+#define DIFFERENT_SIGNS(x,y) ((x) * (y) <= 0.0F && (x) - (y) != 0.0F)

+#endif

+

+

+/***

+ *** CEILF: ceiling of float

+ *** FLOORF: floor of float

+ *** FABSF: absolute value of float

+ *** LOGF: the natural logarithm (base e) of the value

+ *** EXPF: raise e to the value

+ *** LDEXPF: multiply value by an integral power of two

+ *** FREXPF: extract mantissa and exponent from value

+ ***/

+#if defined(__gnu_linux__)

+/* C99 functions */

+#define CEILF(x)   ceilf(x)

+#define FLOORF(x)  floorf(x)

+#define FABSF(x)   fabsf(x)

+#define LOGF(x)    logf(x)

+#define EXPF(x)    expf(x)

+#define LDEXPF(x,y)  ldexpf(x,y)

+#define FREXPF(x,y)  frexpf(x,y)

+#else

+#define CEILF(x)   ((GLfloat) ceil(x))

+#define FLOORF(x)  ((GLfloat) floor(x))

+#define FABSF(x)   ((GLfloat) fabs(x))

+#define LOGF(x)    ((GLfloat) log(x))

+#define EXPF(x)    ((GLfloat) exp(x))

+#define LDEXPF(x,y)  ((GLfloat) ldexp(x,y))

+#define FREXPF(x,y)  ((GLfloat) frexp(x,y))

+#endif

+

+

+/***

+ *** IROUND: return (as an integer) float rounded to nearest integer

+ ***/

+#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)

+static INLINE int iround(float f)

+{

+   int r;

+   __asm__ ("fistpl %0" : "=m" (r) : "t" (f) : "st");

+   return r;

+}

+#define IROUND(x)  iround(x)

+#elif defined(USE_X86_ASM) && defined(_MSC_VER)

+static INLINE int iround(float f)

+{

+   int r;

+   _asm {

+	 fld f

+	 fistp r

+	}

+   return r;

+}

+#define IROUND(x)  iround(x)

+#elif defined(__WATCOMC__) && defined(__386__)

+long iround(float f);

+#pragma aux iround =                    \

+	"push   eax"                        \

+	"fistp  dword ptr [esp]"            \

+	"pop    eax"                        \

+	parm [8087]                         \

+	value [eax]                         \

+	modify exact [eax];

+#define IROUND(x)  iround(x)

+#else

+#define IROUND(f)  ((int) (((f) >= 0.0F) ? ((f) + 0.5F) : ((f) - 0.5F)))

+#endif

+

+#define IROUND64(f)  ((GLint64) (((f) >= 0.0F) ? ((f) + 0.5F) : ((f) - 0.5F)))

+

+/***

+ *** IROUND_POS: return (as an integer) positive float rounded to nearest int

+ ***/

+#ifdef DEBUG

+#define IROUND_POS(f) (assert((f) >= 0.0F), IROUND(f))

+#else

+#define IROUND_POS(f) (IROUND(f))

+#endif

+

+

+/***

+ *** IFLOOR: return (as an integer) floor of float

+ ***/

+#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)

+/*

+ * IEEE floor for computers that round to nearest or even.

+ * 'f' must be between -4194304 and 4194303.

+ * This floor operation is done by "(iround(f + .5) + iround(f - .5)) >> 1",

+ * but uses some IEEE specific tricks for better speed.

+ * Contributed by Josh Vanderhoof

+ */

+static INLINE int ifloor(float f)

+{

+   int ai, bi;

+   double af, bf;

+   af = (3 << 22) + 0.5 + (double)f;

+   bf = (3 << 22) + 0.5 - (double)f;

+   /* GCC generates an extra fstp/fld without this. */

+   __asm__ ("fstps %0" : "=m" (ai) : "t" (af) : "st");

+   __asm__ ("fstps %0" : "=m" (bi) : "t" (bf) : "st");

+   return (ai - bi) >> 1;

+}

+#define IFLOOR(x)  ifloor(x)

+#elif defined(USE_IEEE)

+static INLINE int ifloor(float f)

+{

+   int ai, bi;

+   double af, bf;

+   fi_type u;

+

+   af = (3 << 22) + 0.5 + (double)f;

+   bf = (3 << 22) + 0.5 - (double)f;

+   u.f = (float) af;  ai = u.i;

+   u.f = (float) bf;  bi = u.i;

+   return (ai - bi) >> 1;

+}

+#define IFLOOR(x)  ifloor(x)

+#else

+static INLINE int ifloor(float f)

+{

+   int i = IROUND(f);

+   return (i > f) ? i - 1 : i;

+}

+#define IFLOOR(x)  ifloor(x)

+#endif

+

+

+/***

+ *** ICEIL: return (as an integer) ceiling of float

+ ***/

+#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)

+/*

+ * IEEE ceil for computers that round to nearest or even.

+ * 'f' must be between -4194304 and 4194303.

+ * This ceil operation is done by "(iround(f + .5) + iround(f - .5) + 1) >> 1",

+ * but uses some IEEE specific tricks for better speed.

+ * Contributed by Josh Vanderhoof

+ */

+static INLINE int iceil(float f)

+{

+   int ai, bi;

+   double af, bf;

+   af = (3 << 22) + 0.5 + (double)f;

+   bf = (3 << 22) + 0.5 - (double)f;

+   /* GCC generates an extra fstp/fld without this. */

+   __asm__ ("fstps %0" : "=m" (ai) : "t" (af) : "st");

+   __asm__ ("fstps %0" : "=m" (bi) : "t" (bf) : "st");

+   return (ai - bi + 1) >> 1;

+}

+#define ICEIL(x)  iceil(x)

+#elif defined(USE_IEEE)

+static INLINE int iceil(float f)

+{

+   int ai, bi;

+   double af, bf;

+   fi_type u;

+   af = (3 << 22) + 0.5 + (double)f;

+   bf = (3 << 22) + 0.5 - (double)f;

+   u.f = (float) af; ai = u.i;

+   u.f = (float) bf; bi = u.i;

+   return (ai - bi + 1) >> 1;

+}

+#define ICEIL(x)  iceil(x)

+#else

+static INLINE int iceil(float f)

+{

+   int i = IROUND(f);

+   return (i < f) ? i + 1 : i;

+}

+#define ICEIL(x)  iceil(x)

+#endif

+

+

+/**

+ * Is x a power of two?

+ */

+static INLINE int

+_mesa_is_pow_two(int x)

+{

+   return !(x & (x - 1));

+}

+

+/**

+ * Round given integer to next higer power of two

+ * If X is zero result is undefined.

+ *

+ * Source for the fallback implementation is

+ * Sean Eron Anderson's webpage "Bit Twiddling Hacks"

+ * http://graphics.stanford.edu/~seander/bithacks.html

+ *

+ * When using builtin function have to do some work

+ * for case when passed values 1 to prevent hiting

+ * undefined result from __builtin_clz. Undefined

+ * results would be different depending on optimization

+ * level used for build.

+ */

+static INLINE int32_t

+_mesa_next_pow_two_32(uint32_t x)

+{

+#if defined(__GNUC__) && \

+	((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)

+	uint32_t y = (x != 1);

+	return (1 + y) << ((__builtin_clz(x - y) ^ 31) );

+#else

+	x--;

+	x |= x >> 1;

+	x |= x >> 2;

+	x |= x >> 4;

+	x |= x >> 8;

+	x |= x >> 16;

+	x++;

+	return x;

+#endif

+}

+

+static INLINE int64_t

+_mesa_next_pow_two_64(uint64_t x)

+{

+#if defined(__GNUC__) && \

+	((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)

+	uint64_t y = (x != 1);

+	if (sizeof(x) == sizeof(long))

+		return (1 + y) << ((__builtin_clzl(x - y) ^ 63));

+	else

+		return (1 + y) << ((__builtin_clzll(x - y) ^ 63));

+#else

+	x--;

+	x |= x >> 1;

+	x |= x >> 2;

+	x |= x >> 4;

+	x |= x >> 8;

+	x |= x >> 16;

+	x |= x >> 32;

+	x++;

+	return x;

+#endif

+}

+

+

+/**

+ * Return 1 if this is a little endian machine, 0 if big endian.

+ */

+static INLINE GLboolean

+_mesa_little_endian(void)

+{

+   const GLuint ui = 1; /* intentionally not static */

+   return *((const GLubyte *) &ui);

+}

+

+

+

+/**********************************************************************

+ * Functions

+ */

+

+extern void *

+_mesa_align_malloc( size_t bytes, unsigned long alignment );

+

+extern void *

+_mesa_align_calloc( size_t bytes, unsigned long alignment );

+

+extern void

+_mesa_align_free( void *ptr );

+

+extern void *

+_mesa_align_realloc(void *oldBuffer, size_t oldSize, size_t newSize,

+                    unsigned long alignment);

+

+extern void *

+_mesa_exec_malloc( GLuint size );

+

+extern void 

+_mesa_exec_free( void *addr );

+

+extern void *

+_mesa_realloc( void *oldBuffer, size_t oldSize, size_t newSize );

+

+extern void

+_mesa_memset16( unsigned short *dst, unsigned short val, size_t n );

+

+extern double

+_mesa_sqrtd(double x);

+

+extern float

+_mesa_sqrtf(float x);

+

+extern float

+_mesa_inv_sqrtf(float x);

+

+extern void

+_mesa_init_sqrt_table(void);

+

+#ifdef __GNUC__

+

+#ifdef __MINGW32__

+#define ffs __builtin_ffs

+#define ffsll __builtin_ffsll

+#endif

+

+#define _mesa_ffs(i)  ffs(i)

+#define _mesa_ffsll(i)  ffsll(i)

+

+#if ((_GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)

+#define _mesa_bitcount(i) __builtin_popcount(i)

+#else

+extern unsigned int

+_mesa_bitcount(unsigned int n);

+#endif

+

+#else

+extern int

+_mesa_ffs(int32_t i);

+

+extern int

+_mesa_ffsll(int64_t i);

+

+extern unsigned int

+_mesa_bitcount(unsigned int n);

+#endif

+

+extern GLhalfARB

+_mesa_float_to_half(float f);

+

+extern float

+_mesa_half_to_float(GLhalfARB h);

+

+

+extern void *

+_mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size, 

+               int (*compar)(const void *, const void *) );

+

+extern char *

+_mesa_getenv( const char *var );

+

+extern char *

+_mesa_strdup( const char *s );

+

+extern float

+_mesa_strtof( const char *s, char **end );

+

+extern unsigned int

+_mesa_str_checksum(const char *str);

+

+extern int

+_mesa_snprintf( char *str, size_t size, const char *fmt, ... ) PRINTFLIKE(3, 4);

+

+struct gl_context;

+

+extern void

+_mesa_warning( struct gl_context *gc, const char *fmtString, ... ) PRINTFLIKE(2, 3);

+

+extern void

+_mesa_problem( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);

+

+extern void

+_mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... ) PRINTFLIKE(3, 4);

+

+extern void

+_mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);

+

+

+#if defined(_MSC_VER) && !defined(snprintf)

+#define snprintf _snprintf

+#endif

+

+

+#ifdef __cplusplus

+}

+#endif

+

+

+#endif /* IMPORTS_H */

diff --git a/mesalib/src/mesa/main/lines.c b/mesalib/src/mesa/main/lines.c
index 79bf5679d..1df409f45 100644
--- a/mesalib/src/mesa/main/lines.c
+++ b/mesalib/src/mesa/main/lines.c
@@ -1,117 +1,117 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#include "glheader.h"
-#include "context.h"
-#include "lines.h"
-#include "macros.h"
-#include "mtypes.h"
-
-
-/**
- * Set the line width.
- *
- * \param width line width in pixels.
- *
- * \sa glLineWidth().
- */
-void GLAPIENTRY
-_mesa_LineWidth( GLfloat width )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glLineWidth %f\n", width);
-
-   if (width<=0.0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glLineWidth" );
-      return;
-   }
-
-   if (ctx->Line.Width == width)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_LINE);
-   ctx->Line.Width = width;
-
-   if (ctx->Driver.LineWidth)
-      ctx->Driver.LineWidth(ctx, width);
-}
-
-
-/**
- * Set the line stipple pattern.
- *
- * \param factor pattern scale factor.
- * \param pattern bit pattern.
- * 
- * \sa glLineStipple().
- *
- * Updates gl_line_attrib::StippleFactor and gl_line_attrib::StipplePattern. On
- * change flushes the vertices and notifies the driver via
- * the dd_function_table::LineStipple callback.
- */
-void GLAPIENTRY
-_mesa_LineStipple( GLint factor, GLushort pattern )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glLineStipple %d %u\n", factor, pattern);
-
-   factor = CLAMP( factor, 1, 256 );
-
-   if (ctx->Line.StippleFactor == factor &&
-       ctx->Line.StipplePattern == pattern)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_LINE);
-   ctx->Line.StippleFactor = factor;
-   ctx->Line.StipplePattern = pattern;
-
-   if (ctx->Driver.LineStipple)
-      ctx->Driver.LineStipple( ctx, factor, pattern );
-}
-
-
-/**
- * Initialize the context line state.
- *
- * \param ctx GL context.
- *
- * Initializes __struct gl_contextRec::Line and line related constants in
- * __struct gl_contextRec::Const.
- */
-void GLAPIENTRY
-_mesa_init_line( struct gl_context * ctx )
-{
-   ctx->Line.SmoothFlag = GL_FALSE;
-   ctx->Line.StippleFlag = GL_FALSE;
-   ctx->Line.Width = 1.0;
-   ctx->Line.StipplePattern = 0xffff;
-   ctx->Line.StippleFactor = 1;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.3

+ *

+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include "glheader.h"

+#include "context.h"

+#include "lines.h"

+#include "macros.h"

+#include "mtypes.h"

+

+

+/**

+ * Set the line width.

+ *

+ * \param width line width in pixels.

+ *

+ * \sa glLineWidth().

+ */

+void GLAPIENTRY

+_mesa_LineWidth( GLfloat width )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glLineWidth %f\n", width);

+

+   if (width<=0.0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glLineWidth" );

+      return;

+   }

+

+   if (ctx->Line.Width == width)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_LINE);

+   ctx->Line.Width = width;

+

+   if (ctx->Driver.LineWidth)

+      ctx->Driver.LineWidth(ctx, width);

+}

+

+

+/**

+ * Set the line stipple pattern.

+ *

+ * \param factor pattern scale factor.

+ * \param pattern bit pattern.

+ * 

+ * \sa glLineStipple().

+ *

+ * Updates gl_line_attrib::StippleFactor and gl_line_attrib::StipplePattern. On

+ * change flushes the vertices and notifies the driver via

+ * the dd_function_table::LineStipple callback.

+ */

+void GLAPIENTRY

+_mesa_LineStipple( GLint factor, GLushort pattern )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glLineStipple %d %u\n", factor, pattern);

+

+   factor = CLAMP( factor, 1, 256 );

+

+   if (ctx->Line.StippleFactor == factor &&

+       ctx->Line.StipplePattern == pattern)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_LINE);

+   ctx->Line.StippleFactor = factor;

+   ctx->Line.StipplePattern = pattern;

+

+   if (ctx->Driver.LineStipple)

+      ctx->Driver.LineStipple( ctx, factor, pattern );

+}

+

+

+/**

+ * Initialize the context line state.

+ *

+ * \param ctx GL context.

+ *

+ * Initializes __struct gl_contextRec::Line and line related constants in

+ * __struct gl_contextRec::Const.

+ */

+void GLAPIENTRY

+_mesa_init_line( struct gl_context * ctx )

+{

+   ctx->Line.SmoothFlag = GL_FALSE;

+   ctx->Line.StippleFlag = GL_FALSE;

+   ctx->Line.Width = 1.0;

+   ctx->Line.StipplePattern = 0xffff;

+   ctx->Line.StippleFactor = 1;

+}

diff --git a/mesalib/src/mesa/main/macros.h b/mesalib/src/mesa/main/macros.h
index 86a58cc6b..a54663ced 100644
--- a/mesalib/src/mesa/main/macros.h
+++ b/mesalib/src/mesa/main/macros.h
@@ -1,721 +1,721 @@
-/**
- * \file macros.h
- * A collection of useful macros.
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.2
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#ifndef MACROS_H
-#define MACROS_H
-
-#include "imports.h"
-
-
-/**
- * \name Integer / float conversion for colors, normals, etc.
- */
-/*@{*/
-
-/** Convert GLubyte in [0,255] to GLfloat in [0.0,1.0] */
-extern GLfloat _mesa_ubyte_to_float_color_tab[256];
-#define UBYTE_TO_FLOAT(u) _mesa_ubyte_to_float_color_tab[(unsigned int)(u)]
-
-/** Convert GLfloat in [0.0,1.0] to GLubyte in [0,255] */
-#define FLOAT_TO_UBYTE(X)   ((GLubyte) (GLint) ((X) * 255.0F))
-
-
-/** Convert GLbyte in [-128,127] to GLfloat in [-1.0,1.0] */
-#define BYTE_TO_FLOAT(B)    ((2.0F * (B) + 1.0F) * (1.0F/255.0F))
-
-/** Convert GLfloat in [-1.0,1.0] to GLbyte in [-128,127] */
-#define FLOAT_TO_BYTE(X)    ( (((GLint) (255.0F * (X))) - 1) / 2 )
-
-
-/** Convert GLbyte in [-128,127] to GLfloat in [-1.0,1.0], texture/fb data */
-#define BYTE_TO_FLOAT_TEX(B)    ((B) == -128 ? -1.0F : (B) * (1.0F/127.0F))
-
-/** Convert GLfloat in [-1.0,1.0] to GLbyte in [-128,127], texture/fb data */
-#define FLOAT_TO_BYTE_TEX(X)    CLAMP( (GLint) (127.0F * (X)), -128, 127 )
-
-/** Convert GLushort in [0,65535] to GLfloat in [0.0,1.0] */
-#define USHORT_TO_FLOAT(S)  ((GLfloat) (S) * (1.0F / 65535.0F))
-
-/** Convert GLfloat in [0.0,1.0] to GLushort in [0, 65535] */
-#define FLOAT_TO_USHORT(X)   ((GLuint) ((X) * 65535.0F))
-
-
-/** Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0] */
-#define SHORT_TO_FLOAT(S)   ((2.0F * (S) + 1.0F) * (1.0F/65535.0F))
-
-/** Convert GLfloat in [-1.0,1.0] to GLshort in [-32768,32767] */
-#define FLOAT_TO_SHORT(X)   ( (((GLint) (65535.0F * (X))) - 1) / 2 )
-
-
-/** Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0], texture/fb data */
-#define SHORT_TO_FLOAT_TEX(S)    ((S) == -32768 ? -1.0F : (S) * (1.0F/32767.0F))
-
-/** Convert GLfloat in [-1.0,1.0] to GLshort in [-32768,32767], texture/fb data */
-#define FLOAT_TO_SHORT_TEX(X)    ( (GLint) (32767.0F * (X)) )
-
-
-/** Convert GLuint in [0,4294967295] to GLfloat in [0.0,1.0] */
-#define UINT_TO_FLOAT(U)    ((GLfloat) ((U) * (1.0F / 4294967295.0)))
-
-/** Convert GLfloat in [0.0,1.0] to GLuint in [0,4294967295] */
-#define FLOAT_TO_UINT(X)    ((GLuint) ((X) * 4294967295.0))
-
-
-/** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0] */
-#define INT_TO_FLOAT(I)     ((GLfloat) ((2.0F * (I) + 1.0F) * (1.0F/4294967294.0)))
-
-/** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647] */
-/* causes overflow:
-#define FLOAT_TO_INT(X)     ( (((GLint) (4294967294.0 * (X))) - 1) / 2 )
-*/
-/* a close approximation: */
-#define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0 * (X)) )
-
-/** Convert GLfloat in [-1.0,1.0] to GLint64 in [-(1<<63),(1 << 63) -1] */
-#define FLOAT_TO_INT64(X)     ( (GLint64) (9223372036854775807.0 * (double)(X)) )
-
-
-/** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0], texture/fb data */
-#define INT_TO_FLOAT_TEX(I)    ((I) == -2147483648 ? -1.0F : (I) * (1.0F/2147483647.0))
-
-/** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647], texture/fb data */
-#define FLOAT_TO_INT_TEX(X)    ( (GLint) (2147483647.0 * (X)) )
-
-
-#define BYTE_TO_UBYTE(b)   ((GLubyte) ((b) < 0 ? 0 : (GLubyte) (b)))
-#define SHORT_TO_UBYTE(s)  ((GLubyte) ((s) < 0 ? 0 : (GLubyte) ((s) >> 7)))
-#define USHORT_TO_UBYTE(s) ((GLubyte) ((s) >> 8))
-#define INT_TO_UBYTE(i)    ((GLubyte) ((i) < 0 ? 0 : (GLubyte) ((i) >> 23)))
-#define UINT_TO_UBYTE(i)   ((GLubyte) ((i) >> 24))
-
-
-#define BYTE_TO_USHORT(b)  ((b) < 0 ? 0 : ((GLushort) (((b) * 65535) / 255)))
-#define UBYTE_TO_USHORT(b) (((GLushort) (b) << 8) | (GLushort) (b))
-#define SHORT_TO_USHORT(s) ((s) < 0 ? 0 : ((GLushort) (((s) * 65535 / 32767))))
-#define INT_TO_USHORT(i)   ((i) < 0 ? 0 : ((GLushort) ((i) >> 15)))
-#define UINT_TO_USHORT(i)  ((i) < 0 ? 0 : ((GLushort) ((i) >> 16)))
-#define UNCLAMPED_FLOAT_TO_USHORT(us, f)  \
-        us = ( (GLushort) IROUND( CLAMP((f), 0.0F, 1.0F) * 65535.0F) )
-#define CLAMPED_FLOAT_TO_USHORT(us, f)  \
-        us = ( (GLushort) IROUND( (f) * 65535.0F) )
-
-#define UNCLAMPED_FLOAT_TO_SHORT(s, f)  \
-        s = ( (GLshort) IROUND( CLAMP((f), -1.0F, 1.0F) * 32767.0F) )
-
-/***
- *** UNCLAMPED_FLOAT_TO_UBYTE: clamp float to [0,1] and map to ubyte in [0,255]
- *** CLAMPED_FLOAT_TO_UBYTE: map float known to be in [0,1] to ubyte in [0,255]
- ***/
-#if defined(USE_IEEE) && !defined(DEBUG)
-#define IEEE_0996 0x3f7f0000	/* 0.996 or so */
-/* This function/macro is sensitive to precision.  Test very carefully
- * if you change it!
- */
-#define UNCLAMPED_FLOAT_TO_UBYTE(UB, F)					\
-        do {								\
-           fi_type __tmp;						\
-           __tmp.f = (F);						\
-           if (__tmp.i < 0)						\
-              UB = (GLubyte) 0;						\
-           else if (__tmp.i >= IEEE_0996)				\
-              UB = (GLubyte) 255;					\
-           else {							\
-              __tmp.f = __tmp.f * (255.0F/256.0F) + 32768.0F;		\
-              UB = (GLubyte) __tmp.i;					\
-           }								\
-        } while (0)
-#define CLAMPED_FLOAT_TO_UBYTE(UB, F)					\
-        do {								\
-           fi_type __tmp;						\
-           __tmp.f = (F) * (255.0F/256.0F) + 32768.0F;			\
-           UB = (GLubyte) __tmp.i;					\
-        } while (0)
-#else
-#define UNCLAMPED_FLOAT_TO_UBYTE(ub, f) \
-	ub = ((GLubyte) IROUND(CLAMP((f), 0.0F, 1.0F) * 255.0F))
-#define CLAMPED_FLOAT_TO_UBYTE(ub, f) \
-	ub = ((GLubyte) IROUND((f) * 255.0F))
-#endif
-
-/*@}*/
-
-
-/** Stepping a GLfloat pointer by a byte stride */
-#define STRIDE_F(p, i)  (p = (GLfloat *)((GLubyte *)p + i))
-/** Stepping a GLuint pointer by a byte stride */
-#define STRIDE_UI(p, i)  (p = (GLuint *)((GLubyte *)p + i))
-/** Stepping a GLubyte[4] pointer by a byte stride */
-#define STRIDE_4UB(p, i)  (p = (GLubyte (*)[4])((GLubyte *)p + i))
-/** Stepping a GLfloat[4] pointer by a byte stride */
-#define STRIDE_4F(p, i)  (p = (GLfloat (*)[4])((GLubyte *)p + i))
-/** Stepping a GLchan[4] pointer by a byte stride */
-#define STRIDE_4CHAN(p, i)  (p = (GLchan (*)[4])((GLubyte *)p + i))
-/** Stepping a GLchan pointer by a byte stride */
-#define STRIDE_CHAN(p, i)  (p = (GLchan *)((GLubyte *)p + i))
-/** Stepping a \p t pointer by a byte stride */
-#define STRIDE_T(p, t, i)  (p = (t)((GLubyte *)p + i))
-
-
-/**********************************************************************/
-/** \name 4-element vector operations */
-/*@{*/
-
-/** Zero */
-#define ZERO_4V( DST )  (DST)[0] = (DST)[1] = (DST)[2] = (DST)[3] = 0
-
-/** Test for equality */
-#define TEST_EQ_4V(a,b)  ((a)[0] == (b)[0] &&   \
-              (a)[1] == (b)[1] &&   \
-              (a)[2] == (b)[2] &&   \
-              (a)[3] == (b)[3])
-
-/** Test for equality (unsigned bytes) */
-#if defined(__i386__)
-#define TEST_EQ_4UBV(DST, SRC) *((GLuint*)(DST)) == *((GLuint*)(SRC))
-#else
-#define TEST_EQ_4UBV(DST, SRC) TEST_EQ_4V(DST, SRC)
-#endif
-
-/** Copy a 4-element vector */
-#define COPY_4V( DST, SRC )         \
-do {                                \
-   (DST)[0] = (SRC)[0];             \
-   (DST)[1] = (SRC)[1];             \
-   (DST)[2] = (SRC)[2];             \
-   (DST)[3] = (SRC)[3];             \
-} while (0)
-
-/** Copy a 4-element vector with cast */
-#define COPY_4V_CAST( DST, SRC, CAST )  \
-do {                                    \
-   (DST)[0] = (CAST)(SRC)[0];           \
-   (DST)[1] = (CAST)(SRC)[1];           \
-   (DST)[2] = (CAST)(SRC)[2];           \
-   (DST)[3] = (CAST)(SRC)[3];           \
-} while (0)
-
-/** Copy a 4-element unsigned byte vector */
-#if defined(__i386__)
-#define COPY_4UBV(DST, SRC)                 \
-do {                                        \
-   *((GLuint*)(DST)) = *((GLuint*)(SRC));   \
-} while (0)
-#else
-/* The GLuint cast might fail if DST or SRC are not dword-aligned (RISC) */
-#define COPY_4UBV(DST, SRC)         \
-do {                                \
-   (DST)[0] = (SRC)[0];             \
-   (DST)[1] = (SRC)[1];             \
-   (DST)[2] = (SRC)[2];             \
-   (DST)[3] = (SRC)[3];             \
-} while (0)
-#endif
-
-/**
- * Copy a 4-element float vector
- * memcpy seems to be most efficient
- */
-#define COPY_4FV( DST, SRC )                  \
-do {                                          \
-   memcpy(DST, SRC, sizeof(GLfloat) * 4);     \
-} while (0)
-
-/** Copy \p SZ elements into a 4-element vector */
-#define COPY_SZ_4V(DST, SZ, SRC)  \
-do {                              \
-   switch (SZ) {                  \
-   case 4: (DST)[3] = (SRC)[3];   \
-   case 3: (DST)[2] = (SRC)[2];   \
-   case 2: (DST)[1] = (SRC)[1];   \
-   case 1: (DST)[0] = (SRC)[0];   \
-   }                              \
-} while(0)
-
-/** Copy \p SZ elements into a homegeneous (4-element) vector, giving
- * default values to the remaining */
-#define COPY_CLEAN_4V(DST, SZ, SRC)  \
-do {                                 \
-      ASSIGN_4V( DST, 0, 0, 0, 1 );  \
-      COPY_SZ_4V( DST, SZ, SRC );    \
-} while (0)
-
-/** Subtraction */
-#define SUB_4V( DST, SRCA, SRCB )           \
-do {                                        \
-      (DST)[0] = (SRCA)[0] - (SRCB)[0];     \
-      (DST)[1] = (SRCA)[1] - (SRCB)[1];     \
-      (DST)[2] = (SRCA)[2] - (SRCB)[2];     \
-      (DST)[3] = (SRCA)[3] - (SRCB)[3];     \
-} while (0)
-
-/** Addition */
-#define ADD_4V( DST, SRCA, SRCB )           \
-do {                                        \
-      (DST)[0] = (SRCA)[0] + (SRCB)[0];     \
-      (DST)[1] = (SRCA)[1] + (SRCB)[1];     \
-      (DST)[2] = (SRCA)[2] + (SRCB)[2];     \
-      (DST)[3] = (SRCA)[3] + (SRCB)[3];     \
-} while (0)
-
-/** Element-wise multiplication */
-#define SCALE_4V( DST, SRCA, SRCB )         \
-do {                                        \
-      (DST)[0] = (SRCA)[0] * (SRCB)[0];     \
-      (DST)[1] = (SRCA)[1] * (SRCB)[1];     \
-      (DST)[2] = (SRCA)[2] * (SRCB)[2];     \
-      (DST)[3] = (SRCA)[3] * (SRCB)[3];     \
-} while (0)
-
-/** In-place addition */
-#define ACC_4V( DST, SRC )          \
-do {                                \
-      (DST)[0] += (SRC)[0];         \
-      (DST)[1] += (SRC)[1];         \
-      (DST)[2] += (SRC)[2];         \
-      (DST)[3] += (SRC)[3];         \
-} while (0)
-
-/** Element-wise multiplication and addition */
-#define ACC_SCALE_4V( DST, SRCA, SRCB )     \
-do {                                        \
-      (DST)[0] += (SRCA)[0] * (SRCB)[0];    \
-      (DST)[1] += (SRCA)[1] * (SRCB)[1];    \
-      (DST)[2] += (SRCA)[2] * (SRCB)[2];    \
-      (DST)[3] += (SRCA)[3] * (SRCB)[3];    \
-} while (0)
-
-/** In-place scalar multiplication and addition */
-#define ACC_SCALE_SCALAR_4V( DST, S, SRCB ) \
-do {                                        \
-      (DST)[0] += S * (SRCB)[0];            \
-      (DST)[1] += S * (SRCB)[1];            \
-      (DST)[2] += S * (SRCB)[2];            \
-      (DST)[3] += S * (SRCB)[3];            \
-} while (0)
-
-/** Scalar multiplication */
-#define SCALE_SCALAR_4V( DST, S, SRCB ) \
-do {                                    \
-      (DST)[0] = S * (SRCB)[0];         \
-      (DST)[1] = S * (SRCB)[1];         \
-      (DST)[2] = S * (SRCB)[2];         \
-      (DST)[3] = S * (SRCB)[3];         \
-} while (0)
-
-/** In-place scalar multiplication */
-#define SELF_SCALE_SCALAR_4V( DST, S ) \
-do {                                   \
-      (DST)[0] *= S;                   \
-      (DST)[1] *= S;                   \
-      (DST)[2] *= S;                   \
-      (DST)[3] *= S;                   \
-} while (0)
-
-/** Assignment */
-#define ASSIGN_4V( V, V0, V1, V2, V3 )  \
-do {                                    \
-    V[0] = V0;                          \
-    V[1] = V1;                          \
-    V[2] = V2;                          \
-    V[3] = V3;                          \
-} while(0)
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name 3-element vector operations*/
-/*@{*/
-
-/** Zero */
-#define ZERO_3V( DST )  (DST)[0] = (DST)[1] = (DST)[2] = 0
-
-/** Test for equality */
-#define TEST_EQ_3V(a,b)  \
-   ((a)[0] == (b)[0] &&  \
-    (a)[1] == (b)[1] &&  \
-    (a)[2] == (b)[2])
-
-/** Copy a 3-element vector */
-#define COPY_3V( DST, SRC )         \
-do {                                \
-   (DST)[0] = (SRC)[0];             \
-   (DST)[1] = (SRC)[1];             \
-   (DST)[2] = (SRC)[2];             \
-} while (0)
-
-/** Copy a 3-element vector with cast */
-#define COPY_3V_CAST( DST, SRC, CAST )  \
-do {                                    \
-   (DST)[0] = (CAST)(SRC)[0];           \
-   (DST)[1] = (CAST)(SRC)[1];           \
-   (DST)[2] = (CAST)(SRC)[2];           \
-} while (0)
-
-/** Copy a 3-element float vector */
-#define COPY_3FV( DST, SRC )        \
-do {                                \
-   const GLfloat *_tmp = (SRC);     \
-   (DST)[0] = _tmp[0];              \
-   (DST)[1] = _tmp[1];              \
-   (DST)[2] = _tmp[2];              \
-} while (0)
-
-/** Subtraction */
-#define SUB_3V( DST, SRCA, SRCB )        \
-do {                                     \
-      (DST)[0] = (SRCA)[0] - (SRCB)[0];  \
-      (DST)[1] = (SRCA)[1] - (SRCB)[1];  \
-      (DST)[2] = (SRCA)[2] - (SRCB)[2];  \
-} while (0)
-
-/** Addition */
-#define ADD_3V( DST, SRCA, SRCB )       \
-do {                                    \
-      (DST)[0] = (SRCA)[0] + (SRCB)[0]; \
-      (DST)[1] = (SRCA)[1] + (SRCB)[1]; \
-      (DST)[2] = (SRCA)[2] + (SRCB)[2]; \
-} while (0)
-
-/** In-place scalar multiplication */
-#define SCALE_3V( DST, SRCA, SRCB )     \
-do {                                    \
-      (DST)[0] = (SRCA)[0] * (SRCB)[0]; \
-      (DST)[1] = (SRCA)[1] * (SRCB)[1]; \
-      (DST)[2] = (SRCA)[2] * (SRCB)[2]; \
-} while (0)
-
-/** In-place element-wise multiplication */
-#define SELF_SCALE_3V( DST, SRC )   \
-do {                                \
-      (DST)[0] *= (SRC)[0];         \
-      (DST)[1] *= (SRC)[1];         \
-      (DST)[2] *= (SRC)[2];         \
-} while (0)
-
-/** In-place addition */
-#define ACC_3V( DST, SRC )          \
-do {                                \
-      (DST)[0] += (SRC)[0];         \
-      (DST)[1] += (SRC)[1];         \
-      (DST)[2] += (SRC)[2];         \
-} while (0)
-
-/** Element-wise multiplication and addition */
-#define ACC_SCALE_3V( DST, SRCA, SRCB )     \
-do {                                        \
-      (DST)[0] += (SRCA)[0] * (SRCB)[0];    \
-      (DST)[1] += (SRCA)[1] * (SRCB)[1];    \
-      (DST)[2] += (SRCA)[2] * (SRCB)[2];    \
-} while (0)
-
-/** Scalar multiplication */
-#define SCALE_SCALAR_3V( DST, S, SRCB ) \
-do {                                    \
-      (DST)[0] = S * (SRCB)[0];         \
-      (DST)[1] = S * (SRCB)[1];         \
-      (DST)[2] = S * (SRCB)[2];         \
-} while (0)
-
-/** In-place scalar multiplication and addition */
-#define ACC_SCALE_SCALAR_3V( DST, S, SRCB ) \
-do {                                        \
-      (DST)[0] += S * (SRCB)[0];            \
-      (DST)[1] += S * (SRCB)[1];            \
-      (DST)[2] += S * (SRCB)[2];            \
-} while (0)
-
-/** In-place scalar multiplication */
-#define SELF_SCALE_SCALAR_3V( DST, S ) \
-do {                                   \
-      (DST)[0] *= S;                   \
-      (DST)[1] *= S;                   \
-      (DST)[2] *= S;                   \
-} while (0)
-
-/** In-place scalar addition */
-#define ACC_SCALAR_3V( DST, S )     \
-do {                                \
-      (DST)[0] += S;                \
-      (DST)[1] += S;                \
-      (DST)[2] += S;                \
-} while (0)
-
-/** Assignment */
-#define ASSIGN_3V( V, V0, V1, V2 )  \
-do {                                \
-    V[0] = V0;                      \
-    V[1] = V1;                      \
-    V[2] = V2;                      \
-} while(0)
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name 2-element vector operations*/
-/*@{*/
-
-/** Zero */
-#define ZERO_2V( DST )  (DST)[0] = (DST)[1] = 0
-
-/** Copy a 2-element vector */
-#define COPY_2V( DST, SRC )         \
-do {                        \
-   (DST)[0] = (SRC)[0];             \
-   (DST)[1] = (SRC)[1];             \
-} while (0)
-
-/** Copy a 2-element vector with cast */
-#define COPY_2V_CAST( DST, SRC, CAST )      \
-do {                        \
-   (DST)[0] = (CAST)(SRC)[0];           \
-   (DST)[1] = (CAST)(SRC)[1];           \
-} while (0)
-
-/** Copy a 2-element float vector */
-#define COPY_2FV( DST, SRC )            \
-do {                        \
-   const GLfloat *_tmp = (SRC);         \
-   (DST)[0] = _tmp[0];              \
-   (DST)[1] = _tmp[1];              \
-} while (0)
-
-/** Subtraction */
-#define SUB_2V( DST, SRCA, SRCB )       \
-do {                        \
-      (DST)[0] = (SRCA)[0] - (SRCB)[0];     \
-      (DST)[1] = (SRCA)[1] - (SRCB)[1];     \
-} while (0)
-
-/** Addition */
-#define ADD_2V( DST, SRCA, SRCB )       \
-do {                        \
-      (DST)[0] = (SRCA)[0] + (SRCB)[0];     \
-      (DST)[1] = (SRCA)[1] + (SRCB)[1];     \
-} while (0)
-
-/** In-place scalar multiplication */
-#define SCALE_2V( DST, SRCA, SRCB )     \
-do {                        \
-      (DST)[0] = (SRCA)[0] * (SRCB)[0];     \
-      (DST)[1] = (SRCA)[1] * (SRCB)[1];     \
-} while (0)
-
-/** In-place addition */
-#define ACC_2V( DST, SRC )          \
-do {                        \
-      (DST)[0] += (SRC)[0];         \
-      (DST)[1] += (SRC)[1];         \
-} while (0)
-
-/** Element-wise multiplication and addition */
-#define ACC_SCALE_2V( DST, SRCA, SRCB )     \
-do {                        \
-      (DST)[0] += (SRCA)[0] * (SRCB)[0];    \
-      (DST)[1] += (SRCA)[1] * (SRCB)[1];    \
-} while (0)
-
-/** Scalar multiplication */
-#define SCALE_SCALAR_2V( DST, S, SRCB )     \
-do {                        \
-      (DST)[0] = S * (SRCB)[0];         \
-      (DST)[1] = S * (SRCB)[1];         \
-} while (0)
-
-/** In-place scalar multiplication and addition */
-#define ACC_SCALE_SCALAR_2V( DST, S, SRCB ) \
-do {                        \
-      (DST)[0] += S * (SRCB)[0];        \
-      (DST)[1] += S * (SRCB)[1];        \
-} while (0)
-
-/** In-place scalar multiplication */
-#define SELF_SCALE_SCALAR_2V( DST, S )      \
-do {                        \
-      (DST)[0] *= S;                \
-      (DST)[1] *= S;                \
-} while (0)
-
-/** In-place scalar addition */
-#define ACC_SCALAR_2V( DST, S )         \
-do {                        \
-      (DST)[0] += S;                \
-      (DST)[1] += S;                \
-} while (0)
-
-/** Assign scalers to short vectors */
-#define ASSIGN_2V( V, V0, V1 )	\
-do {				\
-    V[0] = V0;			\
-    V[1] = V1;			\
-} while(0)
-
-/*@}*/
-
-
-/** \name Linear interpolation macros */
-/*@{*/
-
-/**
- * Linear interpolation
- *
- * \note \p OUT argument is evaluated twice!
- * \note Be wary of using *coord++ as an argument to any of these macros!
- */
-#define LINTERP(T, OUT, IN) ((OUT) + (T) * ((IN) - (OUT)))
-
-/* Can do better with integer math
- */
-#define INTERP_UB( t, dstub, outub, inub )  \
-do {                        \
-   GLfloat inf = UBYTE_TO_FLOAT( inub );    \
-   GLfloat outf = UBYTE_TO_FLOAT( outub );  \
-   GLfloat dstf = LINTERP( t, outf, inf );  \
-   UNCLAMPED_FLOAT_TO_UBYTE( dstub, dstf ); \
-} while (0)
-
-#define INTERP_CHAN( t, dstc, outc, inc )   \
-do {                        \
-   GLfloat inf = CHAN_TO_FLOAT( inc );      \
-   GLfloat outf = CHAN_TO_FLOAT( outc );    \
-   GLfloat dstf = LINTERP( t, outf, inf );  \
-   UNCLAMPED_FLOAT_TO_CHAN( dstc, dstf );   \
-} while (0)
-
-#define INTERP_UI( t, dstui, outui, inui )  \
-   dstui = (GLuint) (GLint) LINTERP( (t), (GLfloat) (outui), (GLfloat) (inui) )
-
-#define INTERP_F( t, dstf, outf, inf )      \
-   dstf = LINTERP( t, outf, inf )
-
-#define INTERP_4F( t, dst, out, in )        \
-do {                        \
-   dst[0] = LINTERP( (t), (out)[0], (in)[0] );  \
-   dst[1] = LINTERP( (t), (out)[1], (in)[1] );  \
-   dst[2] = LINTERP( (t), (out)[2], (in)[2] );  \
-   dst[3] = LINTERP( (t), (out)[3], (in)[3] );  \
-} while (0)
-
-#define INTERP_3F( t, dst, out, in )        \
-do {                        \
-   dst[0] = LINTERP( (t), (out)[0], (in)[0] );  \
-   dst[1] = LINTERP( (t), (out)[1], (in)[1] );  \
-   dst[2] = LINTERP( (t), (out)[2], (in)[2] );  \
-} while (0)
-
-#define INTERP_4CHAN( t, dst, out, in )         \
-do {                            \
-   INTERP_CHAN( (t), (dst)[0], (out)[0], (in)[0] ); \
-   INTERP_CHAN( (t), (dst)[1], (out)[1], (in)[1] ); \
-   INTERP_CHAN( (t), (dst)[2], (out)[2], (in)[2] ); \
-   INTERP_CHAN( (t), (dst)[3], (out)[3], (in)[3] ); \
-} while (0)
-
-#define INTERP_3CHAN( t, dst, out, in )         \
-do {                            \
-   INTERP_CHAN( (t), (dst)[0], (out)[0], (in)[0] ); \
-   INTERP_CHAN( (t), (dst)[1], (out)[1], (in)[1] ); \
-   INTERP_CHAN( (t), (dst)[2], (out)[2], (in)[2] ); \
-} while (0)
-
-#define INTERP_SZ( t, vec, to, out, in, sz )                \
-do {                                    \
-   switch (sz) {                            \
-   case 4: vec[to][3] = LINTERP( (t), (vec)[out][3], (vec)[in][3] );    \
-   case 3: vec[to][2] = LINTERP( (t), (vec)[out][2], (vec)[in][2] );    \
-   case 2: vec[to][1] = LINTERP( (t), (vec)[out][1], (vec)[in][1] );    \
-   case 1: vec[to][0] = LINTERP( (t), (vec)[out][0], (vec)[in][0] );    \
-   }                                    \
-} while(0)
-
-/*@}*/
-
-
-
-/** Clamp X to [MIN,MAX] */
-#define CLAMP( X, MIN, MAX )  ( (X)<(MIN) ? (MIN) : ((X)>(MAX) ? (MAX) : (X)) )
-
-/** Minimum of two values: */
-#define MIN2( A, B )   ( (A)<(B) ? (A) : (B) )
-
-/** Maximum of two values: */
-#define MAX2( A, B )   ( (A)>(B) ? (A) : (B) )
-
-/** Dot product of two 2-element vectors */
-#define DOT2( a, b )  ( (a)[0]*(b)[0] + (a)[1]*(b)[1] )
-
-/** Dot product of two 3-element vectors */
-#define DOT3( a, b )  ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + (a)[2]*(b)[2] )
-
-/** Dot product of two 4-element vectors */
-#define DOT4( a, b )  ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + \
-            (a)[2]*(b)[2] + (a)[3]*(b)[3] )
-
-/** Dot product of two 4-element vectors */
-#define DOT4V(v,a,b,c,d) (v[0]*(a) + v[1]*(b) + v[2]*(c) + v[3]*(d))
-
-
-/** Cross product of two 3-element vectors */
-#define CROSS3(n, u, v)             \
-do {                        \
-   (n)[0] = (u)[1]*(v)[2] - (u)[2]*(v)[1];  \
-   (n)[1] = (u)[2]*(v)[0] - (u)[0]*(v)[2];  \
-   (n)[2] = (u)[0]*(v)[1] - (u)[1]*(v)[0];  \
-} while (0)
-
-
-/* Normalize a 3-element vector to unit length. */
-#define NORMALIZE_3FV( V )          \
-do {                        \
-   GLfloat len = (GLfloat) LEN_SQUARED_3FV(V);  \
-   if (len) {                   \
-      len = INV_SQRTF(len);         \
-      (V)[0] = (GLfloat) ((V)[0] * len);    \
-      (V)[1] = (GLfloat) ((V)[1] * len);    \
-      (V)[2] = (GLfloat) ((V)[2] * len);    \
-   }                        \
-} while(0)
-
-#define LEN_3FV( V ) (SQRTF((V)[0]*(V)[0]+(V)[1]*(V)[1]+(V)[2]*(V)[2]))
-#define LEN_2FV( V ) (SQRTF((V)[0]*(V)[0]+(V)[1]*(V)[1]))
-
-#define LEN_SQUARED_3FV( V ) ((V)[0]*(V)[0]+(V)[1]*(V)[1]+(V)[2]*(V)[2])
-#define LEN_SQUARED_2FV( V ) ((V)[0]*(V)[0]+(V)[1]*(V)[1])
-
-
-/** casts to silence warnings with some compilers */
-#define ENUM_TO_INT(E)     ((GLint)(E))
-#define ENUM_TO_FLOAT(E)   ((GLfloat)(GLint)(E))
-#define ENUM_TO_DOUBLE(E)  ((GLdouble)(GLint)(E))
-#define ENUM_TO_BOOLEAN(E) ((E) ? GL_TRUE : GL_FALSE)
-
-
-#endif
+/**

+ * \file macros.h

+ * A collection of useful macros.

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.2

+ *

+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#ifndef MACROS_H

+#define MACROS_H

+

+#include "imports.h"

+

+

+/**

+ * \name Integer / float conversion for colors, normals, etc.

+ */

+/*@{*/

+

+/** Convert GLubyte in [0,255] to GLfloat in [0.0,1.0] */

+extern GLfloat _mesa_ubyte_to_float_color_tab[256];

+#define UBYTE_TO_FLOAT(u) _mesa_ubyte_to_float_color_tab[(unsigned int)(u)]

+

+/** Convert GLfloat in [0.0,1.0] to GLubyte in [0,255] */

+#define FLOAT_TO_UBYTE(X)   ((GLubyte) (GLint) ((X) * 255.0F))

+

+

+/** Convert GLbyte in [-128,127] to GLfloat in [-1.0,1.0] */

+#define BYTE_TO_FLOAT(B)    ((2.0F * (B) + 1.0F) * (1.0F/255.0F))

+

+/** Convert GLfloat in [-1.0,1.0] to GLbyte in [-128,127] */

+#define FLOAT_TO_BYTE(X)    ( (((GLint) (255.0F * (X))) - 1) / 2 )

+

+

+/** Convert GLbyte in [-128,127] to GLfloat in [-1.0,1.0], texture/fb data */

+#define BYTE_TO_FLOAT_TEX(B)    ((B) == -128 ? -1.0F : (B) * (1.0F/127.0F))

+

+/** Convert GLfloat in [-1.0,1.0] to GLbyte in [-128,127], texture/fb data */

+#define FLOAT_TO_BYTE_TEX(X)    CLAMP( (GLint) (127.0F * (X)), -128, 127 )

+

+/** Convert GLushort in [0,65535] to GLfloat in [0.0,1.0] */

+#define USHORT_TO_FLOAT(S)  ((GLfloat) (S) * (1.0F / 65535.0F))

+

+/** Convert GLfloat in [0.0,1.0] to GLushort in [0, 65535] */

+#define FLOAT_TO_USHORT(X)   ((GLuint) ((X) * 65535.0F))

+

+

+/** Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0] */

+#define SHORT_TO_FLOAT(S)   ((2.0F * (S) + 1.0F) * (1.0F/65535.0F))

+

+/** Convert GLfloat in [-1.0,1.0] to GLshort in [-32768,32767] */

+#define FLOAT_TO_SHORT(X)   ( (((GLint) (65535.0F * (X))) - 1) / 2 )

+

+

+/** Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0], texture/fb data */

+#define SHORT_TO_FLOAT_TEX(S)    ((S) == -32768 ? -1.0F : (S) * (1.0F/32767.0F))

+

+/** Convert GLfloat in [-1.0,1.0] to GLshort in [-32768,32767], texture/fb data */

+#define FLOAT_TO_SHORT_TEX(X)    ( (GLint) (32767.0F * (X)) )

+

+

+/** Convert GLuint in [0,4294967295] to GLfloat in [0.0,1.0] */

+#define UINT_TO_FLOAT(U)    ((GLfloat) ((U) * (1.0F / 4294967295.0)))

+

+/** Convert GLfloat in [0.0,1.0] to GLuint in [0,4294967295] */

+#define FLOAT_TO_UINT(X)    ((GLuint) ((X) * 4294967295.0))

+

+

+/** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0] */

+#define INT_TO_FLOAT(I)     ((GLfloat) ((2.0F * (I) + 1.0F) * (1.0F/4294967294.0)))

+

+/** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647] */

+/* causes overflow:

+#define FLOAT_TO_INT(X)     ( (((GLint) (4294967294.0 * (X))) - 1) / 2 )

+*/

+/* a close approximation: */

+#define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0 * (X)) )

+

+/** Convert GLfloat in [-1.0,1.0] to GLint64 in [-(1<<63),(1 << 63) -1] */

+#define FLOAT_TO_INT64(X)     ( (GLint64) (9223372036854775807.0 * (double)(X)) )

+

+

+/** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0], texture/fb data */

+#define INT_TO_FLOAT_TEX(I)    ((I) == -2147483648 ? -1.0F : (I) * (1.0F/2147483647.0))

+

+/** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647], texture/fb data */

+#define FLOAT_TO_INT_TEX(X)    ( (GLint) (2147483647.0 * (X)) )

+

+

+#define BYTE_TO_UBYTE(b)   ((GLubyte) ((b) < 0 ? 0 : (GLubyte) (b)))

+#define SHORT_TO_UBYTE(s)  ((GLubyte) ((s) < 0 ? 0 : (GLubyte) ((s) >> 7)))

+#define USHORT_TO_UBYTE(s) ((GLubyte) ((s) >> 8))

+#define INT_TO_UBYTE(i)    ((GLubyte) ((i) < 0 ? 0 : (GLubyte) ((i) >> 23)))

+#define UINT_TO_UBYTE(i)   ((GLubyte) ((i) >> 24))

+

+

+#define BYTE_TO_USHORT(b)  ((b) < 0 ? 0 : ((GLushort) (((b) * 65535) / 255)))

+#define UBYTE_TO_USHORT(b) (((GLushort) (b) << 8) | (GLushort) (b))

+#define SHORT_TO_USHORT(s) ((s) < 0 ? 0 : ((GLushort) (((s) * 65535 / 32767))))

+#define INT_TO_USHORT(i)   ((i) < 0 ? 0 : ((GLushort) ((i) >> 15)))

+#define UINT_TO_USHORT(i)  ((i) < 0 ? 0 : ((GLushort) ((i) >> 16)))

+#define UNCLAMPED_FLOAT_TO_USHORT(us, f)  \

+        us = ( (GLushort) IROUND( CLAMP((f), 0.0F, 1.0F) * 65535.0F) )

+#define CLAMPED_FLOAT_TO_USHORT(us, f)  \

+        us = ( (GLushort) IROUND( (f) * 65535.0F) )

+

+#define UNCLAMPED_FLOAT_TO_SHORT(s, f)  \

+        s = ( (GLshort) IROUND( CLAMP((f), -1.0F, 1.0F) * 32767.0F) )

+

+/***

+ *** UNCLAMPED_FLOAT_TO_UBYTE: clamp float to [0,1] and map to ubyte in [0,255]

+ *** CLAMPED_FLOAT_TO_UBYTE: map float known to be in [0,1] to ubyte in [0,255]

+ ***/

+#if defined(USE_IEEE) && !defined(DEBUG)

+#define IEEE_0996 0x3f7f0000	/* 0.996 or so */

+/* This function/macro is sensitive to precision.  Test very carefully

+ * if you change it!

+ */

+#define UNCLAMPED_FLOAT_TO_UBYTE(UB, F)					\

+        do {								\

+           fi_type __tmp;						\

+           __tmp.f = (F);						\

+           if (__tmp.i < 0)						\

+              UB = (GLubyte) 0;						\

+           else if (__tmp.i >= IEEE_0996)				\

+              UB = (GLubyte) 255;					\

+           else {							\

+              __tmp.f = __tmp.f * (255.0F/256.0F) + 32768.0F;		\

+              UB = (GLubyte) __tmp.i;					\

+           }								\

+        } while (0)

+#define CLAMPED_FLOAT_TO_UBYTE(UB, F)					\

+        do {								\

+           fi_type __tmp;						\

+           __tmp.f = (F) * (255.0F/256.0F) + 32768.0F;			\

+           UB = (GLubyte) __tmp.i;					\

+        } while (0)

+#else

+#define UNCLAMPED_FLOAT_TO_UBYTE(ub, f) \

+	ub = ((GLubyte) IROUND(CLAMP((f), 0.0F, 1.0F) * 255.0F))

+#define CLAMPED_FLOAT_TO_UBYTE(ub, f) \

+	ub = ((GLubyte) IROUND((f) * 255.0F))

+#endif

+

+/*@}*/

+

+

+/** Stepping a GLfloat pointer by a byte stride */

+#define STRIDE_F(p, i)  (p = (GLfloat *)((GLubyte *)p + i))

+/** Stepping a GLuint pointer by a byte stride */

+#define STRIDE_UI(p, i)  (p = (GLuint *)((GLubyte *)p + i))

+/** Stepping a GLubyte[4] pointer by a byte stride */

+#define STRIDE_4UB(p, i)  (p = (GLubyte (*)[4])((GLubyte *)p + i))

+/** Stepping a GLfloat[4] pointer by a byte stride */

+#define STRIDE_4F(p, i)  (p = (GLfloat (*)[4])((GLubyte *)p + i))

+/** Stepping a GLchan[4] pointer by a byte stride */

+#define STRIDE_4CHAN(p, i)  (p = (GLchan (*)[4])((GLubyte *)p + i))

+/** Stepping a GLchan pointer by a byte stride */

+#define STRIDE_CHAN(p, i)  (p = (GLchan *)((GLubyte *)p + i))

+/** Stepping a \p t pointer by a byte stride */

+#define STRIDE_T(p, t, i)  (p = (t)((GLubyte *)p + i))

+

+

+/**********************************************************************/

+/** \name 4-element vector operations */

+/*@{*/

+

+/** Zero */

+#define ZERO_4V( DST )  (DST)[0] = (DST)[1] = (DST)[2] = (DST)[3] = 0

+

+/** Test for equality */

+#define TEST_EQ_4V(a,b)  ((a)[0] == (b)[0] &&   \

+              (a)[1] == (b)[1] &&   \

+              (a)[2] == (b)[2] &&   \

+              (a)[3] == (b)[3])

+

+/** Test for equality (unsigned bytes) */

+#if defined(__i386__)

+#define TEST_EQ_4UBV(DST, SRC) *((GLuint*)(DST)) == *((GLuint*)(SRC))

+#else

+#define TEST_EQ_4UBV(DST, SRC) TEST_EQ_4V(DST, SRC)

+#endif

+

+/** Copy a 4-element vector */

+#define COPY_4V( DST, SRC )         \

+do {                                \

+   (DST)[0] = (SRC)[0];             \

+   (DST)[1] = (SRC)[1];             \

+   (DST)[2] = (SRC)[2];             \

+   (DST)[3] = (SRC)[3];             \

+} while (0)

+

+/** Copy a 4-element vector with cast */

+#define COPY_4V_CAST( DST, SRC, CAST )  \

+do {                                    \

+   (DST)[0] = (CAST)(SRC)[0];           \

+   (DST)[1] = (CAST)(SRC)[1];           \

+   (DST)[2] = (CAST)(SRC)[2];           \

+   (DST)[3] = (CAST)(SRC)[3];           \

+} while (0)

+

+/** Copy a 4-element unsigned byte vector */

+#if defined(__i386__)

+#define COPY_4UBV(DST, SRC)                 \

+do {                                        \

+   *((GLuint*)(DST)) = *((GLuint*)(SRC));   \

+} while (0)

+#else

+/* The GLuint cast might fail if DST or SRC are not dword-aligned (RISC) */

+#define COPY_4UBV(DST, SRC)         \

+do {                                \

+   (DST)[0] = (SRC)[0];             \

+   (DST)[1] = (SRC)[1];             \

+   (DST)[2] = (SRC)[2];             \

+   (DST)[3] = (SRC)[3];             \

+} while (0)

+#endif

+

+/**

+ * Copy a 4-element float vector

+ * memcpy seems to be most efficient

+ */

+#define COPY_4FV( DST, SRC )                  \

+do {                                          \

+   memcpy(DST, SRC, sizeof(GLfloat) * 4);     \

+} while (0)

+

+/** Copy \p SZ elements into a 4-element vector */

+#define COPY_SZ_4V(DST, SZ, SRC)  \

+do {                              \

+   switch (SZ) {                  \

+   case 4: (DST)[3] = (SRC)[3];   \

+   case 3: (DST)[2] = (SRC)[2];   \

+   case 2: (DST)[1] = (SRC)[1];   \

+   case 1: (DST)[0] = (SRC)[0];   \

+   }                              \

+} while(0)

+

+/** Copy \p SZ elements into a homegeneous (4-element) vector, giving

+ * default values to the remaining */

+#define COPY_CLEAN_4V(DST, SZ, SRC)  \

+do {                                 \

+      ASSIGN_4V( DST, 0, 0, 0, 1 );  \

+      COPY_SZ_4V( DST, SZ, SRC );    \

+} while (0)

+

+/** Subtraction */

+#define SUB_4V( DST, SRCA, SRCB )           \

+do {                                        \

+      (DST)[0] = (SRCA)[0] - (SRCB)[0];     \

+      (DST)[1] = (SRCA)[1] - (SRCB)[1];     \

+      (DST)[2] = (SRCA)[2] - (SRCB)[2];     \

+      (DST)[3] = (SRCA)[3] - (SRCB)[3];     \

+} while (0)

+

+/** Addition */

+#define ADD_4V( DST, SRCA, SRCB )           \

+do {                                        \

+      (DST)[0] = (SRCA)[0] + (SRCB)[0];     \

+      (DST)[1] = (SRCA)[1] + (SRCB)[1];     \

+      (DST)[2] = (SRCA)[2] + (SRCB)[2];     \

+      (DST)[3] = (SRCA)[3] + (SRCB)[3];     \

+} while (0)

+

+/** Element-wise multiplication */

+#define SCALE_4V( DST, SRCA, SRCB )         \

+do {                                        \

+      (DST)[0] = (SRCA)[0] * (SRCB)[0];     \

+      (DST)[1] = (SRCA)[1] * (SRCB)[1];     \

+      (DST)[2] = (SRCA)[2] * (SRCB)[2];     \

+      (DST)[3] = (SRCA)[3] * (SRCB)[3];     \

+} while (0)

+

+/** In-place addition */

+#define ACC_4V( DST, SRC )          \

+do {                                \

+      (DST)[0] += (SRC)[0];         \

+      (DST)[1] += (SRC)[1];         \

+      (DST)[2] += (SRC)[2];         \

+      (DST)[3] += (SRC)[3];         \

+} while (0)

+

+/** Element-wise multiplication and addition */

+#define ACC_SCALE_4V( DST, SRCA, SRCB )     \

+do {                                        \

+      (DST)[0] += (SRCA)[0] * (SRCB)[0];    \

+      (DST)[1] += (SRCA)[1] * (SRCB)[1];    \

+      (DST)[2] += (SRCA)[2] * (SRCB)[2];    \

+      (DST)[3] += (SRCA)[3] * (SRCB)[3];    \

+} while (0)

+

+/** In-place scalar multiplication and addition */

+#define ACC_SCALE_SCALAR_4V( DST, S, SRCB ) \

+do {                                        \

+      (DST)[0] += S * (SRCB)[0];            \

+      (DST)[1] += S * (SRCB)[1];            \

+      (DST)[2] += S * (SRCB)[2];            \

+      (DST)[3] += S * (SRCB)[3];            \

+} while (0)

+

+/** Scalar multiplication */

+#define SCALE_SCALAR_4V( DST, S, SRCB ) \

+do {                                    \

+      (DST)[0] = S * (SRCB)[0];         \

+      (DST)[1] = S * (SRCB)[1];         \

+      (DST)[2] = S * (SRCB)[2];         \

+      (DST)[3] = S * (SRCB)[3];         \

+} while (0)

+

+/** In-place scalar multiplication */

+#define SELF_SCALE_SCALAR_4V( DST, S ) \

+do {                                   \

+      (DST)[0] *= S;                   \

+      (DST)[1] *= S;                   \

+      (DST)[2] *= S;                   \

+      (DST)[3] *= S;                   \

+} while (0)

+

+/** Assignment */

+#define ASSIGN_4V( V, V0, V1, V2, V3 )  \

+do {                                    \

+    V[0] = V0;                          \

+    V[1] = V1;                          \

+    V[2] = V2;                          \

+    V[3] = V3;                          \

+} while(0)

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name 3-element vector operations*/

+/*@{*/

+

+/** Zero */

+#define ZERO_3V( DST )  (DST)[0] = (DST)[1] = (DST)[2] = 0

+

+/** Test for equality */

+#define TEST_EQ_3V(a,b)  \

+   ((a)[0] == (b)[0] &&  \

+    (a)[1] == (b)[1] &&  \

+    (a)[2] == (b)[2])

+

+/** Copy a 3-element vector */

+#define COPY_3V( DST, SRC )         \

+do {                                \

+   (DST)[0] = (SRC)[0];             \

+   (DST)[1] = (SRC)[1];             \

+   (DST)[2] = (SRC)[2];             \

+} while (0)

+

+/** Copy a 3-element vector with cast */

+#define COPY_3V_CAST( DST, SRC, CAST )  \

+do {                                    \

+   (DST)[0] = (CAST)(SRC)[0];           \

+   (DST)[1] = (CAST)(SRC)[1];           \

+   (DST)[2] = (CAST)(SRC)[2];           \

+} while (0)

+

+/** Copy a 3-element float vector */

+#define COPY_3FV( DST, SRC )        \

+do {                                \

+   const GLfloat *_tmp = (SRC);     \

+   (DST)[0] = _tmp[0];              \

+   (DST)[1] = _tmp[1];              \

+   (DST)[2] = _tmp[2];              \

+} while (0)

+

+/** Subtraction */

+#define SUB_3V( DST, SRCA, SRCB )        \

+do {                                     \

+      (DST)[0] = (SRCA)[0] - (SRCB)[0];  \

+      (DST)[1] = (SRCA)[1] - (SRCB)[1];  \

+      (DST)[2] = (SRCA)[2] - (SRCB)[2];  \

+} while (0)

+

+/** Addition */

+#define ADD_3V( DST, SRCA, SRCB )       \

+do {                                    \

+      (DST)[0] = (SRCA)[0] + (SRCB)[0]; \

+      (DST)[1] = (SRCA)[1] + (SRCB)[1]; \

+      (DST)[2] = (SRCA)[2] + (SRCB)[2]; \

+} while (0)

+

+/** In-place scalar multiplication */

+#define SCALE_3V( DST, SRCA, SRCB )     \

+do {                                    \

+      (DST)[0] = (SRCA)[0] * (SRCB)[0]; \

+      (DST)[1] = (SRCA)[1] * (SRCB)[1]; \

+      (DST)[2] = (SRCA)[2] * (SRCB)[2]; \

+} while (0)

+

+/** In-place element-wise multiplication */

+#define SELF_SCALE_3V( DST, SRC )   \

+do {                                \

+      (DST)[0] *= (SRC)[0];         \

+      (DST)[1] *= (SRC)[1];         \

+      (DST)[2] *= (SRC)[2];         \

+} while (0)

+

+/** In-place addition */

+#define ACC_3V( DST, SRC )          \

+do {                                \

+      (DST)[0] += (SRC)[0];         \

+      (DST)[1] += (SRC)[1];         \

+      (DST)[2] += (SRC)[2];         \

+} while (0)

+

+/** Element-wise multiplication and addition */

+#define ACC_SCALE_3V( DST, SRCA, SRCB )     \

+do {                                        \

+      (DST)[0] += (SRCA)[0] * (SRCB)[0];    \

+      (DST)[1] += (SRCA)[1] * (SRCB)[1];    \

+      (DST)[2] += (SRCA)[2] * (SRCB)[2];    \

+} while (0)

+

+/** Scalar multiplication */

+#define SCALE_SCALAR_3V( DST, S, SRCB ) \

+do {                                    \

+      (DST)[0] = S * (SRCB)[0];         \

+      (DST)[1] = S * (SRCB)[1];         \

+      (DST)[2] = S * (SRCB)[2];         \

+} while (0)

+

+/** In-place scalar multiplication and addition */

+#define ACC_SCALE_SCALAR_3V( DST, S, SRCB ) \

+do {                                        \

+      (DST)[0] += S * (SRCB)[0];            \

+      (DST)[1] += S * (SRCB)[1];            \

+      (DST)[2] += S * (SRCB)[2];            \

+} while (0)

+

+/** In-place scalar multiplication */

+#define SELF_SCALE_SCALAR_3V( DST, S ) \

+do {                                   \

+      (DST)[0] *= S;                   \

+      (DST)[1] *= S;                   \

+      (DST)[2] *= S;                   \

+} while (0)

+

+/** In-place scalar addition */

+#define ACC_SCALAR_3V( DST, S )     \

+do {                                \

+      (DST)[0] += S;                \

+      (DST)[1] += S;                \

+      (DST)[2] += S;                \

+} while (0)

+

+/** Assignment */

+#define ASSIGN_3V( V, V0, V1, V2 )  \

+do {                                \

+    V[0] = V0;                      \

+    V[1] = V1;                      \

+    V[2] = V2;                      \

+} while(0)

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name 2-element vector operations*/

+/*@{*/

+

+/** Zero */

+#define ZERO_2V( DST )  (DST)[0] = (DST)[1] = 0

+

+/** Copy a 2-element vector */

+#define COPY_2V( DST, SRC )         \

+do {                        \

+   (DST)[0] = (SRC)[0];             \

+   (DST)[1] = (SRC)[1];             \

+} while (0)

+

+/** Copy a 2-element vector with cast */

+#define COPY_2V_CAST( DST, SRC, CAST )      \

+do {                        \

+   (DST)[0] = (CAST)(SRC)[0];           \

+   (DST)[1] = (CAST)(SRC)[1];           \

+} while (0)

+

+/** Copy a 2-element float vector */

+#define COPY_2FV( DST, SRC )            \

+do {                        \

+   const GLfloat *_tmp = (SRC);         \

+   (DST)[0] = _tmp[0];              \

+   (DST)[1] = _tmp[1];              \

+} while (0)

+

+/** Subtraction */

+#define SUB_2V( DST, SRCA, SRCB )       \

+do {                        \

+      (DST)[0] = (SRCA)[0] - (SRCB)[0];     \

+      (DST)[1] = (SRCA)[1] - (SRCB)[1];     \

+} while (0)

+

+/** Addition */

+#define ADD_2V( DST, SRCA, SRCB )       \

+do {                        \

+      (DST)[0] = (SRCA)[0] + (SRCB)[0];     \

+      (DST)[1] = (SRCA)[1] + (SRCB)[1];     \

+} while (0)

+

+/** In-place scalar multiplication */

+#define SCALE_2V( DST, SRCA, SRCB )     \

+do {                        \

+      (DST)[0] = (SRCA)[0] * (SRCB)[0];     \

+      (DST)[1] = (SRCA)[1] * (SRCB)[1];     \

+} while (0)

+

+/** In-place addition */

+#define ACC_2V( DST, SRC )          \

+do {                        \

+      (DST)[0] += (SRC)[0];         \

+      (DST)[1] += (SRC)[1];         \

+} while (0)

+

+/** Element-wise multiplication and addition */

+#define ACC_SCALE_2V( DST, SRCA, SRCB )     \

+do {                        \

+      (DST)[0] += (SRCA)[0] * (SRCB)[0];    \

+      (DST)[1] += (SRCA)[1] * (SRCB)[1];    \

+} while (0)

+

+/** Scalar multiplication */

+#define SCALE_SCALAR_2V( DST, S, SRCB )     \

+do {                        \

+      (DST)[0] = S * (SRCB)[0];         \

+      (DST)[1] = S * (SRCB)[1];         \

+} while (0)

+

+/** In-place scalar multiplication and addition */

+#define ACC_SCALE_SCALAR_2V( DST, S, SRCB ) \

+do {                        \

+      (DST)[0] += S * (SRCB)[0];        \

+      (DST)[1] += S * (SRCB)[1];        \

+} while (0)

+

+/** In-place scalar multiplication */

+#define SELF_SCALE_SCALAR_2V( DST, S )      \

+do {                        \

+      (DST)[0] *= S;                \

+      (DST)[1] *= S;                \

+} while (0)

+

+/** In-place scalar addition */

+#define ACC_SCALAR_2V( DST, S )         \

+do {                        \

+      (DST)[0] += S;                \

+      (DST)[1] += S;                \

+} while (0)

+

+/** Assign scalers to short vectors */

+#define ASSIGN_2V( V, V0, V1 )	\

+do {				\

+    V[0] = V0;			\

+    V[1] = V1;			\

+} while(0)

+

+/*@}*/

+

+

+/** \name Linear interpolation macros */

+/*@{*/

+

+/**

+ * Linear interpolation

+ *

+ * \note \p OUT argument is evaluated twice!

+ * \note Be wary of using *coord++ as an argument to any of these macros!

+ */

+#define LINTERP(T, OUT, IN) ((OUT) + (T) * ((IN) - (OUT)))

+

+/* Can do better with integer math

+ */

+#define INTERP_UB( t, dstub, outub, inub )  \

+do {                        \

+   GLfloat inf = UBYTE_TO_FLOAT( inub );    \

+   GLfloat outf = UBYTE_TO_FLOAT( outub );  \

+   GLfloat dstf = LINTERP( t, outf, inf );  \

+   UNCLAMPED_FLOAT_TO_UBYTE( dstub, dstf ); \

+} while (0)

+

+#define INTERP_CHAN( t, dstc, outc, inc )   \

+do {                        \

+   GLfloat inf = CHAN_TO_FLOAT( inc );      \

+   GLfloat outf = CHAN_TO_FLOAT( outc );    \

+   GLfloat dstf = LINTERP( t, outf, inf );  \

+   UNCLAMPED_FLOAT_TO_CHAN( dstc, dstf );   \

+} while (0)

+

+#define INTERP_UI( t, dstui, outui, inui )  \

+   dstui = (GLuint) (GLint) LINTERP( (t), (GLfloat) (outui), (GLfloat) (inui) )

+

+#define INTERP_F( t, dstf, outf, inf )      \

+   dstf = LINTERP( t, outf, inf )

+

+#define INTERP_4F( t, dst, out, in )        \

+do {                        \

+   dst[0] = LINTERP( (t), (out)[0], (in)[0] );  \

+   dst[1] = LINTERP( (t), (out)[1], (in)[1] );  \

+   dst[2] = LINTERP( (t), (out)[2], (in)[2] );  \

+   dst[3] = LINTERP( (t), (out)[3], (in)[3] );  \

+} while (0)

+

+#define INTERP_3F( t, dst, out, in )        \

+do {                        \

+   dst[0] = LINTERP( (t), (out)[0], (in)[0] );  \

+   dst[1] = LINTERP( (t), (out)[1], (in)[1] );  \

+   dst[2] = LINTERP( (t), (out)[2], (in)[2] );  \

+} while (0)

+

+#define INTERP_4CHAN( t, dst, out, in )         \

+do {                            \

+   INTERP_CHAN( (t), (dst)[0], (out)[0], (in)[0] ); \

+   INTERP_CHAN( (t), (dst)[1], (out)[1], (in)[1] ); \

+   INTERP_CHAN( (t), (dst)[2], (out)[2], (in)[2] ); \

+   INTERP_CHAN( (t), (dst)[3], (out)[3], (in)[3] ); \

+} while (0)

+

+#define INTERP_3CHAN( t, dst, out, in )         \

+do {                            \

+   INTERP_CHAN( (t), (dst)[0], (out)[0], (in)[0] ); \

+   INTERP_CHAN( (t), (dst)[1], (out)[1], (in)[1] ); \

+   INTERP_CHAN( (t), (dst)[2], (out)[2], (in)[2] ); \

+} while (0)

+

+#define INTERP_SZ( t, vec, to, out, in, sz )                \

+do {                                    \

+   switch (sz) {                            \

+   case 4: vec[to][3] = LINTERP( (t), (vec)[out][3], (vec)[in][3] );    \

+   case 3: vec[to][2] = LINTERP( (t), (vec)[out][2], (vec)[in][2] );    \

+   case 2: vec[to][1] = LINTERP( (t), (vec)[out][1], (vec)[in][1] );    \

+   case 1: vec[to][0] = LINTERP( (t), (vec)[out][0], (vec)[in][0] );    \

+   }                                    \

+} while(0)

+

+/*@}*/

+

+

+

+/** Clamp X to [MIN,MAX] */

+#define CLAMP( X, MIN, MAX )  ( (X)<(MIN) ? (MIN) : ((X)>(MAX) ? (MAX) : (X)) )

+

+/** Minimum of two values: */

+#define MIN2( A, B )   ( (A)<(B) ? (A) : (B) )

+

+/** Maximum of two values: */

+#define MAX2( A, B )   ( (A)>(B) ? (A) : (B) )

+

+/** Dot product of two 2-element vectors */

+#define DOT2( a, b )  ( (a)[0]*(b)[0] + (a)[1]*(b)[1] )

+

+/** Dot product of two 3-element vectors */

+#define DOT3( a, b )  ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + (a)[2]*(b)[2] )

+

+/** Dot product of two 4-element vectors */

+#define DOT4( a, b )  ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + \

+            (a)[2]*(b)[2] + (a)[3]*(b)[3] )

+

+/** Dot product of two 4-element vectors */

+#define DOT4V(v,a,b,c,d) (v[0]*(a) + v[1]*(b) + v[2]*(c) + v[3]*(d))

+

+

+/** Cross product of two 3-element vectors */

+#define CROSS3(n, u, v)             \

+do {                        \

+   (n)[0] = (u)[1]*(v)[2] - (u)[2]*(v)[1];  \

+   (n)[1] = (u)[2]*(v)[0] - (u)[0]*(v)[2];  \

+   (n)[2] = (u)[0]*(v)[1] - (u)[1]*(v)[0];  \

+} while (0)

+

+

+/* Normalize a 3-element vector to unit length. */

+#define NORMALIZE_3FV( V )          \

+do {                        \

+   GLfloat len = (GLfloat) LEN_SQUARED_3FV(V);  \

+   if (len) {                   \

+      len = INV_SQRTF(len);         \

+      (V)[0] = (GLfloat) ((V)[0] * len);    \

+      (V)[1] = (GLfloat) ((V)[1] * len);    \

+      (V)[2] = (GLfloat) ((V)[2] * len);    \

+   }                        \

+} while(0)

+

+#define LEN_3FV( V ) (SQRTF((V)[0]*(V)[0]+(V)[1]*(V)[1]+(V)[2]*(V)[2]))

+#define LEN_2FV( V ) (SQRTF((V)[0]*(V)[0]+(V)[1]*(V)[1]))

+

+#define LEN_SQUARED_3FV( V ) ((V)[0]*(V)[0]+(V)[1]*(V)[1]+(V)[2]*(V)[2])

+#define LEN_SQUARED_2FV( V ) ((V)[0]*(V)[0]+(V)[1]*(V)[1])

+

+

+/** casts to silence warnings with some compilers */

+#define ENUM_TO_INT(E)     ((GLint)(E))

+#define ENUM_TO_FLOAT(E)   ((GLfloat)(GLint)(E))

+#define ENUM_TO_DOUBLE(E)  ((GLdouble)(GLint)(E))

+#define ENUM_TO_BOOLEAN(E) ((E) ? GL_TRUE : GL_FALSE)

+

+

+#endif

diff --git a/mesalib/src/mesa/main/mipmap.c b/mesalib/src/mesa/main/mipmap.c
index e594160ad..b12399ee6 100644
--- a/mesalib/src/mesa/main/mipmap.c
+++ b/mesalib/src/mesa/main/mipmap.c
@@ -1,2027 +1,2027 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file mipmap.c  mipmap generation and teximage resizing functions.
- */
-
-#include "imports.h"
-#include "formats.h"
-#include "mipmap.h"
-#include "mtypes.h"
-#include "teximage.h"
-#include "texstore.h"
-#include "image.h"
-
-
-
-static GLint
-bytes_per_pixel(GLenum datatype, GLuint comps)
-{
-   GLint b = _mesa_sizeof_packed_type(datatype);
-   assert(b >= 0);
-
-   if (_mesa_type_is_packed(datatype))
-       return b;
-   else
-       return b * comps;
-}
-
-
-/**
- * \name Support macros for do_row and do_row_3d
- *
- * The macro madness is here for two reasons.  First, it compacts the code
- * slightly.  Second, it makes it much easier to adjust the specifics of the
- * filter to tune the rounding characteristics.
- */
-/*@{*/
-#define DECLARE_ROW_POINTERS(t, e) \
-      const t(*rowA)[e] = (const t(*)[e]) srcRowA; \
-      const t(*rowB)[e] = (const t(*)[e]) srcRowB; \
-      const t(*rowC)[e] = (const t(*)[e]) srcRowC; \
-      const t(*rowD)[e] = (const t(*)[e]) srcRowD; \
-      t(*dst)[e] = (t(*)[e]) dstRow
-
-#define DECLARE_ROW_POINTERS0(t) \
-      const t *rowA = (const t *) srcRowA; \
-      const t *rowB = (const t *) srcRowB; \
-      const t *rowC = (const t *) srcRowC; \
-      const t *rowD = (const t *) srcRowD; \
-      t *dst = (t *) dstRow
-
-#define FILTER_SUM_3D(Aj, Ak, Bj, Bk, Cj, Ck, Dj, Dk) \
-   ((unsigned) Aj + (unsigned) Ak \
-    + (unsigned) Bj + (unsigned) Bk \
-    + (unsigned) Cj + (unsigned) Ck \
-    + (unsigned) Dj + (unsigned) Dk \
-    + 4) >> 3
-
-#define FILTER_3D(e) \
-   do { \
-      dst[i][e] = FILTER_SUM_3D(rowA[j][e], rowA[k][e], \
-                                rowB[j][e], rowB[k][e], \
-                                rowC[j][e], rowC[k][e], \
-                                rowD[j][e], rowD[k][e]); \
-   } while(0)
-
-#define FILTER_SUM_3D_SIGNED(Aj, Ak, Bj, Bk, Cj, Ck, Dj, Dk) \
-   (Aj + Ak \
-    + Bj + Bk \
-    + Cj + Ck \
-    + Dj + Dk \
-    + 4) / 8
-
-#define FILTER_3D_SIGNED(e) \
-   do { \
-      dst[i][e] = FILTER_SUM_3D_SIGNED(rowA[j][e], rowA[k][e], \
-                                       rowB[j][e], rowB[k][e], \
-                                       rowC[j][e], rowC[k][e], \
-                                       rowD[j][e], rowD[k][e]); \
-   } while(0)
-
-#define FILTER_F_3D(e) \
-   do { \
-      dst[i][e] = (rowA[j][e] + rowA[k][e] \
-                   + rowB[j][e] + rowB[k][e] \
-                   + rowC[j][e] + rowC[k][e] \
-                   + rowD[j][e] + rowD[k][e]) * 0.125F; \
-   } while(0)
-
-#define FILTER_HF_3D(e) \
-   do { \
-      const GLfloat aj = _mesa_half_to_float(rowA[j][e]); \
-      const GLfloat ak = _mesa_half_to_float(rowA[k][e]); \
-      const GLfloat bj = _mesa_half_to_float(rowB[j][e]); \
-      const GLfloat bk = _mesa_half_to_float(rowB[k][e]); \
-      const GLfloat cj = _mesa_half_to_float(rowC[j][e]); \
-      const GLfloat ck = _mesa_half_to_float(rowC[k][e]); \
-      const GLfloat dj = _mesa_half_to_float(rowD[j][e]); \
-      const GLfloat dk = _mesa_half_to_float(rowD[k][e]); \
-      dst[i][e] = _mesa_float_to_half((aj + ak + bj + bk + cj + ck + dj + dk) \
-                                      * 0.125F); \
-   } while(0)
-/*@}*/
-
-
-/**
- * Average together two rows of a source image to produce a single new
- * row in the dest image.  It's legal for the two source rows to point
- * to the same data.  The source width must be equal to either the
- * dest width or two times the dest width.
- * \param datatype  GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, GL_FLOAT, etc.
- * \param comps  number of components per pixel (1..4)
- */
-static void
-do_row(GLenum datatype, GLuint comps, GLint srcWidth,
-       const GLvoid *srcRowA, const GLvoid *srcRowB,
-       GLint dstWidth, GLvoid *dstRow)
-{
-   const GLuint k0 = (srcWidth == dstWidth) ? 0 : 1;
-   const GLuint colStride = (srcWidth == dstWidth) ? 1 : 2;
-
-   ASSERT(comps >= 1);
-   ASSERT(comps <= 4);
-
-   /* This assertion is no longer valid with non-power-of-2 textures
-   assert(srcWidth == dstWidth || srcWidth == 2 * dstWidth);
-   */
-
-   if (datatype == GL_UNSIGNED_BYTE && comps == 4) {
-      GLuint i, j, k;
-      const GLubyte(*rowA)[4] = (const GLubyte(*)[4]) srcRowA;
-      const GLubyte(*rowB)[4] = (const GLubyte(*)[4]) srcRowB;
-      GLubyte(*dst)[4] = (GLubyte(*)[4]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
-         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
-      }
-   }
-   else if (datatype == GL_UNSIGNED_BYTE && comps == 3) {
-      GLuint i, j, k;
-      const GLubyte(*rowA)[3] = (const GLubyte(*)[3]) srcRowA;
-      const GLubyte(*rowB)[3] = (const GLubyte(*)[3]) srcRowB;
-      GLubyte(*dst)[3] = (GLubyte(*)[3]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
-      }
-   }
-   else if (datatype == GL_UNSIGNED_BYTE && comps == 2) {
-      GLuint i, j, k;
-      const GLubyte(*rowA)[2] = (const GLubyte(*)[2]) srcRowA;
-      const GLubyte(*rowB)[2] = (const GLubyte(*)[2]) srcRowB;
-      GLubyte(*dst)[2] = (GLubyte(*)[2]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) >> 2;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) >> 2;
-      }
-   }
-   else if (datatype == GL_UNSIGNED_BYTE && comps == 1) {
-      GLuint i, j, k;
-      const GLubyte *rowA = (const GLubyte *) srcRowA;
-      const GLubyte *rowB = (const GLubyte *) srcRowB;
-      GLubyte *dst = (GLubyte *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) >> 2;
-      }
-   }
-
-   else if (datatype == GL_BYTE && comps == 4) {
-      GLuint i, j, k;
-      const GLbyte(*rowA)[4] = (const GLbyte(*)[4]) srcRowA;
-      const GLbyte(*rowB)[4] = (const GLbyte(*)[4]) srcRowB;
-      GLbyte(*dst)[4] = (GLbyte(*)[4]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
-         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
-      }
-   }
-   else if (datatype == GL_BYTE && comps == 3) {
-      GLuint i, j, k;
-      const GLbyte(*rowA)[3] = (const GLbyte(*)[3]) srcRowA;
-      const GLbyte(*rowB)[3] = (const GLbyte(*)[3]) srcRowB;
-      GLbyte(*dst)[3] = (GLbyte(*)[3]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
-      }
-   }
-   else if (datatype == GL_BYTE && comps == 2) {
-      GLuint i, j, k;
-      const GLbyte(*rowA)[2] = (const GLbyte(*)[2]) srcRowA;
-      const GLbyte(*rowB)[2] = (const GLbyte(*)[2]) srcRowB;
-      GLbyte(*dst)[2] = (GLbyte(*)[2]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-      }
-   }
-   else if (datatype == GL_BYTE && comps == 1) {
-      GLuint i, j, k;
-      const GLbyte *rowA = (const GLbyte *) srcRowA;
-      const GLbyte *rowB = (const GLbyte *) srcRowB;
-      GLbyte *dst = (GLbyte *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
-      }
-   }
-
-   else if (datatype == GL_UNSIGNED_SHORT && comps == 4) {
-      GLuint i, j, k;
-      const GLushort(*rowA)[4] = (const GLushort(*)[4]) srcRowA;
-      const GLushort(*rowB)[4] = (const GLushort(*)[4]) srcRowB;
-      GLushort(*dst)[4] = (GLushort(*)[4]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
-         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
-      }
-   }
-   else if (datatype == GL_UNSIGNED_SHORT && comps == 3) {
-      GLuint i, j, k;
-      const GLushort(*rowA)[3] = (const GLushort(*)[3]) srcRowA;
-      const GLushort(*rowB)[3] = (const GLushort(*)[3]) srcRowB;
-      GLushort(*dst)[3] = (GLushort(*)[3]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
-      }
-   }
-   else if (datatype == GL_UNSIGNED_SHORT && comps == 2) {
-      GLuint i, j, k;
-      const GLushort(*rowA)[2] = (const GLushort(*)[2]) srcRowA;
-      const GLushort(*rowB)[2] = (const GLushort(*)[2]) srcRowB;
-      GLushort(*dst)[2] = (GLushort(*)[2]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-      }
-   }
-   else if (datatype == GL_UNSIGNED_SHORT && comps == 1) {
-      GLuint i, j, k;
-      const GLushort *rowA = (const GLushort *) srcRowA;
-      const GLushort *rowB = (const GLushort *) srcRowB;
-      GLushort *dst = (GLushort *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
-      }
-   }
-
-   else if (datatype == GL_SHORT && comps == 4) {
-      GLuint i, j, k;
-      const GLshort(*rowA)[4] = (const GLshort(*)[4]) srcRowA;
-      const GLshort(*rowB)[4] = (const GLshort(*)[4]) srcRowB;
-      GLshort(*dst)[4] = (GLshort(*)[4]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
-         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;
-      }
-   }
-   else if (datatype == GL_SHORT && comps == 3) {
-      GLuint i, j, k;
-      const GLshort(*rowA)[3] = (const GLshort(*)[3]) srcRowA;
-      const GLshort(*rowB)[3] = (const GLshort(*)[3]) srcRowB;
-      GLshort(*dst)[3] = (GLshort(*)[3]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;
-      }
-   }
-   else if (datatype == GL_SHORT && comps == 2) {
-      GLuint i, j, k;
-      const GLshort(*rowA)[2] = (const GLshort(*)[2]) srcRowA;
-      const GLshort(*rowB)[2] = (const GLshort(*)[2]) srcRowB;
-      GLshort(*dst)[2] = (GLshort(*)[2]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;
-      }
-   }
-   else if (datatype == GL_SHORT && comps == 1) {
-      GLuint i, j, k;
-      const GLshort *rowA = (const GLshort *) srcRowA;
-      const GLshort *rowB = (const GLshort *) srcRowB;
-      GLshort *dst = (GLshort *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
-      }
-   }
-
-   else if (datatype == GL_FLOAT && comps == 4) {
-      GLuint i, j, k;
-      const GLfloat(*rowA)[4] = (const GLfloat(*)[4]) srcRowA;
-      const GLfloat(*rowB)[4] = (const GLfloat(*)[4]) srcRowB;
-      GLfloat(*dst)[4] = (GLfloat(*)[4]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                      rowB[j][0] + rowB[k][0]) * 0.25F;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                      rowB[j][1] + rowB[k][1]) * 0.25F;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] +
-                      rowB[j][2] + rowB[k][2]) * 0.25F;
-         dst[i][3] = (rowA[j][3] + rowA[k][3] +
-                      rowB[j][3] + rowB[k][3]) * 0.25F;
-      }
-   }
-   else if (datatype == GL_FLOAT && comps == 3) {
-      GLuint i, j, k;
-      const GLfloat(*rowA)[3] = (const GLfloat(*)[3]) srcRowA;
-      const GLfloat(*rowB)[3] = (const GLfloat(*)[3]) srcRowB;
-      GLfloat(*dst)[3] = (GLfloat(*)[3]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                      rowB[j][0] + rowB[k][0]) * 0.25F;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                      rowB[j][1] + rowB[k][1]) * 0.25F;
-         dst[i][2] = (rowA[j][2] + rowA[k][2] +
-                      rowB[j][2] + rowB[k][2]) * 0.25F;
-      }
-   }
-   else if (datatype == GL_FLOAT && comps == 2) {
-      GLuint i, j, k;
-      const GLfloat(*rowA)[2] = (const GLfloat(*)[2]) srcRowA;
-      const GLfloat(*rowB)[2] = (const GLfloat(*)[2]) srcRowB;
-      GLfloat(*dst)[2] = (GLfloat(*)[2]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i][0] = (rowA[j][0] + rowA[k][0] +
-                      rowB[j][0] + rowB[k][0]) * 0.25F;
-         dst[i][1] = (rowA[j][1] + rowA[k][1] +
-                      rowB[j][1] + rowB[k][1]) * 0.25F;
-      }
-   }
-   else if (datatype == GL_FLOAT && comps == 1) {
-      GLuint i, j, k;
-      const GLfloat *rowA = (const GLfloat *) srcRowA;
-      const GLfloat *rowB = (const GLfloat *) srcRowB;
-      GLfloat *dst = (GLfloat *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) * 0.25F;
-      }
-   }
-
-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 4) {
-      GLuint i, j, k, comp;
-      const GLhalfARB(*rowA)[4] = (const GLhalfARB(*)[4]) srcRowA;
-      const GLhalfARB(*rowB)[4] = (const GLhalfARB(*)[4]) srcRowB;
-      GLhalfARB(*dst)[4] = (GLhalfARB(*)[4]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         for (comp = 0; comp < 4; comp++) {
-            GLfloat aj, ak, bj, bk;
-            aj = _mesa_half_to_float(rowA[j][comp]);
-            ak = _mesa_half_to_float(rowA[k][comp]);
-            bj = _mesa_half_to_float(rowB[j][comp]);
-            bk = _mesa_half_to_float(rowB[k][comp]);
-            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-         }
-      }
-   }
-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 3) {
-      GLuint i, j, k, comp;
-      const GLhalfARB(*rowA)[3] = (const GLhalfARB(*)[3]) srcRowA;
-      const GLhalfARB(*rowB)[3] = (const GLhalfARB(*)[3]) srcRowB;
-      GLhalfARB(*dst)[3] = (GLhalfARB(*)[3]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         for (comp = 0; comp < 3; comp++) {
-            GLfloat aj, ak, bj, bk;
-            aj = _mesa_half_to_float(rowA[j][comp]);
-            ak = _mesa_half_to_float(rowA[k][comp]);
-            bj = _mesa_half_to_float(rowB[j][comp]);
-            bk = _mesa_half_to_float(rowB[k][comp]);
-            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-         }
-      }
-   }
-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 2) {
-      GLuint i, j, k, comp;
-      const GLhalfARB(*rowA)[2] = (const GLhalfARB(*)[2]) srcRowA;
-      const GLhalfARB(*rowB)[2] = (const GLhalfARB(*)[2]) srcRowB;
-      GLhalfARB(*dst)[2] = (GLhalfARB(*)[2]) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         for (comp = 0; comp < 2; comp++) {
-            GLfloat aj, ak, bj, bk;
-            aj = _mesa_half_to_float(rowA[j][comp]);
-            ak = _mesa_half_to_float(rowA[k][comp]);
-            bj = _mesa_half_to_float(rowB[j][comp]);
-            bk = _mesa_half_to_float(rowB[k][comp]);
-            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-         }
-      }
-   }
-   else if (datatype == GL_HALF_FLOAT_ARB && comps == 1) {
-      GLuint i, j, k;
-      const GLhalfARB *rowA = (const GLhalfARB *) srcRowA;
-      const GLhalfARB *rowB = (const GLhalfARB *) srcRowB;
-      GLhalfARB *dst = (GLhalfARB *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         GLfloat aj, ak, bj, bk;
-         aj = _mesa_half_to_float(rowA[j]);
-         ak = _mesa_half_to_float(rowA[k]);
-         bj = _mesa_half_to_float(rowB[j]);
-         bk = _mesa_half_to_float(rowB[k]);
-         dst[i] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);
-      }
-   }
-
-   else if (datatype == GL_UNSIGNED_INT && comps == 1) {
-      GLuint i, j, k;
-      const GLuint *rowA = (const GLuint *) srcRowA;
-      const GLuint *rowB = (const GLuint *) srcRowB;
-      GLuint *dst = (GLuint *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         dst[i] = (GLfloat)(rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4);
-      }
-   }
-
-   else if (datatype == GL_UNSIGNED_SHORT_5_6_5 && comps == 3) {
-      GLuint i, j, k;
-      const GLushort *rowA = (const GLushort *) srcRowA;
-      const GLushort *rowB = (const GLushort *) srcRowB;
-      GLushort *dst = (GLushort *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = rowA[j] & 0x1f;
-         const GLint rowAr1 = rowA[k] & 0x1f;
-         const GLint rowBr0 = rowB[j] & 0x1f;
-         const GLint rowBr1 = rowB[k] & 0x1f;
-         const GLint rowAg0 = (rowA[j] >> 5) & 0x3f;
-         const GLint rowAg1 = (rowA[k] >> 5) & 0x3f;
-         const GLint rowBg0 = (rowB[j] >> 5) & 0x3f;
-         const GLint rowBg1 = (rowB[k] >> 5) & 0x3f;
-         const GLint rowAb0 = (rowA[j] >> 11) & 0x1f;
-         const GLint rowAb1 = (rowA[k] >> 11) & 0x1f;
-         const GLint rowBb0 = (rowB[j] >> 11) & 0x1f;
-         const GLint rowBb1 = (rowB[k] >> 11) & 0x1f;
-         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
-         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
-         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
-         dst[i] = (blue << 11) | (green << 5) | red;
-      }
-   }
-   else if (datatype == GL_UNSIGNED_SHORT_4_4_4_4 && comps == 4) {
-      GLuint i, j, k;
-      const GLushort *rowA = (const GLushort *) srcRowA;
-      const GLushort *rowB = (const GLushort *) srcRowB;
-      GLushort *dst = (GLushort *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = rowA[j] & 0xf;
-         const GLint rowAr1 = rowA[k] & 0xf;
-         const GLint rowBr0 = rowB[j] & 0xf;
-         const GLint rowBr1 = rowB[k] & 0xf;
-         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;
-         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;
-         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;
-         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;
-         const GLint rowAb0 = (rowA[j] >> 8) & 0xf;
-         const GLint rowAb1 = (rowA[k] >> 8) & 0xf;
-         const GLint rowBb0 = (rowB[j] >> 8) & 0xf;
-         const GLint rowBb1 = (rowB[k] >> 8) & 0xf;
-         const GLint rowAa0 = (rowA[j] >> 12) & 0xf;
-         const GLint rowAa1 = (rowA[k] >> 12) & 0xf;
-         const GLint rowBa0 = (rowB[j] >> 12) & 0xf;
-         const GLint rowBa1 = (rowB[k] >> 12) & 0xf;
-         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
-         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
-         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
-         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
-         dst[i] = (alpha << 12) | (blue << 8) | (green << 4) | red;
-      }
-   }
-   else if (datatype == GL_UNSIGNED_SHORT_1_5_5_5_REV && comps == 4) {
-      GLuint i, j, k;
-      const GLushort *rowA = (const GLushort *) srcRowA;
-      const GLushort *rowB = (const GLushort *) srcRowB;
-      GLushort *dst = (GLushort *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = rowA[j] & 0x1f;
-         const GLint rowAr1 = rowA[k] & 0x1f;
-         const GLint rowBr0 = rowB[j] & 0x1f;
-         const GLint rowBr1 = rowB[k] & 0x1f;
-         const GLint rowAg0 = (rowA[j] >> 5) & 0x1f;
-         const GLint rowAg1 = (rowA[k] >> 5) & 0x1f;
-         const GLint rowBg0 = (rowB[j] >> 5) & 0x1f;
-         const GLint rowBg1 = (rowB[k] >> 5) & 0x1f;
-         const GLint rowAb0 = (rowA[j] >> 10) & 0x1f;
-         const GLint rowAb1 = (rowA[k] >> 10) & 0x1f;
-         const GLint rowBb0 = (rowB[j] >> 10) & 0x1f;
-         const GLint rowBb1 = (rowB[k] >> 10) & 0x1f;
-         const GLint rowAa0 = (rowA[j] >> 15) & 0x1;
-         const GLint rowAa1 = (rowA[k] >> 15) & 0x1;
-         const GLint rowBa0 = (rowB[j] >> 15) & 0x1;
-         const GLint rowBa1 = (rowB[k] >> 15) & 0x1;
-         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
-         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
-         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
-         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
-         dst[i] = (alpha << 15) | (blue << 10) | (green << 5) | red;
-      }
-   }
-   else if (datatype == GL_UNSIGNED_SHORT_5_5_5_1 && comps == 4) {
-      GLuint i, j, k;
-      const GLushort *rowA = (const GLushort *) srcRowA;
-      const GLushort *rowB = (const GLushort *) srcRowB;
-      GLushort *dst = (GLushort *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = (rowA[j] >> 11) & 0x1f;
-         const GLint rowAr1 = (rowA[k] >> 11) & 0x1f;
-         const GLint rowBr0 = (rowB[j] >> 11) & 0x1f;
-         const GLint rowBr1 = (rowB[k] >> 11) & 0x1f;
-         const GLint rowAg0 = (rowA[j] >> 6) & 0x1f;
-         const GLint rowAg1 = (rowA[k] >> 6) & 0x1f;
-         const GLint rowBg0 = (rowB[j] >> 6) & 0x1f;
-         const GLint rowBg1 = (rowB[k] >> 6) & 0x1f;
-         const GLint rowAb0 = (rowA[j] >> 1) & 0x1f;
-         const GLint rowAb1 = (rowA[k] >> 1) & 0x1f;
-         const GLint rowBb0 = (rowB[j] >> 1) & 0x1f;
-         const GLint rowBb1 = (rowB[k] >> 1) & 0x1f;
-         const GLint rowAa0 = (rowA[j] & 0x1);
-         const GLint rowAa1 = (rowA[k] & 0x1);
-         const GLint rowBa0 = (rowB[j] & 0x1);
-         const GLint rowBa1 = (rowB[k] & 0x1);
-         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
-         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
-         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
-         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;
-         dst[i] = (red << 11) | (green << 6) | (blue << 1) | alpha;
-      }
-   }
-
-   else if (datatype == GL_UNSIGNED_BYTE_3_3_2 && comps == 3) {
-      GLuint i, j, k;
-      const GLubyte *rowA = (const GLubyte *) srcRowA;
-      const GLubyte *rowB = (const GLubyte *) srcRowB;
-      GLubyte *dst = (GLubyte *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = rowA[j] & 0x3;
-         const GLint rowAr1 = rowA[k] & 0x3;
-         const GLint rowBr0 = rowB[j] & 0x3;
-         const GLint rowBr1 = rowB[k] & 0x3;
-         const GLint rowAg0 = (rowA[j] >> 2) & 0x7;
-         const GLint rowAg1 = (rowA[k] >> 2) & 0x7;
-         const GLint rowBg0 = (rowB[j] >> 2) & 0x7;
-         const GLint rowBg1 = (rowB[k] >> 2) & 0x7;
-         const GLint rowAb0 = (rowA[j] >> 5) & 0x7;
-         const GLint rowAb1 = (rowA[k] >> 5) & 0x7;
-         const GLint rowBb0 = (rowB[j] >> 5) & 0x7;
-         const GLint rowBb1 = (rowB[k] >> 5) & 0x7;
-         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
-         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
-         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;
-         dst[i] = (blue << 5) | (green << 2) | red;
-      }
-   }
-
-   else if (datatype == MESA_UNSIGNED_BYTE_4_4 && comps == 2) {
-      GLuint i, j, k;
-      const GLubyte *rowA = (const GLubyte *) srcRowA;
-      const GLubyte *rowB = (const GLubyte *) srcRowB;
-      GLubyte *dst = (GLubyte *) dstRow;
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = rowA[j] & 0xf;
-         const GLint rowAr1 = rowA[k] & 0xf;
-         const GLint rowBr0 = rowB[j] & 0xf;
-         const GLint rowBr1 = rowB[k] & 0xf;
-         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;
-         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;
-         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;
-         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;
-         const GLint r = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;
-         const GLint g = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;
-         dst[i] = (g << 4) | r;
-      }
-   }
-
-   else {
-      _mesa_problem(NULL, "bad format in do_row()");
-   }
-}
-
-
-/**
- * Average together four rows of a source image to produce a single new
- * row in the dest image.  It's legal for the two source rows to point
- * to the same data.  The source width must be equal to either the
- * dest width or two times the dest width.
- *
- * \param datatype  GL pixel type \c GL_UNSIGNED_BYTE, \c GL_UNSIGNED_SHORT,
- *                  \c GL_FLOAT, etc.
- * \param comps     number of components per pixel (1..4)
- * \param srcWidth  Width of a row in the source data
- * \param srcRowA   Pointer to one of the rows of source data
- * \param srcRowB   Pointer to one of the rows of source data
- * \param srcRowC   Pointer to one of the rows of source data
- * \param srcRowD   Pointer to one of the rows of source data
- * \param dstWidth  Width of a row in the destination data
- * \param srcRowA   Pointer to the row of destination data
- */
-static void
-do_row_3D(GLenum datatype, GLuint comps, GLint srcWidth,
-          const GLvoid *srcRowA, const GLvoid *srcRowB,
-          const GLvoid *srcRowC, const GLvoid *srcRowD,
-          GLint dstWidth, GLvoid *dstRow)
-{
-   const GLuint k0 = (srcWidth == dstWidth) ? 0 : 1;
-   const GLuint colStride = (srcWidth == dstWidth) ? 1 : 2;
-   GLuint i, j, k;
-
-   ASSERT(comps >= 1);
-   ASSERT(comps <= 4);
-
-   if ((datatype == GL_UNSIGNED_BYTE) && (comps == 4)) {
-      DECLARE_ROW_POINTERS(GLubyte, 4);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-         FILTER_3D(1);
-         FILTER_3D(2);
-         FILTER_3D(3);
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 3)) {
-      DECLARE_ROW_POINTERS(GLubyte, 3);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-         FILTER_3D(1);
-         FILTER_3D(2);
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 2)) {
-      DECLARE_ROW_POINTERS(GLubyte, 2);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-         FILTER_3D(1);
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 1)) {
-      DECLARE_ROW_POINTERS(GLubyte, 1);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-      }
-   }
-   else if ((datatype == GL_BYTE) && (comps == 4)) {
-      DECLARE_ROW_POINTERS(GLbyte, 4);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D_SIGNED(0);
-         FILTER_3D_SIGNED(1);
-         FILTER_3D_SIGNED(2);
-         FILTER_3D_SIGNED(3);
-      }
-   }
-   else if ((datatype == GL_BYTE) && (comps == 3)) {
-      DECLARE_ROW_POINTERS(GLbyte, 3);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D_SIGNED(0);
-         FILTER_3D_SIGNED(1);
-         FILTER_3D_SIGNED(2);
-      }
-   }
-   else if ((datatype == GL_BYTE) && (comps == 2)) {
-      DECLARE_ROW_POINTERS(GLbyte, 2);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D_SIGNED(0);
-         FILTER_3D_SIGNED(1);
-       }
-   }
-   else if ((datatype == GL_BYTE) && (comps == 1)) {
-      DECLARE_ROW_POINTERS(GLbyte, 1);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D_SIGNED(0);
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 4)) {
-      DECLARE_ROW_POINTERS(GLushort, 4);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-         FILTER_3D(1);
-         FILTER_3D(2);
-         FILTER_3D(3);
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 3)) {
-      DECLARE_ROW_POINTERS(GLushort, 3);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-         FILTER_3D(1);
-         FILTER_3D(2);
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 2)) {
-      DECLARE_ROW_POINTERS(GLushort, 2);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-         FILTER_3D(1);
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 1)) {
-      DECLARE_ROW_POINTERS(GLushort, 1);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-      }
-   }
-   else if ((datatype == GL_SHORT) && (comps == 4)) {
-      DECLARE_ROW_POINTERS(GLshort, 4);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-         FILTER_3D(1);
-         FILTER_3D(2);
-         FILTER_3D(3);
-      }
-   }
-   else if ((datatype == GL_SHORT) && (comps == 3)) {
-      DECLARE_ROW_POINTERS(GLshort, 3);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-         FILTER_3D(1);
-         FILTER_3D(2);
-      }
-   }
-   else if ((datatype == GL_SHORT) && (comps == 2)) {
-      DECLARE_ROW_POINTERS(GLshort, 2);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-         FILTER_3D(1);
-      }
-   }
-   else if ((datatype == GL_SHORT) && (comps == 1)) {
-      DECLARE_ROW_POINTERS(GLshort, 1);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_3D(0);
-      }
-   }
-   else if ((datatype == GL_FLOAT) && (comps == 4)) {
-      DECLARE_ROW_POINTERS(GLfloat, 4);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_F_3D(0);
-         FILTER_F_3D(1);
-         FILTER_F_3D(2);
-         FILTER_F_3D(3);
-      }
-   }
-   else if ((datatype == GL_FLOAT) && (comps == 3)) {
-      DECLARE_ROW_POINTERS(GLfloat, 3);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_F_3D(0);
-         FILTER_F_3D(1);
-         FILTER_F_3D(2);
-      }
-   }
-   else if ((datatype == GL_FLOAT) && (comps == 2)) {
-      DECLARE_ROW_POINTERS(GLfloat, 2);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_F_3D(0);
-         FILTER_F_3D(1);
-      }
-   }
-   else if ((datatype == GL_FLOAT) && (comps == 1)) {
-      DECLARE_ROW_POINTERS(GLfloat, 1);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_F_3D(0);
-      }
-   }
-   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 4)) {
-      DECLARE_ROW_POINTERS(GLhalfARB, 4);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_HF_3D(0);
-         FILTER_HF_3D(1);
-         FILTER_HF_3D(2);
-         FILTER_HF_3D(3);
-      }
-   }
-   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 3)) {
-      DECLARE_ROW_POINTERS(GLhalfARB, 4);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_HF_3D(0);
-         FILTER_HF_3D(1);
-         FILTER_HF_3D(2);
-      }
-   }
-   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 2)) {
-      DECLARE_ROW_POINTERS(GLhalfARB, 4);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_HF_3D(0);
-         FILTER_HF_3D(1);
-      }
-   }
-   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 1)) {
-      DECLARE_ROW_POINTERS(GLhalfARB, 4);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         FILTER_HF_3D(0);
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_INT) && (comps == 1)) {
-      const GLuint *rowA = (const GLuint *) srcRowA;
-      const GLuint *rowB = (const GLuint *) srcRowB;
-      const GLuint *rowC = (const GLuint *) srcRowC;
-      const GLuint *rowD = (const GLuint *) srcRowD;
-      GLfloat *dst = (GLfloat *) dstRow;
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const uint64_t tmp = (((uint64_t) rowA[j] + (uint64_t) rowA[k])
-                               + ((uint64_t) rowB[j] + (uint64_t) rowB[k])
-                               + ((uint64_t) rowC[j] + (uint64_t) rowC[k])
-                               + ((uint64_t) rowD[j] + (uint64_t) rowD[k]));
-         dst[i] = (GLfloat)((double) tmp * 0.125);
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_SHORT_5_6_5) && (comps == 3)) {
-      DECLARE_ROW_POINTERS0(GLushort);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = rowA[j] & 0x1f;
-         const GLint rowAr1 = rowA[k] & 0x1f;
-         const GLint rowBr0 = rowB[j] & 0x1f;
-         const GLint rowBr1 = rowB[k] & 0x1f;
-         const GLint rowCr0 = rowC[j] & 0x1f;
-         const GLint rowCr1 = rowC[k] & 0x1f;
-         const GLint rowDr0 = rowD[j] & 0x1f;
-         const GLint rowDr1 = rowD[k] & 0x1f;
-         const GLint rowAg0 = (rowA[j] >> 5) & 0x3f;
-         const GLint rowAg1 = (rowA[k] >> 5) & 0x3f;
-         const GLint rowBg0 = (rowB[j] >> 5) & 0x3f;
-         const GLint rowBg1 = (rowB[k] >> 5) & 0x3f;
-         const GLint rowCg0 = (rowC[j] >> 5) & 0x3f;
-         const GLint rowCg1 = (rowC[k] >> 5) & 0x3f;
-         const GLint rowDg0 = (rowD[j] >> 5) & 0x3f;
-         const GLint rowDg1 = (rowD[k] >> 5) & 0x3f;
-         const GLint rowAb0 = (rowA[j] >> 11) & 0x1f;
-         const GLint rowAb1 = (rowA[k] >> 11) & 0x1f;
-         const GLint rowBb0 = (rowB[j] >> 11) & 0x1f;
-         const GLint rowBb1 = (rowB[k] >> 11) & 0x1f;
-         const GLint rowCb0 = (rowC[j] >> 11) & 0x1f;
-         const GLint rowCb1 = (rowC[k] >> 11) & 0x1f;
-         const GLint rowDb0 = (rowD[j] >> 11) & 0x1f;
-         const GLint rowDb1 = (rowD[k] >> 11) & 0x1f;
-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
-                                       rowCr0, rowCr1, rowDr0, rowDr1);
-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
-                                       rowCg0, rowCg1, rowDg0, rowDg1);
-         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,
-                                       rowCb0, rowCb1, rowDb0, rowDb1);
-         dst[i] = (b << 11) | (g << 5) | r;
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_SHORT_4_4_4_4) && (comps == 4)) {
-      DECLARE_ROW_POINTERS0(GLushort);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = rowA[j] & 0xf;
-         const GLint rowAr1 = rowA[k] & 0xf;
-         const GLint rowBr0 = rowB[j] & 0xf;
-         const GLint rowBr1 = rowB[k] & 0xf;
-         const GLint rowCr0 = rowC[j] & 0xf;
-         const GLint rowCr1 = rowC[k] & 0xf;
-         const GLint rowDr0 = rowD[j] & 0xf;
-         const GLint rowDr1 = rowD[k] & 0xf;
-         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;
-         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;
-         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;
-         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;
-         const GLint rowCg0 = (rowC[j] >> 4) & 0xf;
-         const GLint rowCg1 = (rowC[k] >> 4) & 0xf;
-         const GLint rowDg0 = (rowD[j] >> 4) & 0xf;
-         const GLint rowDg1 = (rowD[k] >> 4) & 0xf;
-         const GLint rowAb0 = (rowA[j] >> 8) & 0xf;
-         const GLint rowAb1 = (rowA[k] >> 8) & 0xf;
-         const GLint rowBb0 = (rowB[j] >> 8) & 0xf;
-         const GLint rowBb1 = (rowB[k] >> 8) & 0xf;
-         const GLint rowCb0 = (rowC[j] >> 8) & 0xf;
-         const GLint rowCb1 = (rowC[k] >> 8) & 0xf;
-         const GLint rowDb0 = (rowD[j] >> 8) & 0xf;
-         const GLint rowDb1 = (rowD[k] >> 8) & 0xf;
-         const GLint rowAa0 = (rowA[j] >> 12) & 0xf;
-         const GLint rowAa1 = (rowA[k] >> 12) & 0xf;
-         const GLint rowBa0 = (rowB[j] >> 12) & 0xf;
-         const GLint rowBa1 = (rowB[k] >> 12) & 0xf;
-         const GLint rowCa0 = (rowC[j] >> 12) & 0xf;
-         const GLint rowCa1 = (rowC[k] >> 12) & 0xf;
-         const GLint rowDa0 = (rowD[j] >> 12) & 0xf;
-         const GLint rowDa1 = (rowD[k] >> 12) & 0xf;
-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
-                                       rowCr0, rowCr1, rowDr0, rowDr1);
-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
-                                       rowCg0, rowCg1, rowDg0, rowDg1);
-         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,
-                                       rowCb0, rowCb1, rowDb0, rowDb1);
-         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,
-                                       rowCa0, rowCa1, rowDa0, rowDa1);
-
-         dst[i] = (a << 12) | (b << 8) | (g << 4) | r;
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_SHORT_1_5_5_5_REV) && (comps == 4)) {
-      DECLARE_ROW_POINTERS0(GLushort);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = rowA[j] & 0x1f;
-         const GLint rowAr1 = rowA[k] & 0x1f;
-         const GLint rowBr0 = rowB[j] & 0x1f;
-         const GLint rowBr1 = rowB[k] & 0x1f;
-         const GLint rowCr0 = rowC[j] & 0x1f;
-         const GLint rowCr1 = rowC[k] & 0x1f;
-         const GLint rowDr0 = rowD[j] & 0x1f;
-         const GLint rowDr1 = rowD[k] & 0x1f;
-         const GLint rowAg0 = (rowA[j] >> 5) & 0x1f;
-         const GLint rowAg1 = (rowA[k] >> 5) & 0x1f;
-         const GLint rowBg0 = (rowB[j] >> 5) & 0x1f;
-         const GLint rowBg1 = (rowB[k] >> 5) & 0x1f;
-         const GLint rowCg0 = (rowC[j] >> 5) & 0x1f;
-         const GLint rowCg1 = (rowC[k] >> 5) & 0x1f;
-         const GLint rowDg0 = (rowD[j] >> 5) & 0x1f;
-         const GLint rowDg1 = (rowD[k] >> 5) & 0x1f;
-         const GLint rowAb0 = (rowA[j] >> 10) & 0x1f;
-         const GLint rowAb1 = (rowA[k] >> 10) & 0x1f;
-         const GLint rowBb0 = (rowB[j] >> 10) & 0x1f;
-         const GLint rowBb1 = (rowB[k] >> 10) & 0x1f;
-         const GLint rowCb0 = (rowC[j] >> 10) & 0x1f;
-         const GLint rowCb1 = (rowC[k] >> 10) & 0x1f;
-         const GLint rowDb0 = (rowD[j] >> 10) & 0x1f;
-         const GLint rowDb1 = (rowD[k] >> 10) & 0x1f;
-         const GLint rowAa0 = (rowA[j] >> 15) & 0x1;
-         const GLint rowAa1 = (rowA[k] >> 15) & 0x1;
-         const GLint rowBa0 = (rowB[j] >> 15) & 0x1;
-         const GLint rowBa1 = (rowB[k] >> 15) & 0x1;
-         const GLint rowCa0 = (rowC[j] >> 15) & 0x1;
-         const GLint rowCa1 = (rowC[k] >> 15) & 0x1;
-         const GLint rowDa0 = (rowD[j] >> 15) & 0x1;
-         const GLint rowDa1 = (rowD[k] >> 15) & 0x1;
-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
-                                       rowCr0, rowCr1, rowDr0, rowDr1);
-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
-                                       rowCg0, rowCg1, rowDg0, rowDg1);
-         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,
-                                       rowCb0, rowCb1, rowDb0, rowDb1);
-         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,
-                                       rowCa0, rowCa1, rowDa0, rowDa1);
-
-         dst[i] = (a << 15) | (b << 10) | (g << 5) | r;
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_SHORT_5_5_5_1) && (comps == 4)) {
-      DECLARE_ROW_POINTERS0(GLushort);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = (rowA[j] >> 11) & 0x1f;
-         const GLint rowAr1 = (rowA[k] >> 11) & 0x1f;
-         const GLint rowBr0 = (rowB[j] >> 11) & 0x1f;
-         const GLint rowBr1 = (rowB[k] >> 11) & 0x1f;
-         const GLint rowCr0 = (rowC[j] >> 11) & 0x1f;
-         const GLint rowCr1 = (rowC[k] >> 11) & 0x1f;
-         const GLint rowDr0 = (rowD[j] >> 11) & 0x1f;
-         const GLint rowDr1 = (rowD[k] >> 11) & 0x1f;
-         const GLint rowAg0 = (rowA[j] >> 6) & 0x1f;
-         const GLint rowAg1 = (rowA[k] >> 6) & 0x1f;
-         const GLint rowBg0 = (rowB[j] >> 6) & 0x1f;
-         const GLint rowBg1 = (rowB[k] >> 6) & 0x1f;
-         const GLint rowCg0 = (rowC[j] >> 6) & 0x1f;
-         const GLint rowCg1 = (rowC[k] >> 6) & 0x1f;
-         const GLint rowDg0 = (rowD[j] >> 6) & 0x1f;
-         const GLint rowDg1 = (rowD[k] >> 6) & 0x1f;
-         const GLint rowAb0 = (rowA[j] >> 1) & 0x1f;
-         const GLint rowAb1 = (rowA[k] >> 1) & 0x1f;
-         const GLint rowBb0 = (rowB[j] >> 1) & 0x1f;
-         const GLint rowBb1 = (rowB[k] >> 1) & 0x1f;
-         const GLint rowCb0 = (rowC[j] >> 1) & 0x1f;
-         const GLint rowCb1 = (rowC[k] >> 1) & 0x1f;
-         const GLint rowDb0 = (rowD[j] >> 1) & 0x1f;
-         const GLint rowDb1 = (rowD[k] >> 1) & 0x1f;
-         const GLint rowAa0 = (rowA[j] & 0x1);
-         const GLint rowAa1 = (rowA[k] & 0x1);
-         const GLint rowBa0 = (rowB[j] & 0x1);
-         const GLint rowBa1 = (rowB[k] & 0x1);
-         const GLint rowCa0 = (rowC[j] & 0x1);
-         const GLint rowCa1 = (rowC[k] & 0x1);
-         const GLint rowDa0 = (rowD[j] & 0x1);
-         const GLint rowDa1 = (rowD[k] & 0x1);
-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
-                                       rowCr0, rowCr1, rowDr0, rowDr1);
-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
-                                       rowCg0, rowCg1, rowDg0, rowDg1);
-         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,
-                                       rowCb0, rowCb1, rowDb0, rowDb1);
-         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,
-                                       rowCa0, rowCa1, rowDa0, rowDa1);
-
-         dst[i] = (r << 11) | (g << 6) | (b << 1) | a;
-      }
-   }
-   else if ((datatype == GL_UNSIGNED_BYTE_3_3_2) && (comps == 3)) {
-      DECLARE_ROW_POINTERS0(GLubyte);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = rowA[j] & 0x3;
-         const GLint rowAr1 = rowA[k] & 0x3;
-         const GLint rowBr0 = rowB[j] & 0x3;
-         const GLint rowBr1 = rowB[k] & 0x3;
-         const GLint rowCr0 = rowC[j] & 0x3;
-         const GLint rowCr1 = rowC[k] & 0x3;
-         const GLint rowDr0 = rowD[j] & 0x3;
-         const GLint rowDr1 = rowD[k] & 0x3;
-         const GLint rowAg0 = (rowA[j] >> 2) & 0x7;
-         const GLint rowAg1 = (rowA[k] >> 2) & 0x7;
-         const GLint rowBg0 = (rowB[j] >> 2) & 0x7;
-         const GLint rowBg1 = (rowB[k] >> 2) & 0x7;
-         const GLint rowCg0 = (rowC[j] >> 2) & 0x7;
-         const GLint rowCg1 = (rowC[k] >> 2) & 0x7;
-         const GLint rowDg0 = (rowD[j] >> 2) & 0x7;
-         const GLint rowDg1 = (rowD[k] >> 2) & 0x7;
-         const GLint rowAb0 = (rowA[j] >> 5) & 0x7;
-         const GLint rowAb1 = (rowA[k] >> 5) & 0x7;
-         const GLint rowBb0 = (rowB[j] >> 5) & 0x7;
-         const GLint rowBb1 = (rowB[k] >> 5) & 0x7;
-         const GLint rowCb0 = (rowC[j] >> 5) & 0x7;
-         const GLint rowCb1 = (rowC[k] >> 5) & 0x7;
-         const GLint rowDb0 = (rowD[j] >> 5) & 0x7;
-         const GLint rowDb1 = (rowD[k] >> 5) & 0x7;
-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
-                                       rowCr0, rowCr1, rowDr0, rowDr1);
-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
-                                       rowCg0, rowCg1, rowDg0, rowDg1);
-         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,
-                                       rowCb0, rowCb1, rowDb0, rowDb1);
-         dst[i] = (b << 5) | (g << 2) | r;
-      }
-   }
-   else if (datatype == MESA_UNSIGNED_BYTE_4_4 && comps == 2) {
-      DECLARE_ROW_POINTERS0(GLubyte);
-
-      for (i = j = 0, k = k0; i < (GLuint) dstWidth;
-           i++, j += colStride, k += colStride) {
-         const GLint rowAr0 = rowA[j] & 0xf;
-         const GLint rowAr1 = rowA[k] & 0xf;
-         const GLint rowBr0 = rowB[j] & 0xf;
-         const GLint rowBr1 = rowB[k] & 0xf;
-         const GLint rowCr0 = rowC[j] & 0xf;
-         const GLint rowCr1 = rowC[k] & 0xf;
-         const GLint rowDr0 = rowD[j] & 0xf;
-         const GLint rowDr1 = rowD[k] & 0xf;
-         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;
-         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;
-         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;
-         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;
-         const GLint rowCg0 = (rowC[j] >> 4) & 0xf;
-         const GLint rowCg1 = (rowC[k] >> 4) & 0xf;
-         const GLint rowDg0 = (rowD[j] >> 4) & 0xf;
-         const GLint rowDg1 = (rowD[k] >> 4) & 0xf;
-         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,
-                                       rowCr0, rowCr1, rowDr0, rowDr1);
-         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,
-                                       rowCg0, rowCg1, rowDg0, rowDg1);
-         dst[i] = (g << 4) | r;
-      }
-   }
-   else {
-      _mesa_problem(NULL, "bad format in do_row()");
-   }
-}
-
-
-/*
- * These functions generate a 1/2-size mipmap image from a source image.
- * Texture borders are handled by copying or averaging the source image's
- * border texels, depending on the scale-down factor.
- */
-
-static void
-make_1d_mipmap(GLenum datatype, GLuint comps, GLint border,
-               GLint srcWidth, const GLubyte *srcPtr,
-               GLint dstWidth, GLubyte *dstPtr)
-{
-   const GLint bpt = bytes_per_pixel(datatype, comps);
-   const GLubyte *src;
-   GLubyte *dst;
-
-   /* skip the border pixel, if any */
-   src = srcPtr + border * bpt;
-   dst = dstPtr + border * bpt;
-
-   /* we just duplicate the input row, kind of hack, saves code */
-   do_row(datatype, comps, srcWidth - 2 * border, src, src,
-          dstWidth - 2 * border, dst);
-
-   if (border) {
-      /* copy left-most pixel from source */
-      assert(dstPtr);
-      assert(srcPtr);
-      memcpy(dstPtr, srcPtr, bpt);
-      /* copy right-most pixel from source */
-      memcpy(dstPtr + (dstWidth - 1) * bpt,
-             srcPtr + (srcWidth - 1) * bpt,
-             bpt);
-   }
-}
-
-
-static void
-make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
-               GLint srcWidth, GLint srcHeight,
-	       const GLubyte *srcPtr, GLint srcRowStride,
-               GLint dstWidth, GLint dstHeight,
-	       GLubyte *dstPtr, GLint dstRowStride)
-{
-   const GLint bpt = bytes_per_pixel(datatype, comps);
-   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
-   const GLint dstWidthNB = dstWidth - 2 * border;
-   const GLint dstHeightNB = dstHeight - 2 * border;
-   const GLint srcRowBytes = bpt * srcRowStride;
-   const GLint dstRowBytes = bpt * dstRowStride;
-   const GLubyte *srcA, *srcB;
-   GLubyte *dst;
-   GLint row, srcRowStep;
-
-   /* Compute src and dst pointers, skipping any border */
-   srcA = srcPtr + border * ((srcWidth + 1) * bpt);
-   if (srcHeight > 1 && srcHeight > dstHeight) {
-      /* sample from two source rows */
-      srcB = srcA + srcRowBytes;
-      srcRowStep = 2;
-   }
-   else {
-      /* sample from one source row */
-      srcB = srcA;
-      srcRowStep = 1;
-   }
-
-   dst = dstPtr + border * ((dstWidth + 1) * bpt);
-
-   for (row = 0; row < dstHeightNB; row++) {
-      do_row(datatype, comps, srcWidthNB, srcA, srcB,
-             dstWidthNB, dst);
-      srcA += srcRowStep * srcRowBytes;
-      srcB += srcRowStep * srcRowBytes;
-      dst += dstRowBytes;
-   }
-
-   /* This is ugly but probably won't be used much */
-   if (border > 0) {
-      /* fill in dest border */
-      /* lower-left border pixel */
-      assert(dstPtr);
-      assert(srcPtr);
-      memcpy(dstPtr, srcPtr, bpt);
-      /* lower-right border pixel */
-      memcpy(dstPtr + (dstWidth - 1) * bpt,
-             srcPtr + (srcWidth - 1) * bpt, bpt);
-      /* upper-left border pixel */
-      memcpy(dstPtr + dstWidth * (dstHeight - 1) * bpt,
-             srcPtr + srcWidth * (srcHeight - 1) * bpt, bpt);
-      /* upper-right border pixel */
-      memcpy(dstPtr + (dstWidth * dstHeight - 1) * bpt,
-             srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);
-      /* lower border */
-      do_row(datatype, comps, srcWidthNB,
-             srcPtr + bpt,
-             srcPtr + bpt,
-             dstWidthNB, dstPtr + bpt);
-      /* upper border */
-      do_row(datatype, comps, srcWidthNB,
-             srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
-             srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
-             dstWidthNB,
-             dstPtr + (dstWidth * (dstHeight - 1) + 1) * bpt);
-      /* left and right borders */
-      if (srcHeight == dstHeight) {
-         /* copy border pixel from src to dst */
-         for (row = 1; row < srcHeight; row++) {
-            memcpy(dstPtr + dstWidth * row * bpt,
-                   srcPtr + srcWidth * row * bpt, bpt);
-            memcpy(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,
-                   srcPtr + (srcWidth * row + srcWidth - 1) * bpt, bpt);
-         }
-      }
-      else {
-         /* average two src pixels each dest pixel */
-         for (row = 0; row < dstHeightNB; row += 2) {
-            do_row(datatype, comps, 1,
-                   srcPtr + (srcWidth * (row * 2 + 1)) * bpt,
-                   srcPtr + (srcWidth * (row * 2 + 2)) * bpt,
-                   1, dstPtr + (dstWidth * row + 1) * bpt);
-            do_row(datatype, comps, 1,
-                   srcPtr + (srcWidth * (row * 2 + 1) + srcWidth - 1) * bpt,
-                   srcPtr + (srcWidth * (row * 2 + 2) + srcWidth - 1) * bpt,
-                   1, dstPtr + (dstWidth * row + 1 + dstWidth - 1) * bpt);
-         }
-      }
-   }
-}
-
-
-static void
-make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
-               GLint srcWidth, GLint srcHeight, GLint srcDepth,
-               const GLubyte *srcPtr, GLint srcRowStride,
-               GLint dstWidth, GLint dstHeight, GLint dstDepth,
-               GLubyte *dstPtr, GLint dstRowStride)
-{
-   const GLint bpt = bytes_per_pixel(datatype, comps);
-   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
-   const GLint srcDepthNB = srcDepth - 2 * border;
-   const GLint dstWidthNB = dstWidth - 2 * border;
-   const GLint dstHeightNB = dstHeight - 2 * border;
-   const GLint dstDepthNB = dstDepth - 2 * border;
-   GLint img, row;
-   GLint bytesPerSrcImage, bytesPerDstImage;
-   GLint bytesPerSrcRow, bytesPerDstRow;
-   GLint srcImageOffset, srcRowOffset;
-
-   (void) srcDepthNB; /* silence warnings */
-
-
-   bytesPerSrcImage = srcWidth * srcHeight * bpt;
-   bytesPerDstImage = dstWidth * dstHeight * bpt;
-
-   bytesPerSrcRow = srcWidth * bpt;
-   bytesPerDstRow = dstWidth * bpt;
-
-   /* Offset between adjacent src images to be averaged together */
-   srcImageOffset = (srcDepth == dstDepth) ? 0 : bytesPerSrcImage;
-
-   /* Offset between adjacent src rows to be averaged together */
-   srcRowOffset = (srcHeight == dstHeight) ? 0 : srcWidth * bpt;
-
-   /*
-    * Need to average together up to 8 src pixels for each dest pixel.
-    * Break that down into 3 operations:
-    *   1. take two rows from source image and average them together.
-    *   2. take two rows from next source image and average them together.
-    *   3. take the two averaged rows and average them for the final dst row.
-    */
-
-   /*
-   printf("mip3d %d x %d x %d  ->  %d x %d x %d\n",
-          srcWidth, srcHeight, srcDepth, dstWidth, dstHeight, dstDepth);
-   */
-
-   for (img = 0; img < dstDepthNB; img++) {
-      /* first source image pointer, skipping border */
-      const GLubyte *imgSrcA = srcPtr
-         + (bytesPerSrcImage + bytesPerSrcRow + border) * bpt * border
-         + img * (bytesPerSrcImage + srcImageOffset);
-      /* second source image pointer, skipping border */
-      const GLubyte *imgSrcB = imgSrcA + srcImageOffset;
-      /* address of the dest image, skipping border */
-      GLubyte *imgDst = dstPtr
-         + (bytesPerDstImage + bytesPerDstRow + border) * bpt * border
-         + img * bytesPerDstImage;
-
-      /* setup the four source row pointers and the dest row pointer */
-      const GLubyte *srcImgARowA = imgSrcA;
-      const GLubyte *srcImgARowB = imgSrcA + srcRowOffset;
-      const GLubyte *srcImgBRowA = imgSrcB;
-      const GLubyte *srcImgBRowB = imgSrcB + srcRowOffset;
-      GLubyte *dstImgRow = imgDst;
-
-      for (row = 0; row < dstHeightNB; row++) {
-         do_row_3D(datatype, comps, srcWidthNB, 
-                   srcImgARowA, srcImgARowB,
-                   srcImgBRowA, srcImgBRowB,
-                   dstWidthNB, dstImgRow);
-
-         /* advance to next rows */
-         srcImgARowA += bytesPerSrcRow + srcRowOffset;
-         srcImgARowB += bytesPerSrcRow + srcRowOffset;
-         srcImgBRowA += bytesPerSrcRow + srcRowOffset;
-         srcImgBRowB += bytesPerSrcRow + srcRowOffset;
-         dstImgRow += bytesPerDstRow;
-      }
-   }
-
-
-   /* Luckily we can leverage the make_2d_mipmap() function here! */
-   if (border > 0) {
-      /* do front border image */
-      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight, srcPtr, srcRowStride,
-                     dstWidth, dstHeight, dstPtr, dstRowStride);
-      /* do back border image */
-      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight,
-                     srcPtr + bytesPerSrcImage * (srcDepth - 1), srcRowStride,
-                     dstWidth, dstHeight,
-                     dstPtr + bytesPerDstImage * (dstDepth - 1), dstRowStride);
-      /* do four remaining border edges that span the image slices */
-      if (srcDepth == dstDepth) {
-         /* just copy border pixels from src to dst */
-         for (img = 0; img < dstDepthNB; img++) {
-            const GLubyte *src;
-            GLubyte *dst;
-
-            /* do border along [img][row=0][col=0] */
-            src = srcPtr + (img + 1) * bytesPerSrcImage;
-            dst = dstPtr + (img + 1) * bytesPerDstImage;
-            memcpy(dst, src, bpt);
-
-            /* do border along [img][row=dstHeight-1][col=0] */
-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
-                         + (srcHeight - 1) * bytesPerSrcRow;
-            dst = dstPtr + (img + 1) * bytesPerDstImage
-                         + (dstHeight - 1) * bytesPerDstRow;
-            memcpy(dst, src, bpt);
-
-            /* do border along [img][row=0][col=dstWidth-1] */
-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
-                         + (srcWidth - 1) * bpt;
-            dst = dstPtr + (img + 1) * bytesPerDstImage
-                         + (dstWidth - 1) * bpt;
-            memcpy(dst, src, bpt);
-
-            /* do border along [img][row=dstHeight-1][col=dstWidth-1] */
-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
-                         + (bytesPerSrcImage - bpt);
-            dst = dstPtr + (img + 1) * bytesPerDstImage
-                         + (bytesPerDstImage - bpt);
-            memcpy(dst, src, bpt);
-         }
-      }
-      else {
-         /* average border pixels from adjacent src image pairs */
-         ASSERT(srcDepthNB == 2 * dstDepthNB);
-         for (img = 0; img < dstDepthNB; img++) {
-            const GLubyte *src;
-            GLubyte *dst;
-
-            /* do border along [img][row=0][col=0] */
-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage;
-            dst = dstPtr + (img + 1) * bytesPerDstImage;
-            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
-
-            /* do border along [img][row=dstHeight-1][col=0] */
-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
-                         + (srcHeight - 1) * bytesPerSrcRow;
-            dst = dstPtr + (img + 1) * bytesPerDstImage
-                         + (dstHeight - 1) * bytesPerDstRow;
-            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
-
-            /* do border along [img][row=0][col=dstWidth-1] */
-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
-                         + (srcWidth - 1) * bpt;
-            dst = dstPtr + (img + 1) * bytesPerDstImage
-                         + (dstWidth - 1) * bpt;
-            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
-
-            /* do border along [img][row=dstHeight-1][col=dstWidth-1] */
-            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
-                         + (bytesPerSrcImage - bpt);
-            dst = dstPtr + (img + 1) * bytesPerDstImage
-                         + (bytesPerDstImage - bpt);
-            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);
-         }
-      }
-   }
-}
-
-
-static void
-make_1d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
-                     GLint srcWidth, const GLubyte *srcPtr, GLuint srcRowStride,
-                     GLint dstWidth, GLint dstHeight,
-		     GLubyte *dstPtr, GLuint dstRowStride )
-{
-   const GLint bpt = bytes_per_pixel(datatype, comps);
-   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
-   const GLint dstWidthNB = dstWidth - 2 * border;
-   const GLint dstHeightNB = dstHeight - 2 * border;
-   const GLint srcRowBytes = bpt * srcRowStride;
-   const GLint dstRowBytes = bpt * dstRowStride;
-   const GLubyte *src;
-   GLubyte *dst;
-   GLint row;
-
-   /* Compute src and dst pointers, skipping any border */
-   src = srcPtr + border * ((srcWidth + 1) * bpt);
-   dst = dstPtr + border * ((dstWidth + 1) * bpt);
-
-   for (row = 0; row < dstHeightNB; row++) {
-      do_row(datatype, comps, srcWidthNB, src, src,
-             dstWidthNB, dst);
-      src += srcRowBytes;
-      dst += dstRowBytes;
-   }
-
-   if (border) {
-      /* copy left-most pixel from source */
-      assert(dstPtr);
-      assert(srcPtr);
-      memcpy(dstPtr, srcPtr, bpt);
-      /* copy right-most pixel from source */
-      memcpy(dstPtr + (dstWidth - 1) * bpt,
-             srcPtr + (srcWidth - 1) * bpt,
-             bpt);
-   }
-}
-
-
-/**
- * \bug
- * There is quite a bit of refactoring that could be done with this function
- * and \c make_2d_mipmap.
- */
-static void
-make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
-                     GLint srcWidth, GLint srcHeight,
-		     const GLubyte *srcPtr, GLint srcRowStride,
-                     GLint dstWidth, GLint dstHeight, GLint dstDepth,
-                     GLubyte *dstPtr, GLint dstRowStride)
-{
-   const GLint bpt = bytes_per_pixel(datatype, comps);
-   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
-   const GLint dstWidthNB = dstWidth - 2 * border;
-   const GLint dstHeightNB = dstHeight - 2 * border;
-   const GLint dstDepthNB = dstDepth - 2 * border;
-   const GLint srcRowBytes = bpt * srcRowStride;
-   const GLint dstRowBytes = bpt * dstRowStride;
-   const GLubyte *srcA, *srcB;
-   GLubyte *dst;
-   GLint layer;
-   GLint row;
-
-   /* Compute src and dst pointers, skipping any border */
-   srcA = srcPtr + border * ((srcWidth + 1) * bpt);
-   if (srcHeight > 1) 
-      srcB = srcA + srcRowBytes;
-   else
-      srcB = srcA;
-   dst = dstPtr + border * ((dstWidth + 1) * bpt);
-
-   for (layer = 0; layer < dstDepthNB; layer++) {
-      for (row = 0; row < dstHeightNB; row++) {
-         do_row(datatype, comps, srcWidthNB, srcA, srcB,
-                dstWidthNB, dst);
-         srcA += 2 * srcRowBytes;
-         srcB += 2 * srcRowBytes;
-         dst += dstRowBytes;
-      }
-
-      /* This is ugly but probably won't be used much */
-      if (border > 0) {
-         /* fill in dest border */
-         /* lower-left border pixel */
-         assert(dstPtr);
-         assert(srcPtr);
-         memcpy(dstPtr, srcPtr, bpt);
-         /* lower-right border pixel */
-         memcpy(dstPtr + (dstWidth - 1) * bpt,
-                srcPtr + (srcWidth - 1) * bpt, bpt);
-         /* upper-left border pixel */
-         memcpy(dstPtr + dstWidth * (dstHeight - 1) * bpt,
-                srcPtr + srcWidth * (srcHeight - 1) * bpt, bpt);
-         /* upper-right border pixel */
-         memcpy(dstPtr + (dstWidth * dstHeight - 1) * bpt,
-                srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);
-         /* lower border */
-         do_row(datatype, comps, srcWidthNB,
-                srcPtr + bpt,
-                srcPtr + bpt,
-                dstWidthNB, dstPtr + bpt);
-         /* upper border */
-         do_row(datatype, comps, srcWidthNB,
-                srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
-                srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
-                dstWidthNB,
-                dstPtr + (dstWidth * (dstHeight - 1) + 1) * bpt);
-         /* left and right borders */
-         if (srcHeight == dstHeight) {
-            /* copy border pixel from src to dst */
-            for (row = 1; row < srcHeight; row++) {
-               memcpy(dstPtr + dstWidth * row * bpt,
-                      srcPtr + srcWidth * row * bpt, bpt);
-               memcpy(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,
-                      srcPtr + (srcWidth * row + srcWidth - 1) * bpt, bpt);
-            }
-         }
-         else {
-            /* average two src pixels each dest pixel */
-            for (row = 0; row < dstHeightNB; row += 2) {
-               do_row(datatype, comps, 1,
-                      srcPtr + (srcWidth * (row * 2 + 1)) * bpt,
-                      srcPtr + (srcWidth * (row * 2 + 2)) * bpt,
-                      1, dstPtr + (dstWidth * row + 1) * bpt);
-               do_row(datatype, comps, 1,
-                      srcPtr + (srcWidth * (row * 2 + 1) + srcWidth - 1) * bpt,
-                      srcPtr + (srcWidth * (row * 2 + 2) + srcWidth - 1) * bpt,
-                      1, dstPtr + (dstWidth * row + 1 + dstWidth - 1) * bpt);
-            }
-         }
-      }
-   }
-}
-
-
-/**
- * Down-sample a texture image to produce the next lower mipmap level.
- * \param comps  components per texel (1, 2, 3 or 4)
- * \param srcRowStride  stride between source rows, in texels
- * \param dstRowStride  stride between destination rows, in texels
- */
-void
-_mesa_generate_mipmap_level(GLenum target,
-                            GLenum datatype, GLuint comps,
-                            GLint border,
-                            GLint srcWidth, GLint srcHeight, GLint srcDepth,
-                            const GLubyte *srcData,
-                            GLint srcRowStride,
-                            GLint dstWidth, GLint dstHeight, GLint dstDepth,
-                            GLubyte *dstData,
-                            GLint dstRowStride)
-{
-   /*
-    * We use simple 2x2 averaging to compute the next mipmap level.
-    */
-   switch (target) {
-   case GL_TEXTURE_1D:
-      make_1d_mipmap(datatype, comps, border,
-                     srcWidth, srcData,
-                     dstWidth, dstData);
-      break;
-   case GL_TEXTURE_2D:
-   case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
-   case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
-   case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
-   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
-   case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
-   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
-      make_2d_mipmap(datatype, comps, border,
-                     srcWidth, srcHeight, srcData, srcRowStride,
-                     dstWidth, dstHeight, dstData, dstRowStride);
-      break;
-   case GL_TEXTURE_3D:
-      make_3d_mipmap(datatype, comps, border,
-                     srcWidth, srcHeight, srcDepth,
-                     srcData, srcRowStride,
-                     dstWidth, dstHeight, dstDepth,
-                     dstData, dstRowStride);
-      break;
-   case GL_TEXTURE_1D_ARRAY_EXT:
-      make_1d_stack_mipmap(datatype, comps, border,
-                           srcWidth, srcData, srcRowStride,
-                           dstWidth, dstHeight,
-                           dstData, dstRowStride);
-      break;
-   case GL_TEXTURE_2D_ARRAY_EXT:
-      make_2d_stack_mipmap(datatype, comps, border,
-                           srcWidth, srcHeight,
-                           srcData, srcRowStride,
-                           dstWidth, dstHeight,
-                           dstDepth, dstData, dstRowStride);
-      break;
-   case GL_TEXTURE_RECTANGLE_NV:
-      /* no mipmaps, do nothing */
-      break;
-   default:
-      _mesa_problem(NULL, "bad dimensions in _mesa_generate_mipmaps");
-      return;
-   }
-}
-
-
-/**
- * compute next (level+1) image size
- * \return GL_FALSE if no smaller size can be generated (eg. src is 1x1x1 size)
- */
-static GLboolean
-next_mipmap_level_size(GLenum target, GLint border,
-                       GLint srcWidth, GLint srcHeight, GLint srcDepth,
-                       GLint *dstWidth, GLint *dstHeight, GLint *dstDepth)
-{
-   if (srcWidth - 2 * border > 1) {
-      *dstWidth = (srcWidth - 2 * border) / 2 + 2 * border;
-   }
-   else {
-      *dstWidth = srcWidth; /* can't go smaller */
-   }
-
-   if ((srcHeight - 2 * border > 1) && 
-       (target != GL_TEXTURE_1D_ARRAY_EXT)) {
-      *dstHeight = (srcHeight - 2 * border) / 2 + 2 * border;
-   }
-   else {
-      *dstHeight = srcHeight; /* can't go smaller */
-   }
-
-   if ((srcDepth - 2 * border > 1) &&
-       (target != GL_TEXTURE_2D_ARRAY_EXT)) {
-      *dstDepth = (srcDepth - 2 * border) / 2 + 2 * border;
-   }
-   else {
-      *dstDepth = srcDepth; /* can't go smaller */
-   }
-
-   if (*dstWidth == srcWidth &&
-       *dstHeight == srcHeight &&
-       *dstDepth == srcDepth) {
-      return GL_FALSE;
-   }
-   else {
-      return GL_TRUE;
-   }
-}
-
-
-
-
-/**
- * Automatic mipmap generation.
- * This is the fallback/default function for ctx->Driver.GenerateMipmap().
- * Generate a complete set of mipmaps from texObj's BaseLevel image.
- * Stop at texObj's MaxLevel or when we get to the 1x1 texture.
- * For cube maps, target will be one of
- * GL_TEXTURE_CUBE_MAP_POSITIVE/NEGATIVE_X/Y/Z; never GL_TEXTURE_CUBE_MAP.
- */
-void
-_mesa_generate_mipmap(struct gl_context *ctx, GLenum target,
-                      struct gl_texture_object *texObj)
-{
-   const struct gl_texture_image *srcImage;
-   gl_format convertFormat;
-   const GLubyte *srcData = NULL;
-   GLubyte *dstData = NULL;
-   GLint level, maxLevels;
-   GLenum datatype;
-   GLuint comps;
-
-   ASSERT(texObj);
-   srcImage = _mesa_select_tex_image(ctx, texObj, target, texObj->BaseLevel);
-   ASSERT(srcImage);
-
-   maxLevels = _mesa_max_texture_levels(ctx, texObj->Target);
-   ASSERT(maxLevels > 0);  /* bad target */
-
-   /* Find convertFormat - the format that do_row() will process */
-
-   if (_mesa_is_format_compressed(srcImage->TexFormat)) {
-      /* setup for compressed textures - need to allocate temporary
-       * image buffers to hold uncompressed images.
-       */
-      GLuint row;
-      GLint  components, size;
-      GLchan *dst;
-
-      assert(texObj->Target == GL_TEXTURE_2D ||
-             texObj->Target == GL_TEXTURE_CUBE_MAP_ARB);
-
-      if (srcImage->_BaseFormat == GL_RGB) {
-         convertFormat = MESA_FORMAT_RGB888;
-         components = 3;
-      } else if (srcImage->_BaseFormat == GL_RED) {
-         convertFormat = MESA_FORMAT_R8;
-         components = 1;
-      } else if (srcImage->_BaseFormat == GL_RG) {
-         convertFormat = MESA_FORMAT_RG88;
-         components = 2;
-      } else if (srcImage->_BaseFormat == GL_RGBA) {
-         convertFormat = MESA_FORMAT_RGBA8888;
-         components = 4;
-      } else if (srcImage->_BaseFormat == GL_LUMINANCE) {
-         convertFormat = MESA_FORMAT_L8;
-         components = 1;
-      } else if (srcImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
-         convertFormat = MESA_FORMAT_AL88;
-         components = 2;
-      } else {
-         _mesa_problem(ctx, "bad srcImage->_BaseFormat in _mesa_generate_mipmaps");
-         return;
-      }
-
-      /* allocate storage for uncompressed GL_RGB or GL_RGBA images */
-      size = _mesa_bytes_per_pixel(srcImage->_BaseFormat, CHAN_TYPE)
-         * srcImage->Width * srcImage->Height * srcImage->Depth + 20;
-      /* 20 extra bytes, just be safe when calling last FetchTexel */
-      srcData = (GLubyte *) malloc(size);
-      if (!srcData) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");
-         return;
-      }
-      dstData = (GLubyte *) malloc(size / 2);  /* 1/4 would probably be OK */
-      if (!dstData) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");
-         free((void *) srcData);
-         return;
-      }
-
-      /* decompress base image here */
-      dst = (GLchan *) srcData;
-      for (row = 0; row < srcImage->Height; row++) {
-         GLuint col;
-         for (col = 0; col < srcImage->Width; col++) {
-            srcImage->FetchTexelc(srcImage, col, row, 0, dst);
-            dst += components;
-         }
-      }
-   }
-   else {
-      /* uncompressed */
-      convertFormat = srcImage->TexFormat;
-   }
-
-   _mesa_format_to_type_and_comps(convertFormat, &datatype, &comps);
-
-   for (level = texObj->BaseLevel; level < texObj->MaxLevel
-           && level < maxLevels - 1; level++) {
-      /* generate image[level+1] from image[level] */
-      const struct gl_texture_image *srcImage;
-      struct gl_texture_image *dstImage;
-      GLint srcWidth, srcHeight, srcDepth;
-      GLint dstWidth, dstHeight, dstDepth;
-      GLint border;
-      GLboolean nextLevel;
-
-      /* get src image parameters */
-      srcImage = _mesa_select_tex_image(ctx, texObj, target, level);
-      ASSERT(srcImage);
-      srcWidth = srcImage->Width;
-      srcHeight = srcImage->Height;
-      srcDepth = srcImage->Depth;
-      border = srcImage->Border;
-
-      nextLevel = next_mipmap_level_size(target, border,
-                                         srcWidth, srcHeight, srcDepth,
-                                         &dstWidth, &dstHeight, &dstDepth);
-      if (!nextLevel) {
-         /* all done */
-         if (_mesa_is_format_compressed(srcImage->TexFormat)) {
-            free((void *) srcData);
-            free(dstData);
-         }
-         return;
-      }
-
-      /* get dest gl_texture_image */
-      dstImage = _mesa_get_tex_image(ctx, texObj, target, level + 1);
-      if (!dstImage) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");
-         return;
-      }
-
-      /* Free old image data */
-      if (dstImage->Data)
-         ctx->Driver.FreeTexImageData(ctx, dstImage);
-
-      /* initialize new image */
-      _mesa_init_teximage_fields(ctx, target, dstImage, dstWidth, dstHeight,
-                                 dstDepth, border, srcImage->InternalFormat,
-                                 srcImage->TexFormat);
-      dstImage->DriverData = NULL;
-      dstImage->FetchTexelc = srcImage->FetchTexelc;
-      dstImage->FetchTexelf = srcImage->FetchTexelf;
-
-      /* Alloc new teximage data buffer */
-      {
-         GLuint size = _mesa_format_image_size(dstImage->TexFormat,
-                                               dstWidth, dstHeight, dstDepth);
-         dstImage->Data = _mesa_alloc_texmemory(size);
-         if (!dstImage->Data) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");
-            return;
-         }
-      }
-
-      /* Setup src and dest data pointers */
-      if (_mesa_is_format_compressed(dstImage->TexFormat)) {
-         /* srcData and dstData are already set */
-         ASSERT(srcData);
-         ASSERT(dstData);
-      }
-      else {
-         srcData = (const GLubyte *) srcImage->Data;
-         dstData = (GLubyte *) dstImage->Data;
-      }
-
-      ASSERT(dstImage->TexFormat);
-      ASSERT(dstImage->FetchTexelc);
-      ASSERT(dstImage->FetchTexelf);
-
-      _mesa_generate_mipmap_level(target, datatype, comps, border,
-                                  srcWidth, srcHeight, srcDepth, 
-                                  srcData, srcImage->RowStride,
-                                  dstWidth, dstHeight, dstDepth, 
-                                  dstData, dstImage->RowStride);
-
-
-      if (_mesa_is_format_compressed(dstImage->TexFormat)) {
-         GLubyte *temp;
-         /* compress image from dstData into dstImage->Data */
-         const GLenum srcFormat = _mesa_get_format_base_format(convertFormat);
-         GLint dstRowStride
-            = _mesa_format_row_stride(dstImage->TexFormat, dstWidth);
-         ASSERT(srcFormat == GL_RGB || srcFormat == GL_RGBA);
-
-         _mesa_texstore(ctx, 2, dstImage->_BaseFormat,
-                        dstImage->TexFormat,
-                        dstImage->Data,
-                        0, 0, 0, /* dstX/Y/Zoffset */
-                        dstRowStride, 0, /* strides */
-                        dstWidth, dstHeight, 1, /* size */
-                        srcFormat, CHAN_TYPE,
-                        dstData, /* src data, actually */
-                        &ctx->DefaultPacking);
-
-         /* swap src and dest pointers */
-         temp = (GLubyte *) srcData;
-         srcData = dstData;
-         dstData = temp;
-      }
-
-   } /* loop over mipmap levels */
-}
-
-
-/**
- * Helper function for drivers which need to rescale texture images to
- * certain aspect ratios.
- * Nearest filtering only (for broken hardware that can't support
- * all aspect ratios).  This can be made a lot faster, but I don't
- * really care enough...
- */
-void
-_mesa_rescale_teximage2d(GLuint bytesPerPixel,
-			 GLuint srcStrideInPixels,
-			 GLuint dstRowStride,
-			 GLint srcWidth, GLint srcHeight,
-			 GLint dstWidth, GLint dstHeight,
-			 const GLvoid *srcImage, GLvoid *dstImage)
-{
-   GLint row, col;
-
-#define INNER_LOOP( TYPE, HOP, WOP )					\
-   for ( row = 0 ; row < dstHeight ; row++ ) {				\
-      GLint srcRow = row HOP hScale;					\
-      for ( col = 0 ; col < dstWidth ; col++ ) {			\
-	 GLint srcCol = col WOP wScale;					\
-	 dst[col] = src[srcRow * srcStrideInPixels + srcCol];		\
-      }									\
-      dst = (TYPE *) ((GLubyte *) dst + dstRowStride);			\
-   }									\
-
-#define RESCALE_IMAGE( TYPE )						\
-do {									\
-   const TYPE *src = (const TYPE *)srcImage;				\
-   TYPE *dst = (TYPE *)dstImage;					\
-									\
-   if ( srcHeight < dstHeight ) {					\
-      const GLint hScale = dstHeight / srcHeight;			\
-      if ( srcWidth < dstWidth ) {					\
-	 const GLint wScale = dstWidth / srcWidth;			\
-	 INNER_LOOP( TYPE, /, / );					\
-      }									\
-      else {								\
-	 const GLint wScale = srcWidth / dstWidth;			\
-	 INNER_LOOP( TYPE, /, * );					\
-      }									\
-   }									\
-   else {								\
-      const GLint hScale = srcHeight / dstHeight;			\
-      if ( srcWidth < dstWidth ) {					\
-	 const GLint wScale = dstWidth / srcWidth;			\
-	 INNER_LOOP( TYPE, *, / );					\
-      }									\
-      else {								\
-	 const GLint wScale = srcWidth / dstWidth;			\
-	 INNER_LOOP( TYPE, *, * );					\
-      }									\
-   }									\
-} while (0)
-
-   switch ( bytesPerPixel ) {
-   case 4:
-      RESCALE_IMAGE( GLuint );
-      break;
-
-   case 2:
-      RESCALE_IMAGE( GLushort );
-      break;
-
-   case 1:
-      RESCALE_IMAGE( GLubyte );
-      break;
-   default:
-      _mesa_problem(NULL,"unexpected bytes/pixel in _mesa_rescale_teximage2d");
-   }
-}
-
-
-/**
- * Upscale an image by replication, not (typical) stretching.
- * We use this when the image width or height is less than a
- * certain size (4, 8) and we need to upscale an image.
- */
-void
-_mesa_upscale_teximage2d(GLsizei inWidth, GLsizei inHeight,
-                         GLsizei outWidth, GLsizei outHeight,
-                         GLint comps, const GLchan *src, GLint srcRowStride,
-                         GLchan *dest )
-{
-   GLint i, j, k;
-
-   ASSERT(outWidth >= inWidth);
-   ASSERT(outHeight >= inHeight);
-#if 0
-   ASSERT(inWidth == 1 || inWidth == 2 || inHeight == 1 || inHeight == 2);
-   ASSERT((outWidth & 3) == 0);
-   ASSERT((outHeight & 3) == 0);
-#endif
-
-   for (i = 0; i < outHeight; i++) {
-      const GLint ii = i % inHeight;
-      for (j = 0; j < outWidth; j++) {
-         const GLint jj = j % inWidth;
-         for (k = 0; k < comps; k++) {
-            dest[(i * outWidth + j) * comps + k]
-               = src[ii * srcRowStride + jj * comps + k];
-         }
-      }
-   }
-}
-
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file mipmap.c  mipmap generation and teximage resizing functions.

+ */

+

+#include "imports.h"

+#include "formats.h"

+#include "mipmap.h"

+#include "mtypes.h"

+#include "teximage.h"

+#include "texstore.h"

+#include "image.h"

+

+

+

+static GLint

+bytes_per_pixel(GLenum datatype, GLuint comps)

+{

+   GLint b = _mesa_sizeof_packed_type(datatype);

+   assert(b >= 0);

+

+   if (_mesa_type_is_packed(datatype))

+       return b;

+   else

+       return b * comps;

+}

+

+

+/**

+ * \name Support macros for do_row and do_row_3d

+ *

+ * The macro madness is here for two reasons.  First, it compacts the code

+ * slightly.  Second, it makes it much easier to adjust the specifics of the

+ * filter to tune the rounding characteristics.

+ */

+/*@{*/

+#define DECLARE_ROW_POINTERS(t, e) \

+      const t(*rowA)[e] = (const t(*)[e]) srcRowA; \

+      const t(*rowB)[e] = (const t(*)[e]) srcRowB; \

+      const t(*rowC)[e] = (const t(*)[e]) srcRowC; \

+      const t(*rowD)[e] = (const t(*)[e]) srcRowD; \

+      t(*dst)[e] = (t(*)[e]) dstRow

+

+#define DECLARE_ROW_POINTERS0(t) \

+      const t *rowA = (const t *) srcRowA; \

+      const t *rowB = (const t *) srcRowB; \

+      const t *rowC = (const t *) srcRowC; \

+      const t *rowD = (const t *) srcRowD; \

+      t *dst = (t *) dstRow

+

+#define FILTER_SUM_3D(Aj, Ak, Bj, Bk, Cj, Ck, Dj, Dk) \

+   ((unsigned) Aj + (unsigned) Ak \

+    + (unsigned) Bj + (unsigned) Bk \

+    + (unsigned) Cj + (unsigned) Ck \

+    + (unsigned) Dj + (unsigned) Dk \

+    + 4) >> 3

+

+#define FILTER_3D(e) \

+   do { \

+      dst[i][e] = FILTER_SUM_3D(rowA[j][e], rowA[k][e], \

+                                rowB[j][e], rowB[k][e], \

+                                rowC[j][e], rowC[k][e], \

+                                rowD[j][e], rowD[k][e]); \

+   } while(0)

+

+#define FILTER_SUM_3D_SIGNED(Aj, Ak, Bj, Bk, Cj, Ck, Dj, Dk) \

+   (Aj + Ak \

+    + Bj + Bk \

+    + Cj + Ck \

+    + Dj + Dk \

+    + 4) / 8

+

+#define FILTER_3D_SIGNED(e) \

+   do { \

+      dst[i][e] = FILTER_SUM_3D_SIGNED(rowA[j][e], rowA[k][e], \

+                                       rowB[j][e], rowB[k][e], \

+                                       rowC[j][e], rowC[k][e], \

+                                       rowD[j][e], rowD[k][e]); \

+   } while(0)

+

+#define FILTER_F_3D(e) \

+   do { \

+      dst[i][e] = (rowA[j][e] + rowA[k][e] \

+                   + rowB[j][e] + rowB[k][e] \

+                   + rowC[j][e] + rowC[k][e] \

+                   + rowD[j][e] + rowD[k][e]) * 0.125F; \

+   } while(0)

+

+#define FILTER_HF_3D(e) \

+   do { \

+      const GLfloat aj = _mesa_half_to_float(rowA[j][e]); \

+      const GLfloat ak = _mesa_half_to_float(rowA[k][e]); \

+      const GLfloat bj = _mesa_half_to_float(rowB[j][e]); \

+      const GLfloat bk = _mesa_half_to_float(rowB[k][e]); \

+      const GLfloat cj = _mesa_half_to_float(rowC[j][e]); \

+      const GLfloat ck = _mesa_half_to_float(rowC[k][e]); \

+      const GLfloat dj = _mesa_half_to_float(rowD[j][e]); \

+      const GLfloat dk = _mesa_half_to_float(rowD[k][e]); \

+      dst[i][e] = _mesa_float_to_half((aj + ak + bj + bk + cj + ck + dj + dk) \

+                                      * 0.125F); \

+   } while(0)

+/*@}*/

+

+

+/**

+ * Average together two rows of a source image to produce a single new

+ * row in the dest image.  It's legal for the two source rows to point

+ * to the same data.  The source width must be equal to either the

+ * dest width or two times the dest width.

+ * \param datatype  GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, GL_FLOAT, etc.

+ * \param comps  number of components per pixel (1..4)

+ */

+static void

+do_row(GLenum datatype, GLuint comps, GLint srcWidth,

+       const GLvoid *srcRowA, const GLvoid *srcRowB,

+       GLint dstWidth, GLvoid *dstRow)

+{

+   const GLuint k0 = (srcWidth == dstWidth) ? 0 : 1;

+   const GLuint colStride = (srcWidth == dstWidth) ? 1 : 2;

+

+   ASSERT(comps >= 1);

+   ASSERT(comps <= 4);

+

+   /* This assertion is no longer valid with non-power-of-2 textures

+   assert(srcWidth == dstWidth || srcWidth == 2 * dstWidth);

+   */

+

+   if (datatype == GL_UNSIGNED_BYTE && comps == 4) {

+      GLuint i, j, k;

+      const GLubyte(*rowA)[4] = (const GLubyte(*)[4]) srcRowA;

+      const GLubyte(*rowB)[4] = (const GLubyte(*)[4]) srcRowB;

+      GLubyte(*dst)[4] = (GLubyte(*)[4]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;

+      }

+   }

+   else if (datatype == GL_UNSIGNED_BYTE && comps == 3) {

+      GLuint i, j, k;

+      const GLubyte(*rowA)[3] = (const GLubyte(*)[3]) srcRowA;

+      const GLubyte(*rowB)[3] = (const GLubyte(*)[3]) srcRowB;

+      GLubyte(*dst)[3] = (GLubyte(*)[3]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

+      }

+   }

+   else if (datatype == GL_UNSIGNED_BYTE && comps == 2) {

+      GLuint i, j, k;

+      const GLubyte(*rowA)[2] = (const GLubyte(*)[2]) srcRowA;

+      const GLubyte(*rowB)[2] = (const GLubyte(*)[2]) srcRowB;

+      GLubyte(*dst)[2] = (GLubyte(*)[2]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) >> 2;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) >> 2;

+      }

+   }

+   else if (datatype == GL_UNSIGNED_BYTE && comps == 1) {

+      GLuint i, j, k;

+      const GLubyte *rowA = (const GLubyte *) srcRowA;

+      const GLubyte *rowB = (const GLubyte *) srcRowB;

+      GLubyte *dst = (GLubyte *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) >> 2;

+      }

+   }

+

+   else if (datatype == GL_BYTE && comps == 4) {

+      GLuint i, j, k;

+      const GLbyte(*rowA)[4] = (const GLbyte(*)[4]) srcRowA;

+      const GLbyte(*rowB)[4] = (const GLbyte(*)[4]) srcRowB;

+      GLbyte(*dst)[4] = (GLbyte(*)[4]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;

+      }

+   }

+   else if (datatype == GL_BYTE && comps == 3) {

+      GLuint i, j, k;

+      const GLbyte(*rowA)[3] = (const GLbyte(*)[3]) srcRowA;

+      const GLbyte(*rowB)[3] = (const GLbyte(*)[3]) srcRowB;

+      GLbyte(*dst)[3] = (GLbyte(*)[3]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

+      }

+   }

+   else if (datatype == GL_BYTE && comps == 2) {

+      GLuint i, j, k;

+      const GLbyte(*rowA)[2] = (const GLbyte(*)[2]) srcRowA;

+      const GLbyte(*rowB)[2] = (const GLbyte(*)[2]) srcRowB;

+      GLbyte(*dst)[2] = (GLbyte(*)[2]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

+      }

+   }

+   else if (datatype == GL_BYTE && comps == 1) {

+      GLuint i, j, k;

+      const GLbyte *rowA = (const GLbyte *) srcRowA;

+      const GLbyte *rowB = (const GLbyte *) srcRowB;

+      GLbyte *dst = (GLbyte *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;

+      }

+   }

+

+   else if (datatype == GL_UNSIGNED_SHORT && comps == 4) {

+      GLuint i, j, k;

+      const GLushort(*rowA)[4] = (const GLushort(*)[4]) srcRowA;

+      const GLushort(*rowB)[4] = (const GLushort(*)[4]) srcRowB;

+      GLushort(*dst)[4] = (GLushort(*)[4]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;

+      }

+   }

+   else if (datatype == GL_UNSIGNED_SHORT && comps == 3) {

+      GLuint i, j, k;

+      const GLushort(*rowA)[3] = (const GLushort(*)[3]) srcRowA;

+      const GLushort(*rowB)[3] = (const GLushort(*)[3]) srcRowB;

+      GLushort(*dst)[3] = (GLushort(*)[3]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

+      }

+   }

+   else if (datatype == GL_UNSIGNED_SHORT && comps == 2) {

+      GLuint i, j, k;

+      const GLushort(*rowA)[2] = (const GLushort(*)[2]) srcRowA;

+      const GLushort(*rowB)[2] = (const GLushort(*)[2]) srcRowB;

+      GLushort(*dst)[2] = (GLushort(*)[2]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

+      }

+   }

+   else if (datatype == GL_UNSIGNED_SHORT && comps == 1) {

+      GLuint i, j, k;

+      const GLushort *rowA = (const GLushort *) srcRowA;

+      const GLushort *rowB = (const GLushort *) srcRowB;

+      GLushort *dst = (GLushort *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;

+      }

+   }

+

+   else if (datatype == GL_SHORT && comps == 4) {

+      GLuint i, j, k;

+      const GLshort(*rowA)[4] = (const GLshort(*)[4]) srcRowA;

+      const GLshort(*rowB)[4] = (const GLshort(*)[4]) srcRowB;

+      GLshort(*dst)[4] = (GLshort(*)[4]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

+         dst[i][3] = (rowA[j][3] + rowA[k][3] + rowB[j][3] + rowB[k][3]) / 4;

+      }

+   }

+   else if (datatype == GL_SHORT && comps == 3) {

+      GLuint i, j, k;

+      const GLshort(*rowA)[3] = (const GLshort(*)[3]) srcRowA;

+      const GLshort(*rowB)[3] = (const GLshort(*)[3]) srcRowB;

+      GLshort(*dst)[3] = (GLshort(*)[3]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

+         dst[i][2] = (rowA[j][2] + rowA[k][2] + rowB[j][2] + rowB[k][2]) / 4;

+      }

+   }

+   else if (datatype == GL_SHORT && comps == 2) {

+      GLuint i, j, k;

+      const GLshort(*rowA)[2] = (const GLshort(*)[2]) srcRowA;

+      const GLshort(*rowB)[2] = (const GLshort(*)[2]) srcRowB;

+      GLshort(*dst)[2] = (GLshort(*)[2]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] + rowB[j][0] + rowB[k][0]) / 4;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] + rowB[j][1] + rowB[k][1]) / 4;

+      }

+   }

+   else if (datatype == GL_SHORT && comps == 1) {

+      GLuint i, j, k;

+      const GLshort *rowA = (const GLshort *) srcRowA;

+      const GLshort *rowB = (const GLshort *) srcRowB;

+      GLshort *dst = (GLshort *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;

+      }

+   }

+

+   else if (datatype == GL_FLOAT && comps == 4) {

+      GLuint i, j, k;

+      const GLfloat(*rowA)[4] = (const GLfloat(*)[4]) srcRowA;

+      const GLfloat(*rowB)[4] = (const GLfloat(*)[4]) srcRowB;

+      GLfloat(*dst)[4] = (GLfloat(*)[4]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] +

+                      rowB[j][0] + rowB[k][0]) * 0.25F;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] +

+                      rowB[j][1] + rowB[k][1]) * 0.25F;

+         dst[i][2] = (rowA[j][2] + rowA[k][2] +

+                      rowB[j][2] + rowB[k][2]) * 0.25F;

+         dst[i][3] = (rowA[j][3] + rowA[k][3] +

+                      rowB[j][3] + rowB[k][3]) * 0.25F;

+      }

+   }

+   else if (datatype == GL_FLOAT && comps == 3) {

+      GLuint i, j, k;

+      const GLfloat(*rowA)[3] = (const GLfloat(*)[3]) srcRowA;

+      const GLfloat(*rowB)[3] = (const GLfloat(*)[3]) srcRowB;

+      GLfloat(*dst)[3] = (GLfloat(*)[3]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] +

+                      rowB[j][0] + rowB[k][0]) * 0.25F;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] +

+                      rowB[j][1] + rowB[k][1]) * 0.25F;

+         dst[i][2] = (rowA[j][2] + rowA[k][2] +

+                      rowB[j][2] + rowB[k][2]) * 0.25F;

+      }

+   }

+   else if (datatype == GL_FLOAT && comps == 2) {

+      GLuint i, j, k;

+      const GLfloat(*rowA)[2] = (const GLfloat(*)[2]) srcRowA;

+      const GLfloat(*rowB)[2] = (const GLfloat(*)[2]) srcRowB;

+      GLfloat(*dst)[2] = (GLfloat(*)[2]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i][0] = (rowA[j][0] + rowA[k][0] +

+                      rowB[j][0] + rowB[k][0]) * 0.25F;

+         dst[i][1] = (rowA[j][1] + rowA[k][1] +

+                      rowB[j][1] + rowB[k][1]) * 0.25F;

+      }

+   }

+   else if (datatype == GL_FLOAT && comps == 1) {

+      GLuint i, j, k;

+      const GLfloat *rowA = (const GLfloat *) srcRowA;

+      const GLfloat *rowB = (const GLfloat *) srcRowB;

+      GLfloat *dst = (GLfloat *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) * 0.25F;

+      }

+   }

+

+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 4) {

+      GLuint i, j, k, comp;

+      const GLhalfARB(*rowA)[4] = (const GLhalfARB(*)[4]) srcRowA;

+      const GLhalfARB(*rowB)[4] = (const GLhalfARB(*)[4]) srcRowB;

+      GLhalfARB(*dst)[4] = (GLhalfARB(*)[4]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         for (comp = 0; comp < 4; comp++) {

+            GLfloat aj, ak, bj, bk;

+            aj = _mesa_half_to_float(rowA[j][comp]);

+            ak = _mesa_half_to_float(rowA[k][comp]);

+            bj = _mesa_half_to_float(rowB[j][comp]);

+            bk = _mesa_half_to_float(rowB[k][comp]);

+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);

+         }

+      }

+   }

+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 3) {

+      GLuint i, j, k, comp;

+      const GLhalfARB(*rowA)[3] = (const GLhalfARB(*)[3]) srcRowA;

+      const GLhalfARB(*rowB)[3] = (const GLhalfARB(*)[3]) srcRowB;

+      GLhalfARB(*dst)[3] = (GLhalfARB(*)[3]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         for (comp = 0; comp < 3; comp++) {

+            GLfloat aj, ak, bj, bk;

+            aj = _mesa_half_to_float(rowA[j][comp]);

+            ak = _mesa_half_to_float(rowA[k][comp]);

+            bj = _mesa_half_to_float(rowB[j][comp]);

+            bk = _mesa_half_to_float(rowB[k][comp]);

+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);

+         }

+      }

+   }

+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 2) {

+      GLuint i, j, k, comp;

+      const GLhalfARB(*rowA)[2] = (const GLhalfARB(*)[2]) srcRowA;

+      const GLhalfARB(*rowB)[2] = (const GLhalfARB(*)[2]) srcRowB;

+      GLhalfARB(*dst)[2] = (GLhalfARB(*)[2]) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         for (comp = 0; comp < 2; comp++) {

+            GLfloat aj, ak, bj, bk;

+            aj = _mesa_half_to_float(rowA[j][comp]);

+            ak = _mesa_half_to_float(rowA[k][comp]);

+            bj = _mesa_half_to_float(rowB[j][comp]);

+            bk = _mesa_half_to_float(rowB[k][comp]);

+            dst[i][comp] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);

+         }

+      }

+   }

+   else if (datatype == GL_HALF_FLOAT_ARB && comps == 1) {

+      GLuint i, j, k;

+      const GLhalfARB *rowA = (const GLhalfARB *) srcRowA;

+      const GLhalfARB *rowB = (const GLhalfARB *) srcRowB;

+      GLhalfARB *dst = (GLhalfARB *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         GLfloat aj, ak, bj, bk;

+         aj = _mesa_half_to_float(rowA[j]);

+         ak = _mesa_half_to_float(rowA[k]);

+         bj = _mesa_half_to_float(rowB[j]);

+         bk = _mesa_half_to_float(rowB[k]);

+         dst[i] = _mesa_float_to_half((aj + ak + bj + bk) * 0.25F);

+      }

+   }

+

+   else if (datatype == GL_UNSIGNED_INT && comps == 1) {

+      GLuint i, j, k;

+      const GLuint *rowA = (const GLuint *) srcRowA;

+      const GLuint *rowB = (const GLuint *) srcRowB;

+      GLuint *dst = (GLuint *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         dst[i] = (GLfloat)(rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4);

+      }

+   }

+

+   else if (datatype == GL_UNSIGNED_SHORT_5_6_5 && comps == 3) {

+      GLuint i, j, k;

+      const GLushort *rowA = (const GLushort *) srcRowA;

+      const GLushort *rowB = (const GLushort *) srcRowB;

+      GLushort *dst = (GLushort *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = rowA[j] & 0x1f;

+         const GLint rowAr1 = rowA[k] & 0x1f;

+         const GLint rowBr0 = rowB[j] & 0x1f;

+         const GLint rowBr1 = rowB[k] & 0x1f;

+         const GLint rowAg0 = (rowA[j] >> 5) & 0x3f;

+         const GLint rowAg1 = (rowA[k] >> 5) & 0x3f;

+         const GLint rowBg0 = (rowB[j] >> 5) & 0x3f;

+         const GLint rowBg1 = (rowB[k] >> 5) & 0x3f;

+         const GLint rowAb0 = (rowA[j] >> 11) & 0x1f;

+         const GLint rowAb1 = (rowA[k] >> 11) & 0x1f;

+         const GLint rowBb0 = (rowB[j] >> 11) & 0x1f;

+         const GLint rowBb1 = (rowB[k] >> 11) & 0x1f;

+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;

+         dst[i] = (blue << 11) | (green << 5) | red;

+      }

+   }

+   else if (datatype == GL_UNSIGNED_SHORT_4_4_4_4 && comps == 4) {

+      GLuint i, j, k;

+      const GLushort *rowA = (const GLushort *) srcRowA;

+      const GLushort *rowB = (const GLushort *) srcRowB;

+      GLushort *dst = (GLushort *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = rowA[j] & 0xf;

+         const GLint rowAr1 = rowA[k] & 0xf;

+         const GLint rowBr0 = rowB[j] & 0xf;

+         const GLint rowBr1 = rowB[k] & 0xf;

+         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;

+         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;

+         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;

+         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;

+         const GLint rowAb0 = (rowA[j] >> 8) & 0xf;

+         const GLint rowAb1 = (rowA[k] >> 8) & 0xf;

+         const GLint rowBb0 = (rowB[j] >> 8) & 0xf;

+         const GLint rowBb1 = (rowB[k] >> 8) & 0xf;

+         const GLint rowAa0 = (rowA[j] >> 12) & 0xf;

+         const GLint rowAa1 = (rowA[k] >> 12) & 0xf;

+         const GLint rowBa0 = (rowB[j] >> 12) & 0xf;

+         const GLint rowBa1 = (rowB[k] >> 12) & 0xf;

+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;

+         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;

+         dst[i] = (alpha << 12) | (blue << 8) | (green << 4) | red;

+      }

+   }

+   else if (datatype == GL_UNSIGNED_SHORT_1_5_5_5_REV && comps == 4) {

+      GLuint i, j, k;

+      const GLushort *rowA = (const GLushort *) srcRowA;

+      const GLushort *rowB = (const GLushort *) srcRowB;

+      GLushort *dst = (GLushort *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = rowA[j] & 0x1f;

+         const GLint rowAr1 = rowA[k] & 0x1f;

+         const GLint rowBr0 = rowB[j] & 0x1f;

+         const GLint rowBr1 = rowB[k] & 0x1f;

+         const GLint rowAg0 = (rowA[j] >> 5) & 0x1f;

+         const GLint rowAg1 = (rowA[k] >> 5) & 0x1f;

+         const GLint rowBg0 = (rowB[j] >> 5) & 0x1f;

+         const GLint rowBg1 = (rowB[k] >> 5) & 0x1f;

+         const GLint rowAb0 = (rowA[j] >> 10) & 0x1f;

+         const GLint rowAb1 = (rowA[k] >> 10) & 0x1f;

+         const GLint rowBb0 = (rowB[j] >> 10) & 0x1f;

+         const GLint rowBb1 = (rowB[k] >> 10) & 0x1f;

+         const GLint rowAa0 = (rowA[j] >> 15) & 0x1;

+         const GLint rowAa1 = (rowA[k] >> 15) & 0x1;

+         const GLint rowBa0 = (rowB[j] >> 15) & 0x1;

+         const GLint rowBa1 = (rowB[k] >> 15) & 0x1;

+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;

+         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;

+         dst[i] = (alpha << 15) | (blue << 10) | (green << 5) | red;

+      }

+   }

+   else if (datatype == GL_UNSIGNED_SHORT_5_5_5_1 && comps == 4) {

+      GLuint i, j, k;

+      const GLushort *rowA = (const GLushort *) srcRowA;

+      const GLushort *rowB = (const GLushort *) srcRowB;

+      GLushort *dst = (GLushort *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = (rowA[j] >> 11) & 0x1f;

+         const GLint rowAr1 = (rowA[k] >> 11) & 0x1f;

+         const GLint rowBr0 = (rowB[j] >> 11) & 0x1f;

+         const GLint rowBr1 = (rowB[k] >> 11) & 0x1f;

+         const GLint rowAg0 = (rowA[j] >> 6) & 0x1f;

+         const GLint rowAg1 = (rowA[k] >> 6) & 0x1f;

+         const GLint rowBg0 = (rowB[j] >> 6) & 0x1f;

+         const GLint rowBg1 = (rowB[k] >> 6) & 0x1f;

+         const GLint rowAb0 = (rowA[j] >> 1) & 0x1f;

+         const GLint rowAb1 = (rowA[k] >> 1) & 0x1f;

+         const GLint rowBb0 = (rowB[j] >> 1) & 0x1f;

+         const GLint rowBb1 = (rowB[k] >> 1) & 0x1f;

+         const GLint rowAa0 = (rowA[j] & 0x1);

+         const GLint rowAa1 = (rowA[k] & 0x1);

+         const GLint rowBa0 = (rowB[j] & 0x1);

+         const GLint rowBa1 = (rowB[k] & 0x1);

+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;

+         const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2;

+         dst[i] = (red << 11) | (green << 6) | (blue << 1) | alpha;

+      }

+   }

+

+   else if (datatype == GL_UNSIGNED_BYTE_3_3_2 && comps == 3) {

+      GLuint i, j, k;

+      const GLubyte *rowA = (const GLubyte *) srcRowA;

+      const GLubyte *rowB = (const GLubyte *) srcRowB;

+      GLubyte *dst = (GLubyte *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = rowA[j] & 0x3;

+         const GLint rowAr1 = rowA[k] & 0x3;

+         const GLint rowBr0 = rowB[j] & 0x3;

+         const GLint rowBr1 = rowB[k] & 0x3;

+         const GLint rowAg0 = (rowA[j] >> 2) & 0x7;

+         const GLint rowAg1 = (rowA[k] >> 2) & 0x7;

+         const GLint rowBg0 = (rowB[j] >> 2) & 0x7;

+         const GLint rowBg1 = (rowB[k] >> 2) & 0x7;

+         const GLint rowAb0 = (rowA[j] >> 5) & 0x7;

+         const GLint rowAb1 = (rowA[k] >> 5) & 0x7;

+         const GLint rowBb0 = (rowB[j] >> 5) & 0x7;

+         const GLint rowBb1 = (rowB[k] >> 5) & 0x7;

+         const GLint red = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

+         const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

+         const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2;

+         dst[i] = (blue << 5) | (green << 2) | red;

+      }

+   }

+

+   else if (datatype == MESA_UNSIGNED_BYTE_4_4 && comps == 2) {

+      GLuint i, j, k;

+      const GLubyte *rowA = (const GLubyte *) srcRowA;

+      const GLubyte *rowB = (const GLubyte *) srcRowB;

+      GLubyte *dst = (GLubyte *) dstRow;

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = rowA[j] & 0xf;

+         const GLint rowAr1 = rowA[k] & 0xf;

+         const GLint rowBr0 = rowB[j] & 0xf;

+         const GLint rowBr1 = rowB[k] & 0xf;

+         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;

+         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;

+         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;

+         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;

+         const GLint r = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 2;

+         const GLint g = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 2;

+         dst[i] = (g << 4) | r;

+      }

+   }

+

+   else {

+      _mesa_problem(NULL, "bad format in do_row()");

+   }

+}

+

+

+/**

+ * Average together four rows of a source image to produce a single new

+ * row in the dest image.  It's legal for the two source rows to point

+ * to the same data.  The source width must be equal to either the

+ * dest width or two times the dest width.

+ *

+ * \param datatype  GL pixel type \c GL_UNSIGNED_BYTE, \c GL_UNSIGNED_SHORT,

+ *                  \c GL_FLOAT, etc.

+ * \param comps     number of components per pixel (1..4)

+ * \param srcWidth  Width of a row in the source data

+ * \param srcRowA   Pointer to one of the rows of source data

+ * \param srcRowB   Pointer to one of the rows of source data

+ * \param srcRowC   Pointer to one of the rows of source data

+ * \param srcRowD   Pointer to one of the rows of source data

+ * \param dstWidth  Width of a row in the destination data

+ * \param srcRowA   Pointer to the row of destination data

+ */

+static void

+do_row_3D(GLenum datatype, GLuint comps, GLint srcWidth,

+          const GLvoid *srcRowA, const GLvoid *srcRowB,

+          const GLvoid *srcRowC, const GLvoid *srcRowD,

+          GLint dstWidth, GLvoid *dstRow)

+{

+   const GLuint k0 = (srcWidth == dstWidth) ? 0 : 1;

+   const GLuint colStride = (srcWidth == dstWidth) ? 1 : 2;

+   GLuint i, j, k;

+

+   ASSERT(comps >= 1);

+   ASSERT(comps <= 4);

+

+   if ((datatype == GL_UNSIGNED_BYTE) && (comps == 4)) {

+      DECLARE_ROW_POINTERS(GLubyte, 4);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+         FILTER_3D(1);

+         FILTER_3D(2);

+         FILTER_3D(3);

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 3)) {

+      DECLARE_ROW_POINTERS(GLubyte, 3);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+         FILTER_3D(1);

+         FILTER_3D(2);

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 2)) {

+      DECLARE_ROW_POINTERS(GLubyte, 2);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+         FILTER_3D(1);

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_BYTE) && (comps == 1)) {

+      DECLARE_ROW_POINTERS(GLubyte, 1);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+      }

+   }

+   else if ((datatype == GL_BYTE) && (comps == 4)) {

+      DECLARE_ROW_POINTERS(GLbyte, 4);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D_SIGNED(0);

+         FILTER_3D_SIGNED(1);

+         FILTER_3D_SIGNED(2);

+         FILTER_3D_SIGNED(3);

+      }

+   }

+   else if ((datatype == GL_BYTE) && (comps == 3)) {

+      DECLARE_ROW_POINTERS(GLbyte, 3);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D_SIGNED(0);

+         FILTER_3D_SIGNED(1);

+         FILTER_3D_SIGNED(2);

+      }

+   }

+   else if ((datatype == GL_BYTE) && (comps == 2)) {

+      DECLARE_ROW_POINTERS(GLbyte, 2);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D_SIGNED(0);

+         FILTER_3D_SIGNED(1);

+       }

+   }

+   else if ((datatype == GL_BYTE) && (comps == 1)) {

+      DECLARE_ROW_POINTERS(GLbyte, 1);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D_SIGNED(0);

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 4)) {

+      DECLARE_ROW_POINTERS(GLushort, 4);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+         FILTER_3D(1);

+         FILTER_3D(2);

+         FILTER_3D(3);

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 3)) {

+      DECLARE_ROW_POINTERS(GLushort, 3);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+         FILTER_3D(1);

+         FILTER_3D(2);

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 2)) {

+      DECLARE_ROW_POINTERS(GLushort, 2);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+         FILTER_3D(1);

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_SHORT) && (comps == 1)) {

+      DECLARE_ROW_POINTERS(GLushort, 1);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+      }

+   }

+   else if ((datatype == GL_SHORT) && (comps == 4)) {

+      DECLARE_ROW_POINTERS(GLshort, 4);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+         FILTER_3D(1);

+         FILTER_3D(2);

+         FILTER_3D(3);

+      }

+   }

+   else if ((datatype == GL_SHORT) && (comps == 3)) {

+      DECLARE_ROW_POINTERS(GLshort, 3);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+         FILTER_3D(1);

+         FILTER_3D(2);

+      }

+   }

+   else if ((datatype == GL_SHORT) && (comps == 2)) {

+      DECLARE_ROW_POINTERS(GLshort, 2);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+         FILTER_3D(1);

+      }

+   }

+   else if ((datatype == GL_SHORT) && (comps == 1)) {

+      DECLARE_ROW_POINTERS(GLshort, 1);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_3D(0);

+      }

+   }

+   else if ((datatype == GL_FLOAT) && (comps == 4)) {

+      DECLARE_ROW_POINTERS(GLfloat, 4);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_F_3D(0);

+         FILTER_F_3D(1);

+         FILTER_F_3D(2);

+         FILTER_F_3D(3);

+      }

+   }

+   else if ((datatype == GL_FLOAT) && (comps == 3)) {

+      DECLARE_ROW_POINTERS(GLfloat, 3);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_F_3D(0);

+         FILTER_F_3D(1);

+         FILTER_F_3D(2);

+      }

+   }

+   else if ((datatype == GL_FLOAT) && (comps == 2)) {

+      DECLARE_ROW_POINTERS(GLfloat, 2);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_F_3D(0);

+         FILTER_F_3D(1);

+      }

+   }

+   else if ((datatype == GL_FLOAT) && (comps == 1)) {

+      DECLARE_ROW_POINTERS(GLfloat, 1);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_F_3D(0);

+      }

+   }

+   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 4)) {

+      DECLARE_ROW_POINTERS(GLhalfARB, 4);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_HF_3D(0);

+         FILTER_HF_3D(1);

+         FILTER_HF_3D(2);

+         FILTER_HF_3D(3);

+      }

+   }

+   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 3)) {

+      DECLARE_ROW_POINTERS(GLhalfARB, 4);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_HF_3D(0);

+         FILTER_HF_3D(1);

+         FILTER_HF_3D(2);

+      }

+   }

+   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 2)) {

+      DECLARE_ROW_POINTERS(GLhalfARB, 4);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_HF_3D(0);

+         FILTER_HF_3D(1);

+      }

+   }

+   else if ((datatype == GL_HALF_FLOAT_ARB) && (comps == 1)) {

+      DECLARE_ROW_POINTERS(GLhalfARB, 4);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         FILTER_HF_3D(0);

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_INT) && (comps == 1)) {

+      const GLuint *rowA = (const GLuint *) srcRowA;

+      const GLuint *rowB = (const GLuint *) srcRowB;

+      const GLuint *rowC = (const GLuint *) srcRowC;

+      const GLuint *rowD = (const GLuint *) srcRowD;

+      GLfloat *dst = (GLfloat *) dstRow;

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const uint64_t tmp = (((uint64_t) rowA[j] + (uint64_t) rowA[k])

+                               + ((uint64_t) rowB[j] + (uint64_t) rowB[k])

+                               + ((uint64_t) rowC[j] + (uint64_t) rowC[k])

+                               + ((uint64_t) rowD[j] + (uint64_t) rowD[k]));

+         dst[i] = (GLfloat)((double) tmp * 0.125);

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_SHORT_5_6_5) && (comps == 3)) {

+      DECLARE_ROW_POINTERS0(GLushort);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = rowA[j] & 0x1f;

+         const GLint rowAr1 = rowA[k] & 0x1f;

+         const GLint rowBr0 = rowB[j] & 0x1f;

+         const GLint rowBr1 = rowB[k] & 0x1f;

+         const GLint rowCr0 = rowC[j] & 0x1f;

+         const GLint rowCr1 = rowC[k] & 0x1f;

+         const GLint rowDr0 = rowD[j] & 0x1f;

+         const GLint rowDr1 = rowD[k] & 0x1f;

+         const GLint rowAg0 = (rowA[j] >> 5) & 0x3f;

+         const GLint rowAg1 = (rowA[k] >> 5) & 0x3f;

+         const GLint rowBg0 = (rowB[j] >> 5) & 0x3f;

+         const GLint rowBg1 = (rowB[k] >> 5) & 0x3f;

+         const GLint rowCg0 = (rowC[j] >> 5) & 0x3f;

+         const GLint rowCg1 = (rowC[k] >> 5) & 0x3f;

+         const GLint rowDg0 = (rowD[j] >> 5) & 0x3f;

+         const GLint rowDg1 = (rowD[k] >> 5) & 0x3f;

+         const GLint rowAb0 = (rowA[j] >> 11) & 0x1f;

+         const GLint rowAb1 = (rowA[k] >> 11) & 0x1f;

+         const GLint rowBb0 = (rowB[j] >> 11) & 0x1f;

+         const GLint rowBb1 = (rowB[k] >> 11) & 0x1f;

+         const GLint rowCb0 = (rowC[j] >> 11) & 0x1f;

+         const GLint rowCb1 = (rowC[k] >> 11) & 0x1f;

+         const GLint rowDb0 = (rowD[j] >> 11) & 0x1f;

+         const GLint rowDb1 = (rowD[k] >> 11) & 0x1f;

+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

+                                       rowCr0, rowCr1, rowDr0, rowDr1);

+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

+                                       rowCg0, rowCg1, rowDg0, rowDg1);

+         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,

+                                       rowCb0, rowCb1, rowDb0, rowDb1);

+         dst[i] = (b << 11) | (g << 5) | r;

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_SHORT_4_4_4_4) && (comps == 4)) {

+      DECLARE_ROW_POINTERS0(GLushort);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = rowA[j] & 0xf;

+         const GLint rowAr1 = rowA[k] & 0xf;

+         const GLint rowBr0 = rowB[j] & 0xf;

+         const GLint rowBr1 = rowB[k] & 0xf;

+         const GLint rowCr0 = rowC[j] & 0xf;

+         const GLint rowCr1 = rowC[k] & 0xf;

+         const GLint rowDr0 = rowD[j] & 0xf;

+         const GLint rowDr1 = rowD[k] & 0xf;

+         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;

+         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;

+         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;

+         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;

+         const GLint rowCg0 = (rowC[j] >> 4) & 0xf;

+         const GLint rowCg1 = (rowC[k] >> 4) & 0xf;

+         const GLint rowDg0 = (rowD[j] >> 4) & 0xf;

+         const GLint rowDg1 = (rowD[k] >> 4) & 0xf;

+         const GLint rowAb0 = (rowA[j] >> 8) & 0xf;

+         const GLint rowAb1 = (rowA[k] >> 8) & 0xf;

+         const GLint rowBb0 = (rowB[j] >> 8) & 0xf;

+         const GLint rowBb1 = (rowB[k] >> 8) & 0xf;

+         const GLint rowCb0 = (rowC[j] >> 8) & 0xf;

+         const GLint rowCb1 = (rowC[k] >> 8) & 0xf;

+         const GLint rowDb0 = (rowD[j] >> 8) & 0xf;

+         const GLint rowDb1 = (rowD[k] >> 8) & 0xf;

+         const GLint rowAa0 = (rowA[j] >> 12) & 0xf;

+         const GLint rowAa1 = (rowA[k] >> 12) & 0xf;

+         const GLint rowBa0 = (rowB[j] >> 12) & 0xf;

+         const GLint rowBa1 = (rowB[k] >> 12) & 0xf;

+         const GLint rowCa0 = (rowC[j] >> 12) & 0xf;

+         const GLint rowCa1 = (rowC[k] >> 12) & 0xf;

+         const GLint rowDa0 = (rowD[j] >> 12) & 0xf;

+         const GLint rowDa1 = (rowD[k] >> 12) & 0xf;

+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

+                                       rowCr0, rowCr1, rowDr0, rowDr1);

+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

+                                       rowCg0, rowCg1, rowDg0, rowDg1);

+         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,

+                                       rowCb0, rowCb1, rowDb0, rowDb1);

+         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,

+                                       rowCa0, rowCa1, rowDa0, rowDa1);

+

+         dst[i] = (a << 12) | (b << 8) | (g << 4) | r;

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_SHORT_1_5_5_5_REV) && (comps == 4)) {

+      DECLARE_ROW_POINTERS0(GLushort);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = rowA[j] & 0x1f;

+         const GLint rowAr1 = rowA[k] & 0x1f;

+         const GLint rowBr0 = rowB[j] & 0x1f;

+         const GLint rowBr1 = rowB[k] & 0x1f;

+         const GLint rowCr0 = rowC[j] & 0x1f;

+         const GLint rowCr1 = rowC[k] & 0x1f;

+         const GLint rowDr0 = rowD[j] & 0x1f;

+         const GLint rowDr1 = rowD[k] & 0x1f;

+         const GLint rowAg0 = (rowA[j] >> 5) & 0x1f;

+         const GLint rowAg1 = (rowA[k] >> 5) & 0x1f;

+         const GLint rowBg0 = (rowB[j] >> 5) & 0x1f;

+         const GLint rowBg1 = (rowB[k] >> 5) & 0x1f;

+         const GLint rowCg0 = (rowC[j] >> 5) & 0x1f;

+         const GLint rowCg1 = (rowC[k] >> 5) & 0x1f;

+         const GLint rowDg0 = (rowD[j] >> 5) & 0x1f;

+         const GLint rowDg1 = (rowD[k] >> 5) & 0x1f;

+         const GLint rowAb0 = (rowA[j] >> 10) & 0x1f;

+         const GLint rowAb1 = (rowA[k] >> 10) & 0x1f;

+         const GLint rowBb0 = (rowB[j] >> 10) & 0x1f;

+         const GLint rowBb1 = (rowB[k] >> 10) & 0x1f;

+         const GLint rowCb0 = (rowC[j] >> 10) & 0x1f;

+         const GLint rowCb1 = (rowC[k] >> 10) & 0x1f;

+         const GLint rowDb0 = (rowD[j] >> 10) & 0x1f;

+         const GLint rowDb1 = (rowD[k] >> 10) & 0x1f;

+         const GLint rowAa0 = (rowA[j] >> 15) & 0x1;

+         const GLint rowAa1 = (rowA[k] >> 15) & 0x1;

+         const GLint rowBa0 = (rowB[j] >> 15) & 0x1;

+         const GLint rowBa1 = (rowB[k] >> 15) & 0x1;

+         const GLint rowCa0 = (rowC[j] >> 15) & 0x1;

+         const GLint rowCa1 = (rowC[k] >> 15) & 0x1;

+         const GLint rowDa0 = (rowD[j] >> 15) & 0x1;

+         const GLint rowDa1 = (rowD[k] >> 15) & 0x1;

+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

+                                       rowCr0, rowCr1, rowDr0, rowDr1);

+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

+                                       rowCg0, rowCg1, rowDg0, rowDg1);

+         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,

+                                       rowCb0, rowCb1, rowDb0, rowDb1);

+         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,

+                                       rowCa0, rowCa1, rowDa0, rowDa1);

+

+         dst[i] = (a << 15) | (b << 10) | (g << 5) | r;

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_SHORT_5_5_5_1) && (comps == 4)) {

+      DECLARE_ROW_POINTERS0(GLushort);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = (rowA[j] >> 11) & 0x1f;

+         const GLint rowAr1 = (rowA[k] >> 11) & 0x1f;

+         const GLint rowBr0 = (rowB[j] >> 11) & 0x1f;

+         const GLint rowBr1 = (rowB[k] >> 11) & 0x1f;

+         const GLint rowCr0 = (rowC[j] >> 11) & 0x1f;

+         const GLint rowCr1 = (rowC[k] >> 11) & 0x1f;

+         const GLint rowDr0 = (rowD[j] >> 11) & 0x1f;

+         const GLint rowDr1 = (rowD[k] >> 11) & 0x1f;

+         const GLint rowAg0 = (rowA[j] >> 6) & 0x1f;

+         const GLint rowAg1 = (rowA[k] >> 6) & 0x1f;

+         const GLint rowBg0 = (rowB[j] >> 6) & 0x1f;

+         const GLint rowBg1 = (rowB[k] >> 6) & 0x1f;

+         const GLint rowCg0 = (rowC[j] >> 6) & 0x1f;

+         const GLint rowCg1 = (rowC[k] >> 6) & 0x1f;

+         const GLint rowDg0 = (rowD[j] >> 6) & 0x1f;

+         const GLint rowDg1 = (rowD[k] >> 6) & 0x1f;

+         const GLint rowAb0 = (rowA[j] >> 1) & 0x1f;

+         const GLint rowAb1 = (rowA[k] >> 1) & 0x1f;

+         const GLint rowBb0 = (rowB[j] >> 1) & 0x1f;

+         const GLint rowBb1 = (rowB[k] >> 1) & 0x1f;

+         const GLint rowCb0 = (rowC[j] >> 1) & 0x1f;

+         const GLint rowCb1 = (rowC[k] >> 1) & 0x1f;

+         const GLint rowDb0 = (rowD[j] >> 1) & 0x1f;

+         const GLint rowDb1 = (rowD[k] >> 1) & 0x1f;

+         const GLint rowAa0 = (rowA[j] & 0x1);

+         const GLint rowAa1 = (rowA[k] & 0x1);

+         const GLint rowBa0 = (rowB[j] & 0x1);

+         const GLint rowBa1 = (rowB[k] & 0x1);

+         const GLint rowCa0 = (rowC[j] & 0x1);

+         const GLint rowCa1 = (rowC[k] & 0x1);

+         const GLint rowDa0 = (rowD[j] & 0x1);

+         const GLint rowDa1 = (rowD[k] & 0x1);

+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

+                                       rowCr0, rowCr1, rowDr0, rowDr1);

+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

+                                       rowCg0, rowCg1, rowDg0, rowDg1);

+         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,

+                                       rowCb0, rowCb1, rowDb0, rowDb1);

+         const GLint a = FILTER_SUM_3D(rowAa0, rowAa1, rowBa0, rowBa1,

+                                       rowCa0, rowCa1, rowDa0, rowDa1);

+

+         dst[i] = (r << 11) | (g << 6) | (b << 1) | a;

+      }

+   }

+   else if ((datatype == GL_UNSIGNED_BYTE_3_3_2) && (comps == 3)) {

+      DECLARE_ROW_POINTERS0(GLubyte);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = rowA[j] & 0x3;

+         const GLint rowAr1 = rowA[k] & 0x3;

+         const GLint rowBr0 = rowB[j] & 0x3;

+         const GLint rowBr1 = rowB[k] & 0x3;

+         const GLint rowCr0 = rowC[j] & 0x3;

+         const GLint rowCr1 = rowC[k] & 0x3;

+         const GLint rowDr0 = rowD[j] & 0x3;

+         const GLint rowDr1 = rowD[k] & 0x3;

+         const GLint rowAg0 = (rowA[j] >> 2) & 0x7;

+         const GLint rowAg1 = (rowA[k] >> 2) & 0x7;

+         const GLint rowBg0 = (rowB[j] >> 2) & 0x7;

+         const GLint rowBg1 = (rowB[k] >> 2) & 0x7;

+         const GLint rowCg0 = (rowC[j] >> 2) & 0x7;

+         const GLint rowCg1 = (rowC[k] >> 2) & 0x7;

+         const GLint rowDg0 = (rowD[j] >> 2) & 0x7;

+         const GLint rowDg1 = (rowD[k] >> 2) & 0x7;

+         const GLint rowAb0 = (rowA[j] >> 5) & 0x7;

+         const GLint rowAb1 = (rowA[k] >> 5) & 0x7;

+         const GLint rowBb0 = (rowB[j] >> 5) & 0x7;

+         const GLint rowBb1 = (rowB[k] >> 5) & 0x7;

+         const GLint rowCb0 = (rowC[j] >> 5) & 0x7;

+         const GLint rowCb1 = (rowC[k] >> 5) & 0x7;

+         const GLint rowDb0 = (rowD[j] >> 5) & 0x7;

+         const GLint rowDb1 = (rowD[k] >> 5) & 0x7;

+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

+                                       rowCr0, rowCr1, rowDr0, rowDr1);

+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

+                                       rowCg0, rowCg1, rowDg0, rowDg1);

+         const GLint b = FILTER_SUM_3D(rowAb0, rowAb1, rowBb0, rowBb1,

+                                       rowCb0, rowCb1, rowDb0, rowDb1);

+         dst[i] = (b << 5) | (g << 2) | r;

+      }

+   }

+   else if (datatype == MESA_UNSIGNED_BYTE_4_4 && comps == 2) {

+      DECLARE_ROW_POINTERS0(GLubyte);

+

+      for (i = j = 0, k = k0; i < (GLuint) dstWidth;

+           i++, j += colStride, k += colStride) {

+         const GLint rowAr0 = rowA[j] & 0xf;

+         const GLint rowAr1 = rowA[k] & 0xf;

+         const GLint rowBr0 = rowB[j] & 0xf;

+         const GLint rowBr1 = rowB[k] & 0xf;

+         const GLint rowCr0 = rowC[j] & 0xf;

+         const GLint rowCr1 = rowC[k] & 0xf;

+         const GLint rowDr0 = rowD[j] & 0xf;

+         const GLint rowDr1 = rowD[k] & 0xf;

+         const GLint rowAg0 = (rowA[j] >> 4) & 0xf;

+         const GLint rowAg1 = (rowA[k] >> 4) & 0xf;

+         const GLint rowBg0 = (rowB[j] >> 4) & 0xf;

+         const GLint rowBg1 = (rowB[k] >> 4) & 0xf;

+         const GLint rowCg0 = (rowC[j] >> 4) & 0xf;

+         const GLint rowCg1 = (rowC[k] >> 4) & 0xf;

+         const GLint rowDg0 = (rowD[j] >> 4) & 0xf;

+         const GLint rowDg1 = (rowD[k] >> 4) & 0xf;

+         const GLint r = FILTER_SUM_3D(rowAr0, rowAr1, rowBr0, rowBr1,

+                                       rowCr0, rowCr1, rowDr0, rowDr1);

+         const GLint g = FILTER_SUM_3D(rowAg0, rowAg1, rowBg0, rowBg1,

+                                       rowCg0, rowCg1, rowDg0, rowDg1);

+         dst[i] = (g << 4) | r;

+      }

+   }

+   else {

+      _mesa_problem(NULL, "bad format in do_row()");

+   }

+}

+

+

+/*

+ * These functions generate a 1/2-size mipmap image from a source image.

+ * Texture borders are handled by copying or averaging the source image's

+ * border texels, depending on the scale-down factor.

+ */

+

+static void

+make_1d_mipmap(GLenum datatype, GLuint comps, GLint border,

+               GLint srcWidth, const GLubyte *srcPtr,

+               GLint dstWidth, GLubyte *dstPtr)

+{

+   const GLint bpt = bytes_per_pixel(datatype, comps);

+   const GLubyte *src;

+   GLubyte *dst;

+

+   /* skip the border pixel, if any */

+   src = srcPtr + border * bpt;

+   dst = dstPtr + border * bpt;

+

+   /* we just duplicate the input row, kind of hack, saves code */

+   do_row(datatype, comps, srcWidth - 2 * border, src, src,

+          dstWidth - 2 * border, dst);

+

+   if (border) {

+      /* copy left-most pixel from source */

+      assert(dstPtr);

+      assert(srcPtr);

+      memcpy(dstPtr, srcPtr, bpt);

+      /* copy right-most pixel from source */

+      memcpy(dstPtr + (dstWidth - 1) * bpt,

+             srcPtr + (srcWidth - 1) * bpt,

+             bpt);

+   }

+}

+

+

+static void

+make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,

+               GLint srcWidth, GLint srcHeight,

+	       const GLubyte *srcPtr, GLint srcRowStride,

+               GLint dstWidth, GLint dstHeight,

+	       GLubyte *dstPtr, GLint dstRowStride)

+{

+   const GLint bpt = bytes_per_pixel(datatype, comps);

+   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */

+   const GLint dstWidthNB = dstWidth - 2 * border;

+   const GLint dstHeightNB = dstHeight - 2 * border;

+   const GLint srcRowBytes = bpt * srcRowStride;

+   const GLint dstRowBytes = bpt * dstRowStride;

+   const GLubyte *srcA, *srcB;

+   GLubyte *dst;

+   GLint row, srcRowStep;

+

+   /* Compute src and dst pointers, skipping any border */

+   srcA = srcPtr + border * ((srcWidth + 1) * bpt);

+   if (srcHeight > 1 && srcHeight > dstHeight) {

+      /* sample from two source rows */

+      srcB = srcA + srcRowBytes;

+      srcRowStep = 2;

+   }

+   else {

+      /* sample from one source row */

+      srcB = srcA;

+      srcRowStep = 1;

+   }

+

+   dst = dstPtr + border * ((dstWidth + 1) * bpt);

+

+   for (row = 0; row < dstHeightNB; row++) {

+      do_row(datatype, comps, srcWidthNB, srcA, srcB,

+             dstWidthNB, dst);

+      srcA += srcRowStep * srcRowBytes;

+      srcB += srcRowStep * srcRowBytes;

+      dst += dstRowBytes;

+   }

+

+   /* This is ugly but probably won't be used much */

+   if (border > 0) {

+      /* fill in dest border */

+      /* lower-left border pixel */

+      assert(dstPtr);

+      assert(srcPtr);

+      memcpy(dstPtr, srcPtr, bpt);

+      /* lower-right border pixel */

+      memcpy(dstPtr + (dstWidth - 1) * bpt,

+             srcPtr + (srcWidth - 1) * bpt, bpt);

+      /* upper-left border pixel */

+      memcpy(dstPtr + dstWidth * (dstHeight - 1) * bpt,

+             srcPtr + srcWidth * (srcHeight - 1) * bpt, bpt);

+      /* upper-right border pixel */

+      memcpy(dstPtr + (dstWidth * dstHeight - 1) * bpt,

+             srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);

+      /* lower border */

+      do_row(datatype, comps, srcWidthNB,

+             srcPtr + bpt,

+             srcPtr + bpt,

+             dstWidthNB, dstPtr + bpt);

+      /* upper border */

+      do_row(datatype, comps, srcWidthNB,

+             srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,

+             srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,

+             dstWidthNB,

+             dstPtr + (dstWidth * (dstHeight - 1) + 1) * bpt);

+      /* left and right borders */

+      if (srcHeight == dstHeight) {

+         /* copy border pixel from src to dst */

+         for (row = 1; row < srcHeight; row++) {

+            memcpy(dstPtr + dstWidth * row * bpt,

+                   srcPtr + srcWidth * row * bpt, bpt);

+            memcpy(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,

+                   srcPtr + (srcWidth * row + srcWidth - 1) * bpt, bpt);

+         }

+      }

+      else {

+         /* average two src pixels each dest pixel */

+         for (row = 0; row < dstHeightNB; row += 2) {

+            do_row(datatype, comps, 1,

+                   srcPtr + (srcWidth * (row * 2 + 1)) * bpt,

+                   srcPtr + (srcWidth * (row * 2 + 2)) * bpt,

+                   1, dstPtr + (dstWidth * row + 1) * bpt);

+            do_row(datatype, comps, 1,

+                   srcPtr + (srcWidth * (row * 2 + 1) + srcWidth - 1) * bpt,

+                   srcPtr + (srcWidth * (row * 2 + 2) + srcWidth - 1) * bpt,

+                   1, dstPtr + (dstWidth * row + 1 + dstWidth - 1) * bpt);

+         }

+      }

+   }

+}

+

+

+static void

+make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,

+               GLint srcWidth, GLint srcHeight, GLint srcDepth,

+               const GLubyte *srcPtr, GLint srcRowStride,

+               GLint dstWidth, GLint dstHeight, GLint dstDepth,

+               GLubyte *dstPtr, GLint dstRowStride)

+{

+   const GLint bpt = bytes_per_pixel(datatype, comps);

+   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */

+   const GLint srcDepthNB = srcDepth - 2 * border;

+   const GLint dstWidthNB = dstWidth - 2 * border;

+   const GLint dstHeightNB = dstHeight - 2 * border;

+   const GLint dstDepthNB = dstDepth - 2 * border;

+   GLint img, row;

+   GLint bytesPerSrcImage, bytesPerDstImage;

+   GLint bytesPerSrcRow, bytesPerDstRow;

+   GLint srcImageOffset, srcRowOffset;

+

+   (void) srcDepthNB; /* silence warnings */

+

+

+   bytesPerSrcImage = srcWidth * srcHeight * bpt;

+   bytesPerDstImage = dstWidth * dstHeight * bpt;

+

+   bytesPerSrcRow = srcWidth * bpt;

+   bytesPerDstRow = dstWidth * bpt;

+

+   /* Offset between adjacent src images to be averaged together */

+   srcImageOffset = (srcDepth == dstDepth) ? 0 : bytesPerSrcImage;

+

+   /* Offset between adjacent src rows to be averaged together */

+   srcRowOffset = (srcHeight == dstHeight) ? 0 : srcWidth * bpt;

+

+   /*

+    * Need to average together up to 8 src pixels for each dest pixel.

+    * Break that down into 3 operations:

+    *   1. take two rows from source image and average them together.

+    *   2. take two rows from next source image and average them together.

+    *   3. take the two averaged rows and average them for the final dst row.

+    */

+

+   /*

+   printf("mip3d %d x %d x %d  ->  %d x %d x %d\n",

+          srcWidth, srcHeight, srcDepth, dstWidth, dstHeight, dstDepth);

+   */

+

+   for (img = 0; img < dstDepthNB; img++) {

+      /* first source image pointer, skipping border */

+      const GLubyte *imgSrcA = srcPtr

+         + (bytesPerSrcImage + bytesPerSrcRow + border) * bpt * border

+         + img * (bytesPerSrcImage + srcImageOffset);

+      /* second source image pointer, skipping border */

+      const GLubyte *imgSrcB = imgSrcA + srcImageOffset;

+      /* address of the dest image, skipping border */

+      GLubyte *imgDst = dstPtr

+         + (bytesPerDstImage + bytesPerDstRow + border) * bpt * border

+         + img * bytesPerDstImage;

+

+      /* setup the four source row pointers and the dest row pointer */

+      const GLubyte *srcImgARowA = imgSrcA;

+      const GLubyte *srcImgARowB = imgSrcA + srcRowOffset;

+      const GLubyte *srcImgBRowA = imgSrcB;

+      const GLubyte *srcImgBRowB = imgSrcB + srcRowOffset;

+      GLubyte *dstImgRow = imgDst;

+

+      for (row = 0; row < dstHeightNB; row++) {

+         do_row_3D(datatype, comps, srcWidthNB, 

+                   srcImgARowA, srcImgARowB,

+                   srcImgBRowA, srcImgBRowB,

+                   dstWidthNB, dstImgRow);

+

+         /* advance to next rows */

+         srcImgARowA += bytesPerSrcRow + srcRowOffset;

+         srcImgARowB += bytesPerSrcRow + srcRowOffset;

+         srcImgBRowA += bytesPerSrcRow + srcRowOffset;

+         srcImgBRowB += bytesPerSrcRow + srcRowOffset;

+         dstImgRow += bytesPerDstRow;

+      }

+   }

+

+

+   /* Luckily we can leverage the make_2d_mipmap() function here! */

+   if (border > 0) {

+      /* do front border image */

+      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight, srcPtr, srcRowStride,

+                     dstWidth, dstHeight, dstPtr, dstRowStride);

+      /* do back border image */

+      make_2d_mipmap(datatype, comps, 1, srcWidth, srcHeight,

+                     srcPtr + bytesPerSrcImage * (srcDepth - 1), srcRowStride,

+                     dstWidth, dstHeight,

+                     dstPtr + bytesPerDstImage * (dstDepth - 1), dstRowStride);

+      /* do four remaining border edges that span the image slices */

+      if (srcDepth == dstDepth) {

+         /* just copy border pixels from src to dst */

+         for (img = 0; img < dstDepthNB; img++) {

+            const GLubyte *src;

+            GLubyte *dst;

+

+            /* do border along [img][row=0][col=0] */

+            src = srcPtr + (img + 1) * bytesPerSrcImage;

+            dst = dstPtr + (img + 1) * bytesPerDstImage;

+            memcpy(dst, src, bpt);

+

+            /* do border along [img][row=dstHeight-1][col=0] */

+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

+                         + (srcHeight - 1) * bytesPerSrcRow;

+            dst = dstPtr + (img + 1) * bytesPerDstImage

+                         + (dstHeight - 1) * bytesPerDstRow;

+            memcpy(dst, src, bpt);

+

+            /* do border along [img][row=0][col=dstWidth-1] */

+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

+                         + (srcWidth - 1) * bpt;

+            dst = dstPtr + (img + 1) * bytesPerDstImage

+                         + (dstWidth - 1) * bpt;

+            memcpy(dst, src, bpt);

+

+            /* do border along [img][row=dstHeight-1][col=dstWidth-1] */

+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

+                         + (bytesPerSrcImage - bpt);

+            dst = dstPtr + (img + 1) * bytesPerDstImage

+                         + (bytesPerDstImage - bpt);

+            memcpy(dst, src, bpt);

+         }

+      }

+      else {

+         /* average border pixels from adjacent src image pairs */

+         ASSERT(srcDepthNB == 2 * dstDepthNB);

+         for (img = 0; img < dstDepthNB; img++) {

+            const GLubyte *src;

+            GLubyte *dst;

+

+            /* do border along [img][row=0][col=0] */

+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage;

+            dst = dstPtr + (img + 1) * bytesPerDstImage;

+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);

+

+            /* do border along [img][row=dstHeight-1][col=0] */

+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

+                         + (srcHeight - 1) * bytesPerSrcRow;

+            dst = dstPtr + (img + 1) * bytesPerDstImage

+                         + (dstHeight - 1) * bytesPerDstRow;

+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);

+

+            /* do border along [img][row=0][col=dstWidth-1] */

+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

+                         + (srcWidth - 1) * bpt;

+            dst = dstPtr + (img + 1) * bytesPerDstImage

+                         + (dstWidth - 1) * bpt;

+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);

+

+            /* do border along [img][row=dstHeight-1][col=dstWidth-1] */

+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage

+                         + (bytesPerSrcImage - bpt);

+            dst = dstPtr + (img + 1) * bytesPerDstImage

+                         + (bytesPerDstImage - bpt);

+            do_row(datatype, comps, 1, src, src + srcImageOffset, 1, dst);

+         }

+      }

+   }

+}

+

+

+static void

+make_1d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,

+                     GLint srcWidth, const GLubyte *srcPtr, GLuint srcRowStride,

+                     GLint dstWidth, GLint dstHeight,

+		     GLubyte *dstPtr, GLuint dstRowStride )

+{

+   const GLint bpt = bytes_per_pixel(datatype, comps);

+   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */

+   const GLint dstWidthNB = dstWidth - 2 * border;

+   const GLint dstHeightNB = dstHeight - 2 * border;

+   const GLint srcRowBytes = bpt * srcRowStride;

+   const GLint dstRowBytes = bpt * dstRowStride;

+   const GLubyte *src;

+   GLubyte *dst;

+   GLint row;

+

+   /* Compute src and dst pointers, skipping any border */

+   src = srcPtr + border * ((srcWidth + 1) * bpt);

+   dst = dstPtr + border * ((dstWidth + 1) * bpt);

+

+   for (row = 0; row < dstHeightNB; row++) {

+      do_row(datatype, comps, srcWidthNB, src, src,

+             dstWidthNB, dst);

+      src += srcRowBytes;

+      dst += dstRowBytes;

+   }

+

+   if (border) {

+      /* copy left-most pixel from source */

+      assert(dstPtr);

+      assert(srcPtr);

+      memcpy(dstPtr, srcPtr, bpt);

+      /* copy right-most pixel from source */

+      memcpy(dstPtr + (dstWidth - 1) * bpt,

+             srcPtr + (srcWidth - 1) * bpt,

+             bpt);

+   }

+}

+

+

+/**

+ * \bug

+ * There is quite a bit of refactoring that could be done with this function

+ * and \c make_2d_mipmap.

+ */

+static void

+make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,

+                     GLint srcWidth, GLint srcHeight,

+		     const GLubyte *srcPtr, GLint srcRowStride,

+                     GLint dstWidth, GLint dstHeight, GLint dstDepth,

+                     GLubyte *dstPtr, GLint dstRowStride)

+{

+   const GLint bpt = bytes_per_pixel(datatype, comps);

+   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */

+   const GLint dstWidthNB = dstWidth - 2 * border;

+   const GLint dstHeightNB = dstHeight - 2 * border;

+   const GLint dstDepthNB = dstDepth - 2 * border;

+   const GLint srcRowBytes = bpt * srcRowStride;

+   const GLint dstRowBytes = bpt * dstRowStride;

+   const GLubyte *srcA, *srcB;

+   GLubyte *dst;

+   GLint layer;

+   GLint row;

+

+   /* Compute src and dst pointers, skipping any border */

+   srcA = srcPtr + border * ((srcWidth + 1) * bpt);

+   if (srcHeight > 1) 

+      srcB = srcA + srcRowBytes;

+   else

+      srcB = srcA;

+   dst = dstPtr + border * ((dstWidth + 1) * bpt);

+

+   for (layer = 0; layer < dstDepthNB; layer++) {

+      for (row = 0; row < dstHeightNB; row++) {

+         do_row(datatype, comps, srcWidthNB, srcA, srcB,

+                dstWidthNB, dst);

+         srcA += 2 * srcRowBytes;

+         srcB += 2 * srcRowBytes;

+         dst += dstRowBytes;

+      }

+

+      /* This is ugly but probably won't be used much */

+      if (border > 0) {

+         /* fill in dest border */

+         /* lower-left border pixel */

+         assert(dstPtr);

+         assert(srcPtr);

+         memcpy(dstPtr, srcPtr, bpt);

+         /* lower-right border pixel */

+         memcpy(dstPtr + (dstWidth - 1) * bpt,

+                srcPtr + (srcWidth - 1) * bpt, bpt);

+         /* upper-left border pixel */

+         memcpy(dstPtr + dstWidth * (dstHeight - 1) * bpt,

+                srcPtr + srcWidth * (srcHeight - 1) * bpt, bpt);

+         /* upper-right border pixel */

+         memcpy(dstPtr + (dstWidth * dstHeight - 1) * bpt,

+                srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);

+         /* lower border */

+         do_row(datatype, comps, srcWidthNB,

+                srcPtr + bpt,

+                srcPtr + bpt,

+                dstWidthNB, dstPtr + bpt);

+         /* upper border */

+         do_row(datatype, comps, srcWidthNB,

+                srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,

+                srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,

+                dstWidthNB,

+                dstPtr + (dstWidth * (dstHeight - 1) + 1) * bpt);

+         /* left and right borders */

+         if (srcHeight == dstHeight) {

+            /* copy border pixel from src to dst */

+            for (row = 1; row < srcHeight; row++) {

+               memcpy(dstPtr + dstWidth * row * bpt,

+                      srcPtr + srcWidth * row * bpt, bpt);

+               memcpy(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,

+                      srcPtr + (srcWidth * row + srcWidth - 1) * bpt, bpt);

+            }

+         }

+         else {

+            /* average two src pixels each dest pixel */

+            for (row = 0; row < dstHeightNB; row += 2) {

+               do_row(datatype, comps, 1,

+                      srcPtr + (srcWidth * (row * 2 + 1)) * bpt,

+                      srcPtr + (srcWidth * (row * 2 + 2)) * bpt,

+                      1, dstPtr + (dstWidth * row + 1) * bpt);

+               do_row(datatype, comps, 1,

+                      srcPtr + (srcWidth * (row * 2 + 1) + srcWidth - 1) * bpt,

+                      srcPtr + (srcWidth * (row * 2 + 2) + srcWidth - 1) * bpt,

+                      1, dstPtr + (dstWidth * row + 1 + dstWidth - 1) * bpt);

+            }

+         }

+      }

+   }

+}

+

+

+/**

+ * Down-sample a texture image to produce the next lower mipmap level.

+ * \param comps  components per texel (1, 2, 3 or 4)

+ * \param srcRowStride  stride between source rows, in texels

+ * \param dstRowStride  stride between destination rows, in texels

+ */

+void

+_mesa_generate_mipmap_level(GLenum target,

+                            GLenum datatype, GLuint comps,

+                            GLint border,

+                            GLint srcWidth, GLint srcHeight, GLint srcDepth,

+                            const GLubyte *srcData,

+                            GLint srcRowStride,

+                            GLint dstWidth, GLint dstHeight, GLint dstDepth,

+                            GLubyte *dstData,

+                            GLint dstRowStride)

+{

+   /*

+    * We use simple 2x2 averaging to compute the next mipmap level.

+    */

+   switch (target) {

+   case GL_TEXTURE_1D:

+      make_1d_mipmap(datatype, comps, border,

+                     srcWidth, srcData,

+                     dstWidth, dstData);

+      break;

+   case GL_TEXTURE_2D:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:

+      make_2d_mipmap(datatype, comps, border,

+                     srcWidth, srcHeight, srcData, srcRowStride,

+                     dstWidth, dstHeight, dstData, dstRowStride);

+      break;

+   case GL_TEXTURE_3D:

+      make_3d_mipmap(datatype, comps, border,

+                     srcWidth, srcHeight, srcDepth,

+                     srcData, srcRowStride,

+                     dstWidth, dstHeight, dstDepth,

+                     dstData, dstRowStride);

+      break;

+   case GL_TEXTURE_1D_ARRAY_EXT:

+      make_1d_stack_mipmap(datatype, comps, border,

+                           srcWidth, srcData, srcRowStride,

+                           dstWidth, dstHeight,

+                           dstData, dstRowStride);

+      break;

+   case GL_TEXTURE_2D_ARRAY_EXT:

+      make_2d_stack_mipmap(datatype, comps, border,

+                           srcWidth, srcHeight,

+                           srcData, srcRowStride,

+                           dstWidth, dstHeight,

+                           dstDepth, dstData, dstRowStride);

+      break;

+   case GL_TEXTURE_RECTANGLE_NV:

+      /* no mipmaps, do nothing */

+      break;

+   default:

+      _mesa_problem(NULL, "bad dimensions in _mesa_generate_mipmaps");

+      return;

+   }

+}

+

+

+/**

+ * compute next (level+1) image size

+ * \return GL_FALSE if no smaller size can be generated (eg. src is 1x1x1 size)

+ */

+static GLboolean

+next_mipmap_level_size(GLenum target, GLint border,

+                       GLint srcWidth, GLint srcHeight, GLint srcDepth,

+                       GLint *dstWidth, GLint *dstHeight, GLint *dstDepth)

+{

+   if (srcWidth - 2 * border > 1) {

+      *dstWidth = (srcWidth - 2 * border) / 2 + 2 * border;

+   }

+   else {

+      *dstWidth = srcWidth; /* can't go smaller */

+   }

+

+   if ((srcHeight - 2 * border > 1) && 

+       (target != GL_TEXTURE_1D_ARRAY_EXT)) {

+      *dstHeight = (srcHeight - 2 * border) / 2 + 2 * border;

+   }

+   else {

+      *dstHeight = srcHeight; /* can't go smaller */

+   }

+

+   if ((srcDepth - 2 * border > 1) &&

+       (target != GL_TEXTURE_2D_ARRAY_EXT)) {

+      *dstDepth = (srcDepth - 2 * border) / 2 + 2 * border;

+   }

+   else {

+      *dstDepth = srcDepth; /* can't go smaller */

+   }

+

+   if (*dstWidth == srcWidth &&

+       *dstHeight == srcHeight &&

+       *dstDepth == srcDepth) {

+      return GL_FALSE;

+   }

+   else {

+      return GL_TRUE;

+   }

+}

+

+

+

+

+/**

+ * Automatic mipmap generation.

+ * This is the fallback/default function for ctx->Driver.GenerateMipmap().

+ * Generate a complete set of mipmaps from texObj's BaseLevel image.

+ * Stop at texObj's MaxLevel or when we get to the 1x1 texture.

+ * For cube maps, target will be one of

+ * GL_TEXTURE_CUBE_MAP_POSITIVE/NEGATIVE_X/Y/Z; never GL_TEXTURE_CUBE_MAP.

+ */

+void

+_mesa_generate_mipmap(struct gl_context *ctx, GLenum target,

+                      struct gl_texture_object *texObj)

+{

+   const struct gl_texture_image *srcImage;

+   gl_format convertFormat;

+   const GLubyte *srcData = NULL;

+   GLubyte *dstData = NULL;

+   GLint level, maxLevels;

+   GLenum datatype;

+   GLuint comps;

+

+   ASSERT(texObj);

+   srcImage = _mesa_select_tex_image(ctx, texObj, target, texObj->BaseLevel);

+   ASSERT(srcImage);

+

+   maxLevels = _mesa_max_texture_levels(ctx, texObj->Target);

+   ASSERT(maxLevels > 0);  /* bad target */

+

+   /* Find convertFormat - the format that do_row() will process */

+

+   if (_mesa_is_format_compressed(srcImage->TexFormat)) {

+      /* setup for compressed textures - need to allocate temporary

+       * image buffers to hold uncompressed images.

+       */

+      GLuint row;

+      GLint  components, size;

+      GLchan *dst;

+

+      assert(texObj->Target == GL_TEXTURE_2D ||

+             texObj->Target == GL_TEXTURE_CUBE_MAP_ARB);

+

+      if (srcImage->_BaseFormat == GL_RGB) {

+         convertFormat = MESA_FORMAT_RGB888;

+         components = 3;

+      } else if (srcImage->_BaseFormat == GL_RED) {

+         convertFormat = MESA_FORMAT_R8;

+         components = 1;

+      } else if (srcImage->_BaseFormat == GL_RG) {

+         convertFormat = MESA_FORMAT_RG88;

+         components = 2;

+      } else if (srcImage->_BaseFormat == GL_RGBA) {

+         convertFormat = MESA_FORMAT_RGBA8888;

+         components = 4;

+      } else if (srcImage->_BaseFormat == GL_LUMINANCE) {

+         convertFormat = MESA_FORMAT_L8;

+         components = 1;

+      } else if (srcImage->_BaseFormat == GL_LUMINANCE_ALPHA) {

+         convertFormat = MESA_FORMAT_AL88;

+         components = 2;

+      } else {

+         _mesa_problem(ctx, "bad srcImage->_BaseFormat in _mesa_generate_mipmaps");

+         return;

+      }

+

+      /* allocate storage for uncompressed GL_RGB or GL_RGBA images */

+      size = _mesa_bytes_per_pixel(srcImage->_BaseFormat, CHAN_TYPE)

+         * srcImage->Width * srcImage->Height * srcImage->Depth + 20;

+      /* 20 extra bytes, just be safe when calling last FetchTexel */

+      srcData = (GLubyte *) malloc(size);

+      if (!srcData) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");

+         return;

+      }

+      dstData = (GLubyte *) malloc(size / 2);  /* 1/4 would probably be OK */

+      if (!dstData) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");

+         free((void *) srcData);

+         return;

+      }

+

+      /* decompress base image here */

+      dst = (GLchan *) srcData;

+      for (row = 0; row < srcImage->Height; row++) {

+         GLuint col;

+         for (col = 0; col < srcImage->Width; col++) {

+            srcImage->FetchTexelc(srcImage, col, row, 0, dst);

+            dst += components;

+         }

+      }

+   }

+   else {

+      /* uncompressed */

+      convertFormat = srcImage->TexFormat;

+   }

+

+   _mesa_format_to_type_and_comps(convertFormat, &datatype, &comps);

+

+   for (level = texObj->BaseLevel; level < texObj->MaxLevel

+           && level < maxLevels - 1; level++) {

+      /* generate image[level+1] from image[level] */

+      const struct gl_texture_image *srcImage;

+      struct gl_texture_image *dstImage;

+      GLint srcWidth, srcHeight, srcDepth;

+      GLint dstWidth, dstHeight, dstDepth;

+      GLint border;

+      GLboolean nextLevel;

+

+      /* get src image parameters */

+      srcImage = _mesa_select_tex_image(ctx, texObj, target, level);

+      ASSERT(srcImage);

+      srcWidth = srcImage->Width;

+      srcHeight = srcImage->Height;

+      srcDepth = srcImage->Depth;

+      border = srcImage->Border;

+

+      nextLevel = next_mipmap_level_size(target, border,

+                                         srcWidth, srcHeight, srcDepth,

+                                         &dstWidth, &dstHeight, &dstDepth);

+      if (!nextLevel) {

+         /* all done */

+         if (_mesa_is_format_compressed(srcImage->TexFormat)) {

+            free((void *) srcData);

+            free(dstData);

+         }

+         return;

+      }

+

+      /* get dest gl_texture_image */

+      dstImage = _mesa_get_tex_image(ctx, texObj, target, level + 1);

+      if (!dstImage) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");

+         return;

+      }

+

+      /* Free old image data */

+      if (dstImage->Data)

+         ctx->Driver.FreeTexImageData(ctx, dstImage);

+

+      /* initialize new image */

+      _mesa_init_teximage_fields(ctx, target, dstImage, dstWidth, dstHeight,

+                                 dstDepth, border, srcImage->InternalFormat,

+                                 srcImage->TexFormat);

+      dstImage->DriverData = NULL;

+      dstImage->FetchTexelc = srcImage->FetchTexelc;

+      dstImage->FetchTexelf = srcImage->FetchTexelf;

+

+      /* Alloc new teximage data buffer */

+      {

+         GLuint size = _mesa_format_image_size(dstImage->TexFormat,

+                                               dstWidth, dstHeight, dstDepth);

+         dstImage->Data = _mesa_alloc_texmemory(size);

+         if (!dstImage->Data) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");

+            return;

+         }

+      }

+

+      /* Setup src and dest data pointers */

+      if (_mesa_is_format_compressed(dstImage->TexFormat)) {

+         /* srcData and dstData are already set */

+         ASSERT(srcData);

+         ASSERT(dstData);

+      }

+      else {

+         srcData = (const GLubyte *) srcImage->Data;

+         dstData = (GLubyte *) dstImage->Data;

+      }

+

+      ASSERT(dstImage->TexFormat);

+      ASSERT(dstImage->FetchTexelc);

+      ASSERT(dstImage->FetchTexelf);

+

+      _mesa_generate_mipmap_level(target, datatype, comps, border,

+                                  srcWidth, srcHeight, srcDepth, 

+                                  srcData, srcImage->RowStride,

+                                  dstWidth, dstHeight, dstDepth, 

+                                  dstData, dstImage->RowStride);

+

+

+      if (_mesa_is_format_compressed(dstImage->TexFormat)) {

+         GLubyte *temp;

+         /* compress image from dstData into dstImage->Data */

+         const GLenum srcFormat = _mesa_get_format_base_format(convertFormat);

+         GLint dstRowStride

+            = _mesa_format_row_stride(dstImage->TexFormat, dstWidth);

+         ASSERT(srcFormat == GL_RGB || srcFormat == GL_RGBA);

+

+         _mesa_texstore(ctx, 2, dstImage->_BaseFormat,

+                        dstImage->TexFormat,

+                        dstImage->Data,

+                        0, 0, 0, /* dstX/Y/Zoffset */

+                        dstRowStride, 0, /* strides */

+                        dstWidth, dstHeight, 1, /* size */

+                        srcFormat, CHAN_TYPE,

+                        dstData, /* src data, actually */

+                        &ctx->DefaultPacking);

+

+         /* swap src and dest pointers */

+         temp = (GLubyte *) srcData;

+         srcData = dstData;

+         dstData = temp;

+      }

+

+   } /* loop over mipmap levels */

+}

+

+

+/**

+ * Helper function for drivers which need to rescale texture images to

+ * certain aspect ratios.

+ * Nearest filtering only (for broken hardware that can't support

+ * all aspect ratios).  This can be made a lot faster, but I don't

+ * really care enough...

+ */

+void

+_mesa_rescale_teximage2d(GLuint bytesPerPixel,

+			 GLuint srcStrideInPixels,

+			 GLuint dstRowStride,

+			 GLint srcWidth, GLint srcHeight,

+			 GLint dstWidth, GLint dstHeight,

+			 const GLvoid *srcImage, GLvoid *dstImage)

+{

+   GLint row, col;

+

+#define INNER_LOOP( TYPE, HOP, WOP )					\

+   for ( row = 0 ; row < dstHeight ; row++ ) {				\

+      GLint srcRow = row HOP hScale;					\

+      for ( col = 0 ; col < dstWidth ; col++ ) {			\

+	 GLint srcCol = col WOP wScale;					\

+	 dst[col] = src[srcRow * srcStrideInPixels + srcCol];		\

+      }									\

+      dst = (TYPE *) ((GLubyte *) dst + dstRowStride);			\

+   }									\

+

+#define RESCALE_IMAGE( TYPE )						\

+do {									\

+   const TYPE *src = (const TYPE *)srcImage;				\

+   TYPE *dst = (TYPE *)dstImage;					\

+									\

+   if ( srcHeight < dstHeight ) {					\

+      const GLint hScale = dstHeight / srcHeight;			\

+      if ( srcWidth < dstWidth ) {					\

+	 const GLint wScale = dstWidth / srcWidth;			\

+	 INNER_LOOP( TYPE, /, / );					\

+      }									\

+      else {								\

+	 const GLint wScale = srcWidth / dstWidth;			\

+	 INNER_LOOP( TYPE, /, * );					\

+      }									\

+   }									\

+   else {								\

+      const GLint hScale = srcHeight / dstHeight;			\

+      if ( srcWidth < dstWidth ) {					\

+	 const GLint wScale = dstWidth / srcWidth;			\

+	 INNER_LOOP( TYPE, *, / );					\

+      }									\

+      else {								\

+	 const GLint wScale = srcWidth / dstWidth;			\

+	 INNER_LOOP( TYPE, *, * );					\

+      }									\

+   }									\

+} while (0)

+

+   switch ( bytesPerPixel ) {

+   case 4:

+      RESCALE_IMAGE( GLuint );

+      break;

+

+   case 2:

+      RESCALE_IMAGE( GLushort );

+      break;

+

+   case 1:

+      RESCALE_IMAGE( GLubyte );

+      break;

+   default:

+      _mesa_problem(NULL,"unexpected bytes/pixel in _mesa_rescale_teximage2d");

+   }

+}

+

+

+/**

+ * Upscale an image by replication, not (typical) stretching.

+ * We use this when the image width or height is less than a

+ * certain size (4, 8) and we need to upscale an image.

+ */

+void

+_mesa_upscale_teximage2d(GLsizei inWidth, GLsizei inHeight,

+                         GLsizei outWidth, GLsizei outHeight,

+                         GLint comps, const GLchan *src, GLint srcRowStride,

+                         GLchan *dest )

+{

+   GLint i, j, k;

+

+   ASSERT(outWidth >= inWidth);

+   ASSERT(outHeight >= inHeight);

+#if 0

+   ASSERT(inWidth == 1 || inWidth == 2 || inHeight == 1 || inHeight == 2);

+   ASSERT((outWidth & 3) == 0);

+   ASSERT((outHeight & 3) == 0);

+#endif

+

+   for (i = 0; i < outHeight; i++) {

+      const GLint ii = i % inHeight;

+      for (j = 0; j < outWidth; j++) {

+         const GLint jj = j % inWidth;

+         for (k = 0; k < comps; k++) {

+            dest[(i * outWidth + j) * comps + k]

+               = src[ii * srcRowStride + jj * comps + k];

+         }

+      }

+   }

+}

+

diff --git a/mesalib/src/mesa/main/pack.c b/mesalib/src/mesa/main/pack.c
index 02154585a..aa32ee9bc 100644
--- a/mesalib/src/mesa/main/pack.c
+++ b/mesalib/src/mesa/main/pack.c
@@ -1,5053 +1,5053 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.
- *
- * 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
- * THEA AUTHORS 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.
- */
-
-
-/**
- * \file pack.c
- * Image and pixel span packing and unpacking.
- */
-
-
-#include "glheader.h"
-#include "colormac.h"
-#include "enums.h"
-#include "image.h"
-#include "imports.h"
-#include "mtypes.h"
-#include "pack.h"
-#include "pixeltransfer.h"
-#include "imports.h"
-
-
-/**
- * NOTE:
- * Normally, BYTE_TO_FLOAT(0) returns 0.00392  That causes problems when
- * we later convert the float to a packed integer value (such as for
- * GL_RGB5_A1) because we'll wind up with a non-zero value.
- *
- * We redefine the macros here so zero is handled correctly.
- */
-#undef BYTE_TO_FLOAT
-#define BYTE_TO_FLOAT(B)    ((B) == 0 ? 0.0F : ((2.0F * (B) + 1.0F) * (1.0F/255.0F)))
-
-#undef SHORT_TO_FLOAT
-#define SHORT_TO_FLOAT(S)   ((S) == 0 ? 0.0F : ((2.0F * (S) + 1.0F) * (1.0F/65535.0F)))
-
-
-
-/** Compute ceiling of integer quotient of A divided by B. */
-#define CEILING( A, B )  ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 )
-
-
-/**
- * Flip the 8 bits in each byte of the given array.
- *
- * \param p array.
- * \param n number of bytes.
- *
- * \todo try this trick to flip bytes someday:
- * \code
- *  v = ((v & 0x55555555) << 1) | ((v >> 1) & 0x55555555);
- *  v = ((v & 0x33333333) << 2) | ((v >> 2) & 0x33333333);
- *  v = ((v & 0x0f0f0f0f) << 4) | ((v >> 4) & 0x0f0f0f0f);
- * \endcode
- */
-static void
-flip_bytes( GLubyte *p, GLuint n )
-{
-   GLuint i, a, b;
-   for (i = 0; i < n; i++) {
-      b = (GLuint) p[i];        /* words are often faster than bytes */
-      a = ((b & 0x01) << 7) |
-	  ((b & 0x02) << 5) |
-	  ((b & 0x04) << 3) |
-	  ((b & 0x08) << 1) |
-	  ((b & 0x10) >> 1) |
-	  ((b & 0x20) >> 3) |
-	  ((b & 0x40) >> 5) |
-	  ((b & 0x80) >> 7);
-      p[i] = (GLubyte) a;
-   }
-}
-
-
-
-/*
- * Unpack a 32x32 pixel polygon stipple from user memory using the
- * current pixel unpack settings.
- */
-void
-_mesa_unpack_polygon_stipple( const GLubyte *pattern, GLuint dest[32],
-                              const struct gl_pixelstore_attrib *unpacking )
-{
-   GLubyte *ptrn = (GLubyte *) _mesa_unpack_bitmap(32, 32, pattern, unpacking);
-   if (ptrn) {
-      /* Convert pattern from GLubytes to GLuints and handle big/little
-       * endian differences
-       */
-      GLubyte *p = ptrn;
-      GLint i;
-      for (i = 0; i < 32; i++) {
-         dest[i] = (p[0] << 24)
-                 | (p[1] << 16)
-                 | (p[2] <<  8)
-                 | (p[3]      );
-         p += 4;
-      }
-      free(ptrn);
-   }
-}
-
-
-/*
- * Pack polygon stipple into user memory given current pixel packing
- * settings.
- */
-void
-_mesa_pack_polygon_stipple( const GLuint pattern[32], GLubyte *dest,
-                            const struct gl_pixelstore_attrib *packing )
-{
-   /* Convert pattern from GLuints to GLubytes to handle big/little
-    * endian differences.
-    */
-   GLubyte ptrn[32*4];
-   GLint i;
-   for (i = 0; i < 32; i++) {
-      ptrn[i * 4 + 0] = (GLubyte) ((pattern[i] >> 24) & 0xff);
-      ptrn[i * 4 + 1] = (GLubyte) ((pattern[i] >> 16) & 0xff);
-      ptrn[i * 4 + 2] = (GLubyte) ((pattern[i] >> 8 ) & 0xff);
-      ptrn[i * 4 + 3] = (GLubyte) ((pattern[i]      ) & 0xff);
-   }
-
-   _mesa_pack_bitmap(32, 32, ptrn, dest, packing);
-}
-
-
-/*
- * Unpack bitmap data.  Resulting data will be in most-significant-bit-first
- * order with row alignment = 1 byte.
- */
-GLvoid *
-_mesa_unpack_bitmap( GLint width, GLint height, const GLubyte *pixels,
-                     const struct gl_pixelstore_attrib *packing )
-{
-   GLint bytes, row, width_in_bytes;
-   GLubyte *buffer, *dst;
-
-   if (!pixels)
-      return NULL;
-
-   /* Alloc dest storage */
-   bytes = ((width + 7) / 8 * height);
-   buffer = (GLubyte *) malloc( bytes );
-   if (!buffer)
-      return NULL;
-
-   width_in_bytes = CEILING( width, 8 );
-   dst = buffer;
-   for (row = 0; row < height; row++) {
-      const GLubyte *src = (const GLubyte *)
-         _mesa_image_address2d(packing, pixels, width, height,
-                               GL_COLOR_INDEX, GL_BITMAP, row, 0);
-      if (!src) {
-         free(buffer);
-         return NULL;
-      }
-
-      if ((packing->SkipPixels & 7) == 0) {
-         memcpy( dst, src, width_in_bytes );
-         if (packing->LsbFirst) {
-            flip_bytes( dst, width_in_bytes );
-         }
-      }
-      else {
-         /* handling SkipPixels is a bit tricky (no pun intended!) */
-         GLint i;
-         if (packing->LsbFirst) {
-            GLubyte srcMask = 1 << (packing->SkipPixels & 0x7);
-            GLubyte dstMask = 128;
-            const GLubyte *s = src;
-            GLubyte *d = dst;
-            *d = 0;
-            for (i = 0; i < width; i++) {
-               if (*s & srcMask) {
-                  *d |= dstMask;
-               }
-               if (srcMask == 128) {
-                  srcMask = 1;
-                  s++;
-               }
-               else {
-                  srcMask = srcMask << 1;
-               }
-               if (dstMask == 1) {
-                  dstMask = 128;
-                  d++;
-                  *d = 0;
-               }
-               else {
-                  dstMask = dstMask >> 1;
-               }
-            }
-         }
-         else {
-            GLubyte srcMask = 128 >> (packing->SkipPixels & 0x7);
-            GLubyte dstMask = 128;
-            const GLubyte *s = src;
-            GLubyte *d = dst;
-            *d = 0;
-            for (i = 0; i < width; i++) {
-               if (*s & srcMask) {
-                  *d |= dstMask;
-               }
-               if (srcMask == 1) {
-                  srcMask = 128;
-                  s++;
-               }
-               else {
-                  srcMask = srcMask >> 1;
-               }
-               if (dstMask == 1) {
-                  dstMask = 128;
-                  d++;
-                  *d = 0;
-               }
-               else {
-                  dstMask = dstMask >> 1;
-               }
-            }
-         }
-      }
-      dst += width_in_bytes;
-   }
-
-   return buffer;
-}
-
-
-/*
- * Pack bitmap data.
- */
-void
-_mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
-                   GLubyte *dest, const struct gl_pixelstore_attrib *packing )
-{
-   GLint row, width_in_bytes;
-   const GLubyte *src;
-
-   if (!source)
-      return;
-
-   width_in_bytes = CEILING( width, 8 );
-   src = source;
-   for (row = 0; row < height; row++) {
-      GLubyte *dst = (GLubyte *) _mesa_image_address2d(packing, dest,
-                       width, height, GL_COLOR_INDEX, GL_BITMAP, row, 0);
-      if (!dst)
-         return;
-
-      if ((packing->SkipPixels & 7) == 0) {
-         memcpy( dst, src, width_in_bytes );
-         if (packing->LsbFirst) {
-            flip_bytes( dst, width_in_bytes );
-         }
-      }
-      else {
-         /* handling SkipPixels is a bit tricky (no pun intended!) */
-         GLint i;
-         if (packing->LsbFirst) {
-            GLubyte srcMask = 128;
-            GLubyte dstMask = 1 << (packing->SkipPixels & 0x7);
-            const GLubyte *s = src;
-            GLubyte *d = dst;
-            *d = 0;
-            for (i = 0; i < width; i++) {
-               if (*s & srcMask) {
-                  *d |= dstMask;
-               }
-               if (srcMask == 1) {
-                  srcMask = 128;
-                  s++;
-               }
-               else {
-                  srcMask = srcMask >> 1;
-               }
-               if (dstMask == 128) {
-                  dstMask = 1;
-                  d++;
-                  *d = 0;
-               }
-               else {
-                  dstMask = dstMask << 1;
-               }
-            }
-         }
-         else {
-            GLubyte srcMask = 128;
-            GLubyte dstMask = 128 >> (packing->SkipPixels & 0x7);
-            const GLubyte *s = src;
-            GLubyte *d = dst;
-            *d = 0;
-            for (i = 0; i < width; i++) {
-               if (*s & srcMask) {
-                  *d |= dstMask;
-               }
-               if (srcMask == 1) {
-                  srcMask = 128;
-                  s++;
-               }
-               else {
-                  srcMask = srcMask >> 1;
-               }
-               if (dstMask == 1) {
-                  dstMask = 128;
-                  d++;
-                  *d = 0;
-               }
-               else {
-                  dstMask = dstMask >> 1;
-               }
-            }
-         }
-      }
-      src += width_in_bytes;
-   }
-}
-
-
-/**
- * Get indexes of color components for a basic color format, such as
- * GL_RGBA, GL_RED, GL_LUMINANCE_ALPHA, etc.  Return -1 for indexes
- * that do not apply.
- */
-static void
-get_component_indexes(GLenum format,
-                      GLint *redIndex,
-                      GLint *greenIndex,
-                      GLint *blueIndex,
-                      GLint *alphaIndex,
-                      GLint *luminanceIndex,
-                      GLint *intensityIndex)
-{
-   *redIndex = -1;
-   *greenIndex = -1;
-   *blueIndex = -1;
-   *alphaIndex = -1;
-   *luminanceIndex = -1;
-   *intensityIndex = -1;
-
-   switch (format) {
-   case GL_LUMINANCE:
-   case GL_LUMINANCE_INTEGER_EXT:
-      *luminanceIndex = 0;
-      break;
-   case GL_LUMINANCE_ALPHA:
-   case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-      *luminanceIndex = 0;
-      *alphaIndex = 1;
-      break;
-   case GL_INTENSITY:
-      *intensityIndex = 0;
-      break;
-   case GL_RED:
-   case GL_RED_INTEGER_EXT:
-      *redIndex = 0;
-      break;
-   case GL_GREEN:
-   case GL_GREEN_INTEGER_EXT:
-      *greenIndex = 0;
-      break;
-   case GL_BLUE:
-   case GL_BLUE_INTEGER_EXT:
-      *blueIndex = 0;
-      break;
-   case GL_ALPHA:
-   case GL_ALPHA_INTEGER_EXT:
-      *alphaIndex = 0;
-      break;
-   case GL_RG:
-   case GL_RG_INTEGER:
-      *redIndex = 0;
-      *greenIndex = 1;
-      break;
-   case GL_RGB:
-   case GL_RGB_INTEGER_EXT:
-      *redIndex = 0;
-      *greenIndex = 1;
-      *blueIndex = 2;
-      break;
-   case GL_BGR:
-   case GL_BGR_INTEGER_EXT:
-      *blueIndex = 0;
-      *greenIndex = 1;
-      *redIndex = 2;
-      break;
-   case GL_RGBA:
-   case GL_RGBA_INTEGER_EXT:
-      *redIndex = 0;
-      *greenIndex = 1;
-      *blueIndex = 2;
-      *alphaIndex = 3;
-      break;
-   case GL_BGRA:
-   case GL_BGRA_INTEGER:
-      *redIndex = 2;
-      *greenIndex = 1;
-      *blueIndex = 0;
-      *alphaIndex = 3;
-      break;
-   case GL_ABGR_EXT:
-      *redIndex = 3;
-      *greenIndex = 2;
-      *blueIndex = 1;
-      *alphaIndex = 0;
-      break;
-   case GL_DU8DV8_ATI:
-   case GL_DUDV_ATI:
-      *redIndex = 0;
-      *greenIndex = 1;
-      break;
-   default:
-      assert(0 && "bad format in get_component_indexes()");
-   }
-}
-
-
-
-/**
- * For small integer types, return the min and max possible values.
- * Used for clamping floats to unscaled integer types.
- * \return GL_TRUE if type is handled, GL_FALSE otherwise.
- */
-static GLboolean
-get_type_min_max(GLenum type, GLfloat *min, GLfloat *max)
-{
-   switch (type) {
-   case GL_BYTE:
-      *min = -128.0;
-      *max = 127.0;
-      return GL_TRUE;
-   case GL_UNSIGNED_BYTE:
-      *min = 0.0;
-      *max = 255.0;
-      return GL_TRUE;
-   case GL_SHORT:
-      *min = -32768.0;
-      *max = 32767.0;
-      return GL_TRUE;
-   case GL_UNSIGNED_SHORT:
-      *min = 0.0;
-      *max = 65535.0;
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-
-/**
- * Used to pack an array [][4] of RGBA float colors as specified
- * by the dstFormat, dstType and dstPacking.  Used by glReadPixels.
- * Historically, the RGBA values were in [0,1] and rescaled to fit
- * into GLubytes, etc.  But with new integer formats, the RGBA values
- * may have any value and we don't always rescale when converting to
- * integers.
- *
- * Note: the rgba values will be modified by this function when any pixel
- * transfer ops are enabled.
- */
-void
-_mesa_pack_rgba_span_float(struct gl_context *ctx, GLuint n, GLfloat rgba[][4],
-                           GLenum dstFormat, GLenum dstType,
-                           GLvoid *dstAddr,
-                           const struct gl_pixelstore_attrib *dstPacking,
-                           GLbitfield transferOps)
-{
-   GLfloat *luminance;
-   const GLint comps = _mesa_components_in_format(dstFormat);
-   const GLboolean intDstFormat = _mesa_is_integer_format(dstFormat);
-   GLuint i;
-
-   if (dstFormat == GL_LUMINANCE ||
-       dstFormat == GL_LUMINANCE_ALPHA ||
-       dstFormat == GL_LUMINANCE_INTEGER_EXT ||
-       dstFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT) {
-      luminance = (GLfloat *) malloc(n * sizeof(GLfloat));
-      if (!luminance) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel packing");
-         return;
-      }
-   }
-   else {
-      luminance = NULL;
-   }
-
-   if (transferOps) {
-      _mesa_apply_rgba_transfer_ops(ctx, transferOps, n, rgba);
-   }
-
-   /*
-    * Component clamping (besides clamping to [0,1] in
-    * _mesa_apply_rgba_transfer_ops()).
-    */
-   if (intDstFormat) {
-      /* clamping to dest type's min/max values */
-      GLfloat min, max;
-      if (get_type_min_max(dstType, &min, &max)) {
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], min, max);
-            rgba[i][GCOMP] = CLAMP(rgba[i][GCOMP], min, max);
-            rgba[i][BCOMP] = CLAMP(rgba[i][BCOMP], min, max);
-            rgba[i][ACOMP] = CLAMP(rgba[i][ACOMP], min, max);
-         }
-      }
-   }
-   else if (dstFormat == GL_LUMINANCE || dstFormat == GL_LUMINANCE_ALPHA) {
-      /* compute luminance values */
-      if (transferOps & IMAGE_CLAMP_BIT) {
-         for (i = 0; i < n; i++) {
-            GLfloat sum = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];
-            luminance[i] = CLAMP(sum, 0.0F, 1.0F);
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            luminance[i] = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];
-         }
-      }
-   }
-
-   /*
-    * Pack/store the pixels.  Ugh!  Lots of cases!!!
-    */
-   switch (dstType) {
-      case GL_UNSIGNED_BYTE:
-         {
-            GLubyte *dst = (GLubyte *) dstAddr;
-            switch (dstFormat) {
-               case GL_RED:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
-                  break;
-               case GL_GREEN:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
-                  break;
-               case GL_BLUE:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
-                  break;
-               case GL_ALPHA:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
-                  break;
-               case GL_LUMINANCE:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_UBYTE(luminance[i]);
-                  break;
-               case GL_LUMINANCE_ALPHA:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_UBYTE(luminance[i]);
-                     dst[i*2+1] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_RG:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
-                     dst[i*2+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
-                  }
-                  break;
-               case GL_RGB:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
-                     dst[i*3+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
-                     dst[i*3+2] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_RGBA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
-                     dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
-                     dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
-                     dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_BGR:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
-                     dst[i*3+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
-                     dst[i*3+2] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_BGRA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
-                     dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
-                     dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
-                     dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_ABGR_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
-                     dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
-                     dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
-                     dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_RED_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLubyte) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_GREEN_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLubyte) rgba[i][GCOMP];
-                  }
-                  break;
-               case GL_BLUE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLubyte) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLubyte) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_RGB_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLubyte) rgba[i][RCOMP];
-                     dst[i*3+1] = (GLubyte) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLubyte) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_RGBA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLubyte) rgba[i][RCOMP];
-                     dst[i*4+1] = (GLubyte) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLubyte) rgba[i][BCOMP];
-                     dst[i*4+3] = (GLubyte) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_BGR_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLubyte) rgba[i][BCOMP];
-                     dst[i*3+1] = (GLubyte) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLubyte) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_BGRA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLubyte) rgba[i][BCOMP];
-                     dst[i*4+1] = (GLubyte) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLubyte) rgba[i][RCOMP];
-                     dst[i*4+3] = (GLubyte) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = (GLubyte) (rgba[i][RCOMP] +
-                                             rgba[i][GCOMP] +
-                                             rgba[i][BCOMP]);
-                     dst[i*2+1] = (GLubyte) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLubyte) (rgba[i][RCOMP] +
-                                         rgba[i][GCOMP] +
-                                         rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_DUDV_ATI:
-               case GL_DU8DV8_ATI:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
-                     dst[i*2+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
-                  }
-                  break;
-               default:
-                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
-            }
-         }
-         break;
-      case GL_BYTE:
-         {
-            GLbyte *dst = (GLbyte *) dstAddr;
-            switch (dstFormat) {
-               case GL_RED:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
-                  break;
-               case GL_GREEN:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
-                  break;
-               case GL_BLUE:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
-                  break;
-               case GL_ALPHA:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
-                  break;
-               case GL_LUMINANCE:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_BYTE(luminance[i]);
-                  break;
-               case GL_LUMINANCE_ALPHA:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_BYTE(luminance[i]);
-                     dst[i*2+1] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_RG:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
-                     dst[i*2+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
-                  }
-                  break;
-               case GL_RGB:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
-                     dst[i*3+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
-                     dst[i*3+2] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_RGBA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
-                     dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
-                     dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
-                     dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_BGR:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
-                     dst[i*3+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
-                     dst[i*3+2] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_BGRA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
-                     dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
-                     dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
-                     dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
-                  }
-		  break;
-               case GL_ABGR_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
-                     dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
-                     dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
-                     dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_RED_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLbyte) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_GREEN_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLbyte) rgba[i][GCOMP];
-                  }
-                  break;
-               case GL_BLUE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLbyte) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLbyte) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_RGB_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLbyte) rgba[i][RCOMP];
-                     dst[i*3+1] = (GLbyte) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLbyte) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_RGBA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLbyte) rgba[i][RCOMP];
-                     dst[i*4+1] = (GLbyte) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLbyte) rgba[i][BCOMP];
-                     dst[i*4+3] = (GLbyte) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_BGR_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLbyte) rgba[i][BCOMP];
-                     dst[i*3+1] = (GLbyte) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLbyte) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_BGRA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLbyte) rgba[i][BCOMP];
-                     dst[i*4+1] = (GLbyte) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLbyte) rgba[i][RCOMP];
-                     dst[i*4+3] = (GLbyte) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = (GLbyte) (rgba[i][RCOMP] +
-                                            rgba[i][GCOMP] +
-                                            rgba[i][BCOMP]);
-                     dst[i*2+1] = (GLbyte) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLbyte) (rgba[i][RCOMP] +
-                                        rgba[i][GCOMP] +
-                                        rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_DUDV_ATI:
-               case GL_DU8DV8_ATI:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
-                     dst[i*2+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
-                  }
-                  break;
-               default:
-                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT:
-         {
-            GLushort *dst = (GLushort *) dstAddr;
-            switch (dstFormat) {
-               case GL_RED:
-                  for (i=0;i<n;i++)
-                     CLAMPED_FLOAT_TO_USHORT(dst[i], rgba[i][RCOMP]);
-                  break;
-               case GL_GREEN:
-                  for (i=0;i<n;i++)
-                     CLAMPED_FLOAT_TO_USHORT(dst[i], rgba[i][GCOMP]);
-                  break;
-               case GL_BLUE:
-                  for (i=0;i<n;i++)
-                     CLAMPED_FLOAT_TO_USHORT(dst[i], rgba[i][BCOMP]);
-                  break;
-               case GL_ALPHA:
-                  for (i=0;i<n;i++)
-                     CLAMPED_FLOAT_TO_USHORT(dst[i], rgba[i][ACOMP]);
-                  break;
-               case GL_LUMINANCE:
-                  for (i=0;i<n;i++)
-                     UNCLAMPED_FLOAT_TO_USHORT(dst[i], luminance[i]);
-                  break;
-               case GL_LUMINANCE_ALPHA:
-                  for (i=0;i<n;i++) {
-                     UNCLAMPED_FLOAT_TO_USHORT(dst[i*2+0], luminance[i]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*2+1], rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_RG:
-                  for (i=0;i<n;i++) {
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*2+0], rgba[i][RCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*2+1], rgba[i][GCOMP]);
-                  }
-                  break;
-               case GL_RGB:
-                  for (i=0;i<n;i++) {
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+0], rgba[i][RCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+1], rgba[i][GCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+2], rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_RGBA:
-                  for (i=0;i<n;i++) {
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+0], rgba[i][RCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+1], rgba[i][GCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+2], rgba[i][BCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+3], rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_BGR:
-                  for (i=0;i<n;i++) {
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+0], rgba[i][BCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+1], rgba[i][GCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+2], rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_BGRA:
-                  for (i=0;i<n;i++) {
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+0], rgba[i][BCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+1], rgba[i][GCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+2], rgba[i][RCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+3], rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_ABGR_EXT:
-                  for (i=0;i<n;i++) {
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+0], rgba[i][ACOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+1], rgba[i][BCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+2], rgba[i][GCOMP]);
-                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+3], rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_RED_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLushort) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_GREEN_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLushort) rgba[i][GCOMP];
-                  }
-                  break;
-               case GL_BLUE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLushort) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLushort) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_RGB_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLushort) rgba[i][RCOMP];
-                     dst[i*3+1] = (GLushort) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLushort) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_RGBA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLushort) rgba[i][RCOMP];
-                     dst[i*4+1] = (GLushort) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLushort) rgba[i][BCOMP];
-                     dst[i*4+3] = (GLushort) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_BGR_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLushort) rgba[i][BCOMP];
-                     dst[i*3+1] = (GLushort) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLushort) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_BGRA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLushort) rgba[i][BCOMP];
-                     dst[i*4+1] = (GLushort) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLushort) rgba[i][RCOMP];
-                     dst[i*4+3] = (GLushort) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = (GLushort) (rgba[i][RCOMP] +
-                                              rgba[i][GCOMP] +
-                                              rgba[i][BCOMP]);
-                     dst[i*2+1] = (GLushort) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLushort) (rgba[i][RCOMP] +
-                                          rgba[i][GCOMP] +
-                                          rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_DUDV_ATI:
-               case GL_DU8DV8_ATI:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
-                     dst[i*2+1] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
-                  }
-                  break;
-               default:
-                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
-            }
-         }
-         break;
-      case GL_SHORT:
-         {
-            GLshort *dst = (GLshort *) dstAddr;
-            switch (dstFormat) {
-               case GL_RED:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
-                  break;
-               case GL_GREEN:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
-                  break;
-               case GL_BLUE:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
-                  break;
-               case GL_ALPHA:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
-                  break;
-               case GL_LUMINANCE:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_SHORT(luminance[i]);
-                  break;
-               case GL_LUMINANCE_ALPHA:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_SHORT(luminance[i]);
-                     dst[i*2+1] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_RG:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
-                     dst[i*2+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
-                  }
-                  break;
-               case GL_RGB:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
-                     dst[i*3+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
-                     dst[i*3+2] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_RGBA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
-                     dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
-                     dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
-                     dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_BGR:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
-                     dst[i*3+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
-                     dst[i*3+2] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_BGRA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
-                     dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
-                     dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
-                     dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
-                  }
-		  break;
-               case GL_ABGR_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
-                     dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
-                     dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
-                     dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_RED_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLshort) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_GREEN_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLshort) rgba[i][GCOMP];
-                  }
-                  break;
-               case GL_BLUE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLshort) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLshort) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_RGB_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLshort) rgba[i][RCOMP];
-                     dst[i*3+1] = (GLshort) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLshort) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_RGBA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLshort) rgba[i][RCOMP];
-                     dst[i*4+1] = (GLshort) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLshort) rgba[i][BCOMP];
-                     dst[i*4+3] = (GLshort) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_BGR_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLshort) rgba[i][BCOMP];
-                     dst[i*3+1] = (GLshort) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLshort) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_BGRA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLshort) rgba[i][BCOMP];
-                     dst[i*4+1] = (GLshort) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLshort) rgba[i][RCOMP];
-                     dst[i*4+3] = (GLshort) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = (GLshort) (rgba[i][RCOMP] +
-                                             rgba[i][GCOMP] +
-                                             rgba[i][BCOMP]);
-                     dst[i*2+1] = (GLshort) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLshort) (rgba[i][RCOMP] +
-                                         rgba[i][GCOMP] +
-                                         rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_DUDV_ATI:
-               case GL_DU8DV8_ATI:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
-                     dst[i*2+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
-                  }
-                  break;
-               default:
-                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT:
-         {
-            GLuint *dst = (GLuint *) dstAddr;
-            switch (dstFormat) {
-               case GL_RED:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_UINT(rgba[i][RCOMP]);
-                  break;
-               case GL_GREEN:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_UINT(rgba[i][GCOMP]);
-                  break;
-               case GL_BLUE:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_UINT(rgba[i][BCOMP]);
-                  break;
-               case GL_ALPHA:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_UINT(rgba[i][ACOMP]);
-                  break;
-               case GL_LUMINANCE:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_UINT(luminance[i]);
-                  break;
-               case GL_LUMINANCE_ALPHA:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_UINT(luminance[i]);
-                     dst[i*2+1] = FLOAT_TO_UINT(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_RG:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);
-                     dst[i*2+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
-                  }
-                  break;
-               case GL_RGB:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);
-                     dst[i*3+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
-                     dst[i*3+2] = FLOAT_TO_UINT(rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_RGBA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);
-                     dst[i*4+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
-                     dst[i*4+2] = FLOAT_TO_UINT(rgba[i][BCOMP]);
-                     dst[i*4+3] = FLOAT_TO_UINT(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_BGR:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = FLOAT_TO_UINT(rgba[i][BCOMP]);
-                     dst[i*3+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
-                     dst[i*3+2] = FLOAT_TO_UINT(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_BGRA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_UINT(rgba[i][BCOMP]);
-                     dst[i*4+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
-                     dst[i*4+2] = FLOAT_TO_UINT(rgba[i][RCOMP]);
-                     dst[i*4+3] = FLOAT_TO_UINT(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_ABGR_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_UINT(rgba[i][ACOMP]);
-                     dst[i*4+1] = FLOAT_TO_UINT(rgba[i][BCOMP]);
-                     dst[i*4+2] = FLOAT_TO_UINT(rgba[i][GCOMP]);
-                     dst[i*4+3] = FLOAT_TO_UINT(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_RED_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLuint) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_GREEN_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLuint) rgba[i][GCOMP];
-                  }
-                  break;
-               case GL_BLUE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLuint) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLuint) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_RGB_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLuint) rgba[i][RCOMP];
-                     dst[i*3+1] = (GLuint) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLuint) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_RGBA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLuint) rgba[i][RCOMP];
-                     dst[i*4+1] = (GLuint) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLuint) rgba[i][BCOMP];
-                     dst[i*4+3] = (GLuint) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_BGR_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLuint) rgba[i][BCOMP];
-                     dst[i*3+1] = (GLuint) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLuint) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_BGRA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLuint) rgba[i][BCOMP];
-                     dst[i*4+1] = (GLuint) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLuint) rgba[i][RCOMP];
-                     dst[i*4+3] = (GLuint) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = (GLuint) (rgba[i][RCOMP] +
-                                            rgba[i][GCOMP] +
-                                            rgba[i][BCOMP]);
-                     dst[i*2+1] = (GLuint) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLuint) (rgba[i][RCOMP] +
-                                        rgba[i][GCOMP] +
-                                        rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_DUDV_ATI:
-               case GL_DU8DV8_ATI:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);
-                     dst[i*2+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
-                  }
-                  break;
-               default:
-                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
-            }
-         }
-         break;
-      case GL_INT:
-         {
-            GLint *dst = (GLint *) dstAddr;
-            switch (dstFormat) {
-               case GL_RED:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_INT(rgba[i][RCOMP]);
-                  break;
-               case GL_GREEN:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_INT(rgba[i][GCOMP]);
-                  break;
-               case GL_BLUE:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_INT(rgba[i][BCOMP]);
-                  break;
-               case GL_ALPHA:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_INT(rgba[i][ACOMP]);
-                  break;
-               case GL_LUMINANCE:
-                  for (i=0;i<n;i++)
-                     dst[i] = FLOAT_TO_INT(luminance[i]);
-                  break;
-               case GL_LUMINANCE_ALPHA:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_INT(luminance[i]);
-                     dst[i*2+1] = FLOAT_TO_INT(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_RG:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_INT(rgba[i][RCOMP]);
-                     dst[i*2+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
-                  }
-                  break;
-               case GL_RGB:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = FLOAT_TO_INT(rgba[i][RCOMP]);
-                     dst[i*3+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
-                     dst[i*3+2] = FLOAT_TO_INT(rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_RGBA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_INT(rgba[i][RCOMP]);
-                     dst[i*4+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
-                     dst[i*4+2] = FLOAT_TO_INT(rgba[i][BCOMP]);
-                     dst[i*4+3] = FLOAT_TO_INT(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_BGR:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = FLOAT_TO_INT(rgba[i][BCOMP]);
-                     dst[i*3+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
-                     dst[i*3+2] = FLOAT_TO_INT(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_BGRA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_INT(rgba[i][BCOMP]);
-                     dst[i*4+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
-                     dst[i*4+2] = FLOAT_TO_INT(rgba[i][RCOMP]);
-                     dst[i*4+3] = FLOAT_TO_INT(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_ABGR_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = FLOAT_TO_INT(rgba[i][ACOMP]);
-                     dst[i*4+1] = FLOAT_TO_INT(rgba[i][BCOMP]);
-                     dst[i*4+2] = FLOAT_TO_INT(rgba[i][GCOMP]);
-                     dst[i*4+3] = FLOAT_TO_INT(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_DUDV_ATI:
-               case GL_DU8DV8_ATI:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = FLOAT_TO_INT(rgba[i][RCOMP]);
-                     dst[i*2+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
-                  }
-                  break;
-               case GL_RED_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLint) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_GREEN_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLint) rgba[i][GCOMP];
-                  }
-                  break;
-               case GL_BLUE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLint) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLint) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_RGB_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLint) rgba[i][RCOMP];
-                     dst[i*3+1] = (GLint) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLint) rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_RGBA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLint) rgba[i][RCOMP];
-                     dst[i*4+1] = (GLint) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLint) rgba[i][BCOMP];
-                     dst[i*4+3] = (GLint) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_BGR_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = (GLint) rgba[i][BCOMP];
-                     dst[i*3+1] = (GLint) rgba[i][GCOMP];
-                     dst[i*3+2] = (GLint) rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_BGRA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = (GLint) rgba[i][BCOMP];
-                     dst[i*4+1] = (GLint) rgba[i][GCOMP];
-                     dst[i*4+2] = (GLint) rgba[i][RCOMP];
-                     dst[i*4+3] = (GLint) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = (GLint) (rgba[i][RCOMP] +
-                                           rgba[i][GCOMP] +
-                                           rgba[i][BCOMP]);
-                     dst[i*2+1] = (GLint) rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i] = (GLint) (rgba[i][RCOMP] +
-                                       rgba[i][GCOMP] +
-                                       rgba[i][BCOMP]);
-                  }
-                  break;
-               default:
-                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
-            }
-         }
-         break;
-      case GL_FLOAT:
-         {
-            GLfloat *dst = (GLfloat *) dstAddr;
-            switch (dstFormat) {
-               case GL_RED:
-                  for (i=0;i<n;i++)
-                     dst[i] = rgba[i][RCOMP];
-                  break;
-               case GL_GREEN:
-                  for (i=0;i<n;i++)
-                     dst[i] = rgba[i][GCOMP];
-                  break;
-               case GL_BLUE:
-                  for (i=0;i<n;i++)
-                     dst[i] = rgba[i][BCOMP];
-                  break;
-               case GL_ALPHA:
-                  for (i=0;i<n;i++)
-                     dst[i] = rgba[i][ACOMP];
-                  break;
-               case GL_LUMINANCE:
-                  for (i=0;i<n;i++)
-                     dst[i] = luminance[i];
-                  break;
-               case GL_LUMINANCE_ALPHA:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = luminance[i];
-                     dst[i*2+1] = rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_RG:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = rgba[i][RCOMP];
-                     dst[i*2+1] = rgba[i][GCOMP];
-                  }
-                  break;
-               case GL_RGB:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = rgba[i][RCOMP];
-                     dst[i*3+1] = rgba[i][GCOMP];
-                     dst[i*3+2] = rgba[i][BCOMP];
-                  }
-                  break;
-               case GL_RGBA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = rgba[i][RCOMP];
-                     dst[i*4+1] = rgba[i][GCOMP];
-                     dst[i*4+2] = rgba[i][BCOMP];
-                     dst[i*4+3] = rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_BGR:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = rgba[i][BCOMP];
-                     dst[i*3+1] = rgba[i][GCOMP];
-                     dst[i*3+2] = rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_BGRA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = rgba[i][BCOMP];
-                     dst[i*4+1] = rgba[i][GCOMP];
-                     dst[i*4+2] = rgba[i][RCOMP];
-                     dst[i*4+3] = rgba[i][ACOMP];
-                  }
-                  break;
-               case GL_ABGR_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = rgba[i][ACOMP];
-                     dst[i*4+1] = rgba[i][BCOMP];
-                     dst[i*4+2] = rgba[i][GCOMP];
-                     dst[i*4+3] = rgba[i][RCOMP];
-                  }
-                  break;
-               case GL_DUDV_ATI:
-               case GL_DU8DV8_ATI:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = rgba[i][RCOMP];
-                     dst[i*2+1] = rgba[i][GCOMP];
-                  }
-                  break;
-               default:
-                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
-            }
-         }
-         break;
-      case GL_HALF_FLOAT_ARB:
-         {
-            GLhalfARB *dst = (GLhalfARB *) dstAddr;
-            switch (dstFormat) {
-               case GL_RED:
-                  for (i=0;i<n;i++)
-                     dst[i] = _mesa_float_to_half(rgba[i][RCOMP]);
-                  break;
-               case GL_GREEN:
-                  for (i=0;i<n;i++)
-                     dst[i] = _mesa_float_to_half(rgba[i][GCOMP]);
-                  break;
-               case GL_BLUE:
-                  for (i=0;i<n;i++)
-                     dst[i] = _mesa_float_to_half(rgba[i][BCOMP]);
-                  break;
-               case GL_ALPHA:
-                  for (i=0;i<n;i++)
-                     dst[i] = _mesa_float_to_half(rgba[i][ACOMP]);
-                  break;
-               case GL_LUMINANCE:
-                  for (i=0;i<n;i++)
-                     dst[i] = _mesa_float_to_half(luminance[i]);
-                  break;
-               case GL_LUMINANCE_ALPHA:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = _mesa_float_to_half(luminance[i]);
-                     dst[i*2+1] = _mesa_float_to_half(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_RG:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = _mesa_float_to_half(rgba[i][RCOMP]);
-                     dst[i*2+1] = _mesa_float_to_half(rgba[i][GCOMP]);
-                  }
-                  break;
-               case GL_RGB:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = _mesa_float_to_half(rgba[i][RCOMP]);
-                     dst[i*3+1] = _mesa_float_to_half(rgba[i][GCOMP]);
-                     dst[i*3+2] = _mesa_float_to_half(rgba[i][BCOMP]);
-                  }
-                  break;
-               case GL_RGBA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = _mesa_float_to_half(rgba[i][RCOMP]);
-                     dst[i*4+1] = _mesa_float_to_half(rgba[i][GCOMP]);
-                     dst[i*4+2] = _mesa_float_to_half(rgba[i][BCOMP]);
-                     dst[i*4+3] = _mesa_float_to_half(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_BGR:
-                  for (i=0;i<n;i++) {
-                     dst[i*3+0] = _mesa_float_to_half(rgba[i][BCOMP]);
-                     dst[i*3+1] = _mesa_float_to_half(rgba[i][GCOMP]);
-                     dst[i*3+2] = _mesa_float_to_half(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_BGRA:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = _mesa_float_to_half(rgba[i][BCOMP]);
-                     dst[i*4+1] = _mesa_float_to_half(rgba[i][GCOMP]);
-                     dst[i*4+2] = _mesa_float_to_half(rgba[i][RCOMP]);
-                     dst[i*4+3] = _mesa_float_to_half(rgba[i][ACOMP]);
-                  }
-                  break;
-               case GL_ABGR_EXT:
-                  for (i=0;i<n;i++) {
-                     dst[i*4+0] = _mesa_float_to_half(rgba[i][ACOMP]);
-                     dst[i*4+1] = _mesa_float_to_half(rgba[i][BCOMP]);
-                     dst[i*4+2] = _mesa_float_to_half(rgba[i][GCOMP]);
-                     dst[i*4+3] = _mesa_float_to_half(rgba[i][RCOMP]);
-                  }
-                  break;
-               case GL_DUDV_ATI:
-               case GL_DU8DV8_ATI:
-                  for (i=0;i<n;i++) {
-                     dst[i*2+0] = _mesa_float_to_half(rgba[i][RCOMP]);
-                     dst[i*2+1] = _mesa_float_to_half(rgba[i][GCOMP]);
-                  }
-                  break;
-               default:
-                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
-            }
-         }
-         break;
-      case GL_UNSIGNED_BYTE_3_3_2:
-         if (dstFormat == GL_RGB) {
-            GLubyte *dst = (GLubyte *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 7.0F) << 5)
-                      | (IROUND(rgba[i][GCOMP] * 7.0F) << 2)
-                      | (IROUND(rgba[i][BCOMP] * 3.0F)     );
-            }
-         }
-         break;
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-         if (dstFormat == GL_RGB) {
-            GLubyte *dst = (GLubyte *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 7.0F)     )
-                      | (IROUND(rgba[i][GCOMP] * 7.0F) << 3)
-                      | (IROUND(rgba[i][BCOMP] * 3.0F) << 6);
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-         if (dstFormat == GL_RGB) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F) << 11)
-                      | (IROUND(rgba[i][GCOMP] * 63.0F) <<  5)
-                      | (IROUND(rgba[i][BCOMP] * 31.0F)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-         if (dstFormat == GL_RGB) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F)      )
-                      | (IROUND(rgba[i][GCOMP] * 63.0F) <<  5)
-                      | (IROUND(rgba[i][BCOMP] * 31.0F) << 11);
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-         if (dstFormat == GL_RGBA) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 15.0F) << 12)
-                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  8)
-                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  4)
-                      | (IROUND(rgba[i][ACOMP] * 15.0F)      );
-            }
-         }
-         else if (dstFormat == GL_BGRA) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][BCOMP] * 15.0F) << 12)
-                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  8)
-                      | (IROUND(rgba[i][RCOMP] * 15.0F) <<  4)
-                      | (IROUND(rgba[i][ACOMP] * 15.0F)      );
-            }
-         }
-         else if (dstFormat == GL_ABGR_EXT) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][ACOMP] * 15.0F) << 12)
-                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  8)
-                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  4)
-                      | (IROUND(rgba[i][RCOMP] * 15.0F)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-         if (dstFormat == GL_RGBA) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 15.0F)      )
-                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  4)
-                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  8)
-                      | (IROUND(rgba[i][ACOMP] * 15.0F) << 12);
-            }
-         }
-         else if (dstFormat == GL_BGRA) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][BCOMP] * 15.0F)      )
-                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  4)
-                      | (IROUND(rgba[i][RCOMP] * 15.0F) <<  8)
-                      | (IROUND(rgba[i][ACOMP] * 15.0F) << 12);
-            }
-         }
-         else if (dstFormat == GL_ABGR_EXT) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][ACOMP] * 15.0F)      )
-                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  4)
-                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  8)
-                      | (IROUND(rgba[i][RCOMP] * 15.0F) << 12);
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-         if (dstFormat == GL_RGBA) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F) << 11)
-                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  6)
-                      | (IROUND(rgba[i][BCOMP] * 31.0F) <<  1)
-                      | (IROUND(rgba[i][ACOMP] *  1.0F)      );
-            }
-         }
-         else if (dstFormat == GL_BGRA) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][BCOMP] * 31.0F) << 11)
-                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  6)
-                      | (IROUND(rgba[i][RCOMP] * 31.0F) <<  1)
-                      | (IROUND(rgba[i][ACOMP] *  1.0F)      );
-            }
-         }
-         else if (dstFormat == GL_ABGR_EXT) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][ACOMP] * 31.0F) << 11)
-                      | (IROUND(rgba[i][BCOMP] * 31.0F) <<  6)
-                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  1)
-                      | (IROUND(rgba[i][RCOMP] *  1.0F)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-         if (dstFormat == GL_RGBA) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F)      )
-                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  5)
-                      | (IROUND(rgba[i][BCOMP] * 31.0F) << 10)
-                      | (IROUND(rgba[i][ACOMP] *  1.0F) << 15);
-            }
-         }
-         else if (dstFormat == GL_BGRA) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][BCOMP] * 31.0F)      )
-                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  5)
-                      | (IROUND(rgba[i][RCOMP] * 31.0F) << 10)
-                      | (IROUND(rgba[i][ACOMP] *  1.0F) << 15);
-            }
-         }
-         else if (dstFormat == GL_ABGR_EXT) {
-            GLushort *dst = (GLushort *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][ACOMP] * 31.0F)      )
-                      | (IROUND(rgba[i][BCOMP] * 31.0F) <<  5)
-                      | (IROUND(rgba[i][GCOMP] * 31.0F) << 10)
-                      | (IROUND(rgba[i][RCOMP] *  1.0F) << 15);
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-         if (dstFormat == GL_RGBA) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 255.F) << 24)
-                      | (IROUND(rgba[i][GCOMP] * 255.F) << 16)
-                      | (IROUND(rgba[i][BCOMP] * 255.F) <<  8)
-                      | (IROUND(rgba[i][ACOMP] * 255.F)      );
-            }
-         }
-         else if (dstFormat == GL_BGRA) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][BCOMP] * 255.F) << 24)
-                      | (IROUND(rgba[i][GCOMP] * 255.F) << 16)
-                      | (IROUND(rgba[i][RCOMP] * 255.F) <<  8)
-                      | (IROUND(rgba[i][ACOMP] * 255.F)      );
-            }
-         }
-         else if (dstFormat == GL_ABGR_EXT) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][ACOMP] * 255.F) << 24)
-                      | (IROUND(rgba[i][BCOMP] * 255.F) << 16)
-                      | (IROUND(rgba[i][GCOMP] * 255.F) <<  8)
-                      | (IROUND(rgba[i][RCOMP] * 255.F)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-         if (dstFormat == GL_RGBA) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 255.0F)      )
-                      | (IROUND(rgba[i][GCOMP] * 255.0F) <<  8)
-                      | (IROUND(rgba[i][BCOMP] * 255.0F) << 16)
-                      | (IROUND(rgba[i][ACOMP] * 255.0F) << 24);
-            }
-         }
-         else if (dstFormat == GL_BGRA) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][BCOMP] * 255.0F)      )
-                      | (IROUND(rgba[i][GCOMP] * 255.0F) <<  8)
-                      | (IROUND(rgba[i][RCOMP] * 255.0F) << 16)
-                      | (IROUND(rgba[i][ACOMP] * 255.0F) << 24);
-            }
-         }
-         else if (dstFormat == GL_ABGR_EXT) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][ACOMP] * 255.0F)      )
-                      | (IROUND(rgba[i][BCOMP] * 255.0F) <<  8)
-                      | (IROUND(rgba[i][GCOMP] * 255.0F) << 16)
-                      | (IROUND(rgba[i][RCOMP] * 255.0F) << 24);
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_10_10_10_2:
-         if (dstFormat == GL_RGBA) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 1023.0F) << 22)
-                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 12)
-                      | (IROUND(rgba[i][BCOMP] * 1023.0F) <<  2)
-                      | (IROUND(rgba[i][ACOMP] *    3.0F)      );
-            }
-         }
-         else if (dstFormat == GL_BGRA) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][BCOMP] * 1023.0F) << 22)
-                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 12)
-                      | (IROUND(rgba[i][RCOMP] * 1023.0F) <<  2)
-                      | (IROUND(rgba[i][ACOMP] *    3.0F)      );
-            }
-         }
-         else if (dstFormat == GL_ABGR_EXT) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][ACOMP] * 1023.0F) << 22)
-                      | (IROUND(rgba[i][BCOMP] * 1023.0F) << 12)
-                      | (IROUND(rgba[i][GCOMP] * 1023.0F) <<  2)
-                      | (IROUND(rgba[i][RCOMP] *    3.0F)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-         if (dstFormat == GL_RGBA) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][RCOMP] * 1023.0F)      )
-                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 10)
-                      | (IROUND(rgba[i][BCOMP] * 1023.0F) << 20)
-                      | (IROUND(rgba[i][ACOMP] *    3.0F) << 30);
-            }
-         }
-         else if (dstFormat == GL_BGRA) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][BCOMP] * 1023.0F)      )
-                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 10)
-                      | (IROUND(rgba[i][RCOMP] * 1023.0F) << 20)
-                      | (IROUND(rgba[i][ACOMP] *    3.0F) << 30);
-            }
-         }
-         else if (dstFormat == GL_ABGR_EXT) {
-            GLuint *dst = (GLuint *) dstAddr;
-            for (i=0;i<n;i++) {
-               dst[i] = (IROUND(rgba[i][ACOMP] * 1023.0F)      )
-                      | (IROUND(rgba[i][BCOMP] * 1023.0F) << 10)
-                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 20)
-                      | (IROUND(rgba[i][RCOMP] *    3.0F) << 30);
-            }
-         }
-         break;
-      default:
-         _mesa_problem(ctx, "bad type in _mesa_pack_rgba_span_float");
-         return;
-   }
-
-   if (dstPacking->SwapBytes) {
-      GLint swapSize = _mesa_sizeof_packed_type(dstType);
-      if (swapSize == 2) {
-         if (dstPacking->SwapBytes) {
-            _mesa_swap2((GLushort *) dstAddr, n * comps);
-         }
-      }
-      else if (swapSize == 4) {
-         if (dstPacking->SwapBytes) {
-            _mesa_swap4((GLuint *) dstAddr, n * comps);
-         }
-      }
-   }
-
-   free(luminance);
-}
-
-
-
-#define SWAP2BYTE(VALUE)			\
-   {						\
-      GLubyte *bytes = (GLubyte *) &(VALUE);	\
-      GLubyte tmp = bytes[0];			\
-      bytes[0] = bytes[1];			\
-      bytes[1] = tmp;				\
-   }
-
-#define SWAP4BYTE(VALUE)			\
-   {						\
-      GLubyte *bytes = (GLubyte *) &(VALUE);	\
-      GLubyte tmp = bytes[0];			\
-      bytes[0] = bytes[3];			\
-      bytes[3] = tmp;				\
-      tmp = bytes[1];				\
-      bytes[1] = bytes[2];			\
-      bytes[2] = tmp;				\
-   }
-
-
-static void
-extract_uint_indexes(GLuint n, GLuint indexes[],
-                     GLenum srcFormat, GLenum srcType, const GLvoid *src,
-                     const struct gl_pixelstore_attrib *unpack )
-{
-   ASSERT(srcFormat == GL_COLOR_INDEX || srcFormat == GL_STENCIL_INDEX);
-
-   ASSERT(srcType == GL_BITMAP ||
-          srcType == GL_UNSIGNED_BYTE ||
-          srcType == GL_BYTE ||
-          srcType == GL_UNSIGNED_SHORT ||
-          srcType == GL_SHORT ||
-          srcType == GL_UNSIGNED_INT ||
-          srcType == GL_INT ||
-          srcType == GL_UNSIGNED_INT_24_8_EXT ||
-          srcType == GL_HALF_FLOAT_ARB ||
-          srcType == GL_FLOAT);
-
-   switch (srcType) {
-      case GL_BITMAP:
-         {
-            GLubyte *ubsrc = (GLubyte *) src;
-            if (unpack->LsbFirst) {
-               GLubyte mask = 1 << (unpack->SkipPixels & 0x7);
-               GLuint i;
-               for (i = 0; i < n; i++) {
-                  indexes[i] = (*ubsrc & mask) ? 1 : 0;
-                  if (mask == 128) {
-                     mask = 1;
-                     ubsrc++;
-                  }
-                  else {
-                     mask = mask << 1;
-                  }
-               }
-            }
-            else {
-               GLubyte mask = 128 >> (unpack->SkipPixels & 0x7);
-               GLuint i;
-               for (i = 0; i < n; i++) {
-                  indexes[i] = (*ubsrc & mask) ? 1 : 0;
-                  if (mask == 1) {
-                     mask = 128;
-                     ubsrc++;
-                  }
-                  else {
-                     mask = mask >> 1;
-                  }
-               }
-            }
-         }
-         break;
-      case GL_UNSIGNED_BYTE:
-         {
-            GLuint i;
-            const GLubyte *s = (const GLubyte *) src;
-            for (i = 0; i < n; i++)
-               indexes[i] = s[i];
-         }
-         break;
-      case GL_BYTE:
-         {
-            GLuint i;
-            const GLbyte *s = (const GLbyte *) src;
-            for (i = 0; i < n; i++)
-               indexes[i] = s[i];
-         }
-         break;
-      case GL_UNSIGNED_SHORT:
-         {
-            GLuint i;
-            const GLushort *s = (const GLushort *) src;
-            if (unpack->SwapBytes) {
-               for (i = 0; i < n; i++) {
-                  GLushort value = s[i];
-                  SWAP2BYTE(value);
-                  indexes[i] = value;
-               }
-            }
-            else {
-               for (i = 0; i < n; i++)
-                  indexes[i] = s[i];
-            }
-         }
-         break;
-      case GL_SHORT:
-         {
-            GLuint i;
-            const GLshort *s = (const GLshort *) src;
-            if (unpack->SwapBytes) {
-               for (i = 0; i < n; i++) {
-                  GLshort value = s[i];
-                  SWAP2BYTE(value);
-                  indexes[i] = value;
-               }
-            }
-            else {
-               for (i = 0; i < n; i++)
-                  indexes[i] = s[i];
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT:
-         {
-            GLuint i;
-            const GLuint *s = (const GLuint *) src;
-            if (unpack->SwapBytes) {
-               for (i = 0; i < n; i++) {
-                  GLuint value = s[i];
-                  SWAP4BYTE(value);
-                  indexes[i] = value;
-               }
-            }
-            else {
-               for (i = 0; i < n; i++)
-                  indexes[i] = s[i];
-            }
-         }
-         break;
-      case GL_INT:
-         {
-            GLuint i;
-            const GLint *s = (const GLint *) src;
-            if (unpack->SwapBytes) {
-               for (i = 0; i < n; i++) {
-                  GLint value = s[i];
-                  SWAP4BYTE(value);
-                  indexes[i] = value;
-               }
-            }
-            else {
-               for (i = 0; i < n; i++)
-                  indexes[i] = s[i];
-            }
-         }
-         break;
-      case GL_FLOAT:
-         {
-            GLuint i;
-            const GLfloat *s = (const GLfloat *) src;
-            if (unpack->SwapBytes) {
-               for (i = 0; i < n; i++) {
-                  GLfloat value = s[i];
-                  SWAP4BYTE(value);
-                  indexes[i] = (GLuint) value;
-               }
-            }
-            else {
-               for (i = 0; i < n; i++)
-                  indexes[i] = (GLuint) s[i];
-            }
-         }
-         break;
-      case GL_HALF_FLOAT_ARB:
-         {
-            GLuint i;
-            const GLhalfARB *s = (const GLhalfARB *) src;
-            if (unpack->SwapBytes) {
-               for (i = 0; i < n; i++) {
-                  GLhalfARB value = s[i];
-                  SWAP2BYTE(value);
-                  indexes[i] = (GLuint) _mesa_half_to_float(value);
-               }
-            }
-            else {
-               for (i = 0; i < n; i++)
-                  indexes[i] = (GLuint) _mesa_half_to_float(s[i]);
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_24_8_EXT:
-         {
-            GLuint i;
-            const GLuint *s = (const GLuint *) src;
-            if (unpack->SwapBytes) {
-               for (i = 0; i < n; i++) {
-                  GLuint value = s[i];
-                  SWAP4BYTE(value);
-                  indexes[i] = value & 0xff;  /* lower 8 bits */
-               }
-            }
-            else {
-               for (i = 0; i < n; i++)
-                  indexes[i] = s[i] & 0xff;  /* lower 8 bits */
-            }
-         }
-         break;
-
-      default:
-         _mesa_problem(NULL, "bad srcType in extract_uint_indexes");
-         return;
-   }
-}
-
-
-/**
- * Return source/dest RGBA indexes for unpacking pixels.
- */
-static void
-get_component_mapping(GLenum format,
-                      GLint *rSrc,
-                      GLint *gSrc,
-                      GLint *bSrc,
-                      GLint *aSrc,
-                      GLint *rDst,
-                      GLint *gDst,
-                      GLint *bDst,
-                      GLint *aDst)
-{
-   switch (format) {
-   case GL_RED:
-   case GL_RED_INTEGER_EXT:
-      *rSrc = 0;
-      *gSrc = *bSrc = *aSrc = -1;
-      break;
-   case GL_GREEN:
-   case GL_GREEN_INTEGER_EXT:
-      *gSrc = 0;
-      *rSrc = *bSrc = *aSrc = -1;
-      break;
-      case GL_BLUE:
-   case GL_BLUE_INTEGER_EXT:
-      *bSrc = 0;
-      *rSrc = *gSrc = *aSrc = -1;
-      break;
-   case GL_ALPHA:
-   case GL_ALPHA_INTEGER_EXT:
-      *rSrc = *gSrc = *bSrc = -1;
-      *aSrc = 0;
-      break;
-   case GL_LUMINANCE:
-   case GL_LUMINANCE_INTEGER_EXT:
-      *rSrc = *gSrc = *bSrc = 0;
-      *aSrc = -1;
-      break;
-   case GL_LUMINANCE_ALPHA:
-   case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-      *rSrc = *gSrc = *bSrc = 0;
-      *aSrc = 1;
-      break;
-   case GL_INTENSITY:
-      *rSrc = *gSrc = *bSrc = *aSrc = 0;
-      break;
-   case GL_RG:
-   case GL_RG_INTEGER:
-      *rSrc = 0;
-      *gSrc = 1;
-      *bSrc = -1;
-      *aSrc = -1;
-      *rDst = 0;
-      *gDst = 1;
-      *bDst = 2;
-      *aDst = 3;
-      break;
-   case GL_RGB:
-   case GL_RGB_INTEGER:
-      *rSrc = 0;
-      *gSrc = 1;
-      *bSrc = 2;
-      *aSrc = -1;
-      *rDst = 0;
-      *gDst = 1;
-      *bDst = 2;
-      *aDst = 3;
-      break;
-   case GL_BGR:
-      *rSrc = 2;
-      *gSrc = 1;
-      *bSrc = 0;
-      *aSrc = -1;
-      *rDst = 2;
-      *gDst = 1;
-      *bDst = 0;
-      *aDst = 3;
-      break;
-   case GL_RGBA:
-   case GL_RGBA_INTEGER:
-      *rSrc = 0;
-      *gSrc = 1;
-      *bSrc = 2;
-      *aSrc = 3;
-      *rDst = 0;
-      *gDst = 1;
-      *bDst = 2;
-      *aDst = 3;
-      break;
-   case GL_BGRA:
-      *rSrc = 2;
-      *gSrc = 1;
-      *bSrc = 0;
-      *aSrc = 3;
-      *rDst = 2;
-      *gDst = 1;
-      *bDst = 0;
-      *aDst = 3;
-      break;
-   case GL_ABGR_EXT:
-      *rSrc = 3;
-      *gSrc = 2;
-      *bSrc = 1;
-      *aSrc = 0;
-      *rDst = 3;
-      *gDst = 2;
-      *bDst = 1;
-      *aDst = 0;
-      break;
-   case GL_DU8DV8_ATI:
-   case GL_DUDV_ATI:
-      *rSrc = 0;
-      *gSrc = 1;
-      *bSrc = -1;
-      *aSrc = -1;
-      break;
-   default:
-      _mesa_problem(NULL, "bad srcFormat %s in get_component_mapping",
-                    _mesa_lookup_enum_by_nr(format));
-      return;
-   }
-}
-
-
-
-/*
- * This function extracts floating point RGBA values from arbitrary
- * image data.  srcFormat and srcType are the format and type parameters
- * passed to glDrawPixels, glTexImage[123]D, glTexSubImage[123]D, etc.
- *
- * Refering to section 3.6.4 of the OpenGL 1.2 spec, this function
- * implements the "Conversion to floating point", "Conversion to RGB",
- * and "Final Expansion to RGBA" operations.
- *
- * Args:  n - number of pixels
- *        rgba - output colors
- *        srcFormat - format of incoming data
- *        srcType - data type of incoming data
- *        src - source data pointer
- *        swapBytes - perform byteswapping of incoming data?
- */
-static void
-extract_float_rgba(GLuint n, GLfloat rgba[][4],
-                   GLenum srcFormat, GLenum srcType, const GLvoid *src,
-                   GLboolean swapBytes)
-{
-   GLint rSrc, gSrc, bSrc, aSrc;
-   GLint stride;
-   GLint rDst, bDst, gDst, aDst;
-   GLboolean intFormat;
-   GLfloat rs = 1.0f, gs = 1.0f, bs = 1.0f, as = 1.0f; /* scale factors */
-
-   ASSERT(srcFormat == GL_RED ||
-          srcFormat == GL_GREEN ||
-          srcFormat == GL_BLUE ||
-          srcFormat == GL_ALPHA ||
-          srcFormat == GL_LUMINANCE ||
-          srcFormat == GL_LUMINANCE_ALPHA ||
-          srcFormat == GL_INTENSITY ||
-          srcFormat == GL_RG ||
-          srcFormat == GL_RGB ||
-          srcFormat == GL_BGR ||
-          srcFormat == GL_RGBA ||
-          srcFormat == GL_BGRA ||
-          srcFormat == GL_ABGR_EXT ||
-          srcFormat == GL_DU8DV8_ATI ||
-          srcFormat == GL_DUDV_ATI ||
-          srcFormat == GL_RED_INTEGER_EXT ||
-          srcFormat == GL_GREEN_INTEGER_EXT ||
-          srcFormat == GL_BLUE_INTEGER_EXT ||
-          srcFormat == GL_ALPHA_INTEGER_EXT ||
-          srcFormat == GL_RGB_INTEGER_EXT ||
-          srcFormat == GL_RGBA_INTEGER_EXT ||
-          srcFormat == GL_BGR_INTEGER_EXT ||
-          srcFormat == GL_BGRA_INTEGER_EXT ||
-          srcFormat == GL_LUMINANCE_INTEGER_EXT ||
-          srcFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT);
-
-   ASSERT(srcType == GL_UNSIGNED_BYTE ||
-          srcType == GL_BYTE ||
-          srcType == GL_UNSIGNED_SHORT ||
-          srcType == GL_SHORT ||
-          srcType == GL_UNSIGNED_INT ||
-          srcType == GL_INT ||
-          srcType == GL_HALF_FLOAT_ARB ||
-          srcType == GL_FLOAT ||
-          srcType == GL_UNSIGNED_BYTE_3_3_2 ||
-          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
-          srcType == GL_UNSIGNED_SHORT_5_6_5 ||
-          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||
-          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||
-          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||
-          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||
-          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||
-          srcType == GL_UNSIGNED_INT_8_8_8_8 ||
-          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||
-          srcType == GL_UNSIGNED_INT_10_10_10_2 ||
-          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);
-
-   get_component_mapping(srcFormat,
-                         &rSrc, &gSrc, &bSrc, &aSrc,
-                         &rDst, &gDst, &bDst, &aDst);
-
-   stride = _mesa_components_in_format(srcFormat);
-
-   intFormat = _mesa_is_integer_format(srcFormat);
-
-#define PROCESS(SRC_INDEX, DST_INDEX, DEFAULT_FLT, DEFAULT_INT, TYPE, CONVERSION) \
-   if ((SRC_INDEX) < 0) {						\
-      GLuint i;								\
-      if (intFormat) {							\
-         for (i = 0; i < n; i++) {					\
-            rgba[i][DST_INDEX] = DEFAULT_INT;				\
-         }								\
-      }									\
-      else {								\
-         for (i = 0; i < n; i++) {					\
-            rgba[i][DST_INDEX] = DEFAULT_FLT;				\
-         }								\
-      }									\
-   }									\
-   else if (swapBytes) {						\
-      const TYPE *s = (const TYPE *) src;				\
-      GLuint i;								\
-      for (i = 0; i < n; i++) {						\
-         TYPE value = s[SRC_INDEX];					\
-         if (sizeof(TYPE) == 2) {					\
-            SWAP2BYTE(value);						\
-         }								\
-         else if (sizeof(TYPE) == 4) {					\
-            SWAP4BYTE(value);						\
-         }								\
-         if (intFormat)							\
-            rgba[i][DST_INDEX] = (GLfloat) value;			\
-         else								\
-            rgba[i][DST_INDEX] = (GLfloat) CONVERSION(value);		\
-         s += stride;							\
-      }									\
-   }									\
-   else {								\
-      const TYPE *s = (const TYPE *) src;				\
-      GLuint i;								\
-      if (intFormat) {							\
-         for (i = 0; i < n; i++) {					\
-            rgba[i][DST_INDEX] = (GLfloat) s[SRC_INDEX];		\
-            s += stride;						\
-         }								\
-      }									\
-      else {								\
-         for (i = 0; i < n; i++) {					\
-            rgba[i][DST_INDEX] = (GLfloat) CONVERSION(s[SRC_INDEX]);	\
-            s += stride;						\
-         }								\
-      }									\
-   }
-
-   switch (srcType) {
-      case GL_UNSIGNED_BYTE:
-         PROCESS(rSrc, RCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);
-         PROCESS(gSrc, GCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);
-         PROCESS(bSrc, BCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);
-         PROCESS(aSrc, ACOMP, 1.0F, 255, GLubyte, UBYTE_TO_FLOAT);
-         break;
-      case GL_BYTE:
-         PROCESS(rSrc, RCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);
-         PROCESS(gSrc, GCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);
-         PROCESS(bSrc, BCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);
-         PROCESS(aSrc, ACOMP, 1.0F, 127, GLbyte, BYTE_TO_FLOAT);
-         break;
-      case GL_UNSIGNED_SHORT:
-         PROCESS(rSrc, RCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);
-         PROCESS(gSrc, GCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);
-         PROCESS(bSrc, BCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);
-         PROCESS(aSrc, ACOMP, 1.0F, 0xffff, GLushort, USHORT_TO_FLOAT);
-         break;
-      case GL_SHORT:
-         PROCESS(rSrc, RCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);
-         PROCESS(gSrc, GCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);
-         PROCESS(bSrc, BCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);
-         PROCESS(aSrc, ACOMP, 1.0F, 32767, GLshort, SHORT_TO_FLOAT);
-         break;
-      case GL_UNSIGNED_INT:
-         PROCESS(rSrc, RCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);
-         PROCESS(gSrc, GCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);
-         PROCESS(bSrc, BCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);
-         PROCESS(aSrc, ACOMP, 1.0F, 0xffffffff, GLuint, UINT_TO_FLOAT);
-         break;
-      case GL_INT:
-         PROCESS(rSrc, RCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);
-         PROCESS(gSrc, GCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);
-         PROCESS(bSrc, BCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);
-         PROCESS(aSrc, ACOMP, 1.0F, 2147483647, GLint, INT_TO_FLOAT);
-         break;
-      case GL_FLOAT:
-         PROCESS(rSrc, RCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));
-         PROCESS(gSrc, GCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));
-         PROCESS(bSrc, BCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));
-         PROCESS(aSrc, ACOMP, 1.0F, 1.0F, GLfloat, (GLfloat));
-         break;
-      case GL_HALF_FLOAT_ARB:
-         PROCESS(rSrc, RCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
-         PROCESS(gSrc, GCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
-         PROCESS(bSrc, BCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
-         PROCESS(aSrc, ACOMP, 1.0F, 1.0F, GLhalfARB, _mesa_half_to_float);
-         break;
-      case GL_UNSIGNED_BYTE_3_3_2:
-         {
-            const GLubyte *ubsrc = (const GLubyte *) src;
-            GLuint i;
-            if (!intFormat) {
-               rs = 1.0F / 7.0F;
-               gs = 1.0F / 7.0F;
-               bs = 1.0F / 3.0F;
-            }
-            for (i = 0; i < n; i ++) {
-               GLubyte p = ubsrc[i];
-               rgba[i][rDst] = ((p >> 5)      ) * rs;
-               rgba[i][gDst] = ((p >> 2) & 0x7) * gs;
-               rgba[i][bDst] = ((p     ) & 0x3) * bs;
-               rgba[i][aDst] = 1.0F;
-            }
-         }
-         break;
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-         {
-            const GLubyte *ubsrc = (const GLubyte *) src;
-            GLuint i;
-            if (!intFormat) {
-               rs = 1.0F / 7.0F;
-               gs = 1.0F / 7.0F;
-               bs = 1.0F / 3.0F;
-            }
-            for (i = 0; i < n; i ++) {
-               GLubyte p = ubsrc[i];
-               rgba[i][rDst] = ((p     ) & 0x7) * rs;
-               rgba[i][gDst] = ((p >> 3) & 0x7) * gs;
-               rgba[i][bDst] = ((p >> 6)      ) * bs;
-               rgba[i][aDst] = 1.0F;
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-         if (!intFormat) {
-            rs = 1.0F / 31.0F;
-            gs = 1.0F / 63.0F;
-            bs = 1.0F / 31.0F;
-         }
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p >> 11)       ) * rs;
-               rgba[i][gDst] = ((p >>  5) & 0x3f) * gs;
-               rgba[i][bDst] = ((p      ) & 0x1f) * bs;
-               rgba[i][aDst] = 1.0F;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p >> 11)       ) * rs;
-               rgba[i][gDst] = ((p >>  5) & 0x3f) * gs;
-               rgba[i][bDst] = ((p      ) & 0x1f) * bs;
-               rgba[i][aDst] = 1.0F;
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-         if (!intFormat) {
-            rs = 1.0F / 31.0F;
-            gs = 1.0F / 63.0F;
-            bs = 1.0F / 31.0F;
-         }
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p      ) & 0x1f) * rs;
-               rgba[i][gDst] = ((p >>  5) & 0x3f) * gs;
-               rgba[i][bDst] = ((p >> 11)       ) * bs;
-               rgba[i][aDst] = 1.0F;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p      ) & 0x1f) * rs;
-               rgba[i][gDst] = ((p >>  5) & 0x3f) * gs;
-               rgba[i][bDst] = ((p >> 11)       ) * bs;
-               rgba[i][aDst] = 1.0F;
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-         if (!intFormat) {
-            rs = gs = bs = as = 1.0F / 15.0F;
-         }
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p >> 12)      ) * rs;
-               rgba[i][gDst] = ((p >>  8) & 0xf) * gs;
-               rgba[i][bDst] = ((p >>  4) & 0xf) * bs;
-               rgba[i][aDst] = ((p      ) & 0xf) * as;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p >> 12)      ) * rs;
-               rgba[i][gDst] = ((p >>  8) & 0xf) * gs;
-               rgba[i][bDst] = ((p >>  4) & 0xf) * bs;
-               rgba[i][aDst] = ((p      ) & 0xf) * as;
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-         if (!intFormat) {
-            rs = gs = bs = as = 1.0F / 15.0F;
-         }
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p      ) & 0xf) * rs;
-               rgba[i][gDst] = ((p >>  4) & 0xf) * gs;
-               rgba[i][bDst] = ((p >>  8) & 0xf) * bs;
-               rgba[i][aDst] = ((p >> 12)      ) * as;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p      ) & 0xf) * rs;
-               rgba[i][gDst] = ((p >>  4) & 0xf) * gs;
-               rgba[i][bDst] = ((p >>  8) & 0xf) * bs;
-               rgba[i][aDst] = ((p >> 12)      ) * as;
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-         if (!intFormat) {
-            rs = gs = bs = 1.0F / 31.0F;
-         }
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p >> 11)       ) * rs;
-               rgba[i][gDst] = ((p >>  6) & 0x1f) * gs;
-               rgba[i][bDst] = ((p >>  1) & 0x1f) * bs;
-               rgba[i][aDst] = ((p      ) & 0x1)  * as;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p >> 11)       ) * rs;
-               rgba[i][gDst] = ((p >>  6) & 0x1f) * gs;
-               rgba[i][bDst] = ((p >>  1) & 0x1f) * bs;
-               rgba[i][aDst] = ((p      ) & 0x1)  * as;
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-         if (!intFormat) {
-            rs = gs = bs = 1.0F / 31.0F;
-         }
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p      ) & 0x1f) * rs;
-               rgba[i][gDst] = ((p >>  5) & 0x1f) * gs;
-               rgba[i][bDst] = ((p >> 10) & 0x1f) * bs;
-               rgba[i][aDst] = ((p >> 15)       ) * as;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p      ) & 0x1f) * rs;
-               rgba[i][gDst] = ((p >>  5) & 0x1f) * gs;
-               rgba[i][bDst] = ((p >> 10) & 0x1f) * bs;
-               rgba[i][aDst] = ((p >> 15)       ) * as;
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-         if (swapBytes) {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            if (intFormat) {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rDst] = (GLfloat) ((p      ) & 0xff);
-                  rgba[i][gDst] = (GLfloat) ((p >>  8) & 0xff);
-                  rgba[i][bDst] = (GLfloat) ((p >> 16) & 0xff);
-                  rgba[i][aDst] = (GLfloat) ((p >> 24)       );
-               }
-            }
-            else {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rDst] = UBYTE_TO_FLOAT((p      ) & 0xff);
-                  rgba[i][gDst] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-                  rgba[i][bDst] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-                  rgba[i][aDst] = UBYTE_TO_FLOAT((p >> 24)       );
-               }
-            }
-         }
-         else {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            if (intFormat) {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rDst] = (GLfloat) ((p >> 24)       );
-                  rgba[i][gDst] = (GLfloat) ((p >> 16) & 0xff);
-                  rgba[i][bDst] = (GLfloat) ((p >>  8) & 0xff);
-                  rgba[i][aDst] = (GLfloat) ((p      ) & 0xff);
-               }
-            }
-            else {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rDst] = UBYTE_TO_FLOAT((p >> 24)       );
-                  rgba[i][gDst] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-                  rgba[i][bDst] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-                  rgba[i][aDst] = UBYTE_TO_FLOAT((p      ) & 0xff);
-               }
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-         if (swapBytes) {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            if (intFormat) {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rDst] = (GLfloat) ((p >> 24)       );
-                  rgba[i][gDst] = (GLfloat) ((p >> 16) & 0xff);
-                  rgba[i][bDst] = (GLfloat) ((p >>  8) & 0xff);
-                  rgba[i][aDst] = (GLfloat) ((p      ) & 0xff);
-               }
-            }
-            else {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rDst] = UBYTE_TO_FLOAT((p >> 24)       );
-                  rgba[i][gDst] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-                  rgba[i][bDst] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-                  rgba[i][aDst] = UBYTE_TO_FLOAT((p      ) & 0xff);
-               }
-            }
-         }
-         else {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            if (intFormat) {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rDst] = (GLfloat) ((p      ) & 0xff);
-                  rgba[i][gDst] = (GLfloat) ((p >>  8) & 0xff);
-                  rgba[i][bDst] = (GLfloat) ((p >> 16) & 0xff);
-                  rgba[i][aDst] = (GLfloat) ((p >> 24)       );
-               }
-            }
-            else {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rDst] = UBYTE_TO_FLOAT((p      ) & 0xff);
-                  rgba[i][gDst] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-                  rgba[i][bDst] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-                  rgba[i][aDst] = UBYTE_TO_FLOAT((p >> 24)       );
-               }
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_10_10_10_2:
-         if (!intFormat) {
-            rs = 1.0F / 1023.0F;
-            gs = 1.0F / 1023.0F;
-            bs = 1.0F / 1023.0F;
-            as = 1.0F / 3.0F;
-         }
-         if (swapBytes) {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               SWAP4BYTE(p);
-               rgba[i][rDst] = ((p >> 22)        ) * rs;
-               rgba[i][gDst] = ((p >> 12) & 0x3ff) * gs;
-               rgba[i][bDst] = ((p >>  2) & 0x3ff) * bs;
-               rgba[i][aDst] = ((p      ) & 0x3  ) * as;
-            }
-         }
-         else {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rDst] = ((p >> 22)        ) * rs;
-               rgba[i][gDst] = ((p >> 12) & 0x3ff) * gs;
-               rgba[i][bDst] = ((p >>  2) & 0x3ff) * bs;
-               rgba[i][aDst] = ((p      ) & 0x3  ) * as;
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-         if (!intFormat) {
-            rs = 1.0F / 1023.0F;
-            gs = 1.0F / 1023.0F;
-            bs = 1.0F / 1023.0F;
-            as = 1.0F / 3.0F;
-         }
-         if (swapBytes) {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               SWAP4BYTE(p);
-               rgba[i][rDst] = ((p      ) & 0x3ff) * rs;
-               rgba[i][gDst] = ((p >> 10) & 0x3ff) * gs;
-               rgba[i][bDst] = ((p >> 20) & 0x3ff) * bs;
-               rgba[i][aDst] = ((p >> 30)        ) * as;
-            }
-         }
-         else {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rDst] = ((p      ) & 0x3ff) * rs;
-               rgba[i][gDst] = ((p >> 10) & 0x3ff) * gs;
-               rgba[i][bDst] = ((p >> 20) & 0x3ff) * bs;
-               rgba[i][aDst] = ((p >> 30)        ) * as;
-            }
-         }
-         break;
-      default:
-         _mesa_problem(NULL, "bad srcType in extract float data");
-         break;
-   }
-#undef PROCESS
-}
-
-
-static INLINE GLuint
-clamp_byte_to_uint(GLbyte b)
-{
-   return b < 0 ? 0 : b;
-}
-
-
-static INLINE GLuint
-clamp_short_to_uint(GLshort s)
-{
-   return s < 0 ? 0 : s;
-}
-
-
-static INLINE GLuint
-clamp_int_to_uint(GLint i)
-{
-   return i < 0 ? 0 : i;
-}
-
-
-static INLINE GLuint
-clamp_float_to_uint(GLfloat f)
-{
-   return f < 0.0F ? 0 : IROUND(f);
-}
-
-
-static INLINE GLuint
-clamp_half_to_uint(GLhalfARB h)
-{
-   GLfloat f = _mesa_half_to_float(h);
-   return f < 0.0F ? 0 : IROUND(f);
-}
-
-
-/**
- * \sa extract_float_rgba()
- */
-static void
-extract_uint_rgba(GLuint n, GLuint rgba[][4],
-                  GLenum srcFormat, GLenum srcType, const GLvoid *src,
-                  GLboolean swapBytes)
-{
-   GLint rSrc, gSrc, bSrc, aSrc;
-   GLint stride;
-   GLint rDst, bDst, gDst, aDst;
-   GLboolean intFormat;
-
-   ASSERT(srcFormat == GL_RED ||
-          srcFormat == GL_GREEN ||
-          srcFormat == GL_BLUE ||
-          srcFormat == GL_ALPHA ||
-          srcFormat == GL_LUMINANCE ||
-          srcFormat == GL_LUMINANCE_ALPHA ||
-          srcFormat == GL_INTENSITY ||
-          srcFormat == GL_RG ||
-          srcFormat == GL_RGB ||
-          srcFormat == GL_BGR ||
-          srcFormat == GL_RGBA ||
-          srcFormat == GL_BGRA ||
-          srcFormat == GL_ABGR_EXT ||
-          srcFormat == GL_DU8DV8_ATI ||
-          srcFormat == GL_DUDV_ATI ||
-          srcFormat == GL_RED_INTEGER_EXT ||
-          srcFormat == GL_GREEN_INTEGER_EXT ||
-          srcFormat == GL_BLUE_INTEGER_EXT ||
-          srcFormat == GL_ALPHA_INTEGER_EXT ||
-          srcFormat == GL_RGB_INTEGER_EXT ||
-          srcFormat == GL_RGBA_INTEGER_EXT ||
-          srcFormat == GL_BGR_INTEGER_EXT ||
-          srcFormat == GL_BGRA_INTEGER_EXT ||
-          srcFormat == GL_LUMINANCE_INTEGER_EXT ||
-          srcFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT);
-
-   ASSERT(srcType == GL_UNSIGNED_BYTE ||
-          srcType == GL_BYTE ||
-          srcType == GL_UNSIGNED_SHORT ||
-          srcType == GL_SHORT ||
-          srcType == GL_UNSIGNED_INT ||
-          srcType == GL_INT ||
-          srcType == GL_HALF_FLOAT_ARB ||
-          srcType == GL_FLOAT ||
-          srcType == GL_UNSIGNED_BYTE_3_3_2 ||
-          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
-          srcType == GL_UNSIGNED_SHORT_5_6_5 ||
-          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||
-          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||
-          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||
-          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||
-          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||
-          srcType == GL_UNSIGNED_INT_8_8_8_8 ||
-          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||
-          srcType == GL_UNSIGNED_INT_10_10_10_2 ||
-          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);
-
-   get_component_mapping(srcFormat,
-                         &rSrc, &gSrc, &bSrc, &aSrc,
-                         &rDst, &gDst, &bDst, &aDst);
-
-   stride = _mesa_components_in_format(srcFormat);
-
-   intFormat = _mesa_is_integer_format(srcFormat);
-
-#define PROCESS(SRC_INDEX, DST_INDEX, DEFAULT, TYPE, CONVERSION)	\
-   if ((SRC_INDEX) < 0) {						\
-      GLuint i;								\
-      for (i = 0; i < n; i++) {						\
-         rgba[i][DST_INDEX] = DEFAULT;					\
-      }									\
-   }									\
-   else if (swapBytes) {						\
-      const TYPE *s = (const TYPE *) src;				\
-      GLuint i;								\
-      for (i = 0; i < n; i++) {						\
-         TYPE value = s[SRC_INDEX];					\
-         if (sizeof(TYPE) == 2) {					\
-            SWAP2BYTE(value);						\
-         }								\
-         else if (sizeof(TYPE) == 4) {					\
-            SWAP4BYTE(value);						\
-         }								\
-         rgba[i][DST_INDEX] = CONVERSION(value);                        \
-         s += stride;							\
-      }									\
-   }									\
-   else {								\
-      const TYPE *s = (const TYPE *) src;				\
-      GLuint i;								\
-      for (i = 0; i < n; i++) {						\
-         rgba[i][DST_INDEX] = CONVERSION(s[SRC_INDEX]);			\
-         s += stride;							\
-      }									\
-   }
-
-   switch (srcType) {
-      case GL_UNSIGNED_BYTE:
-         PROCESS(rSrc, RCOMP, 0, GLubyte, (GLuint));
-         PROCESS(gSrc, GCOMP, 0, GLubyte, (GLuint));
-         PROCESS(bSrc, BCOMP, 0, GLubyte, (GLuint));
-         PROCESS(aSrc, ACOMP, 1, GLubyte, (GLuint));
-         break;
-      case GL_BYTE:
-         PROCESS(rSrc, RCOMP, 0, GLbyte, clamp_byte_to_uint);
-         PROCESS(gSrc, GCOMP, 0, GLbyte, clamp_byte_to_uint);
-         PROCESS(bSrc, BCOMP, 0, GLbyte, clamp_byte_to_uint);
-         PROCESS(aSrc, ACOMP, 1, GLbyte, clamp_byte_to_uint);
-         break;
-      case GL_UNSIGNED_SHORT:
-         PROCESS(rSrc, RCOMP, 0, GLushort, (GLuint));
-         PROCESS(gSrc, GCOMP, 0, GLushort, (GLuint));
-         PROCESS(bSrc, BCOMP, 0, GLushort, (GLuint));
-         PROCESS(aSrc, ACOMP, 1, GLushort, (GLuint));
-         break;
-      case GL_SHORT:
-         PROCESS(rSrc, RCOMP, 0, GLshort, clamp_short_to_uint);
-         PROCESS(gSrc, GCOMP, 0, GLshort, clamp_short_to_uint);
-         PROCESS(bSrc, BCOMP, 0, GLshort, clamp_short_to_uint);
-         PROCESS(aSrc, ACOMP, 1, GLshort, clamp_short_to_uint);
-         break;
-      case GL_UNSIGNED_INT:
-         PROCESS(rSrc, RCOMP, 0, GLuint, (GLuint));
-         PROCESS(gSrc, GCOMP, 0, GLuint, (GLuint));
-         PROCESS(bSrc, BCOMP, 0, GLuint, (GLuint));
-         PROCESS(aSrc, ACOMP, 1, GLuint, (GLuint));
-         break;
-      case GL_INT:
-         PROCESS(rSrc, RCOMP, 0, GLint, clamp_int_to_uint);
-         PROCESS(gSrc, GCOMP, 0, GLint, clamp_int_to_uint);
-         PROCESS(bSrc, BCOMP, 0, GLint, clamp_int_to_uint);
-         PROCESS(aSrc, ACOMP, 1, GLint, clamp_int_to_uint);
-         break;
-      case GL_FLOAT:
-         PROCESS(rSrc, RCOMP, 0, GLfloat, clamp_float_to_uint);
-         PROCESS(gSrc, GCOMP, 0, GLfloat, clamp_float_to_uint);
-         PROCESS(bSrc, BCOMP, 0, GLfloat, clamp_float_to_uint);
-         PROCESS(aSrc, ACOMP, 1, GLfloat, clamp_float_to_uint);
-         break;
-      case GL_HALF_FLOAT_ARB:
-         PROCESS(rSrc, RCOMP, 0, GLhalfARB, clamp_half_to_uint);
-         PROCESS(gSrc, GCOMP, 0, GLhalfARB, clamp_half_to_uint);
-         PROCESS(bSrc, BCOMP, 0, GLhalfARB, clamp_half_to_uint);
-         PROCESS(aSrc, ACOMP, 1, GLhalfARB, clamp_half_to_uint);
-         break;
-      case GL_UNSIGNED_BYTE_3_3_2:
-         {
-            const GLubyte *ubsrc = (const GLubyte *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLubyte p = ubsrc[i];
-               rgba[i][rDst] = ((p >> 5)      );
-               rgba[i][gDst] = ((p >> 2) & 0x7);
-               rgba[i][bDst] = ((p     ) & 0x3);
-               rgba[i][aDst] = 1;
-            }
-         }
-         break;
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-         {
-            const GLubyte *ubsrc = (const GLubyte *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLubyte p = ubsrc[i];
-               rgba[i][rDst] = ((p     ) & 0x7);
-               rgba[i][gDst] = ((p >> 3) & 0x7);
-               rgba[i][bDst] = ((p >> 6)      );
-               rgba[i][aDst] = 1;
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p >> 11)       );
-               rgba[i][gDst] = ((p >>  5) & 0x3f);
-               rgba[i][bDst] = ((p      ) & 0x1f);
-               rgba[i][aDst] = 1;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p >> 11)       );
-               rgba[i][gDst] = ((p >>  5) & 0x3f);
-               rgba[i][bDst] = ((p      ) & 0x1f);
-               rgba[i][aDst] = 1;
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p      ) & 0x1f);
-               rgba[i][gDst] = ((p >>  5) & 0x3f);
-               rgba[i][bDst] = ((p >> 11)       );
-               rgba[i][aDst] = 1;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p      ) & 0x1f);
-               rgba[i][gDst] = ((p >>  5) & 0x3f);
-               rgba[i][bDst] = ((p >> 11)       );
-               rgba[i][aDst] = 1;
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p >> 12)      );
-               rgba[i][gDst] = ((p >>  8) & 0xf);
-               rgba[i][bDst] = ((p >>  4) & 0xf);
-               rgba[i][aDst] = ((p      ) & 0xf);
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p >> 12)      );
-               rgba[i][gDst] = ((p >>  8) & 0xf);
-               rgba[i][bDst] = ((p >>  4) & 0xf);
-               rgba[i][aDst] = ((p      ) & 0xf);
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p      ) & 0xf);
-               rgba[i][gDst] = ((p >>  4) & 0xf);
-               rgba[i][bDst] = ((p >>  8) & 0xf);
-               rgba[i][aDst] = ((p >> 12)      );
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p      ) & 0xf);
-               rgba[i][gDst] = ((p >>  4) & 0xf);
-               rgba[i][bDst] = ((p >>  8) & 0xf);
-               rgba[i][aDst] = ((p >> 12)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p >> 11)       );
-               rgba[i][gDst] = ((p >>  6) & 0x1f);
-               rgba[i][bDst] = ((p >>  1) & 0x1f);
-               rgba[i][aDst] = ((p      ) & 0x1 );
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p >> 11)       );
-               rgba[i][gDst] = ((p >>  6) & 0x1f);
-               rgba[i][bDst] = ((p >>  1) & 0x1f);
-               rgba[i][aDst] = ((p      ) & 0x1 );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-         if (swapBytes) {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               SWAP2BYTE(p);
-               rgba[i][rDst] = ((p      ) & 0x1f);
-               rgba[i][gDst] = ((p >>  5) & 0x1f);
-               rgba[i][bDst] = ((p >> 10) & 0x1f);
-               rgba[i][aDst] = ((p >> 15)       );
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rDst] = ((p      ) & 0x1f);
-               rgba[i][gDst] = ((p >>  5) & 0x1f);
-               rgba[i][bDst] = ((p >> 10) & 0x1f);
-               rgba[i][aDst] = ((p >> 15)       );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-         if (swapBytes) {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rDst] = ((p      ) & 0xff);
-               rgba[i][gDst] = ((p >>  8) & 0xff);
-               rgba[i][bDst] = ((p >> 16) & 0xff);
-               rgba[i][aDst] = ((p >> 24)       );
-            }
-         }
-         else {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rDst] = ((p >> 24)       );
-               rgba[i][gDst] = ((p >> 16) & 0xff);
-               rgba[i][bDst] = ((p >>  8) & 0xff);
-               rgba[i][aDst] = ((p      ) & 0xff);
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-         if (swapBytes) {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rDst] = ((p >> 24)       );
-               rgba[i][gDst] = ((p >> 16) & 0xff);
-               rgba[i][bDst] = ((p >>  8) & 0xff);
-               rgba[i][aDst] = ((p      ) & 0xff);
-            }
-         }
-         else {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rDst] = ((p      ) & 0xff);
-               rgba[i][gDst] = ((p >>  8) & 0xff);
-               rgba[i][bDst] = ((p >> 16) & 0xff);
-               rgba[i][aDst] = ((p >> 24)       );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_10_10_10_2:
-         if (swapBytes) {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               SWAP4BYTE(p);
-               rgba[i][rDst] = ((p >> 22)        );
-               rgba[i][gDst] = ((p >> 12) & 0x3ff);
-               rgba[i][bDst] = ((p >>  2) & 0x3ff);
-               rgba[i][aDst] = ((p      ) & 0x3  );
-            }
-         }
-         else {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rDst] = ((p >> 22)        );
-               rgba[i][gDst] = ((p >> 12) & 0x3ff);
-               rgba[i][bDst] = ((p >>  2) & 0x3ff);
-               rgba[i][aDst] = ((p      ) & 0x3  );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-         if (swapBytes) {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               SWAP4BYTE(p);
-               rgba[i][rDst] = ((p      ) & 0x3ff);
-               rgba[i][gDst] = ((p >> 10) & 0x3ff);
-               rgba[i][bDst] = ((p >> 20) & 0x3ff);
-               rgba[i][aDst] = ((p >> 30)        );
-            }
-         }
-         else {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rDst] = ((p      ) & 0x3ff);
-               rgba[i][gDst] = ((p >> 10) & 0x3ff);
-               rgba[i][bDst] = ((p >> 20) & 0x3ff);
-               rgba[i][aDst] = ((p >> 30)        );
-            }
-         }
-         break;
-      default:
-         _mesa_problem(NULL, "bad srcType in extract uint data");
-         break;
-   }
-#undef PROCESS
-}
-
-
-
-/*
- * Unpack a row of color image data from a client buffer according to
- * the pixel unpacking parameters.
- * Return GLchan values in the specified dest image format.
- * This is used by glDrawPixels and glTexImage?D().
- * \param ctx - the context
- *         n - number of pixels in the span
- *         dstFormat - format of destination color array
- *         dest - the destination color array
- *         srcFormat - source image format
- *         srcType - source image  data type
- *         source - source image pointer
- *         srcPacking - pixel unpacking parameters
- *         transferOps - bitmask of IMAGE_*_BIT values of operations to apply
- *
- * XXX perhaps expand this to process whole images someday.
- */
-void
-_mesa_unpack_color_span_chan( struct gl_context *ctx,
-                              GLuint n, GLenum dstFormat, GLchan dest[],
-                              GLenum srcFormat, GLenum srcType,
-                              const GLvoid *source,
-                              const struct gl_pixelstore_attrib *srcPacking,
-                              GLbitfield transferOps )
-{
-   ASSERT(dstFormat == GL_ALPHA ||
-          dstFormat == GL_LUMINANCE ||
-          dstFormat == GL_LUMINANCE_ALPHA ||
-          dstFormat == GL_INTENSITY ||
-          dstFormat == GL_RED ||
-          dstFormat == GL_RG ||
-          dstFormat == GL_RGB ||
-          dstFormat == GL_RGBA ||
-          dstFormat == GL_COLOR_INDEX);
-
-   ASSERT(srcFormat == GL_RED ||
-          srcFormat == GL_GREEN ||
-          srcFormat == GL_BLUE ||
-          srcFormat == GL_ALPHA ||
-          srcFormat == GL_LUMINANCE ||
-          srcFormat == GL_LUMINANCE_ALPHA ||
-          srcFormat == GL_INTENSITY ||
-          srcFormat == GL_RG ||
-          srcFormat == GL_RGB ||
-          srcFormat == GL_BGR ||
-          srcFormat == GL_RGBA ||
-          srcFormat == GL_BGRA ||
-          srcFormat == GL_ABGR_EXT ||
-          srcFormat == GL_COLOR_INDEX);
-
-   ASSERT(srcType == GL_BITMAP ||
-          srcType == GL_UNSIGNED_BYTE ||
-          srcType == GL_BYTE ||
-          srcType == GL_UNSIGNED_SHORT ||
-          srcType == GL_SHORT ||
-          srcType == GL_UNSIGNED_INT ||
-          srcType == GL_INT ||
-          srcType == GL_HALF_FLOAT_ARB ||
-          srcType == GL_FLOAT ||
-          srcType == GL_UNSIGNED_BYTE_3_3_2 ||
-          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
-          srcType == GL_UNSIGNED_SHORT_5_6_5 ||
-          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||
-          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||
-          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||
-          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||
-          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||
-          srcType == GL_UNSIGNED_INT_8_8_8_8 ||
-          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||
-          srcType == GL_UNSIGNED_INT_10_10_10_2 ||
-          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);
-
-   /* Try simple cases first */
-   if (transferOps == 0) {
-      if (srcType == CHAN_TYPE) {
-         if (dstFormat == GL_RGBA) {
-            if (srcFormat == GL_RGBA) {
-               memcpy( dest, source, n * 4 * sizeof(GLchan) );
-               return;
-            }
-            else if (srcFormat == GL_RGB) {
-               GLuint i;
-               const GLchan *src = (const GLchan *) source;
-               GLchan *dst = dest;
-               for (i = 0; i < n; i++) {
-                  dst[0] = src[0];
-                  dst[1] = src[1];
-                  dst[2] = src[2];
-                  dst[3] = CHAN_MAX;
-                  src += 3;
-                  dst += 4;
-               }
-               return;
-            }
-         }
-         else if (dstFormat == GL_RGB) {
-            if (srcFormat == GL_RGB) {
-               memcpy( dest, source, n * 3 * sizeof(GLchan) );
-               return;
-            }
-            else if (srcFormat == GL_RGBA) {
-               GLuint i;
-               const GLchan *src = (const GLchan *) source;
-               GLchan *dst = dest;
-               for (i = 0; i < n; i++) {
-                  dst[0] = src[0];
-                  dst[1] = src[1];
-                  dst[2] = src[2];
-                  src += 4;
-                  dst += 3;
-               }
-               return;
-            }
-         }
-         else if (dstFormat == srcFormat) {
-            GLint comps = _mesa_components_in_format(srcFormat);
-            assert(comps > 0);
-            memcpy( dest, source, n * comps * sizeof(GLchan) );
-            return;
-         }
-      }
-      /*
-       * Common situation, loading 8bit RGBA/RGB source images
-       * into 16/32 bit destination. (OSMesa16/32)
-       */
-      else if (srcType == GL_UNSIGNED_BYTE) {
-         if (dstFormat == GL_RGBA) {
-            if (srcFormat == GL_RGB) {
-               GLuint i;
-               const GLubyte *src = (const GLubyte *) source;
-               GLchan *dst = dest;
-               for (i = 0; i < n; i++) {
-                  dst[0] = UBYTE_TO_CHAN(src[0]);
-                  dst[1] = UBYTE_TO_CHAN(src[1]);
-                  dst[2] = UBYTE_TO_CHAN(src[2]);
-                  dst[3] = CHAN_MAX;
-                  src += 3;
-                  dst += 4;
-               }
-               return;
-            }
-            else if (srcFormat == GL_RGBA) {
-               GLuint i;
-               const GLubyte *src = (const GLubyte *) source;
-               GLchan *dst = dest;
-               for (i = 0; i < n; i++) {
-                  dst[0] = UBYTE_TO_CHAN(src[0]);
-                  dst[1] = UBYTE_TO_CHAN(src[1]);
-                  dst[2] = UBYTE_TO_CHAN(src[2]);
-                  dst[3] = UBYTE_TO_CHAN(src[3]);
-                  src += 4;
-                  dst += 4;
-               }
-               return;
-             }
-         }
-         else if (dstFormat == GL_RGB) {
-            if (srcFormat == GL_RGB) {
-               GLuint i;
-               const GLubyte *src = (const GLubyte *) source;
-               GLchan *dst = dest;
-               for (i = 0; i < n; i++) {
-                  dst[0] = UBYTE_TO_CHAN(src[0]);
-                  dst[1] = UBYTE_TO_CHAN(src[1]);
-                  dst[2] = UBYTE_TO_CHAN(src[2]);
-                  src += 3;
-                  dst += 3;
-               }
-               return;
-            }
-            else if (srcFormat == GL_RGBA) {
-               GLuint i;
-               const GLubyte *src = (const GLubyte *) source;
-               GLchan *dst = dest;
-               for (i = 0; i < n; i++) {
-                  dst[0] = UBYTE_TO_CHAN(src[0]);
-                  dst[1] = UBYTE_TO_CHAN(src[1]);
-                  dst[2] = UBYTE_TO_CHAN(src[2]);
-                  src += 4;
-                  dst += 3;
-               }
-               return;
-            }
-         }
-      }
-   }
-
-
-   /* general solution begins here */
-   {
-      GLint dstComponents;
-      GLint rDst, gDst, bDst, aDst, lDst, iDst;
-      GLfloat (*rgba)[4] = (GLfloat (*)[4]) malloc(4 * n * sizeof(GLfloat));
-
-      if (!rgba) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");
-         return;
-      }
-
-      dstComponents = _mesa_components_in_format( dstFormat );
-      /* source & dest image formats should have been error checked by now */
-      assert(dstComponents > 0);
-
-      /*
-       * Extract image data and convert to RGBA floats
-       */
-      if (srcFormat == GL_COLOR_INDEX) {
-         GLuint *indexes = (GLuint *) malloc(n * sizeof(GLuint));
-
-         if (!indexes) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");
-            return;
-         }
-
-         extract_uint_indexes(n, indexes, srcFormat, srcType, source,
-                              srcPacking);
-
-         if (dstFormat == GL_COLOR_INDEX) {
-            GLuint i;
-            _mesa_apply_ci_transfer_ops(ctx, transferOps, n, indexes);
-            /* convert to GLchan and return */
-            for (i = 0; i < n; i++) {
-               dest[i] = (GLchan) (indexes[i] & 0xff);
-            }
-            free(indexes);
-            free(rgba);
-            return;
-         }
-         else {
-            /* Convert indexes to RGBA */
-            if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
-               _mesa_shift_and_offset_ci(ctx, n, indexes);
-            }
-            _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);
-         }
-
-         /* Don't do RGBA scale/bias or RGBA->RGBA mapping if starting
-          * with color indexes.
-          */
-         transferOps &= ~(IMAGE_SCALE_BIAS_BIT | IMAGE_MAP_COLOR_BIT);
-
-         free(indexes);
-      }
-      else {
-         /* non-color index data */
-         extract_float_rgba(n, rgba, srcFormat, srcType, source,
-                            srcPacking->SwapBytes);
-      }
-
-      /* Need to clamp if returning GLubytes or GLushorts */
-#if CHAN_TYPE != GL_FLOAT
-      transferOps |= IMAGE_CLAMP_BIT;
-#endif
-
-      if (transferOps) {
-         _mesa_apply_rgba_transfer_ops(ctx, transferOps, n, rgba);
-      }
-
-      get_component_indexes(dstFormat,
-                            &rDst, &gDst, &bDst, &aDst, &lDst, &iDst);
-
-      /* Now return the GLchan data in the requested dstFormat */
-      if (rDst >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            CLAMPED_FLOAT_TO_CHAN(dst[rDst], rgba[i][RCOMP]);
-            dst += dstComponents;
-         }
-      }
-
-      if (gDst >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            CLAMPED_FLOAT_TO_CHAN(dst[gDst], rgba[i][GCOMP]);
-            dst += dstComponents;
-         }
-      }
-
-      if (bDst >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            CLAMPED_FLOAT_TO_CHAN(dst[bDst], rgba[i][BCOMP]);
-            dst += dstComponents;
-         }
-      }
-
-      if (aDst >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            CLAMPED_FLOAT_TO_CHAN(dst[aDst], rgba[i][ACOMP]);
-            dst += dstComponents;
-         }
-      }
-
-      if (iDst >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         assert(iDst == 0);
-         assert(dstComponents == 1);
-         for (i = 0; i < n; i++) {
-            /* Intensity comes from red channel */
-            CLAMPED_FLOAT_TO_CHAN(dst[i], rgba[i][RCOMP]);
-         }
-      }
-
-      if (lDst >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         assert(lDst == 0);
-         for (i = 0; i < n; i++) {
-            /* Luminance comes from red channel */
-            CLAMPED_FLOAT_TO_CHAN(dst[0], rgba[i][RCOMP]);
-            dst += dstComponents;
-         }
-      }
-
-      free(rgba);
-   }
-}
-
-
-/**
- * Same as _mesa_unpack_color_span_chan(), but return GLfloat data
- * instead of GLchan.
- */
-void
-_mesa_unpack_color_span_float( struct gl_context *ctx,
-                               GLuint n, GLenum dstFormat, GLfloat dest[],
-                               GLenum srcFormat, GLenum srcType,
-                               const GLvoid *source,
-                               const struct gl_pixelstore_attrib *srcPacking,
-                               GLbitfield transferOps )
-{
-   ASSERT(dstFormat == GL_ALPHA ||
-          dstFormat == GL_LUMINANCE ||
-          dstFormat == GL_LUMINANCE_ALPHA ||
-          dstFormat == GL_INTENSITY ||
-          dstFormat == GL_RED ||
-          dstFormat == GL_RG ||
-          dstFormat == GL_RGB ||
-          dstFormat == GL_RGBA ||
-          dstFormat == GL_COLOR_INDEX);
-
-   ASSERT(srcFormat == GL_RED ||
-          srcFormat == GL_GREEN ||
-          srcFormat == GL_BLUE ||
-          srcFormat == GL_ALPHA ||
-          srcFormat == GL_LUMINANCE ||
-          srcFormat == GL_LUMINANCE_ALPHA ||
-          srcFormat == GL_INTENSITY ||
-          srcFormat == GL_RG ||
-          srcFormat == GL_RGB ||
-          srcFormat == GL_BGR ||
-          srcFormat == GL_RGBA ||
-          srcFormat == GL_BGRA ||
-          srcFormat == GL_ABGR_EXT ||
-          srcFormat == GL_RED_INTEGER_EXT ||
-          srcFormat == GL_GREEN_INTEGER_EXT ||
-          srcFormat == GL_BLUE_INTEGER_EXT ||
-          srcFormat == GL_ALPHA_INTEGER_EXT ||
-          srcFormat == GL_RGB_INTEGER_EXT ||
-          srcFormat == GL_RGBA_INTEGER_EXT ||
-          srcFormat == GL_BGR_INTEGER_EXT ||
-          srcFormat == GL_BGRA_INTEGER_EXT ||
-          srcFormat == GL_LUMINANCE_INTEGER_EXT ||
-          srcFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT ||
-          srcFormat == GL_COLOR_INDEX);
-
-   ASSERT(srcType == GL_BITMAP ||
-          srcType == GL_UNSIGNED_BYTE ||
-          srcType == GL_BYTE ||
-          srcType == GL_UNSIGNED_SHORT ||
-          srcType == GL_SHORT ||
-          srcType == GL_UNSIGNED_INT ||
-          srcType == GL_INT ||
-          srcType == GL_HALF_FLOAT_ARB ||
-          srcType == GL_FLOAT ||
-          srcType == GL_UNSIGNED_BYTE_3_3_2 ||
-          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
-          srcType == GL_UNSIGNED_SHORT_5_6_5 ||
-          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||
-          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||
-          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||
-          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||
-          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||
-          srcType == GL_UNSIGNED_INT_8_8_8_8 ||
-          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||
-          srcType == GL_UNSIGNED_INT_10_10_10_2 ||
-          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);
-
-   /* general solution, no special cases, yet */
-   {
-      GLint dstComponents;
-      GLint rDst, gDst, bDst, aDst, lDst, iDst;
-      GLfloat (*rgba)[4] = (GLfloat (*)[4]) malloc(4 * n * sizeof(GLfloat));
-
-      if (!rgba) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");
-         return;
-      }
-
-      dstComponents = _mesa_components_in_format( dstFormat );
-      /* source & dest image formats should have been error checked by now */
-      assert(dstComponents > 0);
-
-      /*
-       * Extract image data and convert to RGBA floats
-       */
-      if (srcFormat == GL_COLOR_INDEX) {
-         GLuint *indexes = (GLuint *) malloc(n * sizeof(GLuint));
-
-         if (!indexes) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");
-            free(rgba);
-            return;
-         }
-
-         extract_uint_indexes(n, indexes, srcFormat, srcType, source,
-                              srcPacking);
-
-         if (dstFormat == GL_COLOR_INDEX) {
-            GLuint i;
-            _mesa_apply_ci_transfer_ops(ctx, transferOps, n, indexes);
-            /* convert to GLchan and return */
-            for (i = 0; i < n; i++) {
-               dest[i] = (GLchan) (indexes[i] & 0xff);
-            }
-            free(indexes);
-            free(rgba);
-            return;
-         }
-         else {
-            /* Convert indexes to RGBA */
-            if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
-               _mesa_shift_and_offset_ci(ctx, n, indexes);
-            }
-            _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);
-         }
-
-         /* Don't do RGBA scale/bias or RGBA->RGBA mapping if starting
-          * with color indexes.
-          */
-         transferOps &= ~(IMAGE_SCALE_BIAS_BIT | IMAGE_MAP_COLOR_BIT);
-
-         free(indexes);
-      }
-      else {
-         /* non-color index data */
-         extract_float_rgba(n, rgba, srcFormat, srcType, source,
-                            srcPacking->SwapBytes);
-      }
-
-      if (transferOps) {
-         _mesa_apply_rgba_transfer_ops(ctx, transferOps, n, rgba);
-      }
-
-      get_component_indexes(dstFormat,
-                            &rDst, &gDst, &bDst, &aDst, &lDst, &iDst);
-
-      /* Now pack results in the requested dstFormat */
-      if (rDst >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[rDst] = rgba[i][RCOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (gDst >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[gDst] = rgba[i][GCOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (bDst >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[bDst] = rgba[i][BCOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (aDst >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[aDst] = rgba[i][ACOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (iDst >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         assert(iDst == 0);
-         assert(dstComponents == 1);
-         for (i = 0; i < n; i++) {
-            /* Intensity comes from red channel */
-            dst[i] = rgba[i][RCOMP];
-         }
-      }
-
-      if (lDst >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         assert(lDst == 0);
-         for (i = 0; i < n; i++) {
-            /* Luminance comes from red channel */
-            dst[0] = rgba[i][RCOMP];
-            dst += dstComponents;
-         }
-      }
-
-      free(rgba);
-   }
-}
-
-
-/**
- * Same as _mesa_unpack_color_span_chan(), but return GLuint data
- * instead of GLchan.
- * No pixel transfer ops are applied.
- */
-void
-_mesa_unpack_color_span_uint(struct gl_context *ctx,
-                             GLuint n, GLenum dstFormat, GLuint *dest,
-                             GLenum srcFormat, GLenum srcType,
-                             const GLvoid *source,
-                             const struct gl_pixelstore_attrib *srcPacking)
-{
-   GLuint (*rgba)[4] = (GLuint (*)[4]) malloc(n * 4 * sizeof(GLfloat));
-
-   if (!rgba) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");
-      return;
-   }
-
-   ASSERT(dstFormat == GL_ALPHA ||
-          dstFormat == GL_LUMINANCE ||
-          dstFormat == GL_LUMINANCE_ALPHA ||
-          dstFormat == GL_INTENSITY ||
-          dstFormat == GL_RED ||
-          dstFormat == GL_RG ||
-          dstFormat == GL_RGB ||
-          dstFormat == GL_RGBA);
-
-   ASSERT(srcFormat == GL_RED ||
-          srcFormat == GL_GREEN ||
-          srcFormat == GL_BLUE ||
-          srcFormat == GL_ALPHA ||
-          srcFormat == GL_LUMINANCE ||
-          srcFormat == GL_LUMINANCE_ALPHA ||
-          srcFormat == GL_INTENSITY ||
-          srcFormat == GL_RG ||
-          srcFormat == GL_RGB ||
-          srcFormat == GL_BGR ||
-          srcFormat == GL_RGBA ||
-          srcFormat == GL_BGRA ||
-          srcFormat == GL_ABGR_EXT ||
-          srcFormat == GL_RED_INTEGER_EXT ||
-          srcFormat == GL_GREEN_INTEGER_EXT ||
-          srcFormat == GL_BLUE_INTEGER_EXT ||
-          srcFormat == GL_ALPHA_INTEGER_EXT ||
-          srcFormat == GL_RGB_INTEGER_EXT ||
-          srcFormat == GL_RGBA_INTEGER_EXT ||
-          srcFormat == GL_BGR_INTEGER_EXT ||
-          srcFormat == GL_BGRA_INTEGER_EXT ||
-          srcFormat == GL_LUMINANCE_INTEGER_EXT ||
-          srcFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT);
-
-   ASSERT(srcType == GL_UNSIGNED_BYTE ||
-          srcType == GL_BYTE ||
-          srcType == GL_UNSIGNED_SHORT ||
-          srcType == GL_SHORT ||
-          srcType == GL_UNSIGNED_INT ||
-          srcType == GL_INT ||
-          srcType == GL_HALF_FLOAT_ARB ||
-          srcType == GL_FLOAT ||
-          srcType == GL_UNSIGNED_BYTE_3_3_2 ||
-          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
-          srcType == GL_UNSIGNED_SHORT_5_6_5 ||
-          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||
-          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||
-          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||
-          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||
-          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||
-          srcType == GL_UNSIGNED_INT_8_8_8_8 ||
-          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||
-          srcType == GL_UNSIGNED_INT_10_10_10_2 ||
-          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);
-
-
-   /* Extract image data as uint[4] pixels */
-   extract_uint_rgba(n, rgba, srcFormat, srcType, source,
-                     srcPacking->SwapBytes);
-
-   if (dstFormat == GL_RGBA) {
-      /* simple case */
-      memcpy(dest, rgba, 4 * sizeof(GLuint) * n);
-   }
-   else {
-      /* general case */
-      GLint rDst, gDst, bDst, aDst, lDst, iDst;
-      GLint dstComponents = _mesa_components_in_format( dstFormat );
-
-      assert(dstComponents > 0);
-
-      get_component_indexes(dstFormat,
-                            &rDst, &gDst, &bDst, &aDst, &lDst, &iDst);
-
-      /* Now pack values in the requested dest format */
-      if (rDst >= 0) {
-         GLuint *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[rDst] = rgba[i][RCOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (gDst >= 0) {
-         GLuint *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[gDst] = rgba[i][GCOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (bDst >= 0) {
-         GLuint *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[bDst] = rgba[i][BCOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (aDst >= 0) {
-         GLuint *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[aDst] = rgba[i][ACOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (iDst >= 0) {
-         GLuint *dst = dest;
-         GLuint i;
-         assert(iDst == 0);
-         assert(dstComponents == 1);
-         for (i = 0; i < n; i++) {
-            /* Intensity comes from red channel */
-            dst[i] = rgba[i][RCOMP];
-         }
-      }
-
-      if (lDst >= 0) {
-         GLuint *dst = dest;
-         GLuint i;
-         assert(lDst == 0);
-         for (i = 0; i < n; i++) {
-            /* Luminance comes from red channel */
-            dst[0] = rgba[i][RCOMP];
-            dst += dstComponents;
-         }
-      }
-   }
-
-   free(rgba);
-}
-
-
-
-/**
- * Similar to _mesa_unpack_color_span_float(), but for dudv data instead of rgba,
- * directly return GLbyte data, no transfer ops apply.
- */
-void
-_mesa_unpack_dudv_span_byte( struct gl_context *ctx,
-                             GLuint n, GLenum dstFormat, GLbyte dest[],
-                             GLenum srcFormat, GLenum srcType,
-                             const GLvoid *source,
-                             const struct gl_pixelstore_attrib *srcPacking,
-                             GLbitfield transferOps )
-{
-   ASSERT(dstFormat == GL_DUDV_ATI);
-   ASSERT(srcFormat == GL_DUDV_ATI);
-
-   ASSERT(srcType == GL_UNSIGNED_BYTE ||
-          srcType == GL_BYTE ||
-          srcType == GL_UNSIGNED_SHORT ||
-          srcType == GL_SHORT ||
-          srcType == GL_UNSIGNED_INT ||
-          srcType == GL_INT ||
-          srcType == GL_HALF_FLOAT_ARB ||
-          srcType == GL_FLOAT);
-
-   /* general solution */
-   {
-      GLint dstComponents;
-      GLbyte *dst = dest;
-      GLuint i;
-      GLfloat (*rgba)[4] = (GLfloat (*)[4]) malloc(4 * n * sizeof(GLfloat));
-
-      if (!rgba) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");
-         return;
-      }
-
-      dstComponents = _mesa_components_in_format( dstFormat );
-      /* source & dest image formats should have been error checked by now */
-      assert(dstComponents > 0);
-
-      /*
-       * Extract image data and convert to RGBA floats
-       */
-      extract_float_rgba(n, rgba, srcFormat, srcType, source,
-                         srcPacking->SwapBytes);
-
-
-      /* Now determine which color channels we need to produce.
-       * And determine the dest index (offset) within each color tuple.
-       */
-
-      /* Now pack results in the requested dstFormat */
-      for (i = 0; i < n; i++) {
-         /* not sure - need clamp[-1,1] here? */
-         dst[0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
-         dst[1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
-         dst += dstComponents;
-      }
-
-      free(rgba);
-   }
-}
-
-/*
- * Unpack a row of color index data from a client buffer according to
- * the pixel unpacking parameters.
- * This is (or will be) used by glDrawPixels, glTexImage[123]D, etc.
- *
- * Args:  ctx - the context
- *        n - number of pixels
- *        dstType - destination data type
- *        dest - destination array
- *        srcType - source pixel type
- *        source - source data pointer
- *        srcPacking - pixel unpacking parameters
- *        transferOps - the pixel transfer operations to apply
- */
-void
-_mesa_unpack_index_span( struct gl_context *ctx, GLuint n,
-                         GLenum dstType, GLvoid *dest,
-                         GLenum srcType, const GLvoid *source,
-                         const struct gl_pixelstore_attrib *srcPacking,
-                         GLbitfield transferOps )
-{
-   ASSERT(srcType == GL_BITMAP ||
-          srcType == GL_UNSIGNED_BYTE ||
-          srcType == GL_BYTE ||
-          srcType == GL_UNSIGNED_SHORT ||
-          srcType == GL_SHORT ||
-          srcType == GL_UNSIGNED_INT ||
-          srcType == GL_INT ||
-          srcType == GL_HALF_FLOAT_ARB ||
-          srcType == GL_FLOAT);
-
-   ASSERT(dstType == GL_UNSIGNED_BYTE ||
-          dstType == GL_UNSIGNED_SHORT ||
-          dstType == GL_UNSIGNED_INT);
-
-
-   transferOps &= (IMAGE_MAP_COLOR_BIT | IMAGE_SHIFT_OFFSET_BIT);
-
-   /*
-    * Try simple cases first
-    */
-   if (transferOps == 0 && srcType == GL_UNSIGNED_BYTE
-       && dstType == GL_UNSIGNED_BYTE) {
-      memcpy(dest, source, n * sizeof(GLubyte));
-   }
-   else if (transferOps == 0 && srcType == GL_UNSIGNED_INT
-            && dstType == GL_UNSIGNED_INT && !srcPacking->SwapBytes) {
-      memcpy(dest, source, n * sizeof(GLuint));
-   }
-   else {
-      /*
-       * general solution
-       */
-      GLuint *indexes = (GLuint *) malloc(n * sizeof(GLuint));
-
-      if (!indexes) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");
-         return;
-      }
-
-      extract_uint_indexes(n, indexes, GL_COLOR_INDEX, srcType, source,
-                           srcPacking);
-
-      if (transferOps)
-         _mesa_apply_ci_transfer_ops(ctx, transferOps, n, indexes);
-
-      /* convert to dest type */
-      switch (dstType) {
-         case GL_UNSIGNED_BYTE:
-            {
-               GLubyte *dst = (GLubyte *) dest;
-               GLuint i;
-               for (i = 0; i < n; i++) {
-                  dst[i] = (GLubyte) (indexes[i] & 0xff);
-               }
-            }
-            break;
-         case GL_UNSIGNED_SHORT:
-            {
-               GLuint *dst = (GLuint *) dest;
-               GLuint i;
-               for (i = 0; i < n; i++) {
-                  dst[i] = (GLushort) (indexes[i] & 0xffff);
-               }
-            }
-            break;
-         case GL_UNSIGNED_INT:
-            memcpy(dest, indexes, n * sizeof(GLuint));
-            break;
-         default:
-            _mesa_problem(ctx, "bad dstType in _mesa_unpack_index_span");
-      }
-
-      free(indexes);
-   }
-}
-
-
-void
-_mesa_pack_index_span( struct gl_context *ctx, GLuint n,
-                       GLenum dstType, GLvoid *dest, const GLuint *source,
-                       const struct gl_pixelstore_attrib *dstPacking,
-                       GLbitfield transferOps )
-{
-   GLuint *indexes = (GLuint *) malloc(n * sizeof(GLuint));
-
-   if (!indexes) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel packing");
-      return;
-   }
-
-   transferOps &= (IMAGE_MAP_COLOR_BIT | IMAGE_SHIFT_OFFSET_BIT);
-
-   if (transferOps & (IMAGE_MAP_COLOR_BIT | IMAGE_SHIFT_OFFSET_BIT)) {
-      /* make a copy of input */
-      memcpy(indexes, source, n * sizeof(GLuint));
-      _mesa_apply_ci_transfer_ops(ctx, transferOps, n, indexes);
-      source = indexes;
-   }
-
-   switch (dstType) {
-   case GL_UNSIGNED_BYTE:
-      {
-         GLubyte *dst = (GLubyte *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            *dst++ = (GLubyte) source[i];
-         }
-      }
-      break;
-   case GL_BYTE:
-      {
-         GLbyte *dst = (GLbyte *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = (GLbyte) source[i];
-         }
-      }
-      break;
-   case GL_UNSIGNED_SHORT:
-      {
-         GLushort *dst = (GLushort *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = (GLushort) source[i];
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap2( (GLushort *) dst, n );
-         }
-      }
-      break;
-   case GL_SHORT:
-      {
-         GLshort *dst = (GLshort *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = (GLshort) source[i];
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap2( (GLushort *) dst, n );
-         }
-      }
-      break;
-   case GL_UNSIGNED_INT:
-      {
-         GLuint *dst = (GLuint *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = (GLuint) source[i];
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap4( (GLuint *) dst, n );
-         }
-      }
-      break;
-   case GL_INT:
-      {
-         GLint *dst = (GLint *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = (GLint) source[i];
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap4( (GLuint *) dst, n );
-         }
-      }
-      break;
-   case GL_FLOAT:
-      {
-         GLfloat *dst = (GLfloat *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = (GLfloat) source[i];
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap4( (GLuint *) dst, n );
-         }
-      }
-      break;
-   case GL_HALF_FLOAT_ARB:
-      {
-         GLhalfARB *dst = (GLhalfARB *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = _mesa_float_to_half((GLfloat) source[i]);
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap2( (GLushort *) dst, n );
-         }
-      }
-      break;
-   default:
-      _mesa_problem(ctx, "bad type in _mesa_pack_index_span");
-   }
-
-   free(indexes);
-}
-
-
-/*
- * Unpack a row of stencil data from a client buffer according to
- * the pixel unpacking parameters.
- * This is (or will be) used by glDrawPixels
- *
- * Args:  ctx - the context
- *        n - number of pixels
- *        dstType - destination data type
- *        dest - destination array
- *        srcType - source pixel type
- *        source - source data pointer
- *        srcPacking - pixel unpacking parameters
- *        transferOps - apply offset/bias/lookup ops?
- */
-void
-_mesa_unpack_stencil_span( struct gl_context *ctx, GLuint n,
-                           GLenum dstType, GLvoid *dest,
-                           GLenum srcType, const GLvoid *source,
-                           const struct gl_pixelstore_attrib *srcPacking,
-                           GLbitfield transferOps )
-{
-   ASSERT(srcType == GL_BITMAP ||
-          srcType == GL_UNSIGNED_BYTE ||
-          srcType == GL_BYTE ||
-          srcType == GL_UNSIGNED_SHORT ||
-          srcType == GL_SHORT ||
-          srcType == GL_UNSIGNED_INT ||
-          srcType == GL_INT ||
-          srcType == GL_UNSIGNED_INT_24_8_EXT ||
-          srcType == GL_HALF_FLOAT_ARB ||
-          srcType == GL_FLOAT);
-
-   ASSERT(dstType == GL_UNSIGNED_BYTE ||
-          dstType == GL_UNSIGNED_SHORT ||
-          dstType == GL_UNSIGNED_INT);
-
-   /* only shift and offset apply to stencil */
-   transferOps &= IMAGE_SHIFT_OFFSET_BIT;
-
-   /*
-    * Try simple cases first
-    */
-   if (transferOps == 0 &&
-       !ctx->Pixel.MapStencilFlag &&
-       srcType == GL_UNSIGNED_BYTE &&
-       dstType == GL_UNSIGNED_BYTE) {
-      memcpy(dest, source, n * sizeof(GLubyte));
-   }
-   else if (transferOps == 0 &&
-            !ctx->Pixel.MapStencilFlag &&
-            srcType == GL_UNSIGNED_INT &&
-            dstType == GL_UNSIGNED_INT &&
-            !srcPacking->SwapBytes) {
-      memcpy(dest, source, n * sizeof(GLuint));
-   }
-   else {
-      /*
-       * general solution
-       */
-      GLuint *indexes = (GLuint *) malloc(n * sizeof(GLuint));
-
-      if (!indexes) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "stencil unpacking");
-         return;
-      }
-
-      extract_uint_indexes(n, indexes, GL_STENCIL_INDEX, srcType, source,
-                           srcPacking);
-
-      if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
-         /* shift and offset indexes */
-         _mesa_shift_and_offset_ci(ctx, n, indexes);
-      }
-
-      if (ctx->Pixel.MapStencilFlag) {
-         /* Apply stencil lookup table */
-         const GLuint mask = ctx->PixelMaps.StoS.Size - 1;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            indexes[i] = (GLuint)ctx->PixelMaps.StoS.Map[ indexes[i] & mask ];
-         }
-      }
-
-      /* convert to dest type */
-      switch (dstType) {
-         case GL_UNSIGNED_BYTE:
-            {
-               GLubyte *dst = (GLubyte *) dest;
-               GLuint i;
-               for (i = 0; i < n; i++) {
-                  dst[i] = (GLubyte) (indexes[i] & 0xff);
-               }
-            }
-            break;
-         case GL_UNSIGNED_SHORT:
-            {
-               GLuint *dst = (GLuint *) dest;
-               GLuint i;
-               for (i = 0; i < n; i++) {
-                  dst[i] = (GLushort) (indexes[i] & 0xffff);
-               }
-            }
-            break;
-         case GL_UNSIGNED_INT:
-            memcpy(dest, indexes, n * sizeof(GLuint));
-            break;
-         default:
-            _mesa_problem(ctx, "bad dstType in _mesa_unpack_stencil_span");
-      }
-
-      free(indexes);
-   }
-}
-
-
-void
-_mesa_pack_stencil_span( struct gl_context *ctx, GLuint n,
-                         GLenum dstType, GLvoid *dest, const GLstencil *source,
-                         const struct gl_pixelstore_attrib *dstPacking )
-{
-   GLstencil *stencil = (GLstencil *) malloc(n * sizeof(GLstencil));
-
-   if (!stencil) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "stencil packing");
-      return;
-   }
-
-   if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset ||
-       ctx->Pixel.MapStencilFlag) {
-      /* make a copy of input */
-      memcpy(stencil, source, n * sizeof(GLstencil));
-      _mesa_apply_stencil_transfer_ops(ctx, n, stencil);
-      source = stencil;
-   }
-
-   switch (dstType) {
-   case GL_UNSIGNED_BYTE:
-      if (sizeof(GLstencil) == 1) {
-         memcpy( dest, source, n );
-      }
-      else {
-         GLubyte *dst = (GLubyte *) dest;
-         GLuint i;
-         for (i=0;i<n;i++) {
-            dst[i] = (GLubyte) source[i];
-         }
-      }
-      break;
-   case GL_BYTE:
-      {
-         GLbyte *dst = (GLbyte *) dest;
-         GLuint i;
-         for (i=0;i<n;i++) {
-            dst[i] = (GLbyte) (source[i] & 0x7f);
-         }
-      }
-      break;
-   case GL_UNSIGNED_SHORT:
-      {
-         GLushort *dst = (GLushort *) dest;
-         GLuint i;
-         for (i=0;i<n;i++) {
-            dst[i] = (GLushort) source[i];
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap2( (GLushort *) dst, n );
-         }
-      }
-      break;
-   case GL_SHORT:
-      {
-         GLshort *dst = (GLshort *) dest;
-         GLuint i;
-         for (i=0;i<n;i++) {
-            dst[i] = (GLshort) source[i];
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap2( (GLushort *) dst, n );
-         }
-      }
-      break;
-   case GL_UNSIGNED_INT:
-      {
-         GLuint *dst = (GLuint *) dest;
-         GLuint i;
-         for (i=0;i<n;i++) {
-            dst[i] = (GLuint) source[i];
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap4( (GLuint *) dst, n );
-         }
-      }
-      break;
-   case GL_INT:
-      {
-         GLint *dst = (GLint *) dest;
-         GLuint i;
-         for (i=0;i<n;i++) {
-            dst[i] = (GLint) source[i];
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap4( (GLuint *) dst, n );
-         }
-      }
-      break;
-   case GL_FLOAT:
-      {
-         GLfloat *dst = (GLfloat *) dest;
-         GLuint i;
-         for (i=0;i<n;i++) {
-            dst[i] = (GLfloat) source[i];
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap4( (GLuint *) dst, n );
-         }
-      }
-      break;
-   case GL_HALF_FLOAT_ARB:
-      {
-         GLhalfARB *dst = (GLhalfARB *) dest;
-         GLuint i;
-         for (i=0;i<n;i++) {
-            dst[i] = _mesa_float_to_half( (float) source[i] );
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap2( (GLushort *) dst, n );
-         }
-      }
-      break;
-   case GL_BITMAP:
-      if (dstPacking->LsbFirst) {
-         GLubyte *dst = (GLubyte *) dest;
-         GLint shift = 0;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            if (shift == 0)
-               *dst = 0;
-            *dst |= ((source[i] != 0) << shift);
-            shift++;
-            if (shift == 8) {
-               shift = 0;
-               dst++;
-            }
-         }
-      }
-      else {
-         GLubyte *dst = (GLubyte *) dest;
-         GLint shift = 7;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            if (shift == 7)
-               *dst = 0;
-            *dst |= ((source[i] != 0) << shift);
-            shift--;
-            if (shift < 0) {
-               shift = 7;
-               dst++;
-            }
-         }
-      }
-      break;
-   default:
-      _mesa_problem(ctx, "bad type in _mesa_pack_index_span");
-   }
-
-   free(stencil);
-}
-
-#define DEPTH_VALUES(GLTYPE, GLTYPE2FLOAT)                              \
-    do {                                                                \
-        GLuint i;                                                       \
-        const GLTYPE *src = (const GLTYPE *)source;                     \
-        for (i = 0; i < n; i++) {                                       \
-            GLTYPE value = src[i];                                      \
-            if (srcPacking->SwapBytes) {                                \
-                if (sizeof(GLTYPE) == 2) {                              \
-                    SWAP2BYTE(value);                                   \
-                } else if (sizeof(GLTYPE) == 4) {                       \
-                    SWAP4BYTE(value);                                   \
-                }                                                       \
-            }                                                           \
-            depthValues[i] = GLTYPE2FLOAT(value);                       \
-        }                                                               \
-    } while (0)
-
-
-/**
- * Unpack a row of depth/z values from memory, returning GLushort, GLuint
- * or GLfloat values.
- * The glPixelTransfer (scale/bias) params will be applied.
- *
- * \param dstType  one of GL_UNSIGNED_SHORT, GL_UNSIGNED_INT, GL_FLOAT
- * \param depthMax  max value for returned GLushort or GLuint values
- *                  (ignored for GLfloat).
- */
-void
-_mesa_unpack_depth_span( struct gl_context *ctx, GLuint n,
-                         GLenum dstType, GLvoid *dest, GLuint depthMax,
-                         GLenum srcType, const GLvoid *source,
-                         const struct gl_pixelstore_attrib *srcPacking )
-{
-   GLfloat *depthTemp, *depthValues;
-   GLboolean needClamp = GL_FALSE;
-
-   /* Look for special cases first.
-    * Not only are these faster, they're less prone to numeric conversion
-    * problems.  Otherwise, converting from an int type to a float then
-    * back to an int type can introduce errors that will show up as
-    * artifacts in things like depth peeling which uses glCopyTexImage.
-    */
-   if (ctx->Pixel.DepthScale == 1.0 && ctx->Pixel.DepthBias == 0.0) {
-      if (srcType == GL_UNSIGNED_INT && dstType == GL_UNSIGNED_SHORT) {
-         const GLuint *src = (const GLuint *) source;
-         GLushort *dst = (GLushort *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = src[i] >> 16;
-         }
-         return;
-      }
-      if (srcType == GL_UNSIGNED_SHORT
-          && dstType == GL_UNSIGNED_INT
-          && depthMax == 0xffffffff) {
-         const GLushort *src = (const GLushort *) source;
-         GLuint *dst = (GLuint *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = src[i] | (src[i] << 16);
-         }
-         return;
-      }
-      if (srcType == GL_UNSIGNED_INT_24_8
-          && dstType == GL_UNSIGNED_INT
-          && depthMax == 0xffffff) {
-         const GLuint *src = (const GLuint *) source;
-         GLuint *dst = (GLuint *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = src[i] >> 8;
-         }
-         return;
-      }
-      /* XXX may want to add additional cases here someday */
-   }
-
-   /* general case path follows */
-
-   depthTemp = (GLfloat *) malloc(n * sizeof(GLfloat));
-   if (!depthTemp) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");
-      return;
-   }
-
-   if (dstType == GL_FLOAT) {
-      depthValues = (GLfloat *) dest;
-   }
-   else {
-      depthValues = depthTemp;
-   }
-
-   /* Convert incoming values to GLfloat.  Some conversions will require
-    * clamping, below.
-    */
-   switch (srcType) {
-      case GL_BYTE:
-         DEPTH_VALUES(GLbyte, BYTE_TO_FLOAT);
-         needClamp = GL_TRUE;
-         break;
-      case GL_UNSIGNED_BYTE:
-         DEPTH_VALUES(GLubyte, UBYTE_TO_FLOAT);
-         break;
-      case GL_SHORT:
-         DEPTH_VALUES(GLshort, SHORT_TO_FLOAT);
-         needClamp = GL_TRUE;
-         break;
-      case GL_UNSIGNED_SHORT:
-         DEPTH_VALUES(GLushort, USHORT_TO_FLOAT);
-         break;
-      case GL_INT:
-         DEPTH_VALUES(GLint, INT_TO_FLOAT);
-         needClamp = GL_TRUE;
-         break;
-      case GL_UNSIGNED_INT:
-         DEPTH_VALUES(GLuint, UINT_TO_FLOAT);
-         break;
-      case GL_UNSIGNED_INT_24_8_EXT: /* GL_EXT_packed_depth_stencil */
-         if (dstType == GL_UNSIGNED_INT_24_8_EXT &&
-             depthMax == 0xffffff &&
-             ctx->Pixel.DepthScale == 1.0 &&
-             ctx->Pixel.DepthBias == 0.0) {
-            const GLuint *src = (const GLuint *) source;
-            GLuint *zValues = (GLuint *) dest;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-                GLuint value = src[i];
-                if (srcPacking->SwapBytes) {
-                    SWAP4BYTE(value);
-                }
-                zValues[i] = value & 0xffffff00;
-            }
-            return;
-         }
-         else {
-            const GLuint *src = (const GLuint *) source;
-            const GLfloat scale = 1.0f / 0xffffff;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-                GLuint value = src[i];
-                if (srcPacking->SwapBytes) {
-                    SWAP4BYTE(value);
-                }
-                depthValues[i] = (value >> 8) * scale;
-            }
-         }
-         break;
-      case GL_FLOAT:
-         DEPTH_VALUES(GLfloat, 1*);
-         needClamp = GL_TRUE;
-         break;
-      case GL_HALF_FLOAT_ARB:
-         {
-            GLuint i;
-            const GLhalfARB *src = (const GLhalfARB *) source;
-            for (i = 0; i < n; i++) {
-               GLhalfARB value = src[i];
-               if (srcPacking->SwapBytes) {
-                  SWAP2BYTE(value);
-               }
-               depthValues[i] = _mesa_half_to_float(value);
-            }
-            needClamp = GL_TRUE;
-         }
-         break;
-      default:
-         _mesa_problem(NULL, "bad type in _mesa_unpack_depth_span()");
-         free(depthTemp);
-         return;
-   }
-
-   /* apply depth scale and bias */
-   {
-      const GLfloat scale = ctx->Pixel.DepthScale;
-      const GLfloat bias = ctx->Pixel.DepthBias;
-      if (scale != 1.0 || bias != 0.0) {
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            depthValues[i] = depthValues[i] * scale + bias;
-         }
-         needClamp = GL_TRUE;
-      }
-   }
-
-   /* clamp to [0, 1] */
-   if (needClamp) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         depthValues[i] = (GLfloat)CLAMP(depthValues[i], 0.0, 1.0);
-      }
-   }
-
-   /*
-    * Convert values to dstType
-    */
-   if (dstType == GL_UNSIGNED_INT) {
-      GLuint *zValues = (GLuint *) dest;
-      GLuint i;
-      if (depthMax <= 0xffffff) {
-         /* no overflow worries */
-         for (i = 0; i < n; i++) {
-            zValues[i] = (GLuint) (depthValues[i] * (GLfloat) depthMax);
-         }
-      }
-      else {
-         /* need to use double precision to prevent overflow problems */
-         for (i = 0; i < n; i++) {
-            GLdouble z = depthValues[i] * (GLfloat) depthMax;
-            if (z >= (GLdouble) 0xffffffff)
-               zValues[i] = 0xffffffff;
-            else
-               zValues[i] = (GLuint) z;
-         }
-      }
-   }
-   else if (dstType == GL_UNSIGNED_SHORT) {
-      GLushort *zValues = (GLushort *) dest;
-      GLuint i;
-      ASSERT(depthMax <= 0xffff);
-      for (i = 0; i < n; i++) {
-         zValues[i] = (GLushort) (depthValues[i] * (GLfloat) depthMax);
-      }
-   }
-   else {
-      ASSERT(dstType == GL_FLOAT);
-      /*ASSERT(depthMax == 1.0F);*/
-   }
-
-   free(depthTemp);
-}
-
-
-/*
- * Pack an array of depth values.  The values are floats in [0,1].
- */
-void
-_mesa_pack_depth_span( struct gl_context *ctx, GLuint n, GLvoid *dest,
-                       GLenum dstType, const GLfloat *depthSpan,
-                       const struct gl_pixelstore_attrib *dstPacking )
-{
-   GLfloat *depthCopy = (GLfloat *) malloc(n * sizeof(GLfloat));
-   if (!depthCopy) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel packing");
-      return;
-   }
-
-   if (ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0) {
-      memcpy(depthCopy, depthSpan, n * sizeof(GLfloat));
-      _mesa_scale_and_bias_depth(ctx, n, depthCopy);
-      depthSpan = depthCopy;
-   }
-
-   switch (dstType) {
-   case GL_UNSIGNED_BYTE:
-      {
-         GLubyte *dst = (GLubyte *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = FLOAT_TO_UBYTE( depthSpan[i] );
-         }
-      }
-      break;
-   case GL_BYTE:
-      {
-         GLbyte *dst = (GLbyte *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = FLOAT_TO_BYTE( depthSpan[i] );
-         }
-      }
-      break;
-   case GL_UNSIGNED_SHORT:
-      {
-         GLushort *dst = (GLushort *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            CLAMPED_FLOAT_TO_USHORT(dst[i], depthSpan[i]);
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap2( (GLushort *) dst, n );
-         }
-      }
-      break;
-   case GL_SHORT:
-      {
-         GLshort *dst = (GLshort *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = FLOAT_TO_SHORT( depthSpan[i] );
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap2( (GLushort *) dst, n );
-         }
-      }
-      break;
-   case GL_UNSIGNED_INT:
-      {
-         GLuint *dst = (GLuint *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = FLOAT_TO_UINT( depthSpan[i] );
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap4( (GLuint *) dst, n );
-         }
-      }
-      break;
-   case GL_INT:
-      {
-         GLint *dst = (GLint *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = FLOAT_TO_INT( depthSpan[i] );
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap4( (GLuint *) dst, n );
-         }
-      }
-      break;
-   case GL_FLOAT:
-      {
-         GLfloat *dst = (GLfloat *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = depthSpan[i];
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap4( (GLuint *) dst, n );
-         }
-      }
-      break;
-   case GL_HALF_FLOAT_ARB:
-      {
-         GLhalfARB *dst = (GLhalfARB *) dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[i] = _mesa_float_to_half(depthSpan[i]);
-         }
-         if (dstPacking->SwapBytes) {
-            _mesa_swap2( (GLushort *) dst, n );
-         }
-      }
-      break;
-   default:
-      _mesa_problem(ctx, "bad type in _mesa_pack_depth_span");
-   }
-
-   free(depthCopy);
-}
-
-
-
-/**
- * Pack depth and stencil values as GL_DEPTH_STENCIL/GL_UNSIGNED_INT_24_8.
- */
-void
-_mesa_pack_depth_stencil_span(struct gl_context *ctx, GLuint n, GLuint *dest,
-                              const GLfloat *depthVals,
-                              const GLstencil *stencilVals,
-                              const struct gl_pixelstore_attrib *dstPacking)
-{
-   GLfloat *depthCopy = (GLfloat *) malloc(n * sizeof(GLfloat));
-   GLstencil *stencilCopy = (GLstencil *) malloc(n * sizeof(GLstencil));
-   GLuint i;
-
-   if (!depthCopy || !stencilCopy) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel packing");
-      free(depthCopy);
-      free(stencilCopy);
-      return;
-   }
-
-   if (ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0) {
-      memcpy(depthCopy, depthVals, n * sizeof(GLfloat));
-      _mesa_scale_and_bias_depth(ctx, n, depthCopy);
-      depthVals = depthCopy;
-   }
-
-   if (ctx->Pixel.IndexShift ||
-       ctx->Pixel.IndexOffset ||
-       ctx->Pixel.MapStencilFlag) {
-      memcpy(stencilCopy, stencilVals, n * sizeof(GLstencil));
-      _mesa_apply_stencil_transfer_ops(ctx, n, stencilCopy);
-      stencilVals = stencilCopy;
-   }
-
-   for (i = 0; i < n; i++) {
-      GLuint z = (GLuint) (depthVals[i] * 0xffffff);
-      dest[i] = (z << 8) | (stencilVals[i] & 0xff);
-   }
-
-   if (dstPacking->SwapBytes) {
-      _mesa_swap4(dest, n);
-   }
-
-   free(depthCopy);
-   free(stencilCopy);
-}
-
-
-
-
-/**
- * Unpack image data.  Apply byte swapping, byte flipping (bitmap).
- * Return all image data in a contiguous block.  This is used when we
- * compile glDrawPixels, glTexImage, etc into a display list.  We
- * need a copy of the data in a standard format.
- */
-void *
-_mesa_unpack_image( GLuint dimensions,
-                    GLsizei width, GLsizei height, GLsizei depth,
-                    GLenum format, GLenum type, const GLvoid *pixels,
-                    const struct gl_pixelstore_attrib *unpack )
-{
-   GLint bytesPerRow, compsPerRow;
-   GLboolean flipBytes, swap2, swap4;
-
-   if (!pixels)
-      return NULL;  /* not necessarily an error */
-
-   if (width <= 0 || height <= 0 || depth <= 0)
-      return NULL;  /* generate error later */
-
-   if (type == GL_BITMAP) {
-      bytesPerRow = (width + 7) >> 3;
-      flipBytes = unpack->LsbFirst;
-      swap2 = swap4 = GL_FALSE;
-      compsPerRow = 0;
-   }
-   else {
-      const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);
-      GLint components = _mesa_components_in_format(format);
-      GLint bytesPerComp;
-
-      if (_mesa_type_is_packed(type))
-          components = 1;
-
-      if (bytesPerPixel <= 0 || components <= 0)
-         return NULL;   /* bad format or type.  generate error later */
-      bytesPerRow = bytesPerPixel * width;
-      bytesPerComp = bytesPerPixel / components;
-      flipBytes = GL_FALSE;
-      swap2 = (bytesPerComp == 2) && unpack->SwapBytes;
-      swap4 = (bytesPerComp == 4) && unpack->SwapBytes;
-      compsPerRow = components * width;
-      assert(compsPerRow >= width);
-   }
-
-   {
-      GLubyte *destBuffer
-         = (GLubyte *) malloc(bytesPerRow * height * depth);
-      GLubyte *dst;
-      GLint img, row;
-      if (!destBuffer)
-         return NULL;   /* generate GL_OUT_OF_MEMORY later */
-
-      dst = destBuffer;
-      for (img = 0; img < depth; img++) {
-         for (row = 0; row < height; row++) {
-            const GLvoid *src = _mesa_image_address(dimensions, unpack, pixels,
-                               width, height, format, type, img, row, 0);
-
-            if ((type == GL_BITMAP) && (unpack->SkipPixels & 0x7)) {
-               GLint i;
-               flipBytes = GL_FALSE;
-               if (unpack->LsbFirst) {
-                  GLubyte srcMask = 1 << (unpack->SkipPixels & 0x7);
-                  GLubyte dstMask = 128;
-                  const GLubyte *s = src;
-                  GLubyte *d = dst;
-                  *d = 0;
-                  for (i = 0; i < width; i++) {
-                     if (*s & srcMask) {
-                        *d |= dstMask;
-                     }      
-                     if (srcMask == 128) {
-                        srcMask = 1;
-                        s++;
-                     }
-                     else {
-                        srcMask = srcMask << 1;
-                     }
-                     if (dstMask == 1) {
-                        dstMask = 128;
-                        d++;
-                        *d = 0;
-                     }
-                     else {
-                        dstMask = dstMask >> 1;
-                     }
-                  }
-               }
-               else {
-                  GLubyte srcMask = 128 >> (unpack->SkipPixels & 0x7);
-                  GLubyte dstMask = 128;
-                  const GLubyte *s = src;
-                  GLubyte *d = dst;
-                  *d = 0;
-                  for (i = 0; i < width; i++) {
-                     if (*s & srcMask) {
-                        *d |= dstMask;
-                     }
-                     if (srcMask == 1) {
-                        srcMask = 128;
-                        s++;
-                     }
-                     else {
-                        srcMask = srcMask >> 1;
-                     }
-                     if (dstMask == 1) {
-                        dstMask = 128;
-                        d++;
-                        *d = 0;
-                     }
-                     else {
-                        dstMask = dstMask >> 1;
-                     }      
-                  }
-               }
-            }
-            else {
-               memcpy(dst, src, bytesPerRow);
-            }
-
-            /* byte flipping/swapping */
-            if (flipBytes) {
-               flip_bytes((GLubyte *) dst, bytesPerRow);
-            }
-            else if (swap2) {
-               _mesa_swap2((GLushort*) dst, compsPerRow);
-            }
-            else if (swap4) {
-               _mesa_swap4((GLuint*) dst, compsPerRow);
-            }
-            dst += bytesPerRow;
-         }
-      }
-      return destBuffer;
-   }
-}
-
+/*

+ * Mesa 3-D graphics library

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.

+ *

+ * 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

+ * THEA AUTHORS 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.

+ */

+

+

+/**

+ * \file pack.c

+ * Image and pixel span packing and unpacking.

+ */

+

+

+#include "glheader.h"

+#include "colormac.h"

+#include "enums.h"

+#include "image.h"

+#include "imports.h"

+#include "mtypes.h"

+#include "pack.h"

+#include "pixeltransfer.h"

+#include "imports.h"

+

+

+/**

+ * NOTE:

+ * Normally, BYTE_TO_FLOAT(0) returns 0.00392  That causes problems when

+ * we later convert the float to a packed integer value (such as for

+ * GL_RGB5_A1) because we'll wind up with a non-zero value.

+ *

+ * We redefine the macros here so zero is handled correctly.

+ */

+#undef BYTE_TO_FLOAT

+#define BYTE_TO_FLOAT(B)    ((B) == 0 ? 0.0F : ((2.0F * (B) + 1.0F) * (1.0F/255.0F)))

+

+#undef SHORT_TO_FLOAT

+#define SHORT_TO_FLOAT(S)   ((S) == 0 ? 0.0F : ((2.0F * (S) + 1.0F) * (1.0F/65535.0F)))

+

+

+

+/** Compute ceiling of integer quotient of A divided by B. */

+#define CEILING( A, B )  ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 )

+

+

+/**

+ * Flip the 8 bits in each byte of the given array.

+ *

+ * \param p array.

+ * \param n number of bytes.

+ *

+ * \todo try this trick to flip bytes someday:

+ * \code

+ *  v = ((v & 0x55555555) << 1) | ((v >> 1) & 0x55555555);

+ *  v = ((v & 0x33333333) << 2) | ((v >> 2) & 0x33333333);

+ *  v = ((v & 0x0f0f0f0f) << 4) | ((v >> 4) & 0x0f0f0f0f);

+ * \endcode

+ */

+static void

+flip_bytes( GLubyte *p, GLuint n )

+{

+   GLuint i, a, b;

+   for (i = 0; i < n; i++) {

+      b = (GLuint) p[i];        /* words are often faster than bytes */

+      a = ((b & 0x01) << 7) |

+	  ((b & 0x02) << 5) |

+	  ((b & 0x04) << 3) |

+	  ((b & 0x08) << 1) |

+	  ((b & 0x10) >> 1) |

+	  ((b & 0x20) >> 3) |

+	  ((b & 0x40) >> 5) |

+	  ((b & 0x80) >> 7);

+      p[i] = (GLubyte) a;

+   }

+}

+

+

+

+/*

+ * Unpack a 32x32 pixel polygon stipple from user memory using the

+ * current pixel unpack settings.

+ */

+void

+_mesa_unpack_polygon_stipple( const GLubyte *pattern, GLuint dest[32],

+                              const struct gl_pixelstore_attrib *unpacking )

+{

+   GLubyte *ptrn = (GLubyte *) _mesa_unpack_bitmap(32, 32, pattern, unpacking);

+   if (ptrn) {

+      /* Convert pattern from GLubytes to GLuints and handle big/little

+       * endian differences

+       */

+      GLubyte *p = ptrn;

+      GLint i;

+      for (i = 0; i < 32; i++) {

+         dest[i] = (p[0] << 24)

+                 | (p[1] << 16)

+                 | (p[2] <<  8)

+                 | (p[3]      );

+         p += 4;

+      }

+      free(ptrn);

+   }

+}

+

+

+/*

+ * Pack polygon stipple into user memory given current pixel packing

+ * settings.

+ */

+void

+_mesa_pack_polygon_stipple( const GLuint pattern[32], GLubyte *dest,

+                            const struct gl_pixelstore_attrib *packing )

+{

+   /* Convert pattern from GLuints to GLubytes to handle big/little

+    * endian differences.

+    */

+   GLubyte ptrn[32*4];

+   GLint i;

+   for (i = 0; i < 32; i++) {

+      ptrn[i * 4 + 0] = (GLubyte) ((pattern[i] >> 24) & 0xff);

+      ptrn[i * 4 + 1] = (GLubyte) ((pattern[i] >> 16) & 0xff);

+      ptrn[i * 4 + 2] = (GLubyte) ((pattern[i] >> 8 ) & 0xff);

+      ptrn[i * 4 + 3] = (GLubyte) ((pattern[i]      ) & 0xff);

+   }

+

+   _mesa_pack_bitmap(32, 32, ptrn, dest, packing);

+}

+

+

+/*

+ * Unpack bitmap data.  Resulting data will be in most-significant-bit-first

+ * order with row alignment = 1 byte.

+ */

+GLvoid *

+_mesa_unpack_bitmap( GLint width, GLint height, const GLubyte *pixels,

+                     const struct gl_pixelstore_attrib *packing )

+{

+   GLint bytes, row, width_in_bytes;

+   GLubyte *buffer, *dst;

+

+   if (!pixels)

+      return NULL;

+

+   /* Alloc dest storage */

+   bytes = ((width + 7) / 8 * height);

+   buffer = (GLubyte *) malloc( bytes );

+   if (!buffer)

+      return NULL;

+

+   width_in_bytes = CEILING( width, 8 );

+   dst = buffer;

+   for (row = 0; row < height; row++) {

+      const GLubyte *src = (const GLubyte *)

+         _mesa_image_address2d(packing, pixels, width, height,

+                               GL_COLOR_INDEX, GL_BITMAP, row, 0);

+      if (!src) {

+         free(buffer);

+         return NULL;

+      }

+

+      if ((packing->SkipPixels & 7) == 0) {

+         memcpy( dst, src, width_in_bytes );

+         if (packing->LsbFirst) {

+            flip_bytes( dst, width_in_bytes );

+         }

+      }

+      else {

+         /* handling SkipPixels is a bit tricky (no pun intended!) */

+         GLint i;

+         if (packing->LsbFirst) {

+            GLubyte srcMask = 1 << (packing->SkipPixels & 0x7);

+            GLubyte dstMask = 128;

+            const GLubyte *s = src;

+            GLubyte *d = dst;

+            *d = 0;

+            for (i = 0; i < width; i++) {

+               if (*s & srcMask) {

+                  *d |= dstMask;

+               }

+               if (srcMask == 128) {

+                  srcMask = 1;

+                  s++;

+               }

+               else {

+                  srcMask = srcMask << 1;

+               }

+               if (dstMask == 1) {

+                  dstMask = 128;

+                  d++;

+                  *d = 0;

+               }

+               else {

+                  dstMask = dstMask >> 1;

+               }

+            }

+         }

+         else {

+            GLubyte srcMask = 128 >> (packing->SkipPixels & 0x7);

+            GLubyte dstMask = 128;

+            const GLubyte *s = src;

+            GLubyte *d = dst;

+            *d = 0;

+            for (i = 0; i < width; i++) {

+               if (*s & srcMask) {

+                  *d |= dstMask;

+               }

+               if (srcMask == 1) {

+                  srcMask = 128;

+                  s++;

+               }

+               else {

+                  srcMask = srcMask >> 1;

+               }

+               if (dstMask == 1) {

+                  dstMask = 128;

+                  d++;

+                  *d = 0;

+               }

+               else {

+                  dstMask = dstMask >> 1;

+               }

+            }

+         }

+      }

+      dst += width_in_bytes;

+   }

+

+   return buffer;

+}

+

+

+/*

+ * Pack bitmap data.

+ */

+void

+_mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,

+                   GLubyte *dest, const struct gl_pixelstore_attrib *packing )

+{

+   GLint row, width_in_bytes;

+   const GLubyte *src;

+

+   if (!source)

+      return;

+

+   width_in_bytes = CEILING( width, 8 );

+   src = source;

+   for (row = 0; row < height; row++) {

+      GLubyte *dst = (GLubyte *) _mesa_image_address2d(packing, dest,

+                       width, height, GL_COLOR_INDEX, GL_BITMAP, row, 0);

+      if (!dst)

+         return;

+

+      if ((packing->SkipPixels & 7) == 0) {

+         memcpy( dst, src, width_in_bytes );

+         if (packing->LsbFirst) {

+            flip_bytes( dst, width_in_bytes );

+         }

+      }

+      else {

+         /* handling SkipPixels is a bit tricky (no pun intended!) */

+         GLint i;

+         if (packing->LsbFirst) {

+            GLubyte srcMask = 128;

+            GLubyte dstMask = 1 << (packing->SkipPixels & 0x7);

+            const GLubyte *s = src;

+            GLubyte *d = dst;

+            *d = 0;

+            for (i = 0; i < width; i++) {

+               if (*s & srcMask) {

+                  *d |= dstMask;

+               }

+               if (srcMask == 1) {

+                  srcMask = 128;

+                  s++;

+               }

+               else {

+                  srcMask = srcMask >> 1;

+               }

+               if (dstMask == 128) {

+                  dstMask = 1;

+                  d++;

+                  *d = 0;

+               }

+               else {

+                  dstMask = dstMask << 1;

+               }

+            }

+         }

+         else {

+            GLubyte srcMask = 128;

+            GLubyte dstMask = 128 >> (packing->SkipPixels & 0x7);

+            const GLubyte *s = src;

+            GLubyte *d = dst;

+            *d = 0;

+            for (i = 0; i < width; i++) {

+               if (*s & srcMask) {

+                  *d |= dstMask;

+               }

+               if (srcMask == 1) {

+                  srcMask = 128;

+                  s++;

+               }

+               else {

+                  srcMask = srcMask >> 1;

+               }

+               if (dstMask == 1) {

+                  dstMask = 128;

+                  d++;

+                  *d = 0;

+               }

+               else {

+                  dstMask = dstMask >> 1;

+               }

+            }

+         }

+      }

+      src += width_in_bytes;

+   }

+}

+

+

+/**

+ * Get indexes of color components for a basic color format, such as

+ * GL_RGBA, GL_RED, GL_LUMINANCE_ALPHA, etc.  Return -1 for indexes

+ * that do not apply.

+ */

+static void

+get_component_indexes(GLenum format,

+                      GLint *redIndex,

+                      GLint *greenIndex,

+                      GLint *blueIndex,

+                      GLint *alphaIndex,

+                      GLint *luminanceIndex,

+                      GLint *intensityIndex)

+{

+   *redIndex = -1;

+   *greenIndex = -1;

+   *blueIndex = -1;

+   *alphaIndex = -1;

+   *luminanceIndex = -1;

+   *intensityIndex = -1;

+

+   switch (format) {

+   case GL_LUMINANCE:

+   case GL_LUMINANCE_INTEGER_EXT:

+      *luminanceIndex = 0;

+      break;

+   case GL_LUMINANCE_ALPHA:

+   case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+      *luminanceIndex = 0;

+      *alphaIndex = 1;

+      break;

+   case GL_INTENSITY:

+      *intensityIndex = 0;

+      break;

+   case GL_RED:

+   case GL_RED_INTEGER_EXT:

+      *redIndex = 0;

+      break;

+   case GL_GREEN:

+   case GL_GREEN_INTEGER_EXT:

+      *greenIndex = 0;

+      break;

+   case GL_BLUE:

+   case GL_BLUE_INTEGER_EXT:

+      *blueIndex = 0;

+      break;

+   case GL_ALPHA:

+   case GL_ALPHA_INTEGER_EXT:

+      *alphaIndex = 0;

+      break;

+   case GL_RG:

+   case GL_RG_INTEGER:

+      *redIndex = 0;

+      *greenIndex = 1;

+      break;

+   case GL_RGB:

+   case GL_RGB_INTEGER_EXT:

+      *redIndex = 0;

+      *greenIndex = 1;

+      *blueIndex = 2;

+      break;

+   case GL_BGR:

+   case GL_BGR_INTEGER_EXT:

+      *blueIndex = 0;

+      *greenIndex = 1;

+      *redIndex = 2;

+      break;

+   case GL_RGBA:

+   case GL_RGBA_INTEGER_EXT:

+      *redIndex = 0;

+      *greenIndex = 1;

+      *blueIndex = 2;

+      *alphaIndex = 3;

+      break;

+   case GL_BGRA:

+   case GL_BGRA_INTEGER:

+      *redIndex = 2;

+      *greenIndex = 1;

+      *blueIndex = 0;

+      *alphaIndex = 3;

+      break;

+   case GL_ABGR_EXT:

+      *redIndex = 3;

+      *greenIndex = 2;

+      *blueIndex = 1;

+      *alphaIndex = 0;

+      break;

+   case GL_DU8DV8_ATI:

+   case GL_DUDV_ATI:

+      *redIndex = 0;

+      *greenIndex = 1;

+      break;

+   default:

+      assert(0 && "bad format in get_component_indexes()");

+   }

+}

+

+

+

+/**

+ * For small integer types, return the min and max possible values.

+ * Used for clamping floats to unscaled integer types.

+ * \return GL_TRUE if type is handled, GL_FALSE otherwise.

+ */

+static GLboolean

+get_type_min_max(GLenum type, GLfloat *min, GLfloat *max)

+{

+   switch (type) {

+   case GL_BYTE:

+      *min = -128.0;

+      *max = 127.0;

+      return GL_TRUE;

+   case GL_UNSIGNED_BYTE:

+      *min = 0.0;

+      *max = 255.0;

+      return GL_TRUE;

+   case GL_SHORT:

+      *min = -32768.0;

+      *max = 32767.0;

+      return GL_TRUE;

+   case GL_UNSIGNED_SHORT:

+      *min = 0.0;

+      *max = 65535.0;

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+

+/**

+ * Used to pack an array [][4] of RGBA float colors as specified

+ * by the dstFormat, dstType and dstPacking.  Used by glReadPixels.

+ * Historically, the RGBA values were in [0,1] and rescaled to fit

+ * into GLubytes, etc.  But with new integer formats, the RGBA values

+ * may have any value and we don't always rescale when converting to

+ * integers.

+ *

+ * Note: the rgba values will be modified by this function when any pixel

+ * transfer ops are enabled.

+ */

+void

+_mesa_pack_rgba_span_float(struct gl_context *ctx, GLuint n, GLfloat rgba[][4],

+                           GLenum dstFormat, GLenum dstType,

+                           GLvoid *dstAddr,

+                           const struct gl_pixelstore_attrib *dstPacking,

+                           GLbitfield transferOps)

+{

+   GLfloat *luminance;

+   const GLint comps = _mesa_components_in_format(dstFormat);

+   const GLboolean intDstFormat = _mesa_is_integer_format(dstFormat);

+   GLuint i;

+

+   if (dstFormat == GL_LUMINANCE ||

+       dstFormat == GL_LUMINANCE_ALPHA ||

+       dstFormat == GL_LUMINANCE_INTEGER_EXT ||

+       dstFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT) {

+      luminance = (GLfloat *) malloc(n * sizeof(GLfloat));

+      if (!luminance) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel packing");

+         return;

+      }

+   }

+   else {

+      luminance = NULL;

+   }

+

+   if (transferOps) {

+      _mesa_apply_rgba_transfer_ops(ctx, transferOps, n, rgba);

+   }

+

+   /*

+    * Component clamping (besides clamping to [0,1] in

+    * _mesa_apply_rgba_transfer_ops()).

+    */

+   if (intDstFormat) {

+      /* clamping to dest type's min/max values */

+      GLfloat min, max;

+      if (get_type_min_max(dstType, &min, &max)) {

+         for (i = 0; i < n; i++) {

+            rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], min, max);

+            rgba[i][GCOMP] = CLAMP(rgba[i][GCOMP], min, max);

+            rgba[i][BCOMP] = CLAMP(rgba[i][BCOMP], min, max);

+            rgba[i][ACOMP] = CLAMP(rgba[i][ACOMP], min, max);

+         }

+      }

+   }

+   else if (dstFormat == GL_LUMINANCE || dstFormat == GL_LUMINANCE_ALPHA) {

+      /* compute luminance values */

+      if (transferOps & IMAGE_CLAMP_BIT) {

+         for (i = 0; i < n; i++) {

+            GLfloat sum = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];

+            luminance[i] = CLAMP(sum, 0.0F, 1.0F);

+         }

+      }

+      else {

+         for (i = 0; i < n; i++) {

+            luminance[i] = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];

+         }

+      }

+   }

+

+   /*

+    * Pack/store the pixels.  Ugh!  Lots of cases!!!

+    */

+   switch (dstType) {

+      case GL_UNSIGNED_BYTE:

+         {

+            GLubyte *dst = (GLubyte *) dstAddr;

+            switch (dstFormat) {

+               case GL_RED:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);

+                  break;

+               case GL_GREEN:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);

+                  break;

+               case GL_BLUE:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);

+                  break;

+               case GL_ALPHA:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);

+                  break;

+               case GL_LUMINANCE:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_UBYTE(luminance[i]);

+                  break;

+               case GL_LUMINANCE_ALPHA:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_UBYTE(luminance[i]);

+                     dst[i*2+1] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_RG:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);

+                     dst[i*2+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);

+                  }

+                  break;

+               case GL_RGB:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);

+                     dst[i*3+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);

+                     dst[i*3+2] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_RGBA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);

+                     dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);

+                     dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);

+                     dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_BGR:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);

+                     dst[i*3+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);

+                     dst[i*3+2] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_BGRA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);

+                     dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);

+                     dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);

+                     dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_ABGR_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);

+                     dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);

+                     dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);

+                     dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_RED_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLubyte) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_GREEN_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLubyte) rgba[i][GCOMP];

+                  }

+                  break;

+               case GL_BLUE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLubyte) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLubyte) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_RGB_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLubyte) rgba[i][RCOMP];

+                     dst[i*3+1] = (GLubyte) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLubyte) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_RGBA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLubyte) rgba[i][RCOMP];

+                     dst[i*4+1] = (GLubyte) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLubyte) rgba[i][BCOMP];

+                     dst[i*4+3] = (GLubyte) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_BGR_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLubyte) rgba[i][BCOMP];

+                     dst[i*3+1] = (GLubyte) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLubyte) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_BGRA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLubyte) rgba[i][BCOMP];

+                     dst[i*4+1] = (GLubyte) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLubyte) rgba[i][RCOMP];

+                     dst[i*4+3] = (GLubyte) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = (GLubyte) (rgba[i][RCOMP] +

+                                             rgba[i][GCOMP] +

+                                             rgba[i][BCOMP]);

+                     dst[i*2+1] = (GLubyte) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLubyte) (rgba[i][RCOMP] +

+                                         rgba[i][GCOMP] +

+                                         rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_DUDV_ATI:

+               case GL_DU8DV8_ATI:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);

+                     dst[i*2+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);

+                  }

+                  break;

+               default:

+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");

+            }

+         }

+         break;

+      case GL_BYTE:

+         {

+            GLbyte *dst = (GLbyte *) dstAddr;

+            switch (dstFormat) {

+               case GL_RED:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_BYTE(rgba[i][RCOMP]);

+                  break;

+               case GL_GREEN:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_BYTE(rgba[i][GCOMP]);

+                  break;

+               case GL_BLUE:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_BYTE(rgba[i][BCOMP]);

+                  break;

+               case GL_ALPHA:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_BYTE(rgba[i][ACOMP]);

+                  break;

+               case GL_LUMINANCE:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_BYTE(luminance[i]);

+                  break;

+               case GL_LUMINANCE_ALPHA:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_BYTE(luminance[i]);

+                     dst[i*2+1] = FLOAT_TO_BYTE(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_RG:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);

+                     dst[i*2+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);

+                  }

+                  break;

+               case GL_RGB:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);

+                     dst[i*3+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);

+                     dst[i*3+2] = FLOAT_TO_BYTE(rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_RGBA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);

+                     dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);

+                     dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][BCOMP]);

+                     dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_BGR:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = FLOAT_TO_BYTE(rgba[i][BCOMP]);

+                     dst[i*3+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);

+                     dst[i*3+2] = FLOAT_TO_BYTE(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_BGRA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][BCOMP]);

+                     dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);

+                     dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][RCOMP]);

+                     dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][ACOMP]);

+                  }

+		  break;

+               case GL_ABGR_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][ACOMP]);

+                     dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][BCOMP]);

+                     dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][GCOMP]);

+                     dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_RED_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLbyte) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_GREEN_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLbyte) rgba[i][GCOMP];

+                  }

+                  break;

+               case GL_BLUE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLbyte) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLbyte) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_RGB_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLbyte) rgba[i][RCOMP];

+                     dst[i*3+1] = (GLbyte) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLbyte) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_RGBA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLbyte) rgba[i][RCOMP];

+                     dst[i*4+1] = (GLbyte) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLbyte) rgba[i][BCOMP];

+                     dst[i*4+3] = (GLbyte) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_BGR_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLbyte) rgba[i][BCOMP];

+                     dst[i*3+1] = (GLbyte) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLbyte) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_BGRA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLbyte) rgba[i][BCOMP];

+                     dst[i*4+1] = (GLbyte) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLbyte) rgba[i][RCOMP];

+                     dst[i*4+3] = (GLbyte) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = (GLbyte) (rgba[i][RCOMP] +

+                                            rgba[i][GCOMP] +

+                                            rgba[i][BCOMP]);

+                     dst[i*2+1] = (GLbyte) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLbyte) (rgba[i][RCOMP] +

+                                        rgba[i][GCOMP] +

+                                        rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_DUDV_ATI:

+               case GL_DU8DV8_ATI:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);

+                     dst[i*2+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);

+                  }

+                  break;

+               default:

+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT:

+         {

+            GLushort *dst = (GLushort *) dstAddr;

+            switch (dstFormat) {

+               case GL_RED:

+                  for (i=0;i<n;i++)

+                     CLAMPED_FLOAT_TO_USHORT(dst[i], rgba[i][RCOMP]);

+                  break;

+               case GL_GREEN:

+                  for (i=0;i<n;i++)

+                     CLAMPED_FLOAT_TO_USHORT(dst[i], rgba[i][GCOMP]);

+                  break;

+               case GL_BLUE:

+                  for (i=0;i<n;i++)

+                     CLAMPED_FLOAT_TO_USHORT(dst[i], rgba[i][BCOMP]);

+                  break;

+               case GL_ALPHA:

+                  for (i=0;i<n;i++)

+                     CLAMPED_FLOAT_TO_USHORT(dst[i], rgba[i][ACOMP]);

+                  break;

+               case GL_LUMINANCE:

+                  for (i=0;i<n;i++)

+                     UNCLAMPED_FLOAT_TO_USHORT(dst[i], luminance[i]);

+                  break;

+               case GL_LUMINANCE_ALPHA:

+                  for (i=0;i<n;i++) {

+                     UNCLAMPED_FLOAT_TO_USHORT(dst[i*2+0], luminance[i]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*2+1], rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_RG:

+                  for (i=0;i<n;i++) {

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*2+0], rgba[i][RCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*2+1], rgba[i][GCOMP]);

+                  }

+                  break;

+               case GL_RGB:

+                  for (i=0;i<n;i++) {

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+0], rgba[i][RCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+1], rgba[i][GCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+2], rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_RGBA:

+                  for (i=0;i<n;i++) {

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+0], rgba[i][RCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+1], rgba[i][GCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+2], rgba[i][BCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+3], rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_BGR:

+                  for (i=0;i<n;i++) {

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+0], rgba[i][BCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+1], rgba[i][GCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*3+2], rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_BGRA:

+                  for (i=0;i<n;i++) {

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+0], rgba[i][BCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+1], rgba[i][GCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+2], rgba[i][RCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+3], rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_ABGR_EXT:

+                  for (i=0;i<n;i++) {

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+0], rgba[i][ACOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+1], rgba[i][BCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+2], rgba[i][GCOMP]);

+                     CLAMPED_FLOAT_TO_USHORT(dst[i*4+3], rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_RED_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLushort) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_GREEN_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLushort) rgba[i][GCOMP];

+                  }

+                  break;

+               case GL_BLUE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLushort) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLushort) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_RGB_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLushort) rgba[i][RCOMP];

+                     dst[i*3+1] = (GLushort) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLushort) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_RGBA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLushort) rgba[i][RCOMP];

+                     dst[i*4+1] = (GLushort) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLushort) rgba[i][BCOMP];

+                     dst[i*4+3] = (GLushort) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_BGR_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLushort) rgba[i][BCOMP];

+                     dst[i*3+1] = (GLushort) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLushort) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_BGRA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLushort) rgba[i][BCOMP];

+                     dst[i*4+1] = (GLushort) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLushort) rgba[i][RCOMP];

+                     dst[i*4+3] = (GLushort) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = (GLushort) (rgba[i][RCOMP] +

+                                              rgba[i][GCOMP] +

+                                              rgba[i][BCOMP]);

+                     dst[i*2+1] = (GLushort) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLushort) (rgba[i][RCOMP] +

+                                          rgba[i][GCOMP] +

+                                          rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_DUDV_ATI:

+               case GL_DU8DV8_ATI:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_USHORT(rgba[i][RCOMP]);

+                     dst[i*2+1] = FLOAT_TO_USHORT(rgba[i][GCOMP]);

+                  }

+                  break;

+               default:

+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");

+            }

+         }

+         break;

+      case GL_SHORT:

+         {

+            GLshort *dst = (GLshort *) dstAddr;

+            switch (dstFormat) {

+               case GL_RED:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_SHORT(rgba[i][RCOMP]);

+                  break;

+               case GL_GREEN:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_SHORT(rgba[i][GCOMP]);

+                  break;

+               case GL_BLUE:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_SHORT(rgba[i][BCOMP]);

+                  break;

+               case GL_ALPHA:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_SHORT(rgba[i][ACOMP]);

+                  break;

+               case GL_LUMINANCE:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_SHORT(luminance[i]);

+                  break;

+               case GL_LUMINANCE_ALPHA:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_SHORT(luminance[i]);

+                     dst[i*2+1] = FLOAT_TO_SHORT(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_RG:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);

+                     dst[i*2+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);

+                  }

+                  break;

+               case GL_RGB:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);

+                     dst[i*3+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);

+                     dst[i*3+2] = FLOAT_TO_SHORT(rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_RGBA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);

+                     dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);

+                     dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][BCOMP]);

+                     dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_BGR:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = FLOAT_TO_SHORT(rgba[i][BCOMP]);

+                     dst[i*3+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);

+                     dst[i*3+2] = FLOAT_TO_SHORT(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_BGRA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][BCOMP]);

+                     dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);

+                     dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][RCOMP]);

+                     dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][ACOMP]);

+                  }

+		  break;

+               case GL_ABGR_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][ACOMP]);

+                     dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][BCOMP]);

+                     dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][GCOMP]);

+                     dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_RED_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLshort) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_GREEN_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLshort) rgba[i][GCOMP];

+                  }

+                  break;

+               case GL_BLUE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLshort) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLshort) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_RGB_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLshort) rgba[i][RCOMP];

+                     dst[i*3+1] = (GLshort) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLshort) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_RGBA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLshort) rgba[i][RCOMP];

+                     dst[i*4+1] = (GLshort) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLshort) rgba[i][BCOMP];

+                     dst[i*4+3] = (GLshort) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_BGR_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLshort) rgba[i][BCOMP];

+                     dst[i*3+1] = (GLshort) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLshort) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_BGRA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLshort) rgba[i][BCOMP];

+                     dst[i*4+1] = (GLshort) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLshort) rgba[i][RCOMP];

+                     dst[i*4+3] = (GLshort) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = (GLshort) (rgba[i][RCOMP] +

+                                             rgba[i][GCOMP] +

+                                             rgba[i][BCOMP]);

+                     dst[i*2+1] = (GLshort) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLshort) (rgba[i][RCOMP] +

+                                         rgba[i][GCOMP] +

+                                         rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_DUDV_ATI:

+               case GL_DU8DV8_ATI:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);

+                     dst[i*2+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);

+                  }

+                  break;

+               default:

+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT:

+         {

+            GLuint *dst = (GLuint *) dstAddr;

+            switch (dstFormat) {

+               case GL_RED:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_UINT(rgba[i][RCOMP]);

+                  break;

+               case GL_GREEN:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_UINT(rgba[i][GCOMP]);

+                  break;

+               case GL_BLUE:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_UINT(rgba[i][BCOMP]);

+                  break;

+               case GL_ALPHA:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_UINT(rgba[i][ACOMP]);

+                  break;

+               case GL_LUMINANCE:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_UINT(luminance[i]);

+                  break;

+               case GL_LUMINANCE_ALPHA:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_UINT(luminance[i]);

+                     dst[i*2+1] = FLOAT_TO_UINT(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_RG:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);

+                     dst[i*2+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);

+                  }

+                  break;

+               case GL_RGB:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);

+                     dst[i*3+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);

+                     dst[i*3+2] = FLOAT_TO_UINT(rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_RGBA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);

+                     dst[i*4+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);

+                     dst[i*4+2] = FLOAT_TO_UINT(rgba[i][BCOMP]);

+                     dst[i*4+3] = FLOAT_TO_UINT(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_BGR:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = FLOAT_TO_UINT(rgba[i][BCOMP]);

+                     dst[i*3+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);

+                     dst[i*3+2] = FLOAT_TO_UINT(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_BGRA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_UINT(rgba[i][BCOMP]);

+                     dst[i*4+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);

+                     dst[i*4+2] = FLOAT_TO_UINT(rgba[i][RCOMP]);

+                     dst[i*4+3] = FLOAT_TO_UINT(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_ABGR_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_UINT(rgba[i][ACOMP]);

+                     dst[i*4+1] = FLOAT_TO_UINT(rgba[i][BCOMP]);

+                     dst[i*4+2] = FLOAT_TO_UINT(rgba[i][GCOMP]);

+                     dst[i*4+3] = FLOAT_TO_UINT(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_RED_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLuint) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_GREEN_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLuint) rgba[i][GCOMP];

+                  }

+                  break;

+               case GL_BLUE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLuint) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLuint) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_RGB_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLuint) rgba[i][RCOMP];

+                     dst[i*3+1] = (GLuint) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLuint) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_RGBA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLuint) rgba[i][RCOMP];

+                     dst[i*4+1] = (GLuint) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLuint) rgba[i][BCOMP];

+                     dst[i*4+3] = (GLuint) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_BGR_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLuint) rgba[i][BCOMP];

+                     dst[i*3+1] = (GLuint) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLuint) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_BGRA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLuint) rgba[i][BCOMP];

+                     dst[i*4+1] = (GLuint) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLuint) rgba[i][RCOMP];

+                     dst[i*4+3] = (GLuint) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = (GLuint) (rgba[i][RCOMP] +

+                                            rgba[i][GCOMP] +

+                                            rgba[i][BCOMP]);

+                     dst[i*2+1] = (GLuint) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLuint) (rgba[i][RCOMP] +

+                                        rgba[i][GCOMP] +

+                                        rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_DUDV_ATI:

+               case GL_DU8DV8_ATI:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);

+                     dst[i*2+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);

+                  }

+                  break;

+               default:

+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");

+            }

+         }

+         break;

+      case GL_INT:

+         {

+            GLint *dst = (GLint *) dstAddr;

+            switch (dstFormat) {

+               case GL_RED:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_INT(rgba[i][RCOMP]);

+                  break;

+               case GL_GREEN:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_INT(rgba[i][GCOMP]);

+                  break;

+               case GL_BLUE:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_INT(rgba[i][BCOMP]);

+                  break;

+               case GL_ALPHA:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_INT(rgba[i][ACOMP]);

+                  break;

+               case GL_LUMINANCE:

+                  for (i=0;i<n;i++)

+                     dst[i] = FLOAT_TO_INT(luminance[i]);

+                  break;

+               case GL_LUMINANCE_ALPHA:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_INT(luminance[i]);

+                     dst[i*2+1] = FLOAT_TO_INT(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_RG:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_INT(rgba[i][RCOMP]);

+                     dst[i*2+1] = FLOAT_TO_INT(rgba[i][GCOMP]);

+                  }

+                  break;

+               case GL_RGB:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = FLOAT_TO_INT(rgba[i][RCOMP]);

+                     dst[i*3+1] = FLOAT_TO_INT(rgba[i][GCOMP]);

+                     dst[i*3+2] = FLOAT_TO_INT(rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_RGBA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_INT(rgba[i][RCOMP]);

+                     dst[i*4+1] = FLOAT_TO_INT(rgba[i][GCOMP]);

+                     dst[i*4+2] = FLOAT_TO_INT(rgba[i][BCOMP]);

+                     dst[i*4+3] = FLOAT_TO_INT(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_BGR:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = FLOAT_TO_INT(rgba[i][BCOMP]);

+                     dst[i*3+1] = FLOAT_TO_INT(rgba[i][GCOMP]);

+                     dst[i*3+2] = FLOAT_TO_INT(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_BGRA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_INT(rgba[i][BCOMP]);

+                     dst[i*4+1] = FLOAT_TO_INT(rgba[i][GCOMP]);

+                     dst[i*4+2] = FLOAT_TO_INT(rgba[i][RCOMP]);

+                     dst[i*4+3] = FLOAT_TO_INT(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_ABGR_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = FLOAT_TO_INT(rgba[i][ACOMP]);

+                     dst[i*4+1] = FLOAT_TO_INT(rgba[i][BCOMP]);

+                     dst[i*4+2] = FLOAT_TO_INT(rgba[i][GCOMP]);

+                     dst[i*4+3] = FLOAT_TO_INT(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_DUDV_ATI:

+               case GL_DU8DV8_ATI:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = FLOAT_TO_INT(rgba[i][RCOMP]);

+                     dst[i*2+1] = FLOAT_TO_INT(rgba[i][GCOMP]);

+                  }

+                  break;

+               case GL_RED_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLint) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_GREEN_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLint) rgba[i][GCOMP];

+                  }

+                  break;

+               case GL_BLUE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLint) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLint) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_RGB_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLint) rgba[i][RCOMP];

+                     dst[i*3+1] = (GLint) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLint) rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_RGBA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLint) rgba[i][RCOMP];

+                     dst[i*4+1] = (GLint) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLint) rgba[i][BCOMP];

+                     dst[i*4+3] = (GLint) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_BGR_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = (GLint) rgba[i][BCOMP];

+                     dst[i*3+1] = (GLint) rgba[i][GCOMP];

+                     dst[i*3+2] = (GLint) rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_BGRA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = (GLint) rgba[i][BCOMP];

+                     dst[i*4+1] = (GLint) rgba[i][GCOMP];

+                     dst[i*4+2] = (GLint) rgba[i][RCOMP];

+                     dst[i*4+3] = (GLint) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = (GLint) (rgba[i][RCOMP] +

+                                           rgba[i][GCOMP] +

+                                           rgba[i][BCOMP]);

+                     dst[i*2+1] = (GLint) rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i] = (GLint) (rgba[i][RCOMP] +

+                                       rgba[i][GCOMP] +

+                                       rgba[i][BCOMP]);

+                  }

+                  break;

+               default:

+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");

+            }

+         }

+         break;

+      case GL_FLOAT:

+         {

+            GLfloat *dst = (GLfloat *) dstAddr;

+            switch (dstFormat) {

+               case GL_RED:

+                  for (i=0;i<n;i++)

+                     dst[i] = rgba[i][RCOMP];

+                  break;

+               case GL_GREEN:

+                  for (i=0;i<n;i++)

+                     dst[i] = rgba[i][GCOMP];

+                  break;

+               case GL_BLUE:

+                  for (i=0;i<n;i++)

+                     dst[i] = rgba[i][BCOMP];

+                  break;

+               case GL_ALPHA:

+                  for (i=0;i<n;i++)

+                     dst[i] = rgba[i][ACOMP];

+                  break;

+               case GL_LUMINANCE:

+                  for (i=0;i<n;i++)

+                     dst[i] = luminance[i];

+                  break;

+               case GL_LUMINANCE_ALPHA:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = luminance[i];

+                     dst[i*2+1] = rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_RG:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = rgba[i][RCOMP];

+                     dst[i*2+1] = rgba[i][GCOMP];

+                  }

+                  break;

+               case GL_RGB:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = rgba[i][RCOMP];

+                     dst[i*3+1] = rgba[i][GCOMP];

+                     dst[i*3+2] = rgba[i][BCOMP];

+                  }

+                  break;

+               case GL_RGBA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = rgba[i][RCOMP];

+                     dst[i*4+1] = rgba[i][GCOMP];

+                     dst[i*4+2] = rgba[i][BCOMP];

+                     dst[i*4+3] = rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_BGR:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = rgba[i][BCOMP];

+                     dst[i*3+1] = rgba[i][GCOMP];

+                     dst[i*3+2] = rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_BGRA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = rgba[i][BCOMP];

+                     dst[i*4+1] = rgba[i][GCOMP];

+                     dst[i*4+2] = rgba[i][RCOMP];

+                     dst[i*4+3] = rgba[i][ACOMP];

+                  }

+                  break;

+               case GL_ABGR_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = rgba[i][ACOMP];

+                     dst[i*4+1] = rgba[i][BCOMP];

+                     dst[i*4+2] = rgba[i][GCOMP];

+                     dst[i*4+3] = rgba[i][RCOMP];

+                  }

+                  break;

+               case GL_DUDV_ATI:

+               case GL_DU8DV8_ATI:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = rgba[i][RCOMP];

+                     dst[i*2+1] = rgba[i][GCOMP];

+                  }

+                  break;

+               default:

+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");

+            }

+         }

+         break;

+      case GL_HALF_FLOAT_ARB:

+         {

+            GLhalfARB *dst = (GLhalfARB *) dstAddr;

+            switch (dstFormat) {

+               case GL_RED:

+                  for (i=0;i<n;i++)

+                     dst[i] = _mesa_float_to_half(rgba[i][RCOMP]);

+                  break;

+               case GL_GREEN:

+                  for (i=0;i<n;i++)

+                     dst[i] = _mesa_float_to_half(rgba[i][GCOMP]);

+                  break;

+               case GL_BLUE:

+                  for (i=0;i<n;i++)

+                     dst[i] = _mesa_float_to_half(rgba[i][BCOMP]);

+                  break;

+               case GL_ALPHA:

+                  for (i=0;i<n;i++)

+                     dst[i] = _mesa_float_to_half(rgba[i][ACOMP]);

+                  break;

+               case GL_LUMINANCE:

+                  for (i=0;i<n;i++)

+                     dst[i] = _mesa_float_to_half(luminance[i]);

+                  break;

+               case GL_LUMINANCE_ALPHA:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = _mesa_float_to_half(luminance[i]);

+                     dst[i*2+1] = _mesa_float_to_half(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_RG:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = _mesa_float_to_half(rgba[i][RCOMP]);

+                     dst[i*2+1] = _mesa_float_to_half(rgba[i][GCOMP]);

+                  }

+                  break;

+               case GL_RGB:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = _mesa_float_to_half(rgba[i][RCOMP]);

+                     dst[i*3+1] = _mesa_float_to_half(rgba[i][GCOMP]);

+                     dst[i*3+2] = _mesa_float_to_half(rgba[i][BCOMP]);

+                  }

+                  break;

+               case GL_RGBA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = _mesa_float_to_half(rgba[i][RCOMP]);

+                     dst[i*4+1] = _mesa_float_to_half(rgba[i][GCOMP]);

+                     dst[i*4+2] = _mesa_float_to_half(rgba[i][BCOMP]);

+                     dst[i*4+3] = _mesa_float_to_half(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_BGR:

+                  for (i=0;i<n;i++) {

+                     dst[i*3+0] = _mesa_float_to_half(rgba[i][BCOMP]);

+                     dst[i*3+1] = _mesa_float_to_half(rgba[i][GCOMP]);

+                     dst[i*3+2] = _mesa_float_to_half(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_BGRA:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = _mesa_float_to_half(rgba[i][BCOMP]);

+                     dst[i*4+1] = _mesa_float_to_half(rgba[i][GCOMP]);

+                     dst[i*4+2] = _mesa_float_to_half(rgba[i][RCOMP]);

+                     dst[i*4+3] = _mesa_float_to_half(rgba[i][ACOMP]);

+                  }

+                  break;

+               case GL_ABGR_EXT:

+                  for (i=0;i<n;i++) {

+                     dst[i*4+0] = _mesa_float_to_half(rgba[i][ACOMP]);

+                     dst[i*4+1] = _mesa_float_to_half(rgba[i][BCOMP]);

+                     dst[i*4+2] = _mesa_float_to_half(rgba[i][GCOMP]);

+                     dst[i*4+3] = _mesa_float_to_half(rgba[i][RCOMP]);

+                  }

+                  break;

+               case GL_DUDV_ATI:

+               case GL_DU8DV8_ATI:

+                  for (i=0;i<n;i++) {

+                     dst[i*2+0] = _mesa_float_to_half(rgba[i][RCOMP]);

+                     dst[i*2+1] = _mesa_float_to_half(rgba[i][GCOMP]);

+                  }

+                  break;

+               default:

+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");

+            }

+         }

+         break;

+      case GL_UNSIGNED_BYTE_3_3_2:

+         if (dstFormat == GL_RGB) {

+            GLubyte *dst = (GLubyte *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 7.0F) << 5)

+                      | (IROUND(rgba[i][GCOMP] * 7.0F) << 2)

+                      | (IROUND(rgba[i][BCOMP] * 3.0F)     );

+            }

+         }

+         break;

+      case GL_UNSIGNED_BYTE_2_3_3_REV:

+         if (dstFormat == GL_RGB) {

+            GLubyte *dst = (GLubyte *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 7.0F)     )

+                      | (IROUND(rgba[i][GCOMP] * 7.0F) << 3)

+                      | (IROUND(rgba[i][BCOMP] * 3.0F) << 6);

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_5_6_5:

+         if (dstFormat == GL_RGB) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F) << 11)

+                      | (IROUND(rgba[i][GCOMP] * 63.0F) <<  5)

+                      | (IROUND(rgba[i][BCOMP] * 31.0F)      );

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_5_6_5_REV:

+         if (dstFormat == GL_RGB) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F)      )

+                      | (IROUND(rgba[i][GCOMP] * 63.0F) <<  5)

+                      | (IROUND(rgba[i][BCOMP] * 31.0F) << 11);

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_4_4_4_4:

+         if (dstFormat == GL_RGBA) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 15.0F) << 12)

+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  8)

+                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  4)

+                      | (IROUND(rgba[i][ACOMP] * 15.0F)      );

+            }

+         }

+         else if (dstFormat == GL_BGRA) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][BCOMP] * 15.0F) << 12)

+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  8)

+                      | (IROUND(rgba[i][RCOMP] * 15.0F) <<  4)

+                      | (IROUND(rgba[i][ACOMP] * 15.0F)      );

+            }

+         }

+         else if (dstFormat == GL_ABGR_EXT) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][ACOMP] * 15.0F) << 12)

+                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  8)

+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  4)

+                      | (IROUND(rgba[i][RCOMP] * 15.0F)      );

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:

+         if (dstFormat == GL_RGBA) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 15.0F)      )

+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  4)

+                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  8)

+                      | (IROUND(rgba[i][ACOMP] * 15.0F) << 12);

+            }

+         }

+         else if (dstFormat == GL_BGRA) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][BCOMP] * 15.0F)      )

+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  4)

+                      | (IROUND(rgba[i][RCOMP] * 15.0F) <<  8)

+                      | (IROUND(rgba[i][ACOMP] * 15.0F) << 12);

+            }

+         }

+         else if (dstFormat == GL_ABGR_EXT) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][ACOMP] * 15.0F)      )

+                      | (IROUND(rgba[i][BCOMP] * 15.0F) <<  4)

+                      | (IROUND(rgba[i][GCOMP] * 15.0F) <<  8)

+                      | (IROUND(rgba[i][RCOMP] * 15.0F) << 12);

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_5_5_5_1:

+         if (dstFormat == GL_RGBA) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F) << 11)

+                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  6)

+                      | (IROUND(rgba[i][BCOMP] * 31.0F) <<  1)

+                      | (IROUND(rgba[i][ACOMP] *  1.0F)      );

+            }

+         }

+         else if (dstFormat == GL_BGRA) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][BCOMP] * 31.0F) << 11)

+                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  6)

+                      | (IROUND(rgba[i][RCOMP] * 31.0F) <<  1)

+                      | (IROUND(rgba[i][ACOMP] *  1.0F)      );

+            }

+         }

+         else if (dstFormat == GL_ABGR_EXT) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][ACOMP] * 31.0F) << 11)

+                      | (IROUND(rgba[i][BCOMP] * 31.0F) <<  6)

+                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  1)

+                      | (IROUND(rgba[i][RCOMP] *  1.0F)      );

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:

+         if (dstFormat == GL_RGBA) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 31.0F)      )

+                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  5)

+                      | (IROUND(rgba[i][BCOMP] * 31.0F) << 10)

+                      | (IROUND(rgba[i][ACOMP] *  1.0F) << 15);

+            }

+         }

+         else if (dstFormat == GL_BGRA) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][BCOMP] * 31.0F)      )

+                      | (IROUND(rgba[i][GCOMP] * 31.0F) <<  5)

+                      | (IROUND(rgba[i][RCOMP] * 31.0F) << 10)

+                      | (IROUND(rgba[i][ACOMP] *  1.0F) << 15);

+            }

+         }

+         else if (dstFormat == GL_ABGR_EXT) {

+            GLushort *dst = (GLushort *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][ACOMP] * 31.0F)      )

+                      | (IROUND(rgba[i][BCOMP] * 31.0F) <<  5)

+                      | (IROUND(rgba[i][GCOMP] * 31.0F) << 10)

+                      | (IROUND(rgba[i][RCOMP] *  1.0F) << 15);

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_8_8_8_8:

+         if (dstFormat == GL_RGBA) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 255.F) << 24)

+                      | (IROUND(rgba[i][GCOMP] * 255.F) << 16)

+                      | (IROUND(rgba[i][BCOMP] * 255.F) <<  8)

+                      | (IROUND(rgba[i][ACOMP] * 255.F)      );

+            }

+         }

+         else if (dstFormat == GL_BGRA) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][BCOMP] * 255.F) << 24)

+                      | (IROUND(rgba[i][GCOMP] * 255.F) << 16)

+                      | (IROUND(rgba[i][RCOMP] * 255.F) <<  8)

+                      | (IROUND(rgba[i][ACOMP] * 255.F)      );

+            }

+         }

+         else if (dstFormat == GL_ABGR_EXT) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][ACOMP] * 255.F) << 24)

+                      | (IROUND(rgba[i][BCOMP] * 255.F) << 16)

+                      | (IROUND(rgba[i][GCOMP] * 255.F) <<  8)

+                      | (IROUND(rgba[i][RCOMP] * 255.F)      );

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_8_8_8_8_REV:

+         if (dstFormat == GL_RGBA) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 255.0F)      )

+                      | (IROUND(rgba[i][GCOMP] * 255.0F) <<  8)

+                      | (IROUND(rgba[i][BCOMP] * 255.0F) << 16)

+                      | (IROUND(rgba[i][ACOMP] * 255.0F) << 24);

+            }

+         }

+         else if (dstFormat == GL_BGRA) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][BCOMP] * 255.0F)      )

+                      | (IROUND(rgba[i][GCOMP] * 255.0F) <<  8)

+                      | (IROUND(rgba[i][RCOMP] * 255.0F) << 16)

+                      | (IROUND(rgba[i][ACOMP] * 255.0F) << 24);

+            }

+         }

+         else if (dstFormat == GL_ABGR_EXT) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][ACOMP] * 255.0F)      )

+                      | (IROUND(rgba[i][BCOMP] * 255.0F) <<  8)

+                      | (IROUND(rgba[i][GCOMP] * 255.0F) << 16)

+                      | (IROUND(rgba[i][RCOMP] * 255.0F) << 24);

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_10_10_10_2:

+         if (dstFormat == GL_RGBA) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 1023.0F) << 22)

+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 12)

+                      | (IROUND(rgba[i][BCOMP] * 1023.0F) <<  2)

+                      | (IROUND(rgba[i][ACOMP] *    3.0F)      );

+            }

+         }

+         else if (dstFormat == GL_BGRA) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][BCOMP] * 1023.0F) << 22)

+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 12)

+                      | (IROUND(rgba[i][RCOMP] * 1023.0F) <<  2)

+                      | (IROUND(rgba[i][ACOMP] *    3.0F)      );

+            }

+         }

+         else if (dstFormat == GL_ABGR_EXT) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][ACOMP] * 1023.0F) << 22)

+                      | (IROUND(rgba[i][BCOMP] * 1023.0F) << 12)

+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) <<  2)

+                      | (IROUND(rgba[i][RCOMP] *    3.0F)      );

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_2_10_10_10_REV:

+         if (dstFormat == GL_RGBA) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][RCOMP] * 1023.0F)      )

+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 10)

+                      | (IROUND(rgba[i][BCOMP] * 1023.0F) << 20)

+                      | (IROUND(rgba[i][ACOMP] *    3.0F) << 30);

+            }

+         }

+         else if (dstFormat == GL_BGRA) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][BCOMP] * 1023.0F)      )

+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 10)

+                      | (IROUND(rgba[i][RCOMP] * 1023.0F) << 20)

+                      | (IROUND(rgba[i][ACOMP] *    3.0F) << 30);

+            }

+         }

+         else if (dstFormat == GL_ABGR_EXT) {

+            GLuint *dst = (GLuint *) dstAddr;

+            for (i=0;i<n;i++) {

+               dst[i] = (IROUND(rgba[i][ACOMP] * 1023.0F)      )

+                      | (IROUND(rgba[i][BCOMP] * 1023.0F) << 10)

+                      | (IROUND(rgba[i][GCOMP] * 1023.0F) << 20)

+                      | (IROUND(rgba[i][RCOMP] *    3.0F) << 30);

+            }

+         }

+         break;

+      default:

+         _mesa_problem(ctx, "bad type in _mesa_pack_rgba_span_float");

+         return;

+   }

+

+   if (dstPacking->SwapBytes) {

+      GLint swapSize = _mesa_sizeof_packed_type(dstType);

+      if (swapSize == 2) {

+         if (dstPacking->SwapBytes) {

+            _mesa_swap2((GLushort *) dstAddr, n * comps);

+         }

+      }

+      else if (swapSize == 4) {

+         if (dstPacking->SwapBytes) {

+            _mesa_swap4((GLuint *) dstAddr, n * comps);

+         }

+      }

+   }

+

+   free(luminance);

+}

+

+

+

+#define SWAP2BYTE(VALUE)			\

+   {						\

+      GLubyte *bytes = (GLubyte *) &(VALUE);	\

+      GLubyte tmp = bytes[0];			\

+      bytes[0] = bytes[1];			\

+      bytes[1] = tmp;				\

+   }

+

+#define SWAP4BYTE(VALUE)			\

+   {						\

+      GLubyte *bytes = (GLubyte *) &(VALUE);	\

+      GLubyte tmp = bytes[0];			\

+      bytes[0] = bytes[3];			\

+      bytes[3] = tmp;				\

+      tmp = bytes[1];				\

+      bytes[1] = bytes[2];			\

+      bytes[2] = tmp;				\

+   }

+

+

+static void

+extract_uint_indexes(GLuint n, GLuint indexes[],

+                     GLenum srcFormat, GLenum srcType, const GLvoid *src,

+                     const struct gl_pixelstore_attrib *unpack )

+{

+   ASSERT(srcFormat == GL_COLOR_INDEX || srcFormat == GL_STENCIL_INDEX);

+

+   ASSERT(srcType == GL_BITMAP ||

+          srcType == GL_UNSIGNED_BYTE ||

+          srcType == GL_BYTE ||

+          srcType == GL_UNSIGNED_SHORT ||

+          srcType == GL_SHORT ||

+          srcType == GL_UNSIGNED_INT ||

+          srcType == GL_INT ||

+          srcType == GL_UNSIGNED_INT_24_8_EXT ||

+          srcType == GL_HALF_FLOAT_ARB ||

+          srcType == GL_FLOAT);

+

+   switch (srcType) {

+      case GL_BITMAP:

+         {

+            GLubyte *ubsrc = (GLubyte *) src;

+            if (unpack->LsbFirst) {

+               GLubyte mask = 1 << (unpack->SkipPixels & 0x7);

+               GLuint i;

+               for (i = 0; i < n; i++) {

+                  indexes[i] = (*ubsrc & mask) ? 1 : 0;

+                  if (mask == 128) {

+                     mask = 1;

+                     ubsrc++;

+                  }

+                  else {

+                     mask = mask << 1;

+                  }

+               }

+            }

+            else {

+               GLubyte mask = 128 >> (unpack->SkipPixels & 0x7);

+               GLuint i;

+               for (i = 0; i < n; i++) {

+                  indexes[i] = (*ubsrc & mask) ? 1 : 0;

+                  if (mask == 1) {

+                     mask = 128;

+                     ubsrc++;

+                  }

+                  else {

+                     mask = mask >> 1;

+                  }

+               }

+            }

+         }

+         break;

+      case GL_UNSIGNED_BYTE:

+         {

+            GLuint i;

+            const GLubyte *s = (const GLubyte *) src;

+            for (i = 0; i < n; i++)

+               indexes[i] = s[i];

+         }

+         break;

+      case GL_BYTE:

+         {

+            GLuint i;

+            const GLbyte *s = (const GLbyte *) src;

+            for (i = 0; i < n; i++)

+               indexes[i] = s[i];

+         }

+         break;

+      case GL_UNSIGNED_SHORT:

+         {

+            GLuint i;

+            const GLushort *s = (const GLushort *) src;

+            if (unpack->SwapBytes) {

+               for (i = 0; i < n; i++) {

+                  GLushort value = s[i];

+                  SWAP2BYTE(value);

+                  indexes[i] = value;

+               }

+            }

+            else {

+               for (i = 0; i < n; i++)

+                  indexes[i] = s[i];

+            }

+         }

+         break;

+      case GL_SHORT:

+         {

+            GLuint i;

+            const GLshort *s = (const GLshort *) src;

+            if (unpack->SwapBytes) {

+               for (i = 0; i < n; i++) {

+                  GLshort value = s[i];

+                  SWAP2BYTE(value);

+                  indexes[i] = value;

+               }

+            }

+            else {

+               for (i = 0; i < n; i++)

+                  indexes[i] = s[i];

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT:

+         {

+            GLuint i;

+            const GLuint *s = (const GLuint *) src;

+            if (unpack->SwapBytes) {

+               for (i = 0; i < n; i++) {

+                  GLuint value = s[i];

+                  SWAP4BYTE(value);

+                  indexes[i] = value;

+               }

+            }

+            else {

+               for (i = 0; i < n; i++)

+                  indexes[i] = s[i];

+            }

+         }

+         break;

+      case GL_INT:

+         {

+            GLuint i;

+            const GLint *s = (const GLint *) src;

+            if (unpack->SwapBytes) {

+               for (i = 0; i < n; i++) {

+                  GLint value = s[i];

+                  SWAP4BYTE(value);

+                  indexes[i] = value;

+               }

+            }

+            else {

+               for (i = 0; i < n; i++)

+                  indexes[i] = s[i];

+            }

+         }

+         break;

+      case GL_FLOAT:

+         {

+            GLuint i;

+            const GLfloat *s = (const GLfloat *) src;

+            if (unpack->SwapBytes) {

+               for (i = 0; i < n; i++) {

+                  GLfloat value = s[i];

+                  SWAP4BYTE(value);

+                  indexes[i] = (GLuint) value;

+               }

+            }

+            else {

+               for (i = 0; i < n; i++)

+                  indexes[i] = (GLuint) s[i];

+            }

+         }

+         break;

+      case GL_HALF_FLOAT_ARB:

+         {

+            GLuint i;

+            const GLhalfARB *s = (const GLhalfARB *) src;

+            if (unpack->SwapBytes) {

+               for (i = 0; i < n; i++) {

+                  GLhalfARB value = s[i];

+                  SWAP2BYTE(value);

+                  indexes[i] = (GLuint) _mesa_half_to_float(value);

+               }

+            }

+            else {

+               for (i = 0; i < n; i++)

+                  indexes[i] = (GLuint) _mesa_half_to_float(s[i]);

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_24_8_EXT:

+         {

+            GLuint i;

+            const GLuint *s = (const GLuint *) src;

+            if (unpack->SwapBytes) {

+               for (i = 0; i < n; i++) {

+                  GLuint value = s[i];

+                  SWAP4BYTE(value);

+                  indexes[i] = value & 0xff;  /* lower 8 bits */

+               }

+            }

+            else {

+               for (i = 0; i < n; i++)

+                  indexes[i] = s[i] & 0xff;  /* lower 8 bits */

+            }

+         }

+         break;

+

+      default:

+         _mesa_problem(NULL, "bad srcType in extract_uint_indexes");

+         return;

+   }

+}

+

+

+/**

+ * Return source/dest RGBA indexes for unpacking pixels.

+ */

+static void

+get_component_mapping(GLenum format,

+                      GLint *rSrc,

+                      GLint *gSrc,

+                      GLint *bSrc,

+                      GLint *aSrc,

+                      GLint *rDst,

+                      GLint *gDst,

+                      GLint *bDst,

+                      GLint *aDst)

+{

+   switch (format) {

+   case GL_RED:

+   case GL_RED_INTEGER_EXT:

+      *rSrc = 0;

+      *gSrc = *bSrc = *aSrc = -1;

+      break;

+   case GL_GREEN:

+   case GL_GREEN_INTEGER_EXT:

+      *gSrc = 0;

+      *rSrc = *bSrc = *aSrc = -1;

+      break;

+      case GL_BLUE:

+   case GL_BLUE_INTEGER_EXT:

+      *bSrc = 0;

+      *rSrc = *gSrc = *aSrc = -1;

+      break;

+   case GL_ALPHA:

+   case GL_ALPHA_INTEGER_EXT:

+      *rSrc = *gSrc = *bSrc = -1;

+      *aSrc = 0;

+      break;

+   case GL_LUMINANCE:

+   case GL_LUMINANCE_INTEGER_EXT:

+      *rSrc = *gSrc = *bSrc = 0;

+      *aSrc = -1;

+      break;

+   case GL_LUMINANCE_ALPHA:

+   case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+      *rSrc = *gSrc = *bSrc = 0;

+      *aSrc = 1;

+      break;

+   case GL_INTENSITY:

+      *rSrc = *gSrc = *bSrc = *aSrc = 0;

+      break;

+   case GL_RG:

+   case GL_RG_INTEGER:

+      *rSrc = 0;

+      *gSrc = 1;

+      *bSrc = -1;

+      *aSrc = -1;

+      *rDst = 0;

+      *gDst = 1;

+      *bDst = 2;

+      *aDst = 3;

+      break;

+   case GL_RGB:

+   case GL_RGB_INTEGER:

+      *rSrc = 0;

+      *gSrc = 1;

+      *bSrc = 2;

+      *aSrc = -1;

+      *rDst = 0;

+      *gDst = 1;

+      *bDst = 2;

+      *aDst = 3;

+      break;

+   case GL_BGR:

+      *rSrc = 2;

+      *gSrc = 1;

+      *bSrc = 0;

+      *aSrc = -1;

+      *rDst = 2;

+      *gDst = 1;

+      *bDst = 0;

+      *aDst = 3;

+      break;

+   case GL_RGBA:

+   case GL_RGBA_INTEGER:

+      *rSrc = 0;

+      *gSrc = 1;

+      *bSrc = 2;

+      *aSrc = 3;

+      *rDst = 0;

+      *gDst = 1;

+      *bDst = 2;

+      *aDst = 3;

+      break;

+   case GL_BGRA:

+      *rSrc = 2;

+      *gSrc = 1;

+      *bSrc = 0;

+      *aSrc = 3;

+      *rDst = 2;

+      *gDst = 1;

+      *bDst = 0;

+      *aDst = 3;

+      break;

+   case GL_ABGR_EXT:

+      *rSrc = 3;

+      *gSrc = 2;

+      *bSrc = 1;

+      *aSrc = 0;

+      *rDst = 3;

+      *gDst = 2;

+      *bDst = 1;

+      *aDst = 0;

+      break;

+   case GL_DU8DV8_ATI:

+   case GL_DUDV_ATI:

+      *rSrc = 0;

+      *gSrc = 1;

+      *bSrc = -1;

+      *aSrc = -1;

+      break;

+   default:

+      _mesa_problem(NULL, "bad srcFormat %s in get_component_mapping",

+                    _mesa_lookup_enum_by_nr(format));

+      return;

+   }

+}

+

+

+

+/*

+ * This function extracts floating point RGBA values from arbitrary

+ * image data.  srcFormat and srcType are the format and type parameters

+ * passed to glDrawPixels, glTexImage[123]D, glTexSubImage[123]D, etc.

+ *

+ * Refering to section 3.6.4 of the OpenGL 1.2 spec, this function

+ * implements the "Conversion to floating point", "Conversion to RGB",

+ * and "Final Expansion to RGBA" operations.

+ *

+ * Args:  n - number of pixels

+ *        rgba - output colors

+ *        srcFormat - format of incoming data

+ *        srcType - data type of incoming data

+ *        src - source data pointer

+ *        swapBytes - perform byteswapping of incoming data?

+ */

+static void

+extract_float_rgba(GLuint n, GLfloat rgba[][4],

+                   GLenum srcFormat, GLenum srcType, const GLvoid *src,

+                   GLboolean swapBytes)

+{

+   GLint rSrc, gSrc, bSrc, aSrc;

+   GLint stride;

+   GLint rDst, bDst, gDst, aDst;

+   GLboolean intFormat;

+   GLfloat rs = 1.0f, gs = 1.0f, bs = 1.0f, as = 1.0f; /* scale factors */

+

+   ASSERT(srcFormat == GL_RED ||

+          srcFormat == GL_GREEN ||

+          srcFormat == GL_BLUE ||

+          srcFormat == GL_ALPHA ||

+          srcFormat == GL_LUMINANCE ||

+          srcFormat == GL_LUMINANCE_ALPHA ||

+          srcFormat == GL_INTENSITY ||

+          srcFormat == GL_RG ||

+          srcFormat == GL_RGB ||

+          srcFormat == GL_BGR ||

+          srcFormat == GL_RGBA ||

+          srcFormat == GL_BGRA ||

+          srcFormat == GL_ABGR_EXT ||

+          srcFormat == GL_DU8DV8_ATI ||

+          srcFormat == GL_DUDV_ATI ||

+          srcFormat == GL_RED_INTEGER_EXT ||

+          srcFormat == GL_GREEN_INTEGER_EXT ||

+          srcFormat == GL_BLUE_INTEGER_EXT ||

+          srcFormat == GL_ALPHA_INTEGER_EXT ||

+          srcFormat == GL_RGB_INTEGER_EXT ||

+          srcFormat == GL_RGBA_INTEGER_EXT ||

+          srcFormat == GL_BGR_INTEGER_EXT ||

+          srcFormat == GL_BGRA_INTEGER_EXT ||

+          srcFormat == GL_LUMINANCE_INTEGER_EXT ||

+          srcFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT);

+

+   ASSERT(srcType == GL_UNSIGNED_BYTE ||

+          srcType == GL_BYTE ||

+          srcType == GL_UNSIGNED_SHORT ||

+          srcType == GL_SHORT ||

+          srcType == GL_UNSIGNED_INT ||

+          srcType == GL_INT ||

+          srcType == GL_HALF_FLOAT_ARB ||

+          srcType == GL_FLOAT ||

+          srcType == GL_UNSIGNED_BYTE_3_3_2 ||

+          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||

+          srcType == GL_UNSIGNED_SHORT_5_6_5 ||

+          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||

+          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||

+          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||

+          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||

+          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||

+          srcType == GL_UNSIGNED_INT_8_8_8_8 ||

+          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||

+          srcType == GL_UNSIGNED_INT_10_10_10_2 ||

+          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);

+

+   get_component_mapping(srcFormat,

+                         &rSrc, &gSrc, &bSrc, &aSrc,

+                         &rDst, &gDst, &bDst, &aDst);

+

+   stride = _mesa_components_in_format(srcFormat);

+

+   intFormat = _mesa_is_integer_format(srcFormat);

+

+#define PROCESS(SRC_INDEX, DST_INDEX, DEFAULT_FLT, DEFAULT_INT, TYPE, CONVERSION) \

+   if ((SRC_INDEX) < 0) {						\

+      GLuint i;								\

+      if (intFormat) {							\

+         for (i = 0; i < n; i++) {					\

+            rgba[i][DST_INDEX] = DEFAULT_INT;				\

+         }								\

+      }									\

+      else {								\

+         for (i = 0; i < n; i++) {					\

+            rgba[i][DST_INDEX] = DEFAULT_FLT;				\

+         }								\

+      }									\

+   }									\

+   else if (swapBytes) {						\

+      const TYPE *s = (const TYPE *) src;				\

+      GLuint i;								\

+      for (i = 0; i < n; i++) {						\

+         TYPE value = s[SRC_INDEX];					\

+         if (sizeof(TYPE) == 2) {					\

+            SWAP2BYTE(value);						\

+         }								\

+         else if (sizeof(TYPE) == 4) {					\

+            SWAP4BYTE(value);						\

+         }								\

+         if (intFormat)							\

+            rgba[i][DST_INDEX] = (GLfloat) value;			\

+         else								\

+            rgba[i][DST_INDEX] = (GLfloat) CONVERSION(value);		\

+         s += stride;							\

+      }									\

+   }									\

+   else {								\

+      const TYPE *s = (const TYPE *) src;				\

+      GLuint i;								\

+      if (intFormat) {							\

+         for (i = 0; i < n; i++) {					\

+            rgba[i][DST_INDEX] = (GLfloat) s[SRC_INDEX];		\

+            s += stride;						\

+         }								\

+      }									\

+      else {								\

+         for (i = 0; i < n; i++) {					\

+            rgba[i][DST_INDEX] = (GLfloat) CONVERSION(s[SRC_INDEX]);	\

+            s += stride;						\

+         }								\

+      }									\

+   }

+

+   switch (srcType) {

+      case GL_UNSIGNED_BYTE:

+         PROCESS(rSrc, RCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);

+         PROCESS(gSrc, GCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);

+         PROCESS(bSrc, BCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);

+         PROCESS(aSrc, ACOMP, 1.0F, 255, GLubyte, UBYTE_TO_FLOAT);

+         break;

+      case GL_BYTE:

+         PROCESS(rSrc, RCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);

+         PROCESS(gSrc, GCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);

+         PROCESS(bSrc, BCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);

+         PROCESS(aSrc, ACOMP, 1.0F, 127, GLbyte, BYTE_TO_FLOAT);

+         break;

+      case GL_UNSIGNED_SHORT:

+         PROCESS(rSrc, RCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);

+         PROCESS(gSrc, GCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);

+         PROCESS(bSrc, BCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);

+         PROCESS(aSrc, ACOMP, 1.0F, 0xffff, GLushort, USHORT_TO_FLOAT);

+         break;

+      case GL_SHORT:

+         PROCESS(rSrc, RCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);

+         PROCESS(gSrc, GCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);

+         PROCESS(bSrc, BCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);

+         PROCESS(aSrc, ACOMP, 1.0F, 32767, GLshort, SHORT_TO_FLOAT);

+         break;

+      case GL_UNSIGNED_INT:

+         PROCESS(rSrc, RCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);

+         PROCESS(gSrc, GCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);

+         PROCESS(bSrc, BCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);

+         PROCESS(aSrc, ACOMP, 1.0F, 0xffffffff, GLuint, UINT_TO_FLOAT);

+         break;

+      case GL_INT:

+         PROCESS(rSrc, RCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);

+         PROCESS(gSrc, GCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);

+         PROCESS(bSrc, BCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);

+         PROCESS(aSrc, ACOMP, 1.0F, 2147483647, GLint, INT_TO_FLOAT);

+         break;

+      case GL_FLOAT:

+         PROCESS(rSrc, RCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));

+         PROCESS(gSrc, GCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));

+         PROCESS(bSrc, BCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));

+         PROCESS(aSrc, ACOMP, 1.0F, 1.0F, GLfloat, (GLfloat));

+         break;

+      case GL_HALF_FLOAT_ARB:

+         PROCESS(rSrc, RCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);

+         PROCESS(gSrc, GCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);

+         PROCESS(bSrc, BCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);

+         PROCESS(aSrc, ACOMP, 1.0F, 1.0F, GLhalfARB, _mesa_half_to_float);

+         break;

+      case GL_UNSIGNED_BYTE_3_3_2:

+         {

+            const GLubyte *ubsrc = (const GLubyte *) src;

+            GLuint i;

+            if (!intFormat) {

+               rs = 1.0F / 7.0F;

+               gs = 1.0F / 7.0F;

+               bs = 1.0F / 3.0F;

+            }

+            for (i = 0; i < n; i ++) {

+               GLubyte p = ubsrc[i];

+               rgba[i][rDst] = ((p >> 5)      ) * rs;

+               rgba[i][gDst] = ((p >> 2) & 0x7) * gs;

+               rgba[i][bDst] = ((p     ) & 0x3) * bs;

+               rgba[i][aDst] = 1.0F;

+            }

+         }

+         break;

+      case GL_UNSIGNED_BYTE_2_3_3_REV:

+         {

+            const GLubyte *ubsrc = (const GLubyte *) src;

+            GLuint i;

+            if (!intFormat) {

+               rs = 1.0F / 7.0F;

+               gs = 1.0F / 7.0F;

+               bs = 1.0F / 3.0F;

+            }

+            for (i = 0; i < n; i ++) {

+               GLubyte p = ubsrc[i];

+               rgba[i][rDst] = ((p     ) & 0x7) * rs;

+               rgba[i][gDst] = ((p >> 3) & 0x7) * gs;

+               rgba[i][bDst] = ((p >> 6)      ) * bs;

+               rgba[i][aDst] = 1.0F;

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_5_6_5:

+         if (!intFormat) {

+            rs = 1.0F / 31.0F;

+            gs = 1.0F / 63.0F;

+            bs = 1.0F / 31.0F;

+         }

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p >> 11)       ) * rs;

+               rgba[i][gDst] = ((p >>  5) & 0x3f) * gs;

+               rgba[i][bDst] = ((p      ) & 0x1f) * bs;

+               rgba[i][aDst] = 1.0F;

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p >> 11)       ) * rs;

+               rgba[i][gDst] = ((p >>  5) & 0x3f) * gs;

+               rgba[i][bDst] = ((p      ) & 0x1f) * bs;

+               rgba[i][aDst] = 1.0F;

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_5_6_5_REV:

+         if (!intFormat) {

+            rs = 1.0F / 31.0F;

+            gs = 1.0F / 63.0F;

+            bs = 1.0F / 31.0F;

+         }

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p      ) & 0x1f) * rs;

+               rgba[i][gDst] = ((p >>  5) & 0x3f) * gs;

+               rgba[i][bDst] = ((p >> 11)       ) * bs;

+               rgba[i][aDst] = 1.0F;

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p      ) & 0x1f) * rs;

+               rgba[i][gDst] = ((p >>  5) & 0x3f) * gs;

+               rgba[i][bDst] = ((p >> 11)       ) * bs;

+               rgba[i][aDst] = 1.0F;

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_4_4_4_4:

+         if (!intFormat) {

+            rs = gs = bs = as = 1.0F / 15.0F;

+         }

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p >> 12)      ) * rs;

+               rgba[i][gDst] = ((p >>  8) & 0xf) * gs;

+               rgba[i][bDst] = ((p >>  4) & 0xf) * bs;

+               rgba[i][aDst] = ((p      ) & 0xf) * as;

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p >> 12)      ) * rs;

+               rgba[i][gDst] = ((p >>  8) & 0xf) * gs;

+               rgba[i][bDst] = ((p >>  4) & 0xf) * bs;

+               rgba[i][aDst] = ((p      ) & 0xf) * as;

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:

+         if (!intFormat) {

+            rs = gs = bs = as = 1.0F / 15.0F;

+         }

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p      ) & 0xf) * rs;

+               rgba[i][gDst] = ((p >>  4) & 0xf) * gs;

+               rgba[i][bDst] = ((p >>  8) & 0xf) * bs;

+               rgba[i][aDst] = ((p >> 12)      ) * as;

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p      ) & 0xf) * rs;

+               rgba[i][gDst] = ((p >>  4) & 0xf) * gs;

+               rgba[i][bDst] = ((p >>  8) & 0xf) * bs;

+               rgba[i][aDst] = ((p >> 12)      ) * as;

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_5_5_5_1:

+         if (!intFormat) {

+            rs = gs = bs = 1.0F / 31.0F;

+         }

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p >> 11)       ) * rs;

+               rgba[i][gDst] = ((p >>  6) & 0x1f) * gs;

+               rgba[i][bDst] = ((p >>  1) & 0x1f) * bs;

+               rgba[i][aDst] = ((p      ) & 0x1)  * as;

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p >> 11)       ) * rs;

+               rgba[i][gDst] = ((p >>  6) & 0x1f) * gs;

+               rgba[i][bDst] = ((p >>  1) & 0x1f) * bs;

+               rgba[i][aDst] = ((p      ) & 0x1)  * as;

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:

+         if (!intFormat) {

+            rs = gs = bs = 1.0F / 31.0F;

+         }

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p      ) & 0x1f) * rs;

+               rgba[i][gDst] = ((p >>  5) & 0x1f) * gs;

+               rgba[i][bDst] = ((p >> 10) & 0x1f) * bs;

+               rgba[i][aDst] = ((p >> 15)       ) * as;

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p      ) & 0x1f) * rs;

+               rgba[i][gDst] = ((p >>  5) & 0x1f) * gs;

+               rgba[i][bDst] = ((p >> 10) & 0x1f) * bs;

+               rgba[i][aDst] = ((p >> 15)       ) * as;

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_8_8_8_8:

+         if (swapBytes) {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            if (intFormat) {

+               for (i = 0; i < n; i ++) {

+                  GLuint p = uisrc[i];

+                  rgba[i][rDst] = (GLfloat) ((p      ) & 0xff);

+                  rgba[i][gDst] = (GLfloat) ((p >>  8) & 0xff);

+                  rgba[i][bDst] = (GLfloat) ((p >> 16) & 0xff);

+                  rgba[i][aDst] = (GLfloat) ((p >> 24)       );

+               }

+            }

+            else {

+               for (i = 0; i < n; i ++) {

+                  GLuint p = uisrc[i];

+                  rgba[i][rDst] = UBYTE_TO_FLOAT((p      ) & 0xff);

+                  rgba[i][gDst] = UBYTE_TO_FLOAT((p >>  8) & 0xff);

+                  rgba[i][bDst] = UBYTE_TO_FLOAT((p >> 16) & 0xff);

+                  rgba[i][aDst] = UBYTE_TO_FLOAT((p >> 24)       );

+               }

+            }

+         }

+         else {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            if (intFormat) {

+               for (i = 0; i < n; i ++) {

+                  GLuint p = uisrc[i];

+                  rgba[i][rDst] = (GLfloat) ((p >> 24)       );

+                  rgba[i][gDst] = (GLfloat) ((p >> 16) & 0xff);

+                  rgba[i][bDst] = (GLfloat) ((p >>  8) & 0xff);

+                  rgba[i][aDst] = (GLfloat) ((p      ) & 0xff);

+               }

+            }

+            else {

+               for (i = 0; i < n; i ++) {

+                  GLuint p = uisrc[i];

+                  rgba[i][rDst] = UBYTE_TO_FLOAT((p >> 24)       );

+                  rgba[i][gDst] = UBYTE_TO_FLOAT((p >> 16) & 0xff);

+                  rgba[i][bDst] = UBYTE_TO_FLOAT((p >>  8) & 0xff);

+                  rgba[i][aDst] = UBYTE_TO_FLOAT((p      ) & 0xff);

+               }

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_8_8_8_8_REV:

+         if (swapBytes) {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            if (intFormat) {

+               for (i = 0; i < n; i ++) {

+                  GLuint p = uisrc[i];

+                  rgba[i][rDst] = (GLfloat) ((p >> 24)       );

+                  rgba[i][gDst] = (GLfloat) ((p >> 16) & 0xff);

+                  rgba[i][bDst] = (GLfloat) ((p >>  8) & 0xff);

+                  rgba[i][aDst] = (GLfloat) ((p      ) & 0xff);

+               }

+            }

+            else {

+               for (i = 0; i < n; i ++) {

+                  GLuint p = uisrc[i];

+                  rgba[i][rDst] = UBYTE_TO_FLOAT((p >> 24)       );

+                  rgba[i][gDst] = UBYTE_TO_FLOAT((p >> 16) & 0xff);

+                  rgba[i][bDst] = UBYTE_TO_FLOAT((p >>  8) & 0xff);

+                  rgba[i][aDst] = UBYTE_TO_FLOAT((p      ) & 0xff);

+               }

+            }

+         }

+         else {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            if (intFormat) {

+               for (i = 0; i < n; i ++) {

+                  GLuint p = uisrc[i];

+                  rgba[i][rDst] = (GLfloat) ((p      ) & 0xff);

+                  rgba[i][gDst] = (GLfloat) ((p >>  8) & 0xff);

+                  rgba[i][bDst] = (GLfloat) ((p >> 16) & 0xff);

+                  rgba[i][aDst] = (GLfloat) ((p >> 24)       );

+               }

+            }

+            else {

+               for (i = 0; i < n; i ++) {

+                  GLuint p = uisrc[i];

+                  rgba[i][rDst] = UBYTE_TO_FLOAT((p      ) & 0xff);

+                  rgba[i][gDst] = UBYTE_TO_FLOAT((p >>  8) & 0xff);

+                  rgba[i][bDst] = UBYTE_TO_FLOAT((p >> 16) & 0xff);

+                  rgba[i][aDst] = UBYTE_TO_FLOAT((p >> 24)       );

+               }

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_10_10_10_2:

+         if (!intFormat) {

+            rs = 1.0F / 1023.0F;

+            gs = 1.0F / 1023.0F;

+            bs = 1.0F / 1023.0F;

+            as = 1.0F / 3.0F;

+         }

+         if (swapBytes) {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               SWAP4BYTE(p);

+               rgba[i][rDst] = ((p >> 22)        ) * rs;

+               rgba[i][gDst] = ((p >> 12) & 0x3ff) * gs;

+               rgba[i][bDst] = ((p >>  2) & 0x3ff) * bs;

+               rgba[i][aDst] = ((p      ) & 0x3  ) * as;

+            }

+         }

+         else {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               rgba[i][rDst] = ((p >> 22)        ) * rs;

+               rgba[i][gDst] = ((p >> 12) & 0x3ff) * gs;

+               rgba[i][bDst] = ((p >>  2) & 0x3ff) * bs;

+               rgba[i][aDst] = ((p      ) & 0x3  ) * as;

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_2_10_10_10_REV:

+         if (!intFormat) {

+            rs = 1.0F / 1023.0F;

+            gs = 1.0F / 1023.0F;

+            bs = 1.0F / 1023.0F;

+            as = 1.0F / 3.0F;

+         }

+         if (swapBytes) {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               SWAP4BYTE(p);

+               rgba[i][rDst] = ((p      ) & 0x3ff) * rs;

+               rgba[i][gDst] = ((p >> 10) & 0x3ff) * gs;

+               rgba[i][bDst] = ((p >> 20) & 0x3ff) * bs;

+               rgba[i][aDst] = ((p >> 30)        ) * as;

+            }

+         }

+         else {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               rgba[i][rDst] = ((p      ) & 0x3ff) * rs;

+               rgba[i][gDst] = ((p >> 10) & 0x3ff) * gs;

+               rgba[i][bDst] = ((p >> 20) & 0x3ff) * bs;

+               rgba[i][aDst] = ((p >> 30)        ) * as;

+            }

+         }

+         break;

+      default:

+         _mesa_problem(NULL, "bad srcType in extract float data");

+         break;

+   }

+#undef PROCESS

+}

+

+

+static INLINE GLuint

+clamp_byte_to_uint(GLbyte b)

+{

+   return b < 0 ? 0 : b;

+}

+

+

+static INLINE GLuint

+clamp_short_to_uint(GLshort s)

+{

+   return s < 0 ? 0 : s;

+}

+

+

+static INLINE GLuint

+clamp_int_to_uint(GLint i)

+{

+   return i < 0 ? 0 : i;

+}

+

+

+static INLINE GLuint

+clamp_float_to_uint(GLfloat f)

+{

+   return f < 0.0F ? 0 : IROUND(f);

+}

+

+

+static INLINE GLuint

+clamp_half_to_uint(GLhalfARB h)

+{

+   GLfloat f = _mesa_half_to_float(h);

+   return f < 0.0F ? 0 : IROUND(f);

+}

+

+

+/**

+ * \sa extract_float_rgba()

+ */

+static void

+extract_uint_rgba(GLuint n, GLuint rgba[][4],

+                  GLenum srcFormat, GLenum srcType, const GLvoid *src,

+                  GLboolean swapBytes)

+{

+   GLint rSrc, gSrc, bSrc, aSrc;

+   GLint stride;

+   GLint rDst, bDst, gDst, aDst;

+   GLboolean intFormat;

+

+   ASSERT(srcFormat == GL_RED ||

+          srcFormat == GL_GREEN ||

+          srcFormat == GL_BLUE ||

+          srcFormat == GL_ALPHA ||

+          srcFormat == GL_LUMINANCE ||

+          srcFormat == GL_LUMINANCE_ALPHA ||

+          srcFormat == GL_INTENSITY ||

+          srcFormat == GL_RG ||

+          srcFormat == GL_RGB ||

+          srcFormat == GL_BGR ||

+          srcFormat == GL_RGBA ||

+          srcFormat == GL_BGRA ||

+          srcFormat == GL_ABGR_EXT ||

+          srcFormat == GL_DU8DV8_ATI ||

+          srcFormat == GL_DUDV_ATI ||

+          srcFormat == GL_RED_INTEGER_EXT ||

+          srcFormat == GL_GREEN_INTEGER_EXT ||

+          srcFormat == GL_BLUE_INTEGER_EXT ||

+          srcFormat == GL_ALPHA_INTEGER_EXT ||

+          srcFormat == GL_RGB_INTEGER_EXT ||

+          srcFormat == GL_RGBA_INTEGER_EXT ||

+          srcFormat == GL_BGR_INTEGER_EXT ||

+          srcFormat == GL_BGRA_INTEGER_EXT ||

+          srcFormat == GL_LUMINANCE_INTEGER_EXT ||

+          srcFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT);

+

+   ASSERT(srcType == GL_UNSIGNED_BYTE ||

+          srcType == GL_BYTE ||

+          srcType == GL_UNSIGNED_SHORT ||

+          srcType == GL_SHORT ||

+          srcType == GL_UNSIGNED_INT ||

+          srcType == GL_INT ||

+          srcType == GL_HALF_FLOAT_ARB ||

+          srcType == GL_FLOAT ||

+          srcType == GL_UNSIGNED_BYTE_3_3_2 ||

+          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||

+          srcType == GL_UNSIGNED_SHORT_5_6_5 ||

+          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||

+          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||

+          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||

+          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||

+          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||

+          srcType == GL_UNSIGNED_INT_8_8_8_8 ||

+          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||

+          srcType == GL_UNSIGNED_INT_10_10_10_2 ||

+          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);

+

+   get_component_mapping(srcFormat,

+                         &rSrc, &gSrc, &bSrc, &aSrc,

+                         &rDst, &gDst, &bDst, &aDst);

+

+   stride = _mesa_components_in_format(srcFormat);

+

+   intFormat = _mesa_is_integer_format(srcFormat);

+

+#define PROCESS(SRC_INDEX, DST_INDEX, DEFAULT, TYPE, CONVERSION)	\

+   if ((SRC_INDEX) < 0) {						\

+      GLuint i;								\

+      for (i = 0; i < n; i++) {						\

+         rgba[i][DST_INDEX] = DEFAULT;					\

+      }									\

+   }									\

+   else if (swapBytes) {						\

+      const TYPE *s = (const TYPE *) src;				\

+      GLuint i;								\

+      for (i = 0; i < n; i++) {						\

+         TYPE value = s[SRC_INDEX];					\

+         if (sizeof(TYPE) == 2) {					\

+            SWAP2BYTE(value);						\

+         }								\

+         else if (sizeof(TYPE) == 4) {					\

+            SWAP4BYTE(value);						\

+         }								\

+         rgba[i][DST_INDEX] = CONVERSION(value);                        \

+         s += stride;							\

+      }									\

+   }									\

+   else {								\

+      const TYPE *s = (const TYPE *) src;				\

+      GLuint i;								\

+      for (i = 0; i < n; i++) {						\

+         rgba[i][DST_INDEX] = CONVERSION(s[SRC_INDEX]);			\

+         s += stride;							\

+      }									\

+   }

+

+   switch (srcType) {

+      case GL_UNSIGNED_BYTE:

+         PROCESS(rSrc, RCOMP, 0, GLubyte, (GLuint));

+         PROCESS(gSrc, GCOMP, 0, GLubyte, (GLuint));

+         PROCESS(bSrc, BCOMP, 0, GLubyte, (GLuint));

+         PROCESS(aSrc, ACOMP, 1, GLubyte, (GLuint));

+         break;

+      case GL_BYTE:

+         PROCESS(rSrc, RCOMP, 0, GLbyte, clamp_byte_to_uint);

+         PROCESS(gSrc, GCOMP, 0, GLbyte, clamp_byte_to_uint);

+         PROCESS(bSrc, BCOMP, 0, GLbyte, clamp_byte_to_uint);

+         PROCESS(aSrc, ACOMP, 1, GLbyte, clamp_byte_to_uint);

+         break;

+      case GL_UNSIGNED_SHORT:

+         PROCESS(rSrc, RCOMP, 0, GLushort, (GLuint));

+         PROCESS(gSrc, GCOMP, 0, GLushort, (GLuint));

+         PROCESS(bSrc, BCOMP, 0, GLushort, (GLuint));

+         PROCESS(aSrc, ACOMP, 1, GLushort, (GLuint));

+         break;

+      case GL_SHORT:

+         PROCESS(rSrc, RCOMP, 0, GLshort, clamp_short_to_uint);

+         PROCESS(gSrc, GCOMP, 0, GLshort, clamp_short_to_uint);

+         PROCESS(bSrc, BCOMP, 0, GLshort, clamp_short_to_uint);

+         PROCESS(aSrc, ACOMP, 1, GLshort, clamp_short_to_uint);

+         break;

+      case GL_UNSIGNED_INT:

+         PROCESS(rSrc, RCOMP, 0, GLuint, (GLuint));

+         PROCESS(gSrc, GCOMP, 0, GLuint, (GLuint));

+         PROCESS(bSrc, BCOMP, 0, GLuint, (GLuint));

+         PROCESS(aSrc, ACOMP, 1, GLuint, (GLuint));

+         break;

+      case GL_INT:

+         PROCESS(rSrc, RCOMP, 0, GLint, clamp_int_to_uint);

+         PROCESS(gSrc, GCOMP, 0, GLint, clamp_int_to_uint);

+         PROCESS(bSrc, BCOMP, 0, GLint, clamp_int_to_uint);

+         PROCESS(aSrc, ACOMP, 1, GLint, clamp_int_to_uint);

+         break;

+      case GL_FLOAT:

+         PROCESS(rSrc, RCOMP, 0, GLfloat, clamp_float_to_uint);

+         PROCESS(gSrc, GCOMP, 0, GLfloat, clamp_float_to_uint);

+         PROCESS(bSrc, BCOMP, 0, GLfloat, clamp_float_to_uint);

+         PROCESS(aSrc, ACOMP, 1, GLfloat, clamp_float_to_uint);

+         break;

+      case GL_HALF_FLOAT_ARB:

+         PROCESS(rSrc, RCOMP, 0, GLhalfARB, clamp_half_to_uint);

+         PROCESS(gSrc, GCOMP, 0, GLhalfARB, clamp_half_to_uint);

+         PROCESS(bSrc, BCOMP, 0, GLhalfARB, clamp_half_to_uint);

+         PROCESS(aSrc, ACOMP, 1, GLhalfARB, clamp_half_to_uint);

+         break;

+      case GL_UNSIGNED_BYTE_3_3_2:

+         {

+            const GLubyte *ubsrc = (const GLubyte *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLubyte p = ubsrc[i];

+               rgba[i][rDst] = ((p >> 5)      );

+               rgba[i][gDst] = ((p >> 2) & 0x7);

+               rgba[i][bDst] = ((p     ) & 0x3);

+               rgba[i][aDst] = 1;

+            }

+         }

+         break;

+      case GL_UNSIGNED_BYTE_2_3_3_REV:

+         {

+            const GLubyte *ubsrc = (const GLubyte *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLubyte p = ubsrc[i];

+               rgba[i][rDst] = ((p     ) & 0x7);

+               rgba[i][gDst] = ((p >> 3) & 0x7);

+               rgba[i][bDst] = ((p >> 6)      );

+               rgba[i][aDst] = 1;

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_5_6_5:

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p >> 11)       );

+               rgba[i][gDst] = ((p >>  5) & 0x3f);

+               rgba[i][bDst] = ((p      ) & 0x1f);

+               rgba[i][aDst] = 1;

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p >> 11)       );

+               rgba[i][gDst] = ((p >>  5) & 0x3f);

+               rgba[i][bDst] = ((p      ) & 0x1f);

+               rgba[i][aDst] = 1;

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_5_6_5_REV:

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p      ) & 0x1f);

+               rgba[i][gDst] = ((p >>  5) & 0x3f);

+               rgba[i][bDst] = ((p >> 11)       );

+               rgba[i][aDst] = 1;

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p      ) & 0x1f);

+               rgba[i][gDst] = ((p >>  5) & 0x3f);

+               rgba[i][bDst] = ((p >> 11)       );

+               rgba[i][aDst] = 1;

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_4_4_4_4:

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p >> 12)      );

+               rgba[i][gDst] = ((p >>  8) & 0xf);

+               rgba[i][bDst] = ((p >>  4) & 0xf);

+               rgba[i][aDst] = ((p      ) & 0xf);

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p >> 12)      );

+               rgba[i][gDst] = ((p >>  8) & 0xf);

+               rgba[i][bDst] = ((p >>  4) & 0xf);

+               rgba[i][aDst] = ((p      ) & 0xf);

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p      ) & 0xf);

+               rgba[i][gDst] = ((p >>  4) & 0xf);

+               rgba[i][bDst] = ((p >>  8) & 0xf);

+               rgba[i][aDst] = ((p >> 12)      );

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p      ) & 0xf);

+               rgba[i][gDst] = ((p >>  4) & 0xf);

+               rgba[i][bDst] = ((p >>  8) & 0xf);

+               rgba[i][aDst] = ((p >> 12)      );

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_5_5_5_1:

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p >> 11)       );

+               rgba[i][gDst] = ((p >>  6) & 0x1f);

+               rgba[i][bDst] = ((p >>  1) & 0x1f);

+               rgba[i][aDst] = ((p      ) & 0x1 );

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p >> 11)       );

+               rgba[i][gDst] = ((p >>  6) & 0x1f);

+               rgba[i][bDst] = ((p >>  1) & 0x1f);

+               rgba[i][aDst] = ((p      ) & 0x1 );

+            }

+         }

+         break;

+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:

+         if (swapBytes) {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               SWAP2BYTE(p);

+               rgba[i][rDst] = ((p      ) & 0x1f);

+               rgba[i][gDst] = ((p >>  5) & 0x1f);

+               rgba[i][bDst] = ((p >> 10) & 0x1f);

+               rgba[i][aDst] = ((p >> 15)       );

+            }

+         }

+         else {

+            const GLushort *ussrc = (const GLushort *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLushort p = ussrc[i];

+               rgba[i][rDst] = ((p      ) & 0x1f);

+               rgba[i][gDst] = ((p >>  5) & 0x1f);

+               rgba[i][bDst] = ((p >> 10) & 0x1f);

+               rgba[i][aDst] = ((p >> 15)       );

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_8_8_8_8:

+         if (swapBytes) {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               rgba[i][rDst] = ((p      ) & 0xff);

+               rgba[i][gDst] = ((p >>  8) & 0xff);

+               rgba[i][bDst] = ((p >> 16) & 0xff);

+               rgba[i][aDst] = ((p >> 24)       );

+            }

+         }

+         else {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               rgba[i][rDst] = ((p >> 24)       );

+               rgba[i][gDst] = ((p >> 16) & 0xff);

+               rgba[i][bDst] = ((p >>  8) & 0xff);

+               rgba[i][aDst] = ((p      ) & 0xff);

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_8_8_8_8_REV:

+         if (swapBytes) {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               rgba[i][rDst] = ((p >> 24)       );

+               rgba[i][gDst] = ((p >> 16) & 0xff);

+               rgba[i][bDst] = ((p >>  8) & 0xff);

+               rgba[i][aDst] = ((p      ) & 0xff);

+            }

+         }

+         else {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               rgba[i][rDst] = ((p      ) & 0xff);

+               rgba[i][gDst] = ((p >>  8) & 0xff);

+               rgba[i][bDst] = ((p >> 16) & 0xff);

+               rgba[i][aDst] = ((p >> 24)       );

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_10_10_10_2:

+         if (swapBytes) {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               SWAP4BYTE(p);

+               rgba[i][rDst] = ((p >> 22)        );

+               rgba[i][gDst] = ((p >> 12) & 0x3ff);

+               rgba[i][bDst] = ((p >>  2) & 0x3ff);

+               rgba[i][aDst] = ((p      ) & 0x3  );

+            }

+         }

+         else {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               rgba[i][rDst] = ((p >> 22)        );

+               rgba[i][gDst] = ((p >> 12) & 0x3ff);

+               rgba[i][bDst] = ((p >>  2) & 0x3ff);

+               rgba[i][aDst] = ((p      ) & 0x3  );

+            }

+         }

+         break;

+      case GL_UNSIGNED_INT_2_10_10_10_REV:

+         if (swapBytes) {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               SWAP4BYTE(p);

+               rgba[i][rDst] = ((p      ) & 0x3ff);

+               rgba[i][gDst] = ((p >> 10) & 0x3ff);

+               rgba[i][bDst] = ((p >> 20) & 0x3ff);

+               rgba[i][aDst] = ((p >> 30)        );

+            }

+         }

+         else {

+            const GLuint *uisrc = (const GLuint *) src;

+            GLuint i;

+            for (i = 0; i < n; i ++) {

+               GLuint p = uisrc[i];

+               rgba[i][rDst] = ((p      ) & 0x3ff);

+               rgba[i][gDst] = ((p >> 10) & 0x3ff);

+               rgba[i][bDst] = ((p >> 20) & 0x3ff);

+               rgba[i][aDst] = ((p >> 30)        );

+            }

+         }

+         break;

+      default:

+         _mesa_problem(NULL, "bad srcType in extract uint data");

+         break;

+   }

+#undef PROCESS

+}

+

+

+

+/*

+ * Unpack a row of color image data from a client buffer according to

+ * the pixel unpacking parameters.

+ * Return GLchan values in the specified dest image format.

+ * This is used by glDrawPixels and glTexImage?D().

+ * \param ctx - the context

+ *         n - number of pixels in the span

+ *         dstFormat - format of destination color array

+ *         dest - the destination color array

+ *         srcFormat - source image format

+ *         srcType - source image  data type

+ *         source - source image pointer

+ *         srcPacking - pixel unpacking parameters

+ *         transferOps - bitmask of IMAGE_*_BIT values of operations to apply

+ *

+ * XXX perhaps expand this to process whole images someday.

+ */

+void

+_mesa_unpack_color_span_chan( struct gl_context *ctx,

+                              GLuint n, GLenum dstFormat, GLchan dest[],

+                              GLenum srcFormat, GLenum srcType,

+                              const GLvoid *source,

+                              const struct gl_pixelstore_attrib *srcPacking,

+                              GLbitfield transferOps )

+{

+   ASSERT(dstFormat == GL_ALPHA ||

+          dstFormat == GL_LUMINANCE ||

+          dstFormat == GL_LUMINANCE_ALPHA ||

+          dstFormat == GL_INTENSITY ||

+          dstFormat == GL_RED ||

+          dstFormat == GL_RG ||

+          dstFormat == GL_RGB ||

+          dstFormat == GL_RGBA ||

+          dstFormat == GL_COLOR_INDEX);

+

+   ASSERT(srcFormat == GL_RED ||

+          srcFormat == GL_GREEN ||

+          srcFormat == GL_BLUE ||

+          srcFormat == GL_ALPHA ||

+          srcFormat == GL_LUMINANCE ||

+          srcFormat == GL_LUMINANCE_ALPHA ||

+          srcFormat == GL_INTENSITY ||

+          srcFormat == GL_RG ||

+          srcFormat == GL_RGB ||

+          srcFormat == GL_BGR ||

+          srcFormat == GL_RGBA ||

+          srcFormat == GL_BGRA ||

+          srcFormat == GL_ABGR_EXT ||

+          srcFormat == GL_COLOR_INDEX);

+

+   ASSERT(srcType == GL_BITMAP ||

+          srcType == GL_UNSIGNED_BYTE ||

+          srcType == GL_BYTE ||

+          srcType == GL_UNSIGNED_SHORT ||

+          srcType == GL_SHORT ||

+          srcType == GL_UNSIGNED_INT ||

+          srcType == GL_INT ||

+          srcType == GL_HALF_FLOAT_ARB ||

+          srcType == GL_FLOAT ||

+          srcType == GL_UNSIGNED_BYTE_3_3_2 ||

+          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||

+          srcType == GL_UNSIGNED_SHORT_5_6_5 ||

+          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||

+          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||

+          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||

+          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||

+          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||

+          srcType == GL_UNSIGNED_INT_8_8_8_8 ||

+          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||

+          srcType == GL_UNSIGNED_INT_10_10_10_2 ||

+          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);

+

+   /* Try simple cases first */

+   if (transferOps == 0) {

+      if (srcType == CHAN_TYPE) {

+         if (dstFormat == GL_RGBA) {

+            if (srcFormat == GL_RGBA) {

+               memcpy( dest, source, n * 4 * sizeof(GLchan) );

+               return;

+            }

+            else if (srcFormat == GL_RGB) {

+               GLuint i;

+               const GLchan *src = (const GLchan *) source;

+               GLchan *dst = dest;

+               for (i = 0; i < n; i++) {

+                  dst[0] = src[0];

+                  dst[1] = src[1];

+                  dst[2] = src[2];

+                  dst[3] = CHAN_MAX;

+                  src += 3;

+                  dst += 4;

+               }

+               return;

+            }

+         }

+         else if (dstFormat == GL_RGB) {

+            if (srcFormat == GL_RGB) {

+               memcpy( dest, source, n * 3 * sizeof(GLchan) );

+               return;

+            }

+            else if (srcFormat == GL_RGBA) {

+               GLuint i;

+               const GLchan *src = (const GLchan *) source;

+               GLchan *dst = dest;

+               for (i = 0; i < n; i++) {

+                  dst[0] = src[0];

+                  dst[1] = src[1];

+                  dst[2] = src[2];

+                  src += 4;

+                  dst += 3;

+               }

+               return;

+            }

+         }

+         else if (dstFormat == srcFormat) {

+            GLint comps = _mesa_components_in_format(srcFormat);

+            assert(comps > 0);

+            memcpy( dest, source, n * comps * sizeof(GLchan) );

+            return;

+         }

+      }

+      /*

+       * Common situation, loading 8bit RGBA/RGB source images

+       * into 16/32 bit destination. (OSMesa16/32)

+       */

+      else if (srcType == GL_UNSIGNED_BYTE) {

+         if (dstFormat == GL_RGBA) {

+            if (srcFormat == GL_RGB) {

+               GLuint i;

+               const GLubyte *src = (const GLubyte *) source;

+               GLchan *dst = dest;

+               for (i = 0; i < n; i++) {

+                  dst[0] = UBYTE_TO_CHAN(src[0]);

+                  dst[1] = UBYTE_TO_CHAN(src[1]);

+                  dst[2] = UBYTE_TO_CHAN(src[2]);

+                  dst[3] = CHAN_MAX;

+                  src += 3;

+                  dst += 4;

+               }

+               return;

+            }

+            else if (srcFormat == GL_RGBA) {

+               GLuint i;

+               const GLubyte *src = (const GLubyte *) source;

+               GLchan *dst = dest;

+               for (i = 0; i < n; i++) {

+                  dst[0] = UBYTE_TO_CHAN(src[0]);

+                  dst[1] = UBYTE_TO_CHAN(src[1]);

+                  dst[2] = UBYTE_TO_CHAN(src[2]);

+                  dst[3] = UBYTE_TO_CHAN(src[3]);

+                  src += 4;

+                  dst += 4;

+               }

+               return;

+             }

+         }

+         else if (dstFormat == GL_RGB) {

+            if (srcFormat == GL_RGB) {

+               GLuint i;

+               const GLubyte *src = (const GLubyte *) source;

+               GLchan *dst = dest;

+               for (i = 0; i < n; i++) {

+                  dst[0] = UBYTE_TO_CHAN(src[0]);

+                  dst[1] = UBYTE_TO_CHAN(src[1]);

+                  dst[2] = UBYTE_TO_CHAN(src[2]);

+                  src += 3;

+                  dst += 3;

+               }

+               return;

+            }

+            else if (srcFormat == GL_RGBA) {

+               GLuint i;

+               const GLubyte *src = (const GLubyte *) source;

+               GLchan *dst = dest;

+               for (i = 0; i < n; i++) {

+                  dst[0] = UBYTE_TO_CHAN(src[0]);

+                  dst[1] = UBYTE_TO_CHAN(src[1]);

+                  dst[2] = UBYTE_TO_CHAN(src[2]);

+                  src += 4;

+                  dst += 3;

+               }

+               return;

+            }

+         }

+      }

+   }

+

+

+   /* general solution begins here */

+   {

+      GLint dstComponents;

+      GLint rDst, gDst, bDst, aDst, lDst, iDst;

+      GLfloat (*rgba)[4] = (GLfloat (*)[4]) malloc(4 * n * sizeof(GLfloat));

+

+      if (!rgba) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");

+         return;

+      }

+

+      dstComponents = _mesa_components_in_format( dstFormat );

+      /* source & dest image formats should have been error checked by now */

+      assert(dstComponents > 0);

+

+      /*

+       * Extract image data and convert to RGBA floats

+       */

+      if (srcFormat == GL_COLOR_INDEX) {

+         GLuint *indexes = (GLuint *) malloc(n * sizeof(GLuint));

+

+         if (!indexes) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");

+            return;

+         }

+

+         extract_uint_indexes(n, indexes, srcFormat, srcType, source,

+                              srcPacking);

+

+         if (dstFormat == GL_COLOR_INDEX) {

+            GLuint i;

+            _mesa_apply_ci_transfer_ops(ctx, transferOps, n, indexes);

+            /* convert to GLchan and return */

+            for (i = 0; i < n; i++) {

+               dest[i] = (GLchan) (indexes[i] & 0xff);

+            }

+            free(indexes);

+            free(rgba);

+            return;

+         }

+         else {

+            /* Convert indexes to RGBA */

+            if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {

+               _mesa_shift_and_offset_ci(ctx, n, indexes);

+            }

+            _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);

+         }

+

+         /* Don't do RGBA scale/bias or RGBA->RGBA mapping if starting

+          * with color indexes.

+          */

+         transferOps &= ~(IMAGE_SCALE_BIAS_BIT | IMAGE_MAP_COLOR_BIT);

+

+         free(indexes);

+      }

+      else {

+         /* non-color index data */

+         extract_float_rgba(n, rgba, srcFormat, srcType, source,

+                            srcPacking->SwapBytes);

+      }

+

+      /* Need to clamp if returning GLubytes or GLushorts */

+#if CHAN_TYPE != GL_FLOAT

+      transferOps |= IMAGE_CLAMP_BIT;

+#endif

+

+      if (transferOps) {

+         _mesa_apply_rgba_transfer_ops(ctx, transferOps, n, rgba);

+      }

+

+      get_component_indexes(dstFormat,

+                            &rDst, &gDst, &bDst, &aDst, &lDst, &iDst);

+

+      /* Now return the GLchan data in the requested dstFormat */

+      if (rDst >= 0) {

+         GLchan *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            CLAMPED_FLOAT_TO_CHAN(dst[rDst], rgba[i][RCOMP]);

+            dst += dstComponents;

+         }

+      }

+

+      if (gDst >= 0) {

+         GLchan *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            CLAMPED_FLOAT_TO_CHAN(dst[gDst], rgba[i][GCOMP]);

+            dst += dstComponents;

+         }

+      }

+

+      if (bDst >= 0) {

+         GLchan *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            CLAMPED_FLOAT_TO_CHAN(dst[bDst], rgba[i][BCOMP]);

+            dst += dstComponents;

+         }

+      }

+

+      if (aDst >= 0) {

+         GLchan *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            CLAMPED_FLOAT_TO_CHAN(dst[aDst], rgba[i][ACOMP]);

+            dst += dstComponents;

+         }

+      }

+

+      if (iDst >= 0) {

+         GLchan *dst = dest;

+         GLuint i;

+         assert(iDst == 0);

+         assert(dstComponents == 1);

+         for (i = 0; i < n; i++) {

+            /* Intensity comes from red channel */

+            CLAMPED_FLOAT_TO_CHAN(dst[i], rgba[i][RCOMP]);

+         }

+      }

+

+      if (lDst >= 0) {

+         GLchan *dst = dest;

+         GLuint i;

+         assert(lDst == 0);

+         for (i = 0; i < n; i++) {

+            /* Luminance comes from red channel */

+            CLAMPED_FLOAT_TO_CHAN(dst[0], rgba[i][RCOMP]);

+            dst += dstComponents;

+         }

+      }

+

+      free(rgba);

+   }

+}

+

+

+/**

+ * Same as _mesa_unpack_color_span_chan(), but return GLfloat data

+ * instead of GLchan.

+ */

+void

+_mesa_unpack_color_span_float( struct gl_context *ctx,

+                               GLuint n, GLenum dstFormat, GLfloat dest[],

+                               GLenum srcFormat, GLenum srcType,

+                               const GLvoid *source,

+                               const struct gl_pixelstore_attrib *srcPacking,

+                               GLbitfield transferOps )

+{

+   ASSERT(dstFormat == GL_ALPHA ||

+          dstFormat == GL_LUMINANCE ||

+          dstFormat == GL_LUMINANCE_ALPHA ||

+          dstFormat == GL_INTENSITY ||

+          dstFormat == GL_RED ||

+          dstFormat == GL_RG ||

+          dstFormat == GL_RGB ||

+          dstFormat == GL_RGBA ||

+          dstFormat == GL_COLOR_INDEX);

+

+   ASSERT(srcFormat == GL_RED ||

+          srcFormat == GL_GREEN ||

+          srcFormat == GL_BLUE ||

+          srcFormat == GL_ALPHA ||

+          srcFormat == GL_LUMINANCE ||

+          srcFormat == GL_LUMINANCE_ALPHA ||

+          srcFormat == GL_INTENSITY ||

+          srcFormat == GL_RG ||

+          srcFormat == GL_RGB ||

+          srcFormat == GL_BGR ||

+          srcFormat == GL_RGBA ||

+          srcFormat == GL_BGRA ||

+          srcFormat == GL_ABGR_EXT ||

+          srcFormat == GL_RED_INTEGER_EXT ||

+          srcFormat == GL_GREEN_INTEGER_EXT ||

+          srcFormat == GL_BLUE_INTEGER_EXT ||

+          srcFormat == GL_ALPHA_INTEGER_EXT ||

+          srcFormat == GL_RGB_INTEGER_EXT ||

+          srcFormat == GL_RGBA_INTEGER_EXT ||

+          srcFormat == GL_BGR_INTEGER_EXT ||

+          srcFormat == GL_BGRA_INTEGER_EXT ||

+          srcFormat == GL_LUMINANCE_INTEGER_EXT ||

+          srcFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT ||

+          srcFormat == GL_COLOR_INDEX);

+

+   ASSERT(srcType == GL_BITMAP ||

+          srcType == GL_UNSIGNED_BYTE ||

+          srcType == GL_BYTE ||

+          srcType == GL_UNSIGNED_SHORT ||

+          srcType == GL_SHORT ||

+          srcType == GL_UNSIGNED_INT ||

+          srcType == GL_INT ||

+          srcType == GL_HALF_FLOAT_ARB ||

+          srcType == GL_FLOAT ||

+          srcType == GL_UNSIGNED_BYTE_3_3_2 ||

+          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||

+          srcType == GL_UNSIGNED_SHORT_5_6_5 ||

+          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||

+          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||

+          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||

+          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||

+          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||

+          srcType == GL_UNSIGNED_INT_8_8_8_8 ||

+          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||

+          srcType == GL_UNSIGNED_INT_10_10_10_2 ||

+          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);

+

+   /* general solution, no special cases, yet */

+   {

+      GLint dstComponents;

+      GLint rDst, gDst, bDst, aDst, lDst, iDst;

+      GLfloat (*rgba)[4] = (GLfloat (*)[4]) malloc(4 * n * sizeof(GLfloat));

+

+      if (!rgba) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");

+         return;

+      }

+

+      dstComponents = _mesa_components_in_format( dstFormat );

+      /* source & dest image formats should have been error checked by now */

+      assert(dstComponents > 0);

+

+      /*

+       * Extract image data and convert to RGBA floats

+       */

+      if (srcFormat == GL_COLOR_INDEX) {

+         GLuint *indexes = (GLuint *) malloc(n * sizeof(GLuint));

+

+         if (!indexes) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");

+            free(rgba);

+            return;

+         }

+

+         extract_uint_indexes(n, indexes, srcFormat, srcType, source,

+                              srcPacking);

+

+         if (dstFormat == GL_COLOR_INDEX) {

+            GLuint i;

+            _mesa_apply_ci_transfer_ops(ctx, transferOps, n, indexes);

+            /* convert to GLchan and return */

+            for (i = 0; i < n; i++) {

+               dest[i] = (GLchan) (indexes[i] & 0xff);

+            }

+            free(indexes);

+            free(rgba);

+            return;

+         }

+         else {

+            /* Convert indexes to RGBA */

+            if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {

+               _mesa_shift_and_offset_ci(ctx, n, indexes);

+            }

+            _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);

+         }

+

+         /* Don't do RGBA scale/bias or RGBA->RGBA mapping if starting

+          * with color indexes.

+          */

+         transferOps &= ~(IMAGE_SCALE_BIAS_BIT | IMAGE_MAP_COLOR_BIT);

+

+         free(indexes);

+      }

+      else {

+         /* non-color index data */

+         extract_float_rgba(n, rgba, srcFormat, srcType, source,

+                            srcPacking->SwapBytes);

+      }

+

+      if (transferOps) {

+         _mesa_apply_rgba_transfer_ops(ctx, transferOps, n, rgba);

+      }

+

+      get_component_indexes(dstFormat,

+                            &rDst, &gDst, &bDst, &aDst, &lDst, &iDst);

+

+      /* Now pack results in the requested dstFormat */

+      if (rDst >= 0) {

+         GLfloat *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[rDst] = rgba[i][RCOMP];

+            dst += dstComponents;

+         }

+      }

+

+      if (gDst >= 0) {

+         GLfloat *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[gDst] = rgba[i][GCOMP];

+            dst += dstComponents;

+         }

+      }

+

+      if (bDst >= 0) {

+         GLfloat *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[bDst] = rgba[i][BCOMP];

+            dst += dstComponents;

+         }

+      }

+

+      if (aDst >= 0) {

+         GLfloat *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[aDst] = rgba[i][ACOMP];

+            dst += dstComponents;

+         }

+      }

+

+      if (iDst >= 0) {

+         GLfloat *dst = dest;

+         GLuint i;

+         assert(iDst == 0);

+         assert(dstComponents == 1);

+         for (i = 0; i < n; i++) {

+            /* Intensity comes from red channel */

+            dst[i] = rgba[i][RCOMP];

+         }

+      }

+

+      if (lDst >= 0) {

+         GLfloat *dst = dest;

+         GLuint i;

+         assert(lDst == 0);

+         for (i = 0; i < n; i++) {

+            /* Luminance comes from red channel */

+            dst[0] = rgba[i][RCOMP];

+            dst += dstComponents;

+         }

+      }

+

+      free(rgba);

+   }

+}

+

+

+/**

+ * Same as _mesa_unpack_color_span_chan(), but return GLuint data

+ * instead of GLchan.

+ * No pixel transfer ops are applied.

+ */

+void

+_mesa_unpack_color_span_uint(struct gl_context *ctx,

+                             GLuint n, GLenum dstFormat, GLuint *dest,

+                             GLenum srcFormat, GLenum srcType,

+                             const GLvoid *source,

+                             const struct gl_pixelstore_attrib *srcPacking)

+{

+   GLuint (*rgba)[4] = (GLuint (*)[4]) malloc(n * 4 * sizeof(GLfloat));

+

+   if (!rgba) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");

+      return;

+   }

+

+   ASSERT(dstFormat == GL_ALPHA ||

+          dstFormat == GL_LUMINANCE ||

+          dstFormat == GL_LUMINANCE_ALPHA ||

+          dstFormat == GL_INTENSITY ||

+          dstFormat == GL_RED ||

+          dstFormat == GL_RG ||

+          dstFormat == GL_RGB ||

+          dstFormat == GL_RGBA);

+

+   ASSERT(srcFormat == GL_RED ||

+          srcFormat == GL_GREEN ||

+          srcFormat == GL_BLUE ||

+          srcFormat == GL_ALPHA ||

+          srcFormat == GL_LUMINANCE ||

+          srcFormat == GL_LUMINANCE_ALPHA ||

+          srcFormat == GL_INTENSITY ||

+          srcFormat == GL_RG ||

+          srcFormat == GL_RGB ||

+          srcFormat == GL_BGR ||

+          srcFormat == GL_RGBA ||

+          srcFormat == GL_BGRA ||

+          srcFormat == GL_ABGR_EXT ||

+          srcFormat == GL_RED_INTEGER_EXT ||

+          srcFormat == GL_GREEN_INTEGER_EXT ||

+          srcFormat == GL_BLUE_INTEGER_EXT ||

+          srcFormat == GL_ALPHA_INTEGER_EXT ||

+          srcFormat == GL_RGB_INTEGER_EXT ||

+          srcFormat == GL_RGBA_INTEGER_EXT ||

+          srcFormat == GL_BGR_INTEGER_EXT ||

+          srcFormat == GL_BGRA_INTEGER_EXT ||

+          srcFormat == GL_LUMINANCE_INTEGER_EXT ||

+          srcFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT);

+

+   ASSERT(srcType == GL_UNSIGNED_BYTE ||

+          srcType == GL_BYTE ||

+          srcType == GL_UNSIGNED_SHORT ||

+          srcType == GL_SHORT ||

+          srcType == GL_UNSIGNED_INT ||

+          srcType == GL_INT ||

+          srcType == GL_HALF_FLOAT_ARB ||

+          srcType == GL_FLOAT ||

+          srcType == GL_UNSIGNED_BYTE_3_3_2 ||

+          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||

+          srcType == GL_UNSIGNED_SHORT_5_6_5 ||

+          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||

+          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||

+          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||

+          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||

+          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||

+          srcType == GL_UNSIGNED_INT_8_8_8_8 ||

+          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||

+          srcType == GL_UNSIGNED_INT_10_10_10_2 ||

+          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);

+

+

+   /* Extract image data as uint[4] pixels */

+   extract_uint_rgba(n, rgba, srcFormat, srcType, source,

+                     srcPacking->SwapBytes);

+

+   if (dstFormat == GL_RGBA) {

+      /* simple case */

+      memcpy(dest, rgba, 4 * sizeof(GLuint) * n);

+   }

+   else {

+      /* general case */

+      GLint rDst, gDst, bDst, aDst, lDst, iDst;

+      GLint dstComponents = _mesa_components_in_format( dstFormat );

+

+      assert(dstComponents > 0);

+

+      get_component_indexes(dstFormat,

+                            &rDst, &gDst, &bDst, &aDst, &lDst, &iDst);

+

+      /* Now pack values in the requested dest format */

+      if (rDst >= 0) {

+         GLuint *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[rDst] = rgba[i][RCOMP];

+            dst += dstComponents;

+         }

+      }

+

+      if (gDst >= 0) {

+         GLuint *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[gDst] = rgba[i][GCOMP];

+            dst += dstComponents;

+         }

+      }

+

+      if (bDst >= 0) {

+         GLuint *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[bDst] = rgba[i][BCOMP];

+            dst += dstComponents;

+         }

+      }

+

+      if (aDst >= 0) {

+         GLuint *dst = dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[aDst] = rgba[i][ACOMP];

+            dst += dstComponents;

+         }

+      }

+

+      if (iDst >= 0) {

+         GLuint *dst = dest;

+         GLuint i;

+         assert(iDst == 0);

+         assert(dstComponents == 1);

+         for (i = 0; i < n; i++) {

+            /* Intensity comes from red channel */

+            dst[i] = rgba[i][RCOMP];

+         }

+      }

+

+      if (lDst >= 0) {

+         GLuint *dst = dest;

+         GLuint i;

+         assert(lDst == 0);

+         for (i = 0; i < n; i++) {

+            /* Luminance comes from red channel */

+            dst[0] = rgba[i][RCOMP];

+            dst += dstComponents;

+         }

+      }

+   }

+

+   free(rgba);

+}

+

+

+

+/**

+ * Similar to _mesa_unpack_color_span_float(), but for dudv data instead of rgba,

+ * directly return GLbyte data, no transfer ops apply.

+ */

+void

+_mesa_unpack_dudv_span_byte( struct gl_context *ctx,

+                             GLuint n, GLenum dstFormat, GLbyte dest[],

+                             GLenum srcFormat, GLenum srcType,

+                             const GLvoid *source,

+                             const struct gl_pixelstore_attrib *srcPacking,

+                             GLbitfield transferOps )

+{

+   ASSERT(dstFormat == GL_DUDV_ATI);

+   ASSERT(srcFormat == GL_DUDV_ATI);

+

+   ASSERT(srcType == GL_UNSIGNED_BYTE ||

+          srcType == GL_BYTE ||

+          srcType == GL_UNSIGNED_SHORT ||

+          srcType == GL_SHORT ||

+          srcType == GL_UNSIGNED_INT ||

+          srcType == GL_INT ||

+          srcType == GL_HALF_FLOAT_ARB ||

+          srcType == GL_FLOAT);

+

+   /* general solution */

+   {

+      GLint dstComponents;

+      GLbyte *dst = dest;

+      GLuint i;

+      GLfloat (*rgba)[4] = (GLfloat (*)[4]) malloc(4 * n * sizeof(GLfloat));

+

+      if (!rgba) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");

+         return;

+      }

+

+      dstComponents = _mesa_components_in_format( dstFormat );

+      /* source & dest image formats should have been error checked by now */

+      assert(dstComponents > 0);

+

+      /*

+       * Extract image data and convert to RGBA floats

+       */

+      extract_float_rgba(n, rgba, srcFormat, srcType, source,

+                         srcPacking->SwapBytes);

+

+

+      /* Now determine which color channels we need to produce.

+       * And determine the dest index (offset) within each color tuple.

+       */

+

+      /* Now pack results in the requested dstFormat */

+      for (i = 0; i < n; i++) {

+         /* not sure - need clamp[-1,1] here? */

+         dst[0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);

+         dst[1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);

+         dst += dstComponents;

+      }

+

+      free(rgba);

+   }

+}

+

+/*

+ * Unpack a row of color index data from a client buffer according to

+ * the pixel unpacking parameters.

+ * This is (or will be) used by glDrawPixels, glTexImage[123]D, etc.

+ *

+ * Args:  ctx - the context

+ *        n - number of pixels

+ *        dstType - destination data type

+ *        dest - destination array

+ *        srcType - source pixel type

+ *        source - source data pointer

+ *        srcPacking - pixel unpacking parameters

+ *        transferOps - the pixel transfer operations to apply

+ */

+void

+_mesa_unpack_index_span( struct gl_context *ctx, GLuint n,

+                         GLenum dstType, GLvoid *dest,

+                         GLenum srcType, const GLvoid *source,

+                         const struct gl_pixelstore_attrib *srcPacking,

+                         GLbitfield transferOps )

+{

+   ASSERT(srcType == GL_BITMAP ||

+          srcType == GL_UNSIGNED_BYTE ||

+          srcType == GL_BYTE ||

+          srcType == GL_UNSIGNED_SHORT ||

+          srcType == GL_SHORT ||

+          srcType == GL_UNSIGNED_INT ||

+          srcType == GL_INT ||

+          srcType == GL_HALF_FLOAT_ARB ||

+          srcType == GL_FLOAT);

+

+   ASSERT(dstType == GL_UNSIGNED_BYTE ||

+          dstType == GL_UNSIGNED_SHORT ||

+          dstType == GL_UNSIGNED_INT);

+

+

+   transferOps &= (IMAGE_MAP_COLOR_BIT | IMAGE_SHIFT_OFFSET_BIT);

+

+   /*

+    * Try simple cases first

+    */

+   if (transferOps == 0 && srcType == GL_UNSIGNED_BYTE

+       && dstType == GL_UNSIGNED_BYTE) {

+      memcpy(dest, source, n * sizeof(GLubyte));

+   }

+   else if (transferOps == 0 && srcType == GL_UNSIGNED_INT

+            && dstType == GL_UNSIGNED_INT && !srcPacking->SwapBytes) {

+      memcpy(dest, source, n * sizeof(GLuint));

+   }

+   else {

+      /*

+       * general solution

+       */

+      GLuint *indexes = (GLuint *) malloc(n * sizeof(GLuint));

+

+      if (!indexes) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");

+         return;

+      }

+

+      extract_uint_indexes(n, indexes, GL_COLOR_INDEX, srcType, source,

+                           srcPacking);

+

+      if (transferOps)

+         _mesa_apply_ci_transfer_ops(ctx, transferOps, n, indexes);

+

+      /* convert to dest type */

+      switch (dstType) {

+         case GL_UNSIGNED_BYTE:

+            {

+               GLubyte *dst = (GLubyte *) dest;

+               GLuint i;

+               for (i = 0; i < n; i++) {

+                  dst[i] = (GLubyte) (indexes[i] & 0xff);

+               }

+            }

+            break;

+         case GL_UNSIGNED_SHORT:

+            {

+               GLuint *dst = (GLuint *) dest;

+               GLuint i;

+               for (i = 0; i < n; i++) {

+                  dst[i] = (GLushort) (indexes[i] & 0xffff);

+               }

+            }

+            break;

+         case GL_UNSIGNED_INT:

+            memcpy(dest, indexes, n * sizeof(GLuint));

+            break;

+         default:

+            _mesa_problem(ctx, "bad dstType in _mesa_unpack_index_span");

+      }

+

+      free(indexes);

+   }

+}

+

+

+void

+_mesa_pack_index_span( struct gl_context *ctx, GLuint n,

+                       GLenum dstType, GLvoid *dest, const GLuint *source,

+                       const struct gl_pixelstore_attrib *dstPacking,

+                       GLbitfield transferOps )

+{

+   GLuint *indexes = (GLuint *) malloc(n * sizeof(GLuint));

+

+   if (!indexes) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel packing");

+      return;

+   }

+

+   transferOps &= (IMAGE_MAP_COLOR_BIT | IMAGE_SHIFT_OFFSET_BIT);

+

+   if (transferOps & (IMAGE_MAP_COLOR_BIT | IMAGE_SHIFT_OFFSET_BIT)) {

+      /* make a copy of input */

+      memcpy(indexes, source, n * sizeof(GLuint));

+      _mesa_apply_ci_transfer_ops(ctx, transferOps, n, indexes);

+      source = indexes;

+   }

+

+   switch (dstType) {

+   case GL_UNSIGNED_BYTE:

+      {

+         GLubyte *dst = (GLubyte *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            *dst++ = (GLubyte) source[i];

+         }

+      }

+      break;

+   case GL_BYTE:

+      {

+         GLbyte *dst = (GLbyte *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = (GLbyte) source[i];

+         }

+      }

+      break;

+   case GL_UNSIGNED_SHORT:

+      {

+         GLushort *dst = (GLushort *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = (GLushort) source[i];

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap2( (GLushort *) dst, n );

+         }

+      }

+      break;

+   case GL_SHORT:

+      {

+         GLshort *dst = (GLshort *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = (GLshort) source[i];

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap2( (GLushort *) dst, n );

+         }

+      }

+      break;

+   case GL_UNSIGNED_INT:

+      {

+         GLuint *dst = (GLuint *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = (GLuint) source[i];

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap4( (GLuint *) dst, n );

+         }

+      }

+      break;

+   case GL_INT:

+      {

+         GLint *dst = (GLint *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = (GLint) source[i];

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap4( (GLuint *) dst, n );

+         }

+      }

+      break;

+   case GL_FLOAT:

+      {

+         GLfloat *dst = (GLfloat *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = (GLfloat) source[i];

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap4( (GLuint *) dst, n );

+         }

+      }

+      break;

+   case GL_HALF_FLOAT_ARB:

+      {

+         GLhalfARB *dst = (GLhalfARB *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = _mesa_float_to_half((GLfloat) source[i]);

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap2( (GLushort *) dst, n );

+         }

+      }

+      break;

+   default:

+      _mesa_problem(ctx, "bad type in _mesa_pack_index_span");

+   }

+

+   free(indexes);

+}

+

+

+/*

+ * Unpack a row of stencil data from a client buffer according to

+ * the pixel unpacking parameters.

+ * This is (or will be) used by glDrawPixels

+ *

+ * Args:  ctx - the context

+ *        n - number of pixels

+ *        dstType - destination data type

+ *        dest - destination array

+ *        srcType - source pixel type

+ *        source - source data pointer

+ *        srcPacking - pixel unpacking parameters

+ *        transferOps - apply offset/bias/lookup ops?

+ */

+void

+_mesa_unpack_stencil_span( struct gl_context *ctx, GLuint n,

+                           GLenum dstType, GLvoid *dest,

+                           GLenum srcType, const GLvoid *source,

+                           const struct gl_pixelstore_attrib *srcPacking,

+                           GLbitfield transferOps )

+{

+   ASSERT(srcType == GL_BITMAP ||

+          srcType == GL_UNSIGNED_BYTE ||

+          srcType == GL_BYTE ||

+          srcType == GL_UNSIGNED_SHORT ||

+          srcType == GL_SHORT ||

+          srcType == GL_UNSIGNED_INT ||

+          srcType == GL_INT ||

+          srcType == GL_UNSIGNED_INT_24_8_EXT ||

+          srcType == GL_HALF_FLOAT_ARB ||

+          srcType == GL_FLOAT);

+

+   ASSERT(dstType == GL_UNSIGNED_BYTE ||

+          dstType == GL_UNSIGNED_SHORT ||

+          dstType == GL_UNSIGNED_INT);

+

+   /* only shift and offset apply to stencil */

+   transferOps &= IMAGE_SHIFT_OFFSET_BIT;

+

+   /*

+    * Try simple cases first

+    */

+   if (transferOps == 0 &&

+       !ctx->Pixel.MapStencilFlag &&

+       srcType == GL_UNSIGNED_BYTE &&

+       dstType == GL_UNSIGNED_BYTE) {

+      memcpy(dest, source, n * sizeof(GLubyte));

+   }

+   else if (transferOps == 0 &&

+            !ctx->Pixel.MapStencilFlag &&

+            srcType == GL_UNSIGNED_INT &&

+            dstType == GL_UNSIGNED_INT &&

+            !srcPacking->SwapBytes) {

+      memcpy(dest, source, n * sizeof(GLuint));

+   }

+   else {

+      /*

+       * general solution

+       */

+      GLuint *indexes = (GLuint *) malloc(n * sizeof(GLuint));

+

+      if (!indexes) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "stencil unpacking");

+         return;

+      }

+

+      extract_uint_indexes(n, indexes, GL_STENCIL_INDEX, srcType, source,

+                           srcPacking);

+

+      if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {

+         /* shift and offset indexes */

+         _mesa_shift_and_offset_ci(ctx, n, indexes);

+      }

+

+      if (ctx->Pixel.MapStencilFlag) {

+         /* Apply stencil lookup table */

+         const GLuint mask = ctx->PixelMaps.StoS.Size - 1;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            indexes[i] = (GLuint)ctx->PixelMaps.StoS.Map[ indexes[i] & mask ];

+         }

+      }

+

+      /* convert to dest type */

+      switch (dstType) {

+         case GL_UNSIGNED_BYTE:

+            {

+               GLubyte *dst = (GLubyte *) dest;

+               GLuint i;

+               for (i = 0; i < n; i++) {

+                  dst[i] = (GLubyte) (indexes[i] & 0xff);

+               }

+            }

+            break;

+         case GL_UNSIGNED_SHORT:

+            {

+               GLuint *dst = (GLuint *) dest;

+               GLuint i;

+               for (i = 0; i < n; i++) {

+                  dst[i] = (GLushort) (indexes[i] & 0xffff);

+               }

+            }

+            break;

+         case GL_UNSIGNED_INT:

+            memcpy(dest, indexes, n * sizeof(GLuint));

+            break;

+         default:

+            _mesa_problem(ctx, "bad dstType in _mesa_unpack_stencil_span");

+      }

+

+      free(indexes);

+   }

+}

+

+

+void

+_mesa_pack_stencil_span( struct gl_context *ctx, GLuint n,

+                         GLenum dstType, GLvoid *dest, const GLstencil *source,

+                         const struct gl_pixelstore_attrib *dstPacking )

+{

+   GLstencil *stencil = (GLstencil *) malloc(n * sizeof(GLstencil));

+

+   if (!stencil) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "stencil packing");

+      return;

+   }

+

+   if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset ||

+       ctx->Pixel.MapStencilFlag) {

+      /* make a copy of input */

+      memcpy(stencil, source, n * sizeof(GLstencil));

+      _mesa_apply_stencil_transfer_ops(ctx, n, stencil);

+      source = stencil;

+   }

+

+   switch (dstType) {

+   case GL_UNSIGNED_BYTE:

+      if (sizeof(GLstencil) == 1) {

+         memcpy( dest, source, n );

+      }

+      else {

+         GLubyte *dst = (GLubyte *) dest;

+         GLuint i;

+         for (i=0;i<n;i++) {

+            dst[i] = (GLubyte) source[i];

+         }

+      }

+      break;

+   case GL_BYTE:

+      {

+         GLbyte *dst = (GLbyte *) dest;

+         GLuint i;

+         for (i=0;i<n;i++) {

+            dst[i] = (GLbyte) (source[i] & 0x7f);

+         }

+      }

+      break;

+   case GL_UNSIGNED_SHORT:

+      {

+         GLushort *dst = (GLushort *) dest;

+         GLuint i;

+         for (i=0;i<n;i++) {

+            dst[i] = (GLushort) source[i];

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap2( (GLushort *) dst, n );

+         }

+      }

+      break;

+   case GL_SHORT:

+      {

+         GLshort *dst = (GLshort *) dest;

+         GLuint i;

+         for (i=0;i<n;i++) {

+            dst[i] = (GLshort) source[i];

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap2( (GLushort *) dst, n );

+         }

+      }

+      break;

+   case GL_UNSIGNED_INT:

+      {

+         GLuint *dst = (GLuint *) dest;

+         GLuint i;

+         for (i=0;i<n;i++) {

+            dst[i] = (GLuint) source[i];

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap4( (GLuint *) dst, n );

+         }

+      }

+      break;

+   case GL_INT:

+      {

+         GLint *dst = (GLint *) dest;

+         GLuint i;

+         for (i=0;i<n;i++) {

+            dst[i] = (GLint) source[i];

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap4( (GLuint *) dst, n );

+         }

+      }

+      break;

+   case GL_FLOAT:

+      {

+         GLfloat *dst = (GLfloat *) dest;

+         GLuint i;

+         for (i=0;i<n;i++) {

+            dst[i] = (GLfloat) source[i];

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap4( (GLuint *) dst, n );

+         }

+      }

+      break;

+   case GL_HALF_FLOAT_ARB:

+      {

+         GLhalfARB *dst = (GLhalfARB *) dest;

+         GLuint i;

+         for (i=0;i<n;i++) {

+            dst[i] = _mesa_float_to_half( (float) source[i] );

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap2( (GLushort *) dst, n );

+         }

+      }

+      break;

+   case GL_BITMAP:

+      if (dstPacking->LsbFirst) {

+         GLubyte *dst = (GLubyte *) dest;

+         GLint shift = 0;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            if (shift == 0)

+               *dst = 0;

+            *dst |= ((source[i] != 0) << shift);

+            shift++;

+            if (shift == 8) {

+               shift = 0;

+               dst++;

+            }

+         }

+      }

+      else {

+         GLubyte *dst = (GLubyte *) dest;

+         GLint shift = 7;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            if (shift == 7)

+               *dst = 0;

+            *dst |= ((source[i] != 0) << shift);

+            shift--;

+            if (shift < 0) {

+               shift = 7;

+               dst++;

+            }

+         }

+      }

+      break;

+   default:

+      _mesa_problem(ctx, "bad type in _mesa_pack_index_span");

+   }

+

+   free(stencil);

+}

+

+#define DEPTH_VALUES(GLTYPE, GLTYPE2FLOAT)                              \

+    do {                                                                \

+        GLuint i;                                                       \

+        const GLTYPE *src = (const GLTYPE *)source;                     \

+        for (i = 0; i < n; i++) {                                       \

+            GLTYPE value = src[i];                                      \

+            if (srcPacking->SwapBytes) {                                \

+                if (sizeof(GLTYPE) == 2) {                              \

+                    SWAP2BYTE(value);                                   \

+                } else if (sizeof(GLTYPE) == 4) {                       \

+                    SWAP4BYTE(value);                                   \

+                }                                                       \

+            }                                                           \

+            depthValues[i] = GLTYPE2FLOAT(value);                       \

+        }                                                               \

+    } while (0)

+

+

+/**

+ * Unpack a row of depth/z values from memory, returning GLushort, GLuint

+ * or GLfloat values.

+ * The glPixelTransfer (scale/bias) params will be applied.

+ *

+ * \param dstType  one of GL_UNSIGNED_SHORT, GL_UNSIGNED_INT, GL_FLOAT

+ * \param depthMax  max value for returned GLushort or GLuint values

+ *                  (ignored for GLfloat).

+ */

+void

+_mesa_unpack_depth_span( struct gl_context *ctx, GLuint n,

+                         GLenum dstType, GLvoid *dest, GLuint depthMax,

+                         GLenum srcType, const GLvoid *source,

+                         const struct gl_pixelstore_attrib *srcPacking )

+{

+   GLfloat *depthTemp, *depthValues;

+   GLboolean needClamp = GL_FALSE;

+

+   /* Look for special cases first.

+    * Not only are these faster, they're less prone to numeric conversion

+    * problems.  Otherwise, converting from an int type to a float then

+    * back to an int type can introduce errors that will show up as

+    * artifacts in things like depth peeling which uses glCopyTexImage.

+    */

+   if (ctx->Pixel.DepthScale == 1.0 && ctx->Pixel.DepthBias == 0.0) {

+      if (srcType == GL_UNSIGNED_INT && dstType == GL_UNSIGNED_SHORT) {

+         const GLuint *src = (const GLuint *) source;

+         GLushort *dst = (GLushort *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = src[i] >> 16;

+         }

+         return;

+      }

+      if (srcType == GL_UNSIGNED_SHORT

+          && dstType == GL_UNSIGNED_INT

+          && depthMax == 0xffffffff) {

+         const GLushort *src = (const GLushort *) source;

+         GLuint *dst = (GLuint *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = src[i] | (src[i] << 16);

+         }

+         return;

+      }

+      if (srcType == GL_UNSIGNED_INT_24_8

+          && dstType == GL_UNSIGNED_INT

+          && depthMax == 0xffffff) {

+         const GLuint *src = (const GLuint *) source;

+         GLuint *dst = (GLuint *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = src[i] >> 8;

+         }

+         return;

+      }

+      /* XXX may want to add additional cases here someday */

+   }

+

+   /* general case path follows */

+

+   depthTemp = (GLfloat *) malloc(n * sizeof(GLfloat));

+   if (!depthTemp) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");

+      return;

+   }

+

+   if (dstType == GL_FLOAT) {

+      depthValues = (GLfloat *) dest;

+   }

+   else {

+      depthValues = depthTemp;

+   }

+

+   /* Convert incoming values to GLfloat.  Some conversions will require

+    * clamping, below.

+    */

+   switch (srcType) {

+      case GL_BYTE:

+         DEPTH_VALUES(GLbyte, BYTE_TO_FLOAT);

+         needClamp = GL_TRUE;

+         break;

+      case GL_UNSIGNED_BYTE:

+         DEPTH_VALUES(GLubyte, UBYTE_TO_FLOAT);

+         break;

+      case GL_SHORT:

+         DEPTH_VALUES(GLshort, SHORT_TO_FLOAT);

+         needClamp = GL_TRUE;

+         break;

+      case GL_UNSIGNED_SHORT:

+         DEPTH_VALUES(GLushort, USHORT_TO_FLOAT);

+         break;

+      case GL_INT:

+         DEPTH_VALUES(GLint, INT_TO_FLOAT);

+         needClamp = GL_TRUE;

+         break;

+      case GL_UNSIGNED_INT:

+         DEPTH_VALUES(GLuint, UINT_TO_FLOAT);

+         break;

+      case GL_UNSIGNED_INT_24_8_EXT: /* GL_EXT_packed_depth_stencil */

+         if (dstType == GL_UNSIGNED_INT_24_8_EXT &&

+             depthMax == 0xffffff &&

+             ctx->Pixel.DepthScale == 1.0 &&

+             ctx->Pixel.DepthBias == 0.0) {

+            const GLuint *src = (const GLuint *) source;

+            GLuint *zValues = (GLuint *) dest;

+            GLuint i;

+            for (i = 0; i < n; i++) {

+                GLuint value = src[i];

+                if (srcPacking->SwapBytes) {

+                    SWAP4BYTE(value);

+                }

+                zValues[i] = value & 0xffffff00;

+            }

+            return;

+         }

+         else {

+            const GLuint *src = (const GLuint *) source;

+            const GLfloat scale = 1.0f / 0xffffff;

+            GLuint i;

+            for (i = 0; i < n; i++) {

+                GLuint value = src[i];

+                if (srcPacking->SwapBytes) {

+                    SWAP4BYTE(value);

+                }

+                depthValues[i] = (value >> 8) * scale;

+            }

+         }

+         break;

+      case GL_FLOAT:

+         DEPTH_VALUES(GLfloat, 1*);

+         needClamp = GL_TRUE;

+         break;

+      case GL_HALF_FLOAT_ARB:

+         {

+            GLuint i;

+            const GLhalfARB *src = (const GLhalfARB *) source;

+            for (i = 0; i < n; i++) {

+               GLhalfARB value = src[i];

+               if (srcPacking->SwapBytes) {

+                  SWAP2BYTE(value);

+               }

+               depthValues[i] = _mesa_half_to_float(value);

+            }

+            needClamp = GL_TRUE;

+         }

+         break;

+      default:

+         _mesa_problem(NULL, "bad type in _mesa_unpack_depth_span()");

+         free(depthTemp);

+         return;

+   }

+

+   /* apply depth scale and bias */

+   {

+      const GLfloat scale = ctx->Pixel.DepthScale;

+      const GLfloat bias = ctx->Pixel.DepthBias;

+      if (scale != 1.0 || bias != 0.0) {

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            depthValues[i] = depthValues[i] * scale + bias;

+         }

+         needClamp = GL_TRUE;

+      }

+   }

+

+   /* clamp to [0, 1] */

+   if (needClamp) {

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         depthValues[i] = (GLfloat)CLAMP(depthValues[i], 0.0, 1.0);

+      }

+   }

+

+   /*

+    * Convert values to dstType

+    */

+   if (dstType == GL_UNSIGNED_INT) {

+      GLuint *zValues = (GLuint *) dest;

+      GLuint i;

+      if (depthMax <= 0xffffff) {

+         /* no overflow worries */

+         for (i = 0; i < n; i++) {

+            zValues[i] = (GLuint) (depthValues[i] * (GLfloat) depthMax);

+         }

+      }

+      else {

+         /* need to use double precision to prevent overflow problems */

+         for (i = 0; i < n; i++) {

+            GLdouble z = depthValues[i] * (GLfloat) depthMax;

+            if (z >= (GLdouble) 0xffffffff)

+               zValues[i] = 0xffffffff;

+            else

+               zValues[i] = (GLuint) z;

+         }

+      }

+   }

+   else if (dstType == GL_UNSIGNED_SHORT) {

+      GLushort *zValues = (GLushort *) dest;

+      GLuint i;

+      ASSERT(depthMax <= 0xffff);

+      for (i = 0; i < n; i++) {

+         zValues[i] = (GLushort) (depthValues[i] * (GLfloat) depthMax);

+      }

+   }

+   else {

+      ASSERT(dstType == GL_FLOAT);

+      /*ASSERT(depthMax == 1.0F);*/

+   }

+

+   free(depthTemp);

+}

+

+

+/*

+ * Pack an array of depth values.  The values are floats in [0,1].

+ */

+void

+_mesa_pack_depth_span( struct gl_context *ctx, GLuint n, GLvoid *dest,

+                       GLenum dstType, const GLfloat *depthSpan,

+                       const struct gl_pixelstore_attrib *dstPacking )

+{

+   GLfloat *depthCopy = (GLfloat *) malloc(n * sizeof(GLfloat));

+   if (!depthCopy) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel packing");

+      return;

+   }

+

+   if (ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0) {

+      memcpy(depthCopy, depthSpan, n * sizeof(GLfloat));

+      _mesa_scale_and_bias_depth(ctx, n, depthCopy);

+      depthSpan = depthCopy;

+   }

+

+   switch (dstType) {

+   case GL_UNSIGNED_BYTE:

+      {

+         GLubyte *dst = (GLubyte *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = FLOAT_TO_UBYTE( depthSpan[i] );

+         }

+      }

+      break;

+   case GL_BYTE:

+      {

+         GLbyte *dst = (GLbyte *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = FLOAT_TO_BYTE( depthSpan[i] );

+         }

+      }

+      break;

+   case GL_UNSIGNED_SHORT:

+      {

+         GLushort *dst = (GLushort *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            CLAMPED_FLOAT_TO_USHORT(dst[i], depthSpan[i]);

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap2( (GLushort *) dst, n );

+         }

+      }

+      break;

+   case GL_SHORT:

+      {

+         GLshort *dst = (GLshort *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = FLOAT_TO_SHORT( depthSpan[i] );

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap2( (GLushort *) dst, n );

+         }

+      }

+      break;

+   case GL_UNSIGNED_INT:

+      {

+         GLuint *dst = (GLuint *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = FLOAT_TO_UINT( depthSpan[i] );

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap4( (GLuint *) dst, n );

+         }

+      }

+      break;

+   case GL_INT:

+      {

+         GLint *dst = (GLint *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = FLOAT_TO_INT( depthSpan[i] );

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap4( (GLuint *) dst, n );

+         }

+      }

+      break;

+   case GL_FLOAT:

+      {

+         GLfloat *dst = (GLfloat *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = depthSpan[i];

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap4( (GLuint *) dst, n );

+         }

+      }

+      break;

+   case GL_HALF_FLOAT_ARB:

+      {

+         GLhalfARB *dst = (GLhalfARB *) dest;

+         GLuint i;

+         for (i = 0; i < n; i++) {

+            dst[i] = _mesa_float_to_half(depthSpan[i]);

+         }

+         if (dstPacking->SwapBytes) {

+            _mesa_swap2( (GLushort *) dst, n );

+         }

+      }

+      break;

+   default:

+      _mesa_problem(ctx, "bad type in _mesa_pack_depth_span");

+   }

+

+   free(depthCopy);

+}

+

+

+

+/**

+ * Pack depth and stencil values as GL_DEPTH_STENCIL/GL_UNSIGNED_INT_24_8.

+ */

+void

+_mesa_pack_depth_stencil_span(struct gl_context *ctx, GLuint n, GLuint *dest,

+                              const GLfloat *depthVals,

+                              const GLstencil *stencilVals,

+                              const struct gl_pixelstore_attrib *dstPacking)

+{

+   GLfloat *depthCopy = (GLfloat *) malloc(n * sizeof(GLfloat));

+   GLstencil *stencilCopy = (GLstencil *) malloc(n * sizeof(GLstencil));

+   GLuint i;

+

+   if (!depthCopy || !stencilCopy) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel packing");

+      free(depthCopy);

+      free(stencilCopy);

+      return;

+   }

+

+   if (ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0) {

+      memcpy(depthCopy, depthVals, n * sizeof(GLfloat));

+      _mesa_scale_and_bias_depth(ctx, n, depthCopy);

+      depthVals = depthCopy;

+   }

+

+   if (ctx->Pixel.IndexShift ||

+       ctx->Pixel.IndexOffset ||

+       ctx->Pixel.MapStencilFlag) {

+      memcpy(stencilCopy, stencilVals, n * sizeof(GLstencil));

+      _mesa_apply_stencil_transfer_ops(ctx, n, stencilCopy);

+      stencilVals = stencilCopy;

+   }

+

+   for (i = 0; i < n; i++) {

+      GLuint z = (GLuint) (depthVals[i] * 0xffffff);

+      dest[i] = (z << 8) | (stencilVals[i] & 0xff);

+   }

+

+   if (dstPacking->SwapBytes) {

+      _mesa_swap4(dest, n);

+   }

+

+   free(depthCopy);

+   free(stencilCopy);

+}

+

+

+

+

+/**

+ * Unpack image data.  Apply byte swapping, byte flipping (bitmap).

+ * Return all image data in a contiguous block.  This is used when we

+ * compile glDrawPixels, glTexImage, etc into a display list.  We

+ * need a copy of the data in a standard format.

+ */

+void *

+_mesa_unpack_image( GLuint dimensions,

+                    GLsizei width, GLsizei height, GLsizei depth,

+                    GLenum format, GLenum type, const GLvoid *pixels,

+                    const struct gl_pixelstore_attrib *unpack )

+{

+   GLint bytesPerRow, compsPerRow;

+   GLboolean flipBytes, swap2, swap4;

+

+   if (!pixels)

+      return NULL;  /* not necessarily an error */

+

+   if (width <= 0 || height <= 0 || depth <= 0)

+      return NULL;  /* generate error later */

+

+   if (type == GL_BITMAP) {

+      bytesPerRow = (width + 7) >> 3;

+      flipBytes = unpack->LsbFirst;

+      swap2 = swap4 = GL_FALSE;

+      compsPerRow = 0;

+   }

+   else {

+      const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);

+      GLint components = _mesa_components_in_format(format);

+      GLint bytesPerComp;

+

+      if (_mesa_type_is_packed(type))

+          components = 1;

+

+      if (bytesPerPixel <= 0 || components <= 0)

+         return NULL;   /* bad format or type.  generate error later */

+      bytesPerRow = bytesPerPixel * width;

+      bytesPerComp = bytesPerPixel / components;

+      flipBytes = GL_FALSE;

+      swap2 = (bytesPerComp == 2) && unpack->SwapBytes;

+      swap4 = (bytesPerComp == 4) && unpack->SwapBytes;

+      compsPerRow = components * width;

+      assert(compsPerRow >= width);

+   }

+

+   {

+      GLubyte *destBuffer

+         = (GLubyte *) malloc(bytesPerRow * height * depth);

+      GLubyte *dst;

+      GLint img, row;

+      if (!destBuffer)

+         return NULL;   /* generate GL_OUT_OF_MEMORY later */

+

+      dst = destBuffer;

+      for (img = 0; img < depth; img++) {

+         for (row = 0; row < height; row++) {

+            const GLvoid *src = _mesa_image_address(dimensions, unpack, pixels,

+                               width, height, format, type, img, row, 0);

+

+            if ((type == GL_BITMAP) && (unpack->SkipPixels & 0x7)) {

+               GLint i;

+               flipBytes = GL_FALSE;

+               if (unpack->LsbFirst) {

+                  GLubyte srcMask = 1 << (unpack->SkipPixels & 0x7);

+                  GLubyte dstMask = 128;

+                  const GLubyte *s = src;

+                  GLubyte *d = dst;

+                  *d = 0;

+                  for (i = 0; i < width; i++) {

+                     if (*s & srcMask) {

+                        *d |= dstMask;

+                     }      

+                     if (srcMask == 128) {

+                        srcMask = 1;

+                        s++;

+                     }

+                     else {

+                        srcMask = srcMask << 1;

+                     }

+                     if (dstMask == 1) {

+                        dstMask = 128;

+                        d++;

+                        *d = 0;

+                     }

+                     else {

+                        dstMask = dstMask >> 1;

+                     }

+                  }

+               }

+               else {

+                  GLubyte srcMask = 128 >> (unpack->SkipPixels & 0x7);

+                  GLubyte dstMask = 128;

+                  const GLubyte *s = src;

+                  GLubyte *d = dst;

+                  *d = 0;

+                  for (i = 0; i < width; i++) {

+                     if (*s & srcMask) {

+                        *d |= dstMask;

+                     }

+                     if (srcMask == 1) {

+                        srcMask = 128;

+                        s++;

+                     }

+                     else {

+                        srcMask = srcMask >> 1;

+                     }

+                     if (dstMask == 1) {

+                        dstMask = 128;

+                        d++;

+                        *d = 0;

+                     }

+                     else {

+                        dstMask = dstMask >> 1;

+                     }      

+                  }

+               }

+            }

+            else {

+               memcpy(dst, src, bytesPerRow);

+            }

+

+            /* byte flipping/swapping */

+            if (flipBytes) {

+               flip_bytes((GLubyte *) dst, bytesPerRow);

+            }

+            else if (swap2) {

+               _mesa_swap2((GLushort*) dst, compsPerRow);

+            }

+            else if (swap4) {

+               _mesa_swap4((GLuint*) dst, compsPerRow);

+            }

+            dst += bytesPerRow;

+         }

+      }

+      return destBuffer;

+   }

+}

+

diff --git a/mesalib/src/mesa/main/pixel.c b/mesalib/src/mesa/main/pixel.c
index da99c9b6f..5a14eb2d4 100644
--- a/mesalib/src/mesa/main/pixel.c
+++ b/mesalib/src/mesa/main/pixel.c
@@ -1,699 +1,699 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file pixel.c
- * Pixel transfer functions (glPixelZoom, glPixelMap, glPixelTransfer)
- */
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
-#include "context.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "pixel.h"
-#include "pbo.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
-
-#if FEATURE_pixel_transfer
-
-
-/**********************************************************************/
-/*****                    glPixelZoom                             *****/
-/**********************************************************************/
-
-static void GLAPIENTRY
-_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor )
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (ctx->Pixel.ZoomX == xfactor &&
-       ctx->Pixel.ZoomY == yfactor)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_PIXEL);
-   ctx->Pixel.ZoomX = xfactor;
-   ctx->Pixel.ZoomY = yfactor;
-}
-
-
-
-/**********************************************************************/
-/*****                         glPixelMap                         *****/
-/**********************************************************************/
-
-/**
- * Return pointer to a pixelmap by name.
- */
-static struct gl_pixelmap *
-get_pixelmap(struct gl_context *ctx, GLenum map)
-{
-   switch (map) {
-   case GL_PIXEL_MAP_I_TO_I:
-      return &ctx->PixelMaps.ItoI;
-   case GL_PIXEL_MAP_S_TO_S:
-      return &ctx->PixelMaps.StoS;
-   case GL_PIXEL_MAP_I_TO_R:
-      return &ctx->PixelMaps.ItoR;
-   case GL_PIXEL_MAP_I_TO_G:
-      return &ctx->PixelMaps.ItoG;
-   case GL_PIXEL_MAP_I_TO_B:
-      return &ctx->PixelMaps.ItoB;
-   case GL_PIXEL_MAP_I_TO_A:
-      return &ctx->PixelMaps.ItoA;
-   case GL_PIXEL_MAP_R_TO_R:
-      return &ctx->PixelMaps.RtoR;
-   case GL_PIXEL_MAP_G_TO_G:
-      return &ctx->PixelMaps.GtoG;
-   case GL_PIXEL_MAP_B_TO_B:
-      return &ctx->PixelMaps.BtoB;
-   case GL_PIXEL_MAP_A_TO_A:
-      return &ctx->PixelMaps.AtoA;
-   default:
-      return NULL;
-   }
-}
-
-
-/**
- * Helper routine used by the other _mesa_PixelMap() functions.
- */
-static void
-store_pixelmap(struct gl_context *ctx, GLenum map, GLsizei mapsize,
-               const GLfloat *values)
-{
-   GLint i;
-   struct gl_pixelmap *pm = get_pixelmap(ctx, map);
-   if (!pm) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glPixelMap(map)");
-      return;
-   }
-
-   switch (map) {
-   case GL_PIXEL_MAP_S_TO_S:
-      /* special case */
-      ctx->PixelMaps.StoS.Size = mapsize;
-      for (i = 0; i < mapsize; i++) {
-         ctx->PixelMaps.StoS.Map[i] = (GLfloat)IROUND(values[i]);
-      }
-      break;
-   case GL_PIXEL_MAP_I_TO_I:
-      /* special case */
-      ctx->PixelMaps.ItoI.Size = mapsize;
-      for (i = 0; i < mapsize; i++) {
-         ctx->PixelMaps.ItoI.Map[i] = values[i];
-      }
-      break;
-   default:
-      /* general case */
-      pm->Size = mapsize;
-      for (i = 0; i < mapsize; i++) {
-         GLfloat val = CLAMP(values[i], 0.0F, 1.0F);
-         pm->Map[i] = val;
-         pm->Map8[i] = (GLint) (val * 255.0F);
-      }
-   }
-}
-
-
-/**
- * Convenience wrapper for _mesa_validate_pbo_access() for gl[Get]PixelMap().
- */
-static GLboolean
-validate_pbo_access(struct gl_context *ctx, struct gl_pixelstore_attrib *pack,
-                    GLsizei mapsize, GLenum format, GLenum type,
-                    const GLvoid *ptr)
-{
-   GLboolean ok;
-
-   /* Note, need to use DefaultPacking and Unpack's buffer object */
-   _mesa_reference_buffer_object(ctx,
-                                 &ctx->DefaultPacking.BufferObj,
-                                 pack->BufferObj);
-
-   ok = _mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                  format, type, ptr);
-
-   /* restore */
-   _mesa_reference_buffer_object(ctx,
-                                 &ctx->DefaultPacking.BufferObj,
-                                 ctx->Shared->NullBufferObj);
-
-   if (!ok) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glPixelMap(invalid PBO access)");
-   }
-   return ok;
-}
-
-
-static void GLAPIENTRY
-_mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   /* XXX someday, test against ctx->Const.MaxPixelMapTableSize */
-   if (mapsize < 1 || mapsize > MAX_PIXEL_MAP_TABLE) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapfv(mapsize)" );
-      return;
-   }
-
-   if (map >= GL_PIXEL_MAP_S_TO_S && map <= GL_PIXEL_MAP_I_TO_A) {
-      /* test that mapsize is a power of two */
-      if (!_mesa_is_pow_two(mapsize)) {
-	 _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapfv(mapsize)" );
-         return;
-      }
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PIXEL);
-
-   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,
-                            GL_INTENSITY, GL_FLOAT, values)) {
-      return;
-   }
-
-   values = (const GLfloat *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);
-   if (!values) {
-      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPixelMapfv(PBO is mapped)");
-      }
-      return;
-   }
-
-   store_pixelmap(ctx, map, mapsize, values);
-
-   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-}
-
-
-static void GLAPIENTRY
-_mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )
-{
-   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (mapsize < 1 || mapsize > MAX_PIXEL_MAP_TABLE) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapuiv(mapsize)" );
-      return;
-   }
-
-   if (map >= GL_PIXEL_MAP_S_TO_S && map <= GL_PIXEL_MAP_I_TO_A) {
-      /* test that mapsize is a power of two */
-      if (!_mesa_is_pow_two(mapsize)) {
-	 _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapuiv(mapsize)" );
-         return;
-      }
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PIXEL);
-
-   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,
-                            GL_INTENSITY, GL_UNSIGNED_INT, values)) {
-      return;
-   }
-
-   values = (const GLuint *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);
-   if (!values) {
-      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPixelMapuiv(PBO is mapped)");
-      }
-      return;
-   }
-
-   /* convert to floats */
-   if (map == GL_PIXEL_MAP_I_TO_I || map == GL_PIXEL_MAP_S_TO_S) {
-      GLint i;
-      for (i = 0; i < mapsize; i++) {
-         fvalues[i] = (GLfloat) values[i];
-      }
-   }
-   else {
-      GLint i;
-      for (i = 0; i < mapsize; i++) {
-         fvalues[i] = UINT_TO_FLOAT( values[i] );
-      }
-   }
-
-   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-
-   store_pixelmap(ctx, map, mapsize, fvalues);
-}
-
-
-static void GLAPIENTRY
-_mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )
-{
-   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (mapsize < 1 || mapsize > MAX_PIXEL_MAP_TABLE) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapusv(mapsize)" );
-      return;
-   }
-
-   if (map >= GL_PIXEL_MAP_S_TO_S && map <= GL_PIXEL_MAP_I_TO_A) {
-      /* test that mapsize is a power of two */
-      if (!_mesa_is_pow_two(mapsize)) {
-	 _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapuiv(mapsize)" );
-         return;
-      }
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PIXEL);
-
-   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,
-                            GL_INTENSITY, GL_UNSIGNED_SHORT, values)) {
-      return;
-   }
-
-   values = (const GLushort *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);
-   if (!values) {
-      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPixelMapusv(PBO is mapped)");
-      }
-      return;
-   }
-
-   /* convert to floats */
-   if (map == GL_PIXEL_MAP_I_TO_I || map == GL_PIXEL_MAP_S_TO_S) {
-      GLint i;
-      for (i = 0; i < mapsize; i++) {
-         fvalues[i] = (GLfloat) values[i];
-      }
-   }
-   else {
-      GLint i;
-      for (i = 0; i < mapsize; i++) {
-         fvalues[i] = USHORT_TO_FLOAT( values[i] );
-      }
-   }
-
-   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-
-   store_pixelmap(ctx, map, mapsize, fvalues);
-}
-
-
-static void GLAPIENTRY
-_mesa_GetPixelMapfv( GLenum map, GLfloat *values )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint mapsize, i;
-   const struct gl_pixelmap *pm;
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   pm = get_pixelmap(ctx, map);
-   if (!pm) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetPixelMapfv(map)");
-      return;
-   }
-
-   mapsize = pm->Size;
-
-   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,
-                            GL_INTENSITY, GL_FLOAT, values)) {
-      return;
-   }
-
-   values = (GLfloat *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
-   if (!values) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPixelMapfv(PBO is mapped)");
-      }
-      return;
-   }
-
-   if (map == GL_PIXEL_MAP_S_TO_S) {
-      /* special case */
-      for (i = 0; i < mapsize; i++) {
-         values[i] = (GLfloat) ctx->PixelMaps.StoS.Map[i];
-      }
-   }
-   else {
-      memcpy(values, pm->Map, mapsize * sizeof(GLfloat));
-   }
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-}
-
-
-static void GLAPIENTRY
-_mesa_GetPixelMapuiv( GLenum map, GLuint *values )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint mapsize, i;
-   const struct gl_pixelmap *pm;
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   pm = get_pixelmap(ctx, map);
-   if (!pm) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetPixelMapuiv(map)");
-      return;
-   }
-   mapsize = pm->Size;
-
-   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,
-                            GL_INTENSITY, GL_UNSIGNED_INT, values)) {
-      return;
-   }
-
-   values = (GLuint *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
-   if (!values) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPixelMapuiv(PBO is mapped)");
-      }
-      return;
-   }
-
-   if (map == GL_PIXEL_MAP_S_TO_S) {
-      /* special case */
-      memcpy(values, ctx->PixelMaps.StoS.Map, mapsize * sizeof(GLint));
-   }
-   else {
-      for (i = 0; i < mapsize; i++) {
-         values[i] = FLOAT_TO_UINT( pm->Map[i] );
-      }
-   }
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-}
-
-
-static void GLAPIENTRY
-_mesa_GetPixelMapusv( GLenum map, GLushort *values )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint mapsize, i;
-   const struct gl_pixelmap *pm;
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   pm = get_pixelmap(ctx, map);
-   if (!pm) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetPixelMapusv(map)");
-      return;
-   }
-   mapsize = pm->Size;
-
-   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,
-                            GL_INTENSITY, GL_UNSIGNED_SHORT, values)) {
-      return;
-   }
-
-   values = (GLushort *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
-   if (!values) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPixelMapusv(PBO is mapped)");
-      }
-      return;
-   }
-
-   switch (map) {
-   /* special cases */
-   case GL_PIXEL_MAP_I_TO_I:
-      for (i = 0; i < mapsize; i++) {
-         values[i] = (GLushort) CLAMP(ctx->PixelMaps.ItoI.Map[i], 0.0, 65535.);
-      }
-      break;
-   case GL_PIXEL_MAP_S_TO_S:
-      for (i = 0; i < mapsize; i++) {
-         values[i] = (GLushort) CLAMP(ctx->PixelMaps.StoS.Map[i], 0.0, 65535.);
-      }
-      break;
-   default:
-      for (i = 0; i < mapsize; i++) {
-         CLAMPED_FLOAT_TO_USHORT(values[i], pm->Map[i] );
-      }
-   }
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-}
-
-
-
-/**********************************************************************/
-/*****                       glPixelTransfer                      *****/
-/**********************************************************************/
-
-
-/*
- * Implements glPixelTransfer[fi] whether called immediately or from a
- * display list.
- */
-static void GLAPIENTRY
-_mesa_PixelTransferf( GLenum pname, GLfloat param )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (pname) {
-      case GL_MAP_COLOR:
-         if (ctx->Pixel.MapColorFlag == (param ? GL_TRUE : GL_FALSE))
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.MapColorFlag = param ? GL_TRUE : GL_FALSE;
-	 break;
-      case GL_MAP_STENCIL:
-         if (ctx->Pixel.MapStencilFlag == (param ? GL_TRUE : GL_FALSE))
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.MapStencilFlag = param ? GL_TRUE : GL_FALSE;
-	 break;
-      case GL_INDEX_SHIFT:
-         if (ctx->Pixel.IndexShift == (GLint) param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.IndexShift = (GLint) param;
-	 break;
-      case GL_INDEX_OFFSET:
-         if (ctx->Pixel.IndexOffset == (GLint) param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.IndexOffset = (GLint) param;
-	 break;
-      case GL_RED_SCALE:
-         if (ctx->Pixel.RedScale == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.RedScale = param;
-	 break;
-      case GL_RED_BIAS:
-         if (ctx->Pixel.RedBias == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.RedBias = param;
-	 break;
-      case GL_GREEN_SCALE:
-         if (ctx->Pixel.GreenScale == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.GreenScale = param;
-	 break;
-      case GL_GREEN_BIAS:
-         if (ctx->Pixel.GreenBias == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.GreenBias = param;
-	 break;
-      case GL_BLUE_SCALE:
-         if (ctx->Pixel.BlueScale == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.BlueScale = param;
-	 break;
-      case GL_BLUE_BIAS:
-         if (ctx->Pixel.BlueBias == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.BlueBias = param;
-	 break;
-      case GL_ALPHA_SCALE:
-         if (ctx->Pixel.AlphaScale == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.AlphaScale = param;
-	 break;
-      case GL_ALPHA_BIAS:
-         if (ctx->Pixel.AlphaBias == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.AlphaBias = param;
-	 break;
-      case GL_DEPTH_SCALE:
-         if (ctx->Pixel.DepthScale == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.DepthScale = param;
-	 break;
-      case GL_DEPTH_BIAS:
-         if (ctx->Pixel.DepthBias == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.DepthBias = param;
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glPixelTransfer(pname)" );
-         return;
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_PixelTransferi( GLenum pname, GLint param )
-{
-   _mesa_PixelTransferf( pname, (GLfloat) param );
-}
-
-
-
-/**********************************************************************/
-/*****                    State Management                        *****/
-/**********************************************************************/
-
-/*
- * Return a bitmask of IMAGE_*_BIT flags which to indicate which
- * pixel transfer operations are enabled.
- */
-static void
-update_image_transfer_state(struct gl_context *ctx)
-{
-   GLuint mask = 0;
-
-   if (ctx->Pixel.RedScale   != 1.0F || ctx->Pixel.RedBias   != 0.0F ||
-       ctx->Pixel.GreenScale != 1.0F || ctx->Pixel.GreenBias != 0.0F ||
-       ctx->Pixel.BlueScale  != 1.0F || ctx->Pixel.BlueBias  != 0.0F ||
-       ctx->Pixel.AlphaScale != 1.0F || ctx->Pixel.AlphaBias != 0.0F)
-      mask |= IMAGE_SCALE_BIAS_BIT;
-
-   if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset)
-      mask |= IMAGE_SHIFT_OFFSET_BIT;
-
-   if (ctx->Pixel.MapColorFlag)
-      mask |= IMAGE_MAP_COLOR_BIT;
-
-   ctx->_ImageTransferState = mask;
-}
-
-
-/**
- * Update mesa pixel transfer derived state.
- */
-void _mesa_update_pixel( struct gl_context *ctx, GLuint new_state )
-{
-   if (new_state & _NEW_PIXEL)
-      update_image_transfer_state(ctx);
-}
-
-
-void
-_mesa_init_pixel_dispatch(struct _glapi_table *disp)
-{
-   SET_GetPixelMapfv(disp, _mesa_GetPixelMapfv);
-   SET_GetPixelMapuiv(disp, _mesa_GetPixelMapuiv);
-   SET_GetPixelMapusv(disp, _mesa_GetPixelMapusv);
-   SET_PixelMapfv(disp, _mesa_PixelMapfv);
-   SET_PixelMapuiv(disp, _mesa_PixelMapuiv);
-   SET_PixelMapusv(disp, _mesa_PixelMapusv);
-   SET_PixelTransferf(disp, _mesa_PixelTransferf);
-   SET_PixelTransferi(disp, _mesa_PixelTransferi);
-   SET_PixelZoom(disp, _mesa_PixelZoom);
-}
-
-
-#endif /* FEATURE_pixel_transfer */
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-static void
-init_pixelmap(struct gl_pixelmap *map)
-{
-   map->Size = 1;
-   map->Map[0] = 0.0;
-   map->Map8[0] = 0;
-}
-
-
-/**
- * Initialize the context's PIXEL attribute group.
- */
-void
-_mesa_init_pixel( struct gl_context *ctx )
-{
-   /* Pixel group */
-   ctx->Pixel.RedBias = 0.0;
-   ctx->Pixel.RedScale = 1.0;
-   ctx->Pixel.GreenBias = 0.0;
-   ctx->Pixel.GreenScale = 1.0;
-   ctx->Pixel.BlueBias = 0.0;
-   ctx->Pixel.BlueScale = 1.0;
-   ctx->Pixel.AlphaBias = 0.0;
-   ctx->Pixel.AlphaScale = 1.0;
-   ctx->Pixel.DepthBias = 0.0;
-   ctx->Pixel.DepthScale = 1.0;
-   ctx->Pixel.IndexOffset = 0;
-   ctx->Pixel.IndexShift = 0;
-   ctx->Pixel.ZoomX = 1.0;
-   ctx->Pixel.ZoomY = 1.0;
-   ctx->Pixel.MapColorFlag = GL_FALSE;
-   ctx->Pixel.MapStencilFlag = GL_FALSE;
-   init_pixelmap(&ctx->PixelMaps.StoS);
-   init_pixelmap(&ctx->PixelMaps.ItoI);
-   init_pixelmap(&ctx->PixelMaps.ItoR);
-   init_pixelmap(&ctx->PixelMaps.ItoG);
-   init_pixelmap(&ctx->PixelMaps.ItoB);
-   init_pixelmap(&ctx->PixelMaps.ItoA);
-   init_pixelmap(&ctx->PixelMaps.RtoR);
-   init_pixelmap(&ctx->PixelMaps.GtoG);
-   init_pixelmap(&ctx->PixelMaps.BtoB);
-   init_pixelmap(&ctx->PixelMaps.AtoA);
-
-   if (ctx->Visual.doubleBufferMode) {
-      ctx->Pixel.ReadBuffer = GL_BACK;
-   }
-   else {
-      ctx->Pixel.ReadBuffer = GL_FRONT;
-   }
-
-   /* Miscellaneous */
-   ctx->_ImageTransferState = 0;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file pixel.c

+ * Pixel transfer functions (glPixelZoom, glPixelMap, glPixelTransfer)

+ */

+

+#include "glheader.h"

+#include "bufferobj.h"

+#include "colormac.h"

+#include "context.h"

+#include "macros.h"

+#include "mfeatures.h"

+#include "pixel.h"

+#include "pbo.h"

+#include "mtypes.h"

+#include "main/dispatch.h"

+

+

+#if FEATURE_pixel_transfer

+

+

+/**********************************************************************/

+/*****                    glPixelZoom                             *****/

+/**********************************************************************/

+

+static void GLAPIENTRY

+_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor )

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (ctx->Pixel.ZoomX == xfactor &&

+       ctx->Pixel.ZoomY == yfactor)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_PIXEL);

+   ctx->Pixel.ZoomX = xfactor;

+   ctx->Pixel.ZoomY = yfactor;

+}

+

+

+

+/**********************************************************************/

+/*****                         glPixelMap                         *****/

+/**********************************************************************/

+

+/**

+ * Return pointer to a pixelmap by name.

+ */

+static struct gl_pixelmap *

+get_pixelmap(struct gl_context *ctx, GLenum map)

+{

+   switch (map) {

+   case GL_PIXEL_MAP_I_TO_I:

+      return &ctx->PixelMaps.ItoI;

+   case GL_PIXEL_MAP_S_TO_S:

+      return &ctx->PixelMaps.StoS;

+   case GL_PIXEL_MAP_I_TO_R:

+      return &ctx->PixelMaps.ItoR;

+   case GL_PIXEL_MAP_I_TO_G:

+      return &ctx->PixelMaps.ItoG;

+   case GL_PIXEL_MAP_I_TO_B:

+      return &ctx->PixelMaps.ItoB;

+   case GL_PIXEL_MAP_I_TO_A:

+      return &ctx->PixelMaps.ItoA;

+   case GL_PIXEL_MAP_R_TO_R:

+      return &ctx->PixelMaps.RtoR;

+   case GL_PIXEL_MAP_G_TO_G:

+      return &ctx->PixelMaps.GtoG;

+   case GL_PIXEL_MAP_B_TO_B:

+      return &ctx->PixelMaps.BtoB;

+   case GL_PIXEL_MAP_A_TO_A:

+      return &ctx->PixelMaps.AtoA;

+   default:

+      return NULL;

+   }

+}

+

+

+/**

+ * Helper routine used by the other _mesa_PixelMap() functions.

+ */

+static void

+store_pixelmap(struct gl_context *ctx, GLenum map, GLsizei mapsize,

+               const GLfloat *values)

+{

+   GLint i;

+   struct gl_pixelmap *pm = get_pixelmap(ctx, map);

+   if (!pm) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glPixelMap(map)");

+      return;

+   }

+

+   switch (map) {

+   case GL_PIXEL_MAP_S_TO_S:

+      /* special case */

+      ctx->PixelMaps.StoS.Size = mapsize;

+      for (i = 0; i < mapsize; i++) {

+         ctx->PixelMaps.StoS.Map[i] = (GLfloat)IROUND(values[i]);

+      }

+      break;

+   case GL_PIXEL_MAP_I_TO_I:

+      /* special case */

+      ctx->PixelMaps.ItoI.Size = mapsize;

+      for (i = 0; i < mapsize; i++) {

+         ctx->PixelMaps.ItoI.Map[i] = values[i];

+      }

+      break;

+   default:

+      /* general case */

+      pm->Size = mapsize;

+      for (i = 0; i < mapsize; i++) {

+         GLfloat val = CLAMP(values[i], 0.0F, 1.0F);

+         pm->Map[i] = val;

+         pm->Map8[i] = (GLint) (val * 255.0F);

+      }

+   }

+}

+

+

+/**

+ * Convenience wrapper for _mesa_validate_pbo_access() for gl[Get]PixelMap().

+ */

+static GLboolean

+validate_pbo_access(struct gl_context *ctx, struct gl_pixelstore_attrib *pack,

+                    GLsizei mapsize, GLenum format, GLenum type,

+                    const GLvoid *ptr)

+{

+   GLboolean ok;

+

+   /* Note, need to use DefaultPacking and Unpack's buffer object */

+   _mesa_reference_buffer_object(ctx,

+                                 &ctx->DefaultPacking.BufferObj,

+                                 pack->BufferObj);

+

+   ok = _mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,

+                                  format, type, ptr);

+

+   /* restore */

+   _mesa_reference_buffer_object(ctx,

+                                 &ctx->DefaultPacking.BufferObj,

+                                 ctx->Shared->NullBufferObj);

+

+   if (!ok) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glPixelMap(invalid PBO access)");

+   }

+   return ok;

+}

+

+

+static void GLAPIENTRY

+_mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   /* XXX someday, test against ctx->Const.MaxPixelMapTableSize */

+   if (mapsize < 1 || mapsize > MAX_PIXEL_MAP_TABLE) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapfv(mapsize)" );

+      return;

+   }

+

+   if (map >= GL_PIXEL_MAP_S_TO_S && map <= GL_PIXEL_MAP_I_TO_A) {

+      /* test that mapsize is a power of two */

+      if (!_mesa_is_pow_two(mapsize)) {

+	 _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapfv(mapsize)" );

+         return;

+      }

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PIXEL);

+

+   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,

+                            GL_INTENSITY, GL_FLOAT, values)) {

+      return;

+   }

+

+   values = (const GLfloat *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);

+   if (!values) {

+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glPixelMapfv(PBO is mapped)");

+      }

+      return;

+   }

+

+   store_pixelmap(ctx, map, mapsize, values);

+

+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);

+}

+

+

+static void GLAPIENTRY

+_mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )

+{

+   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (mapsize < 1 || mapsize > MAX_PIXEL_MAP_TABLE) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapuiv(mapsize)" );

+      return;

+   }

+

+   if (map >= GL_PIXEL_MAP_S_TO_S && map <= GL_PIXEL_MAP_I_TO_A) {

+      /* test that mapsize is a power of two */

+      if (!_mesa_is_pow_two(mapsize)) {

+	 _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapuiv(mapsize)" );

+         return;

+      }

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PIXEL);

+

+   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,

+                            GL_INTENSITY, GL_UNSIGNED_INT, values)) {

+      return;

+   }

+

+   values = (const GLuint *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);

+   if (!values) {

+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glPixelMapuiv(PBO is mapped)");

+      }

+      return;

+   }

+

+   /* convert to floats */

+   if (map == GL_PIXEL_MAP_I_TO_I || map == GL_PIXEL_MAP_S_TO_S) {

+      GLint i;

+      for (i = 0; i < mapsize; i++) {

+         fvalues[i] = (GLfloat) values[i];

+      }

+   }

+   else {

+      GLint i;

+      for (i = 0; i < mapsize; i++) {

+         fvalues[i] = UINT_TO_FLOAT( values[i] );

+      }

+   }

+

+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);

+

+   store_pixelmap(ctx, map, mapsize, fvalues);

+}

+

+

+static void GLAPIENTRY

+_mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )

+{

+   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (mapsize < 1 || mapsize > MAX_PIXEL_MAP_TABLE) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapusv(mapsize)" );

+      return;

+   }

+

+   if (map >= GL_PIXEL_MAP_S_TO_S && map <= GL_PIXEL_MAP_I_TO_A) {

+      /* test that mapsize is a power of two */

+      if (!_mesa_is_pow_two(mapsize)) {

+	 _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapuiv(mapsize)" );

+         return;

+      }

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PIXEL);

+

+   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,

+                            GL_INTENSITY, GL_UNSIGNED_SHORT, values)) {

+      return;

+   }

+

+   values = (const GLushort *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);

+   if (!values) {

+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glPixelMapusv(PBO is mapped)");

+      }

+      return;

+   }

+

+   /* convert to floats */

+   if (map == GL_PIXEL_MAP_I_TO_I || map == GL_PIXEL_MAP_S_TO_S) {

+      GLint i;

+      for (i = 0; i < mapsize; i++) {

+         fvalues[i] = (GLfloat) values[i];

+      }

+   }

+   else {

+      GLint i;

+      for (i = 0; i < mapsize; i++) {

+         fvalues[i] = USHORT_TO_FLOAT( values[i] );

+      }

+   }

+

+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);

+

+   store_pixelmap(ctx, map, mapsize, fvalues);

+}

+

+

+static void GLAPIENTRY

+_mesa_GetPixelMapfv( GLenum map, GLfloat *values )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint mapsize, i;

+   const struct gl_pixelmap *pm;

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   pm = get_pixelmap(ctx, map);

+   if (!pm) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetPixelMapfv(map)");

+      return;

+   }

+

+   mapsize = pm->Size;

+

+   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,

+                            GL_INTENSITY, GL_FLOAT, values)) {

+      return;

+   }

+

+   values = (GLfloat *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);

+   if (!values) {

+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetPixelMapfv(PBO is mapped)");

+      }

+      return;

+   }

+

+   if (map == GL_PIXEL_MAP_S_TO_S) {

+      /* special case */

+      for (i = 0; i < mapsize; i++) {

+         values[i] = (GLfloat) ctx->PixelMaps.StoS.Map[i];

+      }

+   }

+   else {

+      memcpy(values, pm->Map, mapsize * sizeof(GLfloat));

+   }

+

+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);

+}

+

+

+static void GLAPIENTRY

+_mesa_GetPixelMapuiv( GLenum map, GLuint *values )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint mapsize, i;

+   const struct gl_pixelmap *pm;

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   pm = get_pixelmap(ctx, map);

+   if (!pm) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetPixelMapuiv(map)");

+      return;

+   }

+   mapsize = pm->Size;

+

+   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,

+                            GL_INTENSITY, GL_UNSIGNED_INT, values)) {

+      return;

+   }

+

+   values = (GLuint *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);

+   if (!values) {

+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetPixelMapuiv(PBO is mapped)");

+      }

+      return;

+   }

+

+   if (map == GL_PIXEL_MAP_S_TO_S) {

+      /* special case */

+      memcpy(values, ctx->PixelMaps.StoS.Map, mapsize * sizeof(GLint));

+   }

+   else {

+      for (i = 0; i < mapsize; i++) {

+         values[i] = FLOAT_TO_UINT( pm->Map[i] );

+      }

+   }

+

+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);

+}

+

+

+static void GLAPIENTRY

+_mesa_GetPixelMapusv( GLenum map, GLushort *values )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint mapsize, i;

+   const struct gl_pixelmap *pm;

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   pm = get_pixelmap(ctx, map);

+   if (!pm) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetPixelMapusv(map)");

+      return;

+   }

+   mapsize = pm->Size;

+

+   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,

+                            GL_INTENSITY, GL_UNSIGNED_SHORT, values)) {

+      return;

+   }

+

+   values = (GLushort *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);

+   if (!values) {

+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetPixelMapusv(PBO is mapped)");

+      }

+      return;

+   }

+

+   switch (map) {

+   /* special cases */

+   case GL_PIXEL_MAP_I_TO_I:

+      for (i = 0; i < mapsize; i++) {

+         values[i] = (GLushort) CLAMP(ctx->PixelMaps.ItoI.Map[i], 0.0, 65535.);

+      }

+      break;

+   case GL_PIXEL_MAP_S_TO_S:

+      for (i = 0; i < mapsize; i++) {

+         values[i] = (GLushort) CLAMP(ctx->PixelMaps.StoS.Map[i], 0.0, 65535.);

+      }

+      break;

+   default:

+      for (i = 0; i < mapsize; i++) {

+         CLAMPED_FLOAT_TO_USHORT(values[i], pm->Map[i] );

+      }

+   }

+

+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);

+}

+

+

+

+/**********************************************************************/

+/*****                       glPixelTransfer                      *****/

+/**********************************************************************/

+

+

+/*

+ * Implements glPixelTransfer[fi] whether called immediately or from a

+ * display list.

+ */

+static void GLAPIENTRY

+_mesa_PixelTransferf( GLenum pname, GLfloat param )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   switch (pname) {

+      case GL_MAP_COLOR:

+         if (ctx->Pixel.MapColorFlag == (param ? GL_TRUE : GL_FALSE))

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.MapColorFlag = param ? GL_TRUE : GL_FALSE;

+	 break;

+      case GL_MAP_STENCIL:

+         if (ctx->Pixel.MapStencilFlag == (param ? GL_TRUE : GL_FALSE))

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.MapStencilFlag = param ? GL_TRUE : GL_FALSE;

+	 break;

+      case GL_INDEX_SHIFT:

+         if (ctx->Pixel.IndexShift == (GLint) param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.IndexShift = (GLint) param;

+	 break;

+      case GL_INDEX_OFFSET:

+         if (ctx->Pixel.IndexOffset == (GLint) param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.IndexOffset = (GLint) param;

+	 break;

+      case GL_RED_SCALE:

+         if (ctx->Pixel.RedScale == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.RedScale = param;

+	 break;

+      case GL_RED_BIAS:

+         if (ctx->Pixel.RedBias == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.RedBias = param;

+	 break;

+      case GL_GREEN_SCALE:

+         if (ctx->Pixel.GreenScale == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.GreenScale = param;

+	 break;

+      case GL_GREEN_BIAS:

+         if (ctx->Pixel.GreenBias == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.GreenBias = param;

+	 break;

+      case GL_BLUE_SCALE:

+         if (ctx->Pixel.BlueScale == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.BlueScale = param;

+	 break;

+      case GL_BLUE_BIAS:

+         if (ctx->Pixel.BlueBias == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.BlueBias = param;

+	 break;

+      case GL_ALPHA_SCALE:

+         if (ctx->Pixel.AlphaScale == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.AlphaScale = param;

+	 break;

+      case GL_ALPHA_BIAS:

+         if (ctx->Pixel.AlphaBias == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.AlphaBias = param;

+	 break;

+      case GL_DEPTH_SCALE:

+         if (ctx->Pixel.DepthScale == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.DepthScale = param;

+	 break;

+      case GL_DEPTH_BIAS:

+         if (ctx->Pixel.DepthBias == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);

+         ctx->Pixel.DepthBias = param;

+	 break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glPixelTransfer(pname)" );

+         return;

+   }

+}

+

+

+static void GLAPIENTRY

+_mesa_PixelTransferi( GLenum pname, GLint param )

+{

+   _mesa_PixelTransferf( pname, (GLfloat) param );

+}

+

+

+

+/**********************************************************************/

+/*****                    State Management                        *****/

+/**********************************************************************/

+

+/*

+ * Return a bitmask of IMAGE_*_BIT flags which to indicate which

+ * pixel transfer operations are enabled.

+ */

+static void

+update_image_transfer_state(struct gl_context *ctx)

+{

+   GLuint mask = 0;

+

+   if (ctx->Pixel.RedScale   != 1.0F || ctx->Pixel.RedBias   != 0.0F ||

+       ctx->Pixel.GreenScale != 1.0F || ctx->Pixel.GreenBias != 0.0F ||

+       ctx->Pixel.BlueScale  != 1.0F || ctx->Pixel.BlueBias  != 0.0F ||

+       ctx->Pixel.AlphaScale != 1.0F || ctx->Pixel.AlphaBias != 0.0F)

+      mask |= IMAGE_SCALE_BIAS_BIT;

+

+   if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset)

+      mask |= IMAGE_SHIFT_OFFSET_BIT;

+

+   if (ctx->Pixel.MapColorFlag)

+      mask |= IMAGE_MAP_COLOR_BIT;

+

+   ctx->_ImageTransferState = mask;

+}

+

+

+/**

+ * Update mesa pixel transfer derived state.

+ */

+void _mesa_update_pixel( struct gl_context *ctx, GLuint new_state )

+{

+   if (new_state & _NEW_PIXEL)

+      update_image_transfer_state(ctx);

+}

+

+

+void

+_mesa_init_pixel_dispatch(struct _glapi_table *disp)

+{

+   SET_GetPixelMapfv(disp, _mesa_GetPixelMapfv);

+   SET_GetPixelMapuiv(disp, _mesa_GetPixelMapuiv);

+   SET_GetPixelMapusv(disp, _mesa_GetPixelMapusv);

+   SET_PixelMapfv(disp, _mesa_PixelMapfv);

+   SET_PixelMapuiv(disp, _mesa_PixelMapuiv);

+   SET_PixelMapusv(disp, _mesa_PixelMapusv);

+   SET_PixelTransferf(disp, _mesa_PixelTransferf);

+   SET_PixelTransferi(disp, _mesa_PixelTransferi);

+   SET_PixelZoom(disp, _mesa_PixelZoom);

+}

+

+

+#endif /* FEATURE_pixel_transfer */

+

+

+/**********************************************************************/

+/*****                      Initialization                        *****/

+/**********************************************************************/

+

+static void

+init_pixelmap(struct gl_pixelmap *map)

+{

+   map->Size = 1;

+   map->Map[0] = 0.0;

+   map->Map8[0] = 0;

+}

+

+

+/**

+ * Initialize the context's PIXEL attribute group.

+ */

+void

+_mesa_init_pixel( struct gl_context *ctx )

+{

+   /* Pixel group */

+   ctx->Pixel.RedBias = 0.0;

+   ctx->Pixel.RedScale = 1.0;

+   ctx->Pixel.GreenBias = 0.0;

+   ctx->Pixel.GreenScale = 1.0;

+   ctx->Pixel.BlueBias = 0.0;

+   ctx->Pixel.BlueScale = 1.0;

+   ctx->Pixel.AlphaBias = 0.0;

+   ctx->Pixel.AlphaScale = 1.0;

+   ctx->Pixel.DepthBias = 0.0;

+   ctx->Pixel.DepthScale = 1.0;

+   ctx->Pixel.IndexOffset = 0;

+   ctx->Pixel.IndexShift = 0;

+   ctx->Pixel.ZoomX = 1.0;

+   ctx->Pixel.ZoomY = 1.0;

+   ctx->Pixel.MapColorFlag = GL_FALSE;

+   ctx->Pixel.MapStencilFlag = GL_FALSE;

+   init_pixelmap(&ctx->PixelMaps.StoS);

+   init_pixelmap(&ctx->PixelMaps.ItoI);

+   init_pixelmap(&ctx->PixelMaps.ItoR);

+   init_pixelmap(&ctx->PixelMaps.ItoG);

+   init_pixelmap(&ctx->PixelMaps.ItoB);

+   init_pixelmap(&ctx->PixelMaps.ItoA);

+   init_pixelmap(&ctx->PixelMaps.RtoR);

+   init_pixelmap(&ctx->PixelMaps.GtoG);

+   init_pixelmap(&ctx->PixelMaps.BtoB);

+   init_pixelmap(&ctx->PixelMaps.AtoA);

+

+   if (ctx->Visual.doubleBufferMode) {

+      ctx->Pixel.ReadBuffer = GL_BACK;

+   }

+   else {

+      ctx->Pixel.ReadBuffer = GL_FRONT;

+   }

+

+   /* Miscellaneous */

+   ctx->_ImageTransferState = 0;

+}

diff --git a/mesalib/src/mesa/main/polygon.c b/mesalib/src/mesa/main/polygon.c
index ff4232ecc..3ad375901 100644
--- a/mesalib/src/mesa/main/polygon.c
+++ b/mesalib/src/mesa/main/polygon.c
@@ -1,322 +1,322 @@
-/**
- * \file polygon.c
- * Polygon operations.
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.1
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "image.h"
-#include "enums.h"
-#include "pack.h"
-#include "pbo.h"
-#include "polygon.h"
-#include "mtypes.h"
-
-
-/**
- * Specify whether to cull front- or back-facing facets.
- *
- * \param mode culling mode.
- *
- * \sa glCullFace().
- *
- * Verifies the parameter and updates gl_polygon_attrib::CullFaceMode. On
- * change, flushes the vertices and notifies the driver via
- * the dd_function_table::CullFace callback.
- */
-void GLAPIENTRY
-_mesa_CullFace( GLenum mode )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glCullFace %s\n", _mesa_lookup_enum_by_nr(mode));
-
-   if (mode!=GL_FRONT && mode!=GL_BACK && mode!=GL_FRONT_AND_BACK) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glCullFace" );
-      return;
-   }
-
-   if (ctx->Polygon.CullFaceMode == mode)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_POLYGON);
-   ctx->Polygon.CullFaceMode = mode;
-
-   if (ctx->Driver.CullFace)
-      ctx->Driver.CullFace( ctx, mode );
-}
-
-
-/**
- * Define front- and back-facing 
- *
- * \param mode orientation of front-facing polygons.
- *
- * \sa glFrontFace().
- *
- * Verifies the parameter and updates gl_polygon_attrib::FrontFace. On change
- * flushes the vertices and notifies the driver via
- * the dd_function_table::FrontFace callback.
- */
-void GLAPIENTRY
-_mesa_FrontFace( GLenum mode )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glFrontFace %s\n", _mesa_lookup_enum_by_nr(mode));
-
-   if (mode!=GL_CW && mode!=GL_CCW) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glFrontFace" );
-      return;
-   }
-
-   if (ctx->Polygon.FrontFace == mode)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_POLYGON);
-   ctx->Polygon.FrontFace = mode;
-
-   ctx->Polygon._FrontBit = (GLboolean) (mode == GL_CW);
-
-   if (ctx->Driver.FrontFace)
-      ctx->Driver.FrontFace( ctx, mode );
-}
-
-
-/**
- * Set the polygon rasterization mode.
- *
- * \param face the polygons which \p mode applies to.
- * \param mode how polygons should be rasterized.
- *
- * \sa glPolygonMode(). 
- * 
- * Verifies the parameters and updates gl_polygon_attrib::FrontMode and
- * gl_polygon_attrib::BackMode. On change flushes the vertices and notifies the
- * driver via the dd_function_table::PolygonMode callback.
- */
-void GLAPIENTRY
-_mesa_PolygonMode( GLenum face, GLenum mode )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glPolygonMode %s %s\n",
-                  _mesa_lookup_enum_by_nr(face),
-                  _mesa_lookup_enum_by_nr(mode));
-
-   if (mode!=GL_POINT && mode!=GL_LINE && mode!=GL_FILL) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glPolygonMode(mode)" );
-      return;
-   }
-
-   switch (face) {
-   case GL_FRONT:
-      if (ctx->Polygon.FrontMode == mode)
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_POLYGON);
-      ctx->Polygon.FrontMode = mode;
-      break;
-   case GL_FRONT_AND_BACK:
-      if (ctx->Polygon.FrontMode == mode &&
-	  ctx->Polygon.BackMode == mode)
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_POLYGON);
-      ctx->Polygon.FrontMode = mode;
-      ctx->Polygon.BackMode = mode;
-      break;
-   case GL_BACK:
-      if (ctx->Polygon.BackMode == mode)
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_POLYGON);
-      ctx->Polygon.BackMode = mode;
-      break;
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glPolygonMode(face)" );
-      return;
-   }
-
-   if (ctx->Polygon.FrontMode == GL_FILL && ctx->Polygon.BackMode == GL_FILL)
-      ctx->_TriangleCaps &= ~DD_TRI_UNFILLED;
-   else
-      ctx->_TriangleCaps |= DD_TRI_UNFILLED;
-
-   if (ctx->Driver.PolygonMode)
-      ctx->Driver.PolygonMode(ctx, face, mode);
-}
-
-#if _HAVE_FULL_GL
-
-
-/**
- * This routine updates the ctx->Polygon.Stipple state.
- * If we're getting the stipple data from a PBO, we map the buffer
- * in order to access the data.
- * In any case, we obey the current pixel unpacking parameters when fetching
- * the stipple data.
- *
- * In the future, this routine should be used as a fallback, called via
- * ctx->Driver.PolygonStipple().  We'll have to update all the DRI drivers
- * too.
- */
-void
-_mesa_polygon_stipple(struct gl_context *ctx, const GLubyte *pattern)
-{
-   pattern = _mesa_map_validate_pbo_source(ctx, 2,
-                                           &ctx->Unpack, 32, 32, 1,
-                                           GL_COLOR_INDEX, GL_BITMAP, pattern,
-                                           "glPolygonStipple");
-   if (!pattern)
-      return;
-
-   _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);
-
-   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-}
-
-
-/**
- * Called by glPolygonStipple.
- */
-void GLAPIENTRY
-_mesa_PolygonStipple( const GLubyte *pattern )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glPolygonStipple\n");
-
-   FLUSH_VERTICES(ctx, _NEW_POLYGONSTIPPLE);
-
-   _mesa_polygon_stipple(ctx, pattern);
-
-   if (ctx->Driver.PolygonStipple)
-      ctx->Driver.PolygonStipple(ctx, pattern);
-}
-
-
-/**
- * Called by glPolygonStipple.
- */
-void GLAPIENTRY
-_mesa_GetPolygonStipple( GLubyte *dest )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glGetPolygonStipple\n");
-
-   dest = _mesa_map_validate_pbo_dest(ctx, 2,
-                                      &ctx->Pack, 32, 32, 1,
-                                      GL_COLOR_INDEX, GL_BITMAP, dest,
-                                      "glGetPolygonStipple");
-   if (!dest)
-      return;
-
-   _mesa_pack_polygon_stipple(ctx->PolygonStipple, dest, &ctx->Pack);
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-}
-
-
-void GLAPIENTRY
-_mesa_PolygonOffset( GLfloat factor, GLfloat units )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glPolygonOffset %f %f\n", factor, units);
-
-   if (ctx->Polygon.OffsetFactor == factor &&
-       ctx->Polygon.OffsetUnits == units)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_POLYGON);
-   ctx->Polygon.OffsetFactor = factor;
-   ctx->Polygon.OffsetUnits = units;
-
-   if (ctx->Driver.PolygonOffset)
-      ctx->Driver.PolygonOffset( ctx, factor, units );
-}
-
-
-void GLAPIENTRY
-_mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   /* XXX mult by DepthMaxF here??? */
-   _mesa_PolygonOffset(factor, bias * ctx->DrawBuffer->_DepthMaxF );
-}
-
-#endif
-
-
-/**********************************************************************/
-/** \name Initialization */
-/*@{*/
-
-/**
- * Initialize the context polygon state.
- *
- * \param ctx GL context.
- *
- * Initializes __struct gl_contextRec::Polygon and __struct gl_contextRec::PolygonStipple
- * attribute groups.
- */
-void _mesa_init_polygon( struct gl_context * ctx )
-{
-   /* Polygon group */
-   ctx->Polygon.CullFlag = GL_FALSE;
-   ctx->Polygon.CullFaceMode = GL_BACK;
-   ctx->Polygon.FrontFace = GL_CCW;
-   ctx->Polygon._FrontBit = 0;
-   ctx->Polygon.FrontMode = GL_FILL;
-   ctx->Polygon.BackMode = GL_FILL;
-   ctx->Polygon.SmoothFlag = GL_FALSE;
-   ctx->Polygon.StippleFlag = GL_FALSE;
-   ctx->Polygon.OffsetFactor = 0.0F;
-   ctx->Polygon.OffsetUnits = 0.0F;
-   ctx->Polygon.OffsetPoint = GL_FALSE;
-   ctx->Polygon.OffsetLine = GL_FALSE;
-   ctx->Polygon.OffsetFill = GL_FALSE;
-
-
-   /* Polygon Stipple group */
-   memset( ctx->PolygonStipple, 0xff, 32*sizeof(GLuint) );
-}
-
-/*@}*/
+/**

+ * \file polygon.c

+ * Polygon operations.

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.1

+ *

+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "context.h"

+#include "image.h"

+#include "enums.h"

+#include "pack.h"

+#include "pbo.h"

+#include "polygon.h"

+#include "mtypes.h"

+

+

+/**

+ * Specify whether to cull front- or back-facing facets.

+ *

+ * \param mode culling mode.

+ *

+ * \sa glCullFace().

+ *

+ * Verifies the parameter and updates gl_polygon_attrib::CullFaceMode. On

+ * change, flushes the vertices and notifies the driver via

+ * the dd_function_table::CullFace callback.

+ */

+void GLAPIENTRY

+_mesa_CullFace( GLenum mode )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE&VERBOSE_API)

+      _mesa_debug(ctx, "glCullFace %s\n", _mesa_lookup_enum_by_nr(mode));

+

+   if (mode!=GL_FRONT && mode!=GL_BACK && mode!=GL_FRONT_AND_BACK) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glCullFace" );

+      return;

+   }

+

+   if (ctx->Polygon.CullFaceMode == mode)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_POLYGON);

+   ctx->Polygon.CullFaceMode = mode;

+

+   if (ctx->Driver.CullFace)

+      ctx->Driver.CullFace( ctx, mode );

+}

+

+

+/**

+ * Define front- and back-facing 

+ *

+ * \param mode orientation of front-facing polygons.

+ *

+ * \sa glFrontFace().

+ *

+ * Verifies the parameter and updates gl_polygon_attrib::FrontFace. On change

+ * flushes the vertices and notifies the driver via

+ * the dd_function_table::FrontFace callback.

+ */

+void GLAPIENTRY

+_mesa_FrontFace( GLenum mode )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE&VERBOSE_API)

+      _mesa_debug(ctx, "glFrontFace %s\n", _mesa_lookup_enum_by_nr(mode));

+

+   if (mode!=GL_CW && mode!=GL_CCW) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glFrontFace" );

+      return;

+   }

+

+   if (ctx->Polygon.FrontFace == mode)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_POLYGON);

+   ctx->Polygon.FrontFace = mode;

+

+   ctx->Polygon._FrontBit = (GLboolean) (mode == GL_CW);

+

+   if (ctx->Driver.FrontFace)

+      ctx->Driver.FrontFace( ctx, mode );

+}

+

+

+/**

+ * Set the polygon rasterization mode.

+ *

+ * \param face the polygons which \p mode applies to.

+ * \param mode how polygons should be rasterized.

+ *

+ * \sa glPolygonMode(). 

+ * 

+ * Verifies the parameters and updates gl_polygon_attrib::FrontMode and

+ * gl_polygon_attrib::BackMode. On change flushes the vertices and notifies the

+ * driver via the dd_function_table::PolygonMode callback.

+ */

+void GLAPIENTRY

+_mesa_PolygonMode( GLenum face, GLenum mode )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE&VERBOSE_API)

+      _mesa_debug(ctx, "glPolygonMode %s %s\n",

+                  _mesa_lookup_enum_by_nr(face),

+                  _mesa_lookup_enum_by_nr(mode));

+

+   if (mode!=GL_POINT && mode!=GL_LINE && mode!=GL_FILL) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glPolygonMode(mode)" );

+      return;

+   }

+

+   switch (face) {

+   case GL_FRONT:

+      if (ctx->Polygon.FrontMode == mode)

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_POLYGON);

+      ctx->Polygon.FrontMode = mode;

+      break;

+   case GL_FRONT_AND_BACK:

+      if (ctx->Polygon.FrontMode == mode &&

+	  ctx->Polygon.BackMode == mode)

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_POLYGON);

+      ctx->Polygon.FrontMode = mode;

+      ctx->Polygon.BackMode = mode;

+      break;

+   case GL_BACK:

+      if (ctx->Polygon.BackMode == mode)

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_POLYGON);

+      ctx->Polygon.BackMode = mode;

+      break;

+   default:

+      _mesa_error( ctx, GL_INVALID_ENUM, "glPolygonMode(face)" );

+      return;

+   }

+

+   if (ctx->Polygon.FrontMode == GL_FILL && ctx->Polygon.BackMode == GL_FILL)

+      ctx->_TriangleCaps &= ~DD_TRI_UNFILLED;

+   else

+      ctx->_TriangleCaps |= DD_TRI_UNFILLED;

+

+   if (ctx->Driver.PolygonMode)

+      ctx->Driver.PolygonMode(ctx, face, mode);

+}

+

+#if _HAVE_FULL_GL

+

+

+/**

+ * This routine updates the ctx->Polygon.Stipple state.

+ * If we're getting the stipple data from a PBO, we map the buffer

+ * in order to access the data.

+ * In any case, we obey the current pixel unpacking parameters when fetching

+ * the stipple data.

+ *

+ * In the future, this routine should be used as a fallback, called via

+ * ctx->Driver.PolygonStipple().  We'll have to update all the DRI drivers

+ * too.

+ */

+void

+_mesa_polygon_stipple(struct gl_context *ctx, const GLubyte *pattern)

+{

+   pattern = _mesa_map_validate_pbo_source(ctx, 2,

+                                           &ctx->Unpack, 32, 32, 1,

+                                           GL_COLOR_INDEX, GL_BITMAP, pattern,

+                                           "glPolygonStipple");

+   if (!pattern)

+      return;

+

+   _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);

+

+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);

+}

+

+

+/**

+ * Called by glPolygonStipple.

+ */

+void GLAPIENTRY

+_mesa_PolygonStipple( const GLubyte *pattern )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE&VERBOSE_API)

+      _mesa_debug(ctx, "glPolygonStipple\n");

+

+   FLUSH_VERTICES(ctx, _NEW_POLYGONSTIPPLE);

+

+   _mesa_polygon_stipple(ctx, pattern);

+

+   if (ctx->Driver.PolygonStipple)

+      ctx->Driver.PolygonStipple(ctx, pattern);

+}

+

+

+/**

+ * Called by glPolygonStipple.

+ */

+void GLAPIENTRY

+_mesa_GetPolygonStipple( GLubyte *dest )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE&VERBOSE_API)

+      _mesa_debug(ctx, "glGetPolygonStipple\n");

+

+   dest = _mesa_map_validate_pbo_dest(ctx, 2,

+                                      &ctx->Pack, 32, 32, 1,

+                                      GL_COLOR_INDEX, GL_BITMAP, dest,

+                                      "glGetPolygonStipple");

+   if (!dest)

+      return;

+

+   _mesa_pack_polygon_stipple(ctx->PolygonStipple, dest, &ctx->Pack);

+

+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);

+}

+

+

+void GLAPIENTRY

+_mesa_PolygonOffset( GLfloat factor, GLfloat units )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE&VERBOSE_API)

+      _mesa_debug(ctx, "glPolygonOffset %f %f\n", factor, units);

+

+   if (ctx->Polygon.OffsetFactor == factor &&

+       ctx->Polygon.OffsetUnits == units)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_POLYGON);

+   ctx->Polygon.OffsetFactor = factor;

+   ctx->Polygon.OffsetUnits = units;

+

+   if (ctx->Driver.PolygonOffset)

+      ctx->Driver.PolygonOffset( ctx, factor, units );

+}

+

+

+void GLAPIENTRY

+_mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   /* XXX mult by DepthMaxF here??? */

+   _mesa_PolygonOffset(factor, bias * ctx->DrawBuffer->_DepthMaxF );

+}

+

+#endif

+

+

+/**********************************************************************/

+/** \name Initialization */

+/*@{*/

+

+/**

+ * Initialize the context polygon state.

+ *

+ * \param ctx GL context.

+ *

+ * Initializes __struct gl_contextRec::Polygon and __struct gl_contextRec::PolygonStipple

+ * attribute groups.

+ */

+void _mesa_init_polygon( struct gl_context * ctx )

+{

+   /* Polygon group */

+   ctx->Polygon.CullFlag = GL_FALSE;

+   ctx->Polygon.CullFaceMode = GL_BACK;

+   ctx->Polygon.FrontFace = GL_CCW;

+   ctx->Polygon._FrontBit = 0;

+   ctx->Polygon.FrontMode = GL_FILL;

+   ctx->Polygon.BackMode = GL_FILL;

+   ctx->Polygon.SmoothFlag = GL_FALSE;

+   ctx->Polygon.StippleFlag = GL_FALSE;

+   ctx->Polygon.OffsetFactor = 0.0F;

+   ctx->Polygon.OffsetUnits = 0.0F;

+   ctx->Polygon.OffsetPoint = GL_FALSE;

+   ctx->Polygon.OffsetLine = GL_FALSE;

+   ctx->Polygon.OffsetFill = GL_FALSE;

+

+

+   /* Polygon Stipple group */

+   memset( ctx->PolygonStipple, 0xff, 32*sizeof(GLuint) );

+}

+

+/*@}*/

diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index 25ec31fd4..c3c1aa170 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -44,7 +44,7 @@
  * \param id - the new object's ID

  * \return pointer to new query_object object or NULL if out of memory.

  */

-static struct gl_query_object *

+struct gl_query_object *

 _mesa_new_query_object(struct gl_context *ctx, GLuint id)

 {

    struct gl_query_object *q = MALLOC_STRUCT(gl_query_object);

@@ -63,7 +63,7 @@ _mesa_new_query_object(struct gl_context *ctx, GLuint id)
  * Begin a query.  Software driver fallback.

  * Called via ctx->Driver.BeginQuery().

  */

-static void

+void

 _mesa_begin_query(struct gl_context *ctx, struct gl_query_object *q)

 {

    /* no-op */

@@ -74,7 +74,7 @@ _mesa_begin_query(struct gl_context *ctx, struct gl_query_object *q)
  * End a query.  Software driver fallback.

  * Called via ctx->Driver.EndQuery().

  */

-static void

+void

 _mesa_end_query(struct gl_context *ctx, struct gl_query_object *q)

 {

    q->Ready = GL_TRUE;

@@ -85,7 +85,7 @@ _mesa_end_query(struct gl_context *ctx, struct gl_query_object *q)
  * Wait for query to complete.  Software driver fallback.

  * Called via ctx->Driver.WaitQuery().

  */

-static void

+void

 _mesa_wait_query(struct gl_context *ctx, struct gl_query_object *q)

 {

    /* For software drivers, _mesa_end_query() should have completed the query.

@@ -113,7 +113,7 @@ _mesa_check_query(struct gl_context *ctx, struct gl_query_object *q)
  * Delete a query object.  Called via ctx->Driver.DeleteQuery().

  * Not removed from hash table here.

  */

-static void

+void

 _mesa_delete_query(struct gl_context *ctx, struct gl_query_object *q)

 {

    free(q);

diff --git a/mesalib/src/mesa/main/renderbuffer.c b/mesalib/src/mesa/main/renderbuffer.c
index e6d5fe4bf..56e608201 100644
--- a/mesalib/src/mesa/main/renderbuffer.c
+++ b/mesalib/src/mesa/main/renderbuffer.c
@@ -1,2023 +1,2023 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * Functions for allocating/managing renderbuffers.
- * Also, routines for reading/writing software-based renderbuffer data as
- * ubytes, ushorts, uints, etc.
- *
- * The 'alpha8' renderbuffer is interesting.  It's used to add a software-based
- * alpha channel to RGB renderbuffers.  This is done by wrapping the RGB
- * renderbuffer with the alpha renderbuffer.  We can do this because of the
- * OO-nature of renderbuffers.
- *
- * Down the road we'll use this for run-time support of 8, 16 and 32-bit
- * color channels.  For example, Mesa may use 32-bit/float color channels
- * internally (swrast) and use wrapper renderbuffers to convert 32-bit
- * values down to 16 or 8-bit values for whatever kind of framebuffer we have.
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "fbobject.h"
-#include "formats.h"
-#include "mtypes.h"
-#include "renderbuffer.h"
-
-
-/*
- * Routines for get/put values in common buffer formats follow.
- * Someday add support for arbitrary row stride to make them more
- * flexible.
- */
-
-/**********************************************************************
- * Functions for buffers of 1 X GLubyte values.
- * Typically stencil.
- */
-
-static void *
-get_pointer_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                  GLint x, GLint y)
-{
-   if (!rb->Data)
-      return NULL;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   /* Can't assert rb->Format since these funcs may be used for serveral
-    * different formats (GL_ALPHA8, GL_STENCIL_INDEX8, etc).
-    */
-   return (GLubyte *) rb->Data + y * rb->Width + x;
-}
-
-
-static void
-get_row_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-              GLint x, GLint y, void *values)
-{
-   const GLubyte *src = (const GLubyte *) rb->Data + y * rb->Width + x;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   memcpy(values, src, count * sizeof(GLubyte));
-}
-
-
-static void
-get_values_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                 const GLint x[], const GLint y[], void *values)
-{
-   GLubyte *dst = (GLubyte *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < count; i++) {
-      const GLubyte *src = (GLubyte *) rb->Data + y[i] * rb->Width + x[i];
-      dst[i] = *src;
-   }
-}
-
-
-static void
-put_row_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-              GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   const GLubyte *src = (const GLubyte *) values;
-   GLubyte *dst = (GLubyte *) rb->Data + y * rb->Width + x;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   if (mask) {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            dst[i] = src[i];
-         }
-      }
-   }
-   else {
-      memcpy(dst, values, count * sizeof(GLubyte));
-   }
-}
-
-
-static void
-put_mono_row_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   const GLubyte val = *((const GLubyte *) value);
-   GLubyte *dst = (GLubyte *) rb->Data + y * rb->Width + x;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   if (mask) {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            dst[i] = val;
-         }
-      }
-   }
-   else {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         dst[i] = val;
-      }
-   }
-}
-
-
-static void
-put_values_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                 const GLint x[], const GLint y[],
-                 const void *values, const GLubyte *mask)
-{
-   const GLubyte *src = (const GLubyte *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLubyte *dst = (GLubyte *) rb->Data + y[i] * rb->Width + x[i];
-         *dst = src[i];
-      }
-   }
-}
-
-
-static void
-put_mono_values_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                      const GLint x[], const GLint y[],
-                      const void *value, const GLubyte *mask)
-{
-   const GLubyte val = *((const GLubyte *) value);
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLubyte *dst = (GLubyte *) rb->Data + y[i] * rb->Width + x[i];
-         *dst = val;
-      }
-   }
-}
-
-
-/**********************************************************************
- * Functions for buffers of 1 X GLushort values.
- * Typically depth/Z.
- */
-
-static void *
-get_pointer_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                   GLint x, GLint y)
-{
-   if (!rb->Data)
-      return NULL;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   ASSERT(rb->Width > 0);
-   return (GLushort *) rb->Data + y * rb->Width + x;
-}
-
-
-static void
-get_row_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-               GLint x, GLint y, void *values)
-{
-   const void *src = rb->GetPointer(ctx, rb, x, y);
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   memcpy(values, src, count * sizeof(GLushort));
-}
-
-
-static void
-get_values_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  const GLint x[], const GLint y[], void *values)
-{
-   GLushort *dst = (GLushort *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   for (i = 0; i < count; i++) {
-      const GLushort *src = (GLushort *) rb->Data + y[i] * rb->Width + x[i];
-      dst[i] = *src;
-   }
-}
-
-
-static void
-put_row_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-               GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   const GLushort *src = (const GLushort *) values;
-   GLushort *dst = (GLushort *) rb->Data + y * rb->Width + x;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   if (mask) {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            dst[i] = src[i];
-         }
-      }
-   }
-   else {
-      memcpy(dst, src, count * sizeof(GLushort));
-   }
-}
-
-
-static void
-put_mono_row_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                    GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   const GLushort val = *((const GLushort *) value);
-   GLushort *dst = (GLushort *) rb->Data + y * rb->Width + x;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   if (mask) {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            dst[i] = val;
-         }
-      }
-   }
-   else {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         dst[i] = val;
-      }
-   }
-}
-
-
-static void
-put_values_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  const GLint x[], const GLint y[], const void *values,
-                  const GLubyte *mask)
-{
-   const GLushort *src = (const GLushort *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLushort *dst = (GLushort *) rb->Data + y[i] * rb->Width + x[i];
-         *dst = src[i];
-      }
-   }
-}
- 
-
-static void
-put_mono_values_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                       GLuint count, const GLint x[], const GLint y[],
-                       const void *value, const GLubyte *mask)
-{
-   const GLushort val = *((const GLushort *) value);
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   if (mask) {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            GLushort *dst = (GLushort *) rb->Data + y[i] * rb->Width + x[i];
-            *dst = val;
-         }
-      }
-   }
-   else {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         GLushort *dst = (GLushort *) rb->Data + y[i] * rb->Width + x[i];
-         *dst = val;
-      }
-   }
-}
- 
-
-/**********************************************************************
- * Functions for buffers of 1 X GLuint values.
- * Typically depth/Z or color index.
- */
-
-static void *
-get_pointer_uint(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                 GLint x, GLint y)
-{
-   if (!rb->Data)
-      return NULL;
-   ASSERT(rb->DataType == GL_UNSIGNED_INT ||
-          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   return (GLuint *) rb->Data + y * rb->Width + x;
-}
-
-
-static void
-get_row_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-             GLint x, GLint y, void *values)
-{
-   const void *src = rb->GetPointer(ctx, rb, x, y);
-   ASSERT(rb->DataType == GL_UNSIGNED_INT ||
-          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   memcpy(values, src, count * sizeof(GLuint));
-}
-
-
-static void
-get_values_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                const GLint x[], const GLint y[], void *values)
-{
-   GLuint *dst = (GLuint *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_INT ||
-          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   for (i = 0; i < count; i++) {
-      const GLuint *src = (GLuint *) rb->Data + y[i] * rb->Width + x[i];
-      dst[i] = *src;
-   }
-}
-
-
-static void
-put_row_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-             GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   const GLuint *src = (const GLuint *) values;
-   GLuint *dst = (GLuint *) rb->Data + y * rb->Width + x;
-   ASSERT(rb->DataType == GL_UNSIGNED_INT ||
-          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   if (mask) {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            dst[i] = src[i];
-         }
-      }
-   }
-   else {
-      memcpy(dst, src, count * sizeof(GLuint));
-   }
-}
-
-
-static void
-put_mono_row_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   const GLuint val = *((const GLuint *) value);
-   GLuint *dst = (GLuint *) rb->Data + y * rb->Width + x;
-   ASSERT(rb->DataType == GL_UNSIGNED_INT ||
-          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   if (mask) {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            dst[i] = val;
-         }
-      }
-   }
-   else {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         dst[i] = val;
-      }
-   }
-}
-
-
-static void
-put_values_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                const GLint x[], const GLint y[], const void *values,
-                const GLubyte *mask)
-{
-   const GLuint *src = (const GLuint *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_INT ||
-          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLuint *dst = (GLuint *) rb->Data + y[i] * rb->Width + x[i];
-         *dst = src[i];
-      }
-   }
-}
-
-
-static void
-put_mono_values_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                     const GLint x[], const GLint y[], const void *value,
-                     const GLubyte *mask)
-{
-   const GLuint val = *((const GLuint *) value);
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_INT ||
-          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLuint *dst = (GLuint *) rb->Data + y[i] * rb->Width + x[i];
-         *dst = val;
-      }
-   }
-}
-
-
-/**********************************************************************
- * Functions for buffers of 3 X GLubyte (or GLbyte) values.
- * Typically color buffers.
- * NOTE: the incoming and outgoing colors are RGBA!  We ignore incoming
- * alpha values and return 255 for outgoing alpha values.
- */
-
-static void *
-get_pointer_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                   GLint x, GLint y)
-{
-   ASSERT(rb->Format == MESA_FORMAT_RGB888);
-   /* No direct access since this buffer is RGB but caller will be
-    * treating it as if it were RGBA.
-    */
-   return NULL;
-}
-
-
-static void
-get_row_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-               GLint x, GLint y, void *values)
-{
-   const GLubyte *src = (const GLubyte *) rb->Data + 3 * (y * rb->Width + x);
-   GLubyte *dst = (GLubyte *) values;
-   GLuint i;
-   ASSERT(rb->Format == MESA_FORMAT_RGB888);
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < count; i++) {
-      dst[i * 4 + 0] = src[i * 3 + 0];
-      dst[i * 4 + 1] = src[i * 3 + 1];
-      dst[i * 4 + 2] = src[i * 3 + 2];
-      dst[i * 4 + 3] = 255;
-   }
-}
-
-
-static void
-get_values_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  const GLint x[], const GLint y[], void *values)
-{
-   GLubyte *dst = (GLubyte *) values;
-   GLuint i;
-   ASSERT(rb->Format == MESA_FORMAT_RGB888);
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < count; i++) {
-      const GLubyte *src
-         = (GLubyte *) rb->Data + 3 * (y[i] * rb->Width + x[i]);
-      dst[i * 4 + 0] = src[0];
-      dst[i * 4 + 1] = src[1];
-      dst[i * 4 + 2] = src[2];
-      dst[i * 4 + 3] = 255;
-   }
-}
-
-
-static void
-put_row_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-               GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   /* note: incoming values are RGB+A! */
-   const GLubyte *src = (const GLubyte *) values;
-   GLubyte *dst = (GLubyte *) rb->Data + 3 * (y * rb->Width + x);
-   GLuint i;
-   ASSERT(rb->Format == MESA_FORMAT_RGB888);
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         dst[i * 3 + 0] = src[i * 4 + 0];
-         dst[i * 3 + 1] = src[i * 4 + 1];
-         dst[i * 3 + 2] = src[i * 4 + 2];
-      }
-   }
-}
-
-
-static void
-put_row_rgb_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   /* note: incoming values are RGB+A! */
-   const GLubyte *src = (const GLubyte *) values;
-   GLubyte *dst = (GLubyte *) rb->Data + 3 * (y * rb->Width + x);
-   GLuint i;
-   ASSERT(rb->Format == MESA_FORMAT_RGB888);
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         dst[i * 3 + 0] = src[i * 3 + 0];
-         dst[i * 3 + 1] = src[i * 3 + 1];
-         dst[i * 3 + 2] = src[i * 3 + 2];
-      }
-   }
-}
-
-
-static void
-put_mono_row_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                    GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   /* note: incoming value is RGB+A! */
-   const GLubyte val0 = ((const GLubyte *) value)[0];
-   const GLubyte val1 = ((const GLubyte *) value)[1];
-   const GLubyte val2 = ((const GLubyte *) value)[2];
-   GLubyte *dst = (GLubyte *) rb->Data + 3 * (y * rb->Width + x);
-   ASSERT(rb->Format == MESA_FORMAT_RGB888);
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   if (!mask && val0 == val1 && val1 == val2) {
-      /* optimized case */
-      memset(dst, val0, 3 * count);
-   }
-   else {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            dst[i * 3 + 0] = val0;
-            dst[i * 3 + 1] = val1;
-            dst[i * 3 + 2] = val2;
-         }
-      }
-   }
-}
-
-
-static void
-put_values_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  const GLint x[], const GLint y[], const void *values,
-                  const GLubyte *mask)
-{
-   /* note: incoming values are RGB+A! */
-   const GLubyte *src = (const GLubyte *) values;
-   GLuint i;
-   ASSERT(rb->Format == MESA_FORMAT_RGB888);
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLubyte *dst = (GLubyte *) rb->Data + 3 * (y[i] * rb->Width + x[i]);
-         dst[0] = src[i * 4 + 0];
-         dst[1] = src[i * 4 + 1];
-         dst[2] = src[i * 4 + 2];
-      }
-   }
-}
-
-
-static void
-put_mono_values_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                       GLuint count, const GLint x[], const GLint y[],
-                       const void *value, const GLubyte *mask)
-{
-   /* note: incoming value is RGB+A! */
-   const GLubyte val0 = ((const GLubyte *) value)[0];
-   const GLubyte val1 = ((const GLubyte *) value)[1];
-   const GLubyte val2 = ((const GLubyte *) value)[2];
-   GLuint i;
-   ASSERT(rb->Format == MESA_FORMAT_RGB888);
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLubyte *dst = (GLubyte *) rb->Data + 3 * (y[i] * rb->Width + x[i]);
-         dst[0] = val0;
-         dst[1] = val1;
-         dst[2] = val2;
-      }
-   }
-}
-
-
-/**********************************************************************
- * Functions for buffers of 4 X GLubyte (or GLbyte) values.
- * Typically color buffers.
- */
-
-static void *
-get_pointer_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                   GLint x, GLint y)
-{
-   if (!rb->Data)
-      return NULL;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);
-   return (GLubyte *) rb->Data + 4 * (y * rb->Width + x);
-}
-
-
-static void
-get_row_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-               GLint x, GLint y, void *values)
-{
-   const GLubyte *src = (const GLubyte *) rb->Data + 4 * (y * rb->Width + x);
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);
-   memcpy(values, src, 4 * count * sizeof(GLubyte));
-}
-
-
-static void
-get_values_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  const GLint x[], const GLint y[], void *values)
-{
-   /* treat 4*GLubyte as 1*GLuint */
-   GLuint *dst = (GLuint *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);
-   for (i = 0; i < count; i++) {
-      const GLuint *src = (GLuint *) rb->Data + (y[i] * rb->Width + x[i]);
-      dst[i] = *src;
-   }
-}
-
-
-static void
-put_row_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-               GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   /* treat 4*GLubyte as 1*GLuint */
-   const GLuint *src = (const GLuint *) values;
-   GLuint *dst = (GLuint *) rb->Data + (y * rb->Width + x);
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);
-   if (mask) {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            dst[i] = src[i];
-         }
-      }
-   }
-   else {
-      memcpy(dst, src, 4 * count * sizeof(GLubyte));
-   }
-}
-
-
-static void
-put_row_rgb_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   /* Store RGB values in RGBA buffer */
-   const GLubyte *src = (const GLubyte *) values;
-   GLubyte *dst = (GLubyte *) rb->Data + 4 * (y * rb->Width + x);
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         dst[i * 4 + 0] = src[i * 3 + 0];
-         dst[i * 4 + 1] = src[i * 3 + 1];
-         dst[i * 4 + 2] = src[i * 3 + 2];
-         dst[i * 4 + 3] = 0xff;
-      }
-   }
-}
-
-
-static void
-put_mono_row_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                    GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   /* treat 4*GLubyte as 1*GLuint */
-   const GLuint val = *((const GLuint *) value);
-   GLuint *dst = (GLuint *) rb->Data + (y * rb->Width + x);
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);
-   if (!mask && val == 0) {
-      /* common case */
-      memset(dst, 0, count * 4 * sizeof(GLubyte));
-   }
-   else {
-      /* general case */
-      if (mask) {
-         GLuint i;
-         for (i = 0; i < count; i++) {
-            if (mask[i]) {
-               dst[i] = val;
-            }
-         }
-      }
-      else {
-         GLuint i;
-         for (i = 0; i < count; i++) {
-            dst[i] = val;
-         }
-      }
-   }
-}
-
-
-static void
-put_values_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  const GLint x[], const GLint y[], const void *values,
-                  const GLubyte *mask)
-{
-   /* treat 4*GLubyte as 1*GLuint */
-   const GLuint *src = (const GLuint *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLuint *dst = (GLuint *) rb->Data + (y[i] * rb->Width + x[i]);
-         *dst = src[i];
-      }
-   }
-}
-
-
-static void
-put_mono_values_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                       GLuint count, const GLint x[], const GLint y[],
-                       const void *value, const GLubyte *mask)
-{
-   /* treat 4*GLubyte as 1*GLuint */
-   const GLuint val = *((const GLuint *) value);
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLuint *dst = (GLuint *) rb->Data + (y[i] * rb->Width + x[i]);
-         *dst = val;
-      }
-   }
-}
-
-
-/**********************************************************************
- * Functions for buffers of 4 X GLushort (or GLshort) values.
- * Typically accum buffer.
- */
-
-static void *
-get_pointer_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                    GLint x, GLint y)
-{
-   if (!rb->Data)
-      return NULL;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);
-   return (GLushort *) rb->Data + 4 * (y * rb->Width + x);
-}
-
-
-static void
-get_row_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                GLint x, GLint y, void *values)
-{
-   const GLshort *src = (const GLshort *) rb->Data + 4 * (y * rb->Width + x);
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);
-   memcpy(values, src, 4 * count * sizeof(GLshort));
-}
-
-
-static void
-get_values_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   const GLint x[], const GLint y[], void *values)
-{
-   GLushort *dst = (GLushort *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);
-   for (i = 0; i < count; i++) {
-      const GLushort *src
-         = (GLushort *) rb->Data + 4 * (y[i] * rb->Width + x[i]);
-      dst[i] = *src;
-   }
-}
-
-
-static void
-put_row_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   const GLushort *src = (const GLushort *) values;
-   GLushort *dst = (GLushort *) rb->Data + 4 * (y * rb->Width + x);
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);
-   if (mask) {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            dst[i * 4 + 0] = src[i * 4 + 0];
-            dst[i * 4 + 1] = src[i * 4 + 1];
-            dst[i * 4 + 2] = src[i * 4 + 2];
-            dst[i * 4 + 3] = src[i * 4 + 3];
-         }
-      }
-   }
-   else {
-      memcpy(dst, src, 4 * count * sizeof(GLushort));
-   }
-}
-
-
-static void
-put_row_rgb_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                    GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   /* Put RGB values in RGBA buffer */
-   const GLushort *src = (const GLushort *) values;
-   GLushort *dst = (GLushort *) rb->Data + 4 * (y * rb->Width + x);
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);
-   if (mask) {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            dst[i * 4 + 0] = src[i * 3 + 0];
-            dst[i * 4 + 1] = src[i * 3 + 1];
-            dst[i * 4 + 2] = src[i * 3 + 2];
-            dst[i * 4 + 3] = 0xffff;
-         }
-      }
-   }
-   else {
-      memcpy(dst, src, 4 * count * sizeof(GLushort));
-   }
-}
-
-
-static void
-put_mono_row_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                     GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   const GLushort val0 = ((const GLushort *) value)[0];
-   const GLushort val1 = ((const GLushort *) value)[1];
-   const GLushort val2 = ((const GLushort *) value)[2];
-   const GLushort val3 = ((const GLushort *) value)[3];
-   GLushort *dst = (GLushort *) rb->Data + 4 * (y * rb->Width + x);
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);
-   if (!mask && val0 == 0 && val1 == 0 && val2 == 0 && val3 == 0) {
-      /* common case for clearing accum buffer */
-      memset(dst, 0, count * 4 * sizeof(GLushort));
-   }
-   else {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            dst[i * 4 + 0] = val0;
-            dst[i * 4 + 1] = val1;
-            dst[i * 4 + 2] = val2;
-            dst[i * 4 + 3] = val3;
-         }
-      }
-   }
-}
-
-
-static void
-put_values_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   const GLint x[], const GLint y[], const void *values,
-                   const GLubyte *mask)
-{
-   const GLushort *src = (const GLushort *) values;
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLushort *dst = (GLushort *) rb->Data + 4 * (y[i] * rb->Width + x[i]);
-         dst[0] = src[i * 4 + 0];
-         dst[1] = src[i * 4 + 1];
-         dst[2] = src[i * 4 + 2];
-         dst[3] = src[i * 4 + 3];
-      }
-   }
-}
-
-
-static void
-put_mono_values_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                        GLuint count, const GLint x[], const GLint y[],
-                        const void *value, const GLubyte *mask)
-{
-   const GLushort val0 = ((const GLushort *) value)[0];
-   const GLushort val1 = ((const GLushort *) value)[1];
-   const GLushort val2 = ((const GLushort *) value)[2];
-   const GLushort val3 = ((const GLushort *) value)[3];
-   GLuint i;
-   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLushort *dst = (GLushort *) rb->Data + 4 * (y[i] * rb->Width + x[i]);
-         dst[0] = val0;
-         dst[1] = val1;
-         dst[2] = val2;
-         dst[3] = val3;
-      }
-   }
-}
-
-
-
-/**
- * This is a software fallback for the gl_renderbuffer->AllocStorage
- * function.
- * Device drivers will typically override this function for the buffers
- * which it manages (typically color buffers, Z and stencil).
- * Other buffers (like software accumulation and aux buffers) which the driver
- * doesn't manage can be handled with this function.
- *
- * This one multi-purpose function can allocate stencil, depth, accum, color
- * or color-index buffers!
- *
- * This function also plugs in the appropriate GetPointer, Get/PutRow and
- * Get/PutValues functions.
- */
-GLboolean
-_mesa_soft_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                                GLenum internalFormat,
-                                GLuint width, GLuint height)
-{
-   GLuint pixelSize;
-
-   switch (internalFormat) {
-   case GL_RGB:
-   case GL_R3_G3_B2:
-   case GL_RGB4:
-   case GL_RGB5:
-   case GL_RGB8:
-   case GL_RGB10:
-   case GL_RGB12:
-   case GL_RGB16:
-      rb->Format = MESA_FORMAT_RGB888;
-      rb->DataType = GL_UNSIGNED_BYTE;
-      rb->GetPointer = get_pointer_ubyte3;
-      rb->GetRow = get_row_ubyte3;
-      rb->GetValues = get_values_ubyte3;
-      rb->PutRow = put_row_ubyte3;
-      rb->PutRowRGB = put_row_rgb_ubyte3;
-      rb->PutMonoRow = put_mono_row_ubyte3;
-      rb->PutValues = put_values_ubyte3;
-      rb->PutMonoValues = put_mono_values_ubyte3;
-      pixelSize = 3 * sizeof(GLubyte);
-      break;
-   case GL_RGBA:
-   case GL_RGBA2:
-   case GL_RGBA4:
-   case GL_RGB5_A1:
-   case GL_RGBA8:
-#if 1
-   case GL_RGB10_A2:
-   case GL_RGBA12:
-#endif
-      rb->Format = MESA_FORMAT_RGBA8888;
-      rb->DataType = GL_UNSIGNED_BYTE;
-      rb->GetPointer = get_pointer_ubyte4;
-      rb->GetRow = get_row_ubyte4;
-      rb->GetValues = get_values_ubyte4;
-      rb->PutRow = put_row_ubyte4;
-      rb->PutRowRGB = put_row_rgb_ubyte4;
-      rb->PutMonoRow = put_mono_row_ubyte4;
-      rb->PutValues = put_values_ubyte4;
-      rb->PutMonoValues = put_mono_values_ubyte4;
-      pixelSize = 4 * sizeof(GLubyte);
-      break;
-   case GL_RGBA16:
-   case GL_RGBA16_SNORM:
-      /* for accum buffer */
-      rb->Format = MESA_FORMAT_SIGNED_RGBA_16;
-      rb->DataType = GL_SHORT;
-      rb->GetPointer = get_pointer_ushort4;
-      rb->GetRow = get_row_ushort4;
-      rb->GetValues = get_values_ushort4;
-      rb->PutRow = put_row_ushort4;
-      rb->PutRowRGB = put_row_rgb_ushort4;
-      rb->PutMonoRow = put_mono_row_ushort4;
-      rb->PutValues = put_values_ushort4;
-      rb->PutMonoValues = put_mono_values_ushort4;
-      pixelSize = 4 * sizeof(GLushort);
-      break;
-#if 0
-   case GL_ALPHA8:
-      rb->Format = MESA_FORMAT_A8;
-      rb->DataType = GL_UNSIGNED_BYTE;
-      rb->GetPointer = get_pointer_alpha8;
-      rb->GetRow = get_row_alpha8;
-      rb->GetValues = get_values_alpha8;
-      rb->PutRow = put_row_alpha8;
-      rb->PutRowRGB = NULL;
-      rb->PutMonoRow = put_mono_row_alpha8;
-      rb->PutValues = put_values_alpha8;
-      rb->PutMonoValues = put_mono_values_alpha8;
-      pixelSize = sizeof(GLubyte);
-      break;
-#endif
-   case GL_STENCIL_INDEX:
-   case GL_STENCIL_INDEX1_EXT:
-   case GL_STENCIL_INDEX4_EXT:
-   case GL_STENCIL_INDEX8_EXT:
-   case GL_STENCIL_INDEX16_EXT:
-      rb->Format = MESA_FORMAT_S8;
-      rb->DataType = GL_UNSIGNED_BYTE;
-      rb->GetPointer = get_pointer_ubyte;
-      rb->GetRow = get_row_ubyte;
-      rb->GetValues = get_values_ubyte;
-      rb->PutRow = put_row_ubyte;
-      rb->PutRowRGB = NULL;
-      rb->PutMonoRow = put_mono_row_ubyte;
-      rb->PutValues = put_values_ubyte;
-      rb->PutMonoValues = put_mono_values_ubyte;
-      pixelSize = sizeof(GLubyte);
-      break;
-   case GL_DEPTH_COMPONENT:
-   case GL_DEPTH_COMPONENT16:
-      rb->Format = MESA_FORMAT_Z16;
-      rb->DataType = GL_UNSIGNED_SHORT;
-      rb->GetPointer = get_pointer_ushort;
-      rb->GetRow = get_row_ushort;
-      rb->GetValues = get_values_ushort;
-      rb->PutRow = put_row_ushort;
-      rb->PutRowRGB = NULL;
-      rb->PutMonoRow = put_mono_row_ushort;
-      rb->PutValues = put_values_ushort;
-      rb->PutMonoValues = put_mono_values_ushort;
-      pixelSize = sizeof(GLushort);
-      break;
-   case GL_DEPTH_COMPONENT24:
-      rb->DataType = GL_UNSIGNED_INT;
-      rb->GetPointer = get_pointer_uint;
-      rb->GetRow = get_row_uint;
-      rb->GetValues = get_values_uint;
-      rb->PutRow = put_row_uint;
-      rb->PutRowRGB = NULL;
-      rb->PutMonoRow = put_mono_row_uint;
-      rb->PutValues = put_values_uint;
-      rb->PutMonoValues = put_mono_values_uint;
-      rb->Format = MESA_FORMAT_X8_Z24;
-      pixelSize = sizeof(GLuint);
-      break;
-   case GL_DEPTH_COMPONENT32:
-      rb->DataType = GL_UNSIGNED_INT;
-      rb->GetPointer = get_pointer_uint;
-      rb->GetRow = get_row_uint;
-      rb->GetValues = get_values_uint;
-      rb->PutRow = put_row_uint;
-      rb->PutRowRGB = NULL;
-      rb->PutMonoRow = put_mono_row_uint;
-      rb->PutValues = put_values_uint;
-      rb->PutMonoValues = put_mono_values_uint;
-      rb->Format = MESA_FORMAT_Z32;
-      pixelSize = sizeof(GLuint);
-      break;
-   case GL_DEPTH_STENCIL_EXT:
-   case GL_DEPTH24_STENCIL8_EXT:
-      rb->Format = MESA_FORMAT_Z24_S8;
-      rb->DataType = GL_UNSIGNED_INT_24_8_EXT;
-      rb->GetPointer = get_pointer_uint;
-      rb->GetRow = get_row_uint;
-      rb->GetValues = get_values_uint;
-      rb->PutRow = put_row_uint;
-      rb->PutRowRGB = NULL;
-      rb->PutMonoRow = put_mono_row_uint;
-      rb->PutValues = put_values_uint;
-      rb->PutMonoValues = put_mono_values_uint;
-      pixelSize = sizeof(GLuint);
-      break;
-   default:
-      /* unsupported format */
-      return GL_FALSE;
-   }
-
-   ASSERT(rb->DataType);
-   ASSERT(rb->GetPointer);
-   ASSERT(rb->GetRow);
-   ASSERT(rb->GetValues);
-   ASSERT(rb->PutRow);
-   ASSERT(rb->PutMonoRow);
-   ASSERT(rb->PutValues);
-   ASSERT(rb->PutMonoValues);
-
-   /* free old buffer storage */
-   if (rb->Data) {
-      free(rb->Data);
-      rb->Data = NULL;
-   }
-
-   if (width > 0 && height > 0) {
-      /* allocate new buffer storage */
-      rb->Data = malloc(width * height * pixelSize);
-
-      if (rb->Data == NULL) {
-         rb->Width = 0;
-         rb->Height = 0;
-         _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                     "software renderbuffer allocation (%d x %d x %d)",
-                     width, height, pixelSize);
-         return GL_FALSE;
-      }
-   }
-
-   rb->Width = width;
-   rb->Height = height;
-   rb->_BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);
-
-   if (rb->Name == 0 &&
-       internalFormat == GL_RGBA16_SNORM &&
-       rb->_BaseFormat == 0) {
-      /* NOTE: This is a special case just for accumulation buffers.
-       * This is a very limited use case- there's no snorm texturing or
-       * rendering going on.
-       */
-      rb->_BaseFormat = GL_RGBA;
-   }
-   else {
-      /* the internalFormat should have been error checked long ago */
-      ASSERT(rb->_BaseFormat);
-   }
-
-   return GL_TRUE;
-}
-
-
-
-/**********************************************************************/
-/**********************************************************************/
-/**********************************************************************/
-
-
-/**
- * Here we utilize the gl_renderbuffer->Wrapper field to put an alpha
- * buffer wrapper around an existing RGB renderbuffer (hw or sw).
- *
- * When PutRow is called (for example), we store the alpha values in
- * this buffer, then pass on the PutRow call to the wrapped RGB
- * buffer.
- */
-
-
-static GLboolean
-alloc_storage_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb,
-                     GLenum internalFormat, GLuint width, GLuint height)
-{
-   ASSERT(arb != arb->Wrapped);
-   ASSERT(arb->Format == MESA_FORMAT_A8);
-
-   /* first, pass the call to the wrapped RGB buffer */
-   if (!arb->Wrapped->AllocStorage(ctx, arb->Wrapped, internalFormat,
-                                  width, height)) {
-      return GL_FALSE;
-   }
-
-   /* next, resize my alpha buffer */
-   if (arb->Data) {
-      free(arb->Data);
-   }
-
-   arb->Data = malloc(width * height * sizeof(GLubyte));
-   if (arb->Data == NULL) {
-      arb->Width = 0;
-      arb->Height = 0;
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "software alpha buffer allocation");
-      return GL_FALSE;
-   }
-
-   arb->Width = width;
-   arb->Height = height;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Delete an alpha_renderbuffer object, as well as the wrapped RGB buffer.
- */
-static void
-delete_renderbuffer_alpha8(struct gl_renderbuffer *arb)
-{
-   if (arb->Data) {
-      free(arb->Data);
-   }
-   ASSERT(arb->Wrapped);
-   ASSERT(arb != arb->Wrapped);
-   arb->Wrapped->Delete(arb->Wrapped);
-   arb->Wrapped = NULL;
-   free(arb);
-}
-
-
-static void *
-get_pointer_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb,
-                   GLint x, GLint y)
-{
-   return NULL;   /* don't allow direct access! */
-}
-
-
-static void
-get_row_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
-               GLint x, GLint y, void *values)
-{
-   /* NOTE: 'values' is RGBA format! */
-   const GLubyte *src = (const GLubyte *) arb->Data + y * arb->Width + x;
-   GLubyte *dst = (GLubyte *) values;
-   GLuint i;
-   ASSERT(arb != arb->Wrapped);
-   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);
-   /* first, pass the call to the wrapped RGB buffer */
-   arb->Wrapped->GetRow(ctx, arb->Wrapped, count, x, y, values);
-   /* second, fill in alpha values from this buffer! */
-   for (i = 0; i < count; i++) {
-      dst[i * 4 + 3] = src[i];
-   }
-}
-
-
-static void
-get_values_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
-                  const GLint x[], const GLint y[], void *values)
-{
-   GLubyte *dst = (GLubyte *) values;
-   GLuint i;
-   ASSERT(arb != arb->Wrapped);
-   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);
-   /* first, pass the call to the wrapped RGB buffer */
-   arb->Wrapped->GetValues(ctx, arb->Wrapped, count, x, y, values);
-   /* second, fill in alpha values from this buffer! */
-   for (i = 0; i < count; i++) {
-      const GLubyte *src = (GLubyte *) arb->Data + y[i] * arb->Width + x[i];
-      dst[i * 4 + 3] = *src;
-   }
-}
-
-
-static void
-put_row_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
-               GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   const GLubyte *src = (const GLubyte *) values;
-   GLubyte *dst = (GLubyte *) arb->Data + y * arb->Width + x;
-   GLuint i;
-   ASSERT(arb != arb->Wrapped);
-   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);
-   /* first, pass the call to the wrapped RGB buffer */
-   arb->Wrapped->PutRow(ctx, arb->Wrapped, count, x, y, values, mask);
-   /* second, store alpha in our buffer */
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         dst[i] = src[i * 4 + 3];
-      }
-   }
-}
-
-
-static void
-put_row_rgb_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
-                   GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   const GLubyte *src = (const GLubyte *) values;
-   GLubyte *dst = (GLubyte *) arb->Data + y * arb->Width + x;
-   GLuint i;
-   ASSERT(arb != arb->Wrapped);
-   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);
-   /* first, pass the call to the wrapped RGB buffer */
-   arb->Wrapped->PutRowRGB(ctx, arb->Wrapped, count, x, y, values, mask);
-   /* second, store alpha in our buffer */
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         dst[i] = src[i * 4 + 3];
-      }
-   }
-}
-
-
-static void
-put_mono_row_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
-                    GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   const GLubyte val = ((const GLubyte *) value)[3];
-   GLubyte *dst = (GLubyte *) arb->Data + y * arb->Width + x;
-   ASSERT(arb != arb->Wrapped);
-   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);
-   /* first, pass the call to the wrapped RGB buffer */
-   arb->Wrapped->PutMonoRow(ctx, arb->Wrapped, count, x, y, value, mask);
-   /* second, store alpha in our buffer */
-   if (mask) {
-      GLuint i;
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            dst[i] = val;
-         }
-      }
-   }
-   else {
-      memset(dst, val, count);
-   }
-}
-
-
-static void
-put_values_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
-                  const GLint x[], const GLint y[],
-                  const void *values, const GLubyte *mask)
-{
-   const GLubyte *src = (const GLubyte *) values;
-   GLuint i;
-   ASSERT(arb != arb->Wrapped);
-   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);
-   /* first, pass the call to the wrapped RGB buffer */
-   arb->Wrapped->PutValues(ctx, arb->Wrapped, count, x, y, values, mask);
-   /* second, store alpha in our buffer */
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLubyte *dst = (GLubyte *) arb->Data + y[i] * arb->Width + x[i];
-         *dst = src[i * 4 + 3];
-      }
-   }
-}
-
-
-static void
-put_mono_values_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb,
-                       GLuint count, const GLint x[], const GLint y[],
-                       const void *value, const GLubyte *mask)
-{
-   const GLubyte val = ((const GLubyte *) value)[3];
-   GLuint i;
-   ASSERT(arb != arb->Wrapped);
-   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);
-   /* first, pass the call to the wrapped RGB buffer */
-   arb->Wrapped->PutValues(ctx, arb->Wrapped, count, x, y, value, mask);
-   /* second, store alpha in our buffer */
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-         GLubyte *dst = (GLubyte *) arb->Data + y[i] * arb->Width + x[i];
-         *dst = val;
-      }
-   }
-}
-
-
-static void
-copy_buffer_alpha8(struct gl_renderbuffer* dst, struct gl_renderbuffer* src)
-{
-   ASSERT(dst->Format == MESA_FORMAT_A8);
-   ASSERT(src->Format == MESA_FORMAT_A8);
-   ASSERT(dst->Width == src->Width);
-   ASSERT(dst->Height == src->Height);
-
-   memcpy(dst->Data, src->Data, dst->Width * dst->Height * sizeof(GLubyte));
-}
-
-
-/**********************************************************************/
-/**********************************************************************/
-/**********************************************************************/
-
-
-/**
- * Default GetPointer routine.  Always return NULL to indicate that
- * direct buffer access is not supported.
- */
-static void *
-nop_get_pointer(struct gl_context *ctx, struct gl_renderbuffer *rb, GLint x, GLint y)
-{
-   return NULL;
-}
-
-
-/**
- * Initialize the fields of a gl_renderbuffer to default values.
- */
-void
-_mesa_init_renderbuffer(struct gl_renderbuffer *rb, GLuint name)
-{
-   _glthread_INIT_MUTEX(rb->Mutex);
-
-   rb->Magic = RB_MAGIC;
-   rb->ClassID = 0;
-   rb->Name = name;
-   rb->RefCount = 0;
-   rb->Delete = _mesa_delete_renderbuffer;
-
-   /* The rest of these should be set later by the caller of this function or
-    * the AllocStorage method:
-    */
-   rb->AllocStorage = NULL;
-
-   rb->Width = 0;
-   rb->Height = 0;
-   rb->InternalFormat = GL_NONE;
-   rb->Format = MESA_FORMAT_NONE;
-
-   rb->DataType = GL_NONE;
-   rb->Data = NULL;
-
-   /* Point back to ourself so that we don't have to check for Wrapped==NULL
-    * all over the drivers.
-    */
-   rb->Wrapped = rb;
-
-   rb->GetPointer = nop_get_pointer;
-   rb->GetRow = NULL;
-   rb->GetValues = NULL;
-   rb->PutRow = NULL;
-   rb->PutRowRGB = NULL;
-   rb->PutMonoRow = NULL;
-   rb->PutValues = NULL;
-   rb->PutMonoValues = NULL;
-}
-
-
-/**
- * Allocate a new gl_renderbuffer object.  This can be used for user-created
- * renderbuffers or window-system renderbuffers.
- */
-struct gl_renderbuffer *
-_mesa_new_renderbuffer(struct gl_context *ctx, GLuint name)
-{
-   struct gl_renderbuffer *rb = CALLOC_STRUCT(gl_renderbuffer);
-   if (rb) {
-      _mesa_init_renderbuffer(rb, name);
-   }
-   return rb;
-}
-
-
-/**
- * Delete a gl_framebuffer.
- * This is the default function for renderbuffer->Delete().
- */
-void
-_mesa_delete_renderbuffer(struct gl_renderbuffer *rb)
-{
-   if (rb->Data) {
-      free(rb->Data);
-   }
-   free(rb);
-}
-
-
-/**
- * Allocate a software-based renderbuffer.  This is called via the
- * ctx->Driver.NewRenderbuffer() function when the user creates a new
- * renderbuffer.
- * This would not be used for hardware-based renderbuffers.
- */
-struct gl_renderbuffer *
-_mesa_new_soft_renderbuffer(struct gl_context *ctx, GLuint name)
-{
-   struct gl_renderbuffer *rb = _mesa_new_renderbuffer(ctx, name);
-   if (rb) {
-      rb->AllocStorage = _mesa_soft_renderbuffer_storage;
-      /* Normally, one would setup the PutRow, GetRow, etc functions here.
-       * But we're doing that in the _mesa_soft_renderbuffer_storage() function
-       * instead.
-       */
-   }
-   return rb;
-}
-
-
-/**
- * Add software-based color renderbuffers to the given framebuffer.
- * This is a helper routine for device drivers when creating a
- * window system framebuffer (not a user-created render/framebuffer).
- * Once this function is called, you can basically forget about this
- * renderbuffer; core Mesa will handle all the buffer management and
- * rendering!
- */
-GLboolean
-_mesa_add_color_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
-                              GLuint rgbBits, GLuint alphaBits,
-                              GLboolean frontLeft, GLboolean backLeft,
-                              GLboolean frontRight, GLboolean backRight)
-{
-   gl_buffer_index b;
-
-   if (rgbBits > 16 || alphaBits > 16) {
-      _mesa_problem(ctx,
-                    "Unsupported bit depth in _mesa_add_color_renderbuffers");
-      return GL_FALSE;
-   }
-
-   assert(MAX_COLOR_ATTACHMENTS >= 4);
-
-   for (b = BUFFER_FRONT_LEFT; b <= BUFFER_BACK_RIGHT; b++) {
-      struct gl_renderbuffer *rb;
-
-      if (b == BUFFER_FRONT_LEFT && !frontLeft)
-         continue;
-      else if (b == BUFFER_BACK_LEFT && !backLeft)
-         continue;
-      else if (b == BUFFER_FRONT_RIGHT && !frontRight)
-         continue;
-      else if (b == BUFFER_BACK_RIGHT && !backRight)
-         continue;
-
-      assert(fb->Attachment[b].Renderbuffer == NULL);
-
-      rb = _mesa_new_renderbuffer(ctx, 0);
-      if (!rb) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating color buffer");
-         return GL_FALSE;
-      }
-
-      if (rgbBits <= 8) {
-         if (alphaBits)
-            rb->Format = MESA_FORMAT_RGBA8888;
-         else
-            rb->Format = MESA_FORMAT_RGB888;
-      }
-      else {
-         assert(rgbBits <= 16);
-         rb->Format = MESA_FORMAT_NONE; /*XXX RGBA16;*/
-      }
-      rb->InternalFormat = GL_RGBA;
-
-      rb->AllocStorage = _mesa_soft_renderbuffer_storage;
-      _mesa_add_renderbuffer(fb, b, rb);
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Add software-based alpha renderbuffers to the given framebuffer.
- * This is a helper routine for device drivers when creating a
- * window system framebuffer (not a user-created render/framebuffer).
- * Once this function is called, you can basically forget about this
- * renderbuffer; core Mesa will handle all the buffer management and
- * rendering!
- */
-GLboolean
-_mesa_add_alpha_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
-                              GLuint alphaBits,
-                              GLboolean frontLeft, GLboolean backLeft,
-                              GLboolean frontRight, GLboolean backRight)
-{
-   gl_buffer_index b;
-
-   /* for window system framebuffers only! */
-   assert(fb->Name == 0);
-
-   if (alphaBits > 8) {
-      _mesa_problem(ctx,
-                    "Unsupported bit depth in _mesa_add_alpha_renderbuffers");
-      return GL_FALSE;
-   }
-
-   assert(MAX_COLOR_ATTACHMENTS >= 4);
-
-   /* Wrap each of the RGB color buffers with an alpha renderbuffer.
-    */
-   for (b = BUFFER_FRONT_LEFT; b <= BUFFER_BACK_RIGHT; b++) {
-      struct gl_renderbuffer *arb;
-
-      if (b == BUFFER_FRONT_LEFT && !frontLeft)
-         continue;
-      else if (b == BUFFER_BACK_LEFT && !backLeft)
-         continue;
-      else if (b == BUFFER_FRONT_RIGHT && !frontRight)
-         continue;
-      else if (b == BUFFER_BACK_RIGHT && !backRight)
-         continue;
-
-      /* the RGB buffer to wrap must already exist!! */
-      assert(fb->Attachment[b].Renderbuffer);
-
-      /* only GLubyte supported for now */
-      assert(fb->Attachment[b].Renderbuffer->DataType == GL_UNSIGNED_BYTE);
-
-      /* allocate alpha renderbuffer */
-      arb = _mesa_new_renderbuffer(ctx, 0);
-      if (!arb) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating alpha buffer");
-         return GL_FALSE;
-      }
-
-      /* wrap the alpha renderbuffer around the RGB renderbuffer */
-      arb->Wrapped = fb->Attachment[b].Renderbuffer;
-
-      /* Set up my alphabuffer fields and plug in my functions.
-       * The functions will put/get the alpha values from/to RGBA arrays
-       * and then call the wrapped buffer's functions to handle the RGB
-       * values.
-       */
-      arb->InternalFormat = arb->Wrapped->InternalFormat;
-      arb->Format         = MESA_FORMAT_A8;
-      arb->DataType       = arb->Wrapped->DataType;
-      arb->AllocStorage   = alloc_storage_alpha8;
-      arb->Delete         = delete_renderbuffer_alpha8;
-      arb->GetPointer     = get_pointer_alpha8;
-      arb->GetRow         = get_row_alpha8;
-      arb->GetValues      = get_values_alpha8;
-      arb->PutRow         = put_row_alpha8;
-      arb->PutRowRGB      = put_row_rgb_alpha8;
-      arb->PutMonoRow     = put_mono_row_alpha8;
-      arb->PutValues      = put_values_alpha8;
-      arb->PutMonoValues  = put_mono_values_alpha8;
-
-      /* clear the pointer to avoid assertion/sanity check failure later */
-      fb->Attachment[b].Renderbuffer = NULL;
-
-      /* plug the alpha renderbuffer into the colorbuffer attachment */
-      _mesa_add_renderbuffer(fb, b, arb);
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * For framebuffers that use a software alpha channel wrapper
- * created by _mesa_add_alpha_renderbuffer or _mesa_add_soft_renderbuffers,
- * copy the back buffer alpha channel into the front buffer alpha channel.
- */
-void
-_mesa_copy_soft_alpha_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb)
-{
-   if (fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer &&
-       fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer)
-      copy_buffer_alpha8(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer,
-                         fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer);
-
-
-   if (fb->Attachment[BUFFER_FRONT_RIGHT].Renderbuffer &&
-       fb->Attachment[BUFFER_BACK_RIGHT].Renderbuffer)
-      copy_buffer_alpha8(fb->Attachment[BUFFER_FRONT_RIGHT].Renderbuffer,
-                         fb->Attachment[BUFFER_BACK_RIGHT].Renderbuffer);
-}
-
-
-/**
- * Add a software-based depth renderbuffer to the given framebuffer.
- * This is a helper routine for device drivers when creating a
- * window system framebuffer (not a user-created render/framebuffer).
- * Once this function is called, you can basically forget about this
- * renderbuffer; core Mesa will handle all the buffer management and
- * rendering!
- */
-GLboolean
-_mesa_add_depth_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
-                             GLuint depthBits)
-{
-   struct gl_renderbuffer *rb;
-
-   if (depthBits > 32) {
-      _mesa_problem(ctx,
-                    "Unsupported depthBits in _mesa_add_depth_renderbuffer");
-      return GL_FALSE;
-   }
-
-   assert(fb->Attachment[BUFFER_DEPTH].Renderbuffer == NULL);
-
-   rb = _mesa_new_renderbuffer(ctx, 0);
-   if (!rb) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating depth buffer");
-      return GL_FALSE;
-   }
-
-   if (depthBits <= 16) {
-      rb->Format = MESA_FORMAT_Z16;
-      rb->InternalFormat = GL_DEPTH_COMPONENT16;
-   }
-   else if (depthBits <= 24) {
-      rb->Format = MESA_FORMAT_X8_Z24;
-      rb->InternalFormat = GL_DEPTH_COMPONENT24;
-   }
-   else {
-      rb->Format = MESA_FORMAT_Z32;
-      rb->InternalFormat = GL_DEPTH_COMPONENT32;
-   }
-
-   rb->AllocStorage = _mesa_soft_renderbuffer_storage;
-   _mesa_add_renderbuffer(fb, BUFFER_DEPTH, rb);
-
-   return GL_TRUE;
-}
-
-
-/**
- * Add a software-based stencil renderbuffer to the given framebuffer.
- * This is a helper routine for device drivers when creating a
- * window system framebuffer (not a user-created render/framebuffer).
- * Once this function is called, you can basically forget about this
- * renderbuffer; core Mesa will handle all the buffer management and
- * rendering!
- */
-GLboolean
-_mesa_add_stencil_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
-                               GLuint stencilBits)
-{
-   struct gl_renderbuffer *rb;
-
-   if (stencilBits > 16) {
-      _mesa_problem(ctx,
-                  "Unsupported stencilBits in _mesa_add_stencil_renderbuffer");
-      return GL_FALSE;
-   }
-
-   assert(fb->Attachment[BUFFER_STENCIL].Renderbuffer == NULL);
-
-   rb = _mesa_new_renderbuffer(ctx, 0);
-   if (!rb) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating stencil buffer");
-      return GL_FALSE;
-   }
-
-   assert(stencilBits <= 8);
-   rb->Format = MESA_FORMAT_S8;
-   rb->InternalFormat = GL_STENCIL_INDEX8;
-
-   rb->AllocStorage = _mesa_soft_renderbuffer_storage;
-   _mesa_add_renderbuffer(fb, BUFFER_STENCIL, rb);
-
-   return GL_TRUE;
-}
-
-
-/**
- * Add a software-based accumulation renderbuffer to the given framebuffer.
- * This is a helper routine for device drivers when creating a
- * window system framebuffer (not a user-created render/framebuffer).
- * Once this function is called, you can basically forget about this
- * renderbuffer; core Mesa will handle all the buffer management and
- * rendering!
- */
-GLboolean
-_mesa_add_accum_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
-                             GLuint redBits, GLuint greenBits,
-                             GLuint blueBits, GLuint alphaBits)
-{
-   struct gl_renderbuffer *rb;
-
-   if (redBits > 16 || greenBits > 16 || blueBits > 16 || alphaBits > 16) {
-      _mesa_problem(ctx,
-                    "Unsupported accumBits in _mesa_add_accum_renderbuffer");
-      return GL_FALSE;
-   }
-
-   assert(fb->Attachment[BUFFER_ACCUM].Renderbuffer == NULL);
-
-   rb = _mesa_new_renderbuffer(ctx, 0);
-   if (!rb) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating accum buffer");
-      return GL_FALSE;
-   }
-
-   rb->Format = MESA_FORMAT_SIGNED_RGBA_16;
-   rb->InternalFormat = GL_RGBA16_SNORM;
-   rb->AllocStorage = _mesa_soft_renderbuffer_storage;
-   _mesa_add_renderbuffer(fb, BUFFER_ACCUM, rb);
-
-   return GL_TRUE;
-}
-
-
-
-/**
- * Add a software-based aux renderbuffer to the given framebuffer.
- * This is a helper routine for device drivers when creating a
- * window system framebuffer (not a user-created render/framebuffer).
- * Once this function is called, you can basically forget about this
- * renderbuffer; core Mesa will handle all the buffer management and
- * rendering!
- *
- * NOTE: color-index aux buffers not supported.
- */
-GLboolean
-_mesa_add_aux_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
-                            GLuint colorBits, GLuint numBuffers)
-{
-   GLuint i;
-
-   if (colorBits > 16) {
-      _mesa_problem(ctx,
-                    "Unsupported accumBits in _mesa_add_aux_renderbuffers");
-      return GL_FALSE;
-   }
-
-   assert(numBuffers <= MAX_AUX_BUFFERS);
-
-   for (i = 0; i < numBuffers; i++) {
-      struct gl_renderbuffer *rb = _mesa_new_renderbuffer(ctx, 0);
-
-      assert(fb->Attachment[BUFFER_AUX0 + i].Renderbuffer == NULL);
-
-      if (!rb) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating aux buffer");
-         return GL_FALSE;
-      }
-
-      assert (colorBits <= 8);
-      rb->Format = MESA_FORMAT_RGBA8888;
-      rb->InternalFormat = GL_RGBA;
-
-      rb->AllocStorage = _mesa_soft_renderbuffer_storage;
-      _mesa_add_renderbuffer(fb, BUFFER_AUX0 + i, rb);
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Create/attach software-based renderbuffers to the given framebuffer.
- * This is a helper routine for device drivers.  Drivers can just as well
- * call the individual _mesa_add_*_renderbuffer() routines directly.
- */
-void
-_mesa_add_soft_renderbuffers(struct gl_framebuffer *fb,
-                             GLboolean color,
-                             GLboolean depth,
-                             GLboolean stencil,
-                             GLboolean accum,
-                             GLboolean alpha,
-                             GLboolean aux)
-{
-   GLboolean frontLeft = GL_TRUE;
-   GLboolean backLeft = fb->Visual.doubleBufferMode;
-   GLboolean frontRight = fb->Visual.stereoMode;
-   GLboolean backRight = fb->Visual.stereoMode && fb->Visual.doubleBufferMode;
-
-   if (color) {
-      assert(fb->Visual.redBits == fb->Visual.greenBits);
-      assert(fb->Visual.redBits == fb->Visual.blueBits);
-      _mesa_add_color_renderbuffers(NULL, fb,
-				    fb->Visual.redBits,
-				    fb->Visual.alphaBits,
-				    frontLeft, backLeft,
-				    frontRight, backRight);
-   }
-
-   if (depth) {
-      assert(fb->Visual.depthBits > 0);
-      _mesa_add_depth_renderbuffer(NULL, fb, fb->Visual.depthBits);
-   }
-
-   if (stencil) {
-      assert(fb->Visual.stencilBits > 0);
-      _mesa_add_stencil_renderbuffer(NULL, fb, fb->Visual.stencilBits);
-   }
-
-   if (accum) {
-      assert(fb->Visual.accumRedBits > 0);
-      assert(fb->Visual.accumGreenBits > 0);
-      assert(fb->Visual.accumBlueBits > 0);
-      _mesa_add_accum_renderbuffer(NULL, fb,
-                                   fb->Visual.accumRedBits,
-                                   fb->Visual.accumGreenBits,
-                                   fb->Visual.accumBlueBits,
-                                   fb->Visual.accumAlphaBits);
-   }
-
-   if (aux) {
-      assert(fb->Visual.numAuxBuffers > 0);
-      _mesa_add_aux_renderbuffers(NULL, fb, fb->Visual.redBits,
-                                  fb->Visual.numAuxBuffers);
-   }
-
-   if (alpha) {
-      assert(fb->Visual.alphaBits > 0);
-      _mesa_add_alpha_renderbuffers(NULL, fb, fb->Visual.alphaBits,
-                                    frontLeft, backLeft,
-                                    frontRight, backRight);
-   }
-
-#if 0
-   if (multisample) {
-      /* maybe someday */
-   }
-#endif
-}
-
-
-/**
- * Attach a renderbuffer to a framebuffer.
- * \param bufferName  one of the BUFFER_x tokens
- */
-void
-_mesa_add_renderbuffer(struct gl_framebuffer *fb,
-                       gl_buffer_index bufferName, struct gl_renderbuffer *rb)
-{
-   assert(fb);
-   assert(rb);
-   assert(bufferName < BUFFER_COUNT);
-
-   /* There should be no previous renderbuffer on this attachment point,
-    * with the exception of depth/stencil since the same renderbuffer may
-    * be used for both.
-    */
-   assert(bufferName == BUFFER_DEPTH ||
-          bufferName == BUFFER_STENCIL ||
-          fb->Attachment[bufferName].Renderbuffer == NULL);
-
-   /* winsys vs. user-created buffer cross check */
-   if (fb->Name) {
-      assert(rb->Name);
-   }
-   else {
-      assert(!rb->Name);
-   }
-
-   fb->Attachment[bufferName].Type = GL_RENDERBUFFER_EXT;
-   fb->Attachment[bufferName].Complete = GL_TRUE;
-   _mesa_reference_renderbuffer(&fb->Attachment[bufferName].Renderbuffer, rb);
-}
-
-
-/**
- * Remove the named renderbuffer from the given framebuffer.
- * \param bufferName  one of the BUFFER_x tokens
- */
-void
-_mesa_remove_renderbuffer(struct gl_framebuffer *fb,
-                          gl_buffer_index bufferName)
-{
-   struct gl_renderbuffer *rb;
-
-   assert(bufferName < BUFFER_COUNT);
-
-   rb = fb->Attachment[bufferName].Renderbuffer;
-   if (!rb)
-      return;
-
-   _mesa_reference_renderbuffer(&rb, NULL);
-
-   fb->Attachment[bufferName].Renderbuffer = NULL;
-}
-
-
-/**
- * Set *ptr to point to rb.  If *ptr points to another renderbuffer,
- * dereference that buffer first.  The new renderbuffer's refcount will
- * be incremented.  The old renderbuffer's refcount will be decremented.
- */
-void
-_mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,
-                             struct gl_renderbuffer *rb)
-{
-   assert(ptr);
-   if (*ptr == rb) {
-      /* no change */
-      return;
-   }
-
-   if (*ptr) {
-      /* Unreference the old renderbuffer */
-      GLboolean deleteFlag = GL_FALSE;
-      struct gl_renderbuffer *oldRb = *ptr;
-
-      assert(oldRb->Magic == RB_MAGIC);
-      _glthread_LOCK_MUTEX(oldRb->Mutex);
-      assert(oldRb->Magic == RB_MAGIC);
-      ASSERT(oldRb->RefCount > 0);
-      oldRb->RefCount--;
-      /*printf("RB DECR %p (%d) to %d\n", (void*) oldRb, oldRb->Name, oldRb->RefCount);*/
-      deleteFlag = (oldRb->RefCount == 0);
-      _glthread_UNLOCK_MUTEX(oldRb->Mutex);
-
-      if (deleteFlag) {
-         oldRb->Magic = 0; /* now invalid memory! */
-         oldRb->Delete(oldRb);
-      }
-
-      *ptr = NULL;
-   }
-   assert(!*ptr);
-
-   if (rb) {
-      assert(rb->Magic == RB_MAGIC);
-      /* reference new renderbuffer */
-      _glthread_LOCK_MUTEX(rb->Mutex);
-      rb->RefCount++;
-      /*printf("RB INCR %p (%d) to %d\n", (void*) rb, rb->Name, rb->RefCount);*/
-      _glthread_UNLOCK_MUTEX(rb->Mutex);
-      *ptr = rb;
-   }
-}
-
-
-/**
- * Create a new combined depth/stencil renderbuffer for implementing
- * the GL_EXT_packed_depth_stencil extension.
- * \return new depth/stencil renderbuffer
- */
-struct gl_renderbuffer *
-_mesa_new_depthstencil_renderbuffer(struct gl_context *ctx, GLuint name)
-{
-   struct gl_renderbuffer *dsrb;
-
-   dsrb = _mesa_new_renderbuffer(ctx, name);
-   if (!dsrb)
-      return NULL;
-
-   /* init fields not covered by _mesa_new_renderbuffer() */
-   dsrb->InternalFormat = GL_DEPTH24_STENCIL8_EXT;
-   dsrb->Format = MESA_FORMAT_Z24_S8;
-   dsrb->AllocStorage = _mesa_soft_renderbuffer_storage;
-
-   return dsrb;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * Functions for allocating/managing renderbuffers.

+ * Also, routines for reading/writing software-based renderbuffer data as

+ * ubytes, ushorts, uints, etc.

+ *

+ * The 'alpha8' renderbuffer is interesting.  It's used to add a software-based

+ * alpha channel to RGB renderbuffers.  This is done by wrapping the RGB

+ * renderbuffer with the alpha renderbuffer.  We can do this because of the

+ * OO-nature of renderbuffers.

+ *

+ * Down the road we'll use this for run-time support of 8, 16 and 32-bit

+ * color channels.  For example, Mesa may use 32-bit/float color channels

+ * internally (swrast) and use wrapper renderbuffers to convert 32-bit

+ * values down to 16 or 8-bit values for whatever kind of framebuffer we have.

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "context.h"

+#include "fbobject.h"

+#include "formats.h"

+#include "mtypes.h"

+#include "renderbuffer.h"

+

+

+/*

+ * Routines for get/put values in common buffer formats follow.

+ * Someday add support for arbitrary row stride to make them more

+ * flexible.

+ */

+

+/**********************************************************************

+ * Functions for buffers of 1 X GLubyte values.

+ * Typically stencil.

+ */

+

+static void *

+get_pointer_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                  GLint x, GLint y)

+{

+   if (!rb->Data)

+      return NULL;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   /* Can't assert rb->Format since these funcs may be used for serveral

+    * different formats (GL_ALPHA8, GL_STENCIL_INDEX8, etc).

+    */

+   return (GLubyte *) rb->Data + y * rb->Width + x;

+}

+

+

+static void

+get_row_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+              GLint x, GLint y, void *values)

+{

+   const GLubyte *src = (const GLubyte *) rb->Data + y * rb->Width + x;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   memcpy(values, src, count * sizeof(GLubyte));

+}

+

+

+static void

+get_values_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                 const GLint x[], const GLint y[], void *values)

+{

+   GLubyte *dst = (GLubyte *) values;

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   for (i = 0; i < count; i++) {

+      const GLubyte *src = (GLubyte *) rb->Data + y[i] * rb->Width + x[i];

+      dst[i] = *src;

+   }

+}

+

+

+static void

+put_row_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+              GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   const GLubyte *src = (const GLubyte *) values;

+   GLubyte *dst = (GLubyte *) rb->Data + y * rb->Width + x;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   if (mask) {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            dst[i] = src[i];

+         }

+      }

+   }

+   else {

+      memcpy(dst, values, count * sizeof(GLubyte));

+   }

+}

+

+

+static void

+put_mono_row_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                   GLint x, GLint y, const void *value, const GLubyte *mask)

+{

+   const GLubyte val = *((const GLubyte *) value);

+   GLubyte *dst = (GLubyte *) rb->Data + y * rb->Width + x;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   if (mask) {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            dst[i] = val;

+         }

+      }

+   }

+   else {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         dst[i] = val;

+      }

+   }

+}

+

+

+static void

+put_values_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                 const GLint x[], const GLint y[],

+                 const void *values, const GLubyte *mask)

+{

+   const GLubyte *src = (const GLubyte *) values;

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLubyte *dst = (GLubyte *) rb->Data + y[i] * rb->Width + x[i];

+         *dst = src[i];

+      }

+   }

+}

+

+

+static void

+put_mono_values_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                      const GLint x[], const GLint y[],

+                      const void *value, const GLubyte *mask)

+{

+   const GLubyte val = *((const GLubyte *) value);

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLubyte *dst = (GLubyte *) rb->Data + y[i] * rb->Width + x[i];

+         *dst = val;

+      }

+   }

+}

+

+

+/**********************************************************************

+ * Functions for buffers of 1 X GLushort values.

+ * Typically depth/Z.

+ */

+

+static void *

+get_pointer_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                   GLint x, GLint y)

+{

+   if (!rb->Data)

+      return NULL;

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);

+   ASSERT(rb->Width > 0);

+   return (GLushort *) rb->Data + y * rb->Width + x;

+}

+

+

+static void

+get_row_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+               GLint x, GLint y, void *values)

+{

+   const void *src = rb->GetPointer(ctx, rb, x, y);

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);

+   memcpy(values, src, count * sizeof(GLushort));

+}

+

+

+static void

+get_values_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                  const GLint x[], const GLint y[], void *values)

+{

+   GLushort *dst = (GLushort *) values;

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);

+   for (i = 0; i < count; i++) {

+      const GLushort *src = (GLushort *) rb->Data + y[i] * rb->Width + x[i];

+      dst[i] = *src;

+   }

+}

+

+

+static void

+put_row_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+               GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   const GLushort *src = (const GLushort *) values;

+   GLushort *dst = (GLushort *) rb->Data + y * rb->Width + x;

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);

+   if (mask) {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            dst[i] = src[i];

+         }

+      }

+   }

+   else {

+      memcpy(dst, src, count * sizeof(GLushort));

+   }

+}

+

+

+static void

+put_mono_row_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                    GLint x, GLint y, const void *value, const GLubyte *mask)

+{

+   const GLushort val = *((const GLushort *) value);

+   GLushort *dst = (GLushort *) rb->Data + y * rb->Width + x;

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);

+   if (mask) {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            dst[i] = val;

+         }

+      }

+   }

+   else {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         dst[i] = val;

+      }

+   }

+}

+

+

+static void

+put_values_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                  const GLint x[], const GLint y[], const void *values,

+                  const GLubyte *mask)

+{

+   const GLushort *src = (const GLushort *) values;

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLushort *dst = (GLushort *) rb->Data + y[i] * rb->Width + x[i];

+         *dst = src[i];

+      }

+   }

+}

+ 

+

+static void

+put_mono_values_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                       GLuint count, const GLint x[], const GLint y[],

+                       const void *value, const GLubyte *mask)

+{

+   const GLushort val = *((const GLushort *) value);

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT);

+   if (mask) {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            GLushort *dst = (GLushort *) rb->Data + y[i] * rb->Width + x[i];

+            *dst = val;

+         }

+      }

+   }

+   else {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         GLushort *dst = (GLushort *) rb->Data + y[i] * rb->Width + x[i];

+         *dst = val;

+      }

+   }

+}

+ 

+

+/**********************************************************************

+ * Functions for buffers of 1 X GLuint values.

+ * Typically depth/Z or color index.

+ */

+

+static void *

+get_pointer_uint(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                 GLint x, GLint y)

+{

+   if (!rb->Data)

+      return NULL;

+   ASSERT(rb->DataType == GL_UNSIGNED_INT ||

+          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   return (GLuint *) rb->Data + y * rb->Width + x;

+}

+

+

+static void

+get_row_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+             GLint x, GLint y, void *values)

+{

+   const void *src = rb->GetPointer(ctx, rb, x, y);

+   ASSERT(rb->DataType == GL_UNSIGNED_INT ||

+          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   memcpy(values, src, count * sizeof(GLuint));

+}

+

+

+static void

+get_values_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                const GLint x[], const GLint y[], void *values)

+{

+   GLuint *dst = (GLuint *) values;

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_INT ||

+          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   for (i = 0; i < count; i++) {

+      const GLuint *src = (GLuint *) rb->Data + y[i] * rb->Width + x[i];

+      dst[i] = *src;

+   }

+}

+

+

+static void

+put_row_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+             GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   const GLuint *src = (const GLuint *) values;

+   GLuint *dst = (GLuint *) rb->Data + y * rb->Width + x;

+   ASSERT(rb->DataType == GL_UNSIGNED_INT ||

+          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   if (mask) {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            dst[i] = src[i];

+         }

+      }

+   }

+   else {

+      memcpy(dst, src, count * sizeof(GLuint));

+   }

+}

+

+

+static void

+put_mono_row_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                  GLint x, GLint y, const void *value, const GLubyte *mask)

+{

+   const GLuint val = *((const GLuint *) value);

+   GLuint *dst = (GLuint *) rb->Data + y * rb->Width + x;

+   ASSERT(rb->DataType == GL_UNSIGNED_INT ||

+          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   if (mask) {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            dst[i] = val;

+         }

+      }

+   }

+   else {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         dst[i] = val;

+      }

+   }

+}

+

+

+static void

+put_values_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                const GLint x[], const GLint y[], const void *values,

+                const GLubyte *mask)

+{

+   const GLuint *src = (const GLuint *) values;

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_INT ||

+          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLuint *dst = (GLuint *) rb->Data + y[i] * rb->Width + x[i];

+         *dst = src[i];

+      }

+   }

+}

+

+

+static void

+put_mono_values_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                     const GLint x[], const GLint y[], const void *value,

+                     const GLubyte *mask)

+{

+   const GLuint val = *((const GLuint *) value);

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_INT ||

+          rb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLuint *dst = (GLuint *) rb->Data + y[i] * rb->Width + x[i];

+         *dst = val;

+      }

+   }

+}

+

+

+/**********************************************************************

+ * Functions for buffers of 3 X GLubyte (or GLbyte) values.

+ * Typically color buffers.

+ * NOTE: the incoming and outgoing colors are RGBA!  We ignore incoming

+ * alpha values and return 255 for outgoing alpha values.

+ */

+

+static void *

+get_pointer_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                   GLint x, GLint y)

+{

+   ASSERT(rb->Format == MESA_FORMAT_RGB888);

+   /* No direct access since this buffer is RGB but caller will be

+    * treating it as if it were RGBA.

+    */

+   return NULL;

+}

+

+

+static void

+get_row_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+               GLint x, GLint y, void *values)

+{

+   const GLubyte *src = (const GLubyte *) rb->Data + 3 * (y * rb->Width + x);

+   GLubyte *dst = (GLubyte *) values;

+   GLuint i;

+   ASSERT(rb->Format == MESA_FORMAT_RGB888);

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   for (i = 0; i < count; i++) {

+      dst[i * 4 + 0] = src[i * 3 + 0];

+      dst[i * 4 + 1] = src[i * 3 + 1];

+      dst[i * 4 + 2] = src[i * 3 + 2];

+      dst[i * 4 + 3] = 255;

+   }

+}

+

+

+static void

+get_values_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                  const GLint x[], const GLint y[], void *values)

+{

+   GLubyte *dst = (GLubyte *) values;

+   GLuint i;

+   ASSERT(rb->Format == MESA_FORMAT_RGB888);

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   for (i = 0; i < count; i++) {

+      const GLubyte *src

+         = (GLubyte *) rb->Data + 3 * (y[i] * rb->Width + x[i]);

+      dst[i * 4 + 0] = src[0];

+      dst[i * 4 + 1] = src[1];

+      dst[i * 4 + 2] = src[2];

+      dst[i * 4 + 3] = 255;

+   }

+}

+

+

+static void

+put_row_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+               GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   /* note: incoming values are RGB+A! */

+   const GLubyte *src = (const GLubyte *) values;

+   GLubyte *dst = (GLubyte *) rb->Data + 3 * (y * rb->Width + x);

+   GLuint i;

+   ASSERT(rb->Format == MESA_FORMAT_RGB888);

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         dst[i * 3 + 0] = src[i * 4 + 0];

+         dst[i * 3 + 1] = src[i * 4 + 1];

+         dst[i * 3 + 2] = src[i * 4 + 2];

+      }

+   }

+}

+

+

+static void

+put_row_rgb_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                   GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   /* note: incoming values are RGB+A! */

+   const GLubyte *src = (const GLubyte *) values;

+   GLubyte *dst = (GLubyte *) rb->Data + 3 * (y * rb->Width + x);

+   GLuint i;

+   ASSERT(rb->Format == MESA_FORMAT_RGB888);

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         dst[i * 3 + 0] = src[i * 3 + 0];

+         dst[i * 3 + 1] = src[i * 3 + 1];

+         dst[i * 3 + 2] = src[i * 3 + 2];

+      }

+   }

+}

+

+

+static void

+put_mono_row_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                    GLint x, GLint y, const void *value, const GLubyte *mask)

+{

+   /* note: incoming value is RGB+A! */

+   const GLubyte val0 = ((const GLubyte *) value)[0];

+   const GLubyte val1 = ((const GLubyte *) value)[1];

+   const GLubyte val2 = ((const GLubyte *) value)[2];

+   GLubyte *dst = (GLubyte *) rb->Data + 3 * (y * rb->Width + x);

+   ASSERT(rb->Format == MESA_FORMAT_RGB888);

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   if (!mask && val0 == val1 && val1 == val2) {

+      /* optimized case */

+      memset(dst, val0, 3 * count);

+   }

+   else {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            dst[i * 3 + 0] = val0;

+            dst[i * 3 + 1] = val1;

+            dst[i * 3 + 2] = val2;

+         }

+      }

+   }

+}

+

+

+static void

+put_values_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                  const GLint x[], const GLint y[], const void *values,

+                  const GLubyte *mask)

+{

+   /* note: incoming values are RGB+A! */

+   const GLubyte *src = (const GLubyte *) values;

+   GLuint i;

+   ASSERT(rb->Format == MESA_FORMAT_RGB888);

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLubyte *dst = (GLubyte *) rb->Data + 3 * (y[i] * rb->Width + x[i]);

+         dst[0] = src[i * 4 + 0];

+         dst[1] = src[i * 4 + 1];

+         dst[2] = src[i * 4 + 2];

+      }

+   }

+}

+

+

+static void

+put_mono_values_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                       GLuint count, const GLint x[], const GLint y[],

+                       const void *value, const GLubyte *mask)

+{

+   /* note: incoming value is RGB+A! */

+   const GLubyte val0 = ((const GLubyte *) value)[0];

+   const GLubyte val1 = ((const GLubyte *) value)[1];

+   const GLubyte val2 = ((const GLubyte *) value)[2];

+   GLuint i;

+   ASSERT(rb->Format == MESA_FORMAT_RGB888);

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLubyte *dst = (GLubyte *) rb->Data + 3 * (y[i] * rb->Width + x[i]);

+         dst[0] = val0;

+         dst[1] = val1;

+         dst[2] = val2;

+      }

+   }

+}

+

+

+/**********************************************************************

+ * Functions for buffers of 4 X GLubyte (or GLbyte) values.

+ * Typically color buffers.

+ */

+

+static void *

+get_pointer_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                   GLint x, GLint y)

+{

+   if (!rb->Data)

+      return NULL;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);

+   return (GLubyte *) rb->Data + 4 * (y * rb->Width + x);

+}

+

+

+static void

+get_row_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+               GLint x, GLint y, void *values)

+{

+   const GLubyte *src = (const GLubyte *) rb->Data + 4 * (y * rb->Width + x);

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);

+   memcpy(values, src, 4 * count * sizeof(GLubyte));

+}

+

+

+static void

+get_values_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                  const GLint x[], const GLint y[], void *values)

+{

+   /* treat 4*GLubyte as 1*GLuint */

+   GLuint *dst = (GLuint *) values;

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);

+   for (i = 0; i < count; i++) {

+      const GLuint *src = (GLuint *) rb->Data + (y[i] * rb->Width + x[i]);

+      dst[i] = *src;

+   }

+}

+

+

+static void

+put_row_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+               GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   /* treat 4*GLubyte as 1*GLuint */

+   const GLuint *src = (const GLuint *) values;

+   GLuint *dst = (GLuint *) rb->Data + (y * rb->Width + x);

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);

+   if (mask) {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            dst[i] = src[i];

+         }

+      }

+   }

+   else {

+      memcpy(dst, src, 4 * count * sizeof(GLubyte));

+   }

+}

+

+

+static void

+put_row_rgb_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                   GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   /* Store RGB values in RGBA buffer */

+   const GLubyte *src = (const GLubyte *) values;

+   GLubyte *dst = (GLubyte *) rb->Data + 4 * (y * rb->Width + x);

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         dst[i * 4 + 0] = src[i * 3 + 0];

+         dst[i * 4 + 1] = src[i * 3 + 1];

+         dst[i * 4 + 2] = src[i * 3 + 2];

+         dst[i * 4 + 3] = 0xff;

+      }

+   }

+}

+

+

+static void

+put_mono_row_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                    GLint x, GLint y, const void *value, const GLubyte *mask)

+{

+   /* treat 4*GLubyte as 1*GLuint */

+   const GLuint val = *((const GLuint *) value);

+   GLuint *dst = (GLuint *) rb->Data + (y * rb->Width + x);

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);

+   if (!mask && val == 0) {

+      /* common case */

+      memset(dst, 0, count * 4 * sizeof(GLubyte));

+   }

+   else {

+      /* general case */

+      if (mask) {

+         GLuint i;

+         for (i = 0; i < count; i++) {

+            if (mask[i]) {

+               dst[i] = val;

+            }

+         }

+      }

+      else {

+         GLuint i;

+         for (i = 0; i < count; i++) {

+            dst[i] = val;

+         }

+      }

+   }

+}

+

+

+static void

+put_values_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                  const GLint x[], const GLint y[], const void *values,

+                  const GLubyte *mask)

+{

+   /* treat 4*GLubyte as 1*GLuint */

+   const GLuint *src = (const GLuint *) values;

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLuint *dst = (GLuint *) rb->Data + (y[i] * rb->Width + x[i]);

+         *dst = src[i];

+      }

+   }

+}

+

+

+static void

+put_mono_values_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                       GLuint count, const GLint x[], const GLint y[],

+                       const void *value, const GLubyte *mask)

+{

+   /* treat 4*GLubyte as 1*GLuint */

+   const GLuint val = *((const GLuint *) value);

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(rb->Format == MESA_FORMAT_RGBA8888);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLuint *dst = (GLuint *) rb->Data + (y[i] * rb->Width + x[i]);

+         *dst = val;

+      }

+   }

+}

+

+

+/**********************************************************************

+ * Functions for buffers of 4 X GLushort (or GLshort) values.

+ * Typically accum buffer.

+ */

+

+static void *

+get_pointer_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                    GLint x, GLint y)

+{

+   if (!rb->Data)

+      return NULL;

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);

+   return (GLushort *) rb->Data + 4 * (y * rb->Width + x);

+}

+

+

+static void

+get_row_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                GLint x, GLint y, void *values)

+{

+   const GLshort *src = (const GLshort *) rb->Data + 4 * (y * rb->Width + x);

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);

+   memcpy(values, src, 4 * count * sizeof(GLshort));

+}

+

+

+static void

+get_values_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                   const GLint x[], const GLint y[], void *values)

+{

+   GLushort *dst = (GLushort *) values;

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);

+   for (i = 0; i < count; i++) {

+      const GLushort *src

+         = (GLushort *) rb->Data + 4 * (y[i] * rb->Width + x[i]);

+      dst[i] = *src;

+   }

+}

+

+

+static void

+put_row_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   const GLushort *src = (const GLushort *) values;

+   GLushort *dst = (GLushort *) rb->Data + 4 * (y * rb->Width + x);

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);

+   if (mask) {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            dst[i * 4 + 0] = src[i * 4 + 0];

+            dst[i * 4 + 1] = src[i * 4 + 1];

+            dst[i * 4 + 2] = src[i * 4 + 2];

+            dst[i * 4 + 3] = src[i * 4 + 3];

+         }

+      }

+   }

+   else {

+      memcpy(dst, src, 4 * count * sizeof(GLushort));

+   }

+}

+

+

+static void

+put_row_rgb_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                    GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   /* Put RGB values in RGBA buffer */

+   const GLushort *src = (const GLushort *) values;

+   GLushort *dst = (GLushort *) rb->Data + 4 * (y * rb->Width + x);

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);

+   if (mask) {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            dst[i * 4 + 0] = src[i * 3 + 0];

+            dst[i * 4 + 1] = src[i * 3 + 1];

+            dst[i * 4 + 2] = src[i * 3 + 2];

+            dst[i * 4 + 3] = 0xffff;

+         }

+      }

+   }

+   else {

+      memcpy(dst, src, 4 * count * sizeof(GLushort));

+   }

+}

+

+

+static void

+put_mono_row_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                     GLint x, GLint y, const void *value, const GLubyte *mask)

+{

+   const GLushort val0 = ((const GLushort *) value)[0];

+   const GLushort val1 = ((const GLushort *) value)[1];

+   const GLushort val2 = ((const GLushort *) value)[2];

+   const GLushort val3 = ((const GLushort *) value)[3];

+   GLushort *dst = (GLushort *) rb->Data + 4 * (y * rb->Width + x);

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);

+   if (!mask && val0 == 0 && val1 == 0 && val2 == 0 && val3 == 0) {

+      /* common case for clearing accum buffer */

+      memset(dst, 0, count * 4 * sizeof(GLushort));

+   }

+   else {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            dst[i * 4 + 0] = val0;

+            dst[i * 4 + 1] = val1;

+            dst[i * 4 + 2] = val2;

+            dst[i * 4 + 3] = val3;

+         }

+      }

+   }

+}

+

+

+static void

+put_values_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                   const GLint x[], const GLint y[], const void *values,

+                   const GLubyte *mask)

+{

+   const GLushort *src = (const GLushort *) values;

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLushort *dst = (GLushort *) rb->Data + 4 * (y[i] * rb->Width + x[i]);

+         dst[0] = src[i * 4 + 0];

+         dst[1] = src[i * 4 + 1];

+         dst[2] = src[i * 4 + 2];

+         dst[3] = src[i * 4 + 3];

+      }

+   }

+}

+

+

+static void

+put_mono_values_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                        GLuint count, const GLint x[], const GLint y[],

+                        const void *value, const GLubyte *mask)

+{

+   const GLushort val0 = ((const GLushort *) value)[0];

+   const GLushort val1 = ((const GLushort *) value)[1];

+   const GLushort val2 = ((const GLushort *) value)[2];

+   const GLushort val3 = ((const GLushort *) value)[3];

+   GLuint i;

+   ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLushort *dst = (GLushort *) rb->Data + 4 * (y[i] * rb->Width + x[i]);

+         dst[0] = val0;

+         dst[1] = val1;

+         dst[2] = val2;

+         dst[3] = val3;

+      }

+   }

+}

+

+

+

+/**

+ * This is a software fallback for the gl_renderbuffer->AllocStorage

+ * function.

+ * Device drivers will typically override this function for the buffers

+ * which it manages (typically color buffers, Z and stencil).

+ * Other buffers (like software accumulation and aux buffers) which the driver

+ * doesn't manage can be handled with this function.

+ *

+ * This one multi-purpose function can allocate stencil, depth, accum, color

+ * or color-index buffers!

+ *

+ * This function also plugs in the appropriate GetPointer, Get/PutRow and

+ * Get/PutValues functions.

+ */

+GLboolean

+_mesa_soft_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                                GLenum internalFormat,

+                                GLuint width, GLuint height)

+{

+   GLuint pixelSize;

+

+   switch (internalFormat) {

+   case GL_RGB:

+   case GL_R3_G3_B2:

+   case GL_RGB4:

+   case GL_RGB5:

+   case GL_RGB8:

+   case GL_RGB10:

+   case GL_RGB12:

+   case GL_RGB16:

+      rb->Format = MESA_FORMAT_RGB888;

+      rb->DataType = GL_UNSIGNED_BYTE;

+      rb->GetPointer = get_pointer_ubyte3;

+      rb->GetRow = get_row_ubyte3;

+      rb->GetValues = get_values_ubyte3;

+      rb->PutRow = put_row_ubyte3;

+      rb->PutRowRGB = put_row_rgb_ubyte3;

+      rb->PutMonoRow = put_mono_row_ubyte3;

+      rb->PutValues = put_values_ubyte3;

+      rb->PutMonoValues = put_mono_values_ubyte3;

+      pixelSize = 3 * sizeof(GLubyte);

+      break;

+   case GL_RGBA:

+   case GL_RGBA2:

+   case GL_RGBA4:

+   case GL_RGB5_A1:

+   case GL_RGBA8:

+#if 1

+   case GL_RGB10_A2:

+   case GL_RGBA12:

+#endif

+      rb->Format = MESA_FORMAT_RGBA8888;

+      rb->DataType = GL_UNSIGNED_BYTE;

+      rb->GetPointer = get_pointer_ubyte4;

+      rb->GetRow = get_row_ubyte4;

+      rb->GetValues = get_values_ubyte4;

+      rb->PutRow = put_row_ubyte4;

+      rb->PutRowRGB = put_row_rgb_ubyte4;

+      rb->PutMonoRow = put_mono_row_ubyte4;

+      rb->PutValues = put_values_ubyte4;

+      rb->PutMonoValues = put_mono_values_ubyte4;

+      pixelSize = 4 * sizeof(GLubyte);

+      break;

+   case GL_RGBA16:

+   case GL_RGBA16_SNORM:

+      /* for accum buffer */

+      rb->Format = MESA_FORMAT_SIGNED_RGBA_16;

+      rb->DataType = GL_SHORT;

+      rb->GetPointer = get_pointer_ushort4;

+      rb->GetRow = get_row_ushort4;

+      rb->GetValues = get_values_ushort4;

+      rb->PutRow = put_row_ushort4;

+      rb->PutRowRGB = put_row_rgb_ushort4;

+      rb->PutMonoRow = put_mono_row_ushort4;

+      rb->PutValues = put_values_ushort4;

+      rb->PutMonoValues = put_mono_values_ushort4;

+      pixelSize = 4 * sizeof(GLushort);

+      break;

+#if 0

+   case GL_ALPHA8:

+      rb->Format = MESA_FORMAT_A8;

+      rb->DataType = GL_UNSIGNED_BYTE;

+      rb->GetPointer = get_pointer_alpha8;

+      rb->GetRow = get_row_alpha8;

+      rb->GetValues = get_values_alpha8;

+      rb->PutRow = put_row_alpha8;

+      rb->PutRowRGB = NULL;

+      rb->PutMonoRow = put_mono_row_alpha8;

+      rb->PutValues = put_values_alpha8;

+      rb->PutMonoValues = put_mono_values_alpha8;

+      pixelSize = sizeof(GLubyte);

+      break;

+#endif

+   case GL_STENCIL_INDEX:

+   case GL_STENCIL_INDEX1_EXT:

+   case GL_STENCIL_INDEX4_EXT:

+   case GL_STENCIL_INDEX8_EXT:

+   case GL_STENCIL_INDEX16_EXT:

+      rb->Format = MESA_FORMAT_S8;

+      rb->DataType = GL_UNSIGNED_BYTE;

+      rb->GetPointer = get_pointer_ubyte;

+      rb->GetRow = get_row_ubyte;

+      rb->GetValues = get_values_ubyte;

+      rb->PutRow = put_row_ubyte;

+      rb->PutRowRGB = NULL;

+      rb->PutMonoRow = put_mono_row_ubyte;

+      rb->PutValues = put_values_ubyte;

+      rb->PutMonoValues = put_mono_values_ubyte;

+      pixelSize = sizeof(GLubyte);

+      break;

+   case GL_DEPTH_COMPONENT:

+   case GL_DEPTH_COMPONENT16:

+      rb->Format = MESA_FORMAT_Z16;

+      rb->DataType = GL_UNSIGNED_SHORT;

+      rb->GetPointer = get_pointer_ushort;

+      rb->GetRow = get_row_ushort;

+      rb->GetValues = get_values_ushort;

+      rb->PutRow = put_row_ushort;

+      rb->PutRowRGB = NULL;

+      rb->PutMonoRow = put_mono_row_ushort;

+      rb->PutValues = put_values_ushort;

+      rb->PutMonoValues = put_mono_values_ushort;

+      pixelSize = sizeof(GLushort);

+      break;

+   case GL_DEPTH_COMPONENT24:

+      rb->DataType = GL_UNSIGNED_INT;

+      rb->GetPointer = get_pointer_uint;

+      rb->GetRow = get_row_uint;

+      rb->GetValues = get_values_uint;

+      rb->PutRow = put_row_uint;

+      rb->PutRowRGB = NULL;

+      rb->PutMonoRow = put_mono_row_uint;

+      rb->PutValues = put_values_uint;

+      rb->PutMonoValues = put_mono_values_uint;

+      rb->Format = MESA_FORMAT_X8_Z24;

+      pixelSize = sizeof(GLuint);

+      break;

+   case GL_DEPTH_COMPONENT32:

+      rb->DataType = GL_UNSIGNED_INT;

+      rb->GetPointer = get_pointer_uint;

+      rb->GetRow = get_row_uint;

+      rb->GetValues = get_values_uint;

+      rb->PutRow = put_row_uint;

+      rb->PutRowRGB = NULL;

+      rb->PutMonoRow = put_mono_row_uint;

+      rb->PutValues = put_values_uint;

+      rb->PutMonoValues = put_mono_values_uint;

+      rb->Format = MESA_FORMAT_Z32;

+      pixelSize = sizeof(GLuint);

+      break;

+   case GL_DEPTH_STENCIL_EXT:

+   case GL_DEPTH24_STENCIL8_EXT:

+      rb->Format = MESA_FORMAT_Z24_S8;

+      rb->DataType = GL_UNSIGNED_INT_24_8_EXT;

+      rb->GetPointer = get_pointer_uint;

+      rb->GetRow = get_row_uint;

+      rb->GetValues = get_values_uint;

+      rb->PutRow = put_row_uint;

+      rb->PutRowRGB = NULL;

+      rb->PutMonoRow = put_mono_row_uint;

+      rb->PutValues = put_values_uint;

+      rb->PutMonoValues = put_mono_values_uint;

+      pixelSize = sizeof(GLuint);

+      break;

+   default:

+      /* unsupported format */

+      return GL_FALSE;

+   }

+

+   ASSERT(rb->DataType);

+   ASSERT(rb->GetPointer);

+   ASSERT(rb->GetRow);

+   ASSERT(rb->GetValues);

+   ASSERT(rb->PutRow);

+   ASSERT(rb->PutMonoRow);

+   ASSERT(rb->PutValues);

+   ASSERT(rb->PutMonoValues);

+

+   /* free old buffer storage */

+   if (rb->Data) {

+      free(rb->Data);

+      rb->Data = NULL;

+   }

+

+   if (width > 0 && height > 0) {

+      /* allocate new buffer storage */

+      rb->Data = malloc(width * height * pixelSize);

+

+      if (rb->Data == NULL) {

+         rb->Width = 0;

+         rb->Height = 0;

+         _mesa_error(ctx, GL_OUT_OF_MEMORY,

+                     "software renderbuffer allocation (%d x %d x %d)",

+                     width, height, pixelSize);

+         return GL_FALSE;

+      }

+   }

+

+   rb->Width = width;

+   rb->Height = height;

+   rb->_BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);

+

+   if (rb->Name == 0 &&

+       internalFormat == GL_RGBA16_SNORM &&

+       rb->_BaseFormat == 0) {

+      /* NOTE: This is a special case just for accumulation buffers.

+       * This is a very limited use case- there's no snorm texturing or

+       * rendering going on.

+       */

+      rb->_BaseFormat = GL_RGBA;

+   }

+   else {

+      /* the internalFormat should have been error checked long ago */

+      ASSERT(rb->_BaseFormat);

+   }

+

+   return GL_TRUE;

+}

+

+

+

+/**********************************************************************/

+/**********************************************************************/

+/**********************************************************************/

+

+

+/**

+ * Here we utilize the gl_renderbuffer->Wrapper field to put an alpha

+ * buffer wrapper around an existing RGB renderbuffer (hw or sw).

+ *

+ * When PutRow is called (for example), we store the alpha values in

+ * this buffer, then pass on the PutRow call to the wrapped RGB

+ * buffer.

+ */

+

+

+static GLboolean

+alloc_storage_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb,

+                     GLenum internalFormat, GLuint width, GLuint height)

+{

+   ASSERT(arb != arb->Wrapped);

+   ASSERT(arb->Format == MESA_FORMAT_A8);

+

+   /* first, pass the call to the wrapped RGB buffer */

+   if (!arb->Wrapped->AllocStorage(ctx, arb->Wrapped, internalFormat,

+                                  width, height)) {

+      return GL_FALSE;

+   }

+

+   /* next, resize my alpha buffer */

+   if (arb->Data) {

+      free(arb->Data);

+   }

+

+   arb->Data = malloc(width * height * sizeof(GLubyte));

+   if (arb->Data == NULL) {

+      arb->Width = 0;

+      arb->Height = 0;

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "software alpha buffer allocation");

+      return GL_FALSE;

+   }

+

+   arb->Width = width;

+   arb->Height = height;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Delete an alpha_renderbuffer object, as well as the wrapped RGB buffer.

+ */

+static void

+delete_renderbuffer_alpha8(struct gl_renderbuffer *arb)

+{

+   if (arb->Data) {

+      free(arb->Data);

+   }

+   ASSERT(arb->Wrapped);

+   ASSERT(arb != arb->Wrapped);

+   arb->Wrapped->Delete(arb->Wrapped);

+   arb->Wrapped = NULL;

+   free(arb);

+}

+

+

+static void *

+get_pointer_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb,

+                   GLint x, GLint y)

+{

+   return NULL;   /* don't allow direct access! */

+}

+

+

+static void

+get_row_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,

+               GLint x, GLint y, void *values)

+{

+   /* NOTE: 'values' is RGBA format! */

+   const GLubyte *src = (const GLubyte *) arb->Data + y * arb->Width + x;

+   GLubyte *dst = (GLubyte *) values;

+   GLuint i;

+   ASSERT(arb != arb->Wrapped);

+   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);

+   /* first, pass the call to the wrapped RGB buffer */

+   arb->Wrapped->GetRow(ctx, arb->Wrapped, count, x, y, values);

+   /* second, fill in alpha values from this buffer! */

+   for (i = 0; i < count; i++) {

+      dst[i * 4 + 3] = src[i];

+   }

+}

+

+

+static void

+get_values_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,

+                  const GLint x[], const GLint y[], void *values)

+{

+   GLubyte *dst = (GLubyte *) values;

+   GLuint i;

+   ASSERT(arb != arb->Wrapped);

+   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);

+   /* first, pass the call to the wrapped RGB buffer */

+   arb->Wrapped->GetValues(ctx, arb->Wrapped, count, x, y, values);

+   /* second, fill in alpha values from this buffer! */

+   for (i = 0; i < count; i++) {

+      const GLubyte *src = (GLubyte *) arb->Data + y[i] * arb->Width + x[i];

+      dst[i * 4 + 3] = *src;

+   }

+}

+

+

+static void

+put_row_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,

+               GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   const GLubyte *src = (const GLubyte *) values;

+   GLubyte *dst = (GLubyte *) arb->Data + y * arb->Width + x;

+   GLuint i;

+   ASSERT(arb != arb->Wrapped);

+   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);

+   /* first, pass the call to the wrapped RGB buffer */

+   arb->Wrapped->PutRow(ctx, arb->Wrapped, count, x, y, values, mask);

+   /* second, store alpha in our buffer */

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         dst[i] = src[i * 4 + 3];

+      }

+   }

+}

+

+

+static void

+put_row_rgb_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,

+                   GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   const GLubyte *src = (const GLubyte *) values;

+   GLubyte *dst = (GLubyte *) arb->Data + y * arb->Width + x;

+   GLuint i;

+   ASSERT(arb != arb->Wrapped);

+   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);

+   /* first, pass the call to the wrapped RGB buffer */

+   arb->Wrapped->PutRowRGB(ctx, arb->Wrapped, count, x, y, values, mask);

+   /* second, store alpha in our buffer */

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         dst[i] = src[i * 4 + 3];

+      }

+   }

+}

+

+

+static void

+put_mono_row_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,

+                    GLint x, GLint y, const void *value, const GLubyte *mask)

+{

+   const GLubyte val = ((const GLubyte *) value)[3];

+   GLubyte *dst = (GLubyte *) arb->Data + y * arb->Width + x;

+   ASSERT(arb != arb->Wrapped);

+   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);

+   /* first, pass the call to the wrapped RGB buffer */

+   arb->Wrapped->PutMonoRow(ctx, arb->Wrapped, count, x, y, value, mask);

+   /* second, store alpha in our buffer */

+   if (mask) {

+      GLuint i;

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            dst[i] = val;

+         }

+      }

+   }

+   else {

+      memset(dst, val, count);

+   }

+}

+

+

+static void

+put_values_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,

+                  const GLint x[], const GLint y[],

+                  const void *values, const GLubyte *mask)

+{

+   const GLubyte *src = (const GLubyte *) values;

+   GLuint i;

+   ASSERT(arb != arb->Wrapped);

+   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);

+   /* first, pass the call to the wrapped RGB buffer */

+   arb->Wrapped->PutValues(ctx, arb->Wrapped, count, x, y, values, mask);

+   /* second, store alpha in our buffer */

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLubyte *dst = (GLubyte *) arb->Data + y[i] * arb->Width + x[i];

+         *dst = src[i * 4 + 3];

+      }

+   }

+}

+

+

+static void

+put_mono_values_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb,

+                       GLuint count, const GLint x[], const GLint y[],

+                       const void *value, const GLubyte *mask)

+{

+   const GLubyte val = ((const GLubyte *) value)[3];

+   GLuint i;

+   ASSERT(arb != arb->Wrapped);

+   ASSERT(arb->DataType == GL_UNSIGNED_BYTE);

+   /* first, pass the call to the wrapped RGB buffer */

+   arb->Wrapped->PutValues(ctx, arb->Wrapped, count, x, y, value, mask);

+   /* second, store alpha in our buffer */

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+         GLubyte *dst = (GLubyte *) arb->Data + y[i] * arb->Width + x[i];

+         *dst = val;

+      }

+   }

+}

+

+

+static void

+copy_buffer_alpha8(struct gl_renderbuffer* dst, struct gl_renderbuffer* src)

+{

+   ASSERT(dst->Format == MESA_FORMAT_A8);

+   ASSERT(src->Format == MESA_FORMAT_A8);

+   ASSERT(dst->Width == src->Width);

+   ASSERT(dst->Height == src->Height);

+

+   memcpy(dst->Data, src->Data, dst->Width * dst->Height * sizeof(GLubyte));

+}

+

+

+/**********************************************************************/

+/**********************************************************************/

+/**********************************************************************/

+

+

+/**

+ * Default GetPointer routine.  Always return NULL to indicate that

+ * direct buffer access is not supported.

+ */

+static void *

+nop_get_pointer(struct gl_context *ctx, struct gl_renderbuffer *rb, GLint x, GLint y)

+{

+   return NULL;

+}

+

+

+/**

+ * Initialize the fields of a gl_renderbuffer to default values.

+ */

+void

+_mesa_init_renderbuffer(struct gl_renderbuffer *rb, GLuint name)

+{

+   _glthread_INIT_MUTEX(rb->Mutex);

+

+   rb->Magic = RB_MAGIC;

+   rb->ClassID = 0;

+   rb->Name = name;

+   rb->RefCount = 0;

+   rb->Delete = _mesa_delete_renderbuffer;

+

+   /* The rest of these should be set later by the caller of this function or

+    * the AllocStorage method:

+    */

+   rb->AllocStorage = NULL;

+

+   rb->Width = 0;

+   rb->Height = 0;

+   rb->InternalFormat = GL_NONE;

+   rb->Format = MESA_FORMAT_NONE;

+

+   rb->DataType = GL_NONE;

+   rb->Data = NULL;

+

+   /* Point back to ourself so that we don't have to check for Wrapped==NULL

+    * all over the drivers.

+    */

+   rb->Wrapped = rb;

+

+   rb->GetPointer = nop_get_pointer;

+   rb->GetRow = NULL;

+   rb->GetValues = NULL;

+   rb->PutRow = NULL;

+   rb->PutRowRGB = NULL;

+   rb->PutMonoRow = NULL;

+   rb->PutValues = NULL;

+   rb->PutMonoValues = NULL;

+}

+

+

+/**

+ * Allocate a new gl_renderbuffer object.  This can be used for user-created

+ * renderbuffers or window-system renderbuffers.

+ */

+struct gl_renderbuffer *

+_mesa_new_renderbuffer(struct gl_context *ctx, GLuint name)

+{

+   struct gl_renderbuffer *rb = CALLOC_STRUCT(gl_renderbuffer);

+   if (rb) {

+      _mesa_init_renderbuffer(rb, name);

+   }

+   return rb;

+}

+

+

+/**

+ * Delete a gl_framebuffer.

+ * This is the default function for renderbuffer->Delete().

+ */

+void

+_mesa_delete_renderbuffer(struct gl_renderbuffer *rb)

+{

+   if (rb->Data) {

+      free(rb->Data);

+   }

+   free(rb);

+}

+

+

+/**

+ * Allocate a software-based renderbuffer.  This is called via the

+ * ctx->Driver.NewRenderbuffer() function when the user creates a new

+ * renderbuffer.

+ * This would not be used for hardware-based renderbuffers.

+ */

+struct gl_renderbuffer *

+_mesa_new_soft_renderbuffer(struct gl_context *ctx, GLuint name)

+{

+   struct gl_renderbuffer *rb = _mesa_new_renderbuffer(ctx, name);

+   if (rb) {

+      rb->AllocStorage = _mesa_soft_renderbuffer_storage;

+      /* Normally, one would setup the PutRow, GetRow, etc functions here.

+       * But we're doing that in the _mesa_soft_renderbuffer_storage() function

+       * instead.

+       */

+   }

+   return rb;

+}

+

+

+/**

+ * Add software-based color renderbuffers to the given framebuffer.

+ * This is a helper routine for device drivers when creating a

+ * window system framebuffer (not a user-created render/framebuffer).

+ * Once this function is called, you can basically forget about this

+ * renderbuffer; core Mesa will handle all the buffer management and

+ * rendering!

+ */

+GLboolean

+_mesa_add_color_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,

+                              GLuint rgbBits, GLuint alphaBits,

+                              GLboolean frontLeft, GLboolean backLeft,

+                              GLboolean frontRight, GLboolean backRight)

+{

+   gl_buffer_index b;

+

+   if (rgbBits > 16 || alphaBits > 16) {

+      _mesa_problem(ctx,

+                    "Unsupported bit depth in _mesa_add_color_renderbuffers");

+      return GL_FALSE;

+   }

+

+   assert(MAX_COLOR_ATTACHMENTS >= 4);

+

+   for (b = BUFFER_FRONT_LEFT; b <= BUFFER_BACK_RIGHT; b++) {

+      struct gl_renderbuffer *rb;

+

+      if (b == BUFFER_FRONT_LEFT && !frontLeft)

+         continue;

+      else if (b == BUFFER_BACK_LEFT && !backLeft)

+         continue;

+      else if (b == BUFFER_FRONT_RIGHT && !frontRight)

+         continue;

+      else if (b == BUFFER_BACK_RIGHT && !backRight)

+         continue;

+

+      assert(fb->Attachment[b].Renderbuffer == NULL);

+

+      rb = _mesa_new_renderbuffer(ctx, 0);

+      if (!rb) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating color buffer");

+         return GL_FALSE;

+      }

+

+      if (rgbBits <= 8) {

+         if (alphaBits)

+            rb->Format = MESA_FORMAT_RGBA8888;

+         else

+            rb->Format = MESA_FORMAT_RGB888;

+      }

+      else {

+         assert(rgbBits <= 16);

+         rb->Format = MESA_FORMAT_NONE; /*XXX RGBA16;*/

+      }

+      rb->InternalFormat = GL_RGBA;

+

+      rb->AllocStorage = _mesa_soft_renderbuffer_storage;

+      _mesa_add_renderbuffer(fb, b, rb);

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Add software-based alpha renderbuffers to the given framebuffer.

+ * This is a helper routine for device drivers when creating a

+ * window system framebuffer (not a user-created render/framebuffer).

+ * Once this function is called, you can basically forget about this

+ * renderbuffer; core Mesa will handle all the buffer management and

+ * rendering!

+ */

+GLboolean

+_mesa_add_alpha_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,

+                              GLuint alphaBits,

+                              GLboolean frontLeft, GLboolean backLeft,

+                              GLboolean frontRight, GLboolean backRight)

+{

+   gl_buffer_index b;

+

+   /* for window system framebuffers only! */

+   assert(fb->Name == 0);

+

+   if (alphaBits > 8) {

+      _mesa_problem(ctx,

+                    "Unsupported bit depth in _mesa_add_alpha_renderbuffers");

+      return GL_FALSE;

+   }

+

+   assert(MAX_COLOR_ATTACHMENTS >= 4);

+

+   /* Wrap each of the RGB color buffers with an alpha renderbuffer.

+    */

+   for (b = BUFFER_FRONT_LEFT; b <= BUFFER_BACK_RIGHT; b++) {

+      struct gl_renderbuffer *arb;

+

+      if (b == BUFFER_FRONT_LEFT && !frontLeft)

+         continue;

+      else if (b == BUFFER_BACK_LEFT && !backLeft)

+         continue;

+      else if (b == BUFFER_FRONT_RIGHT && !frontRight)

+         continue;

+      else if (b == BUFFER_BACK_RIGHT && !backRight)

+         continue;

+

+      /* the RGB buffer to wrap must already exist!! */

+      assert(fb->Attachment[b].Renderbuffer);

+

+      /* only GLubyte supported for now */

+      assert(fb->Attachment[b].Renderbuffer->DataType == GL_UNSIGNED_BYTE);

+

+      /* allocate alpha renderbuffer */

+      arb = _mesa_new_renderbuffer(ctx, 0);

+      if (!arb) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating alpha buffer");

+         return GL_FALSE;

+      }

+

+      /* wrap the alpha renderbuffer around the RGB renderbuffer */

+      arb->Wrapped = fb->Attachment[b].Renderbuffer;

+

+      /* Set up my alphabuffer fields and plug in my functions.

+       * The functions will put/get the alpha values from/to RGBA arrays

+       * and then call the wrapped buffer's functions to handle the RGB

+       * values.

+       */

+      arb->InternalFormat = arb->Wrapped->InternalFormat;

+      arb->Format         = MESA_FORMAT_A8;

+      arb->DataType       = arb->Wrapped->DataType;

+      arb->AllocStorage   = alloc_storage_alpha8;

+      arb->Delete         = delete_renderbuffer_alpha8;

+      arb->GetPointer     = get_pointer_alpha8;

+      arb->GetRow         = get_row_alpha8;

+      arb->GetValues      = get_values_alpha8;

+      arb->PutRow         = put_row_alpha8;

+      arb->PutRowRGB      = put_row_rgb_alpha8;

+      arb->PutMonoRow     = put_mono_row_alpha8;

+      arb->PutValues      = put_values_alpha8;

+      arb->PutMonoValues  = put_mono_values_alpha8;

+

+      /* clear the pointer to avoid assertion/sanity check failure later */

+      fb->Attachment[b].Renderbuffer = NULL;

+

+      /* plug the alpha renderbuffer into the colorbuffer attachment */

+      _mesa_add_renderbuffer(fb, b, arb);

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * For framebuffers that use a software alpha channel wrapper

+ * created by _mesa_add_alpha_renderbuffer or _mesa_add_soft_renderbuffers,

+ * copy the back buffer alpha channel into the front buffer alpha channel.

+ */

+void

+_mesa_copy_soft_alpha_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb)

+{

+   if (fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer &&

+       fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer)

+      copy_buffer_alpha8(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer,

+                         fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer);

+

+

+   if (fb->Attachment[BUFFER_FRONT_RIGHT].Renderbuffer &&

+       fb->Attachment[BUFFER_BACK_RIGHT].Renderbuffer)

+      copy_buffer_alpha8(fb->Attachment[BUFFER_FRONT_RIGHT].Renderbuffer,

+                         fb->Attachment[BUFFER_BACK_RIGHT].Renderbuffer);

+}

+

+

+/**

+ * Add a software-based depth renderbuffer to the given framebuffer.

+ * This is a helper routine for device drivers when creating a

+ * window system framebuffer (not a user-created render/framebuffer).

+ * Once this function is called, you can basically forget about this

+ * renderbuffer; core Mesa will handle all the buffer management and

+ * rendering!

+ */

+GLboolean

+_mesa_add_depth_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,

+                             GLuint depthBits)

+{

+   struct gl_renderbuffer *rb;

+

+   if (depthBits > 32) {

+      _mesa_problem(ctx,

+                    "Unsupported depthBits in _mesa_add_depth_renderbuffer");

+      return GL_FALSE;

+   }

+

+   assert(fb->Attachment[BUFFER_DEPTH].Renderbuffer == NULL);

+

+   rb = _mesa_new_renderbuffer(ctx, 0);

+   if (!rb) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating depth buffer");

+      return GL_FALSE;

+   }

+

+   if (depthBits <= 16) {

+      rb->Format = MESA_FORMAT_Z16;

+      rb->InternalFormat = GL_DEPTH_COMPONENT16;

+   }

+   else if (depthBits <= 24) {

+      rb->Format = MESA_FORMAT_X8_Z24;

+      rb->InternalFormat = GL_DEPTH_COMPONENT24;

+   }

+   else {

+      rb->Format = MESA_FORMAT_Z32;

+      rb->InternalFormat = GL_DEPTH_COMPONENT32;

+   }

+

+   rb->AllocStorage = _mesa_soft_renderbuffer_storage;

+   _mesa_add_renderbuffer(fb, BUFFER_DEPTH, rb);

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Add a software-based stencil renderbuffer to the given framebuffer.

+ * This is a helper routine for device drivers when creating a

+ * window system framebuffer (not a user-created render/framebuffer).

+ * Once this function is called, you can basically forget about this

+ * renderbuffer; core Mesa will handle all the buffer management and

+ * rendering!

+ */

+GLboolean

+_mesa_add_stencil_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,

+                               GLuint stencilBits)

+{

+   struct gl_renderbuffer *rb;

+

+   if (stencilBits > 16) {

+      _mesa_problem(ctx,

+                  "Unsupported stencilBits in _mesa_add_stencil_renderbuffer");

+      return GL_FALSE;

+   }

+

+   assert(fb->Attachment[BUFFER_STENCIL].Renderbuffer == NULL);

+

+   rb = _mesa_new_renderbuffer(ctx, 0);

+   if (!rb) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating stencil buffer");

+      return GL_FALSE;

+   }

+

+   assert(stencilBits <= 8);

+   rb->Format = MESA_FORMAT_S8;

+   rb->InternalFormat = GL_STENCIL_INDEX8;

+

+   rb->AllocStorage = _mesa_soft_renderbuffer_storage;

+   _mesa_add_renderbuffer(fb, BUFFER_STENCIL, rb);

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Add a software-based accumulation renderbuffer to the given framebuffer.

+ * This is a helper routine for device drivers when creating a

+ * window system framebuffer (not a user-created render/framebuffer).

+ * Once this function is called, you can basically forget about this

+ * renderbuffer; core Mesa will handle all the buffer management and

+ * rendering!

+ */

+GLboolean

+_mesa_add_accum_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,

+                             GLuint redBits, GLuint greenBits,

+                             GLuint blueBits, GLuint alphaBits)

+{

+   struct gl_renderbuffer *rb;

+

+   if (redBits > 16 || greenBits > 16 || blueBits > 16 || alphaBits > 16) {

+      _mesa_problem(ctx,

+                    "Unsupported accumBits in _mesa_add_accum_renderbuffer");

+      return GL_FALSE;

+   }

+

+   assert(fb->Attachment[BUFFER_ACCUM].Renderbuffer == NULL);

+

+   rb = _mesa_new_renderbuffer(ctx, 0);

+   if (!rb) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating accum buffer");

+      return GL_FALSE;

+   }

+

+   rb->Format = MESA_FORMAT_SIGNED_RGBA_16;

+   rb->InternalFormat = GL_RGBA16_SNORM;

+   rb->AllocStorage = _mesa_soft_renderbuffer_storage;

+   _mesa_add_renderbuffer(fb, BUFFER_ACCUM, rb);

+

+   return GL_TRUE;

+}

+

+

+

+/**

+ * Add a software-based aux renderbuffer to the given framebuffer.

+ * This is a helper routine for device drivers when creating a

+ * window system framebuffer (not a user-created render/framebuffer).

+ * Once this function is called, you can basically forget about this

+ * renderbuffer; core Mesa will handle all the buffer management and

+ * rendering!

+ *

+ * NOTE: color-index aux buffers not supported.

+ */

+GLboolean

+_mesa_add_aux_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,

+                            GLuint colorBits, GLuint numBuffers)

+{

+   GLuint i;

+

+   if (colorBits > 16) {

+      _mesa_problem(ctx,

+                    "Unsupported accumBits in _mesa_add_aux_renderbuffers");

+      return GL_FALSE;

+   }

+

+   assert(numBuffers <= MAX_AUX_BUFFERS);

+

+   for (i = 0; i < numBuffers; i++) {

+      struct gl_renderbuffer *rb = _mesa_new_renderbuffer(ctx, 0);

+

+      assert(fb->Attachment[BUFFER_AUX0 + i].Renderbuffer == NULL);

+

+      if (!rb) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating aux buffer");

+         return GL_FALSE;

+      }

+

+      assert (colorBits <= 8);

+      rb->Format = MESA_FORMAT_RGBA8888;

+      rb->InternalFormat = GL_RGBA;

+

+      rb->AllocStorage = _mesa_soft_renderbuffer_storage;

+      _mesa_add_renderbuffer(fb, BUFFER_AUX0 + i, rb);

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Create/attach software-based renderbuffers to the given framebuffer.

+ * This is a helper routine for device drivers.  Drivers can just as well

+ * call the individual _mesa_add_*_renderbuffer() routines directly.

+ */

+void

+_mesa_add_soft_renderbuffers(struct gl_framebuffer *fb,

+                             GLboolean color,

+                             GLboolean depth,

+                             GLboolean stencil,

+                             GLboolean accum,

+                             GLboolean alpha,

+                             GLboolean aux)

+{

+   GLboolean frontLeft = GL_TRUE;

+   GLboolean backLeft = fb->Visual.doubleBufferMode;

+   GLboolean frontRight = fb->Visual.stereoMode;

+   GLboolean backRight = fb->Visual.stereoMode && fb->Visual.doubleBufferMode;

+

+   if (color) {

+      assert(fb->Visual.redBits == fb->Visual.greenBits);

+      assert(fb->Visual.redBits == fb->Visual.blueBits);

+      _mesa_add_color_renderbuffers(NULL, fb,

+				    fb->Visual.redBits,

+				    fb->Visual.alphaBits,

+				    frontLeft, backLeft,

+				    frontRight, backRight);

+   }

+

+   if (depth) {

+      assert(fb->Visual.depthBits > 0);

+      _mesa_add_depth_renderbuffer(NULL, fb, fb->Visual.depthBits);

+   }

+

+   if (stencil) {

+      assert(fb->Visual.stencilBits > 0);

+      _mesa_add_stencil_renderbuffer(NULL, fb, fb->Visual.stencilBits);

+   }

+

+   if (accum) {

+      assert(fb->Visual.accumRedBits > 0);

+      assert(fb->Visual.accumGreenBits > 0);

+      assert(fb->Visual.accumBlueBits > 0);

+      _mesa_add_accum_renderbuffer(NULL, fb,

+                                   fb->Visual.accumRedBits,

+                                   fb->Visual.accumGreenBits,

+                                   fb->Visual.accumBlueBits,

+                                   fb->Visual.accumAlphaBits);

+   }

+

+   if (aux) {

+      assert(fb->Visual.numAuxBuffers > 0);

+      _mesa_add_aux_renderbuffers(NULL, fb, fb->Visual.redBits,

+                                  fb->Visual.numAuxBuffers);

+   }

+

+   if (alpha) {

+      assert(fb->Visual.alphaBits > 0);

+      _mesa_add_alpha_renderbuffers(NULL, fb, fb->Visual.alphaBits,

+                                    frontLeft, backLeft,

+                                    frontRight, backRight);

+   }

+

+#if 0

+   if (multisample) {

+      /* maybe someday */

+   }

+#endif

+}

+

+

+/**

+ * Attach a renderbuffer to a framebuffer.

+ * \param bufferName  one of the BUFFER_x tokens

+ */

+void

+_mesa_add_renderbuffer(struct gl_framebuffer *fb,

+                       gl_buffer_index bufferName, struct gl_renderbuffer *rb)

+{

+   assert(fb);

+   assert(rb);

+   assert(bufferName < BUFFER_COUNT);

+

+   /* There should be no previous renderbuffer on this attachment point,

+    * with the exception of depth/stencil since the same renderbuffer may

+    * be used for both.

+    */

+   assert(bufferName == BUFFER_DEPTH ||

+          bufferName == BUFFER_STENCIL ||

+          fb->Attachment[bufferName].Renderbuffer == NULL);

+

+   /* winsys vs. user-created buffer cross check */

+   if (fb->Name) {

+      assert(rb->Name);

+   }

+   else {

+      assert(!rb->Name);

+   }

+

+   fb->Attachment[bufferName].Type = GL_RENDERBUFFER_EXT;

+   fb->Attachment[bufferName].Complete = GL_TRUE;

+   _mesa_reference_renderbuffer(&fb->Attachment[bufferName].Renderbuffer, rb);

+}

+

+

+/**

+ * Remove the named renderbuffer from the given framebuffer.

+ * \param bufferName  one of the BUFFER_x tokens

+ */

+void

+_mesa_remove_renderbuffer(struct gl_framebuffer *fb,

+                          gl_buffer_index bufferName)

+{

+   struct gl_renderbuffer *rb;

+

+   assert(bufferName < BUFFER_COUNT);

+

+   rb = fb->Attachment[bufferName].Renderbuffer;

+   if (!rb)

+      return;

+

+   _mesa_reference_renderbuffer(&rb, NULL);

+

+   fb->Attachment[bufferName].Renderbuffer = NULL;

+}

+

+

+/**

+ * Set *ptr to point to rb.  If *ptr points to another renderbuffer,

+ * dereference that buffer first.  The new renderbuffer's refcount will

+ * be incremented.  The old renderbuffer's refcount will be decremented.

+ */

+void

+_mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,

+                             struct gl_renderbuffer *rb)

+{

+   assert(ptr);

+   if (*ptr == rb) {

+      /* no change */

+      return;

+   }

+

+   if (*ptr) {

+      /* Unreference the old renderbuffer */

+      GLboolean deleteFlag = GL_FALSE;

+      struct gl_renderbuffer *oldRb = *ptr;

+

+      assert(oldRb->Magic == RB_MAGIC);

+      _glthread_LOCK_MUTEX(oldRb->Mutex);

+      assert(oldRb->Magic == RB_MAGIC);

+      ASSERT(oldRb->RefCount > 0);

+      oldRb->RefCount--;

+      /*printf("RB DECR %p (%d) to %d\n", (void*) oldRb, oldRb->Name, oldRb->RefCount);*/

+      deleteFlag = (oldRb->RefCount == 0);

+      _glthread_UNLOCK_MUTEX(oldRb->Mutex);

+

+      if (deleteFlag) {

+         oldRb->Magic = 0; /* now invalid memory! */

+         oldRb->Delete(oldRb);

+      }

+

+      *ptr = NULL;

+   }

+   assert(!*ptr);

+

+   if (rb) {

+      assert(rb->Magic == RB_MAGIC);

+      /* reference new renderbuffer */

+      _glthread_LOCK_MUTEX(rb->Mutex);

+      rb->RefCount++;

+      /*printf("RB INCR %p (%d) to %d\n", (void*) rb, rb->Name, rb->RefCount);*/

+      _glthread_UNLOCK_MUTEX(rb->Mutex);

+      *ptr = rb;

+   }

+}

+

+

+/**

+ * Create a new combined depth/stencil renderbuffer for implementing

+ * the GL_EXT_packed_depth_stencil extension.

+ * \return new depth/stencil renderbuffer

+ */

+struct gl_renderbuffer *

+_mesa_new_depthstencil_renderbuffer(struct gl_context *ctx, GLuint name)

+{

+   struct gl_renderbuffer *dsrb;

+

+   dsrb = _mesa_new_renderbuffer(ctx, name);

+   if (!dsrb)

+      return NULL;

+

+   /* init fields not covered by _mesa_new_renderbuffer() */

+   dsrb->InternalFormat = GL_DEPTH24_STENCIL8_EXT;

+   dsrb->Format = MESA_FORMAT_Z24_S8;

+   dsrb->AllocStorage = _mesa_soft_renderbuffer_storage;

+

+   return dsrb;

+}

diff --git a/mesalib/src/mesa/main/state.c b/mesalib/src/mesa/main/state.c
index 1d1ae4737..ee335340a 100644
--- a/mesalib/src/mesa/main/state.c
+++ b/mesalib/src/mesa/main/state.c
@@ -1,772 +1,772 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file state.c
- * State management.
- * 
- * This file manages recalculation of derived values in struct gl_context.
- */
-
-
-#include "glheader.h"
-#include "mtypes.h"
-#include "context.h"
-#include "debug.h"
-#include "macros.h"
-#include "ffvertex_prog.h"
-#include "framebuffer.h"
-#include "light.h"
-#include "matrix.h"
-#include "pixel.h"
-#include "program/program.h"
-#include "program/prog_parameter.h"
-#include "state.h"
-#include "stencil.h"
-#include "texenvprogram.h"
-#include "texobj.h"
-#include "texstate.h"
-
-
-static void
-update_separate_specular(struct gl_context *ctx)
-{
-   if (_mesa_need_secondary_color(ctx))
-      ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR;
-   else
-      ctx->_TriangleCaps &= ~DD_SEPARATE_SPECULAR;
-}
-
-
-/**
- * Compute the index of the last array element that can be safely accessed
- * in a vertex array.  We can really only do this when the array lives in
- * a VBO.
- * The array->_MaxElement field will be updated.
- * Later in glDrawArrays/Elements/etc we can do some bounds checking.
- */
-static void
-compute_max_element(struct gl_client_array *array)
-{
-   assert(array->Enabled);
-   if (array->BufferObj->Name) {
-      GLsizeiptrARB offset = (GLsizeiptrARB) array->Ptr;
-      GLsizeiptrARB obj_size = (GLsizeiptrARB) array->BufferObj->Size;
-
-      if (offset < obj_size) {
-	 array->_MaxElement = (obj_size - offset +
-			       array->StrideB -
-			       array->_ElementSize) / array->StrideB;
-      } else {
-	 array->_MaxElement = 0;
-      }
-   }
-   else {
-      /* user-space array, no idea how big it is */
-      array->_MaxElement = 2 * 1000 * 1000 * 1000; /* just a big number */
-   }
-}
-
-
-/**
- * Helper for update_arrays().
- * \return  min(current min, array->_MaxElement).
- */
-static GLuint
-update_min(GLuint min, struct gl_client_array *array)
-{
-   compute_max_element(array);
-   return MIN2(min, array->_MaxElement);
-}
-
-
-/**
- * Update ctx->Array._MaxElement (the max legal index into all enabled arrays).
- * Need to do this upon new array state or new buffer object state.
- */
-static void
-update_arrays( struct gl_context *ctx )
-{
-   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
-   GLuint i, min = ~0;
-
-   /* find min of _MaxElement values for all enabled arrays */
-
-   /* 0 */
-   if (ctx->VertexProgram._Current
-       && arrayObj->VertexAttrib[VERT_ATTRIB_POS].Enabled) {
-      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_POS]);
-   }
-   else if (arrayObj->Vertex.Enabled) {
-      min = update_min(min, &arrayObj->Vertex);
-   }
-
-   /* 1 */
-   if (ctx->VertexProgram._Enabled
-       && arrayObj->VertexAttrib[VERT_ATTRIB_WEIGHT].Enabled) {
-      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_WEIGHT]);
-   }
-   /* no conventional vertex weight array */
-
-   /* 2 */
-   if (ctx->VertexProgram._Enabled
-       && arrayObj->VertexAttrib[VERT_ATTRIB_NORMAL].Enabled) {
-      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_NORMAL]);
-   }
-   else if (arrayObj->Normal.Enabled) {
-      min = update_min(min, &arrayObj->Normal);
-   }
-
-   /* 3 */
-   if (ctx->VertexProgram._Enabled
-       && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR0].Enabled) {
-      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_COLOR0]);
-   }
-   else if (arrayObj->Color.Enabled) {
-      min = update_min(min, &arrayObj->Color);
-   }
-
-   /* 4 */
-   if (ctx->VertexProgram._Enabled
-       && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR1].Enabled) {
-      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_COLOR1]);
-   }
-   else if (arrayObj->SecondaryColor.Enabled) {
-      min = update_min(min, &arrayObj->SecondaryColor);
-   }
-
-   /* 5 */
-   if (ctx->VertexProgram._Enabled
-       && arrayObj->VertexAttrib[VERT_ATTRIB_FOG].Enabled) {
-      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_FOG]);
-   }
-   else if (arrayObj->FogCoord.Enabled) {
-      min = update_min(min, &arrayObj->FogCoord);
-   }
-
-   /* 6 */
-   if (ctx->VertexProgram._Enabled
-       && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled) {
-      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX]);
-   }
-   else if (arrayObj->Index.Enabled) {
-      min = update_min(min, &arrayObj->Index);
-   }
-
-   /* 7 */
-   if (ctx->VertexProgram._Enabled
-       && arrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Enabled) {
-      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG]);
-   }
-
-   /* 8..15 */
-   for (i = VERT_ATTRIB_TEX0; i <= VERT_ATTRIB_TEX7; i++) {
-      if (ctx->VertexProgram._Enabled
-          && arrayObj->VertexAttrib[i].Enabled) {
-         min = update_min(min, &arrayObj->VertexAttrib[i]);
-      }
-      else if (i - VERT_ATTRIB_TEX0 < ctx->Const.MaxTextureCoordUnits
-               && arrayObj->TexCoord[i - VERT_ATTRIB_TEX0].Enabled) {
-         min = update_min(min, &arrayObj->TexCoord[i - VERT_ATTRIB_TEX0]);
-      }
-   }
-
-   /* 16..31 */
-   if (ctx->VertexProgram._Current) {
-      for (i = 0; i < Elements(arrayObj->VertexAttrib); i++) {
-         if (arrayObj->VertexAttrib[i].Enabled) {
-            min = update_min(min, &arrayObj->VertexAttrib[i]);
-         }
-      }
-   }
-
-   if (arrayObj->EdgeFlag.Enabled) {
-      min = update_min(min, &arrayObj->EdgeFlag);
-   }
-
-   /* _MaxElement is one past the last legal array element */
-   arrayObj->_MaxElement = min;
-}
-
-
-/**
- * Update the following fields:
- *   ctx->VertexProgram._Enabled
- *   ctx->FragmentProgram._Enabled
- *   ctx->ATIFragmentShader._Enabled
- * This needs to be done before texture state validation.
- */
-static void
-update_program_enables(struct gl_context *ctx)
-{
-   /* These _Enabled flags indicate if the program is enabled AND valid. */
-   ctx->VertexProgram._Enabled = ctx->VertexProgram.Enabled
-      && ctx->VertexProgram.Current->Base.Instructions;
-   ctx->FragmentProgram._Enabled = ctx->FragmentProgram.Enabled
-      && ctx->FragmentProgram.Current->Base.Instructions;
-   ctx->ATIFragmentShader._Enabled = ctx->ATIFragmentShader.Enabled
-      && ctx->ATIFragmentShader.Current->Instructions[0];
-}
-
-
-/**
- * Update vertex/fragment program state.  In particular, update these fields:
- *   ctx->VertexProgram._Current
- *   ctx->VertexProgram._TnlProgram,
- * These point to the highest priority enabled vertex/fragment program or are
- * NULL if fixed-function processing is to be done.
- *
- * This function needs to be called after texture state validation in case
- * we're generating a fragment program from fixed-function texture state.
- *
- * \return bitfield which will indicate _NEW_PROGRAM state if a new vertex
- * or fragment program is being used.
- */
-static GLbitfield
-update_program(struct gl_context *ctx)
-{
-   const struct gl_shader_program *vsProg = ctx->Shader.CurrentVertexProgram;
-   const struct gl_shader_program *gsProg = ctx->Shader.CurrentGeometryProgram;
-   const struct gl_shader_program *fsProg = ctx->Shader.CurrentFragmentProgram;
-   const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current;
-   const struct gl_fragment_program *prevFP = ctx->FragmentProgram._Current;
-   const struct gl_geometry_program *prevGP = ctx->GeometryProgram._Current;
-   GLbitfield new_state = 0x0;
-
-   /*
-    * Set the ctx->VertexProgram._Current and ctx->FragmentProgram._Current
-    * pointers to the programs that should be used for rendering.  If either
-    * is NULL, use fixed-function code paths.
-    *
-    * These programs may come from several sources.  The priority is as
-    * follows:
-    *   1. OpenGL 2.0/ARB vertex/fragment shaders
-    *   2. ARB/NV vertex/fragment programs
-    *   3. Programs derived from fixed-function state.
-    *
-    * Note: it's possible for a vertex shader to get used with a fragment
-    * program (and vice versa) here, but in practice that shouldn't ever
-    * come up, or matter.
-    */
-
-   if (fsProg && fsProg->LinkStatus && fsProg->FragmentProgram) {
-      /* Use shader programs */
-      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
-                               fsProg->FragmentProgram);
-   }
-   else if (ctx->FragmentProgram._Enabled) {
-      /* use user-defined vertex program */
-      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
-                               ctx->FragmentProgram.Current);
-   }
-   else if (ctx->FragmentProgram._MaintainTexEnvProgram) {
-      /* Use fragment program generated from fixed-function state.
-       */
-      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
-                               _mesa_get_fixed_func_fragment_program(ctx));
-      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram,
-                               ctx->FragmentProgram._Current);
-   }
-   else {
-      /* no fragment program */
-      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
-   }
-
-   if (gsProg && gsProg->LinkStatus && gsProg->GeometryProgram) {
-      /* Use shader programs */
-      _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current,
-                               gsProg->GeometryProgram);
-   } else {
-      /* no fragment program */
-      _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current, NULL);
-   }
-
-   /* Examine vertex program after fragment program as
-    * _mesa_get_fixed_func_vertex_program() needs to know active
-    * fragprog inputs.
-    */
-   if (vsProg && vsProg->LinkStatus && vsProg->VertexProgram) {
-      /* Use shader programs */
-      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
-                            vsProg->VertexProgram);
-   }
-   else if (ctx->VertexProgram._Enabled) {
-      /* use user-defined vertex program */
-      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
-                               ctx->VertexProgram.Current);
-   }
-   else if (ctx->VertexProgram._MaintainTnlProgram) {
-      /* Use vertex program generated from fixed-function state.
-       */
-      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
-                               _mesa_get_fixed_func_vertex_program(ctx));
-      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram,
-                               ctx->VertexProgram._Current);
-   }
-   else {
-      /* no vertex program */
-      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
-   }
-
-   /* Let the driver know what's happening:
-    */
-   if (ctx->FragmentProgram._Current != prevFP) {
-      new_state |= _NEW_PROGRAM;
-      if (ctx->Driver.BindProgram) {
-         ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,
-                          (struct gl_program *) ctx->FragmentProgram._Current);
-      }
-   }
-
-   if (ctx->GeometryProgram._Current != prevGP) {
-      new_state |= _NEW_PROGRAM;
-      if (ctx->Driver.BindProgram) {
-         ctx->Driver.BindProgram(ctx, MESA_GEOMETRY_PROGRAM,
-                            (struct gl_program *) ctx->GeometryProgram._Current);
-      }
-   }
-
-   if (ctx->VertexProgram._Current != prevVP) {
-      new_state |= _NEW_PROGRAM;
-      if (ctx->Driver.BindProgram) {
-         ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,
-                            (struct gl_program *) ctx->VertexProgram._Current);
-      }
-   }
-
-   return new_state;
-}
-
-
-/**
- * Examine shader constants and return either _NEW_PROGRAM_CONSTANTS or 0.
- */
-static GLbitfield
-update_program_constants(struct gl_context *ctx)
-{
-   GLbitfield new_state = 0x0;
-
-   if (ctx->FragmentProgram._Current) {
-      const struct gl_program_parameter_list *params =
-         ctx->FragmentProgram._Current->Base.Parameters;
-      if (params && params->StateFlags & ctx->NewState) {
-         new_state |= _NEW_PROGRAM_CONSTANTS;
-      }
-   }
-
-   if (ctx->GeometryProgram._Current) {
-      const struct gl_program_parameter_list *params =
-         ctx->GeometryProgram._Current->Base.Parameters;
-      /*FIXME: StateFlags is always 0 because we have unnamed constant
-       *       not state changes */
-      if (params /*&& params->StateFlags & ctx->NewState*/) {
-         new_state |= _NEW_PROGRAM_CONSTANTS;
-      }
-   }
-
-   if (ctx->VertexProgram._Current) {
-      const struct gl_program_parameter_list *params =
-         ctx->VertexProgram._Current->Base.Parameters;
-      if (params && params->StateFlags & ctx->NewState) {
-         new_state |= _NEW_PROGRAM_CONSTANTS;
-      }
-   }
-
-   return new_state;
-}
-
-
-
-
-static void
-update_viewport_matrix(struct gl_context *ctx)
-{
-   const GLfloat depthMax = ctx->DrawBuffer->_DepthMaxF;
-
-   ASSERT(depthMax > 0);
-
-   /* Compute scale and bias values. This is really driver-specific
-    * and should be maintained elsewhere if at all.
-    * NOTE: RasterPos uses this.
-    */
-   _math_matrix_viewport(&ctx->Viewport._WindowMap,
-                         ctx->Viewport.X, ctx->Viewport.Y,
-                         ctx->Viewport.Width, ctx->Viewport.Height,
-                         ctx->Viewport.Near, ctx->Viewport.Far,
-                         depthMax);
-}
-
-
-/**
- * Update derived multisample state.
- */
-static void
-update_multisample(struct gl_context *ctx)
-{
-   ctx->Multisample._Enabled = GL_FALSE;
-   if (ctx->Multisample.Enabled &&
-       ctx->DrawBuffer &&
-       ctx->DrawBuffer->Visual.sampleBuffers)
-      ctx->Multisample._Enabled = GL_TRUE;
-}
-
-
-/**
- * Update derived color/blend/logicop state.
- */
-static void
-update_color(struct gl_context *ctx)
-{
-   /* This is needed to support 1.1's RGB logic ops AND
-    * 1.0's blending logicops.
-    */
-   ctx->Color._LogicOpEnabled = _mesa_rgba_logicop_enabled(ctx);
-}
-
-static void
-update_clamp_fragment_color(struct gl_context *ctx)
-{
-   if(ctx->Color.ClampFragmentColor == GL_FIXED_ONLY_ARB)
-      ctx->Color._ClampFragmentColor = !ctx->DrawBuffer || !ctx->DrawBuffer->Visual.floatMode;
-   else
-      ctx->Color._ClampFragmentColor = ctx->Color.ClampFragmentColor;
-}
-
-static void
-update_clamp_vertex_color(struct gl_context *ctx)
-{
-   if(ctx->Light.ClampVertexColor == GL_FIXED_ONLY_ARB)
-      ctx->Light._ClampVertexColor = !ctx->DrawBuffer || !ctx->DrawBuffer->Visual.floatMode;
-   else
-      ctx->Light._ClampVertexColor = ctx->Light.ClampVertexColor;
-}
-
-static void
-update_clamp_read_color(struct gl_context *ctx)
-{
-   if(ctx->Color.ClampReadColor == GL_FIXED_ONLY_ARB)
-      ctx->Color._ClampReadColor = !ctx->ReadBuffer || !ctx->ReadBuffer->Visual.floatMode;
-   else
-      ctx->Color._ClampReadColor = ctx->Color.ClampReadColor;
-}
-
-
-
-
-/*
- * Check polygon state and set DD_TRI_CULL_FRONT_BACK and/or DD_TRI_OFFSET
- * in ctx->_TriangleCaps if needed.
- */
-static void
-update_polygon(struct gl_context *ctx)
-{
-   ctx->_TriangleCaps &= ~(DD_TRI_CULL_FRONT_BACK | DD_TRI_OFFSET);
-
-   if (ctx->Polygon.CullFlag && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
-      ctx->_TriangleCaps |= DD_TRI_CULL_FRONT_BACK;
-
-   if (   ctx->Polygon.OffsetPoint
-       || ctx->Polygon.OffsetLine
-       || ctx->Polygon.OffsetFill)
-      ctx->_TriangleCaps |= DD_TRI_OFFSET;
-}
-
-
-/**
- * Update the ctx->_TriangleCaps bitfield.
- * XXX that bitfield should really go away someday!
- * This function must be called after other update_*() functions since
- * there are dependencies on some other derived values.
- */
-#if 0
-static void
-update_tricaps(struct gl_context *ctx, GLbitfield new_state)
-{
-   ctx->_TriangleCaps = 0;
-
-   /*
-    * Points
-    */
-   if (1/*new_state & _NEW_POINT*/) {
-      if (ctx->Point.SmoothFlag)
-         ctx->_TriangleCaps |= DD_POINT_SMOOTH;
-      if (ctx->Point._Attenuated)
-         ctx->_TriangleCaps |= DD_POINT_ATTEN;
-   }
-
-   /*
-    * Lines
-    */
-   if (1/*new_state & _NEW_LINE*/) {
-      if (ctx->Line.SmoothFlag)
-         ctx->_TriangleCaps |= DD_LINE_SMOOTH;
-      if (ctx->Line.StippleFlag)
-         ctx->_TriangleCaps |= DD_LINE_STIPPLE;
-   }
-
-   /*
-    * Polygons
-    */
-   if (1/*new_state & _NEW_POLYGON*/) {
-      if (ctx->Polygon.SmoothFlag)
-         ctx->_TriangleCaps |= DD_TRI_SMOOTH;
-      if (ctx->Polygon.StippleFlag)
-         ctx->_TriangleCaps |= DD_TRI_STIPPLE;
-      if (ctx->Polygon.FrontMode != GL_FILL
-          || ctx->Polygon.BackMode != GL_FILL)
-         ctx->_TriangleCaps |= DD_TRI_UNFILLED;
-      if (ctx->Polygon.CullFlag
-          && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
-         ctx->_TriangleCaps |= DD_TRI_CULL_FRONT_BACK;
-      if (ctx->Polygon.OffsetPoint ||
-          ctx->Polygon.OffsetLine ||
-          ctx->Polygon.OffsetFill)
-         ctx->_TriangleCaps |= DD_TRI_OFFSET;
-   }
-
-   /*
-    * Lighting and shading
-    */
-   if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)
-      ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE;
-   if (ctx->Light.ShadeModel == GL_FLAT)
-      ctx->_TriangleCaps |= DD_FLATSHADE;
-   if (_mesa_need_secondary_color(ctx))
-      ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR;
-
-   /*
-    * Stencil
-    */
-   if (ctx->Stencil._TestTwoSide)
-      ctx->_TriangleCaps |= DD_TRI_TWOSTENCIL;
-}
-#endif
-
-
-/**
- * Compute derived GL state.
- * If __struct gl_contextRec::NewState is non-zero then this function \b must
- * be called before rendering anything.
- *
- * Calls dd_function_table::UpdateState to perform any internal state
- * management necessary.
- * 
- * \sa _mesa_update_modelview_project(), _mesa_update_texture(),
- * _mesa_update_buffer_bounds(),
- * _mesa_update_lighting() and _mesa_update_tnl_spaces().
- */
-void
-_mesa_update_state_locked( struct gl_context *ctx )
-{
-   GLbitfield new_state = ctx->NewState;
-   GLbitfield prog_flags = _NEW_PROGRAM;
-   GLbitfield new_prog_state = 0x0;
-
-   if (new_state == _NEW_CURRENT_ATTRIB) 
-      goto out;
-
-   if (MESA_VERBOSE & VERBOSE_STATE)
-      _mesa_print_state("_mesa_update_state", new_state);
-
-   /* Determine which state flags effect vertex/fragment program state */
-   if (ctx->FragmentProgram._MaintainTexEnvProgram) {
-      prog_flags |= (_NEW_BUFFERS | _NEW_TEXTURE | _NEW_FOG |
-		     _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE |
-		     _NEW_PROGRAM | _NEW_FRAG_CLAMP);
-   }
-   if (ctx->VertexProgram._MaintainTnlProgram) {
-      prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
-                     _NEW_TRANSFORM | _NEW_POINT |
-                     _NEW_FOG | _NEW_LIGHT |
-                     _MESA_NEW_NEED_EYE_COORDS);
-   }
-
-   /*
-    * Now update derived state info
-    */
-
-   if (new_state & prog_flags)
-      update_program_enables( ctx );
-
-   if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION))
-      _mesa_update_modelview_project( ctx, new_state );
-
-   if (new_state & (_NEW_PROGRAM|_NEW_TEXTURE|_NEW_TEXTURE_MATRIX))
-      _mesa_update_texture( ctx, new_state );
-
-   if (new_state & _NEW_BUFFERS)
-      _mesa_update_framebuffer(ctx);
-
-   if (new_state & (_NEW_SCISSOR | _NEW_BUFFERS | _NEW_VIEWPORT))
-      _mesa_update_draw_buffer_bounds( ctx );
-
-   if (new_state & _NEW_POLYGON)
-      update_polygon( ctx );
-
-   if (new_state & _NEW_LIGHT)
-      _mesa_update_lighting( ctx );
-
-   if (new_state & (_NEW_LIGHT | _NEW_BUFFERS))
-      update_clamp_vertex_color(ctx);
-
-   if (new_state & (_NEW_STENCIL | _NEW_BUFFERS))
-      _mesa_update_stencil( ctx );
-
-   if (new_state & _NEW_PIXEL)
-      _mesa_update_pixel( ctx, new_state );
-
-   if (new_state & _DD_NEW_SEPARATE_SPECULAR)
-      update_separate_specular( ctx );
-
-   if (new_state & (_NEW_BUFFERS | _NEW_VIEWPORT))
-      update_viewport_matrix(ctx);
-
-   if (new_state & _NEW_MULTISAMPLE)
-      update_multisample( ctx );
-
-   if (new_state & _NEW_COLOR)
-      update_color( ctx );
-
-   if (new_state & (_NEW_COLOR | _NEW_BUFFERS))
-      update_clamp_read_color(ctx);
-
-   if(new_state & (_NEW_FRAG_CLAMP | _NEW_BUFFERS))
-      update_clamp_fragment_color(ctx);
-
-#if 0
-   if (new_state & (_NEW_POINT | _NEW_LINE | _NEW_POLYGON | _NEW_LIGHT
-                    | _NEW_STENCIL | _DD_NEW_SEPARATE_SPECULAR))
-      update_tricaps( ctx, new_state );
-#endif
-
-   /* ctx->_NeedEyeCoords is now up to date.
-    *
-    * If the truth value of this variable has changed, update for the
-    * new lighting space and recompute the positions of lights and the
-    * normal transform.
-    *
-    * If the lighting space hasn't changed, may still need to recompute
-    * light positions & normal transforms for other reasons.
-    */
-   if (new_state & _MESA_NEW_NEED_EYE_COORDS) 
-      _mesa_update_tnl_spaces( ctx, new_state );
-
-   if (new_state & prog_flags) {
-      /* When we generate programs from fixed-function vertex/fragment state
-       * this call may generate/bind a new program.  If so, we need to
-       * propogate the _NEW_PROGRAM flag to the driver.
-       */
-      new_prog_state |= update_program( ctx );
-   }
-
-   if (new_state & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT))
-      update_arrays( ctx );
-
- out:
-   new_prog_state |= update_program_constants(ctx);
-
-   /*
-    * Give the driver a chance to act upon the new_state flags.
-    * The driver might plug in different span functions, for example.
-    * Also, this is where the driver can invalidate the state of any
-    * active modules (such as swrast_setup, swrast, tnl, etc).
-    *
-    * Set ctx->NewState to zero to avoid recursion if
-    * Driver.UpdateState() has to call FLUSH_VERTICES().  (fixed?)
-    */
-   new_state = ctx->NewState | new_prog_state;
-   ctx->NewState = 0;
-   ctx->Driver.UpdateState(ctx, new_state);
-   ctx->Array.NewState = 0;
-   if (!ctx->Array.RebindArrays)
-      ctx->Array.RebindArrays = (new_state & (_NEW_ARRAY | _NEW_PROGRAM)) != 0;
-}
-
-
-/* This is the usual entrypoint for state updates:
- */
-void
-_mesa_update_state( struct gl_context *ctx )
-{
-   _mesa_lock_context_textures(ctx);
-   _mesa_update_state_locked(ctx);
-   _mesa_unlock_context_textures(ctx);
-}
-
-
-
-
-/**
- * Want to figure out which fragment program inputs are actually
- * constant/current values from ctx->Current.  These should be
- * referenced as a tracked state variable rather than a fragment
- * program input, to save the overhead of putting a constant value in
- * every submitted vertex, transferring it to hardware, interpolating
- * it across the triangle, etc...
- *
- * When there is a VP bound, just use vp->outputs.  But when we're
- * generating vp from fixed function state, basically want to
- * calculate:
- *
- * vp_out_2_fp_in( vp_in_2_vp_out( varying_inputs ) | 
- *                 potential_vp_outputs )
- *
- * Where potential_vp_outputs is calculated by looking at enabled
- * texgen, etc.
- * 
- * The generated fragment program should then only declare inputs that
- * may vary or otherwise differ from the ctx->Current values.
- * Otherwise, the fp should track them as state values instead.
- */
-void
-_mesa_set_varying_vp_inputs( struct gl_context *ctx,
-                             GLbitfield varying_inputs )
-{
-   if (ctx->varying_vp_inputs != varying_inputs) {
-      ctx->varying_vp_inputs = varying_inputs;
-      ctx->NewState |= _NEW_ARRAY;
-      /*printf("%s %x\n", __FUNCTION__, varying_inputs);*/
-   }
-}
-
-
-/**
- * Used by drivers to tell core Mesa that the driver is going to
- * install/ use its own vertex program.  In particular, this will
- * prevent generated fragment programs from using state vars instead
- * of ordinary varyings/inputs.
- */
-void
-_mesa_set_vp_override(struct gl_context *ctx, GLboolean flag)
-{
-   if (ctx->VertexProgram._Overriden != flag) {
-      ctx->VertexProgram._Overriden = flag;
-
-      /* Set one of the bits which will trigger fragment program
-       * regeneration:
-       */
-      ctx->NewState |= _NEW_PROGRAM;
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.3

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file state.c

+ * State management.

+ * 

+ * This file manages recalculation of derived values in struct gl_context.

+ */

+

+

+#include "glheader.h"

+#include "mtypes.h"

+#include "context.h"

+#include "debug.h"

+#include "macros.h"

+#include "ffvertex_prog.h"

+#include "framebuffer.h"

+#include "light.h"

+#include "matrix.h"

+#include "pixel.h"

+#include "program/program.h"

+#include "program/prog_parameter.h"

+#include "state.h"

+#include "stencil.h"

+#include "texenvprogram.h"

+#include "texobj.h"

+#include "texstate.h"

+

+

+static void

+update_separate_specular(struct gl_context *ctx)

+{

+   if (_mesa_need_secondary_color(ctx))

+      ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR;

+   else

+      ctx->_TriangleCaps &= ~DD_SEPARATE_SPECULAR;

+}

+

+

+/**

+ * Compute the index of the last array element that can be safely accessed

+ * in a vertex array.  We can really only do this when the array lives in

+ * a VBO.

+ * The array->_MaxElement field will be updated.

+ * Later in glDrawArrays/Elements/etc we can do some bounds checking.

+ */

+static void

+compute_max_element(struct gl_client_array *array)

+{

+   assert(array->Enabled);

+   if (array->BufferObj->Name) {

+      GLsizeiptrARB offset = (GLsizeiptrARB) array->Ptr;

+      GLsizeiptrARB obj_size = (GLsizeiptrARB) array->BufferObj->Size;

+

+      if (offset < obj_size) {

+	 array->_MaxElement = (obj_size - offset +

+			       array->StrideB -

+			       array->_ElementSize) / array->StrideB;

+      } else {

+	 array->_MaxElement = 0;

+      }

+   }

+   else {

+      /* user-space array, no idea how big it is */

+      array->_MaxElement = 2 * 1000 * 1000 * 1000; /* just a big number */

+   }

+}

+

+

+/**

+ * Helper for update_arrays().

+ * \return  min(current min, array->_MaxElement).

+ */

+static GLuint

+update_min(GLuint min, struct gl_client_array *array)

+{

+   compute_max_element(array);

+   return MIN2(min, array->_MaxElement);

+}

+

+

+/**

+ * Update ctx->Array._MaxElement (the max legal index into all enabled arrays).

+ * Need to do this upon new array state or new buffer object state.

+ */

+static void

+update_arrays( struct gl_context *ctx )

+{

+   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;

+   GLuint i, min = ~0;

+

+   /* find min of _MaxElement values for all enabled arrays */

+

+   /* 0 */

+   if (ctx->VertexProgram._Current

+       && arrayObj->VertexAttrib[VERT_ATTRIB_POS].Enabled) {

+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_POS]);

+   }

+   else if (arrayObj->Vertex.Enabled) {

+      min = update_min(min, &arrayObj->Vertex);

+   }

+

+   /* 1 */

+   if (ctx->VertexProgram._Enabled

+       && arrayObj->VertexAttrib[VERT_ATTRIB_WEIGHT].Enabled) {

+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_WEIGHT]);

+   }

+   /* no conventional vertex weight array */

+

+   /* 2 */

+   if (ctx->VertexProgram._Enabled

+       && arrayObj->VertexAttrib[VERT_ATTRIB_NORMAL].Enabled) {

+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_NORMAL]);

+   }

+   else if (arrayObj->Normal.Enabled) {

+      min = update_min(min, &arrayObj->Normal);

+   }

+

+   /* 3 */

+   if (ctx->VertexProgram._Enabled

+       && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR0].Enabled) {

+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_COLOR0]);

+   }

+   else if (arrayObj->Color.Enabled) {

+      min = update_min(min, &arrayObj->Color);

+   }

+

+   /* 4 */

+   if (ctx->VertexProgram._Enabled

+       && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR1].Enabled) {

+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_COLOR1]);

+   }

+   else if (arrayObj->SecondaryColor.Enabled) {

+      min = update_min(min, &arrayObj->SecondaryColor);

+   }

+

+   /* 5 */

+   if (ctx->VertexProgram._Enabled

+       && arrayObj->VertexAttrib[VERT_ATTRIB_FOG].Enabled) {

+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_FOG]);

+   }

+   else if (arrayObj->FogCoord.Enabled) {

+      min = update_min(min, &arrayObj->FogCoord);

+   }

+

+   /* 6 */

+   if (ctx->VertexProgram._Enabled

+       && arrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled) {

+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX]);

+   }

+   else if (arrayObj->Index.Enabled) {

+      min = update_min(min, &arrayObj->Index);

+   }

+

+   /* 7 */

+   if (ctx->VertexProgram._Enabled

+       && arrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Enabled) {

+      min = update_min(min, &arrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG]);

+   }

+

+   /* 8..15 */

+   for (i = VERT_ATTRIB_TEX0; i <= VERT_ATTRIB_TEX7; i++) {

+      if (ctx->VertexProgram._Enabled

+          && arrayObj->VertexAttrib[i].Enabled) {

+         min = update_min(min, &arrayObj->VertexAttrib[i]);

+      }

+      else if (i - VERT_ATTRIB_TEX0 < ctx->Const.MaxTextureCoordUnits

+               && arrayObj->TexCoord[i - VERT_ATTRIB_TEX0].Enabled) {

+         min = update_min(min, &arrayObj->TexCoord[i - VERT_ATTRIB_TEX0]);

+      }

+   }

+

+   /* 16..31 */

+   if (ctx->VertexProgram._Current) {

+      for (i = 0; i < Elements(arrayObj->VertexAttrib); i++) {

+         if (arrayObj->VertexAttrib[i].Enabled) {

+            min = update_min(min, &arrayObj->VertexAttrib[i]);

+         }

+      }

+   }

+

+   if (arrayObj->EdgeFlag.Enabled) {

+      min = update_min(min, &arrayObj->EdgeFlag);

+   }

+

+   /* _MaxElement is one past the last legal array element */

+   arrayObj->_MaxElement = min;

+}

+

+

+/**

+ * Update the following fields:

+ *   ctx->VertexProgram._Enabled

+ *   ctx->FragmentProgram._Enabled

+ *   ctx->ATIFragmentShader._Enabled

+ * This needs to be done before texture state validation.

+ */

+static void

+update_program_enables(struct gl_context *ctx)

+{

+   /* These _Enabled flags indicate if the program is enabled AND valid. */

+   ctx->VertexProgram._Enabled = ctx->VertexProgram.Enabled

+      && ctx->VertexProgram.Current->Base.Instructions;

+   ctx->FragmentProgram._Enabled = ctx->FragmentProgram.Enabled

+      && ctx->FragmentProgram.Current->Base.Instructions;

+   ctx->ATIFragmentShader._Enabled = ctx->ATIFragmentShader.Enabled

+      && ctx->ATIFragmentShader.Current->Instructions[0];

+}

+

+

+/**

+ * Update vertex/fragment program state.  In particular, update these fields:

+ *   ctx->VertexProgram._Current

+ *   ctx->VertexProgram._TnlProgram,

+ * These point to the highest priority enabled vertex/fragment program or are

+ * NULL if fixed-function processing is to be done.

+ *

+ * This function needs to be called after texture state validation in case

+ * we're generating a fragment program from fixed-function texture state.

+ *

+ * \return bitfield which will indicate _NEW_PROGRAM state if a new vertex

+ * or fragment program is being used.

+ */

+static GLbitfield

+update_program(struct gl_context *ctx)

+{

+   const struct gl_shader_program *vsProg = ctx->Shader.CurrentVertexProgram;

+   const struct gl_shader_program *gsProg = ctx->Shader.CurrentGeometryProgram;

+   const struct gl_shader_program *fsProg = ctx->Shader.CurrentFragmentProgram;

+   const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current;

+   const struct gl_fragment_program *prevFP = ctx->FragmentProgram._Current;

+   const struct gl_geometry_program *prevGP = ctx->GeometryProgram._Current;

+   GLbitfield new_state = 0x0;

+

+   /*

+    * Set the ctx->VertexProgram._Current and ctx->FragmentProgram._Current

+    * pointers to the programs that should be used for rendering.  If either

+    * is NULL, use fixed-function code paths.

+    *

+    * These programs may come from several sources.  The priority is as

+    * follows:

+    *   1. OpenGL 2.0/ARB vertex/fragment shaders

+    *   2. ARB/NV vertex/fragment programs

+    *   3. Programs derived from fixed-function state.

+    *

+    * Note: it's possible for a vertex shader to get used with a fragment

+    * program (and vice versa) here, but in practice that shouldn't ever

+    * come up, or matter.

+    */

+

+   if (fsProg && fsProg->LinkStatus && fsProg->FragmentProgram) {

+      /* Use shader programs */

+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,

+                               fsProg->FragmentProgram);

+   }

+   else if (ctx->FragmentProgram._Enabled) {

+      /* use user-defined vertex program */

+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,

+                               ctx->FragmentProgram.Current);

+   }

+   else if (ctx->FragmentProgram._MaintainTexEnvProgram) {

+      /* Use fragment program generated from fixed-function state.

+       */

+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,

+                               _mesa_get_fixed_func_fragment_program(ctx));

+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram,

+                               ctx->FragmentProgram._Current);

+   }

+   else {

+      /* no fragment program */

+      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);

+   }

+

+   if (gsProg && gsProg->LinkStatus && gsProg->GeometryProgram) {

+      /* Use shader programs */

+      _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current,

+                               gsProg->GeometryProgram);

+   } else {

+      /* no fragment program */

+      _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current, NULL);

+   }

+

+   /* Examine vertex program after fragment program as

+    * _mesa_get_fixed_func_vertex_program() needs to know active

+    * fragprog inputs.

+    */

+   if (vsProg && vsProg->LinkStatus && vsProg->VertexProgram) {

+      /* Use shader programs */

+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,

+                            vsProg->VertexProgram);

+   }

+   else if (ctx->VertexProgram._Enabled) {

+      /* use user-defined vertex program */

+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,

+                               ctx->VertexProgram.Current);

+   }

+   else if (ctx->VertexProgram._MaintainTnlProgram) {

+      /* Use vertex program generated from fixed-function state.

+       */

+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,

+                               _mesa_get_fixed_func_vertex_program(ctx));

+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram,

+                               ctx->VertexProgram._Current);

+   }

+   else {

+      /* no vertex program */

+      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);

+   }

+

+   /* Let the driver know what's happening:

+    */

+   if (ctx->FragmentProgram._Current != prevFP) {

+      new_state |= _NEW_PROGRAM;

+      if (ctx->Driver.BindProgram) {

+         ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,

+                          (struct gl_program *) ctx->FragmentProgram._Current);

+      }

+   }

+

+   if (ctx->GeometryProgram._Current != prevGP) {

+      new_state |= _NEW_PROGRAM;

+      if (ctx->Driver.BindProgram) {

+         ctx->Driver.BindProgram(ctx, MESA_GEOMETRY_PROGRAM,

+                            (struct gl_program *) ctx->GeometryProgram._Current);

+      }

+   }

+

+   if (ctx->VertexProgram._Current != prevVP) {

+      new_state |= _NEW_PROGRAM;

+      if (ctx->Driver.BindProgram) {

+         ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,

+                            (struct gl_program *) ctx->VertexProgram._Current);

+      }

+   }

+

+   return new_state;

+}

+

+

+/**

+ * Examine shader constants and return either _NEW_PROGRAM_CONSTANTS or 0.

+ */

+static GLbitfield

+update_program_constants(struct gl_context *ctx)

+{

+   GLbitfield new_state = 0x0;

+

+   if (ctx->FragmentProgram._Current) {

+      const struct gl_program_parameter_list *params =

+         ctx->FragmentProgram._Current->Base.Parameters;

+      if (params && params->StateFlags & ctx->NewState) {

+         new_state |= _NEW_PROGRAM_CONSTANTS;

+      }

+   }

+

+   if (ctx->GeometryProgram._Current) {

+      const struct gl_program_parameter_list *params =

+         ctx->GeometryProgram._Current->Base.Parameters;

+      /*FIXME: StateFlags is always 0 because we have unnamed constant

+       *       not state changes */

+      if (params /*&& params->StateFlags & ctx->NewState*/) {

+         new_state |= _NEW_PROGRAM_CONSTANTS;

+      }

+   }

+

+   if (ctx->VertexProgram._Current) {

+      const struct gl_program_parameter_list *params =

+         ctx->VertexProgram._Current->Base.Parameters;

+      if (params && params->StateFlags & ctx->NewState) {

+         new_state |= _NEW_PROGRAM_CONSTANTS;

+      }

+   }

+

+   return new_state;

+}

+

+

+

+

+static void

+update_viewport_matrix(struct gl_context *ctx)

+{

+   const GLfloat depthMax = ctx->DrawBuffer->_DepthMaxF;

+

+   ASSERT(depthMax > 0);

+

+   /* Compute scale and bias values. This is really driver-specific

+    * and should be maintained elsewhere if at all.

+    * NOTE: RasterPos uses this.

+    */

+   _math_matrix_viewport(&ctx->Viewport._WindowMap,

+                         ctx->Viewport.X, ctx->Viewport.Y,

+                         ctx->Viewport.Width, ctx->Viewport.Height,

+                         ctx->Viewport.Near, ctx->Viewport.Far,

+                         depthMax);

+}

+

+

+/**

+ * Update derived multisample state.

+ */

+static void

+update_multisample(struct gl_context *ctx)

+{

+   ctx->Multisample._Enabled = GL_FALSE;

+   if (ctx->Multisample.Enabled &&

+       ctx->DrawBuffer &&

+       ctx->DrawBuffer->Visual.sampleBuffers)

+      ctx->Multisample._Enabled = GL_TRUE;

+}

+

+

+/**

+ * Update derived color/blend/logicop state.

+ */

+static void

+update_color(struct gl_context *ctx)

+{

+   /* This is needed to support 1.1's RGB logic ops AND

+    * 1.0's blending logicops.

+    */

+   ctx->Color._LogicOpEnabled = _mesa_rgba_logicop_enabled(ctx);

+}

+

+static void

+update_clamp_fragment_color(struct gl_context *ctx)

+{

+   if(ctx->Color.ClampFragmentColor == GL_FIXED_ONLY_ARB)

+      ctx->Color._ClampFragmentColor = !ctx->DrawBuffer || !ctx->DrawBuffer->Visual.floatMode;

+   else

+      ctx->Color._ClampFragmentColor = ctx->Color.ClampFragmentColor;

+}

+

+static void

+update_clamp_vertex_color(struct gl_context *ctx)

+{

+   if(ctx->Light.ClampVertexColor == GL_FIXED_ONLY_ARB)

+      ctx->Light._ClampVertexColor = !ctx->DrawBuffer || !ctx->DrawBuffer->Visual.floatMode;

+   else

+      ctx->Light._ClampVertexColor = ctx->Light.ClampVertexColor;

+}

+

+static void

+update_clamp_read_color(struct gl_context *ctx)

+{

+   if(ctx->Color.ClampReadColor == GL_FIXED_ONLY_ARB)

+      ctx->Color._ClampReadColor = !ctx->ReadBuffer || !ctx->ReadBuffer->Visual.floatMode;

+   else

+      ctx->Color._ClampReadColor = ctx->Color.ClampReadColor;

+}

+

+

+

+

+/*

+ * Check polygon state and set DD_TRI_CULL_FRONT_BACK and/or DD_TRI_OFFSET

+ * in ctx->_TriangleCaps if needed.

+ */

+static void

+update_polygon(struct gl_context *ctx)

+{

+   ctx->_TriangleCaps &= ~(DD_TRI_CULL_FRONT_BACK | DD_TRI_OFFSET);

+

+   if (ctx->Polygon.CullFlag && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)

+      ctx->_TriangleCaps |= DD_TRI_CULL_FRONT_BACK;

+

+   if (   ctx->Polygon.OffsetPoint

+       || ctx->Polygon.OffsetLine

+       || ctx->Polygon.OffsetFill)

+      ctx->_TriangleCaps |= DD_TRI_OFFSET;

+}

+

+

+/**

+ * Update the ctx->_TriangleCaps bitfield.

+ * XXX that bitfield should really go away someday!

+ * This function must be called after other update_*() functions since

+ * there are dependencies on some other derived values.

+ */

+#if 0

+static void

+update_tricaps(struct gl_context *ctx, GLbitfield new_state)

+{

+   ctx->_TriangleCaps = 0;

+

+   /*

+    * Points

+    */

+   if (1/*new_state & _NEW_POINT*/) {

+      if (ctx->Point.SmoothFlag)

+         ctx->_TriangleCaps |= DD_POINT_SMOOTH;

+      if (ctx->Point._Attenuated)

+         ctx->_TriangleCaps |= DD_POINT_ATTEN;

+   }

+

+   /*

+    * Lines

+    */

+   if (1/*new_state & _NEW_LINE*/) {

+      if (ctx->Line.SmoothFlag)

+         ctx->_TriangleCaps |= DD_LINE_SMOOTH;

+      if (ctx->Line.StippleFlag)

+         ctx->_TriangleCaps |= DD_LINE_STIPPLE;

+   }

+

+   /*

+    * Polygons

+    */

+   if (1/*new_state & _NEW_POLYGON*/) {

+      if (ctx->Polygon.SmoothFlag)

+         ctx->_TriangleCaps |= DD_TRI_SMOOTH;

+      if (ctx->Polygon.StippleFlag)

+         ctx->_TriangleCaps |= DD_TRI_STIPPLE;

+      if (ctx->Polygon.FrontMode != GL_FILL

+          || ctx->Polygon.BackMode != GL_FILL)

+         ctx->_TriangleCaps |= DD_TRI_UNFILLED;

+      if (ctx->Polygon.CullFlag

+          && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)

+         ctx->_TriangleCaps |= DD_TRI_CULL_FRONT_BACK;

+      if (ctx->Polygon.OffsetPoint ||

+          ctx->Polygon.OffsetLine ||

+          ctx->Polygon.OffsetFill)

+         ctx->_TriangleCaps |= DD_TRI_OFFSET;

+   }

+

+   /*

+    * Lighting and shading

+    */

+   if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)

+      ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE;

+   if (ctx->Light.ShadeModel == GL_FLAT)

+      ctx->_TriangleCaps |= DD_FLATSHADE;

+   if (_mesa_need_secondary_color(ctx))

+      ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR;

+

+   /*

+    * Stencil

+    */

+   if (ctx->Stencil._TestTwoSide)

+      ctx->_TriangleCaps |= DD_TRI_TWOSTENCIL;

+}

+#endif

+

+

+/**

+ * Compute derived GL state.

+ * If __struct gl_contextRec::NewState is non-zero then this function \b must

+ * be called before rendering anything.

+ *

+ * Calls dd_function_table::UpdateState to perform any internal state

+ * management necessary.

+ * 

+ * \sa _mesa_update_modelview_project(), _mesa_update_texture(),

+ * _mesa_update_buffer_bounds(),

+ * _mesa_update_lighting() and _mesa_update_tnl_spaces().

+ */

+void

+_mesa_update_state_locked( struct gl_context *ctx )

+{

+   GLbitfield new_state = ctx->NewState;

+   GLbitfield prog_flags = _NEW_PROGRAM;

+   GLbitfield new_prog_state = 0x0;

+

+   if (new_state == _NEW_CURRENT_ATTRIB) 

+      goto out;

+

+   if (MESA_VERBOSE & VERBOSE_STATE)

+      _mesa_print_state("_mesa_update_state", new_state);

+

+   /* Determine which state flags effect vertex/fragment program state */

+   if (ctx->FragmentProgram._MaintainTexEnvProgram) {

+      prog_flags |= (_NEW_BUFFERS | _NEW_TEXTURE | _NEW_FOG |

+		     _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE |

+		     _NEW_PROGRAM | _NEW_FRAG_CLAMP);

+   }

+   if (ctx->VertexProgram._MaintainTnlProgram) {

+      prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX |

+                     _NEW_TRANSFORM | _NEW_POINT |

+                     _NEW_FOG | _NEW_LIGHT |

+                     _MESA_NEW_NEED_EYE_COORDS);

+   }

+

+   /*

+    * Now update derived state info

+    */

+

+   if (new_state & prog_flags)

+      update_program_enables( ctx );

+

+   if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION))

+      _mesa_update_modelview_project( ctx, new_state );

+

+   if (new_state & (_NEW_PROGRAM|_NEW_TEXTURE|_NEW_TEXTURE_MATRIX))

+      _mesa_update_texture( ctx, new_state );

+

+   if (new_state & _NEW_BUFFERS)

+      _mesa_update_framebuffer(ctx);

+

+   if (new_state & (_NEW_SCISSOR | _NEW_BUFFERS | _NEW_VIEWPORT))

+      _mesa_update_draw_buffer_bounds( ctx );

+

+   if (new_state & _NEW_POLYGON)

+      update_polygon( ctx );

+

+   if (new_state & _NEW_LIGHT)

+      _mesa_update_lighting( ctx );

+

+   if (new_state & (_NEW_LIGHT | _NEW_BUFFERS))

+      update_clamp_vertex_color(ctx);

+

+   if (new_state & (_NEW_STENCIL | _NEW_BUFFERS))

+      _mesa_update_stencil( ctx );

+

+   if (new_state & _NEW_PIXEL)

+      _mesa_update_pixel( ctx, new_state );

+

+   if (new_state & _DD_NEW_SEPARATE_SPECULAR)

+      update_separate_specular( ctx );

+

+   if (new_state & (_NEW_BUFFERS | _NEW_VIEWPORT))

+      update_viewport_matrix(ctx);

+

+   if (new_state & _NEW_MULTISAMPLE)

+      update_multisample( ctx );

+

+   if (new_state & _NEW_COLOR)

+      update_color( ctx );

+

+   if (new_state & (_NEW_COLOR | _NEW_BUFFERS))

+      update_clamp_read_color(ctx);

+

+   if(new_state & (_NEW_FRAG_CLAMP | _NEW_BUFFERS))

+      update_clamp_fragment_color(ctx);

+

+#if 0

+   if (new_state & (_NEW_POINT | _NEW_LINE | _NEW_POLYGON | _NEW_LIGHT

+                    | _NEW_STENCIL | _DD_NEW_SEPARATE_SPECULAR))

+      update_tricaps( ctx, new_state );

+#endif

+

+   /* ctx->_NeedEyeCoords is now up to date.

+    *

+    * If the truth value of this variable has changed, update for the

+    * new lighting space and recompute the positions of lights and the

+    * normal transform.

+    *

+    * If the lighting space hasn't changed, may still need to recompute

+    * light positions & normal transforms for other reasons.

+    */

+   if (new_state & _MESA_NEW_NEED_EYE_COORDS) 

+      _mesa_update_tnl_spaces( ctx, new_state );

+

+   if (new_state & prog_flags) {

+      /* When we generate programs from fixed-function vertex/fragment state

+       * this call may generate/bind a new program.  If so, we need to

+       * propogate the _NEW_PROGRAM flag to the driver.

+       */

+      new_prog_state |= update_program( ctx );

+   }

+

+   if (new_state & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT))

+      update_arrays( ctx );

+

+ out:

+   new_prog_state |= update_program_constants(ctx);

+

+   /*

+    * Give the driver a chance to act upon the new_state flags.

+    * The driver might plug in different span functions, for example.

+    * Also, this is where the driver can invalidate the state of any

+    * active modules (such as swrast_setup, swrast, tnl, etc).

+    *

+    * Set ctx->NewState to zero to avoid recursion if

+    * Driver.UpdateState() has to call FLUSH_VERTICES().  (fixed?)

+    */

+   new_state = ctx->NewState | new_prog_state;

+   ctx->NewState = 0;

+   ctx->Driver.UpdateState(ctx, new_state);

+   ctx->Array.NewState = 0;

+   if (!ctx->Array.RebindArrays)

+      ctx->Array.RebindArrays = (new_state & (_NEW_ARRAY | _NEW_PROGRAM)) != 0;

+}

+

+

+/* This is the usual entrypoint for state updates:

+ */

+void

+_mesa_update_state( struct gl_context *ctx )

+{

+   _mesa_lock_context_textures(ctx);

+   _mesa_update_state_locked(ctx);

+   _mesa_unlock_context_textures(ctx);

+}

+

+

+

+

+/**

+ * Want to figure out which fragment program inputs are actually

+ * constant/current values from ctx->Current.  These should be

+ * referenced as a tracked state variable rather than a fragment

+ * program input, to save the overhead of putting a constant value in

+ * every submitted vertex, transferring it to hardware, interpolating

+ * it across the triangle, etc...

+ *

+ * When there is a VP bound, just use vp->outputs.  But when we're

+ * generating vp from fixed function state, basically want to

+ * calculate:

+ *

+ * vp_out_2_fp_in( vp_in_2_vp_out( varying_inputs ) | 

+ *                 potential_vp_outputs )

+ *

+ * Where potential_vp_outputs is calculated by looking at enabled

+ * texgen, etc.

+ * 

+ * The generated fragment program should then only declare inputs that

+ * may vary or otherwise differ from the ctx->Current values.

+ * Otherwise, the fp should track them as state values instead.

+ */

+void

+_mesa_set_varying_vp_inputs( struct gl_context *ctx,

+                             GLbitfield varying_inputs )

+{

+   if (ctx->varying_vp_inputs != varying_inputs) {

+      ctx->varying_vp_inputs = varying_inputs;

+      ctx->NewState |= _NEW_ARRAY;

+      /*printf("%s %x\n", __FUNCTION__, varying_inputs);*/

+   }

+}

+

+

+/**

+ * Used by drivers to tell core Mesa that the driver is going to

+ * install/ use its own vertex program.  In particular, this will

+ * prevent generated fragment programs from using state vars instead

+ * of ordinary varyings/inputs.

+ */

+void

+_mesa_set_vp_override(struct gl_context *ctx, GLboolean flag)

+{

+   if (ctx->VertexProgram._Overriden != flag) {

+      ctx->VertexProgram._Overriden = flag;

+

+      /* Set one of the bits which will trigger fragment program

+       * regeneration:

+       */

+      ctx->NewState |= _NEW_PROGRAM;

+   }

+}

diff --git a/mesalib/src/mesa/main/stencil.c b/mesalib/src/mesa/main/stencil.c
index d898bf1d7..b49ddbdbb 100644
--- a/mesalib/src/mesa/main/stencil.c
+++ b/mesalib/src/mesa/main/stencil.c
@@ -1,614 +1,614 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file stencil.c
- * Stencil operations.
- *
- * Note: There's some conflict between GL_EXT_stencil_two_side and
- * OpenGL 2.0's two-sided stencil feature.
- *
- * With GL_EXT_stencil_two_side, calling glStencilOp/Func/Mask() only the
- * front OR back face state (as set by glActiveStencilFaceEXT) is set.
- *
- * But with OpenGL 2.0, calling glStencilOp/Func/Mask() sets BOTH the
- * front AND back state.
- *
- * Also, note that GL_ATI_separate_stencil is different as well:
- * glStencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, ...)  vs.
- * glStencilFuncSeparate(GLenum face, GLenum func, ...).
- *
- * This problem is solved by keeping three sets of stencil state:
- *  state[0] = GL_FRONT state.
- *  state[1] = OpenGL 2.0 / GL_ATI_separate_stencil GL_BACK state.
- *  state[2] = GL_EXT_stencil_two_side GL_BACK state.
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "macros.h"
-#include "stencil.h"
-#include "mtypes.h"
-
-
-static GLboolean
-validate_stencil_op(struct gl_context *ctx, GLenum op)
-{
-   switch (op) {
-   case GL_KEEP:
-   case GL_ZERO:
-   case GL_REPLACE:
-   case GL_INCR:
-   case GL_DECR:
-   case GL_INVERT:
-      return GL_TRUE;
-   case GL_INCR_WRAP_EXT:
-   case GL_DECR_WRAP_EXT:
-      if (ctx->Extensions.EXT_stencil_wrap) {
-         return GL_TRUE;
-      }
-      /* FALL-THROUGH */
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-static GLboolean
-validate_stencil_func(struct gl_context *ctx, GLenum func)
-{
-   switch (func) {
-   case GL_NEVER:
-   case GL_LESS:
-   case GL_LEQUAL:
-   case GL_GREATER:
-   case GL_GEQUAL:
-   case GL_EQUAL:
-   case GL_NOTEQUAL:
-   case GL_ALWAYS:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Set the clear value for the stencil buffer.
- *
- * \param s clear value.
- *
- * \sa glClearStencil().
- *
- * Updates gl_stencil_attrib::Clear. On change
- * flushes the vertices and notifies the driver via
- * the dd_function_table::ClearStencil callback.
- */
-void GLAPIENTRY
-_mesa_ClearStencil( GLint s )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Stencil.Clear == (GLuint) s)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_STENCIL);
-   ctx->Stencil.Clear = (GLuint) s;
-
-   if (ctx->Driver.ClearStencil) {
-      ctx->Driver.ClearStencil( ctx, s );
-   }
-}
-
-
-/**
- * Set the function and reference value for stencil testing.
- *
- * \param frontfunc front test function.
- * \param backfunc back test function.
- * \param ref front and back reference value.
- * \param mask front and back bitmask.
- *
- * \sa glStencilFunc().
- *
- * Verifies the parameters and updates the respective values in
- * __struct gl_contextRec::Stencil. On change flushes the vertices and notifies the
- * driver via the dd_function_table::StencilFunc callback.
- */
-void GLAPIENTRY
-_mesa_StencilFuncSeparateATI( GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const GLint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glStencilFuncSeparateATI()\n");
-
-   if (!validate_stencil_func(ctx, frontfunc)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glStencilFuncSeparateATI(frontfunc)");
-      return;
-   }
-   if (!validate_stencil_func(ctx, backfunc)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glStencilFuncSeparateATI(backfunc)");
-      return;
-   }
-
-   ref = CLAMP( ref, 0, stencilMax );
-
-   /* set both front and back state */
-   if (ctx->Stencil.Function[0] == frontfunc &&
-       ctx->Stencil.Function[1] == backfunc &&
-       ctx->Stencil.ValueMask[0] == mask &&
-       ctx->Stencil.ValueMask[1] == mask &&
-       ctx->Stencil.Ref[0] == ref &&
-       ctx->Stencil.Ref[1] == ref)
-      return;
-   FLUSH_VERTICES(ctx, _NEW_STENCIL);
-   ctx->Stencil.Function[0]  = frontfunc;
-   ctx->Stencil.Function[1]  = backfunc;
-   ctx->Stencil.Ref[0]       = ctx->Stencil.Ref[1]       = ref;
-   ctx->Stencil.ValueMask[0] = ctx->Stencil.ValueMask[1] = mask;
-   if (ctx->Driver.StencilFuncSeparate) {
-      ctx->Driver.StencilFuncSeparate(ctx, GL_FRONT,
-                                      frontfunc, ref, mask);
-      ctx->Driver.StencilFuncSeparate(ctx, GL_BACK,
-                                      backfunc, ref, mask);
-   }
-}
-
-
-/**
- * Set the function and reference value for stencil testing.
- *
- * \param func test function.
- * \param ref reference value.
- * \param mask bitmask.
- *
- * \sa glStencilFunc().
- *
- * Verifies the parameters and updates the respective values in
- * __struct gl_contextRec::Stencil. On change flushes the vertices and notifies the
- * driver via the dd_function_table::StencilFunc callback.
- */
-void GLAPIENTRY
-_mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const GLint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;
-   const GLint face = ctx->Stencil.ActiveFace;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glStencilFunc()\n");
-
-   if (!validate_stencil_func(ctx, func)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilFunc(func)");
-      return;
-   }
-
-   ref = CLAMP( ref, 0, stencilMax );
-
-   if (face != 0) {
-      if (ctx->Stencil.Function[face] == func &&
-          ctx->Stencil.ValueMask[face] == mask &&
-          ctx->Stencil.Ref[face] == ref)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.Function[face] = func;
-      ctx->Stencil.Ref[face] = ref;
-      ctx->Stencil.ValueMask[face] = mask;
-
-      /* Only propagate the change to the driver if EXT_stencil_two_side
-       * is enabled.
-       */
-      if (ctx->Driver.StencilFuncSeparate && ctx->Stencil.TestTwoSide) {
-         ctx->Driver.StencilFuncSeparate(ctx, GL_BACK, func, ref, mask);
-      }
-   }
-   else {
-      /* set both front and back state */
-      if (ctx->Stencil.Function[0] == func &&
-          ctx->Stencil.Function[1] == func &&
-          ctx->Stencil.ValueMask[0] == mask &&
-          ctx->Stencil.ValueMask[1] == mask &&
-          ctx->Stencil.Ref[0] == ref &&
-          ctx->Stencil.Ref[1] == ref)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.Function[0]  = ctx->Stencil.Function[1]  = func;
-      ctx->Stencil.Ref[0]       = ctx->Stencil.Ref[1]       = ref;
-      ctx->Stencil.ValueMask[0] = ctx->Stencil.ValueMask[1] = mask;
-      if (ctx->Driver.StencilFuncSeparate) {
-         ctx->Driver.StencilFuncSeparate(ctx,
-					 ((ctx->Stencil.TestTwoSide)
-					  ? GL_FRONT : GL_FRONT_AND_BACK),
-                                         func, ref, mask);
-      }
-   }
-}
-
-
-/**
- * Set the stencil writing mask.
- *
- * \param mask bit-mask to enable/disable writing of individual bits in the
- * stencil planes.
- *
- * \sa glStencilMask().
- *
- * Updates gl_stencil_attrib::WriteMask. On change flushes the vertices and
- * notifies the driver via the dd_function_table::StencilMask callback.
- */
-void GLAPIENTRY
-_mesa_StencilMask( GLuint mask )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const GLint face = ctx->Stencil.ActiveFace;
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glStencilMask()\n");
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (face != 0) {
-      /* Only modify the EXT_stencil_two_side back-face state.
-       */
-      if (ctx->Stencil.WriteMask[face] == mask)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.WriteMask[face] = mask;
-
-      /* Only propagate the change to the driver if EXT_stencil_two_side
-       * is enabled.
-       */
-      if (ctx->Driver.StencilMaskSeparate && ctx->Stencil.TestTwoSide) {
-         ctx->Driver.StencilMaskSeparate(ctx, GL_BACK, mask);
-      }
-   }
-   else {
-      /* set both front and back state */
-      if (ctx->Stencil.WriteMask[0] == mask &&
-          ctx->Stencil.WriteMask[1] == mask)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.WriteMask[0] = ctx->Stencil.WriteMask[1] = mask;
-      if (ctx->Driver.StencilMaskSeparate) {
-         ctx->Driver.StencilMaskSeparate(ctx,
-					 ((ctx->Stencil.TestTwoSide)
-					  ? GL_FRONT : GL_FRONT_AND_BACK),
-					  mask);
-      }
-   }
-}
-
-
-/**
- * Set the stencil test actions.
- *
- * \param fail action to take when stencil test fails.
- * \param zfail action to take when stencil test passes, but depth test fails.
- * \param zpass action to take when stencil test passes and the depth test
- * passes (or depth testing is not enabled).
- * 
- * \sa glStencilOp().
- * 
- * Verifies the parameters and updates the respective fields in
- * __struct gl_contextRec::Stencil. On change flushes the vertices and notifies the
- * driver via the dd_function_table::StencilOp callback.
- */
-void GLAPIENTRY
-_mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const GLint face = ctx->Stencil.ActiveFace;
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glStencilOp()\n");
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!validate_stencil_op(ctx, fail)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp(sfail)");
-      return;
-   }
-   if (!validate_stencil_op(ctx, zfail)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp(zfail)");
-      return;
-   }
-   if (!validate_stencil_op(ctx, zpass)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp(zpass)");
-      return;
-   }
-
-   if (face != 0) {
-      /* only set active face state */
-      if (ctx->Stencil.ZFailFunc[face] == zfail &&
-          ctx->Stencil.ZPassFunc[face] == zpass &&
-          ctx->Stencil.FailFunc[face] == fail)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.ZFailFunc[face] = zfail;
-      ctx->Stencil.ZPassFunc[face] = zpass;
-      ctx->Stencil.FailFunc[face] = fail;
-
-      /* Only propagate the change to the driver if EXT_stencil_two_side
-       * is enabled.
-       */
-      if (ctx->Driver.StencilOpSeparate && ctx->Stencil.TestTwoSide) {
-         ctx->Driver.StencilOpSeparate(ctx, GL_BACK, fail, zfail, zpass);
-      }
-   }
-   else {
-      /* set both front and back state */
-      if (ctx->Stencil.ZFailFunc[0] == zfail &&
-          ctx->Stencil.ZFailFunc[1] == zfail &&
-          ctx->Stencil.ZPassFunc[0] == zpass &&
-          ctx->Stencil.ZPassFunc[1] == zpass &&
-          ctx->Stencil.FailFunc[0] == fail &&
-          ctx->Stencil.FailFunc[1] == fail)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.ZFailFunc[0] = ctx->Stencil.ZFailFunc[1] = zfail;
-      ctx->Stencil.ZPassFunc[0] = ctx->Stencil.ZPassFunc[1] = zpass;
-      ctx->Stencil.FailFunc[0]  = ctx->Stencil.FailFunc[1]  = fail;
-      if (ctx->Driver.StencilOpSeparate) {
-         ctx->Driver.StencilOpSeparate(ctx,
-				       ((ctx->Stencil.TestTwoSide)
-					? GL_FRONT : GL_FRONT_AND_BACK),
-                                       fail, zfail, zpass);
-      }
-   }
-}
-
-
-
-#if _HAVE_FULL_GL
-/* GL_EXT_stencil_two_side */
-void GLAPIENTRY
-_mesa_ActiveStencilFaceEXT(GLenum face)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glActiveStencilFaceEXT()\n");
-
-   if (!ctx->Extensions.EXT_stencil_two_side) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glActiveStencilFaceEXT");
-      return;
-   }
-
-   if (face == GL_FRONT || face == GL_BACK) {
-      FLUSH_VERTICES(ctx, _NEW_STENCIL);
-      ctx->Stencil.ActiveFace = (face == GL_FRONT) ? 0 : 2;
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glActiveStencilFaceEXT(face)");
-   }
-}
-#endif
-
-
-
-/**
- * OpenGL 2.0 function.
- * \todo Make StencilOp() call this function.  And eventually remove the
- * ctx->Driver.StencilOp function and use ctx->Driver.StencilOpSeparate
- * instead.
- */
-void GLAPIENTRY
-_mesa_StencilOpSeparate(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass)
-{
-   GLboolean set = GL_FALSE;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glStencilOpSeparate()\n");
-
-   if (!validate_stencil_op(ctx, sfail)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(sfail)");
-      return;
-   }
-   if (!validate_stencil_op(ctx, zfail)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(zfail)");
-      return;
-   }
-   if (!validate_stencil_op(ctx, zpass)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(zpass)");
-      return;
-   }
-   if (face != GL_FRONT && face != GL_BACK && face != GL_FRONT_AND_BACK) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(face)");
-      return;
-   }
-
-   if (face != GL_BACK) {
-      /* set front */
-      if (ctx->Stencil.ZFailFunc[0] != zfail ||
-          ctx->Stencil.ZPassFunc[0] != zpass ||
-          ctx->Stencil.FailFunc[0] != sfail){
-         FLUSH_VERTICES(ctx, _NEW_STENCIL);
-         ctx->Stencil.ZFailFunc[0] = zfail;
-         ctx->Stencil.ZPassFunc[0] = zpass;
-         ctx->Stencil.FailFunc[0] = sfail;
-         set = GL_TRUE;
-      }
-   }
-   if (face != GL_FRONT) {
-      /* set back */
-      if (ctx->Stencil.ZFailFunc[1] != zfail ||
-          ctx->Stencil.ZPassFunc[1] != zpass ||
-          ctx->Stencil.FailFunc[1] != sfail) {
-         FLUSH_VERTICES(ctx, _NEW_STENCIL);
-         ctx->Stencil.ZFailFunc[1] = zfail;
-         ctx->Stencil.ZPassFunc[1] = zpass;
-         ctx->Stencil.FailFunc[1] = sfail;
-         set = GL_TRUE;
-      }
-   }
-   if (set && ctx->Driver.StencilOpSeparate) {
-      ctx->Driver.StencilOpSeparate(ctx, face, sfail, zfail, zpass);
-   }
-}
-
-
-/* OpenGL 2.0 */
-void GLAPIENTRY
-_mesa_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const GLint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glStencilFuncSeparate()\n");
-
-   if (face != GL_FRONT && face != GL_BACK && face != GL_FRONT_AND_BACK) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilFuncSeparate(face)");
-      return;
-   }
-   if (!validate_stencil_func(ctx, func)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilFuncSeparate(func)");
-      return;
-   }
-
-   ref = CLAMP(ref, 0, stencilMax);
-
-   FLUSH_VERTICES(ctx, _NEW_STENCIL);
-
-   if (face != GL_BACK) {
-      /* set front */
-      ctx->Stencil.Function[0] = func;
-      ctx->Stencil.Ref[0] = ref;
-      ctx->Stencil.ValueMask[0] = mask;
-   }
-   if (face != GL_FRONT) {
-      /* set back */
-      ctx->Stencil.Function[1] = func;
-      ctx->Stencil.Ref[1] = ref;
-      ctx->Stencil.ValueMask[1] = mask;
-   }
-   if (ctx->Driver.StencilFuncSeparate) {
-      ctx->Driver.StencilFuncSeparate(ctx, face, func, ref, mask);
-   }
-}
-
-
-/* OpenGL 2.0 */
-void GLAPIENTRY
-_mesa_StencilMaskSeparate(GLenum face, GLuint mask)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glStencilMaskSeparate()\n");
-
-   if (face != GL_FRONT && face != GL_BACK && face != GL_FRONT_AND_BACK) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilaMaskSeparate(face)");
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_STENCIL);
-
-   if (face != GL_BACK) {
-      ctx->Stencil.WriteMask[0] = mask;
-   }
-   if (face != GL_FRONT) {
-      ctx->Stencil.WriteMask[1] = mask;
-   }
-   if (ctx->Driver.StencilMaskSeparate) {
-      ctx->Driver.StencilMaskSeparate(ctx, face, mask);
-   }
-}
-
-
-/**
- * Update derived stencil state.
- */
-void
-_mesa_update_stencil(struct gl_context *ctx)
-{
-   const GLint face = ctx->Stencil._BackFace;
-
-   ctx->Stencil._Enabled = (ctx->Stencil.Enabled &&
-                            ctx->DrawBuffer->Visual.stencilBits > 0);
-
-    ctx->Stencil._TestTwoSide =
-       ctx->Stencil._Enabled &&
-       (ctx->Stencil.Function[0] != ctx->Stencil.Function[face] ||
-	ctx->Stencil.FailFunc[0] != ctx->Stencil.FailFunc[face] ||
-	ctx->Stencil.ZPassFunc[0] != ctx->Stencil.ZPassFunc[face] ||
-	ctx->Stencil.ZFailFunc[0] != ctx->Stencil.ZFailFunc[face] ||
-	ctx->Stencil.Ref[0] != ctx->Stencil.Ref[face] ||
-	ctx->Stencil.ValueMask[0] != ctx->Stencil.ValueMask[face] ||
-	ctx->Stencil.WriteMask[0] != ctx->Stencil.WriteMask[face]);
-}
-
-
-/**
- * Initialize the context stipple state.
- *
- * \param ctx GL context.
- *
- * Initializes __struct gl_contextRec::Stencil attribute group.
- */
-void
-_mesa_init_stencil(struct gl_context *ctx)
-{
-   ctx->Stencil.Enabled = GL_FALSE;
-   ctx->Stencil.TestTwoSide = GL_FALSE;
-   ctx->Stencil.ActiveFace = 0;  /* 0 = GL_FRONT, 2 = GL_BACK */
-   ctx->Stencil.Function[0] = GL_ALWAYS;
-   ctx->Stencil.Function[1] = GL_ALWAYS;
-   ctx->Stencil.Function[2] = GL_ALWAYS;
-   ctx->Stencil.FailFunc[0] = GL_KEEP;
-   ctx->Stencil.FailFunc[1] = GL_KEEP;
-   ctx->Stencil.FailFunc[2] = GL_KEEP;
-   ctx->Stencil.ZPassFunc[0] = GL_KEEP;
-   ctx->Stencil.ZPassFunc[1] = GL_KEEP;
-   ctx->Stencil.ZPassFunc[2] = GL_KEEP;
-   ctx->Stencil.ZFailFunc[0] = GL_KEEP;
-   ctx->Stencil.ZFailFunc[1] = GL_KEEP;
-   ctx->Stencil.ZFailFunc[2] = GL_KEEP;
-   ctx->Stencil.Ref[0] = 0;
-   ctx->Stencil.Ref[1] = 0;
-   ctx->Stencil.Ref[2] = 0;
-   ctx->Stencil.ValueMask[0] = ~0U;
-   ctx->Stencil.ValueMask[1] = ~0U;
-   ctx->Stencil.ValueMask[2] = ~0U;
-   ctx->Stencil.WriteMask[0] = ~0U;
-   ctx->Stencil.WriteMask[1] = ~0U;
-   ctx->Stencil.WriteMask[2] = ~0U;
-   ctx->Stencil.Clear = 0;
-   ctx->Stencil._BackFace = 1;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file stencil.c

+ * Stencil operations.

+ *

+ * Note: There's some conflict between GL_EXT_stencil_two_side and

+ * OpenGL 2.0's two-sided stencil feature.

+ *

+ * With GL_EXT_stencil_two_side, calling glStencilOp/Func/Mask() only the

+ * front OR back face state (as set by glActiveStencilFaceEXT) is set.

+ *

+ * But with OpenGL 2.0, calling glStencilOp/Func/Mask() sets BOTH the

+ * front AND back state.

+ *

+ * Also, note that GL_ATI_separate_stencil is different as well:

+ * glStencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, ...)  vs.

+ * glStencilFuncSeparate(GLenum face, GLenum func, ...).

+ *

+ * This problem is solved by keeping three sets of stencil state:

+ *  state[0] = GL_FRONT state.

+ *  state[1] = OpenGL 2.0 / GL_ATI_separate_stencil GL_BACK state.

+ *  state[2] = GL_EXT_stencil_two_side GL_BACK state.

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "context.h"

+#include "macros.h"

+#include "stencil.h"

+#include "mtypes.h"

+

+

+static GLboolean

+validate_stencil_op(struct gl_context *ctx, GLenum op)

+{

+   switch (op) {

+   case GL_KEEP:

+   case GL_ZERO:

+   case GL_REPLACE:

+   case GL_INCR:

+   case GL_DECR:

+   case GL_INVERT:

+      return GL_TRUE;

+   case GL_INCR_WRAP_EXT:

+   case GL_DECR_WRAP_EXT:

+      if (ctx->Extensions.EXT_stencil_wrap) {

+         return GL_TRUE;

+      }

+      /* FALL-THROUGH */

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+static GLboolean

+validate_stencil_func(struct gl_context *ctx, GLenum func)

+{

+   switch (func) {

+   case GL_NEVER:

+   case GL_LESS:

+   case GL_LEQUAL:

+   case GL_GREATER:

+   case GL_GEQUAL:

+   case GL_EQUAL:

+   case GL_NOTEQUAL:

+   case GL_ALWAYS:

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Set the clear value for the stencil buffer.

+ *

+ * \param s clear value.

+ *

+ * \sa glClearStencil().

+ *

+ * Updates gl_stencil_attrib::Clear. On change

+ * flushes the vertices and notifies the driver via

+ * the dd_function_table::ClearStencil callback.

+ */

+void GLAPIENTRY

+_mesa_ClearStencil( GLint s )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->Stencil.Clear == (GLuint) s)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_STENCIL);

+   ctx->Stencil.Clear = (GLuint) s;

+

+   if (ctx->Driver.ClearStencil) {

+      ctx->Driver.ClearStencil( ctx, s );

+   }

+}

+

+

+/**

+ * Set the function and reference value for stencil testing.

+ *

+ * \param frontfunc front test function.

+ * \param backfunc back test function.

+ * \param ref front and back reference value.

+ * \param mask front and back bitmask.

+ *

+ * \sa glStencilFunc().

+ *

+ * Verifies the parameters and updates the respective values in

+ * __struct gl_contextRec::Stencil. On change flushes the vertices and notifies the

+ * driver via the dd_function_table::StencilFunc callback.

+ */

+void GLAPIENTRY

+_mesa_StencilFuncSeparateATI( GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const GLint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glStencilFuncSeparateATI()\n");

+

+   if (!validate_stencil_func(ctx, frontfunc)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glStencilFuncSeparateATI(frontfunc)");

+      return;

+   }

+   if (!validate_stencil_func(ctx, backfunc)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glStencilFuncSeparateATI(backfunc)");

+      return;

+   }

+

+   ref = CLAMP( ref, 0, stencilMax );

+

+   /* set both front and back state */

+   if (ctx->Stencil.Function[0] == frontfunc &&

+       ctx->Stencil.Function[1] == backfunc &&

+       ctx->Stencil.ValueMask[0] == mask &&

+       ctx->Stencil.ValueMask[1] == mask &&

+       ctx->Stencil.Ref[0] == ref &&

+       ctx->Stencil.Ref[1] == ref)

+      return;

+   FLUSH_VERTICES(ctx, _NEW_STENCIL);

+   ctx->Stencil.Function[0]  = frontfunc;

+   ctx->Stencil.Function[1]  = backfunc;

+   ctx->Stencil.Ref[0]       = ctx->Stencil.Ref[1]       = ref;

+   ctx->Stencil.ValueMask[0] = ctx->Stencil.ValueMask[1] = mask;

+   if (ctx->Driver.StencilFuncSeparate) {

+      ctx->Driver.StencilFuncSeparate(ctx, GL_FRONT,

+                                      frontfunc, ref, mask);

+      ctx->Driver.StencilFuncSeparate(ctx, GL_BACK,

+                                      backfunc, ref, mask);

+   }

+}

+

+

+/**

+ * Set the function and reference value for stencil testing.

+ *

+ * \param func test function.

+ * \param ref reference value.

+ * \param mask bitmask.

+ *

+ * \sa glStencilFunc().

+ *

+ * Verifies the parameters and updates the respective values in

+ * __struct gl_contextRec::Stencil. On change flushes the vertices and notifies the

+ * driver via the dd_function_table::StencilFunc callback.

+ */

+void GLAPIENTRY

+_mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const GLint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;

+   const GLint face = ctx->Stencil.ActiveFace;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glStencilFunc()\n");

+

+   if (!validate_stencil_func(ctx, func)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilFunc(func)");

+      return;

+   }

+

+   ref = CLAMP( ref, 0, stencilMax );

+

+   if (face != 0) {

+      if (ctx->Stencil.Function[face] == func &&

+          ctx->Stencil.ValueMask[face] == mask &&

+          ctx->Stencil.Ref[face] == ref)

+         return;

+      FLUSH_VERTICES(ctx, _NEW_STENCIL);

+      ctx->Stencil.Function[face] = func;

+      ctx->Stencil.Ref[face] = ref;

+      ctx->Stencil.ValueMask[face] = mask;

+

+      /* Only propagate the change to the driver if EXT_stencil_two_side

+       * is enabled.

+       */

+      if (ctx->Driver.StencilFuncSeparate && ctx->Stencil.TestTwoSide) {

+         ctx->Driver.StencilFuncSeparate(ctx, GL_BACK, func, ref, mask);

+      }

+   }

+   else {

+      /* set both front and back state */

+      if (ctx->Stencil.Function[0] == func &&

+          ctx->Stencil.Function[1] == func &&

+          ctx->Stencil.ValueMask[0] == mask &&

+          ctx->Stencil.ValueMask[1] == mask &&

+          ctx->Stencil.Ref[0] == ref &&

+          ctx->Stencil.Ref[1] == ref)

+         return;

+      FLUSH_VERTICES(ctx, _NEW_STENCIL);

+      ctx->Stencil.Function[0]  = ctx->Stencil.Function[1]  = func;

+      ctx->Stencil.Ref[0]       = ctx->Stencil.Ref[1]       = ref;

+      ctx->Stencil.ValueMask[0] = ctx->Stencil.ValueMask[1] = mask;

+      if (ctx->Driver.StencilFuncSeparate) {

+         ctx->Driver.StencilFuncSeparate(ctx,

+					 ((ctx->Stencil.TestTwoSide)

+					  ? GL_FRONT : GL_FRONT_AND_BACK),

+                                         func, ref, mask);

+      }

+   }

+}

+

+

+/**

+ * Set the stencil writing mask.

+ *

+ * \param mask bit-mask to enable/disable writing of individual bits in the

+ * stencil planes.

+ *

+ * \sa glStencilMask().

+ *

+ * Updates gl_stencil_attrib::WriteMask. On change flushes the vertices and

+ * notifies the driver via the dd_function_table::StencilMask callback.

+ */

+void GLAPIENTRY

+_mesa_StencilMask( GLuint mask )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const GLint face = ctx->Stencil.ActiveFace;

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glStencilMask()\n");

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (face != 0) {

+      /* Only modify the EXT_stencil_two_side back-face state.

+       */

+      if (ctx->Stencil.WriteMask[face] == mask)

+         return;

+      FLUSH_VERTICES(ctx, _NEW_STENCIL);

+      ctx->Stencil.WriteMask[face] = mask;

+

+      /* Only propagate the change to the driver if EXT_stencil_two_side

+       * is enabled.

+       */

+      if (ctx->Driver.StencilMaskSeparate && ctx->Stencil.TestTwoSide) {

+         ctx->Driver.StencilMaskSeparate(ctx, GL_BACK, mask);

+      }

+   }

+   else {

+      /* set both front and back state */

+      if (ctx->Stencil.WriteMask[0] == mask &&

+          ctx->Stencil.WriteMask[1] == mask)

+         return;

+      FLUSH_VERTICES(ctx, _NEW_STENCIL);

+      ctx->Stencil.WriteMask[0] = ctx->Stencil.WriteMask[1] = mask;

+      if (ctx->Driver.StencilMaskSeparate) {

+         ctx->Driver.StencilMaskSeparate(ctx,

+					 ((ctx->Stencil.TestTwoSide)

+					  ? GL_FRONT : GL_FRONT_AND_BACK),

+					  mask);

+      }

+   }

+}

+

+

+/**

+ * Set the stencil test actions.

+ *

+ * \param fail action to take when stencil test fails.

+ * \param zfail action to take when stencil test passes, but depth test fails.

+ * \param zpass action to take when stencil test passes and the depth test

+ * passes (or depth testing is not enabled).

+ * 

+ * \sa glStencilOp().

+ * 

+ * Verifies the parameters and updates the respective fields in

+ * __struct gl_contextRec::Stencil. On change flushes the vertices and notifies the

+ * driver via the dd_function_table::StencilOp callback.

+ */

+void GLAPIENTRY

+_mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const GLint face = ctx->Stencil.ActiveFace;

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glStencilOp()\n");

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!validate_stencil_op(ctx, fail)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp(sfail)");

+      return;

+   }

+   if (!validate_stencil_op(ctx, zfail)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp(zfail)");

+      return;

+   }

+   if (!validate_stencil_op(ctx, zpass)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp(zpass)");

+      return;

+   }

+

+   if (face != 0) {

+      /* only set active face state */

+      if (ctx->Stencil.ZFailFunc[face] == zfail &&

+          ctx->Stencil.ZPassFunc[face] == zpass &&

+          ctx->Stencil.FailFunc[face] == fail)

+         return;

+      FLUSH_VERTICES(ctx, _NEW_STENCIL);

+      ctx->Stencil.ZFailFunc[face] = zfail;

+      ctx->Stencil.ZPassFunc[face] = zpass;

+      ctx->Stencil.FailFunc[face] = fail;

+

+      /* Only propagate the change to the driver if EXT_stencil_two_side

+       * is enabled.

+       */

+      if (ctx->Driver.StencilOpSeparate && ctx->Stencil.TestTwoSide) {

+         ctx->Driver.StencilOpSeparate(ctx, GL_BACK, fail, zfail, zpass);

+      }

+   }

+   else {

+      /* set both front and back state */

+      if (ctx->Stencil.ZFailFunc[0] == zfail &&

+          ctx->Stencil.ZFailFunc[1] == zfail &&

+          ctx->Stencil.ZPassFunc[0] == zpass &&

+          ctx->Stencil.ZPassFunc[1] == zpass &&

+          ctx->Stencil.FailFunc[0] == fail &&

+          ctx->Stencil.FailFunc[1] == fail)

+         return;

+      FLUSH_VERTICES(ctx, _NEW_STENCIL);

+      ctx->Stencil.ZFailFunc[0] = ctx->Stencil.ZFailFunc[1] = zfail;

+      ctx->Stencil.ZPassFunc[0] = ctx->Stencil.ZPassFunc[1] = zpass;

+      ctx->Stencil.FailFunc[0]  = ctx->Stencil.FailFunc[1]  = fail;

+      if (ctx->Driver.StencilOpSeparate) {

+         ctx->Driver.StencilOpSeparate(ctx,

+				       ((ctx->Stencil.TestTwoSide)

+					? GL_FRONT : GL_FRONT_AND_BACK),

+                                       fail, zfail, zpass);

+      }

+   }

+}

+

+

+

+#if _HAVE_FULL_GL

+/* GL_EXT_stencil_two_side */

+void GLAPIENTRY

+_mesa_ActiveStencilFaceEXT(GLenum face)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glActiveStencilFaceEXT()\n");

+

+   if (!ctx->Extensions.EXT_stencil_two_side) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glActiveStencilFaceEXT");

+      return;

+   }

+

+   if (face == GL_FRONT || face == GL_BACK) {

+      FLUSH_VERTICES(ctx, _NEW_STENCIL);

+      ctx->Stencil.ActiveFace = (face == GL_FRONT) ? 0 : 2;

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glActiveStencilFaceEXT(face)");

+   }

+}

+#endif

+

+

+

+/**

+ * OpenGL 2.0 function.

+ * \todo Make StencilOp() call this function.  And eventually remove the

+ * ctx->Driver.StencilOp function and use ctx->Driver.StencilOpSeparate

+ * instead.

+ */

+void GLAPIENTRY

+_mesa_StencilOpSeparate(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass)

+{

+   GLboolean set = GL_FALSE;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glStencilOpSeparate()\n");

+

+   if (!validate_stencil_op(ctx, sfail)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(sfail)");

+      return;

+   }

+   if (!validate_stencil_op(ctx, zfail)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(zfail)");

+      return;

+   }

+   if (!validate_stencil_op(ctx, zpass)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(zpass)");

+      return;

+   }

+   if (face != GL_FRONT && face != GL_BACK && face != GL_FRONT_AND_BACK) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOpSeparate(face)");

+      return;

+   }

+

+   if (face != GL_BACK) {

+      /* set front */

+      if (ctx->Stencil.ZFailFunc[0] != zfail ||

+          ctx->Stencil.ZPassFunc[0] != zpass ||

+          ctx->Stencil.FailFunc[0] != sfail){

+         FLUSH_VERTICES(ctx, _NEW_STENCIL);

+         ctx->Stencil.ZFailFunc[0] = zfail;

+         ctx->Stencil.ZPassFunc[0] = zpass;

+         ctx->Stencil.FailFunc[0] = sfail;

+         set = GL_TRUE;

+      }

+   }

+   if (face != GL_FRONT) {

+      /* set back */

+      if (ctx->Stencil.ZFailFunc[1] != zfail ||

+          ctx->Stencil.ZPassFunc[1] != zpass ||

+          ctx->Stencil.FailFunc[1] != sfail) {

+         FLUSH_VERTICES(ctx, _NEW_STENCIL);

+         ctx->Stencil.ZFailFunc[1] = zfail;

+         ctx->Stencil.ZPassFunc[1] = zpass;

+         ctx->Stencil.FailFunc[1] = sfail;

+         set = GL_TRUE;

+      }

+   }

+   if (set && ctx->Driver.StencilOpSeparate) {

+      ctx->Driver.StencilOpSeparate(ctx, face, sfail, zfail, zpass);

+   }

+}

+

+

+/* OpenGL 2.0 */

+void GLAPIENTRY

+_mesa_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const GLint stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glStencilFuncSeparate()\n");

+

+   if (face != GL_FRONT && face != GL_BACK && face != GL_FRONT_AND_BACK) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilFuncSeparate(face)");

+      return;

+   }

+   if (!validate_stencil_func(ctx, func)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilFuncSeparate(func)");

+      return;

+   }

+

+   ref = CLAMP(ref, 0, stencilMax);

+

+   FLUSH_VERTICES(ctx, _NEW_STENCIL);

+

+   if (face != GL_BACK) {

+      /* set front */

+      ctx->Stencil.Function[0] = func;

+      ctx->Stencil.Ref[0] = ref;

+      ctx->Stencil.ValueMask[0] = mask;

+   }

+   if (face != GL_FRONT) {

+      /* set back */

+      ctx->Stencil.Function[1] = func;

+      ctx->Stencil.Ref[1] = ref;

+      ctx->Stencil.ValueMask[1] = mask;

+   }

+   if (ctx->Driver.StencilFuncSeparate) {

+      ctx->Driver.StencilFuncSeparate(ctx, face, func, ref, mask);

+   }

+}

+

+

+/* OpenGL 2.0 */

+void GLAPIENTRY

+_mesa_StencilMaskSeparate(GLenum face, GLuint mask)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glStencilMaskSeparate()\n");

+

+   if (face != GL_FRONT && face != GL_BACK && face != GL_FRONT_AND_BACK) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glStencilaMaskSeparate(face)");

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_STENCIL);

+

+   if (face != GL_BACK) {

+      ctx->Stencil.WriteMask[0] = mask;

+   }

+   if (face != GL_FRONT) {

+      ctx->Stencil.WriteMask[1] = mask;

+   }

+   if (ctx->Driver.StencilMaskSeparate) {

+      ctx->Driver.StencilMaskSeparate(ctx, face, mask);

+   }

+}

+

+

+/**

+ * Update derived stencil state.

+ */

+void

+_mesa_update_stencil(struct gl_context *ctx)

+{

+   const GLint face = ctx->Stencil._BackFace;

+

+   ctx->Stencil._Enabled = (ctx->Stencil.Enabled &&

+                            ctx->DrawBuffer->Visual.stencilBits > 0);

+

+    ctx->Stencil._TestTwoSide =

+       ctx->Stencil._Enabled &&

+       (ctx->Stencil.Function[0] != ctx->Stencil.Function[face] ||

+	ctx->Stencil.FailFunc[0] != ctx->Stencil.FailFunc[face] ||

+	ctx->Stencil.ZPassFunc[0] != ctx->Stencil.ZPassFunc[face] ||

+	ctx->Stencil.ZFailFunc[0] != ctx->Stencil.ZFailFunc[face] ||

+	ctx->Stencil.Ref[0] != ctx->Stencil.Ref[face] ||

+	ctx->Stencil.ValueMask[0] != ctx->Stencil.ValueMask[face] ||

+	ctx->Stencil.WriteMask[0] != ctx->Stencil.WriteMask[face]);

+}

+

+

+/**

+ * Initialize the context stipple state.

+ *

+ * \param ctx GL context.

+ *

+ * Initializes __struct gl_contextRec::Stencil attribute group.

+ */

+void

+_mesa_init_stencil(struct gl_context *ctx)

+{

+   ctx->Stencil.Enabled = GL_FALSE;

+   ctx->Stencil.TestTwoSide = GL_FALSE;

+   ctx->Stencil.ActiveFace = 0;  /* 0 = GL_FRONT, 2 = GL_BACK */

+   ctx->Stencil.Function[0] = GL_ALWAYS;

+   ctx->Stencil.Function[1] = GL_ALWAYS;

+   ctx->Stencil.Function[2] = GL_ALWAYS;

+   ctx->Stencil.FailFunc[0] = GL_KEEP;

+   ctx->Stencil.FailFunc[1] = GL_KEEP;

+   ctx->Stencil.FailFunc[2] = GL_KEEP;

+   ctx->Stencil.ZPassFunc[0] = GL_KEEP;

+   ctx->Stencil.ZPassFunc[1] = GL_KEEP;

+   ctx->Stencil.ZPassFunc[2] = GL_KEEP;

+   ctx->Stencil.ZFailFunc[0] = GL_KEEP;

+   ctx->Stencil.ZFailFunc[1] = GL_KEEP;

+   ctx->Stencil.ZFailFunc[2] = GL_KEEP;

+   ctx->Stencil.Ref[0] = 0;

+   ctx->Stencil.Ref[1] = 0;

+   ctx->Stencil.Ref[2] = 0;

+   ctx->Stencil.ValueMask[0] = ~0U;

+   ctx->Stencil.ValueMask[1] = ~0U;

+   ctx->Stencil.ValueMask[2] = ~0U;

+   ctx->Stencil.WriteMask[0] = ~0U;

+   ctx->Stencil.WriteMask[1] = ~0U;

+   ctx->Stencil.WriteMask[2] = ~0U;

+   ctx->Stencil.Clear = 0;

+   ctx->Stencil._BackFace = 1;

+}

diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c
index 676038430..25307a17c 100644
--- a/mesalib/src/mesa/main/syncobj.c
+++ b/mesalib/src/mesa/main/syncobj.c
@@ -125,7 +125,7 @@ _mesa_wait_sync(struct gl_context *ctx, struct gl_sync_object *syncObj,
 }

 

 

-void

+void GLAPIENTRY

 _mesa_init_sync_object_functions(struct dd_function_table *driver)

 {

    driver->NewSyncObject = _mesa_new_sync_object;

@@ -140,7 +140,7 @@ _mesa_init_sync_object_functions(struct dd_function_table *driver)
 }

 

 

-void

+void GLAPIENTRY

 _mesa_init_sync_dispatch(struct _glapi_table *disp)

 {

    SET_IsSync(disp, _mesa_IsSync);

@@ -156,7 +156,7 @@ _mesa_init_sync_dispatch(struct _glapi_table *disp)
 /**

  * Allocate/init the context state related to sync objects.

  */

-void

+void GLAPIENTRY

 _mesa_init_sync(struct gl_context *ctx)

 {

    (void) ctx;

@@ -166,7 +166,7 @@ _mesa_init_sync(struct gl_context *ctx)
 /**

  * Free the context state related to sync objects.

  */

-void

+void GLAPIENTRY

 _mesa_free_sync_data(struct gl_context *ctx)

 {

    (void) ctx;

@@ -182,7 +182,7 @@ _mesa_validate_sync(struct gl_sync_object *syncObj)
 }

 

 

-void

+void GLAPIENTRY

 _mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)

 {

    _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

@@ -191,7 +191,7 @@ _mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 }

 

 

-void

+void GLAPIENTRY

 _mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)

 {

    _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

diff --git a/mesalib/src/mesa/main/syncobj.h b/mesalib/src/mesa/main/syncobj.h
index ac1384f61..e83ac8b0e 100644
--- a/mesalib/src/mesa/main/syncobj.h
+++ b/mesalib/src/mesa/main/syncobj.h
@@ -41,22 +41,22 @@ struct gl_sync_object;
 

 #if FEATURE_ARB_sync

 

-extern void

+extern void GLAPIENTRY

 _mesa_init_sync_object_functions(struct dd_function_table *driver);

 

-extern void

+extern void GLAPIENTRY

 _mesa_init_sync_dispatch(struct _glapi_table *disp);

 

-extern void

+extern void GLAPIENTRY

 _mesa_init_sync(struct gl_context *);

 

-extern void

+extern void GLAPIENTRY

 _mesa_free_sync_data(struct gl_context *);

 

-extern void

+extern void GLAPIENTRY

 _mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj);

 

-extern void

+extern void GLAPIENTRY

 _mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj);

 

 extern GLboolean GLAPIENTRY

diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c
index d820ae927..59603e81e 100644
--- a/mesalib/src/mesa/main/texcompress.c
+++ b/mesalib/src/mesa/main/texcompress.c
@@ -1,288 +1,288 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.1
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- * Copyright (c) 2008 VMware, Inc.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file texcompress.c
- * Helper functions for texture compression.
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "colormac.h"
-#include "formats.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "texcompress.h"
-
-
-/**
- * Return list of (and count of) all specific texture compression
- * formats that are supported.
- *
- * \param ctx  the GL context
- * \param formats  the resulting format list (may be NULL).
- * \param all  if true return all formats, even those with  some kind
- *             of restrictions/limitations (See GL_ARB_texture_compression
- *             spec for more info).
- *
- * \return number of formats.
- */
-GLuint
-_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats, GLboolean all)
-{
-   GLuint n = 0;
-   if (ctx->Extensions.TDFX_texture_compression_FXT1) {
-      if (formats) {
-         formats[n++] = GL_COMPRESSED_RGB_FXT1_3DFX;
-         formats[n++] = GL_COMPRESSED_RGBA_FXT1_3DFX;
-      }
-      else {
-         n += 2;
-      }
-   }
-   /* don't return RGTC - ARB_texture_compression_rgtc query 19 */
-   if (ctx->Extensions.EXT_texture_compression_s3tc) {
-      if (formats) {
-         formats[n++] = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
-         /* This format has some restrictions/limitations and so should
-          * not be returned via the GL_COMPRESSED_TEXTURE_FORMATS query.
-          * Specifically, all transparent pixels become black.  NVIDIA
-          * omits this format too.
-          */
-         if (all)
-             formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
-         formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-         formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-      }
-      else {
-         n += 3;
-         if (all)
-             n += 1;
-      }
-   }
-   if (ctx->Extensions.S3_s3tc) {
-      if (formats) {
-         formats[n++] = GL_RGB_S3TC;
-         formats[n++] = GL_RGB4_S3TC;
-         formats[n++] = GL_RGBA_S3TC;
-         formats[n++] = GL_RGBA4_S3TC;
-      }
-      else {
-         n += 4;
-      }
-   }
-#if FEATURE_EXT_texture_sRGB
-   if (ctx->Extensions.EXT_texture_sRGB) {
-      if (formats) {
-         formats[n++] = GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;
-         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
-         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
-         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
-      }
-      else {
-         n += 4;
-      }
-   }
-#endif /* FEATURE_EXT_texture_sRGB */
-   return n;
-
-#if FEATURE_ES1 || FEATURE_ES2
-   if (formats) {
-      formats[n++] = GL_PALETTE4_RGB8_OES;
-      formats[n++] = GL_PALETTE4_RGBA8_OES;
-      formats[n++] = GL_PALETTE4_R5_G6_B5_OES;
-      formats[n++] = GL_PALETTE4_RGBA4_OES;
-      formats[n++] = GL_PALETTE4_RGB5_A1_OES;
-      formats[n++] = GL_PALETTE8_RGB8_OES;
-      formats[n++] = GL_PALETTE8_RGBA8_OES;
-      formats[n++] = GL_PALETTE8_R5_G6_B5_OES;
-      formats[n++] = GL_PALETTE8_RGBA4_OES;
-      formats[n++] = GL_PALETTE8_RGB5_A1_OES;
-   }
-   else {
-      n += 10;
-   }
-#endif
-}
-
-
-/**
- * Convert a compressed MESA_FORMAT_x to a GLenum.
- */
-gl_format
-_mesa_glenum_to_compressed_format(GLenum format)
-{
-   switch (format) {
-   case GL_COMPRESSED_RGB_FXT1_3DFX:
-      return MESA_FORMAT_RGB_FXT1;
-   case GL_COMPRESSED_RGBA_FXT1_3DFX:
-      return MESA_FORMAT_RGBA_FXT1;
-
-   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-   case GL_RGB_S3TC:
-      return MESA_FORMAT_RGB_DXT1;
-   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-   case GL_RGB4_S3TC:
-      return MESA_FORMAT_RGBA_DXT1;
-   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-   case GL_RGBA_S3TC:
-      return MESA_FORMAT_RGBA_DXT3;
-   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-   case GL_RGBA4_S3TC:
-      return MESA_FORMAT_RGBA_DXT5;
-
-   case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-      return MESA_FORMAT_SRGB_DXT1;
-   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-      return MESA_FORMAT_SRGBA_DXT1;
-   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
-      return MESA_FORMAT_SRGBA_DXT3;
-   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-      return MESA_FORMAT_SRGBA_DXT5;
-
-   case GL_COMPRESSED_RED_RGTC1:
-      return MESA_FORMAT_RED_RGTC1;
-   case GL_COMPRESSED_SIGNED_RED_RGTC1:
-      return MESA_FORMAT_SIGNED_RED_RGTC1;
-   case GL_COMPRESSED_RG_RGTC2:
-      return MESA_FORMAT_RG_RGTC2;
-   case GL_COMPRESSED_SIGNED_RG_RGTC2:
-      return MESA_FORMAT_SIGNED_RG_RGTC2;
-
-   case GL_COMPRESSED_LUMINANCE_LATC1_EXT:
-      return MESA_FORMAT_L_LATC1;
-   case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:
-      return MESA_FORMAT_SIGNED_L_LATC1;
-   case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
-   case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
-      return MESA_FORMAT_LA_LATC2;
-   case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
-      return MESA_FORMAT_SIGNED_LA_LATC2;
-
-   default:
-      return MESA_FORMAT_NONE;
-   }
-}
-
-
-/**
- * Given a compressed MESA_FORMAT_x value, return the corresponding
- * GLenum for that format.
- * This is needed for glGetTexLevelParameter(GL_TEXTURE_INTERNAL_FORMAT)
- * which must return the specific texture format used when the user might
- * have originally specified a generic compressed format in their
- * glTexImage2D() call.
- * For non-compressed textures, we always return the user-specified
- * internal format unchanged.
- */
-GLenum
-_mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat)
-{
-   switch (mesaFormat) {
-#if FEATURE_texture_fxt1
-   case MESA_FORMAT_RGB_FXT1:
-      return GL_COMPRESSED_RGB_FXT1_3DFX;
-   case MESA_FORMAT_RGBA_FXT1:
-      return GL_COMPRESSED_RGBA_FXT1_3DFX;
-#endif
-#if FEATURE_texture_s3tc
-   case MESA_FORMAT_RGB_DXT1:
-      return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
-   case MESA_FORMAT_RGBA_DXT1:
-      return GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
-   case MESA_FORMAT_RGBA_DXT3:
-      return GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-   case MESA_FORMAT_RGBA_DXT5:
-      return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-#if FEATURE_EXT_texture_sRGB
-   case MESA_FORMAT_SRGB_DXT1:
-      return GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;
-   case MESA_FORMAT_SRGBA_DXT1:
-      return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
-   case MESA_FORMAT_SRGBA_DXT3:
-      return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
-   case MESA_FORMAT_SRGBA_DXT5:
-      return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
-#endif
-#endif
-
-   case MESA_FORMAT_RED_RGTC1:
-      return GL_COMPRESSED_RED_RGTC1;
-   case MESA_FORMAT_SIGNED_RED_RGTC1:
-      return GL_COMPRESSED_SIGNED_RED_RGTC1;
-   case MESA_FORMAT_RG_RGTC2:
-      return GL_COMPRESSED_RG_RGTC2;
-   case MESA_FORMAT_SIGNED_RG_RGTC2:
-      return GL_COMPRESSED_SIGNED_RG_RGTC2;
-
-   case MESA_FORMAT_L_LATC1:
-      return GL_COMPRESSED_LUMINANCE_LATC1_EXT;
-   case MESA_FORMAT_SIGNED_L_LATC1:
-      return GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT;
-   case MESA_FORMAT_LA_LATC2:
-      return GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT;
-   case MESA_FORMAT_SIGNED_LA_LATC2:
-      return GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT;
-
-   default:
-      _mesa_problem(ctx, "Unexpected mesa texture format in"
-                    " _mesa_compressed_format_to_glenum()");
-      return 0;
-   }
-}
-
-
-/*
- * Return the address of the pixel at (col, row, img) in a
- * compressed texture image.
- * \param col, row, img - image position (3D), should be a multiple of the
- *                        format's block size.
- * \param format - compressed image format
- * \param width - image width (stride) in pixels
- * \param image - the image address
- * \return address of pixel at (row, col, img)
- */
-GLubyte *
-_mesa_compressed_image_address(GLint col, GLint row, GLint img,
-                               gl_format mesaFormat,
-                               GLsizei width, const GLubyte *image)
-{
-   /* XXX only 2D images implemented, not 3D */
-   const GLuint blockSize = _mesa_get_format_bytes(mesaFormat);
-   GLuint bw, bh;
-   GLint offset;
-
-   _mesa_get_format_block_size(mesaFormat, &bw, &bh);
-
-   ASSERT(col % bw == 0);
-   ASSERT(row % bh == 0);
-
-   offset = ((width + bw - 1) / bw) * (row / bh) + col / bw;
-   offset *= blockSize;
-
-   return (GLubyte *) image + offset;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.1

+ *

+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

+ * Copyright (c) 2008 VMware, Inc.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file texcompress.c

+ * Helper functions for texture compression.

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "colormac.h"

+#include "formats.h"

+#include "mfeatures.h"

+#include "mtypes.h"

+#include "texcompress.h"

+

+

+/**

+ * Return list of (and count of) all specific texture compression

+ * formats that are supported.

+ *

+ * \param ctx  the GL context

+ * \param formats  the resulting format list (may be NULL).

+ * \param all  if true return all formats, even those with  some kind

+ *             of restrictions/limitations (See GL_ARB_texture_compression

+ *             spec for more info).

+ *

+ * \return number of formats.

+ */

+GLuint

+_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats, GLboolean all)

+{

+   GLuint n = 0;

+   if (ctx->Extensions.TDFX_texture_compression_FXT1) {

+      if (formats) {

+         formats[n++] = GL_COMPRESSED_RGB_FXT1_3DFX;

+         formats[n++] = GL_COMPRESSED_RGBA_FXT1_3DFX;

+      }

+      else {

+         n += 2;

+      }

+   }

+   /* don't return RGTC - ARB_texture_compression_rgtc query 19 */

+   if (ctx->Extensions.EXT_texture_compression_s3tc) {

+      if (formats) {

+         formats[n++] = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;

+         /* This format has some restrictions/limitations and so should

+          * not be returned via the GL_COMPRESSED_TEXTURE_FORMATS query.

+          * Specifically, all transparent pixels become black.  NVIDIA

+          * omits this format too.

+          */

+         if (all)

+             formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;

+         formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;

+         formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;

+      }

+      else {

+         n += 3;

+         if (all)

+             n += 1;

+      }

+   }

+   if (ctx->Extensions.S3_s3tc) {

+      if (formats) {

+         formats[n++] = GL_RGB_S3TC;

+         formats[n++] = GL_RGB4_S3TC;

+         formats[n++] = GL_RGBA_S3TC;

+         formats[n++] = GL_RGBA4_S3TC;

+      }

+      else {

+         n += 4;

+      }

+   }

+#if FEATURE_EXT_texture_sRGB

+   if (ctx->Extensions.EXT_texture_sRGB) {

+      if (formats) {

+         formats[n++] = GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;

+         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;

+         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;

+         formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;

+      }

+      else {

+         n += 4;

+      }

+   }

+#endif /* FEATURE_EXT_texture_sRGB */

+   return n;

+

+#if FEATURE_ES1 || FEATURE_ES2

+   if (formats) {

+      formats[n++] = GL_PALETTE4_RGB8_OES;

+      formats[n++] = GL_PALETTE4_RGBA8_OES;

+      formats[n++] = GL_PALETTE4_R5_G6_B5_OES;

+      formats[n++] = GL_PALETTE4_RGBA4_OES;

+      formats[n++] = GL_PALETTE4_RGB5_A1_OES;

+      formats[n++] = GL_PALETTE8_RGB8_OES;

+      formats[n++] = GL_PALETTE8_RGBA8_OES;

+      formats[n++] = GL_PALETTE8_R5_G6_B5_OES;

+      formats[n++] = GL_PALETTE8_RGBA4_OES;

+      formats[n++] = GL_PALETTE8_RGB5_A1_OES;

+   }

+   else {

+      n += 10;

+   }

+#endif

+}

+

+

+/**

+ * Convert a compressed MESA_FORMAT_x to a GLenum.

+ */

+gl_format

+_mesa_glenum_to_compressed_format(GLenum format)

+{

+   switch (format) {

+   case GL_COMPRESSED_RGB_FXT1_3DFX:

+      return MESA_FORMAT_RGB_FXT1;

+   case GL_COMPRESSED_RGBA_FXT1_3DFX:

+      return MESA_FORMAT_RGBA_FXT1;

+

+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:

+   case GL_RGB_S3TC:

+      return MESA_FORMAT_RGB_DXT1;

+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:

+   case GL_RGB4_S3TC:

+      return MESA_FORMAT_RGBA_DXT1;

+   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:

+   case GL_RGBA_S3TC:

+      return MESA_FORMAT_RGBA_DXT3;

+   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:

+   case GL_RGBA4_S3TC:

+      return MESA_FORMAT_RGBA_DXT5;

+

+   case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:

+      return MESA_FORMAT_SRGB_DXT1;

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:

+      return MESA_FORMAT_SRGBA_DXT1;

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:

+      return MESA_FORMAT_SRGBA_DXT3;

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:

+      return MESA_FORMAT_SRGBA_DXT5;

+

+   case GL_COMPRESSED_RED_RGTC1:

+      return MESA_FORMAT_RED_RGTC1;

+   case GL_COMPRESSED_SIGNED_RED_RGTC1:

+      return MESA_FORMAT_SIGNED_RED_RGTC1;

+   case GL_COMPRESSED_RG_RGTC2:

+      return MESA_FORMAT_RG_RGTC2;

+   case GL_COMPRESSED_SIGNED_RG_RGTC2:

+      return MESA_FORMAT_SIGNED_RG_RGTC2;

+

+   case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

+      return MESA_FORMAT_L_LATC1;

+   case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+      return MESA_FORMAT_SIGNED_L_LATC1;

+   case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+   case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

+      return MESA_FORMAT_LA_LATC2;

+   case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+      return MESA_FORMAT_SIGNED_LA_LATC2;

+

+   default:

+      return MESA_FORMAT_NONE;

+   }

+}

+

+

+/**

+ * Given a compressed MESA_FORMAT_x value, return the corresponding

+ * GLenum for that format.

+ * This is needed for glGetTexLevelParameter(GL_TEXTURE_INTERNAL_FORMAT)

+ * which must return the specific texture format used when the user might

+ * have originally specified a generic compressed format in their

+ * glTexImage2D() call.

+ * For non-compressed textures, we always return the user-specified

+ * internal format unchanged.

+ */

+GLenum

+_mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat)

+{

+   switch (mesaFormat) {

+#if FEATURE_texture_fxt1

+   case MESA_FORMAT_RGB_FXT1:

+      return GL_COMPRESSED_RGB_FXT1_3DFX;

+   case MESA_FORMAT_RGBA_FXT1:

+      return GL_COMPRESSED_RGBA_FXT1_3DFX;

+#endif

+#if FEATURE_texture_s3tc

+   case MESA_FORMAT_RGB_DXT1:

+      return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;

+   case MESA_FORMAT_RGBA_DXT1:

+      return GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;

+   case MESA_FORMAT_RGBA_DXT3:

+      return GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;

+   case MESA_FORMAT_RGBA_DXT5:

+      return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;

+#if FEATURE_EXT_texture_sRGB

+   case MESA_FORMAT_SRGB_DXT1:

+      return GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;

+   case MESA_FORMAT_SRGBA_DXT1:

+      return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;

+   case MESA_FORMAT_SRGBA_DXT3:

+      return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;

+   case MESA_FORMAT_SRGBA_DXT5:

+      return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;

+#endif

+#endif

+

+   case MESA_FORMAT_RED_RGTC1:

+      return GL_COMPRESSED_RED_RGTC1;

+   case MESA_FORMAT_SIGNED_RED_RGTC1:

+      return GL_COMPRESSED_SIGNED_RED_RGTC1;

+   case MESA_FORMAT_RG_RGTC2:

+      return GL_COMPRESSED_RG_RGTC2;

+   case MESA_FORMAT_SIGNED_RG_RGTC2:

+      return GL_COMPRESSED_SIGNED_RG_RGTC2;

+

+   case MESA_FORMAT_L_LATC1:

+      return GL_COMPRESSED_LUMINANCE_LATC1_EXT;

+   case MESA_FORMAT_SIGNED_L_LATC1:

+      return GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT;

+   case MESA_FORMAT_LA_LATC2:

+      return GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT;

+   case MESA_FORMAT_SIGNED_LA_LATC2:

+      return GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT;

+

+   default:

+      _mesa_problem(ctx, "Unexpected mesa texture format in"

+                    " _mesa_compressed_format_to_glenum()");

+      return 0;

+   }

+}

+

+

+/*

+ * Return the address of the pixel at (col, row, img) in a

+ * compressed texture image.

+ * \param col, row, img - image position (3D), should be a multiple of the

+ *                        format's block size.

+ * \param format - compressed image format

+ * \param width - image width (stride) in pixels

+ * \param image - the image address

+ * \return address of pixel at (row, col, img)

+ */

+GLubyte *

+_mesa_compressed_image_address(GLint col, GLint row, GLint img,

+                               gl_format mesaFormat,

+                               GLsizei width, const GLubyte *image)

+{

+   /* XXX only 2D images implemented, not 3D */

+   const GLuint blockSize = _mesa_get_format_bytes(mesaFormat);

+   GLuint bw, bh;

+   GLint offset;

+

+   _mesa_get_format_block_size(mesaFormat, &bw, &bh);

+

+   ASSERT(col % bw == 0);

+   ASSERT(row % bh == 0);

+

+   offset = ((width + bw - 1) / bw) * (row / bh) + col / bw;

+   offset *= blockSize;

+

+   return (GLubyte *) image + offset;

+}

diff --git a/mesalib/src/mesa/main/texcompress_rgtc.c b/mesalib/src/mesa/main/texcompress_rgtc.c
index c50df19c5..60146d09b 100644
--- a/mesalib/src/mesa/main/texcompress_rgtc.c
+++ b/mesalib/src/mesa/main/texcompress_rgtc.c
@@ -1,460 +1,460 @@
-/*
- * Copyright (C) 2011 Red Hat Inc.
- * 
- * block compression parts are:
- * Copyright (C) 2004  Roland Scheidegger   All Rights Reserved.
- *
- * 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 (including the next
- * paragraph) 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.
- *
- * Author:
- *    Dave Airlie
- */
-
-/**
- * \file texcompress_rgtc.c
- * GL_EXT_texture_compression_rgtc support.
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "colormac.h"
-#include "image.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mipmap.h"
-#include "texcompress.h"
-#include "texcompress_rgtc.h"
-#include "texstore.h"
-
-#define RGTC_DEBUG 0
-
-static void unsigned_encode_rgtc_chan(GLubyte *blkaddr, GLubyte srccolors[4][4],
-					GLint numxpixels, GLint numypixels);
-static void signed_encode_rgtc_chan(GLbyte *blkaddr, GLbyte srccolors[4][4],
-			     GLint numxpixels, GLint numypixels);
-
-static void unsigned_fetch_texel_rgtc(unsigned srcRowStride, const GLubyte *pixdata,
-				      unsigned i, unsigned j, GLubyte *value, unsigned comps);
-
-static void signed_fetch_texel_rgtc(unsigned srcRowStride, const GLbyte *pixdata,
-				      unsigned i, unsigned j, GLbyte *value, unsigned comps);
-
-static void extractsrc_u( GLubyte srcpixels[4][4], const GLchan *srcaddr,
-			  GLint srcRowStride, GLint numxpixels, GLint numypixels, GLint comps)
-{
-   GLubyte i, j;
-   const GLchan *curaddr;
-   for (j = 0; j < numypixels; j++) {
-      curaddr = srcaddr + j * srcRowStride * comps;
-      for (i = 0; i < numxpixels; i++) {
-	 srcpixels[j][i] = *curaddr / (CHAN_MAX / 255);
-	 curaddr += comps;
-      }
-   }
-}
-
-static void extractsrc_s( GLbyte srcpixels[4][4], const GLfloat *srcaddr,
-			  GLint srcRowStride, GLint numxpixels, GLint numypixels, GLint comps)
-{
-   GLubyte i, j;
-   const GLfloat *curaddr;
-   for (j = 0; j < numypixels; j++) {
-      curaddr = srcaddr + j * srcRowStride * comps;
-      for (i = 0; i < numxpixels; i++) {
-	 srcpixels[j][i] = FLOAT_TO_BYTE_TEX(*curaddr);
-	 curaddr += comps;
-      }
-   }
-}
-
-
-GLboolean
-_mesa_texstore_red_rgtc1(TEXSTORE_PARAMS)
-{
-   GLubyte *dst;
-   const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
-   const GLchan *tempImage = NULL;
-   int i, j;
-   int numxpixels, numypixels;
-   const GLchan *srcaddr;
-   GLubyte srcpixels[4][4];
-   GLubyte *blkaddr;
-   GLint dstRowDiff;
-   ASSERT(dstFormat == MESA_FORMAT_RED_RGTC1 ||
-          dstFormat == MESA_FORMAT_L_LATC1);
-   ASSERT(dstXoffset % 4 == 0);
-   ASSERT(dstYoffset % 4 == 0);
-   ASSERT(dstZoffset % 4 == 0);
-   (void) dstZoffset;
-   (void) dstImageOffsets;
-
-
-   tempImage = _mesa_make_temp_chan_image(ctx, dims,
-					  baseInternalFormat,
-					  _mesa_get_format_base_format(dstFormat),
-					  srcWidth, srcHeight, srcDepth,
-					  srcFormat, srcType, srcAddr,
-					  srcPacking);
-   if (!tempImage)
-      return GL_FALSE; /* out of memory */
-
-   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        dstFormat,
-                                        texWidth, (GLubyte *) dstAddr);
-
-   blkaddr = dst;
-   dstRowDiff = dstRowStride >= (srcWidth * 4) ? dstRowStride - (((srcWidth + 3) & ~3) * 4) : 0;
-   for (j = 0; j < srcHeight; j+=4) {
-      if (srcHeight > j + 3) numypixels = 4;
-      else numypixels = srcHeight - j;
-      srcaddr = tempImage + j * srcWidth;
-      for (i = 0; i < srcWidth; i += 4) {
-	 if (srcWidth > i + 3) numxpixels = 4;
-	 else numxpixels = srcWidth - i;
-	 extractsrc_u(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 1);
-	 unsigned_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);
-	 srcaddr += numxpixels;
-	 blkaddr += 8;
-      }
-      blkaddr += dstRowDiff;
-   }
-   if (tempImage)
-      free((void *) tempImage);
-
-   return GL_TRUE;
-}
-
-GLboolean
-_mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS)
-{
-   GLbyte *dst;
-   const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
-   const GLfloat *tempImage = NULL;
-   int i, j;
-   int numxpixels, numypixels;
-   const GLfloat *srcaddr;
-   GLbyte srcpixels[4][4];
-   GLbyte *blkaddr;
-   GLint dstRowDiff;
-   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RED_RGTC1 ||
-          dstFormat == MESA_FORMAT_SIGNED_L_LATC1);
-   ASSERT(dstXoffset % 4 == 0);
-   ASSERT(dstYoffset % 4 == 0);
-   ASSERT(dstZoffset % 4 == 0);
-   (void) dstZoffset;
-   (void) dstImageOffsets;
-
-   tempImage = _mesa_make_temp_float_image(ctx, dims,
-					   baseInternalFormat,
-					   _mesa_get_format_base_format(dstFormat),
-					   srcWidth, srcHeight, srcDepth,
-					   srcFormat, srcType, srcAddr,
-					   srcPacking, 0x0);
-   if (!tempImage)
-      return GL_FALSE; /* out of memory */
-
-   dst = (GLbyte *)_mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-						  dstFormat,
-						  texWidth, (GLubyte *) dstAddr);
-
-   blkaddr = dst;
-   dstRowDiff = dstRowStride >= (srcWidth * 4) ? dstRowStride - (((srcWidth + 3) & ~3) * 4) : 0;
-   for (j = 0; j < srcHeight; j+=4) {
-      if (srcHeight > j + 3) numypixels = 4;
-      else numypixels = srcHeight - j;
-      srcaddr = tempImage + j * srcWidth;
-      for (i = 0; i < srcWidth; i += 4) {
-	 if (srcWidth > i + 3) numxpixels = 4;
-	 else numxpixels = srcWidth - i;
-	 extractsrc_s(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 1);
-	 signed_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);
-	 srcaddr += numxpixels;
-	 blkaddr += 8;
-      }
-      blkaddr += dstRowDiff;
-   }
-   if (tempImage)
-      free((void *) tempImage);
-
-   return GL_TRUE;
-}
-
-GLboolean
-_mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS)
-{
-   GLubyte *dst;
-   const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
-   const GLchan *tempImage = NULL;
-   int i, j;
-   int numxpixels, numypixels;
-   const GLchan *srcaddr;
-   GLubyte srcpixels[4][4];
-   GLubyte *blkaddr;
-   GLint dstRowDiff;
-
-   ASSERT(dstFormat == MESA_FORMAT_RG_RGTC2 ||
-          dstFormat == MESA_FORMAT_LA_LATC2);
-   ASSERT(dstXoffset % 4 == 0);
-   ASSERT(dstYoffset % 4 == 0);
-   ASSERT(dstZoffset % 4 == 0);
-   (void) dstZoffset;
-   (void) dstImageOffsets;
-
-   tempImage = _mesa_make_temp_chan_image(ctx, dims,
-					  baseInternalFormat,
-					  _mesa_get_format_base_format(dstFormat),
-					  srcWidth, srcHeight, srcDepth,
-					  srcFormat, srcType, srcAddr,
-					  srcPacking);
-   if (!tempImage)
-      return GL_FALSE; /* out of memory */
-
-   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        dstFormat,
-                                        texWidth, (GLubyte *) dstAddr);
-
-   blkaddr = dst;
-   dstRowDiff = dstRowStride >= (srcWidth * 8) ? dstRowStride - (((srcWidth + 7) & ~7) * 8) : 0;
-   for (j = 0; j < srcHeight; j+=4) {
-      if (srcHeight > j + 3) numypixels = 4;
-      else numypixels = srcHeight - j;
-      srcaddr = tempImage + j * srcWidth * 2;
-      for (i = 0; i < srcWidth; i += 4) {
-	 if (srcWidth > i + 3) numxpixels = 4;
-	 else numxpixels = srcWidth - i;
-	 extractsrc_u(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 2);
-	 unsigned_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);
-
-	 blkaddr += 8;
-	 extractsrc_u(srcpixels, (GLchan *)srcaddr + 1, srcWidth, numxpixels, numypixels, 2);
-	 unsigned_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);
-
-	 blkaddr += 8;
-
-	 srcaddr += numxpixels * 2;
-      }
-      blkaddr += dstRowDiff;
-   }
-   if (tempImage)
-      free((void *) tempImage);
-
-   return GL_TRUE;
-}
-
-GLboolean
-_mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS)
-{
-   GLbyte *dst;
-   const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
-   const GLfloat *tempImage = NULL;
-   int i, j;
-   int numxpixels, numypixels;
-   const GLfloat *srcaddr;
-   GLbyte srcpixels[4][4];
-   GLbyte *blkaddr;
-   GLint dstRowDiff;
-
-   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RG_RGTC2 ||
-          dstFormat == MESA_FORMAT_SIGNED_LA_LATC2);
-   ASSERT(dstXoffset % 4 == 0);
-   ASSERT(dstYoffset % 4 == 0);
-   ASSERT(dstZoffset % 4 == 0);
-   (void) dstZoffset;
-   (void) dstImageOffsets;
-
-   tempImage = _mesa_make_temp_float_image(ctx, dims,
-					   baseInternalFormat,
-					   _mesa_get_format_base_format(dstFormat),
-					   srcWidth, srcHeight, srcDepth,
-					   srcFormat, srcType, srcAddr,
-					   srcPacking, 0x0);
-   if (!tempImage)
-      return GL_FALSE; /* out of memory */
-
-   dst = (GLbyte *)_mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-						  dstFormat,
-						  texWidth, (GLubyte *) dstAddr);
-
-   blkaddr = dst;
-   dstRowDiff = dstRowStride >= (srcWidth * 8) ? dstRowStride - (((srcWidth + 7) & ~7) * 8) : 0;
-   for (j = 0; j < srcHeight; j += 4) {
-      if (srcHeight > j + 3) numypixels = 4;
-      else numypixels = srcHeight - j;
-      srcaddr = tempImage + j * srcWidth * 2;
-      for (i = 0; i < srcWidth; i += 4) {
-	 if (srcWidth > i + 3) numxpixels = 4;
-	 else numxpixels = srcWidth - i;
-
-	 extractsrc_s(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 2);
-	 signed_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);
-	 blkaddr += 8;
-
-	 extractsrc_s(srcpixels, srcaddr + 1, srcWidth, numxpixels, numypixels, 2);
-	 signed_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);
-	 blkaddr += 8;
-
-	 srcaddr += numxpixels * 2;
-
-      }
-      blkaddr += dstRowDiff;
-   }
-   if (tempImage)
-      free((void *) tempImage);
-
-   return GL_TRUE;
-}
-
-void
-_mesa_fetch_texel_2d_f_red_rgtc1(const struct gl_texture_image *texImage,
-				 GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   GLubyte red;
-   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),
-		       i, j, &red, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT(red);
-   texel[GCOMP] = 0.0;
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = 1.0;
-}
-
-void
-_mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct gl_texture_image *texImage,
-					GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   GLbyte red;
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),
-		       i, j, &red, 1);
-   texel[RCOMP] = BYTE_TO_FLOAT_TEX(red);
-   texel[GCOMP] = 0.0;
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = 1.0;
-}
-
-void
-_mesa_fetch_texel_2d_f_rg_rgtc2(const struct gl_texture_image *texImage,
-				 GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   GLubyte red, green;
-   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),
-		     i, j, &red, 2);
-   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data) + 8,
-		     i, j, &green, 2);
-   texel[RCOMP] = UBYTE_TO_FLOAT(red);
-   texel[GCOMP] = UBYTE_TO_FLOAT(green);
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = 1.0;
-}
-
-void
-_mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct gl_texture_image *texImage,
-				       GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   GLbyte red, green;
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),
-		     i, j, &red, 2);
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data) + 8,
-		     i, j, &green, 2);
-   texel[RCOMP] = BYTE_TO_FLOAT_TEX(red);
-   texel[GCOMP] = BYTE_TO_FLOAT_TEX(green);
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = 1.0;
-}
-
-void
-_mesa_fetch_texel_2d_f_l_latc1(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   GLubyte red;
-   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),
-                       i, j, &red, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = UBYTE_TO_FLOAT(red);
-   texel[ACOMP] = 1.0;
-}
-
-void
-_mesa_fetch_texel_2d_f_signed_l_latc1(const struct gl_texture_image *texImage,
-                                        GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   GLbyte red;
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),
-                       i, j, &red, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = BYTE_TO_FLOAT_TEX(red);
-   texel[ACOMP] = 1.0;
-}
-
-void
-_mesa_fetch_texel_2d_f_la_latc2(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   GLubyte red, green;
-   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),
-                     i, j, &red, 2);
-   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data) + 8,
-                     i, j, &green, 2);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = UBYTE_TO_FLOAT(red);
-   texel[ACOMP] = UBYTE_TO_FLOAT(green);
-}
-
-void
-_mesa_fetch_texel_2d_f_signed_la_latc2(const struct gl_texture_image *texImage,
-                                       GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   GLbyte red, green;
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),
-                     i, j, &red, 2);
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data) + 8,
-                     i, j, &green, 2);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = BYTE_TO_FLOAT_TEX(red);
-   texel[ACOMP] = BYTE_TO_FLOAT_TEX(green);
-}
-
-#define TAG(x) unsigned_##x
-
-#define TYPE GLubyte
-#define T_MIN 0
-#define T_MAX 0xff
-
-#include "texcompress_rgtc_tmp.h"
-
-#undef TAG
-#undef TYPE
-#undef T_MIN
-#undef T_MAX
-
-#define TAG(x) signed_##x
-#define TYPE GLbyte
-#define T_MIN (GLbyte)-128
-#define T_MAX (GLbyte)127
-
-#include "texcompress_rgtc_tmp.h"
-
-#undef TAG
-#undef TYPE
-#undef T_MIN
-#undef T_MAX
+/*

+ * Copyright (C) 2011 Red Hat Inc.

+ * 

+ * block compression parts are:

+ * Copyright (C) 2004  Roland Scheidegger   All Rights Reserved.

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ *

+ * Author:

+ *    Dave Airlie

+ */

+

+/**

+ * \file texcompress_rgtc.c

+ * GL_EXT_texture_compression_rgtc support.

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "colormac.h"

+#include "image.h"

+#include "macros.h"

+#include "mfeatures.h"

+#include "mipmap.h"

+#include "texcompress.h"

+#include "texcompress_rgtc.h"

+#include "texstore.h"

+

+#define RGTC_DEBUG 0

+

+static void unsigned_encode_rgtc_chan(GLubyte *blkaddr, GLubyte srccolors[4][4],

+					GLint numxpixels, GLint numypixels);

+static void signed_encode_rgtc_chan(GLbyte *blkaddr, GLbyte srccolors[4][4],

+			     GLint numxpixels, GLint numypixels);

+

+static void unsigned_fetch_texel_rgtc(unsigned srcRowStride, const GLubyte *pixdata,

+				      unsigned i, unsigned j, GLubyte *value, unsigned comps);

+

+static void signed_fetch_texel_rgtc(unsigned srcRowStride, const GLbyte *pixdata,

+				      unsigned i, unsigned j, GLbyte *value, unsigned comps);

+

+static void extractsrc_u( GLubyte srcpixels[4][4], const GLchan *srcaddr,

+			  GLint srcRowStride, GLint numxpixels, GLint numypixels, GLint comps)

+{

+   GLubyte i, j;

+   const GLchan *curaddr;

+   for (j = 0; j < numypixels; j++) {

+      curaddr = srcaddr + j * srcRowStride * comps;

+      for (i = 0; i < numxpixels; i++) {

+	 srcpixels[j][i] = *curaddr / (CHAN_MAX / 255);

+	 curaddr += comps;

+      }

+   }

+}

+

+static void extractsrc_s( GLbyte srcpixels[4][4], const GLfloat *srcaddr,

+			  GLint srcRowStride, GLint numxpixels, GLint numypixels, GLint comps)

+{

+   GLubyte i, j;

+   const GLfloat *curaddr;

+   for (j = 0; j < numypixels; j++) {

+      curaddr = srcaddr + j * srcRowStride * comps;

+      for (i = 0; i < numxpixels; i++) {

+	 srcpixels[j][i] = FLOAT_TO_BYTE_TEX(*curaddr);

+	 curaddr += comps;

+      }

+   }

+}

+

+

+GLboolean

+_mesa_texstore_red_rgtc1(TEXSTORE_PARAMS)

+{

+   GLubyte *dst;

+   const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */

+   const GLchan *tempImage = NULL;

+   int i, j;

+   int numxpixels, numypixels;

+   const GLchan *srcaddr;

+   GLubyte srcpixels[4][4];

+   GLubyte *blkaddr;

+   GLint dstRowDiff;

+   ASSERT(dstFormat == MESA_FORMAT_RED_RGTC1 ||

+          dstFormat == MESA_FORMAT_L_LATC1);

+   ASSERT(dstXoffset % 4 == 0);

+   ASSERT(dstYoffset % 4 == 0);

+   ASSERT(dstZoffset % 4 == 0);

+   (void) dstZoffset;

+   (void) dstImageOffsets;

+

+

+   tempImage = _mesa_make_temp_chan_image(ctx, dims,

+					  baseInternalFormat,

+					  _mesa_get_format_base_format(dstFormat),

+					  srcWidth, srcHeight, srcDepth,

+					  srcFormat, srcType, srcAddr,

+					  srcPacking);

+   if (!tempImage)

+      return GL_FALSE; /* out of memory */

+

+   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

+                                        dstFormat,

+                                        texWidth, (GLubyte *) dstAddr);

+

+   blkaddr = dst;

+   dstRowDiff = dstRowStride >= (srcWidth * 4) ? dstRowStride - (((srcWidth + 3) & ~3) * 4) : 0;

+   for (j = 0; j < srcHeight; j+=4) {

+      if (srcHeight > j + 3) numypixels = 4;

+      else numypixels = srcHeight - j;

+      srcaddr = tempImage + j * srcWidth;

+      for (i = 0; i < srcWidth; i += 4) {

+	 if (srcWidth > i + 3) numxpixels = 4;

+	 else numxpixels = srcWidth - i;

+	 extractsrc_u(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 1);

+	 unsigned_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);

+	 srcaddr += numxpixels;

+	 blkaddr += 8;

+      }

+      blkaddr += dstRowDiff;

+   }

+   if (tempImage)

+      free((void *) tempImage);

+

+   return GL_TRUE;

+}

+

+GLboolean

+_mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS)

+{

+   GLbyte *dst;

+   const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */

+   const GLfloat *tempImage = NULL;

+   int i, j;

+   int numxpixels, numypixels;

+   const GLfloat *srcaddr;

+   GLbyte srcpixels[4][4];

+   GLbyte *blkaddr;

+   GLint dstRowDiff;

+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RED_RGTC1 ||

+          dstFormat == MESA_FORMAT_SIGNED_L_LATC1);

+   ASSERT(dstXoffset % 4 == 0);

+   ASSERT(dstYoffset % 4 == 0);

+   ASSERT(dstZoffset % 4 == 0);

+   (void) dstZoffset;

+   (void) dstImageOffsets;

+

+   tempImage = _mesa_make_temp_float_image(ctx, dims,

+					   baseInternalFormat,

+					   _mesa_get_format_base_format(dstFormat),

+					   srcWidth, srcHeight, srcDepth,

+					   srcFormat, srcType, srcAddr,

+					   srcPacking, 0x0);

+   if (!tempImage)

+      return GL_FALSE; /* out of memory */

+

+   dst = (GLbyte *)_mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

+						  dstFormat,

+						  texWidth, (GLubyte *) dstAddr);

+

+   blkaddr = dst;

+   dstRowDiff = dstRowStride >= (srcWidth * 4) ? dstRowStride - (((srcWidth + 3) & ~3) * 4) : 0;

+   for (j = 0; j < srcHeight; j+=4) {

+      if (srcHeight > j + 3) numypixels = 4;

+      else numypixels = srcHeight - j;

+      srcaddr = tempImage + j * srcWidth;

+      for (i = 0; i < srcWidth; i += 4) {

+	 if (srcWidth > i + 3) numxpixels = 4;

+	 else numxpixels = srcWidth - i;

+	 extractsrc_s(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 1);

+	 signed_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);

+	 srcaddr += numxpixels;

+	 blkaddr += 8;

+      }

+      blkaddr += dstRowDiff;

+   }

+   if (tempImage)

+      free((void *) tempImage);

+

+   return GL_TRUE;

+}

+

+GLboolean

+_mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS)

+{

+   GLubyte *dst;

+   const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */

+   const GLchan *tempImage = NULL;

+   int i, j;

+   int numxpixels, numypixels;

+   const GLchan *srcaddr;

+   GLubyte srcpixels[4][4];

+   GLubyte *blkaddr;

+   GLint dstRowDiff;

+

+   ASSERT(dstFormat == MESA_FORMAT_RG_RGTC2 ||

+          dstFormat == MESA_FORMAT_LA_LATC2);

+   ASSERT(dstXoffset % 4 == 0);

+   ASSERT(dstYoffset % 4 == 0);

+   ASSERT(dstZoffset % 4 == 0);

+   (void) dstZoffset;

+   (void) dstImageOffsets;

+

+   tempImage = _mesa_make_temp_chan_image(ctx, dims,

+					  baseInternalFormat,

+					  _mesa_get_format_base_format(dstFormat),

+					  srcWidth, srcHeight, srcDepth,

+					  srcFormat, srcType, srcAddr,

+					  srcPacking);

+   if (!tempImage)

+      return GL_FALSE; /* out of memory */

+

+   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

+                                        dstFormat,

+                                        texWidth, (GLubyte *) dstAddr);

+

+   blkaddr = dst;

+   dstRowDiff = dstRowStride >= (srcWidth * 8) ? dstRowStride - (((srcWidth + 7) & ~7) * 8) : 0;

+   for (j = 0; j < srcHeight; j+=4) {

+      if (srcHeight > j + 3) numypixels = 4;

+      else numypixels = srcHeight - j;

+      srcaddr = tempImage + j * srcWidth * 2;

+      for (i = 0; i < srcWidth; i += 4) {

+	 if (srcWidth > i + 3) numxpixels = 4;

+	 else numxpixels = srcWidth - i;

+	 extractsrc_u(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 2);

+	 unsigned_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);

+

+	 blkaddr += 8;

+	 extractsrc_u(srcpixels, (GLchan *)srcaddr + 1, srcWidth, numxpixels, numypixels, 2);

+	 unsigned_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);

+

+	 blkaddr += 8;

+

+	 srcaddr += numxpixels * 2;

+      }

+      blkaddr += dstRowDiff;

+   }

+   if (tempImage)

+      free((void *) tempImage);

+

+   return GL_TRUE;

+}

+

+GLboolean

+_mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS)

+{

+   GLbyte *dst;

+   const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */

+   const GLfloat *tempImage = NULL;

+   int i, j;

+   int numxpixels, numypixels;

+   const GLfloat *srcaddr;

+   GLbyte srcpixels[4][4];

+   GLbyte *blkaddr;

+   GLint dstRowDiff;

+

+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RG_RGTC2 ||

+          dstFormat == MESA_FORMAT_SIGNED_LA_LATC2);

+   ASSERT(dstXoffset % 4 == 0);

+   ASSERT(dstYoffset % 4 == 0);

+   ASSERT(dstZoffset % 4 == 0);

+   (void) dstZoffset;

+   (void) dstImageOffsets;

+

+   tempImage = _mesa_make_temp_float_image(ctx, dims,

+					   baseInternalFormat,

+					   _mesa_get_format_base_format(dstFormat),

+					   srcWidth, srcHeight, srcDepth,

+					   srcFormat, srcType, srcAddr,

+					   srcPacking, 0x0);

+   if (!tempImage)

+      return GL_FALSE; /* out of memory */

+

+   dst = (GLbyte *)_mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

+						  dstFormat,

+						  texWidth, (GLubyte *) dstAddr);

+

+   blkaddr = dst;

+   dstRowDiff = dstRowStride >= (srcWidth * 8) ? dstRowStride - (((srcWidth + 7) & ~7) * 8) : 0;

+   for (j = 0; j < srcHeight; j += 4) {

+      if (srcHeight > j + 3) numypixels = 4;

+      else numypixels = srcHeight - j;

+      srcaddr = tempImage + j * srcWidth * 2;

+      for (i = 0; i < srcWidth; i += 4) {

+	 if (srcWidth > i + 3) numxpixels = 4;

+	 else numxpixels = srcWidth - i;

+

+	 extractsrc_s(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 2);

+	 signed_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);

+	 blkaddr += 8;

+

+	 extractsrc_s(srcpixels, srcaddr + 1, srcWidth, numxpixels, numypixels, 2);

+	 signed_encode_rgtc_chan(blkaddr, srcpixels, numxpixels, numypixels);

+	 blkaddr += 8;

+

+	 srcaddr += numxpixels * 2;

+

+      }

+      blkaddr += dstRowDiff;

+   }

+   if (tempImage)

+      free((void *) tempImage);

+

+   return GL_TRUE;

+}

+

+void

+_mesa_fetch_texel_2d_f_red_rgtc1(const struct gl_texture_image *texImage,

+				 GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLubyte red;

+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),

+		       i, j, &red, 1);

+   texel[RCOMP] = UBYTE_TO_FLOAT(red);

+   texel[GCOMP] = 0.0;

+   texel[BCOMP] = 0.0;

+   texel[ACOMP] = 1.0;

+}

+

+void

+_mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct gl_texture_image *texImage,

+					GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLbyte red;

+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),

+		       i, j, &red, 1);

+   texel[RCOMP] = BYTE_TO_FLOAT_TEX(red);

+   texel[GCOMP] = 0.0;

+   texel[BCOMP] = 0.0;

+   texel[ACOMP] = 1.0;

+}

+

+void

+_mesa_fetch_texel_2d_f_rg_rgtc2(const struct gl_texture_image *texImage,

+				 GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLubyte red, green;

+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),

+		     i, j, &red, 2);

+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data) + 8,

+		     i, j, &green, 2);

+   texel[RCOMP] = UBYTE_TO_FLOAT(red);

+   texel[GCOMP] = UBYTE_TO_FLOAT(green);

+   texel[BCOMP] = 0.0;

+   texel[ACOMP] = 1.0;

+}

+

+void

+_mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct gl_texture_image *texImage,

+				       GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLbyte red, green;

+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),

+		     i, j, &red, 2);

+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data) + 8,

+		     i, j, &green, 2);

+   texel[RCOMP] = BYTE_TO_FLOAT_TEX(red);

+   texel[GCOMP] = BYTE_TO_FLOAT_TEX(green);

+   texel[BCOMP] = 0.0;

+   texel[ACOMP] = 1.0;

+}

+

+void

+_mesa_fetch_texel_2d_f_l_latc1(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLubyte red;

+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),

+                       i, j, &red, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = UBYTE_TO_FLOAT(red);

+   texel[ACOMP] = 1.0;

+}

+

+void

+_mesa_fetch_texel_2d_f_signed_l_latc1(const struct gl_texture_image *texImage,

+                                        GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLbyte red;

+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),

+                       i, j, &red, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = BYTE_TO_FLOAT_TEX(red);

+   texel[ACOMP] = 1.0;

+}

+

+void

+_mesa_fetch_texel_2d_f_la_latc2(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLubyte red, green;

+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data),

+                     i, j, &red, 2);

+   unsigned_fetch_texel_rgtc(texImage->RowStride, (GLubyte *)(texImage->Data) + 8,

+                     i, j, &green, 2);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = UBYTE_TO_FLOAT(red);

+   texel[ACOMP] = UBYTE_TO_FLOAT(green);

+}

+

+void

+_mesa_fetch_texel_2d_f_signed_la_latc2(const struct gl_texture_image *texImage,

+                                       GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   GLbyte red, green;

+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data),

+                     i, j, &red, 2);

+   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Data) + 8,

+                     i, j, &green, 2);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = BYTE_TO_FLOAT_TEX(red);

+   texel[ACOMP] = BYTE_TO_FLOAT_TEX(green);

+}

+

+#define TAG(x) unsigned_##x

+

+#define TYPE GLubyte

+#define T_MIN 0

+#define T_MAX 0xff

+

+#include "texcompress_rgtc_tmp.h"

+

+#undef TAG

+#undef TYPE

+#undef T_MIN

+#undef T_MAX

+

+#define TAG(x) signed_##x

+#define TYPE GLbyte

+#define T_MIN (GLbyte)-128

+#define T_MAX (GLbyte)127

+

+#include "texcompress_rgtc_tmp.h"

+

+#undef TAG

+#undef TYPE

+#undef T_MIN

+#undef T_MAX

diff --git a/mesalib/src/mesa/main/texcompress_rgtc.h b/mesalib/src/mesa/main/texcompress_rgtc.h
index 18766770d..a64ef9968 100644
--- a/mesalib/src/mesa/main/texcompress_rgtc.h
+++ b/mesalib/src/mesa/main/texcompress_rgtc.h
@@ -1,77 +1,77 @@
-/*
- * Copyright (C) 2011 Red Hat Inc.
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#ifndef TEXCOMPRESS_RGTC_H
-#define TEXCOMPRESS_RGTC_H
-
-#include "glheader.h"
-#include "mfeatures.h"
-#include "texstore.h"
-
-struct gl_texture_image;
-
-extern GLboolean
-_mesa_texstore_red_rgtc1(TEXSTORE_PARAMS);
-
-extern GLboolean
-_mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS);
-
-extern GLboolean
-_mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS);
-
-extern GLboolean
-_mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS);
-
-extern void
-_mesa_fetch_texel_2d_f_red_rgtc1(const struct gl_texture_image *texImage,
-				 GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct gl_texture_image *texImage,
-					GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_rg_rgtc2(const struct gl_texture_image *texImage,
-				 GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct gl_texture_image *texImage,
-				       GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_l_latc1(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_signed_l_latc1(const struct gl_texture_image *texImage,
-                                        GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_la_latc2(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_signed_la_latc2(const struct gl_texture_image *texImage,
-                                       GLint i, GLint j, GLint k, GLfloat *texel);
-
-#endif
+/*

+ * Copyright (C) 2011 Red Hat Inc.

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#ifndef TEXCOMPRESS_RGTC_H

+#define TEXCOMPRESS_RGTC_H

+

+#include "glheader.h"

+#include "mfeatures.h"

+#include "texstore.h"

+

+struct gl_texture_image;

+

+extern GLboolean

+_mesa_texstore_red_rgtc1(TEXSTORE_PARAMS);

+

+extern GLboolean

+_mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS);

+

+extern GLboolean

+_mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS);

+

+extern GLboolean

+_mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS);

+

+extern void

+_mesa_fetch_texel_2d_f_red_rgtc1(const struct gl_texture_image *texImage,

+				 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct gl_texture_image *texImage,

+					GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_rg_rgtc2(const struct gl_texture_image *texImage,

+				 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct gl_texture_image *texImage,

+				       GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_l_latc1(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_signed_l_latc1(const struct gl_texture_image *texImage,

+                                        GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_la_latc2(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_signed_la_latc2(const struct gl_texture_image *texImage,

+                                       GLint i, GLint j, GLint k, GLfloat *texel);

+

+#endif

diff --git a/mesalib/src/mesa/main/texcompress_rgtc_tmp.h b/mesalib/src/mesa/main/texcompress_rgtc_tmp.h
index c8bf082a1..335e1f4a1 100644
--- a/mesalib/src/mesa/main/texcompress_rgtc_tmp.h
+++ b/mesalib/src/mesa/main/texcompress_rgtc_tmp.h
@@ -1,418 +1,418 @@
-/*
- * Copyright (C) 2011 Red Hat Inc.
- * 
- * block compression parts are:
- * Copyright (C) 2004  Roland Scheidegger   All Rights Reserved.
- *
- * 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 (including the next
- * paragraph) 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.
- *
- * Author:
- *    Dave Airlie
- */
-
-/* included by texcompress_rgtc to define byte/ubyte compressors */
-
-static void TAG(fetch_texel_rgtc)(unsigned srcRowStride, const TYPE *pixdata,
-				  unsigned i, unsigned j, TYPE *value, unsigned comps)
-{
-   TYPE decode;
-   const TYPE *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 8 * comps);
-   const TYPE alpha0 = blksrc[0];
-   const TYPE alpha1 = blksrc[1];
-   const char bit_pos = ((j&3) * 4 + (i&3)) * 3;
-   const TYPE acodelow = blksrc[2 + bit_pos / 8];
-   const TYPE acodehigh = (3 + bit_pos / 8) < 8 ? blksrc[3 + bit_pos / 8] : 0;
-   const TYPE code = (acodelow >> (bit_pos & 0x7) |
-      (acodehigh  << (8 - (bit_pos & 0x7)))) & 0x7;
-
-   if (code == 0)
-      decode = alpha0;
-   else if (code == 1)
-      decode = alpha1;
-   else if (alpha0 > alpha1)
-      decode = ((alpha0 * (8 - code) + (alpha1 * (code - 1))) / 7);
-   else if (code < 6)
-      decode = ((alpha0 * (6 - code) + (alpha1 * (code - 1))) / 5);
-   else if (code == 6)
-      decode = T_MIN;
-   else
-      decode = T_MAX;
-
-   *value = decode;
-}
-
-static void TAG(write_rgtc_encoded_channel)(TYPE *blkaddr,
-					    TYPE alphabase1,
-					    TYPE alphabase2,
-					    TYPE alphaenc[16])
-{
-   *blkaddr++ = alphabase1;
-   *blkaddr++ = alphabase2;
-   *blkaddr++ = alphaenc[0] | (alphaenc[1] << 3) | ((alphaenc[2] & 3) << 6);
-   *blkaddr++ = (alphaenc[2] >> 2) | (alphaenc[3] << 1) | (alphaenc[4] << 4) | ((alphaenc[5] & 1) << 7);
-   *blkaddr++ = (alphaenc[5] >> 1) | (alphaenc[6] << 2) | (alphaenc[7] << 5);
-   *blkaddr++ = alphaenc[8] | (alphaenc[9] << 3) | ((alphaenc[10] & 3) << 6);
-   *blkaddr++ = (alphaenc[10] >> 2) | (alphaenc[11] << 1) | (alphaenc[12] << 4) | ((alphaenc[13] & 1) << 7);
-   *blkaddr++ = (alphaenc[13] >> 1) | (alphaenc[14] << 2) | (alphaenc[15] << 5);
-}
-
-static void TAG(encode_rgtc_chan)(TYPE *blkaddr, TYPE srccolors[4][4],
-			     int numxpixels, int numypixels)
-{
-   TYPE alphabase[2], alphause[2];
-   short alphatest[2] = { 0 };
-   unsigned int alphablockerror1, alphablockerror2, alphablockerror3;
-   TYPE i, j, aindex, acutValues[7];
-   TYPE alphaenc1[16], alphaenc2[16], alphaenc3[16];
-   int alphaabsmin = 0, alphaabsmax = 0;
-   short alphadist;
-
-   /* find lowest and highest alpha value in block, alphabase[0] lowest, alphabase[1] highest */
-   alphabase[0] = T_MAX; alphabase[1] = T_MIN;
-   for (j = 0; j < numypixels; j++) {
-      for (i = 0; i < numxpixels; i++) {
-	 if (srccolors[j][i] == T_MIN)
-            alphaabsmin = 1;
-         else if (srccolors[j][i] == T_MAX)
-            alphaabsmax = 1;
-         else {
-            if (srccolors[j][i] > alphabase[1])
-               alphabase[1] = srccolors[j][i];
-            if (srccolors[j][i] < alphabase[0])
-               alphabase[0] = srccolors[j][i];
-         }
-      }
-   }
-
-
-   if (((alphabase[0] > alphabase[1]) && !(alphaabsmin && alphaabsmax))
-       || (alphabase[0] == alphabase[1] && !alphaabsmin && !alphaabsmax)) { /* one color, either max or min */
-      /* shortcut here since it is a very common case (and also avoids later problems) */
-      /* could also thest for alpha0 == alpha1 (and not min/max), but probably not common, so don't bother */
-
-      *blkaddr++ = srccolors[0][0];
-      blkaddr++;
-      *blkaddr++ = 0;
-      *blkaddr++ = 0;
-      *blkaddr++ = 0;
-      *blkaddr++ = 0;
-      *blkaddr++ = 0;
-      *blkaddr++ = 0;
-#if RGTC_DEBUG
-      fprintf(stderr, "enc0 used\n");
-#endif
-      return;
-   }
-
-   /* find best encoding for alpha0 > alpha1 */
-   /* it's possible this encoding is better even if both alphaabsmin and alphaabsmax are true */
-   alphablockerror1 = 0x0;
-   alphablockerror2 = 0xffffffff;
-   alphablockerror3 = 0xffffffff;
-   if (alphaabsmin) alphause[0] = T_MIN;
-   else alphause[0] = alphabase[0];
-   if (alphaabsmax) alphause[1] = T_MAX;
-   else alphause[1] = alphabase[1];
-   /* calculate the 7 cut values, just the middle between 2 of the computed alpha values */
-   for (aindex = 0; aindex < 7; aindex++) {
-      /* don't forget here is always rounded down */
-      acutValues[aindex] = (alphause[0] * (2*aindex + 1) + alphause[1] * (14 - (2*aindex + 1))) / 14;
-   }
-
-   for (j = 0; j < numypixels; j++) {
-      for (i = 0; i < numxpixels; i++) {
-         /* maybe it's overkill to have the most complicated calculation just for the error
-            calculation which we only need to figure out if encoding1 or encoding2 is better... */
-         if (srccolors[j][i] > acutValues[0]) {
-            alphaenc1[4*j + i] = 0;
-            alphadist = srccolors[j][i] - alphause[1];
-         }
-         else if (srccolors[j][i] > acutValues[1]) {
-            alphaenc1[4*j + i] = 2;
-            alphadist = srccolors[j][i] - (alphause[1] * 6 + alphause[0] * 1) / 7;
-         }
-         else if (srccolors[j][i] > acutValues[2]) {
-            alphaenc1[4*j + i] = 3;
-            alphadist = srccolors[j][i] - (alphause[1] * 5 + alphause[0] * 2) / 7;
-         }
-         else if (srccolors[j][i] > acutValues[3]) {
-            alphaenc1[4*j + i] = 4;
-            alphadist = srccolors[j][i] - (alphause[1] * 4 + alphause[0] * 3) / 7;
-         }
-         else if (srccolors[j][i] > acutValues[4]) {
-            alphaenc1[4*j + i] = 5;
-            alphadist = srccolors[j][i] - (alphause[1] * 3 + alphause[0] * 4) / 7;
-         }
-         else if (srccolors[j][i] > acutValues[5]) {
-            alphaenc1[4*j + i] = 6;
-            alphadist = srccolors[j][i] - (alphause[1] * 2 + alphause[0] * 5) / 7;
-         }
-         else if (srccolors[j][i] > acutValues[6]) {
-            alphaenc1[4*j + i] = 7;
-            alphadist = srccolors[j][i] - (alphause[1] * 1 + alphause[0] * 6) / 7;
-         }
-         else {
-            alphaenc1[4*j + i] = 1;
-            alphadist = srccolors[j][i] - alphause[0];
-         }
-         alphablockerror1 += alphadist * alphadist;
-      }
-   }
-
-#if RGTC_DEBUG
-   for (i = 0; i < 16; i++) {
-      fprintf(stderr, "%d ", alphaenc1[i]);
-   }
-   fprintf(stderr, "cutVals ");
-   for (i = 0; i < 8; i++) {
-      fprintf(stderr, "%d ", acutValues[i]);
-   }
-   fprintf(stderr, "srcVals ");
-   for (j = 0; j < numypixels; j++) {
-      for (i = 0; i < numxpixels; i++) {
-	 fprintf(stderr, "%d ", srccolors[j][i]);
-      }
-   }
-   fprintf(stderr, "\n");
-#endif
-
-   /* it's not very likely this encoding is better if both alphaabsmin and alphaabsmax
-      are false but try it anyway */
-   if (alphablockerror1 >= 32) {
-
-      /* don't bother if encoding is already very good, this condition should also imply
-      we have valid alphabase colors which we absolutely need (alphabase[0] <= alphabase[1]) */
-      alphablockerror2 = 0;
-      for (aindex = 0; aindex < 5; aindex++) {
-         /* don't forget here is always rounded down */
-         acutValues[aindex] = (alphabase[0] * (10 - (2*aindex + 1)) + alphabase[1] * (2*aindex + 1)) / 10;
-      }
-      for (j = 0; j < numypixels; j++) {
-         for (i = 0; i < numxpixels; i++) {
-             /* maybe it's overkill to have the most complicated calculation just for the error
-               calculation which we only need to figure out if encoding1 or encoding2 is better... */
-            if (srccolors[j][i] == T_MIN) {
-               alphaenc2[4*j + i] = 6;
-               alphadist = 0;
-            }
-            else if (srccolors[j][i] == T_MAX) {
-               alphaenc2[4*j + i] = 7;
-               alphadist = 0;
-            }
-            else if (srccolors[j][i] <= acutValues[0]) {
-               alphaenc2[4*j + i] = 0;
-               alphadist = srccolors[j][i] - alphabase[0];
-            }
-            else if (srccolors[j][i] <= acutValues[1]) {
-               alphaenc2[4*j + i] = 2;
-               alphadist = srccolors[j][i] - (alphabase[0] * 4 + alphabase[1] * 1) / 5;
-            }
-            else if (srccolors[j][i] <= acutValues[2]) {
-               alphaenc2[4*j + i] = 3;
-               alphadist = srccolors[j][i] - (alphabase[0] * 3 + alphabase[1] * 2) / 5;
-            }
-            else if (srccolors[j][i] <= acutValues[3]) {
-               alphaenc2[4*j + i] = 4;
-               alphadist = srccolors[j][i] - (alphabase[0] * 2 + alphabase[1] * 3) / 5;
-            }
-            else if (srccolors[j][i] <= acutValues[4]) {
-               alphaenc2[4*j + i] = 5;
-               alphadist = srccolors[j][i] - (alphabase[0] * 1 + alphabase[1] * 4) / 5;
-            }
-            else {
-               alphaenc2[4*j + i] = 1;
-               alphadist = srccolors[j][i] - alphabase[1];
-            }
-            alphablockerror2 += alphadist * alphadist;
-         }
-      }
-
-
-      /* skip this if the error is already very small
-         this encoding is MUCH better on average than #2 though, but expensive! */
-      if ((alphablockerror2 > 96) && (alphablockerror1 > 96)) {
-         short blockerrlin1 = 0;
-         short blockerrlin2 = 0;
-         TYPE nralphainrangelow = 0;
-         TYPE nralphainrangehigh = 0;
-         alphatest[0] = T_MAX;
-         alphatest[1] = T_MIN;
-         /* if we have large range it's likely there are values close to 0/255, try to map them to 0/255 */
-         for (j = 0; j < numypixels; j++) {
-            for (i = 0; i < numxpixels; i++) {
-               if ((srccolors[j][i] > alphatest[1]) && (srccolors[j][i] < (T_MAX -(alphabase[1] - alphabase[0]) / 28)))
-                  alphatest[1] = srccolors[j][i];
-               if ((srccolors[j][i] < alphatest[0]) && (srccolors[j][i] > (alphabase[1] - alphabase[0]) / 28))
-                  alphatest[0] = srccolors[j][i];
-            }
-         }
-          /* shouldn't happen too often, don't really care about those degenerated cases */
-          if (alphatest[1] <= alphatest[0]) {
-             alphatest[0] = T_MIN+1;
-             alphatest[1] = T_MAX-1;
-         }
-         for (aindex = 0; aindex < 5; aindex++) {
-         /* don't forget here is always rounded down */
-            acutValues[aindex] = (alphatest[0] * (10 - (2*aindex + 1)) + alphatest[1] * (2*aindex + 1)) / 10;
-         }
-
-         /* find the "average" difference between the alpha values and the next encoded value.
-            This is then used to calculate new base values.
-            Should there be some weighting, i.e. those values closer to alphatest[x] have more weight,
-            since they will see more improvement, and also because the values in the middle are somewhat
-            likely to get no improvement at all (because the base values might move in different directions)?
-            OTOH it would mean the values in the middle are even less likely to get an improvement
-         */
-         for (j = 0; j < numypixels; j++) {
-            for (i = 0; i < numxpixels; i++) {
-               if (srccolors[j][i] <= alphatest[0] / 2) {
-               }
-               else if (srccolors[j][i] > ((T_MAX + alphatest[1]) / 2)) {
-               }
-               else if (srccolors[j][i] <= acutValues[0]) {
-                  blockerrlin1 += (srccolors[j][i] - alphatest[0]);
-                  nralphainrangelow += 1;
-               }
-               else if (srccolors[j][i] <= acutValues[1]) {
-                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5);
-                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5);
-                  nralphainrangelow += 1;
-                  nralphainrangehigh += 1;
-               }
-               else if (srccolors[j][i] <= acutValues[2]) {
-                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5);
-                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5);
-                  nralphainrangelow += 1;
-                  nralphainrangehigh += 1;
-               }
-               else if (srccolors[j][i] <= acutValues[3]) {
-                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5);
-                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5);
-                  nralphainrangelow += 1;
-                  nralphainrangehigh += 1;
-               }
-               else if (srccolors[j][i] <= acutValues[4]) {
-                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5);
-                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5);
-                  nralphainrangelow += 1;
-                  nralphainrangehigh += 1;
-                  }
-               else {
-                  blockerrlin2 += (srccolors[j][i] - alphatest[1]);
-                  nralphainrangehigh += 1;
-               }
-            }
-         }
-         /* shouldn't happen often, needed to avoid div by zero */
-         if (nralphainrangelow == 0) nralphainrangelow = 1;
-         if (nralphainrangehigh == 0) nralphainrangehigh = 1;
-         alphatest[0] = alphatest[0] + (blockerrlin1 / nralphainrangelow);
-#if RGTC_DEBUG
-         fprintf(stderr, "block err lin low %d, nr %d\n", blockerrlin1, nralphainrangelow);
-         fprintf(stderr, "block err lin high %d, nr %d\n", blockerrlin2, nralphainrangehigh);
-#endif
-         /* again shouldn't really happen often... */
-         if (alphatest[0] < T_MIN) {
-            alphatest[0] = T_MIN;
-         }
-         alphatest[1] = alphatest[1] + (blockerrlin2 / nralphainrangehigh);
-         if (alphatest[1] > T_MAX) {
-            alphatest[1] = T_MAX;
-         }
-
-         alphablockerror3 = 0;
-         for (aindex = 0; aindex < 5; aindex++) {
-         /* don't forget here is always rounded down */
-            acutValues[aindex] = (alphatest[0] * (10 - (2*aindex + 1)) + alphatest[1] * (2*aindex + 1)) / 10;
-         }
-         for (j = 0; j < numypixels; j++) {
-            for (i = 0; i < numxpixels; i++) {
-                /* maybe it's overkill to have the most complicated calculation just for the error
-                  calculation which we only need to figure out if encoding1 or encoding2 is better... */
-               if (srccolors[j][i] <= alphatest[0] / 2) {
-                  alphaenc3[4*j + i] = 6;
-                  alphadist = srccolors[j][i];
-               }
-               else if (srccolors[j][i] > ((T_MAX + alphatest[1]) / 2)) {
-                  alphaenc3[4*j + i] = 7;
-                  alphadist = T_MAX - srccolors[j][i];
-               }
-               else if (srccolors[j][i] <= acutValues[0]) {
-                  alphaenc3[4*j + i] = 0;
-                  alphadist = srccolors[j][i] - alphatest[0];
-               }
-               else if (srccolors[j][i] <= acutValues[1]) {
-                 alphaenc3[4*j + i] = 2;
-                 alphadist = srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5;
-               }
-               else if (srccolors[j][i] <= acutValues[2]) {
-                  alphaenc3[4*j + i] = 3;
-                  alphadist = srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5;
-               }
-               else if (srccolors[j][i] <= acutValues[3]) {
-                  alphaenc3[4*j + i] = 4;
-                  alphadist = srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5;
-               }
-               else if (srccolors[j][i] <= acutValues[4]) {
-                  alphaenc3[4*j + i] = 5;
-                  alphadist = srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5;
-               }
-               else {
-                  alphaenc3[4*j + i] = 1;
-                  alphadist = srccolors[j][i] - alphatest[1];
-               }
-               alphablockerror3 += alphadist * alphadist;
-            }
-         }
-      }
-   }
-
-  /* write the alpha values and encoding back. */
-   if ((alphablockerror1 <= alphablockerror2) && (alphablockerror1 <= alphablockerror3)) {
-#if RGTC_DEBUG
-      if (alphablockerror1 > 96) fprintf(stderr, "enc1 used, error %d\n", alphablockerror1);
-      fprintf(stderr,"w1: min %d max %d au0 %d au1 %d\n",
-	      T_MIN, T_MAX,
-	      alphause[1], alphause[0]);
-#endif
-
-      TAG(write_rgtc_encoded_channel)( blkaddr, alphause[1], alphause[0], alphaenc1 );
-   }
-   else if (alphablockerror2 <= alphablockerror3) {
-#if RGTC_DEBUG
-      if (alphablockerror2 > 96) fprintf(stderr, "enc2 used, error %d\n", alphablockerror2);
-      fprintf(stderr,"w2: min %d max %d au0 %d au1 %d\n",
-	      T_MIN, T_MAX,
-	      alphabase[0], alphabase[1]);
-#endif
-
-      TAG(write_rgtc_encoded_channel)( blkaddr, alphabase[0], alphabase[1], alphaenc2 );
-   }
-   else {
-#if RGTC_DEBUG
-      fprintf(stderr, "enc3 used, error %d\n", alphablockerror3);
-      fprintf(stderr,"w3: min %d max %d au0 %d au1 %d\n",
-	      T_MIN, T_MAX,
-	      alphatest[0], alphatest[1]);
-#endif
-
-      TAG(write_rgtc_encoded_channel)( blkaddr, (TYPE)alphatest[0], (TYPE)alphatest[1], alphaenc3 );
-   }
-}
+/*

+ * Copyright (C) 2011 Red Hat Inc.

+ * 

+ * block compression parts are:

+ * Copyright (C) 2004  Roland Scheidegger   All Rights Reserved.

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ *

+ * Author:

+ *    Dave Airlie

+ */

+

+/* included by texcompress_rgtc to define byte/ubyte compressors */

+

+static void TAG(fetch_texel_rgtc)(unsigned srcRowStride, const TYPE *pixdata,

+				  unsigned i, unsigned j, TYPE *value, unsigned comps)

+{

+   TYPE decode;

+   const TYPE *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 8 * comps);

+   const TYPE alpha0 = blksrc[0];

+   const TYPE alpha1 = blksrc[1];

+   const char bit_pos = ((j&3) * 4 + (i&3)) * 3;

+   const TYPE acodelow = blksrc[2 + bit_pos / 8];

+   const TYPE acodehigh = (3 + bit_pos / 8) < 8 ? blksrc[3 + bit_pos / 8] : 0;

+   const TYPE code = (acodelow >> (bit_pos & 0x7) |

+      (acodehigh  << (8 - (bit_pos & 0x7)))) & 0x7;

+

+   if (code == 0)

+      decode = alpha0;

+   else if (code == 1)

+      decode = alpha1;

+   else if (alpha0 > alpha1)

+      decode = ((alpha0 * (8 - code) + (alpha1 * (code - 1))) / 7);

+   else if (code < 6)

+      decode = ((alpha0 * (6 - code) + (alpha1 * (code - 1))) / 5);

+   else if (code == 6)

+      decode = T_MIN;

+   else

+      decode = T_MAX;

+

+   *value = decode;

+}

+

+static void TAG(write_rgtc_encoded_channel)(TYPE *blkaddr,

+					    TYPE alphabase1,

+					    TYPE alphabase2,

+					    TYPE alphaenc[16])

+{

+   *blkaddr++ = alphabase1;

+   *blkaddr++ = alphabase2;

+   *blkaddr++ = alphaenc[0] | (alphaenc[1] << 3) | ((alphaenc[2] & 3) << 6);

+   *blkaddr++ = (alphaenc[2] >> 2) | (alphaenc[3] << 1) | (alphaenc[4] << 4) | ((alphaenc[5] & 1) << 7);

+   *blkaddr++ = (alphaenc[5] >> 1) | (alphaenc[6] << 2) | (alphaenc[7] << 5);

+   *blkaddr++ = alphaenc[8] | (alphaenc[9] << 3) | ((alphaenc[10] & 3) << 6);

+   *blkaddr++ = (alphaenc[10] >> 2) | (alphaenc[11] << 1) | (alphaenc[12] << 4) | ((alphaenc[13] & 1) << 7);

+   *blkaddr++ = (alphaenc[13] >> 1) | (alphaenc[14] << 2) | (alphaenc[15] << 5);

+}

+

+static void TAG(encode_rgtc_chan)(TYPE *blkaddr, TYPE srccolors[4][4],

+			     int numxpixels, int numypixels)

+{

+   TYPE alphabase[2], alphause[2];

+   short alphatest[2] = { 0 };

+   unsigned int alphablockerror1, alphablockerror2, alphablockerror3;

+   TYPE i, j, aindex, acutValues[7];

+   TYPE alphaenc1[16], alphaenc2[16], alphaenc3[16];

+   int alphaabsmin = 0, alphaabsmax = 0;

+   short alphadist;

+

+   /* find lowest and highest alpha value in block, alphabase[0] lowest, alphabase[1] highest */

+   alphabase[0] = T_MAX; alphabase[1] = T_MIN;

+   for (j = 0; j < numypixels; j++) {

+      for (i = 0; i < numxpixels; i++) {

+	 if (srccolors[j][i] == T_MIN)

+            alphaabsmin = 1;

+         else if (srccolors[j][i] == T_MAX)

+            alphaabsmax = 1;

+         else {

+            if (srccolors[j][i] > alphabase[1])

+               alphabase[1] = srccolors[j][i];

+            if (srccolors[j][i] < alphabase[0])

+               alphabase[0] = srccolors[j][i];

+         }

+      }

+   }

+

+

+   if (((alphabase[0] > alphabase[1]) && !(alphaabsmin && alphaabsmax))

+       || (alphabase[0] == alphabase[1] && !alphaabsmin && !alphaabsmax)) { /* one color, either max or min */

+      /* shortcut here since it is a very common case (and also avoids later problems) */

+      /* could also thest for alpha0 == alpha1 (and not min/max), but probably not common, so don't bother */

+

+      *blkaddr++ = srccolors[0][0];

+      blkaddr++;

+      *blkaddr++ = 0;

+      *blkaddr++ = 0;

+      *blkaddr++ = 0;

+      *blkaddr++ = 0;

+      *blkaddr++ = 0;

+      *blkaddr++ = 0;

+#if RGTC_DEBUG

+      fprintf(stderr, "enc0 used\n");

+#endif

+      return;

+   }

+

+   /* find best encoding for alpha0 > alpha1 */

+   /* it's possible this encoding is better even if both alphaabsmin and alphaabsmax are true */

+   alphablockerror1 = 0x0;

+   alphablockerror2 = 0xffffffff;

+   alphablockerror3 = 0xffffffff;

+   if (alphaabsmin) alphause[0] = T_MIN;

+   else alphause[0] = alphabase[0];

+   if (alphaabsmax) alphause[1] = T_MAX;

+   else alphause[1] = alphabase[1];

+   /* calculate the 7 cut values, just the middle between 2 of the computed alpha values */

+   for (aindex = 0; aindex < 7; aindex++) {

+      /* don't forget here is always rounded down */

+      acutValues[aindex] = (alphause[0] * (2*aindex + 1) + alphause[1] * (14 - (2*aindex + 1))) / 14;

+   }

+

+   for (j = 0; j < numypixels; j++) {

+      for (i = 0; i < numxpixels; i++) {

+         /* maybe it's overkill to have the most complicated calculation just for the error

+            calculation which we only need to figure out if encoding1 or encoding2 is better... */

+         if (srccolors[j][i] > acutValues[0]) {

+            alphaenc1[4*j + i] = 0;

+            alphadist = srccolors[j][i] - alphause[1];

+         }

+         else if (srccolors[j][i] > acutValues[1]) {

+            alphaenc1[4*j + i] = 2;

+            alphadist = srccolors[j][i] - (alphause[1] * 6 + alphause[0] * 1) / 7;

+         }

+         else if (srccolors[j][i] > acutValues[2]) {

+            alphaenc1[4*j + i] = 3;

+            alphadist = srccolors[j][i] - (alphause[1] * 5 + alphause[0] * 2) / 7;

+         }

+         else if (srccolors[j][i] > acutValues[3]) {

+            alphaenc1[4*j + i] = 4;

+            alphadist = srccolors[j][i] - (alphause[1] * 4 + alphause[0] * 3) / 7;

+         }

+         else if (srccolors[j][i] > acutValues[4]) {

+            alphaenc1[4*j + i] = 5;

+            alphadist = srccolors[j][i] - (alphause[1] * 3 + alphause[0] * 4) / 7;

+         }

+         else if (srccolors[j][i] > acutValues[5]) {

+            alphaenc1[4*j + i] = 6;

+            alphadist = srccolors[j][i] - (alphause[1] * 2 + alphause[0] * 5) / 7;

+         }

+         else if (srccolors[j][i] > acutValues[6]) {

+            alphaenc1[4*j + i] = 7;

+            alphadist = srccolors[j][i] - (alphause[1] * 1 + alphause[0] * 6) / 7;

+         }

+         else {

+            alphaenc1[4*j + i] = 1;

+            alphadist = srccolors[j][i] - alphause[0];

+         }

+         alphablockerror1 += alphadist * alphadist;

+      }

+   }

+

+#if RGTC_DEBUG

+   for (i = 0; i < 16; i++) {

+      fprintf(stderr, "%d ", alphaenc1[i]);

+   }

+   fprintf(stderr, "cutVals ");

+   for (i = 0; i < 8; i++) {

+      fprintf(stderr, "%d ", acutValues[i]);

+   }

+   fprintf(stderr, "srcVals ");

+   for (j = 0; j < numypixels; j++) {

+      for (i = 0; i < numxpixels; i++) {

+	 fprintf(stderr, "%d ", srccolors[j][i]);

+      }

+   }

+   fprintf(stderr, "\n");

+#endif

+

+   /* it's not very likely this encoding is better if both alphaabsmin and alphaabsmax

+      are false but try it anyway */

+   if (alphablockerror1 >= 32) {

+

+      /* don't bother if encoding is already very good, this condition should also imply

+      we have valid alphabase colors which we absolutely need (alphabase[0] <= alphabase[1]) */

+      alphablockerror2 = 0;

+      for (aindex = 0; aindex < 5; aindex++) {

+         /* don't forget here is always rounded down */

+         acutValues[aindex] = (alphabase[0] * (10 - (2*aindex + 1)) + alphabase[1] * (2*aindex + 1)) / 10;

+      }

+      for (j = 0; j < numypixels; j++) {

+         for (i = 0; i < numxpixels; i++) {

+             /* maybe it's overkill to have the most complicated calculation just for the error

+               calculation which we only need to figure out if encoding1 or encoding2 is better... */

+            if (srccolors[j][i] == T_MIN) {

+               alphaenc2[4*j + i] = 6;

+               alphadist = 0;

+            }

+            else if (srccolors[j][i] == T_MAX) {

+               alphaenc2[4*j + i] = 7;

+               alphadist = 0;

+            }

+            else if (srccolors[j][i] <= acutValues[0]) {

+               alphaenc2[4*j + i] = 0;

+               alphadist = srccolors[j][i] - alphabase[0];

+            }

+            else if (srccolors[j][i] <= acutValues[1]) {

+               alphaenc2[4*j + i] = 2;

+               alphadist = srccolors[j][i] - (alphabase[0] * 4 + alphabase[1] * 1) / 5;

+            }

+            else if (srccolors[j][i] <= acutValues[2]) {

+               alphaenc2[4*j + i] = 3;

+               alphadist = srccolors[j][i] - (alphabase[0] * 3 + alphabase[1] * 2) / 5;

+            }

+            else if (srccolors[j][i] <= acutValues[3]) {

+               alphaenc2[4*j + i] = 4;

+               alphadist = srccolors[j][i] - (alphabase[0] * 2 + alphabase[1] * 3) / 5;

+            }

+            else if (srccolors[j][i] <= acutValues[4]) {

+               alphaenc2[4*j + i] = 5;

+               alphadist = srccolors[j][i] - (alphabase[0] * 1 + alphabase[1] * 4) / 5;

+            }

+            else {

+               alphaenc2[4*j + i] = 1;

+               alphadist = srccolors[j][i] - alphabase[1];

+            }

+            alphablockerror2 += alphadist * alphadist;

+         }

+      }

+

+

+      /* skip this if the error is already very small

+         this encoding is MUCH better on average than #2 though, but expensive! */

+      if ((alphablockerror2 > 96) && (alphablockerror1 > 96)) {

+         short blockerrlin1 = 0;

+         short blockerrlin2 = 0;

+         TYPE nralphainrangelow = 0;

+         TYPE nralphainrangehigh = 0;

+         alphatest[0] = T_MAX;

+         alphatest[1] = T_MIN;

+         /* if we have large range it's likely there are values close to 0/255, try to map them to 0/255 */

+         for (j = 0; j < numypixels; j++) {

+            for (i = 0; i < numxpixels; i++) {

+               if ((srccolors[j][i] > alphatest[1]) && (srccolors[j][i] < (T_MAX -(alphabase[1] - alphabase[0]) / 28)))

+                  alphatest[1] = srccolors[j][i];

+               if ((srccolors[j][i] < alphatest[0]) && (srccolors[j][i] > (alphabase[1] - alphabase[0]) / 28))

+                  alphatest[0] = srccolors[j][i];

+            }

+         }

+          /* shouldn't happen too often, don't really care about those degenerated cases */

+          if (alphatest[1] <= alphatest[0]) {

+             alphatest[0] = T_MIN+1;

+             alphatest[1] = T_MAX-1;

+         }

+         for (aindex = 0; aindex < 5; aindex++) {

+         /* don't forget here is always rounded down */

+            acutValues[aindex] = (alphatest[0] * (10 - (2*aindex + 1)) + alphatest[1] * (2*aindex + 1)) / 10;

+         }

+

+         /* find the "average" difference between the alpha values and the next encoded value.

+            This is then used to calculate new base values.

+            Should there be some weighting, i.e. those values closer to alphatest[x] have more weight,

+            since they will see more improvement, and also because the values in the middle are somewhat

+            likely to get no improvement at all (because the base values might move in different directions)?

+            OTOH it would mean the values in the middle are even less likely to get an improvement

+         */

+         for (j = 0; j < numypixels; j++) {

+            for (i = 0; i < numxpixels; i++) {

+               if (srccolors[j][i] <= alphatest[0] / 2) {

+               }

+               else if (srccolors[j][i] > ((T_MAX + alphatest[1]) / 2)) {

+               }

+               else if (srccolors[j][i] <= acutValues[0]) {

+                  blockerrlin1 += (srccolors[j][i] - alphatest[0]);

+                  nralphainrangelow += 1;

+               }

+               else if (srccolors[j][i] <= acutValues[1]) {

+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5);

+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5);

+                  nralphainrangelow += 1;

+                  nralphainrangehigh += 1;

+               }

+               else if (srccolors[j][i] <= acutValues[2]) {

+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5);

+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5);

+                  nralphainrangelow += 1;

+                  nralphainrangehigh += 1;

+               }

+               else if (srccolors[j][i] <= acutValues[3]) {

+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5);

+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5);

+                  nralphainrangelow += 1;

+                  nralphainrangehigh += 1;

+               }

+               else if (srccolors[j][i] <= acutValues[4]) {

+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5);

+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5);

+                  nralphainrangelow += 1;

+                  nralphainrangehigh += 1;

+                  }

+               else {

+                  blockerrlin2 += (srccolors[j][i] - alphatest[1]);

+                  nralphainrangehigh += 1;

+               }

+            }

+         }

+         /* shouldn't happen often, needed to avoid div by zero */

+         if (nralphainrangelow == 0) nralphainrangelow = 1;

+         if (nralphainrangehigh == 0) nralphainrangehigh = 1;

+         alphatest[0] = alphatest[0] + (blockerrlin1 / nralphainrangelow);

+#if RGTC_DEBUG

+         fprintf(stderr, "block err lin low %d, nr %d\n", blockerrlin1, nralphainrangelow);

+         fprintf(stderr, "block err lin high %d, nr %d\n", blockerrlin2, nralphainrangehigh);

+#endif

+         /* again shouldn't really happen often... */

+         if (alphatest[0] < T_MIN) {

+            alphatest[0] = T_MIN;

+         }

+         alphatest[1] = alphatest[1] + (blockerrlin2 / nralphainrangehigh);

+         if (alphatest[1] > T_MAX) {

+            alphatest[1] = T_MAX;

+         }

+

+         alphablockerror3 = 0;

+         for (aindex = 0; aindex < 5; aindex++) {

+         /* don't forget here is always rounded down */

+            acutValues[aindex] = (alphatest[0] * (10 - (2*aindex + 1)) + alphatest[1] * (2*aindex + 1)) / 10;

+         }

+         for (j = 0; j < numypixels; j++) {

+            for (i = 0; i < numxpixels; i++) {

+                /* maybe it's overkill to have the most complicated calculation just for the error

+                  calculation which we only need to figure out if encoding1 or encoding2 is better... */

+               if (srccolors[j][i] <= alphatest[0] / 2) {

+                  alphaenc3[4*j + i] = 6;

+                  alphadist = srccolors[j][i];

+               }

+               else if (srccolors[j][i] > ((T_MAX + alphatest[1]) / 2)) {

+                  alphaenc3[4*j + i] = 7;

+                  alphadist = T_MAX - srccolors[j][i];

+               }

+               else if (srccolors[j][i] <= acutValues[0]) {

+                  alphaenc3[4*j + i] = 0;

+                  alphadist = srccolors[j][i] - alphatest[0];

+               }

+               else if (srccolors[j][i] <= acutValues[1]) {

+                 alphaenc3[4*j + i] = 2;

+                 alphadist = srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5;

+               }

+               else if (srccolors[j][i] <= acutValues[2]) {

+                  alphaenc3[4*j + i] = 3;

+                  alphadist = srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5;

+               }

+               else if (srccolors[j][i] <= acutValues[3]) {

+                  alphaenc3[4*j + i] = 4;

+                  alphadist = srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5;

+               }

+               else if (srccolors[j][i] <= acutValues[4]) {

+                  alphaenc3[4*j + i] = 5;

+                  alphadist = srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5;

+               }

+               else {

+                  alphaenc3[4*j + i] = 1;

+                  alphadist = srccolors[j][i] - alphatest[1];

+               }

+               alphablockerror3 += alphadist * alphadist;

+            }

+         }

+      }

+   }

+

+  /* write the alpha values and encoding back. */

+   if ((alphablockerror1 <= alphablockerror2) && (alphablockerror1 <= alphablockerror3)) {

+#if RGTC_DEBUG

+      if (alphablockerror1 > 96) fprintf(stderr, "enc1 used, error %d\n", alphablockerror1);

+      fprintf(stderr,"w1: min %d max %d au0 %d au1 %d\n",

+	      T_MIN, T_MAX,

+	      alphause[1], alphause[0]);

+#endif

+

+      TAG(write_rgtc_encoded_channel)( blkaddr, alphause[1], alphause[0], alphaenc1 );

+   }

+   else if (alphablockerror2 <= alphablockerror3) {

+#if RGTC_DEBUG

+      if (alphablockerror2 > 96) fprintf(stderr, "enc2 used, error %d\n", alphablockerror2);

+      fprintf(stderr,"w2: min %d max %d au0 %d au1 %d\n",

+	      T_MIN, T_MAX,

+	      alphabase[0], alphabase[1]);

+#endif

+

+      TAG(write_rgtc_encoded_channel)( blkaddr, alphabase[0], alphabase[1], alphaenc2 );

+   }

+   else {

+#if RGTC_DEBUG

+      fprintf(stderr, "enc3 used, error %d\n", alphablockerror3);

+      fprintf(stderr,"w3: min %d max %d au0 %d au1 %d\n",

+	      T_MIN, T_MAX,

+	      alphatest[0], alphatest[1]);

+#endif

+

+      TAG(write_rgtc_encoded_channel)( blkaddr, (TYPE)alphatest[0], (TYPE)alphatest[1], alphaenc3 );

+   }

+}

diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c
index 90be6c0a8..479806eca 100644
--- a/mesalib/src/mesa/main/texcompress_s3tc.c
+++ b/mesalib/src/mesa/main/texcompress_s3tc.c
@@ -50,7 +50,11 @@
 

 

 #if defined(_WIN32) || defined(WIN32)

+#ifdef _DEBUG

+#define DXTN_LIBNAME "dxtn_dbg.dll"

+#else

 #define DXTN_LIBNAME "dxtn.dll"

+#endif

 #define RTLD_LAZY 0

 #define RTLD_GLOBAL 0

 #elif defined(__DJGPP__)

diff --git a/mesalib/src/mesa/main/texenv.c b/mesalib/src/mesa/main/texenv.c
index 9228e354a..7363e2794 100644
--- a/mesalib/src/mesa/main/texenv.c
+++ b/mesalib/src/mesa/main/texenv.c
@@ -1,1043 +1,1043 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-/** 
- * \file texenv.c
- *
- * glTexEnv-related functions
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/enums.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-#include "main/state.h"
-#include "main/texenv.h"
-#include "main/texstate.h"
-
-
-#define TE_ERROR(errCode, msg, value)				\
-   _mesa_error(ctx, errCode, msg, _mesa_lookup_enum_by_nr(value));
-
-
-/** Set texture env mode */
-static void
-set_env_mode(struct gl_context *ctx,
-             struct gl_texture_unit *texUnit,
-             GLenum mode)
-{
-   GLboolean legal;
-
-   if (texUnit->EnvMode == mode)
-      return;
-
-   switch (mode) {
-   case GL_MODULATE:
-   case GL_BLEND:
-   case GL_DECAL:
-   case GL_REPLACE:
-      legal = GL_TRUE;
-      break;
-   case GL_REPLACE_EXT:
-      mode = GL_REPLACE; /* GL_REPLACE_EXT != GL_REPLACE */
-      legal = GL_TRUE;
-      break;
-   case GL_ADD:
-      legal = ctx->Extensions.EXT_texture_env_add;
-      break;
-   case GL_COMBINE:
-      legal = (ctx->Extensions.EXT_texture_env_combine ||
-               ctx->Extensions.ARB_texture_env_combine);
-      break;
-   case GL_COMBINE4_NV:
-      legal = ctx->Extensions.NV_texture_env_combine4;
-      break;
-   default:
-      legal = GL_FALSE;
-   }
-
-   if (legal) {
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-      texUnit->EnvMode = mode;
-   }
-   else {
-      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-   }
-}
-
-
-static void
-set_env_color(struct gl_context *ctx,
-              struct gl_texture_unit *texUnit,
-              const GLfloat *color)
-{
-   if (TEST_EQ_4V(color, texUnit->EnvColorUnclamped))
-      return;
-   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-   COPY_4FV(texUnit->EnvColorUnclamped, color);
-   texUnit->EnvColor[0] = CLAMP(color[0], 0.0F, 1.0F);
-   texUnit->EnvColor[1] = CLAMP(color[1], 0.0F, 1.0F);
-   texUnit->EnvColor[2] = CLAMP(color[2], 0.0F, 1.0F);
-   texUnit->EnvColor[3] = CLAMP(color[3], 0.0F, 1.0F);
-}
-
-
-/** Set an RGB or A combiner mode/function */
-static void
-set_combiner_mode(struct gl_context *ctx,
-                  struct gl_texture_unit *texUnit,
-                  GLenum pname, GLenum mode)
-{
-   GLboolean legal;
-
-   if (!ctx->Extensions.EXT_texture_env_combine &&
-       !ctx->Extensions.ARB_texture_env_combine) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");
-      return;
-   }
-
-   switch (mode) {
-   case GL_REPLACE:
-   case GL_MODULATE:
-   case GL_ADD:
-   case GL_ADD_SIGNED:
-   case GL_INTERPOLATE:
-      legal = GL_TRUE;
-      break;
-   case GL_SUBTRACT:
-      legal = ctx->Extensions.ARB_texture_env_combine;
-      break;
-   case GL_DOT3_RGB_EXT:
-   case GL_DOT3_RGBA_EXT:
-      legal = (ctx->Extensions.EXT_texture_env_dot3 &&
-               pname == GL_COMBINE_RGB);
-      break;
-   case GL_DOT3_RGB:
-   case GL_DOT3_RGBA:
-      legal = (ctx->Extensions.ARB_texture_env_dot3 &&
-               pname == GL_COMBINE_RGB);
-      break;
-   case GL_MODULATE_ADD_ATI:
-   case GL_MODULATE_SIGNED_ADD_ATI:
-   case GL_MODULATE_SUBTRACT_ATI:
-      legal = ctx->Extensions.ATI_texture_env_combine3;
-      break;
-   case GL_BUMP_ENVMAP_ATI:
-      legal = (ctx->Extensions.ATI_envmap_bumpmap &&
-               pname == GL_COMBINE_RGB);
-      break;
-   default:
-      legal = GL_FALSE;
-   }
-
-   if (!legal) {
-      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
-      return;
-   }
-
-   switch (pname) {
-   case GL_COMBINE_RGB:
-      if (texUnit->Combine.ModeRGB == mode)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-      texUnit->Combine.ModeRGB = mode;
-      break;
-
-   case GL_COMBINE_ALPHA:
-      if (texUnit->Combine.ModeA == mode)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-      texUnit->Combine.ModeA = mode;
-      break;
-   default:
-      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-   }
-}
-
-
-
-/** Set an RGB or A combiner source term */
-static void
-set_combiner_source(struct gl_context *ctx,
-                    struct gl_texture_unit *texUnit,
-                    GLenum pname, GLenum param)
-{
-   GLuint term;
-   GLboolean alpha, legal;
-
-   if (!ctx->Extensions.EXT_texture_env_combine &&
-       !ctx->Extensions.ARB_texture_env_combine) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");
-      return;
-   }
-
-   /*
-    * Translate pname to (term, alpha).
-    *
-    * The enums were given sequential values for a reason.
-    */
-   switch (pname) {
-   case GL_SOURCE0_RGB:
-   case GL_SOURCE1_RGB:
-   case GL_SOURCE2_RGB:
-   case GL_SOURCE3_RGB_NV:
-      term = pname - GL_SOURCE0_RGB;
-      alpha = GL_FALSE;
-      break;
-   case GL_SOURCE0_ALPHA:
-   case GL_SOURCE1_ALPHA:
-   case GL_SOURCE2_ALPHA:
-   case GL_SOURCE3_ALPHA_NV:
-      term = pname - GL_SOURCE0_ALPHA;
-      alpha = GL_TRUE;
-      break;
-   default:
-      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-      return;
-   }
-
-   if ((term == 3) && !ctx->Extensions.NV_texture_env_combine4) {
-      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-      return;
-   }
-
-   assert(term < MAX_COMBINER_TERMS);
-
-   /*
-    * Error-check param (the source term)
-    */
-   switch (param) {
-   case GL_TEXTURE:
-   case GL_CONSTANT:
-   case GL_PRIMARY_COLOR:
-   case GL_PREVIOUS:
-      legal = GL_TRUE;
-      break;
-   case GL_TEXTURE0:
-   case GL_TEXTURE1:
-   case GL_TEXTURE2:
-   case GL_TEXTURE3:
-   case GL_TEXTURE4:
-   case GL_TEXTURE5:
-   case GL_TEXTURE6:
-   case GL_TEXTURE7:
-      legal = (ctx->Extensions.ARB_texture_env_crossbar &&
-               param - GL_TEXTURE0 < ctx->Const.MaxTextureUnits);
-      break;
-   case GL_ZERO:
-      legal = (ctx->Extensions.ATI_texture_env_combine3 ||
-               ctx->Extensions.NV_texture_env_combine4);
-      break;
-   case GL_ONE:
-      legal = ctx->Extensions.ATI_texture_env_combine3;
-      break;
-   default:
-      legal = GL_FALSE;
-   }
-
-   if (!legal) {
-      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", param);
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-
-   if (alpha)
-      texUnit->Combine.SourceA[term] = param;
-   else
-      texUnit->Combine.SourceRGB[term] = param;
-}
-
-
-/** Set an RGB or A combiner operand term */
-static void
-set_combiner_operand(struct gl_context *ctx,
-                     struct gl_texture_unit *texUnit,
-                     GLenum pname, GLenum param)
-{
-   GLuint term;
-   GLboolean alpha, legal;
-
-   if (!ctx->Extensions.EXT_texture_env_combine &&
-       !ctx->Extensions.ARB_texture_env_combine) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");
-      return;
-   }
-
-   /* The enums were given sequential values for a reason.
-    */
-   switch (pname) {
-   case GL_OPERAND0_RGB:
-   case GL_OPERAND1_RGB:
-   case GL_OPERAND2_RGB:
-   case GL_OPERAND3_RGB_NV:
-      term = pname - GL_OPERAND0_RGB;
-      alpha = GL_FALSE;
-      break;
-   case GL_OPERAND0_ALPHA:
-   case GL_OPERAND1_ALPHA:
-   case GL_OPERAND2_ALPHA:
-   case GL_OPERAND3_ALPHA_NV:
-      term = pname - GL_OPERAND0_ALPHA;
-      alpha = GL_TRUE;
-      break;
-   default:
-      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-      return;
-   }
-
-   if ((term == 3) && !ctx->Extensions.NV_texture_env_combine4) {
-      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-      return;
-   }
-
-   assert(term < MAX_COMBINER_TERMS);
-
-   /*
-    * Error-check param (the source operand)
-    */
-   switch (param) {
-   case GL_SRC_COLOR:
-   case GL_ONE_MINUS_SRC_COLOR:
-      /* The color input can only be used with GL_OPERAND[01]_RGB in the EXT
-       * version.  In the ARB and NV versions they can be used for any RGB
-       * operand.
-       */
-      legal = !alpha
-	 && ((term < 2) || ctx->Extensions.ARB_texture_env_combine
-	     || ctx->Extensions.NV_texture_env_combine4);
-      break;
-   case GL_ONE_MINUS_SRC_ALPHA:
-      /* GL_ONE_MINUS_SRC_ALPHA can only be used with
-       * GL_OPERAND[01]_(RGB|ALPHA) in the EXT version.  In the ARB and NV
-       * versions it can be used for any operand.
-       */
-      legal = (term < 2) || ctx->Extensions.ARB_texture_env_combine
-	 || ctx->Extensions.NV_texture_env_combine4;
-      break;
-   case GL_SRC_ALPHA:
-      legal = GL_TRUE;
-      break;
-   default:
-      legal = GL_FALSE;
-   }
-
-   if (!legal) {
-      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", param);
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-
-   if (alpha)
-      texUnit->Combine.OperandA[term] = param;
-   else
-      texUnit->Combine.OperandRGB[term] = param;
-}
-
-
-static void
-set_combiner_scale(struct gl_context *ctx,
-                   struct gl_texture_unit *texUnit,
-                   GLenum pname, GLfloat scale)
-{
-   GLuint shift;
-
-   if (!ctx->Extensions.EXT_texture_env_combine &&
-       !ctx->Extensions.ARB_texture_env_combine) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");
-      return;
-   }
-
-   if (scale == 1.0F) {
-      shift = 0;
-   }
-   else if (scale == 2.0F) {
-      shift = 1;
-   }
-   else if (scale == 4.0F) {
-      shift = 2;
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_VALUE,
-                   "glTexEnv(GL_RGB_SCALE not 1, 2 or 4)" );
-      return;
-   }
-
-   switch (pname) {
-   case GL_RGB_SCALE:
-      if (texUnit->Combine.ScaleShiftRGB == shift)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-      texUnit->Combine.ScaleShiftRGB = shift;
-      break;
-   case GL_ALPHA_SCALE:
-      if (texUnit->Combine.ScaleShiftA == shift)
-         return;
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-      texUnit->Combine.ScaleShiftA = shift;
-      break;
-   default:
-      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-   }
-}
-
-
-
-void GLAPIENTRY
-_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
-{
-   const GLint iparam0 = (GLint) param[0];
-   struct gl_texture_unit *texUnit;
-   GLuint maxUnit;
-
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)
-      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;
-   if (ctx->Texture.CurrentUnit >= maxUnit) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexEnvfv(current unit)");
-      return;
-   }
-
-   texUnit = _mesa_get_current_tex_unit(ctx);
-
-   if (target == GL_TEXTURE_ENV) {
-      switch (pname) {
-      case GL_TEXTURE_ENV_MODE:
-         set_env_mode(ctx, texUnit, (GLenum) iparam0);
-         break;
-      case GL_TEXTURE_ENV_COLOR:
-         set_env_color(ctx, texUnit, param);
-         break;
-      case GL_COMBINE_RGB:
-      case GL_COMBINE_ALPHA:
-         set_combiner_mode(ctx, texUnit, pname, (GLenum) iparam0);
-	 break;
-      case GL_SOURCE0_RGB:
-      case GL_SOURCE1_RGB:
-      case GL_SOURCE2_RGB:
-      case GL_SOURCE3_RGB_NV:
-      case GL_SOURCE0_ALPHA:
-      case GL_SOURCE1_ALPHA:
-      case GL_SOURCE2_ALPHA:
-      case GL_SOURCE3_ALPHA_NV:
-         set_combiner_source(ctx, texUnit, pname, (GLenum) iparam0);
-	 break;
-      case GL_OPERAND0_RGB:
-      case GL_OPERAND1_RGB:
-      case GL_OPERAND2_RGB:
-      case GL_OPERAND3_RGB_NV:
-      case GL_OPERAND0_ALPHA:
-      case GL_OPERAND1_ALPHA:
-      case GL_OPERAND2_ALPHA:
-      case GL_OPERAND3_ALPHA_NV:
-         set_combiner_operand(ctx, texUnit, pname, (GLenum) iparam0);
-	 break;
-      case GL_RGB_SCALE:
-      case GL_ALPHA_SCALE:
-         set_combiner_scale(ctx, texUnit, pname, param[0]);
-	 break;
-      case GL_BUMP_TARGET_ATI:
-         if (!ctx->Extensions.ATI_envmap_bumpmap) {
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname=0x%x)", pname );
-	    return;
-	 }
-	 if ((iparam0 < GL_TEXTURE0) ||
-             (iparam0 > GL_TEXTURE31)) {
-	    /* spec doesn't say this but it seems logical */
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(param=0x%x)", iparam0);
-	    return;
-	 }
-	 if (!((1 << (iparam0 - GL_TEXTURE0)) & ctx->Const.SupportedBumpUnits)) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", iparam0);
-	    return;
-	 }
-	 else {
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->BumpTarget = iparam0;
-	 }
-	 break;
-      default:
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname)" );
-	 return;
-      }
-   }
-   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
-      /* GL_EXT_texture_lod_bias */
-      if (!ctx->Extensions.EXT_texture_lod_bias) {
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)", target );
-	 return;
-      }
-      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
-	 if (texUnit->LodBias == param[0])
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         texUnit->LodBias = param[0];
-      }
-      else {
-         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
-	 return;
-      }
-   }
-   else if (target == GL_POINT_SPRITE_NV) {
-      /* GL_ARB_point_sprite / GL_NV_point_sprite */
-      if (!ctx->Extensions.NV_point_sprite
-	  && !ctx->Extensions.ARB_point_sprite) {
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)", target );
-	 return;
-      }
-      if (pname == GL_COORD_REPLACE_NV) {
-         if (iparam0 == GL_TRUE || iparam0 == GL_FALSE) {
-            /* It's kind of weird to set point state via glTexEnv,
-             * but that's what the spec calls for.
-             */
-            const GLboolean state = (GLboolean) iparam0;
-            if (ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] == state)
-               return;
-            FLUSH_VERTICES(ctx, _NEW_POINT);
-            ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] = state;
-         }
-         else {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", iparam0);
-            return;
-         }
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname=0x%x)", pname );
-         return;
-      }
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)",target );
-      return;
-   }
-
-   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexEnv %s %s %.1f(%s) ...\n",
-                  _mesa_lookup_enum_by_nr(target),
-                  _mesa_lookup_enum_by_nr(pname),
-                  *param,
-                  _mesa_lookup_enum_by_nr((GLenum) iparam0));
-
-   /* Tell device driver about the new texture environment */
-   if (ctx->Driver.TexEnv) {
-      (*ctx->Driver.TexEnv)( ctx, target, pname, param );
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param )
-{
-   GLfloat p[4];
-   p[0] = param;
-   p[1] = p[2] = p[3] = 0.0;
-   _mesa_TexEnvfv( target, pname, p );
-}
-
-
-
-void GLAPIENTRY
-_mesa_TexEnvi( GLenum target, GLenum pname, GLint param )
-{
-   GLfloat p[4];
-   p[0] = (GLfloat) param;
-   p[1] = p[2] = p[3] = 0.0;
-   _mesa_TexEnvfv( target, pname, p );
-}
-
-
-void GLAPIENTRY
-_mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param )
-{
-   GLfloat p[4];
-   if (pname == GL_TEXTURE_ENV_COLOR) {
-      p[0] = INT_TO_FLOAT( param[0] );
-      p[1] = INT_TO_FLOAT( param[1] );
-      p[2] = INT_TO_FLOAT( param[2] );
-      p[3] = INT_TO_FLOAT( param[3] );
-   }
-   else {
-      p[0] = (GLfloat) param[0];
-      p[1] = p[2] = p[3] = 0;  /* init to zero, just to be safe */
-   }
-   _mesa_TexEnvfv( target, pname, p );
-}
-
-
-
-/**
- * Helper for glGetTexEnvi/f()
- * \return  value of queried pname or -1 if error.
- */
-static GLint
-get_texenvi(struct gl_context *ctx, const struct gl_texture_unit *texUnit,
-            GLenum pname)
-{
-   switch (pname) {
-   case GL_TEXTURE_ENV_MODE:
-      return texUnit->EnvMode;
-      break;
-   case GL_COMBINE_RGB:
-      if (ctx->Extensions.EXT_texture_env_combine ||
-          ctx->Extensions.ARB_texture_env_combine) {
-         return texUnit->Combine.ModeRGB;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_COMBINE_ALPHA:
-      if (ctx->Extensions.EXT_texture_env_combine ||
-          ctx->Extensions.ARB_texture_env_combine) {
-         return texUnit->Combine.ModeA;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_SOURCE0_RGB:
-   case GL_SOURCE1_RGB:
-   case GL_SOURCE2_RGB:
-      if (ctx->Extensions.EXT_texture_env_combine ||
-          ctx->Extensions.ARB_texture_env_combine) {
-         const unsigned rgb_idx = pname - GL_SOURCE0_RGB;
-         return texUnit->Combine.SourceRGB[rgb_idx];
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_SOURCE3_RGB_NV:
-      if (ctx->Extensions.NV_texture_env_combine4) {
-         return texUnit->Combine.SourceRGB[3];
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_SOURCE0_ALPHA:
-   case GL_SOURCE1_ALPHA:
-   case GL_SOURCE2_ALPHA:
-      if (ctx->Extensions.EXT_texture_env_combine ||
-          ctx->Extensions.ARB_texture_env_combine) {
-         const unsigned alpha_idx = pname - GL_SOURCE0_ALPHA;
-         return texUnit->Combine.SourceA[alpha_idx];
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_SOURCE3_ALPHA_NV:
-      if (ctx->Extensions.NV_texture_env_combine4) {
-         return texUnit->Combine.SourceA[3];
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_OPERAND0_RGB:
-   case GL_OPERAND1_RGB:
-   case GL_OPERAND2_RGB:
-      if (ctx->Extensions.EXT_texture_env_combine ||
-          ctx->Extensions.ARB_texture_env_combine) {
-         const unsigned op_rgb = pname - GL_OPERAND0_RGB;
-         return texUnit->Combine.OperandRGB[op_rgb];
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_OPERAND3_RGB_NV:
-      if (ctx->Extensions.NV_texture_env_combine4) {
-         return texUnit->Combine.OperandRGB[3];
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_OPERAND0_ALPHA:
-   case GL_OPERAND1_ALPHA:
-   case GL_OPERAND2_ALPHA:
-      if (ctx->Extensions.EXT_texture_env_combine ||
-          ctx->Extensions.ARB_texture_env_combine) {
-         const unsigned op_alpha = pname - GL_OPERAND0_ALPHA;
-         return texUnit->Combine.OperandA[op_alpha];
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_OPERAND3_ALPHA_NV:
-      if (ctx->Extensions.NV_texture_env_combine4) {
-         return texUnit->Combine.OperandA[3];
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_RGB_SCALE:
-      if (ctx->Extensions.EXT_texture_env_combine ||
-          ctx->Extensions.ARB_texture_env_combine) {
-         return 1 << texUnit->Combine.ScaleShiftRGB;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_ALPHA_SCALE:
-      if (ctx->Extensions.EXT_texture_env_combine ||
-          ctx->Extensions.ARB_texture_env_combine) {
-         return 1 << texUnit->Combine.ScaleShiftA;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-   case GL_BUMP_TARGET_ATI:
-      /* spec doesn't say so, but I think this should be queryable */
-      if (ctx->Extensions.ATI_envmap_bumpmap) {
-         return texUnit->BumpTarget;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
-      }
-      break;
-
-   default:
-      ;
-   }
-
-   return -1; /* error */
-}
-
-
-
-void GLAPIENTRY
-_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
-{
-   GLuint maxUnit;
-   const struct gl_texture_unit *texUnit;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)
-      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;
-   if (ctx->Texture.CurrentUnit >= maxUnit) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexEnvfv(current unit)");
-      return;
-   }
-
-   texUnit = _mesa_get_current_tex_unit(ctx);
-
-   if (target == GL_TEXTURE_ENV) {
-      if (pname == GL_TEXTURE_ENV_COLOR) {
-         if(ctx->NewState & (_NEW_BUFFERS | _NEW_FRAG_CLAMP))
-            _mesa_update_state(ctx);
-         if(ctx->Color._ClampFragmentColor)
-            COPY_4FV( params, texUnit->EnvColor );
-         else
-            COPY_4FV( params, texUnit->EnvColorUnclamped );
-      }
-      else {
-         GLint val = get_texenvi(ctx, texUnit, pname);
-         if (val >= 0) {
-            *params = (GLfloat) val;
-         }
-      }
-   }
-   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
-      /* GL_EXT_texture_lod_bias */
-      if (!ctx->Extensions.EXT_texture_lod_bias) {
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
-	 return;
-      }
-      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
-         *params = texUnit->LodBias;
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)" );
-	 return;
-      }
-   }
-   else if (target == GL_POINT_SPRITE_NV) {
-      /* GL_ARB_point_sprite / GL_NV_point_sprite */
-      if (!ctx->Extensions.NV_point_sprite
-	  && !ctx->Extensions.ARB_point_sprite) {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
-         return;
-      }
-      if (pname == GL_COORD_REPLACE_NV) {
-         *params = (GLfloat) ctx->Point.CoordReplace[ctx->Texture.CurrentUnit];
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)" );
-         return;
-      }
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
-      return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
-{
-   GLuint maxUnit;
-   const struct gl_texture_unit *texUnit;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)
-      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;
-   if (ctx->Texture.CurrentUnit >= maxUnit) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexEnviv(current unit)");
-      return;
-   }
-
-   texUnit = _mesa_get_current_tex_unit(ctx);
-
-   if (target == GL_TEXTURE_ENV) {
-      if (pname == GL_TEXTURE_ENV_COLOR) {
-         params[0] = FLOAT_TO_INT( texUnit->EnvColor[0] );
-         params[1] = FLOAT_TO_INT( texUnit->EnvColor[1] );
-         params[2] = FLOAT_TO_INT( texUnit->EnvColor[2] );
-         params[3] = FLOAT_TO_INT( texUnit->EnvColor[3] );
-      }
-      else {
-         GLint val = get_texenvi(ctx, texUnit, pname);
-         if (val >= 0) {
-            *params = val;
-         }
-      }
-   }
-   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
-      /* GL_EXT_texture_lod_bias */
-      if (!ctx->Extensions.EXT_texture_lod_bias) {
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
-	 return;
-      }
-      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
-         *params = (GLint) texUnit->LodBias;
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)" );
-	 return;
-      }
-   }
-   else if (target == GL_POINT_SPRITE_NV) {
-      /* GL_ARB_point_sprite / GL_NV_point_sprite */
-      if (!ctx->Extensions.NV_point_sprite
-	  && !ctx->Extensions.ARB_point_sprite) {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
-         return;
-      }
-      if (pname == GL_COORD_REPLACE_NV) {
-         *params = (GLint) ctx->Point.CoordReplace[ctx->Texture.CurrentUnit];
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)" );
-         return;
-      }
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
-      return;
-   }
-}
-
-
-/**
- * Why does ATI_envmap_bumpmap require new entrypoints? Should just
- * reuse TexEnv ones...
- */
-void GLAPIENTRY
-_mesa_TexBumpParameterivATI( GLenum pname, const GLint *param )
-{
-   GLfloat p[4];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.ATI_envmap_bumpmap) {
-      /* This isn't an "official" error case, but let's tell the user
-       * that something's wrong.
-       */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBumpParameterivATI");
-      return;
-   }
-
-   if (pname == GL_BUMP_ROT_MATRIX_ATI) {
-      /* hope that conversion is correct here */
-      p[0] = INT_TO_FLOAT( param[0] );
-      p[1] = INT_TO_FLOAT( param[1] );
-      p[2] = INT_TO_FLOAT( param[2] );
-      p[3] = INT_TO_FLOAT( param[3] );
-   }
-   else {
-      p[0] = (GLfloat) param[0];
-      p[1] = p[2] = p[3] = 0.0F;  /* init to zero, just to be safe */
-   }
-   _mesa_TexBumpParameterfvATI( pname, p );
-}
-
-
-void GLAPIENTRY
-_mesa_TexBumpParameterfvATI( GLenum pname, const GLfloat *param )
-{
-   struct gl_texture_unit *texUnit;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.ATI_envmap_bumpmap) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBumpParameterfvATI");
-      return;
-   }
-
-   texUnit = _mesa_get_current_tex_unit(ctx);
-
-   if (pname == GL_BUMP_ROT_MATRIX_ATI) {
-      if (TEST_EQ_4V(param, texUnit->RotMatrix))
-         return;
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-      COPY_4FV(texUnit->RotMatrix, param);
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glTexBumpParameter(pname)" );
-      return;
-   }
-   /* Drivers might want to know about this, instead of dedicated function
-      just shove it into TexEnv where it really belongs anyway */
-   if (ctx->Driver.TexEnv) {
-      (*ctx->Driver.TexEnv)( ctx, 0, pname, param );
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetTexBumpParameterivATI( GLenum pname, GLint *param )
-{
-   const struct gl_texture_unit *texUnit;
-   GLuint i;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.ATI_envmap_bumpmap) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexBumpParameterivATI");
-      return;
-   }
-
-   texUnit = _mesa_get_current_tex_unit(ctx);
-
-   if (pname == GL_BUMP_ROT_MATRIX_SIZE_ATI) {
-      /* spec leaves open to support larger matrices.
-         Don't think anyone would ever want to use it
-         (and apps almost certainly would not understand it and
-         thus fail to submit matrices correctly) so hardcode this. */
-      *param = 4;
-   }
-   else if (pname == GL_BUMP_ROT_MATRIX_ATI) {
-      /* hope that conversion is correct here */
-      param[0] = FLOAT_TO_INT(texUnit->RotMatrix[0]);
-      param[1] = FLOAT_TO_INT(texUnit->RotMatrix[1]);
-      param[2] = FLOAT_TO_INT(texUnit->RotMatrix[2]);
-      param[3] = FLOAT_TO_INT(texUnit->RotMatrix[3]);
-   }
-   else if (pname == GL_BUMP_NUM_TEX_UNITS_ATI) {
-      GLint count = 0;
-      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
-         if (ctx->Const.SupportedBumpUnits & (1 << i)) {
-            count++;
-         }
-      }
-      *param = count;
-   }
-   else if (pname == GL_BUMP_TEX_UNITS_ATI) {
-      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
-         if (ctx->Const.SupportedBumpUnits & (1 << i)) {
-            *param++ = i + GL_TEXTURE0;
-         }
-      }
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexBumpParameter(pname)" );
-      return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetTexBumpParameterfvATI( GLenum pname, GLfloat *param )
-{
-   const struct gl_texture_unit *texUnit;
-   GLuint i;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.ATI_envmap_bumpmap) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexBumpParameterfvATI");
-      return;
-   }
-
-   texUnit = _mesa_get_current_tex_unit(ctx);
-
-   if (pname == GL_BUMP_ROT_MATRIX_SIZE_ATI) {
-      /* spec leaves open to support larger matrices.
-         Don't think anyone would ever want to use it
-         (and apps might not understand it) so hardcode this. */
-      *param = 4.0F;
-   }
-   else if (pname == GL_BUMP_ROT_MATRIX_ATI) {
-      param[0] = texUnit->RotMatrix[0];
-      param[1] = texUnit->RotMatrix[1];
-      param[2] = texUnit->RotMatrix[2];
-      param[3] = texUnit->RotMatrix[3];
-   }
-   else if (pname == GL_BUMP_NUM_TEX_UNITS_ATI) {
-      GLint count = 0;
-      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
-         if (ctx->Const.SupportedBumpUnits & (1 << i)) {
-            count++;
-         }
-      }
-      *param = (GLfloat) count;
-   }
-   else if (pname == GL_BUMP_TEX_UNITS_ATI) {
-      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
-         if (ctx->Const.SupportedBumpUnits & (1 << i)) {
-            *param++ = (GLfloat) (i + GL_TEXTURE0);
-         }
-      }
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexBumpParameter(pname)" );
-      return;
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+/** 

+ * \file texenv.c

+ *

+ * glTexEnv-related functions

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/enums.h"

+#include "main/macros.h"

+#include "main/mtypes.h"

+#include "main/state.h"

+#include "main/texenv.h"

+#include "main/texstate.h"

+

+

+#define TE_ERROR(errCode, msg, value)				\

+   _mesa_error(ctx, errCode, msg, _mesa_lookup_enum_by_nr(value));

+

+

+/** Set texture env mode */

+static void

+set_env_mode(struct gl_context *ctx,

+             struct gl_texture_unit *texUnit,

+             GLenum mode)

+{

+   GLboolean legal;

+

+   if (texUnit->EnvMode == mode)

+      return;

+

+   switch (mode) {

+   case GL_MODULATE:

+   case GL_BLEND:

+   case GL_DECAL:

+   case GL_REPLACE:

+      legal = GL_TRUE;

+      break;

+   case GL_REPLACE_EXT:

+      mode = GL_REPLACE; /* GL_REPLACE_EXT != GL_REPLACE */

+      legal = GL_TRUE;

+      break;

+   case GL_ADD:

+      legal = ctx->Extensions.EXT_texture_env_add;

+      break;

+   case GL_COMBINE:

+      legal = (ctx->Extensions.EXT_texture_env_combine ||

+               ctx->Extensions.ARB_texture_env_combine);

+      break;

+   case GL_COMBINE4_NV:

+      legal = ctx->Extensions.NV_texture_env_combine4;

+      break;

+   default:

+      legal = GL_FALSE;

+   }

+

+   if (legal) {

+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+      texUnit->EnvMode = mode;

+   }

+   else {

+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);

+   }

+}

+

+

+static void

+set_env_color(struct gl_context *ctx,

+              struct gl_texture_unit *texUnit,

+              const GLfloat *color)

+{

+   if (TEST_EQ_4V(color, texUnit->EnvColorUnclamped))

+      return;

+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+   COPY_4FV(texUnit->EnvColorUnclamped, color);

+   texUnit->EnvColor[0] = CLAMP(color[0], 0.0F, 1.0F);

+   texUnit->EnvColor[1] = CLAMP(color[1], 0.0F, 1.0F);

+   texUnit->EnvColor[2] = CLAMP(color[2], 0.0F, 1.0F);

+   texUnit->EnvColor[3] = CLAMP(color[3], 0.0F, 1.0F);

+}

+

+

+/** Set an RGB or A combiner mode/function */

+static void

+set_combiner_mode(struct gl_context *ctx,

+                  struct gl_texture_unit *texUnit,

+                  GLenum pname, GLenum mode)

+{

+   GLboolean legal;

+

+   if (!ctx->Extensions.EXT_texture_env_combine &&

+       !ctx->Extensions.ARB_texture_env_combine) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");

+      return;

+   }

+

+   switch (mode) {

+   case GL_REPLACE:

+   case GL_MODULATE:

+   case GL_ADD:

+   case GL_ADD_SIGNED:

+   case GL_INTERPOLATE:

+      legal = GL_TRUE;

+      break;

+   case GL_SUBTRACT:

+      legal = ctx->Extensions.ARB_texture_env_combine;

+      break;

+   case GL_DOT3_RGB_EXT:

+   case GL_DOT3_RGBA_EXT:

+      legal = (ctx->Extensions.EXT_texture_env_dot3 &&

+               pname == GL_COMBINE_RGB);

+      break;

+   case GL_DOT3_RGB:

+   case GL_DOT3_RGBA:

+      legal = (ctx->Extensions.ARB_texture_env_dot3 &&

+               pname == GL_COMBINE_RGB);

+      break;

+   case GL_MODULATE_ADD_ATI:

+   case GL_MODULATE_SIGNED_ADD_ATI:

+   case GL_MODULATE_SUBTRACT_ATI:

+      legal = ctx->Extensions.ATI_texture_env_combine3;

+      break;

+   case GL_BUMP_ENVMAP_ATI:

+      legal = (ctx->Extensions.ATI_envmap_bumpmap &&

+               pname == GL_COMBINE_RGB);

+      break;

+   default:

+      legal = GL_FALSE;

+   }

+

+   if (!legal) {

+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);

+      return;

+   }

+

+   switch (pname) {

+   case GL_COMBINE_RGB:

+      if (texUnit->Combine.ModeRGB == mode)

+         return;

+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+      texUnit->Combine.ModeRGB = mode;

+      break;

+

+   case GL_COMBINE_ALPHA:

+      if (texUnit->Combine.ModeA == mode)

+         return;

+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+      texUnit->Combine.ModeA = mode;

+      break;

+   default:

+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);

+   }

+}

+

+

+

+/** Set an RGB or A combiner source term */

+static void

+set_combiner_source(struct gl_context *ctx,

+                    struct gl_texture_unit *texUnit,

+                    GLenum pname, GLenum param)

+{

+   GLuint term;

+   GLboolean alpha, legal;

+

+   if (!ctx->Extensions.EXT_texture_env_combine &&

+       !ctx->Extensions.ARB_texture_env_combine) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");

+      return;

+   }

+

+   /*

+    * Translate pname to (term, alpha).

+    *

+    * The enums were given sequential values for a reason.

+    */

+   switch (pname) {

+   case GL_SOURCE0_RGB:

+   case GL_SOURCE1_RGB:

+   case GL_SOURCE2_RGB:

+   case GL_SOURCE3_RGB_NV:

+      term = pname - GL_SOURCE0_RGB;

+      alpha = GL_FALSE;

+      break;

+   case GL_SOURCE0_ALPHA:

+   case GL_SOURCE1_ALPHA:

+   case GL_SOURCE2_ALPHA:

+   case GL_SOURCE3_ALPHA_NV:

+      term = pname - GL_SOURCE0_ALPHA;

+      alpha = GL_TRUE;

+      break;

+   default:

+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);

+      return;

+   }

+

+   if ((term == 3) && !ctx->Extensions.NV_texture_env_combine4) {

+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);

+      return;

+   }

+

+   assert(term < MAX_COMBINER_TERMS);

+

+   /*

+    * Error-check param (the source term)

+    */

+   switch (param) {

+   case GL_TEXTURE:

+   case GL_CONSTANT:

+   case GL_PRIMARY_COLOR:

+   case GL_PREVIOUS:

+      legal = GL_TRUE;

+      break;

+   case GL_TEXTURE0:

+   case GL_TEXTURE1:

+   case GL_TEXTURE2:

+   case GL_TEXTURE3:

+   case GL_TEXTURE4:

+   case GL_TEXTURE5:

+   case GL_TEXTURE6:

+   case GL_TEXTURE7:

+      legal = (ctx->Extensions.ARB_texture_env_crossbar &&

+               param - GL_TEXTURE0 < ctx->Const.MaxTextureUnits);

+      break;

+   case GL_ZERO:

+      legal = (ctx->Extensions.ATI_texture_env_combine3 ||

+               ctx->Extensions.NV_texture_env_combine4);

+      break;

+   case GL_ONE:

+      legal = ctx->Extensions.ATI_texture_env_combine3;

+      break;

+   default:

+      legal = GL_FALSE;

+   }

+

+   if (!legal) {

+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", param);

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+

+   if (alpha)

+      texUnit->Combine.SourceA[term] = param;

+   else

+      texUnit->Combine.SourceRGB[term] = param;

+}

+

+

+/** Set an RGB or A combiner operand term */

+static void

+set_combiner_operand(struct gl_context *ctx,

+                     struct gl_texture_unit *texUnit,

+                     GLenum pname, GLenum param)

+{

+   GLuint term;

+   GLboolean alpha, legal;

+

+   if (!ctx->Extensions.EXT_texture_env_combine &&

+       !ctx->Extensions.ARB_texture_env_combine) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");

+      return;

+   }

+

+   /* The enums were given sequential values for a reason.

+    */

+   switch (pname) {

+   case GL_OPERAND0_RGB:

+   case GL_OPERAND1_RGB:

+   case GL_OPERAND2_RGB:

+   case GL_OPERAND3_RGB_NV:

+      term = pname - GL_OPERAND0_RGB;

+      alpha = GL_FALSE;

+      break;

+   case GL_OPERAND0_ALPHA:

+   case GL_OPERAND1_ALPHA:

+   case GL_OPERAND2_ALPHA:

+   case GL_OPERAND3_ALPHA_NV:

+      term = pname - GL_OPERAND0_ALPHA;

+      alpha = GL_TRUE;

+      break;

+   default:

+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);

+      return;

+   }

+

+   if ((term == 3) && !ctx->Extensions.NV_texture_env_combine4) {

+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);

+      return;

+   }

+

+   assert(term < MAX_COMBINER_TERMS);

+

+   /*

+    * Error-check param (the source operand)

+    */

+   switch (param) {

+   case GL_SRC_COLOR:

+   case GL_ONE_MINUS_SRC_COLOR:

+      /* The color input can only be used with GL_OPERAND[01]_RGB in the EXT

+       * version.  In the ARB and NV versions they can be used for any RGB

+       * operand.

+       */

+      legal = !alpha

+	 && ((term < 2) || ctx->Extensions.ARB_texture_env_combine

+	     || ctx->Extensions.NV_texture_env_combine4);

+      break;

+   case GL_ONE_MINUS_SRC_ALPHA:

+      /* GL_ONE_MINUS_SRC_ALPHA can only be used with

+       * GL_OPERAND[01]_(RGB|ALPHA) in the EXT version.  In the ARB and NV

+       * versions it can be used for any operand.

+       */

+      legal = (term < 2) || ctx->Extensions.ARB_texture_env_combine

+	 || ctx->Extensions.NV_texture_env_combine4;

+      break;

+   case GL_SRC_ALPHA:

+      legal = GL_TRUE;

+      break;

+   default:

+      legal = GL_FALSE;

+   }

+

+   if (!legal) {

+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", param);

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+

+   if (alpha)

+      texUnit->Combine.OperandA[term] = param;

+   else

+      texUnit->Combine.OperandRGB[term] = param;

+}

+

+

+static void

+set_combiner_scale(struct gl_context *ctx,

+                   struct gl_texture_unit *texUnit,

+                   GLenum pname, GLfloat scale)

+{

+   GLuint shift;

+

+   if (!ctx->Extensions.EXT_texture_env_combine &&

+       !ctx->Extensions.ARB_texture_env_combine) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexEnv(pname)");

+      return;

+   }

+

+   if (scale == 1.0F) {

+      shift = 0;

+   }

+   else if (scale == 2.0F) {

+      shift = 1;

+   }

+   else if (scale == 4.0F) {

+      shift = 2;

+   }

+   else {

+      _mesa_error( ctx, GL_INVALID_VALUE,

+                   "glTexEnv(GL_RGB_SCALE not 1, 2 or 4)" );

+      return;

+   }

+

+   switch (pname) {

+   case GL_RGB_SCALE:

+      if (texUnit->Combine.ScaleShiftRGB == shift)

+         return;

+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+      texUnit->Combine.ScaleShiftRGB = shift;

+      break;

+   case GL_ALPHA_SCALE:

+      if (texUnit->Combine.ScaleShiftA == shift)

+         return;

+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+      texUnit->Combine.ScaleShiftA = shift;

+      break;

+   default:

+      TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);

+   }

+}

+

+

+

+void GLAPIENTRY

+_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )

+{

+   const GLint iparam0 = (GLint) param[0];

+   struct gl_texture_unit *texUnit;

+   GLuint maxUnit;

+

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)

+      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;

+   if (ctx->Texture.CurrentUnit >= maxUnit) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexEnvfv(current unit)");

+      return;

+   }

+

+   texUnit = _mesa_get_current_tex_unit(ctx);

+

+   if (target == GL_TEXTURE_ENV) {

+      switch (pname) {

+      case GL_TEXTURE_ENV_MODE:

+         set_env_mode(ctx, texUnit, (GLenum) iparam0);

+         break;

+      case GL_TEXTURE_ENV_COLOR:

+         set_env_color(ctx, texUnit, param);

+         break;

+      case GL_COMBINE_RGB:

+      case GL_COMBINE_ALPHA:

+         set_combiner_mode(ctx, texUnit, pname, (GLenum) iparam0);

+	 break;

+      case GL_SOURCE0_RGB:

+      case GL_SOURCE1_RGB:

+      case GL_SOURCE2_RGB:

+      case GL_SOURCE3_RGB_NV:

+      case GL_SOURCE0_ALPHA:

+      case GL_SOURCE1_ALPHA:

+      case GL_SOURCE2_ALPHA:

+      case GL_SOURCE3_ALPHA_NV:

+         set_combiner_source(ctx, texUnit, pname, (GLenum) iparam0);

+	 break;

+      case GL_OPERAND0_RGB:

+      case GL_OPERAND1_RGB:

+      case GL_OPERAND2_RGB:

+      case GL_OPERAND3_RGB_NV:

+      case GL_OPERAND0_ALPHA:

+      case GL_OPERAND1_ALPHA:

+      case GL_OPERAND2_ALPHA:

+      case GL_OPERAND3_ALPHA_NV:

+         set_combiner_operand(ctx, texUnit, pname, (GLenum) iparam0);

+	 break;

+      case GL_RGB_SCALE:

+      case GL_ALPHA_SCALE:

+         set_combiner_scale(ctx, texUnit, pname, param[0]);

+	 break;

+      case GL_BUMP_TARGET_ATI:

+         if (!ctx->Extensions.ATI_envmap_bumpmap) {

+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname=0x%x)", pname );

+	    return;

+	 }

+	 if ((iparam0 < GL_TEXTURE0) ||

+             (iparam0 > GL_TEXTURE31)) {

+	    /* spec doesn't say this but it seems logical */

+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(param=0x%x)", iparam0);

+	    return;

+	 }

+	 if (!((1 << (iparam0 - GL_TEXTURE0)) & ctx->Const.SupportedBumpUnits)) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", iparam0);

+	    return;

+	 }

+	 else {

+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+	    texUnit->BumpTarget = iparam0;

+	 }

+	 break;

+      default:

+	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname)" );

+	 return;

+      }

+   }

+   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {

+      /* GL_EXT_texture_lod_bias */

+      if (!ctx->Extensions.EXT_texture_lod_bias) {

+	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)", target );

+	 return;

+      }

+      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {

+	 if (texUnit->LodBias == param[0])

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+         texUnit->LodBias = param[0];

+      }

+      else {

+         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);

+	 return;

+      }

+   }

+   else if (target == GL_POINT_SPRITE_NV) {

+      /* GL_ARB_point_sprite / GL_NV_point_sprite */

+      if (!ctx->Extensions.NV_point_sprite

+	  && !ctx->Extensions.ARB_point_sprite) {

+	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)", target );

+	 return;

+      }

+      if (pname == GL_COORD_REPLACE_NV) {

+         if (iparam0 == GL_TRUE || iparam0 == GL_FALSE) {

+            /* It's kind of weird to set point state via glTexEnv,

+             * but that's what the spec calls for.

+             */

+            const GLboolean state = (GLboolean) iparam0;

+            if (ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] == state)

+               return;

+            FLUSH_VERTICES(ctx, _NEW_POINT);

+            ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] = state;

+         }

+         else {

+            _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", iparam0);

+            return;

+         }

+      }

+      else {

+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname=0x%x)", pname );

+         return;

+      }

+   }

+   else {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)",target );

+      return;

+   }

+

+   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))

+      _mesa_debug(ctx, "glTexEnv %s %s %.1f(%s) ...\n",

+                  _mesa_lookup_enum_by_nr(target),

+                  _mesa_lookup_enum_by_nr(pname),

+                  *param,

+                  _mesa_lookup_enum_by_nr((GLenum) iparam0));

+

+   /* Tell device driver about the new texture environment */

+   if (ctx->Driver.TexEnv) {

+      (*ctx->Driver.TexEnv)( ctx, target, pname, param );

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param )

+{

+   GLfloat p[4];

+   p[0] = param;

+   p[1] = p[2] = p[3] = 0.0;

+   _mesa_TexEnvfv( target, pname, p );

+}

+

+

+

+void GLAPIENTRY

+_mesa_TexEnvi( GLenum target, GLenum pname, GLint param )

+{

+   GLfloat p[4];

+   p[0] = (GLfloat) param;

+   p[1] = p[2] = p[3] = 0.0;

+   _mesa_TexEnvfv( target, pname, p );

+}

+

+

+void GLAPIENTRY

+_mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param )

+{

+   GLfloat p[4];

+   if (pname == GL_TEXTURE_ENV_COLOR) {

+      p[0] = INT_TO_FLOAT( param[0] );

+      p[1] = INT_TO_FLOAT( param[1] );

+      p[2] = INT_TO_FLOAT( param[2] );

+      p[3] = INT_TO_FLOAT( param[3] );

+   }

+   else {

+      p[0] = (GLfloat) param[0];

+      p[1] = p[2] = p[3] = 0;  /* init to zero, just to be safe */

+   }

+   _mesa_TexEnvfv( target, pname, p );

+}

+

+

+

+/**

+ * Helper for glGetTexEnvi/f()

+ * \return  value of queried pname or -1 if error.

+ */

+static GLint

+get_texenvi(struct gl_context *ctx, const struct gl_texture_unit *texUnit,

+            GLenum pname)

+{

+   switch (pname) {

+   case GL_TEXTURE_ENV_MODE:

+      return texUnit->EnvMode;

+      break;

+   case GL_COMBINE_RGB:

+      if (ctx->Extensions.EXT_texture_env_combine ||

+          ctx->Extensions.ARB_texture_env_combine) {

+         return texUnit->Combine.ModeRGB;

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_COMBINE_ALPHA:

+      if (ctx->Extensions.EXT_texture_env_combine ||

+          ctx->Extensions.ARB_texture_env_combine) {

+         return texUnit->Combine.ModeA;

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_SOURCE0_RGB:

+   case GL_SOURCE1_RGB:

+   case GL_SOURCE2_RGB:

+      if (ctx->Extensions.EXT_texture_env_combine ||

+          ctx->Extensions.ARB_texture_env_combine) {

+         const unsigned rgb_idx = pname - GL_SOURCE0_RGB;

+         return texUnit->Combine.SourceRGB[rgb_idx];

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_SOURCE3_RGB_NV:

+      if (ctx->Extensions.NV_texture_env_combine4) {

+         return texUnit->Combine.SourceRGB[3];

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_SOURCE0_ALPHA:

+   case GL_SOURCE1_ALPHA:

+   case GL_SOURCE2_ALPHA:

+      if (ctx->Extensions.EXT_texture_env_combine ||

+          ctx->Extensions.ARB_texture_env_combine) {

+         const unsigned alpha_idx = pname - GL_SOURCE0_ALPHA;

+         return texUnit->Combine.SourceA[alpha_idx];

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_SOURCE3_ALPHA_NV:

+      if (ctx->Extensions.NV_texture_env_combine4) {

+         return texUnit->Combine.SourceA[3];

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_OPERAND0_RGB:

+   case GL_OPERAND1_RGB:

+   case GL_OPERAND2_RGB:

+      if (ctx->Extensions.EXT_texture_env_combine ||

+          ctx->Extensions.ARB_texture_env_combine) {

+         const unsigned op_rgb = pname - GL_OPERAND0_RGB;

+         return texUnit->Combine.OperandRGB[op_rgb];

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_OPERAND3_RGB_NV:

+      if (ctx->Extensions.NV_texture_env_combine4) {

+         return texUnit->Combine.OperandRGB[3];

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_OPERAND0_ALPHA:

+   case GL_OPERAND1_ALPHA:

+   case GL_OPERAND2_ALPHA:

+      if (ctx->Extensions.EXT_texture_env_combine ||

+          ctx->Extensions.ARB_texture_env_combine) {

+         const unsigned op_alpha = pname - GL_OPERAND0_ALPHA;

+         return texUnit->Combine.OperandA[op_alpha];

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_OPERAND3_ALPHA_NV:

+      if (ctx->Extensions.NV_texture_env_combine4) {

+         return texUnit->Combine.OperandA[3];

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_RGB_SCALE:

+      if (ctx->Extensions.EXT_texture_env_combine ||

+          ctx->Extensions.ARB_texture_env_combine) {

+         return 1 << texUnit->Combine.ScaleShiftRGB;

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_ALPHA_SCALE:

+      if (ctx->Extensions.EXT_texture_env_combine ||

+          ctx->Extensions.ARB_texture_env_combine) {

+         return 1 << texUnit->Combine.ScaleShiftA;

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+   case GL_BUMP_TARGET_ATI:

+      /* spec doesn't say so, but I think this should be queryable */

+      if (ctx->Extensions.ATI_envmap_bumpmap) {

+         return texUnit->BumpTarget;

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");

+      }

+      break;

+

+   default:

+      ;

+   }

+

+   return -1; /* error */

+}

+

+

+

+void GLAPIENTRY

+_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )

+{

+   GLuint maxUnit;

+   const struct gl_texture_unit *texUnit;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)

+      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;

+   if (ctx->Texture.CurrentUnit >= maxUnit) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexEnvfv(current unit)");

+      return;

+   }

+

+   texUnit = _mesa_get_current_tex_unit(ctx);

+

+   if (target == GL_TEXTURE_ENV) {

+      if (pname == GL_TEXTURE_ENV_COLOR) {

+         if(ctx->NewState & (_NEW_BUFFERS | _NEW_FRAG_CLAMP))

+            _mesa_update_state(ctx);

+         if(ctx->Color._ClampFragmentColor)

+            COPY_4FV( params, texUnit->EnvColor );

+         else

+            COPY_4FV( params, texUnit->EnvColorUnclamped );

+      }

+      else {

+         GLint val = get_texenvi(ctx, texUnit, pname);

+         if (val >= 0) {

+            *params = (GLfloat) val;

+         }

+      }

+   }

+   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {

+      /* GL_EXT_texture_lod_bias */

+      if (!ctx->Extensions.EXT_texture_lod_bias) {

+	 _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );

+	 return;

+      }

+      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {

+         *params = texUnit->LodBias;

+      }

+      else {

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)" );

+	 return;

+      }

+   }

+   else if (target == GL_POINT_SPRITE_NV) {

+      /* GL_ARB_point_sprite / GL_NV_point_sprite */

+      if (!ctx->Extensions.NV_point_sprite

+	  && !ctx->Extensions.ARB_point_sprite) {

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );

+         return;

+      }

+      if (pname == GL_COORD_REPLACE_NV) {

+         *params = (GLfloat) ctx->Point.CoordReplace[ctx->Texture.CurrentUnit];

+      }

+      else {

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)" );

+         return;

+      }

+   }

+   else {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );

+      return;

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )

+{

+   GLuint maxUnit;

+   const struct gl_texture_unit *texUnit;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)

+      ? ctx->Const.MaxTextureCoordUnits : ctx->Const.MaxTextureImageUnits;

+   if (ctx->Texture.CurrentUnit >= maxUnit) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexEnviv(current unit)");

+      return;

+   }

+

+   texUnit = _mesa_get_current_tex_unit(ctx);

+

+   if (target == GL_TEXTURE_ENV) {

+      if (pname == GL_TEXTURE_ENV_COLOR) {

+         params[0] = FLOAT_TO_INT( texUnit->EnvColor[0] );

+         params[1] = FLOAT_TO_INT( texUnit->EnvColor[1] );

+         params[2] = FLOAT_TO_INT( texUnit->EnvColor[2] );

+         params[3] = FLOAT_TO_INT( texUnit->EnvColor[3] );

+      }

+      else {

+         GLint val = get_texenvi(ctx, texUnit, pname);

+         if (val >= 0) {

+            *params = val;

+         }

+      }

+   }

+   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {

+      /* GL_EXT_texture_lod_bias */

+      if (!ctx->Extensions.EXT_texture_lod_bias) {

+	 _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );

+	 return;

+      }

+      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {

+         *params = (GLint) texUnit->LodBias;

+      }

+      else {

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)" );

+	 return;

+      }

+   }

+   else if (target == GL_POINT_SPRITE_NV) {

+      /* GL_ARB_point_sprite / GL_NV_point_sprite */

+      if (!ctx->Extensions.NV_point_sprite

+	  && !ctx->Extensions.ARB_point_sprite) {

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );

+         return;

+      }

+      if (pname == GL_COORD_REPLACE_NV) {

+         *params = (GLint) ctx->Point.CoordReplace[ctx->Texture.CurrentUnit];

+      }

+      else {

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)" );

+         return;

+      }

+   }

+   else {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );

+      return;

+   }

+}

+

+

+/**

+ * Why does ATI_envmap_bumpmap require new entrypoints? Should just

+ * reuse TexEnv ones...

+ */

+void GLAPIENTRY

+_mesa_TexBumpParameterivATI( GLenum pname, const GLint *param )

+{

+   GLfloat p[4];

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!ctx->Extensions.ATI_envmap_bumpmap) {

+      /* This isn't an "official" error case, but let's tell the user

+       * that something's wrong.

+       */

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBumpParameterivATI");

+      return;

+   }

+

+   if (pname == GL_BUMP_ROT_MATRIX_ATI) {

+      /* hope that conversion is correct here */

+      p[0] = INT_TO_FLOAT( param[0] );

+      p[1] = INT_TO_FLOAT( param[1] );

+      p[2] = INT_TO_FLOAT( param[2] );

+      p[3] = INT_TO_FLOAT( param[3] );

+   }

+   else {

+      p[0] = (GLfloat) param[0];

+      p[1] = p[2] = p[3] = 0.0F;  /* init to zero, just to be safe */

+   }

+   _mesa_TexBumpParameterfvATI( pname, p );

+}

+

+

+void GLAPIENTRY

+_mesa_TexBumpParameterfvATI( GLenum pname, const GLfloat *param )

+{

+   struct gl_texture_unit *texUnit;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!ctx->Extensions.ATI_envmap_bumpmap) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBumpParameterfvATI");

+      return;

+   }

+

+   texUnit = _mesa_get_current_tex_unit(ctx);

+

+   if (pname == GL_BUMP_ROT_MATRIX_ATI) {

+      if (TEST_EQ_4V(param, texUnit->RotMatrix))

+         return;

+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+      COPY_4FV(texUnit->RotMatrix, param);

+   }

+   else {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glTexBumpParameter(pname)" );

+      return;

+   }

+   /* Drivers might want to know about this, instead of dedicated function

+      just shove it into TexEnv where it really belongs anyway */

+   if (ctx->Driver.TexEnv) {

+      (*ctx->Driver.TexEnv)( ctx, 0, pname, param );

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetTexBumpParameterivATI( GLenum pname, GLint *param )

+{

+   const struct gl_texture_unit *texUnit;

+   GLuint i;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!ctx->Extensions.ATI_envmap_bumpmap) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexBumpParameterivATI");

+      return;

+   }

+

+   texUnit = _mesa_get_current_tex_unit(ctx);

+

+   if (pname == GL_BUMP_ROT_MATRIX_SIZE_ATI) {

+      /* spec leaves open to support larger matrices.

+         Don't think anyone would ever want to use it

+         (and apps almost certainly would not understand it and

+         thus fail to submit matrices correctly) so hardcode this. */

+      *param = 4;

+   }

+   else if (pname == GL_BUMP_ROT_MATRIX_ATI) {

+      /* hope that conversion is correct here */

+      param[0] = FLOAT_TO_INT(texUnit->RotMatrix[0]);

+      param[1] = FLOAT_TO_INT(texUnit->RotMatrix[1]);

+      param[2] = FLOAT_TO_INT(texUnit->RotMatrix[2]);

+      param[3] = FLOAT_TO_INT(texUnit->RotMatrix[3]);

+   }

+   else if (pname == GL_BUMP_NUM_TEX_UNITS_ATI) {

+      GLint count = 0;

+      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {

+         if (ctx->Const.SupportedBumpUnits & (1 << i)) {

+            count++;

+         }

+      }

+      *param = count;

+   }

+   else if (pname == GL_BUMP_TEX_UNITS_ATI) {

+      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {

+         if (ctx->Const.SupportedBumpUnits & (1 << i)) {

+            *param++ = i + GL_TEXTURE0;

+         }

+      }

+   }

+   else {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexBumpParameter(pname)" );

+      return;

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetTexBumpParameterfvATI( GLenum pname, GLfloat *param )

+{

+   const struct gl_texture_unit *texUnit;

+   GLuint i;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!ctx->Extensions.ATI_envmap_bumpmap) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexBumpParameterfvATI");

+      return;

+   }

+

+   texUnit = _mesa_get_current_tex_unit(ctx);

+

+   if (pname == GL_BUMP_ROT_MATRIX_SIZE_ATI) {

+      /* spec leaves open to support larger matrices.

+         Don't think anyone would ever want to use it

+         (and apps might not understand it) so hardcode this. */

+      *param = 4.0F;

+   }

+   else if (pname == GL_BUMP_ROT_MATRIX_ATI) {

+      param[0] = texUnit->RotMatrix[0];

+      param[1] = texUnit->RotMatrix[1];

+      param[2] = texUnit->RotMatrix[2];

+      param[3] = texUnit->RotMatrix[3];

+   }

+   else if (pname == GL_BUMP_NUM_TEX_UNITS_ATI) {

+      GLint count = 0;

+      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {

+         if (ctx->Const.SupportedBumpUnits & (1 << i)) {

+            count++;

+         }

+      }

+      *param = (GLfloat) count;

+   }

+   else if (pname == GL_BUMP_TEX_UNITS_ATI) {

+      for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {

+         if (ctx->Const.SupportedBumpUnits & (1 << i)) {

+            *param++ = (GLfloat) (i + GL_TEXTURE0);

+         }

+      }

+   }

+   else {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexBumpParameter(pname)" );

+      return;

+   }

+}

diff --git a/mesalib/src/mesa/main/texfetch.c b/mesalib/src/mesa/main/texfetch.c
index b2181af29..9c67f6b67 100644
--- a/mesalib/src/mesa/main/texfetch.c
+++ b/mesalib/src/mesa/main/texfetch.c
@@ -1,1006 +1,1006 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.7
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (c) 2009  VMware, Inc.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file texfetch.c
- *
- * Texel fetch/store functions
- *
- * \author Gareth Hughes
- */
-
-
-#include "colormac.h"
-#include "macros.h"
-#include "texcompress.h"
-#include "texcompress_fxt1.h"
-#include "texcompress_s3tc.h"
-#include "texcompress_rgtc.h"
-#include "texfetch.h"
-#include "teximage.h"
-
-
-/**
- * Convert an 8-bit sRGB value from non-linear space to a
- * linear RGB value in [0, 1].
- * Implemented with a 256-entry lookup table.
- */
-static INLINE GLfloat
-nonlinear_to_linear(GLubyte cs8)
-{
-   static GLfloat table[256];
-   static GLboolean tableReady = GL_FALSE;
-   if (!tableReady) {
-      /* compute lookup table now */
-      GLuint i;
-      for (i = 0; i < 256; i++) {
-         const GLfloat cs = UBYTE_TO_FLOAT(i);
-         if (cs <= 0.04045) {
-            table[i] = cs / 12.92f;
-         }
-         else {
-            table[i] = (GLfloat) pow((cs + 0.055) / 1.055, 2.4);
-         }
-      }
-      tableReady = GL_TRUE;
-   }
-   return table[cs8];
-}
-
-
-
-/* Texel fetch routines for all supported formats
- */
-#define DIM 1
-#include "texfetch_tmp.h"
-
-#define DIM 2
-#include "texfetch_tmp.h"
-
-#define DIM 3
-#include "texfetch_tmp.h"
-
-/**
- * Null texel fetch function.
- *
- * Have to have this so the FetchTexel function pointer is never NULL.
- */
-static void fetch_null_texelf( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   (void) texImage; (void) i; (void) j; (void) k;
-   texel[RCOMP] = 0.0;
-   texel[GCOMP] = 0.0;
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = 0.0;
-   _mesa_warning(NULL, "fetch_null_texelf() called!");
-}
-
-static void store_null_texel(struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, const void *texel)
-{
-   (void) texImage;
-   (void) i;
-   (void) j;
-   (void) k;
-   (void) texel;
-   /* no-op */
-}
-
-
-
-/**
- * Table to map MESA_FORMAT_ to texel fetch/store funcs.
- * XXX this is somewhat temporary.
- */
-static struct {
-   gl_format Name;
-   FetchTexelFuncF Fetch1D;
-   FetchTexelFuncF Fetch2D;
-   FetchTexelFuncF Fetch3D;
-   StoreTexelFunc StoreTexel;
-}
-texfetch_funcs[MESA_FORMAT_COUNT] =
-{
-   {
-      MESA_FORMAT_NONE,
-      fetch_null_texelf,
-      fetch_null_texelf,
-      fetch_null_texelf,
-      store_null_texel
-   },
-
-   {
-      MESA_FORMAT_RGBA8888,
-      fetch_texel_1d_f_rgba8888,
-      fetch_texel_2d_f_rgba8888,
-      fetch_texel_3d_f_rgba8888,
-      store_texel_rgba8888
-   },
-   {
-      MESA_FORMAT_RGBA8888_REV,
-      fetch_texel_1d_f_rgba8888_rev,
-      fetch_texel_2d_f_rgba8888_rev,
-      fetch_texel_3d_f_rgba8888_rev,
-      store_texel_rgba8888_rev
-   },
-   {
-      MESA_FORMAT_ARGB8888,
-      fetch_texel_1d_f_argb8888,
-      fetch_texel_2d_f_argb8888,
-      fetch_texel_3d_f_argb8888,
-      store_texel_argb8888
-   },
-   {
-      MESA_FORMAT_ARGB8888_REV,
-      fetch_texel_1d_f_argb8888_rev,
-      fetch_texel_2d_f_argb8888_rev,
-      fetch_texel_3d_f_argb8888_rev,
-      store_texel_argb8888_rev
-   },
-   {
-      MESA_FORMAT_XRGB8888,
-      fetch_texel_1d_f_xrgb8888,
-      fetch_texel_2d_f_xrgb8888,
-      fetch_texel_3d_f_xrgb8888,
-      store_texel_xrgb8888
-   },
-   {
-      MESA_FORMAT_XRGB8888_REV,
-      fetch_texel_1d_f_xrgb8888_rev,
-      fetch_texel_2d_f_xrgb8888_rev,
-      fetch_texel_3d_f_xrgb8888_rev,
-      store_texel_xrgb8888_rev,
-   },
-   {
-      MESA_FORMAT_RGB888,
-      fetch_texel_1d_f_rgb888,
-      fetch_texel_2d_f_rgb888,
-      fetch_texel_3d_f_rgb888,
-      store_texel_rgb888
-   },
-   {
-      MESA_FORMAT_BGR888,
-      fetch_texel_1d_f_bgr888,
-      fetch_texel_2d_f_bgr888,
-      fetch_texel_3d_f_bgr888,
-      store_texel_bgr888
-   },
-   {
-      MESA_FORMAT_RGB565,
-      fetch_texel_1d_f_rgb565,
-      fetch_texel_2d_f_rgb565,
-      fetch_texel_3d_f_rgb565,
-      store_texel_rgb565
-   },
-   {
-      MESA_FORMAT_RGB565_REV,
-      fetch_texel_1d_f_rgb565_rev,
-      fetch_texel_2d_f_rgb565_rev,
-      fetch_texel_3d_f_rgb565_rev,
-      store_texel_rgb565_rev
-   },
-   {
-      MESA_FORMAT_ARGB4444,
-      fetch_texel_1d_f_argb4444,
-      fetch_texel_2d_f_argb4444,
-      fetch_texel_3d_f_argb4444,
-      store_texel_argb4444
-   },
-   {
-      MESA_FORMAT_ARGB4444_REV,
-      fetch_texel_1d_f_argb4444_rev,
-      fetch_texel_2d_f_argb4444_rev,
-      fetch_texel_3d_f_argb4444_rev,
-      store_texel_argb4444_rev
-   },
-   {
-      MESA_FORMAT_RGBA5551,
-      fetch_texel_1d_f_rgba5551,
-      fetch_texel_2d_f_rgba5551,
-      fetch_texel_3d_f_rgba5551,
-      store_texel_rgba5551
-   },
-   {
-      MESA_FORMAT_ARGB1555,
-      fetch_texel_1d_f_argb1555,
-      fetch_texel_2d_f_argb1555,
-      fetch_texel_3d_f_argb1555,
-      store_texel_argb1555
-   },
-   {
-      MESA_FORMAT_ARGB1555_REV,
-      fetch_texel_1d_f_argb1555_rev,
-      fetch_texel_2d_f_argb1555_rev,
-      fetch_texel_3d_f_argb1555_rev,
-      store_texel_argb1555_rev
-   },
-   {
-      MESA_FORMAT_AL44,
-      fetch_texel_1d_f_al44,
-      fetch_texel_2d_f_al44,
-      fetch_texel_3d_f_al44,
-      store_texel_al44
-   },
-   {
-      MESA_FORMAT_AL88,
-      fetch_texel_1d_f_al88,
-      fetch_texel_2d_f_al88,
-      fetch_texel_3d_f_al88,
-      store_texel_al88
-   },
-   {
-      MESA_FORMAT_AL88_REV,
-      fetch_texel_1d_f_al88_rev,
-      fetch_texel_2d_f_al88_rev,
-      fetch_texel_3d_f_al88_rev,
-      store_texel_al88_rev
-   },
-   {
-      MESA_FORMAT_AL1616,
-      fetch_texel_1d_f_al1616,
-      fetch_texel_2d_f_al1616,
-      fetch_texel_3d_f_al1616,
-      store_texel_al1616
-   },
-   {
-      MESA_FORMAT_AL1616_REV,
-      fetch_texel_1d_f_al1616_rev,
-      fetch_texel_2d_f_al1616_rev,
-      fetch_texel_3d_f_al1616_rev,
-      store_texel_al1616_rev
-   },
-   {
-      MESA_FORMAT_RGB332,
-      fetch_texel_1d_f_rgb332,
-      fetch_texel_2d_f_rgb332,
-      fetch_texel_3d_f_rgb332,
-      store_texel_rgb332
-   },
-   {
-      MESA_FORMAT_A8,
-      fetch_texel_1d_f_a8,
-      fetch_texel_2d_f_a8,
-      fetch_texel_3d_f_a8,
-      store_texel_a8
-   },
-   {
-      MESA_FORMAT_A16,
-      fetch_texel_1d_f_a16,
-      fetch_texel_2d_f_a16,
-      fetch_texel_3d_f_a16,
-      store_texel_a16
-   },
-   {
-      MESA_FORMAT_L8,
-      fetch_texel_1d_f_l8,
-      fetch_texel_2d_f_l8,
-      fetch_texel_3d_f_l8,
-      store_texel_l8
-   },
-   {
-      MESA_FORMAT_L16,
-      fetch_texel_1d_f_l16,
-      fetch_texel_2d_f_l16,
-      fetch_texel_3d_f_l16,
-      store_texel_l16
-   },
-   {
-      MESA_FORMAT_I8,
-      fetch_texel_1d_f_i8,
-      fetch_texel_2d_f_i8,
-      fetch_texel_3d_f_i8,
-      store_texel_i8
-   },
-   {
-      MESA_FORMAT_I16,
-      fetch_texel_1d_f_i16,
-      fetch_texel_2d_f_i16,
-      fetch_texel_3d_f_i16,
-      store_texel_i16
-   },
-   {
-      MESA_FORMAT_CI8,
-      fetch_texel_1d_f_ci8,
-      fetch_texel_2d_f_ci8,
-      fetch_texel_3d_f_ci8,
-      store_texel_ci8
-   },
-   {
-      MESA_FORMAT_YCBCR,
-      fetch_texel_1d_f_ycbcr,
-      fetch_texel_2d_f_ycbcr,
-      fetch_texel_3d_f_ycbcr,
-      store_texel_ycbcr
-   },
-   {
-      MESA_FORMAT_YCBCR_REV,
-      fetch_texel_1d_f_ycbcr_rev,
-      fetch_texel_2d_f_ycbcr_rev,
-      fetch_texel_3d_f_ycbcr_rev,
-      store_texel_ycbcr_rev
-   },
-   {
-      MESA_FORMAT_R8,
-      fetch_texel_1d_f_r8,
-      fetch_texel_2d_f_r8,
-      fetch_texel_3d_f_r8,
-      store_texel_r8,
-   },
-   {
-      MESA_FORMAT_RG88,
-      fetch_texel_1d_f_rg88,
-      fetch_texel_2d_f_rg88,
-      fetch_texel_3d_f_rg88,
-      store_texel_rg88,
-   },
-   {
-      MESA_FORMAT_RG88_REV,
-      fetch_texel_1d_f_rg88_rev,
-      fetch_texel_2d_f_rg88_rev,
-      fetch_texel_3d_f_rg88_rev,
-      store_texel_rg88_rev,
-   },
-   {
-      MESA_FORMAT_R16,
-      fetch_texel_1d_f_r16,
-      fetch_texel_2d_f_r16,
-      fetch_texel_3d_f_r16,
-      store_texel_r16,
-   },
-   {
-      MESA_FORMAT_RG1616,
-      fetch_texel_1d_f_rg1616,
-      fetch_texel_2d_f_rg1616,
-      fetch_texel_3d_f_rg1616,
-      store_texel_rg1616,
-   },
-   {
-      MESA_FORMAT_RG1616_REV,
-      fetch_texel_1d_f_rg1616_rev,
-      fetch_texel_2d_f_rg1616_rev,
-      fetch_texel_3d_f_rg1616_rev,
-      store_texel_rg1616_rev,
-   },
-   {
-      MESA_FORMAT_ARGB2101010,
-      fetch_texel_1d_f_argb2101010,
-      fetch_texel_2d_f_argb2101010,
-      fetch_texel_3d_f_argb2101010,
-      store_texel_argb2101010
-   },
-   {
-      MESA_FORMAT_Z24_S8,
-      fetch_texel_1d_f_z24_s8,
-      fetch_texel_2d_f_z24_s8,
-      fetch_texel_3d_f_z24_s8,
-      store_texel_z24_s8
-   },
-   {
-      MESA_FORMAT_S8_Z24,
-      fetch_texel_1d_f_s8_z24,
-      fetch_texel_2d_f_s8_z24,
-      fetch_texel_3d_f_s8_z24,
-      store_texel_s8_z24
-   },
-   {
-      MESA_FORMAT_Z16,
-      fetch_texel_1d_f_z16,
-      fetch_texel_2d_f_z16,
-      fetch_texel_3d_f_z16,
-      store_texel_z16
-   },
-   {
-      MESA_FORMAT_X8_Z24,
-      fetch_texel_1d_f_s8_z24,
-      fetch_texel_2d_f_s8_z24,
-      fetch_texel_3d_f_s8_z24,
-      store_texel_s8_z24
-   },
-   {
-      MESA_FORMAT_Z24_X8,
-      fetch_texel_1d_f_z24_s8,
-      fetch_texel_2d_f_z24_s8,
-      fetch_texel_3d_f_z24_s8,
-      store_texel_z24_s8
-   },
-   {
-      MESA_FORMAT_Z32,
-      fetch_texel_1d_f_z32,
-      fetch_texel_2d_f_z32,
-      fetch_texel_3d_f_z32,
-      store_texel_z32
-   },
-   {
-      MESA_FORMAT_S8,
-      NULL,
-      NULL,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SRGB8,
-      fetch_texel_1d_srgb8,
-      fetch_texel_2d_srgb8,
-      fetch_texel_3d_srgb8,
-      store_texel_srgb8
-   },
-   {
-      MESA_FORMAT_SRGBA8,
-      fetch_texel_1d_srgba8,
-      fetch_texel_2d_srgba8,
-      fetch_texel_3d_srgba8,
-      store_texel_srgba8
-   },
-   {
-      MESA_FORMAT_SARGB8,
-      fetch_texel_1d_sargb8,
-      fetch_texel_2d_sargb8,
-      fetch_texel_3d_sargb8,
-      store_texel_sargb8
-   },
-   {
-      MESA_FORMAT_SL8,
-      fetch_texel_1d_sl8,
-      fetch_texel_2d_sl8,
-      fetch_texel_3d_sl8,
-      store_texel_sl8
-   },
-   {
-      MESA_FORMAT_SLA8,
-      fetch_texel_1d_sla8,
-      fetch_texel_2d_sla8,
-      fetch_texel_3d_sla8,
-      store_texel_sla8
-   },
-   {
-      MESA_FORMAT_SRGB_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgb_dxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SRGBA_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgba_dxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SRGBA_DXT3,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgba_dxt3,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SRGBA_DXT5,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgba_dxt5,
-      NULL,
-      NULL
-   },
-
-   {
-      MESA_FORMAT_RGB_FXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgb_fxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGBA_FXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgba_fxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGB_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgb_dxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGBA_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgba_dxt1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGBA_DXT3,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgba_dxt3,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGBA_DXT5,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgba_dxt5,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RGBA_FLOAT32,
-      fetch_texel_1d_f_rgba_f32,
-      fetch_texel_2d_f_rgba_f32,
-      fetch_texel_3d_f_rgba_f32,
-      store_texel_rgba_f32
-   },
-   {
-      MESA_FORMAT_RGBA_FLOAT16,
-      fetch_texel_1d_f_rgba_f16,
-      fetch_texel_2d_f_rgba_f16,
-      fetch_texel_3d_f_rgba_f16,
-      store_texel_rgba_f16
-   },
-   {
-      MESA_FORMAT_RGB_FLOAT32,
-      fetch_texel_1d_f_rgb_f32,
-      fetch_texel_2d_f_rgb_f32,
-      fetch_texel_3d_f_rgb_f32,
-      store_texel_rgb_f32
-   },
-   {
-      MESA_FORMAT_RGB_FLOAT16,
-      fetch_texel_1d_f_rgb_f16,
-      fetch_texel_2d_f_rgb_f16,
-      fetch_texel_3d_f_rgb_f16,
-      store_texel_rgb_f16
-   },
-   {
-      MESA_FORMAT_ALPHA_FLOAT32,
-      fetch_texel_1d_f_alpha_f32,
-      fetch_texel_2d_f_alpha_f32,
-      fetch_texel_3d_f_alpha_f32,
-      store_texel_alpha_f32
-   },
-   {
-      MESA_FORMAT_ALPHA_FLOAT16,
-      fetch_texel_1d_f_alpha_f16,
-      fetch_texel_2d_f_alpha_f16,
-      fetch_texel_3d_f_alpha_f16,
-      store_texel_alpha_f16
-   },
-   {
-      MESA_FORMAT_LUMINANCE_FLOAT32,
-      fetch_texel_1d_f_luminance_f32,
-      fetch_texel_2d_f_luminance_f32,
-      fetch_texel_3d_f_luminance_f32,
-      store_texel_luminance_f32
-   },
-   {
-      MESA_FORMAT_LUMINANCE_FLOAT16,
-      fetch_texel_1d_f_luminance_f16,
-      fetch_texel_2d_f_luminance_f16,
-      fetch_texel_3d_f_luminance_f16,
-      store_texel_luminance_f16
-   },
-   {
-      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,
-      fetch_texel_1d_f_luminance_alpha_f32,
-      fetch_texel_2d_f_luminance_alpha_f32,
-      fetch_texel_3d_f_luminance_alpha_f32,
-      store_texel_luminance_alpha_f32
-   },
-   {
-      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,
-      fetch_texel_1d_f_luminance_alpha_f16,
-      fetch_texel_2d_f_luminance_alpha_f16,
-      fetch_texel_3d_f_luminance_alpha_f16,
-      store_texel_luminance_alpha_f16
-   },
-   {
-      MESA_FORMAT_INTENSITY_FLOAT32,
-      fetch_texel_1d_f_intensity_f32,
-      fetch_texel_2d_f_intensity_f32,
-      fetch_texel_3d_f_intensity_f32,
-      store_texel_intensity_f32
-   },
-   {
-      MESA_FORMAT_INTENSITY_FLOAT16,
-      fetch_texel_1d_f_intensity_f16,
-      fetch_texel_2d_f_intensity_f16,
-      fetch_texel_3d_f_intensity_f16,
-      store_texel_intensity_f16
-   },
-
-   /* non-normalized, signed int */
-   {
-      MESA_FORMAT_RGBA_INT8,
-      fetch_texel_1d_rgba_int8,
-      fetch_texel_2d_rgba_int8,
-      fetch_texel_3d_rgba_int8,
-      store_texel_rgba_int8
-   },
-   {
-      MESA_FORMAT_RGBA_INT16,
-      fetch_texel_1d_rgba_int16,
-      fetch_texel_2d_rgba_int16,
-      fetch_texel_3d_rgba_int16,
-      store_texel_rgba_int16
-   },
-   {
-      MESA_FORMAT_RGBA_INT32,
-      fetch_texel_1d_rgba_int32,
-      fetch_texel_2d_rgba_int32,
-      fetch_texel_3d_rgba_int32,
-      store_texel_rgba_int32
-   },
-
-   /* non-normalized, unsigned int */
-   {
-      MESA_FORMAT_RGBA_UINT8,
-      fetch_texel_1d_rgba_uint8,
-      fetch_texel_2d_rgba_uint8,
-      fetch_texel_3d_rgba_uint8,
-      store_texel_rgba_uint8
-   },
-   {
-      MESA_FORMAT_RGBA_UINT16,
-      fetch_texel_1d_rgba_uint16,
-      fetch_texel_2d_rgba_uint16,
-      fetch_texel_3d_rgba_uint16,
-      store_texel_rgba_uint16
-   },
-   {
-      MESA_FORMAT_RGBA_UINT32,
-      fetch_texel_1d_rgba_uint32,
-      fetch_texel_2d_rgba_uint32,
-      fetch_texel_3d_rgba_uint32,
-      store_texel_rgba_uint32
-   },
-
-   /* dudv */
-   {
-      MESA_FORMAT_DUDV8,
-      fetch_texel_1d_dudv8,
-      fetch_texel_2d_dudv8,
-      fetch_texel_3d_dudv8,
-      NULL
-   },
-
-   /* signed, normalized */
-   {
-      MESA_FORMAT_SIGNED_R8,
-      fetch_texel_1d_signed_r8,
-      fetch_texel_2d_signed_r8,
-      fetch_texel_3d_signed_r8,
-      store_texel_signed_r8
-   },
-   {
-      MESA_FORMAT_SIGNED_RG88_REV,
-      fetch_texel_1d_signed_rg88_rev,
-      fetch_texel_2d_signed_rg88_rev,
-      fetch_texel_3d_signed_rg88_rev,
-      store_texel_signed_rg88_rev
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBX8888,
-      fetch_texel_1d_signed_rgbx8888,
-      fetch_texel_2d_signed_rgbx8888,
-      fetch_texel_3d_signed_rgbx8888,
-      store_texel_signed_rgbx8888
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBA8888,
-      fetch_texel_1d_signed_rgba8888,
-      fetch_texel_2d_signed_rgba8888,
-      fetch_texel_3d_signed_rgba8888,
-      store_texel_signed_rgba8888
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBA8888_REV,
-      fetch_texel_1d_signed_rgba8888_rev,
-      fetch_texel_2d_signed_rgba8888_rev,
-      fetch_texel_3d_signed_rgba8888_rev,
-      store_texel_signed_rgba8888_rev
-   },
-   {
-      MESA_FORMAT_SIGNED_R16,
-      fetch_texel_1d_signed_r16,
-      fetch_texel_2d_signed_r16,
-      fetch_texel_3d_signed_r16,
-      store_texel_signed_r16
-   },
-   {
-      MESA_FORMAT_SIGNED_GR1616,
-      fetch_texel_1d_signed_rg1616,
-      fetch_texel_2d_signed_rg1616,
-      fetch_texel_3d_signed_rg1616,
-      store_texel_signed_rg1616
-   },
-   {
-      MESA_FORMAT_SIGNED_RGB_16,
-      fetch_texel_1d_signed_rgb_16,
-      fetch_texel_2d_signed_rgb_16,
-      fetch_texel_3d_signed_rgb_16,
-      store_texel_signed_rgb_16
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBA_16,
-      fetch_texel_1d_signed_rgba_16,
-      fetch_texel_2d_signed_rgba_16,
-      fetch_texel_3d_signed_rgba_16,
-      store_texel_signed_rgba_16
-   },
-   {
-      MESA_FORMAT_RGBA_16,
-      fetch_texel_1d_rgba_16,
-      fetch_texel_2d_rgba_16,
-      fetch_texel_3d_rgba_16,
-      store_texel_rgba_16
-   },
-   {
-      MESA_FORMAT_RED_RGTC1,
-      NULL,
-      _mesa_fetch_texel_2d_f_red_rgtc1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SIGNED_RED_RGTC1,
-      NULL,
-      _mesa_fetch_texel_2d_f_signed_red_rgtc1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_RG_RGTC2,
-      NULL,
-      _mesa_fetch_texel_2d_f_rg_rgtc2,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SIGNED_RG_RGTC2,
-      NULL,
-      _mesa_fetch_texel_2d_f_signed_rg_rgtc2,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_L_LATC1,
-      NULL,
-      _mesa_fetch_texel_2d_f_l_latc1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SIGNED_L_LATC1,
-      NULL,
-      _mesa_fetch_texel_2d_f_signed_l_latc1,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_LA_LATC2,
-      NULL,
-      _mesa_fetch_texel_2d_f_la_latc2,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SIGNED_LA_LATC2,
-      NULL,
-      _mesa_fetch_texel_2d_f_signed_la_latc2,
-      NULL,
-      NULL
-   },
-   {
-      MESA_FORMAT_SIGNED_A8,
-      fetch_texel_1d_signed_a8,
-      fetch_texel_2d_signed_a8,
-      fetch_texel_3d_signed_a8,
-      store_texel_signed_a8
-   },
-   {
-      MESA_FORMAT_SIGNED_L8,
-      fetch_texel_1d_signed_l8,
-      fetch_texel_2d_signed_l8,
-      fetch_texel_3d_signed_l8,
-      store_texel_signed_l8
-   },
-   {
-      MESA_FORMAT_SIGNED_AL88,
-      fetch_texel_1d_signed_al88,
-      fetch_texel_2d_signed_al88,
-      fetch_texel_3d_signed_al88,
-      store_texel_signed_al88
-   },
-   {
-      MESA_FORMAT_SIGNED_I8,
-      fetch_texel_1d_signed_i8,
-      fetch_texel_2d_signed_i8,
-      fetch_texel_3d_signed_i8,
-      store_texel_signed_i8
-   },
-   {
-      MESA_FORMAT_SIGNED_A16,
-      fetch_texel_1d_signed_a16,
-      fetch_texel_2d_signed_a16,
-      fetch_texel_3d_signed_a16,
-      store_texel_signed_a16
-   },
-   {
-      MESA_FORMAT_SIGNED_L16,
-      fetch_texel_1d_signed_l16,
-      fetch_texel_2d_signed_l16,
-      fetch_texel_3d_signed_l16,
-      store_texel_signed_l16
-   },
-   {
-      MESA_FORMAT_SIGNED_AL1616,
-      fetch_texel_1d_signed_al1616,
-      fetch_texel_2d_signed_al1616,
-      fetch_texel_3d_signed_al1616,
-      store_texel_signed_al1616
-   },
-   {
-      MESA_FORMAT_SIGNED_I16,
-      fetch_texel_1d_signed_i16,
-      fetch_texel_2d_signed_i16,
-      fetch_texel_3d_signed_i16,
-      store_texel_signed_i16
-   },
-};
-
-
-FetchTexelFuncF
-_mesa_get_texel_fetch_func(gl_format format, GLuint dims)
-{
-#ifdef DEBUG
-   /* check that the table entries are sorted by format name */
-   gl_format fmt;
-   for (fmt = 0; fmt < MESA_FORMAT_COUNT; fmt++) {
-      assert(texfetch_funcs[fmt].Name == fmt);
-   }
-#endif
-
-   assert(Elements(texfetch_funcs) == MESA_FORMAT_COUNT);
-   assert(format < MESA_FORMAT_COUNT);
-
-   switch (dims) {
-   case 1:
-      return texfetch_funcs[format].Fetch1D;
-   case 2:
-      return texfetch_funcs[format].Fetch2D;
-   case 3:
-      return texfetch_funcs[format].Fetch3D;
-   default:
-      assert(0 && "bad dims in _mesa_get_texel_fetch_func");
-      return NULL;
-   }
-}
-
-
-StoreTexelFunc
-_mesa_get_texel_store_func(gl_format format)
-{
-   assert(format < MESA_FORMAT_COUNT);
-   return texfetch_funcs[format].StoreTexel;
-}
-
-
-/**
- * Adaptor for fetching a GLchan texel from a float-valued texture.
- */
-static void
-fetch_texel_float_to_chan(const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLchan *texelOut)
-{
-   GLfloat temp[4];
-   GLenum baseFormat = _mesa_get_format_base_format(texImage->TexFormat);
-
-   ASSERT(texImage->FetchTexelf);
-   texImage->FetchTexelf(texImage, i, j, k, temp);
-   if (baseFormat == GL_DEPTH_COMPONENT ||
-       baseFormat == GL_DEPTH_STENCIL_EXT) {
-      /* just one channel */
-      UNCLAMPED_FLOAT_TO_CHAN(texelOut[0], temp[0]);
-   }
-   else {
-      /* four channels */
-      UNCLAMPED_FLOAT_TO_CHAN(texelOut[0], temp[0]);
-      UNCLAMPED_FLOAT_TO_CHAN(texelOut[1], temp[1]);
-      UNCLAMPED_FLOAT_TO_CHAN(texelOut[2], temp[2]);
-      UNCLAMPED_FLOAT_TO_CHAN(texelOut[3], temp[3]);
-   }
-}
-
-
-#if 0
-/**
- * Adaptor for fetching a float texel from a GLchan-valued texture.
- */
-static void
-fetch_texel_chan_to_float(const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLfloat *texelOut)
-{
-   GLchan temp[4];
-   GLenum baseFormat = _mesa_get_format_base_format(texImage->TexFormat);
-
-   ASSERT(texImage->FetchTexelc);
-   texImage->FetchTexelc(texImage, i, j, k, temp);
-   if (baseFormat == GL_DEPTH_COMPONENT ||
-       baseFormat == GL_DEPTH_STENCIL_EXT) {
-      /* just one channel */
-      texelOut[0] = CHAN_TO_FLOAT(temp[0]);
-   }
-   else {
-      /* four channels */
-      texelOut[0] = CHAN_TO_FLOAT(temp[0]);
-      texelOut[1] = CHAN_TO_FLOAT(temp[1]);
-      texelOut[2] = CHAN_TO_FLOAT(temp[2]);
-      texelOut[3] = CHAN_TO_FLOAT(temp[3]);
-   }
-}
-#endif
-
-
-/**
- * Initialize the texture image's FetchTexelc and FetchTexelf methods.
- */
-void
-_mesa_set_fetch_functions(struct gl_texture_image *texImage, GLuint dims)
-{
-   gl_format format = texImage->TexFormat;
-
-   ASSERT(dims == 1 || dims == 2 || dims == 3);
-
-   if (texImage->TexObject->sRGBDecode == GL_SKIP_DECODE_EXT &&
-       _mesa_get_format_color_encoding(format) == GL_SRGB) {
-      format = _mesa_get_srgb_format_linear(format);
-   }
-
-   texImage->FetchTexelf = _mesa_get_texel_fetch_func(format, dims);
-
-   texImage->FetchTexelc = fetch_texel_float_to_chan;
-
-   ASSERT(texImage->FetchTexelc);
-   ASSERT(texImage->FetchTexelf);
-}
-
-void
-_mesa_update_fetch_functions(struct gl_texture_object *texObj)
-{
-   GLuint face, i;
-   GLuint dims;
-
-   dims = _mesa_get_texture_dimensions(texObj->Target);
-
-   for (face = 0; face < 6; face++) {
-      for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {
-         if (texObj->Image[face][i]) {
-	    _mesa_set_fetch_functions(texObj->Image[face][i], dims);
-         }
-      }
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.7

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (c) 2009  VMware, Inc.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file texfetch.c

+ *

+ * Texel fetch/store functions

+ *

+ * \author Gareth Hughes

+ */

+

+

+#include "colormac.h"

+#include "macros.h"

+#include "texcompress.h"

+#include "texcompress_fxt1.h"

+#include "texcompress_s3tc.h"

+#include "texcompress_rgtc.h"

+#include "texfetch.h"

+#include "teximage.h"

+

+

+/**

+ * Convert an 8-bit sRGB value from non-linear space to a

+ * linear RGB value in [0, 1].

+ * Implemented with a 256-entry lookup table.

+ */

+static INLINE GLfloat

+nonlinear_to_linear(GLubyte cs8)

+{

+   static GLfloat table[256];

+   static GLboolean tableReady = GL_FALSE;

+   if (!tableReady) {

+      /* compute lookup table now */

+      GLuint i;

+      for (i = 0; i < 256; i++) {

+         const GLfloat cs = UBYTE_TO_FLOAT(i);

+         if (cs <= 0.04045) {

+            table[i] = cs / 12.92f;

+         }

+         else {

+            table[i] = (GLfloat) pow((cs + 0.055) / 1.055, 2.4);

+         }

+      }

+      tableReady = GL_TRUE;

+   }

+   return table[cs8];

+}

+

+

+

+/* Texel fetch routines for all supported formats

+ */

+#define DIM 1

+#include "texfetch_tmp.h"

+

+#define DIM 2

+#include "texfetch_tmp.h"

+

+#define DIM 3

+#include "texfetch_tmp.h"

+

+/**

+ * Null texel fetch function.

+ *

+ * Have to have this so the FetchTexel function pointer is never NULL.

+ */

+static void fetch_null_texelf( const struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   (void) texImage; (void) i; (void) j; (void) k;

+   texel[RCOMP] = 0.0;

+   texel[GCOMP] = 0.0;

+   texel[BCOMP] = 0.0;

+   texel[ACOMP] = 0.0;

+   _mesa_warning(NULL, "fetch_null_texelf() called!");

+}

+

+static void store_null_texel(struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, const void *texel)

+{

+   (void) texImage;

+   (void) i;

+   (void) j;

+   (void) k;

+   (void) texel;

+   /* no-op */

+}

+

+

+

+/**

+ * Table to map MESA_FORMAT_ to texel fetch/store funcs.

+ * XXX this is somewhat temporary.

+ */

+static struct {

+   gl_format Name;

+   FetchTexelFuncF Fetch1D;

+   FetchTexelFuncF Fetch2D;

+   FetchTexelFuncF Fetch3D;

+   StoreTexelFunc StoreTexel;

+}

+texfetch_funcs[MESA_FORMAT_COUNT] =

+{

+   {

+      MESA_FORMAT_NONE,

+      fetch_null_texelf,

+      fetch_null_texelf,

+      fetch_null_texelf,

+      store_null_texel

+   },

+

+   {

+      MESA_FORMAT_RGBA8888,

+      fetch_texel_1d_f_rgba8888,

+      fetch_texel_2d_f_rgba8888,

+      fetch_texel_3d_f_rgba8888,

+      store_texel_rgba8888

+   },

+   {

+      MESA_FORMAT_RGBA8888_REV,

+      fetch_texel_1d_f_rgba8888_rev,

+      fetch_texel_2d_f_rgba8888_rev,

+      fetch_texel_3d_f_rgba8888_rev,

+      store_texel_rgba8888_rev

+   },

+   {

+      MESA_FORMAT_ARGB8888,

+      fetch_texel_1d_f_argb8888,

+      fetch_texel_2d_f_argb8888,

+      fetch_texel_3d_f_argb8888,

+      store_texel_argb8888

+   },

+   {

+      MESA_FORMAT_ARGB8888_REV,

+      fetch_texel_1d_f_argb8888_rev,

+      fetch_texel_2d_f_argb8888_rev,

+      fetch_texel_3d_f_argb8888_rev,

+      store_texel_argb8888_rev

+   },

+   {

+      MESA_FORMAT_XRGB8888,

+      fetch_texel_1d_f_xrgb8888,

+      fetch_texel_2d_f_xrgb8888,

+      fetch_texel_3d_f_xrgb8888,

+      store_texel_xrgb8888

+   },

+   {

+      MESA_FORMAT_XRGB8888_REV,

+      fetch_texel_1d_f_xrgb8888_rev,

+      fetch_texel_2d_f_xrgb8888_rev,

+      fetch_texel_3d_f_xrgb8888_rev,

+      store_texel_xrgb8888_rev,

+   },

+   {

+      MESA_FORMAT_RGB888,

+      fetch_texel_1d_f_rgb888,

+      fetch_texel_2d_f_rgb888,

+      fetch_texel_3d_f_rgb888,

+      store_texel_rgb888

+   },

+   {

+      MESA_FORMAT_BGR888,

+      fetch_texel_1d_f_bgr888,

+      fetch_texel_2d_f_bgr888,

+      fetch_texel_3d_f_bgr888,

+      store_texel_bgr888

+   },

+   {

+      MESA_FORMAT_RGB565,

+      fetch_texel_1d_f_rgb565,

+      fetch_texel_2d_f_rgb565,

+      fetch_texel_3d_f_rgb565,

+      store_texel_rgb565

+   },

+   {

+      MESA_FORMAT_RGB565_REV,

+      fetch_texel_1d_f_rgb565_rev,

+      fetch_texel_2d_f_rgb565_rev,

+      fetch_texel_3d_f_rgb565_rev,

+      store_texel_rgb565_rev

+   },

+   {

+      MESA_FORMAT_ARGB4444,

+      fetch_texel_1d_f_argb4444,

+      fetch_texel_2d_f_argb4444,

+      fetch_texel_3d_f_argb4444,

+      store_texel_argb4444

+   },

+   {

+      MESA_FORMAT_ARGB4444_REV,

+      fetch_texel_1d_f_argb4444_rev,

+      fetch_texel_2d_f_argb4444_rev,

+      fetch_texel_3d_f_argb4444_rev,

+      store_texel_argb4444_rev

+   },

+   {

+      MESA_FORMAT_RGBA5551,

+      fetch_texel_1d_f_rgba5551,

+      fetch_texel_2d_f_rgba5551,

+      fetch_texel_3d_f_rgba5551,

+      store_texel_rgba5551

+   },

+   {

+      MESA_FORMAT_ARGB1555,

+      fetch_texel_1d_f_argb1555,

+      fetch_texel_2d_f_argb1555,

+      fetch_texel_3d_f_argb1555,

+      store_texel_argb1555

+   },

+   {

+      MESA_FORMAT_ARGB1555_REV,

+      fetch_texel_1d_f_argb1555_rev,

+      fetch_texel_2d_f_argb1555_rev,

+      fetch_texel_3d_f_argb1555_rev,

+      store_texel_argb1555_rev

+   },

+   {

+      MESA_FORMAT_AL44,

+      fetch_texel_1d_f_al44,

+      fetch_texel_2d_f_al44,

+      fetch_texel_3d_f_al44,

+      store_texel_al44

+   },

+   {

+      MESA_FORMAT_AL88,

+      fetch_texel_1d_f_al88,

+      fetch_texel_2d_f_al88,

+      fetch_texel_3d_f_al88,

+      store_texel_al88

+   },

+   {

+      MESA_FORMAT_AL88_REV,

+      fetch_texel_1d_f_al88_rev,

+      fetch_texel_2d_f_al88_rev,

+      fetch_texel_3d_f_al88_rev,

+      store_texel_al88_rev

+   },

+   {

+      MESA_FORMAT_AL1616,

+      fetch_texel_1d_f_al1616,

+      fetch_texel_2d_f_al1616,

+      fetch_texel_3d_f_al1616,

+      store_texel_al1616

+   },

+   {

+      MESA_FORMAT_AL1616_REV,

+      fetch_texel_1d_f_al1616_rev,

+      fetch_texel_2d_f_al1616_rev,

+      fetch_texel_3d_f_al1616_rev,

+      store_texel_al1616_rev

+   },

+   {

+      MESA_FORMAT_RGB332,

+      fetch_texel_1d_f_rgb332,

+      fetch_texel_2d_f_rgb332,

+      fetch_texel_3d_f_rgb332,

+      store_texel_rgb332

+   },

+   {

+      MESA_FORMAT_A8,

+      fetch_texel_1d_f_a8,

+      fetch_texel_2d_f_a8,

+      fetch_texel_3d_f_a8,

+      store_texel_a8

+   },

+   {

+      MESA_FORMAT_A16,

+      fetch_texel_1d_f_a16,

+      fetch_texel_2d_f_a16,

+      fetch_texel_3d_f_a16,

+      store_texel_a16

+   },

+   {

+      MESA_FORMAT_L8,

+      fetch_texel_1d_f_l8,

+      fetch_texel_2d_f_l8,

+      fetch_texel_3d_f_l8,

+      store_texel_l8

+   },

+   {

+      MESA_FORMAT_L16,

+      fetch_texel_1d_f_l16,

+      fetch_texel_2d_f_l16,

+      fetch_texel_3d_f_l16,

+      store_texel_l16

+   },

+   {

+      MESA_FORMAT_I8,

+      fetch_texel_1d_f_i8,

+      fetch_texel_2d_f_i8,

+      fetch_texel_3d_f_i8,

+      store_texel_i8

+   },

+   {

+      MESA_FORMAT_I16,

+      fetch_texel_1d_f_i16,

+      fetch_texel_2d_f_i16,

+      fetch_texel_3d_f_i16,

+      store_texel_i16

+   },

+   {

+      MESA_FORMAT_CI8,

+      fetch_texel_1d_f_ci8,

+      fetch_texel_2d_f_ci8,

+      fetch_texel_3d_f_ci8,

+      store_texel_ci8

+   },

+   {

+      MESA_FORMAT_YCBCR,

+      fetch_texel_1d_f_ycbcr,

+      fetch_texel_2d_f_ycbcr,

+      fetch_texel_3d_f_ycbcr,

+      store_texel_ycbcr

+   },

+   {

+      MESA_FORMAT_YCBCR_REV,

+      fetch_texel_1d_f_ycbcr_rev,

+      fetch_texel_2d_f_ycbcr_rev,

+      fetch_texel_3d_f_ycbcr_rev,

+      store_texel_ycbcr_rev

+   },

+   {

+      MESA_FORMAT_R8,

+      fetch_texel_1d_f_r8,

+      fetch_texel_2d_f_r8,

+      fetch_texel_3d_f_r8,

+      store_texel_r8,

+   },

+   {

+      MESA_FORMAT_RG88,

+      fetch_texel_1d_f_rg88,

+      fetch_texel_2d_f_rg88,

+      fetch_texel_3d_f_rg88,

+      store_texel_rg88,

+   },

+   {

+      MESA_FORMAT_RG88_REV,

+      fetch_texel_1d_f_rg88_rev,

+      fetch_texel_2d_f_rg88_rev,

+      fetch_texel_3d_f_rg88_rev,

+      store_texel_rg88_rev,

+   },

+   {

+      MESA_FORMAT_R16,

+      fetch_texel_1d_f_r16,

+      fetch_texel_2d_f_r16,

+      fetch_texel_3d_f_r16,

+      store_texel_r16,

+   },

+   {

+      MESA_FORMAT_RG1616,

+      fetch_texel_1d_f_rg1616,

+      fetch_texel_2d_f_rg1616,

+      fetch_texel_3d_f_rg1616,

+      store_texel_rg1616,

+   },

+   {

+      MESA_FORMAT_RG1616_REV,

+      fetch_texel_1d_f_rg1616_rev,

+      fetch_texel_2d_f_rg1616_rev,

+      fetch_texel_3d_f_rg1616_rev,

+      store_texel_rg1616_rev,

+   },

+   {

+      MESA_FORMAT_ARGB2101010,

+      fetch_texel_1d_f_argb2101010,

+      fetch_texel_2d_f_argb2101010,

+      fetch_texel_3d_f_argb2101010,

+      store_texel_argb2101010

+   },

+   {

+      MESA_FORMAT_Z24_S8,

+      fetch_texel_1d_f_z24_s8,

+      fetch_texel_2d_f_z24_s8,

+      fetch_texel_3d_f_z24_s8,

+      store_texel_z24_s8

+   },

+   {

+      MESA_FORMAT_S8_Z24,

+      fetch_texel_1d_f_s8_z24,

+      fetch_texel_2d_f_s8_z24,

+      fetch_texel_3d_f_s8_z24,

+      store_texel_s8_z24

+   },

+   {

+      MESA_FORMAT_Z16,

+      fetch_texel_1d_f_z16,

+      fetch_texel_2d_f_z16,

+      fetch_texel_3d_f_z16,

+      store_texel_z16

+   },

+   {

+      MESA_FORMAT_X8_Z24,

+      fetch_texel_1d_f_s8_z24,

+      fetch_texel_2d_f_s8_z24,

+      fetch_texel_3d_f_s8_z24,

+      store_texel_s8_z24

+   },

+   {

+      MESA_FORMAT_Z24_X8,

+      fetch_texel_1d_f_z24_s8,

+      fetch_texel_2d_f_z24_s8,

+      fetch_texel_3d_f_z24_s8,

+      store_texel_z24_s8

+   },

+   {

+      MESA_FORMAT_Z32,

+      fetch_texel_1d_f_z32,

+      fetch_texel_2d_f_z32,

+      fetch_texel_3d_f_z32,

+      store_texel_z32

+   },

+   {

+      MESA_FORMAT_S8,

+      NULL,

+      NULL,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SRGB8,

+      fetch_texel_1d_srgb8,

+      fetch_texel_2d_srgb8,

+      fetch_texel_3d_srgb8,

+      store_texel_srgb8

+   },

+   {

+      MESA_FORMAT_SRGBA8,

+      fetch_texel_1d_srgba8,

+      fetch_texel_2d_srgba8,

+      fetch_texel_3d_srgba8,

+      store_texel_srgba8

+   },

+   {

+      MESA_FORMAT_SARGB8,

+      fetch_texel_1d_sargb8,

+      fetch_texel_2d_sargb8,

+      fetch_texel_3d_sargb8,

+      store_texel_sargb8

+   },

+   {

+      MESA_FORMAT_SL8,

+      fetch_texel_1d_sl8,

+      fetch_texel_2d_sl8,

+      fetch_texel_3d_sl8,

+      store_texel_sl8

+   },

+   {

+      MESA_FORMAT_SLA8,

+      fetch_texel_1d_sla8,

+      fetch_texel_2d_sla8,

+      fetch_texel_3d_sla8,

+      store_texel_sla8

+   },

+   {

+      MESA_FORMAT_SRGB_DXT1,

+      NULL,

+      _mesa_fetch_texel_2d_f_srgb_dxt1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SRGBA_DXT1,

+      NULL,

+      _mesa_fetch_texel_2d_f_srgba_dxt1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SRGBA_DXT3,

+      NULL,

+      _mesa_fetch_texel_2d_f_srgba_dxt3,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SRGBA_DXT5,

+      NULL,

+      _mesa_fetch_texel_2d_f_srgba_dxt5,

+      NULL,

+      NULL

+   },

+

+   {

+      MESA_FORMAT_RGB_FXT1,

+      NULL,

+      _mesa_fetch_texel_2d_f_rgb_fxt1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_RGBA_FXT1,

+      NULL,

+      _mesa_fetch_texel_2d_f_rgba_fxt1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_RGB_DXT1,

+      NULL,

+      _mesa_fetch_texel_2d_f_rgb_dxt1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_RGBA_DXT1,

+      NULL,

+      _mesa_fetch_texel_2d_f_rgba_dxt1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_RGBA_DXT3,

+      NULL,

+      _mesa_fetch_texel_2d_f_rgba_dxt3,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_RGBA_DXT5,

+      NULL,

+      _mesa_fetch_texel_2d_f_rgba_dxt5,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_RGBA_FLOAT32,

+      fetch_texel_1d_f_rgba_f32,

+      fetch_texel_2d_f_rgba_f32,

+      fetch_texel_3d_f_rgba_f32,

+      store_texel_rgba_f32

+   },

+   {

+      MESA_FORMAT_RGBA_FLOAT16,

+      fetch_texel_1d_f_rgba_f16,

+      fetch_texel_2d_f_rgba_f16,

+      fetch_texel_3d_f_rgba_f16,

+      store_texel_rgba_f16

+   },

+   {

+      MESA_FORMAT_RGB_FLOAT32,

+      fetch_texel_1d_f_rgb_f32,

+      fetch_texel_2d_f_rgb_f32,

+      fetch_texel_3d_f_rgb_f32,

+      store_texel_rgb_f32

+   },

+   {

+      MESA_FORMAT_RGB_FLOAT16,

+      fetch_texel_1d_f_rgb_f16,

+      fetch_texel_2d_f_rgb_f16,

+      fetch_texel_3d_f_rgb_f16,

+      store_texel_rgb_f16

+   },

+   {

+      MESA_FORMAT_ALPHA_FLOAT32,

+      fetch_texel_1d_f_alpha_f32,

+      fetch_texel_2d_f_alpha_f32,

+      fetch_texel_3d_f_alpha_f32,

+      store_texel_alpha_f32

+   },

+   {

+      MESA_FORMAT_ALPHA_FLOAT16,

+      fetch_texel_1d_f_alpha_f16,

+      fetch_texel_2d_f_alpha_f16,

+      fetch_texel_3d_f_alpha_f16,

+      store_texel_alpha_f16

+   },

+   {

+      MESA_FORMAT_LUMINANCE_FLOAT32,

+      fetch_texel_1d_f_luminance_f32,

+      fetch_texel_2d_f_luminance_f32,

+      fetch_texel_3d_f_luminance_f32,

+      store_texel_luminance_f32

+   },

+   {

+      MESA_FORMAT_LUMINANCE_FLOAT16,

+      fetch_texel_1d_f_luminance_f16,

+      fetch_texel_2d_f_luminance_f16,

+      fetch_texel_3d_f_luminance_f16,

+      store_texel_luminance_f16

+   },

+   {

+      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,

+      fetch_texel_1d_f_luminance_alpha_f32,

+      fetch_texel_2d_f_luminance_alpha_f32,

+      fetch_texel_3d_f_luminance_alpha_f32,

+      store_texel_luminance_alpha_f32

+   },

+   {

+      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,

+      fetch_texel_1d_f_luminance_alpha_f16,

+      fetch_texel_2d_f_luminance_alpha_f16,

+      fetch_texel_3d_f_luminance_alpha_f16,

+      store_texel_luminance_alpha_f16

+   },

+   {

+      MESA_FORMAT_INTENSITY_FLOAT32,

+      fetch_texel_1d_f_intensity_f32,

+      fetch_texel_2d_f_intensity_f32,

+      fetch_texel_3d_f_intensity_f32,

+      store_texel_intensity_f32

+   },

+   {

+      MESA_FORMAT_INTENSITY_FLOAT16,

+      fetch_texel_1d_f_intensity_f16,

+      fetch_texel_2d_f_intensity_f16,

+      fetch_texel_3d_f_intensity_f16,

+      store_texel_intensity_f16

+   },

+

+   /* non-normalized, signed int */

+   {

+      MESA_FORMAT_RGBA_INT8,

+      fetch_texel_1d_rgba_int8,

+      fetch_texel_2d_rgba_int8,

+      fetch_texel_3d_rgba_int8,

+      store_texel_rgba_int8

+   },

+   {

+      MESA_FORMAT_RGBA_INT16,

+      fetch_texel_1d_rgba_int16,

+      fetch_texel_2d_rgba_int16,

+      fetch_texel_3d_rgba_int16,

+      store_texel_rgba_int16

+   },

+   {

+      MESA_FORMAT_RGBA_INT32,

+      fetch_texel_1d_rgba_int32,

+      fetch_texel_2d_rgba_int32,

+      fetch_texel_3d_rgba_int32,

+      store_texel_rgba_int32

+   },

+

+   /* non-normalized, unsigned int */

+   {

+      MESA_FORMAT_RGBA_UINT8,

+      fetch_texel_1d_rgba_uint8,

+      fetch_texel_2d_rgba_uint8,

+      fetch_texel_3d_rgba_uint8,

+      store_texel_rgba_uint8

+   },

+   {

+      MESA_FORMAT_RGBA_UINT16,

+      fetch_texel_1d_rgba_uint16,

+      fetch_texel_2d_rgba_uint16,

+      fetch_texel_3d_rgba_uint16,

+      store_texel_rgba_uint16

+   },

+   {

+      MESA_FORMAT_RGBA_UINT32,

+      fetch_texel_1d_rgba_uint32,

+      fetch_texel_2d_rgba_uint32,

+      fetch_texel_3d_rgba_uint32,

+      store_texel_rgba_uint32

+   },

+

+   /* dudv */

+   {

+      MESA_FORMAT_DUDV8,

+      fetch_texel_1d_dudv8,

+      fetch_texel_2d_dudv8,

+      fetch_texel_3d_dudv8,

+      NULL

+   },

+

+   /* signed, normalized */

+   {

+      MESA_FORMAT_SIGNED_R8,

+      fetch_texel_1d_signed_r8,

+      fetch_texel_2d_signed_r8,

+      fetch_texel_3d_signed_r8,

+      store_texel_signed_r8

+   },

+   {

+      MESA_FORMAT_SIGNED_RG88_REV,

+      fetch_texel_1d_signed_rg88_rev,

+      fetch_texel_2d_signed_rg88_rev,

+      fetch_texel_3d_signed_rg88_rev,

+      store_texel_signed_rg88_rev

+   },

+   {

+      MESA_FORMAT_SIGNED_RGBX8888,

+      fetch_texel_1d_signed_rgbx8888,

+      fetch_texel_2d_signed_rgbx8888,

+      fetch_texel_3d_signed_rgbx8888,

+      store_texel_signed_rgbx8888

+   },

+   {

+      MESA_FORMAT_SIGNED_RGBA8888,

+      fetch_texel_1d_signed_rgba8888,

+      fetch_texel_2d_signed_rgba8888,

+      fetch_texel_3d_signed_rgba8888,

+      store_texel_signed_rgba8888

+   },

+   {

+      MESA_FORMAT_SIGNED_RGBA8888_REV,

+      fetch_texel_1d_signed_rgba8888_rev,

+      fetch_texel_2d_signed_rgba8888_rev,

+      fetch_texel_3d_signed_rgba8888_rev,

+      store_texel_signed_rgba8888_rev

+   },

+   {

+      MESA_FORMAT_SIGNED_R16,

+      fetch_texel_1d_signed_r16,

+      fetch_texel_2d_signed_r16,

+      fetch_texel_3d_signed_r16,

+      store_texel_signed_r16

+   },

+   {

+      MESA_FORMAT_SIGNED_GR1616,

+      fetch_texel_1d_signed_rg1616,

+      fetch_texel_2d_signed_rg1616,

+      fetch_texel_3d_signed_rg1616,

+      store_texel_signed_rg1616

+   },

+   {

+      MESA_FORMAT_SIGNED_RGB_16,

+      fetch_texel_1d_signed_rgb_16,

+      fetch_texel_2d_signed_rgb_16,

+      fetch_texel_3d_signed_rgb_16,

+      store_texel_signed_rgb_16

+   },

+   {

+      MESA_FORMAT_SIGNED_RGBA_16,

+      fetch_texel_1d_signed_rgba_16,

+      fetch_texel_2d_signed_rgba_16,

+      fetch_texel_3d_signed_rgba_16,

+      store_texel_signed_rgba_16

+   },

+   {

+      MESA_FORMAT_RGBA_16,

+      fetch_texel_1d_rgba_16,

+      fetch_texel_2d_rgba_16,

+      fetch_texel_3d_rgba_16,

+      store_texel_rgba_16

+   },

+   {

+      MESA_FORMAT_RED_RGTC1,

+      NULL,

+      _mesa_fetch_texel_2d_f_red_rgtc1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SIGNED_RED_RGTC1,

+      NULL,

+      _mesa_fetch_texel_2d_f_signed_red_rgtc1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_RG_RGTC2,

+      NULL,

+      _mesa_fetch_texel_2d_f_rg_rgtc2,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SIGNED_RG_RGTC2,

+      NULL,

+      _mesa_fetch_texel_2d_f_signed_rg_rgtc2,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_L_LATC1,

+      NULL,

+      _mesa_fetch_texel_2d_f_l_latc1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SIGNED_L_LATC1,

+      NULL,

+      _mesa_fetch_texel_2d_f_signed_l_latc1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_LA_LATC2,

+      NULL,

+      _mesa_fetch_texel_2d_f_la_latc2,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SIGNED_LA_LATC2,

+      NULL,

+      _mesa_fetch_texel_2d_f_signed_la_latc2,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SIGNED_A8,

+      fetch_texel_1d_signed_a8,

+      fetch_texel_2d_signed_a8,

+      fetch_texel_3d_signed_a8,

+      store_texel_signed_a8

+   },

+   {

+      MESA_FORMAT_SIGNED_L8,

+      fetch_texel_1d_signed_l8,

+      fetch_texel_2d_signed_l8,

+      fetch_texel_3d_signed_l8,

+      store_texel_signed_l8

+   },

+   {

+      MESA_FORMAT_SIGNED_AL88,

+      fetch_texel_1d_signed_al88,

+      fetch_texel_2d_signed_al88,

+      fetch_texel_3d_signed_al88,

+      store_texel_signed_al88

+   },

+   {

+      MESA_FORMAT_SIGNED_I8,

+      fetch_texel_1d_signed_i8,

+      fetch_texel_2d_signed_i8,

+      fetch_texel_3d_signed_i8,

+      store_texel_signed_i8

+   },

+   {

+      MESA_FORMAT_SIGNED_A16,

+      fetch_texel_1d_signed_a16,

+      fetch_texel_2d_signed_a16,

+      fetch_texel_3d_signed_a16,

+      store_texel_signed_a16

+   },

+   {

+      MESA_FORMAT_SIGNED_L16,

+      fetch_texel_1d_signed_l16,

+      fetch_texel_2d_signed_l16,

+      fetch_texel_3d_signed_l16,

+      store_texel_signed_l16

+   },

+   {

+      MESA_FORMAT_SIGNED_AL1616,

+      fetch_texel_1d_signed_al1616,

+      fetch_texel_2d_signed_al1616,

+      fetch_texel_3d_signed_al1616,

+      store_texel_signed_al1616

+   },

+   {

+      MESA_FORMAT_SIGNED_I16,

+      fetch_texel_1d_signed_i16,

+      fetch_texel_2d_signed_i16,

+      fetch_texel_3d_signed_i16,

+      store_texel_signed_i16

+   },

+};

+

+

+FetchTexelFuncF

+_mesa_get_texel_fetch_func(gl_format format, GLuint dims)

+{

+#ifdef DEBUG

+   /* check that the table entries are sorted by format name */

+   gl_format fmt;

+   for (fmt = 0; fmt < MESA_FORMAT_COUNT; fmt++) {

+      assert(texfetch_funcs[fmt].Name == fmt);

+   }

+#endif

+

+   assert(Elements(texfetch_funcs) == MESA_FORMAT_COUNT);

+   assert(format < MESA_FORMAT_COUNT);

+

+   switch (dims) {

+   case 1:

+      return texfetch_funcs[format].Fetch1D;

+   case 2:

+      return texfetch_funcs[format].Fetch2D;

+   case 3:

+      return texfetch_funcs[format].Fetch3D;

+   default:

+      assert(0 && "bad dims in _mesa_get_texel_fetch_func");

+      return NULL;

+   }

+}

+

+

+StoreTexelFunc

+_mesa_get_texel_store_func(gl_format format)

+{

+   assert(format < MESA_FORMAT_COUNT);

+   return texfetch_funcs[format].StoreTexel;

+}

+

+

+/**

+ * Adaptor for fetching a GLchan texel from a float-valued texture.

+ */

+static void

+fetch_texel_float_to_chan(const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLchan *texelOut)

+{

+   GLfloat temp[4];

+   GLenum baseFormat = _mesa_get_format_base_format(texImage->TexFormat);

+

+   ASSERT(texImage->FetchTexelf);

+   texImage->FetchTexelf(texImage, i, j, k, temp);

+   if (baseFormat == GL_DEPTH_COMPONENT ||

+       baseFormat == GL_DEPTH_STENCIL_EXT) {

+      /* just one channel */

+      UNCLAMPED_FLOAT_TO_CHAN(texelOut[0], temp[0]);

+   }

+   else {

+      /* four channels */

+      UNCLAMPED_FLOAT_TO_CHAN(texelOut[0], temp[0]);

+      UNCLAMPED_FLOAT_TO_CHAN(texelOut[1], temp[1]);

+      UNCLAMPED_FLOAT_TO_CHAN(texelOut[2], temp[2]);

+      UNCLAMPED_FLOAT_TO_CHAN(texelOut[3], temp[3]);

+   }

+}

+

+

+#if 0

+/**

+ * Adaptor for fetching a float texel from a GLchan-valued texture.

+ */

+static void

+fetch_texel_chan_to_float(const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLfloat *texelOut)

+{

+   GLchan temp[4];

+   GLenum baseFormat = _mesa_get_format_base_format(texImage->TexFormat);

+

+   ASSERT(texImage->FetchTexelc);

+   texImage->FetchTexelc(texImage, i, j, k, temp);

+   if (baseFormat == GL_DEPTH_COMPONENT ||

+       baseFormat == GL_DEPTH_STENCIL_EXT) {

+      /* just one channel */

+      texelOut[0] = CHAN_TO_FLOAT(temp[0]);

+   }

+   else {

+      /* four channels */

+      texelOut[0] = CHAN_TO_FLOAT(temp[0]);

+      texelOut[1] = CHAN_TO_FLOAT(temp[1]);

+      texelOut[2] = CHAN_TO_FLOAT(temp[2]);

+      texelOut[3] = CHAN_TO_FLOAT(temp[3]);

+   }

+}

+#endif

+

+

+/**

+ * Initialize the texture image's FetchTexelc and FetchTexelf methods.

+ */

+void

+_mesa_set_fetch_functions(struct gl_texture_image *texImage, GLuint dims)

+{

+   gl_format format = texImage->TexFormat;

+

+   ASSERT(dims == 1 || dims == 2 || dims == 3);

+

+   if (texImage->TexObject->sRGBDecode == GL_SKIP_DECODE_EXT &&

+       _mesa_get_format_color_encoding(format) == GL_SRGB) {

+      format = _mesa_get_srgb_format_linear(format);

+   }

+

+   texImage->FetchTexelf = _mesa_get_texel_fetch_func(format, dims);

+

+   texImage->FetchTexelc = fetch_texel_float_to_chan;

+

+   ASSERT(texImage->FetchTexelc);

+   ASSERT(texImage->FetchTexelf);

+}

+

+void

+_mesa_update_fetch_functions(struct gl_texture_object *texObj)

+{

+   GLuint face, i;

+   GLuint dims;

+

+   dims = _mesa_get_texture_dimensions(texObj->Target);

+

+   for (face = 0; face < 6; face++) {

+      for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {

+         if (texObj->Image[face][i]) {

+	    _mesa_set_fetch_functions(texObj->Image[face][i], dims);

+         }

+      }

+   }

+}

diff --git a/mesalib/src/mesa/main/texfetch_tmp.h b/mesalib/src/mesa/main/texfetch_tmp.h
index f1f6a01a4..fe525aa62 100644
--- a/mesalib/src/mesa/main/texfetch_tmp.h
+++ b/mesalib/src/mesa/main/texfetch_tmp.h
@@ -1,2233 +1,2233 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.7
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (c) 2008-2009  VMware, Inc.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file texfetch_tmp.h
- * Texel fetch functions template.
- * 
- * This template file is used by texfetch.c to generate texel fetch functions
- * for 1-D, 2-D and 3-D texture images. 
- *
- * It should be expanded by defining \p DIM as the number texture dimensions
- * (1, 2 or 3).  According to the value of \p DIM a series of macros is defined
- * for the texel lookup in the gl_texture_image::Data.
- * 
- * \author Gareth Hughes
- * \author Brian Paul
- */
-
-
-#if DIM == 1
-
-#define TEXEL_ADDR( type, image, i, j, k, size ) \
-	((void) (j), (void) (k), ((type *)(image)->Data + (i) * (size)))
-
-#define FETCH(x) fetch_texel_1d_##x
-
-#elif DIM == 2
-
-#define TEXEL_ADDR( type, image, i, j, k, size )			\
-	((void) (k),							\
-	 ((type *)(image)->Data + ((image)->RowStride * (j) + (i)) * (size)))
-
-#define FETCH(x) fetch_texel_2d_##x
-
-#elif DIM == 3
-
-#define TEXEL_ADDR( type, image, i, j, k, size )			\
-	((type *)(image)->Data + ((image)->ImageOffsets[k]		\
-             + (image)->RowStride * (j) + (i)) * (size))
-
-#define FETCH(x) fetch_texel_3d_##x
-
-#else
-#error	illegal number of texture dimensions
-#endif
-
-
-/* MESA_FORMAT_Z32 ***********************************************************/
-
-/* Fetch depth texel from 1D, 2D or 3D 32-bit depth texture,
- * returning 1 GLfloat.
- * Note: no GLchan version of this function.
- */
-static void FETCH(f_z32)( const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[0] = src[0] * (1.0F / 0xffffffff);
-}
-
-#if DIM == 3
-static void store_texel_z32(struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLuint *depth = (const GLuint *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   dst[0] = *depth;
-}
-#endif
-
-
-/* MESA_FORMAT_Z16 ***********************************************************/
-
-/* Fetch depth texel from 1D, 2D or 3D 16-bit depth texture,
- * returning 1 GLfloat.
- * Note: no GLchan version of this function.
- */
-static void FETCH(f_z16)(const struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[0] = src[0] * (1.0F / 65535.0F);
-}
-
-#if DIM == 3
-static void store_texel_z16(struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLushort *depth = (const GLushort *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   dst[0] = *depth;
-}
-#endif
-
-
-/* MESA_FORMAT_RGBA_F32 ******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT32 texture, returning 4 GLfloats.
- */
-static void FETCH(f_rgba_f32)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 4);
-   texel[RCOMP] = src[0];
-   texel[GCOMP] = src[1];
-   texel[BCOMP] = src[2];
-   texel[ACOMP] = src[3];
-}
-
-#if DIM == 3
-static void store_texel_rgba_f32(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *depth = (const GLfloat *) texel;
-   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 4);
-   dst[0] = depth[RCOMP];
-   dst[1] = depth[GCOMP];
-   dst[2] = depth[BCOMP];
-   dst[3] = depth[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_RGBA_F16 ******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT16 texture,
- * returning 4 GLfloats.
- */
-static void FETCH(f_rgba_f16)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 4);
-   texel[RCOMP] = _mesa_half_to_float(src[0]);
-   texel[GCOMP] = _mesa_half_to_float(src[1]);
-   texel[BCOMP] = _mesa_half_to_float(src[2]);
-   texel[ACOMP] = _mesa_half_to_float(src[3]);
-}
-
-#if DIM == 3
-static void store_texel_rgba_f16(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *src = (const GLfloat *) texel;
-   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 4);
-   dst[0] = _mesa_float_to_half(src[RCOMP]);
-   dst[1] = _mesa_float_to_half(src[GCOMP]);
-   dst[2] = _mesa_float_to_half(src[BCOMP]);
-   dst[3] = _mesa_float_to_half(src[ACOMP]);
-}
-#endif
-
-/* MESA_FORMAT_RGB_F32 *******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D RGB_FLOAT32 texture,
- * returning 4 GLfloats.
- */
-static void FETCH(f_rgb_f32)( const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 3);
-   texel[RCOMP] = src[0];
-   texel[GCOMP] = src[1];
-   texel[BCOMP] = src[2];
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_rgb_f32(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *src = (const GLfloat *) texel;
-   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 3);
-   dst[0] = src[RCOMP];
-   dst[1] = src[GCOMP];
-   dst[2] = src[BCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_RGB_F16 *******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D RGB_FLOAT16 texture,
- * returning 4 GLfloats.
- */
-static void FETCH(f_rgb_f16)( const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 3);
-   texel[RCOMP] = _mesa_half_to_float(src[0]);
-   texel[GCOMP] = _mesa_half_to_float(src[1]);
-   texel[BCOMP] = _mesa_half_to_float(src[2]);
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_rgb_f16(struct gl_texture_image *texImage,
-                                GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *src = (const GLfloat *) texel;
-   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 3);
-   dst[0] = _mesa_float_to_half(src[RCOMP]);
-   dst[1] = _mesa_float_to_half(src[GCOMP]);
-   dst[2] = _mesa_float_to_half(src[BCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_ALPHA_F32 *****************************************************/
-
-/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT32 texture,
- * returning 4 GLfloats.
- */
-static void FETCH(f_alpha_f32)( const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = 0.0F;
-   texel[ACOMP] = src[0];
-}
-
-#if DIM == 3
-static void store_texel_alpha_f32(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *rgba = (const GLfloat *) texel;
-   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
-   dst[0] = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_ALPHA_F32 *****************************************************/
-
-/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT16 texture,
- * returning 4 GLfloats.
- */
-static void FETCH(f_alpha_f16)( const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = 0.0F;
-   texel[ACOMP] = _mesa_half_to_float(src[0]);
-}
-
-#if DIM == 3
-static void store_texel_alpha_f16(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *rgba = (const GLfloat *) texel;
-   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
-   dst[0] = _mesa_float_to_half(rgba[ACOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_LUMINANCE_F32 *************************************************/
-
-/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT32 texture,
- * returning 4 GLfloats.
- */
-static void FETCH(f_luminance_f32)( const struct gl_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = src[0];
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_luminance_f32(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *rgba = (const GLfloat *) texel;
-   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
-   dst[0] = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_LUMINANCE_F16 *************************************************/
-
-/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT16 texture,
- * returning 4 GLfloats.
- */
-static void FETCH(f_luminance_f16)( const struct gl_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = _mesa_half_to_float(src[0]);
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_luminance_f16(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *rgba = (const GLfloat *) texel;
-   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
-   dst[0] = _mesa_float_to_half(rgba[RCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_LUMINANCE_ALPHA_F32 *******************************************/
-
-/* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT32 texture,
- * returning 4 GLfloats.
- */
-static void FETCH(f_luminance_alpha_f32)( const struct gl_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = src[0];
-   texel[ACOMP] = src[1];
-}
-
-#if DIM == 3
-static void store_texel_luminance_alpha_f32(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *rgba = (const GLfloat *) texel;
-   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_LUMINANCE_ALPHA_F16 *******************************************/
-
-/* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT16 texture,
- * returning 4 GLfloats.
- */
-static void FETCH(f_luminance_alpha_f16)( const struct gl_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = _mesa_half_to_float(src[0]);
-   texel[ACOMP] = _mesa_half_to_float(src[1]);
-}
-
-#if DIM == 3
-static void store_texel_luminance_alpha_f16(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *rgba = (const GLfloat *) texel;
-   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2);
-   dst[0] = _mesa_float_to_half(rgba[RCOMP]);
-   dst[1] = _mesa_float_to_half(rgba[ACOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_INTENSITY_F32 *************************************************/
-
-/* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT32 texture,
- * returning 4 GLfloats.
- */
-static void FETCH(f_intensity_f32)( const struct gl_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] =
-   texel[ACOMP] = src[0];
-}
-
-#if DIM == 3
-static void store_texel_intensity_f32(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *rgba = (const GLfloat *) texel;
-   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
-   dst[0] = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_INTENSITY_F16 *************************************************/
-
-/* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT16 texture,
- * returning 4 GLfloats.
- */
-static void FETCH(f_intensity_f16)( const struct gl_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] =
-   texel[ACOMP] = _mesa_half_to_float(src[0]);
-}
-
-#if DIM == 3
-static void store_texel_intensity_f16(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLfloat *rgba = (const GLfloat *) texel;
-   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
-   dst[0] = _mesa_float_to_half(rgba[RCOMP]);
-}
-#endif
-
-
-
-
-/*
- * Begin Hardware formats
- */
-
-/* MESA_FORMAT_RGBA8888 ******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D rgba8888 texture, return 4 GLfloats */
-static void FETCH(f_rgba8888)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
-   texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
-   texel[BCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
-   texel[ACOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
-}
-
-
-
-#if DIM == 3
-static void store_texel_rgba8888(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_RGBA888_REV ***************************************************/
-
-/* Fetch texel from 1D, 2D or 3D abgr8888 texture, return 4 GLchans */
-static void FETCH(f_rgba8888_rev)( const struct gl_texture_image *texImage,
-                                   GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
-   texel[GCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
-   texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
-   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
-}
-
-#if DIM == 3
-static void store_texel_rgba8888_rev(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_8888_REV(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_ARGB8888 ******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D argb8888 texture, return 4 GLchans */
-static void FETCH(f_argb8888)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
-   texel[GCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
-   texel[BCOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
-   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
-}
-
-#if DIM == 3
-static void store_texel_argb8888(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_8888(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_ARGB8888_REV **************************************************/
-
-/* Fetch texel from 1D, 2D or 3D argb8888_rev texture, return 4 GLfloats */
-static void FETCH(f_argb8888_rev)( const struct gl_texture_image *texImage,
-                                   GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
-   texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
-   texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
-   texel[ACOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
-}
-
-#if DIM == 3
-static void store_texel_argb8888_rev(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_8888(rgba[BCOMP], rgba[GCOMP], rgba[RCOMP], rgba[ACOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_XRGB8888 ******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D xrgb8888 texture, return 4 GLchans */
-static void FETCH(f_xrgb8888)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
-   texel[GCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
-   texel[BCOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
-   texel[ACOMP] = 1.0f;
-}
-
-#if DIM == 3
-static void store_texel_xrgb8888(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_8888(0xff, rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_XRGB8888_REV **************************************************/
-
-/* Fetch texel from 1D, 2D or 3D xrgb8888_rev texture, return 4 GLfloats */
-static void FETCH(f_xrgb8888_rev)( const struct gl_texture_image *texImage,
-                                   GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
-   texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
-   texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
-   texel[ACOMP] = 1.0f;
-}
-
-#if DIM == 3
-static void store_texel_xrgb8888_rev(struct gl_texture_image *texImage,
-                                     GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_8888(rgba[BCOMP], rgba[GCOMP], rgba[RCOMP], 0xff);
-}
-#endif
-
-
-/* MESA_FORMAT_RGB888 ********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D rgb888 texture, return 4 GLchans */
-static void FETCH(f_rgb888)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   texel[RCOMP] = UBYTE_TO_FLOAT( src[2] );
-   texel[GCOMP] = UBYTE_TO_FLOAT( src[1] );
-   texel[BCOMP] = UBYTE_TO_FLOAT( src[0] );
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_rgb888(struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   dst[0] = rgba[BCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_BGR888 ********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D bgr888 texture, return 4 GLchans */
-static void FETCH(f_bgr888)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   texel[RCOMP] = UBYTE_TO_FLOAT( src[0] );
-   texel[GCOMP] = UBYTE_TO_FLOAT( src[1] );
-   texel[BCOMP] = UBYTE_TO_FLOAT( src[2] );
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_bgr888(struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
-}
-#endif
-
-
-/* use color expansion like (g << 2) | (g >> 4) (does somewhat random rounding)
-   instead of slow (g << 2) * 255 / 252 (always rounds down) */
-
-/* MESA_FORMAT_RGB565 ********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D rgb565 texture, return 4 GLchans */
-static void FETCH(f_rgb565)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   const GLushort s = *src;
-   texel[RCOMP] = ((s >> 11) & 0x1f) * (1.0F / 31.0F);
-   texel[GCOMP] = ((s >> 5 ) & 0x3f) * (1.0F / 63.0F);
-   texel[BCOMP] = ((s      ) & 0x1f) * (1.0F / 31.0F);
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_rgb565(struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_565(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_RGB565_REV ****************************************************/
-
-/* Fetch texel from 1D, 2D or 3D rgb565_rev texture, return 4 GLchans */
-static void FETCH(f_rgb565_rev)( const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   const GLushort s = (*src >> 8) | (*src << 8); /* byte swap */
-   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >> 8) & 0xf8) | ((s >> 13) & 0x7) );
-   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >> 3) & 0xfc) | ((s >>  9) & 0x3) );
-   texel[BCOMP] = UBYTE_TO_FLOAT( ((s << 3) & 0xf8) | ((s >>  2) & 0x7) );
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_rgb565_rev(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_565(rgba[BCOMP], rgba[GCOMP], rgba[RCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_ARGB4444 ******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D argb444 texture, return 4 GLchans */
-static void FETCH(f_argb4444)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   const GLushort s = *src;
-   texel[RCOMP] = ((s >>  8) & 0xf) * (1.0F / 15.0F);
-   texel[GCOMP] = ((s >>  4) & 0xf) * (1.0F / 15.0F);
-   texel[BCOMP] = ((s      ) & 0xf) * (1.0F / 15.0F);
-   texel[ACOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F);
-}
-
-#if DIM == 3
-static void store_texel_argb4444(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_4444(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_ARGB4444_REV **************************************************/
-
-/* Fetch texel from 1D, 2D or 3D argb4444_rev texture, return 4 GLchans */
-static void FETCH(f_argb4444_rev)( const struct gl_texture_image *texImage,
-                                   GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = ((s      ) & 0xf) * (1.0F / 15.0F);
-   texel[GCOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F);
-   texel[BCOMP] = ((s >>  8) & 0xf) * (1.0F / 15.0F);
-   texel[ACOMP] = ((s >>  4) & 0xf) * (1.0F / 15.0F);
-}
-
-#if DIM == 3
-static void store_texel_argb4444_rev(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_4444(rgba[ACOMP], rgba[BCOMP], rgba[GCOMP], rgba[RCOMP]);
-}
-#endif
-
-/* MESA_FORMAT_RGBA5551 ******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D argb1555 texture, return 4 GLchans */
-static void FETCH(f_rgba5551)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   const GLushort s = *src;
-   texel[RCOMP] = ((s >> 11) & 0x1f) * (1.0F / 31.0F);
-   texel[GCOMP] = ((s >>  6) & 0x1f) * (1.0F / 31.0F);
-   texel[BCOMP] = ((s >>  1) & 0x1f) * (1.0F / 31.0F);
-   texel[ACOMP] = ((s      ) & 0x01) * 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_rgba5551(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_5551(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);
-}
-#endif
-
-/* MESA_FORMAT_ARGB1555 ******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D argb1555 texture, return 4 GLchans */
-static void FETCH(f_argb1555)( const struct gl_texture_image *texImage,
-			     GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   const GLushort s = *src;
-   texel[RCOMP] = ((s >> 10) & 0x1f) * (1.0F / 31.0F);
-   texel[GCOMP] = ((s >>  5) & 0x1f) * (1.0F / 31.0F);
-   texel[BCOMP] = ((s >>  0) & 0x1f) * (1.0F / 31.0F);
-   texel[ACOMP] = ((s >> 15) & 0x01) * 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_argb1555(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_1555(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_ARGB1555_REV **************************************************/
-
-/* Fetch texel from 1D, 2D or 3D argb1555_rev texture, return 4 GLchans */
-static void FETCH(f_argb1555_rev)( const struct gl_texture_image *texImage,
-                                   GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   const GLushort s = (*src << 8) | (*src >> 8); /* byteswap */
-   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >>  7) & 0xf8) | ((s >> 12) & 0x7) );
-   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >>  2) & 0xf8) | ((s >>  7) & 0x7) );
-   texel[BCOMP] = UBYTE_TO_FLOAT( ((s <<  3) & 0xf8) | ((s >>  2) & 0x7) );
-   texel[ACOMP] = UBYTE_TO_FLOAT( ((s >> 15) & 0x01) * 255 );
-}
-
-#if DIM == 3
-static void store_texel_argb1555_rev(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_1555_REV(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_ARGB2101010 ***************************************************/
-
-/* Fetch texel from 1D, 2D or 3D argb2101010 texture, return 4 GLchans */
-static void FETCH(f_argb2101010)( const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   const GLuint s = *src;
-   texel[RCOMP] = ((s >> 20) & 0x3ff) * (1.0F / 1023.0F);
-   texel[GCOMP] = ((s >> 10) & 0x3ff) * (1.0F / 1023.0F);
-   texel[BCOMP] = ((s >>  0) & 0x3ff) * (1.0F / 1023.0F);
-   texel[ACOMP] = ((s >> 30) & 0x03) * (1.0F / 3.0F);
-}
-
-#if DIM == 3
-static void store_texel_argb2101010(struct gl_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_2101010_UB(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_RG88 **********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D rg88 texture, return 4 GLchans */
-static void FETCH(f_rg88)( const struct gl_texture_image *texImage,
-                           GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( s & 0xff );
-   texel[GCOMP] = UBYTE_TO_FLOAT( s >> 8 );
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = 1.0;
-}
-
-#if DIM == 3
-static void store_texel_rg88(struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_88(rgba[RCOMP], rgba[GCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_RG88_REV ******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D rg88_rev texture, return 4 GLchans */
-static void FETCH(f_rg88_rev)( const struct gl_texture_image *texImage,
-                           GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( s & 0xff );
-   texel[GCOMP] = UBYTE_TO_FLOAT( s >> 8 );
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = 1.0;
-}
-
-#if DIM == 3
-static void store_texel_rg88_rev(struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_88(rgba[GCOMP], rgba[RCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_AL44 **********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D al44 texture, return 4 GLchans */
-static void FETCH(f_al44)( const struct gl_texture_image *texImage,
-                           GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte s = *TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = (s & 0xf) * (1.0F / 15.0F);
-   texel[ACOMP] = ((s >> 4) & 0xf) * (1.0F / 15.0F);
-}
-
-#if DIM == 3
-static void store_texel_al44(struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_44(rgba[ACOMP], rgba[RCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_AL88 **********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D al88 texture, return 4 GLchans */
-static void FETCH(f_al88)( const struct gl_texture_image *texImage,
-                           GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = 
-   texel[GCOMP] = 
-   texel[BCOMP] = UBYTE_TO_FLOAT( s & 0xff );
-   texel[ACOMP] = UBYTE_TO_FLOAT( s >> 8 );
-}
-
-#if DIM == 3
-static void store_texel_al88(struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_88(rgba[ACOMP], rgba[RCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_R8 ************************************************************/
-
-/* Fetch texel from 1D, 2D or 3D rg88 texture, return 4 GLchans */
-static void FETCH(f_r8)(const struct gl_texture_image *texImage,
-			GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   const GLubyte s = *TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT(s);
-   texel[GCOMP] = 0.0;
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = 1.0;
-}
-
-#if DIM == 3
-static void store_texel_r8(struct gl_texture_image *texImage,
-			   GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_R16 ***********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D r16 texture, return 4 GLchans */
-static void FETCH(f_r16)(const struct gl_texture_image *texImage,
-			GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = USHORT_TO_FLOAT(s);
-   texel[GCOMP] = 0.0;
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = 1.0;
-}
-
-#if DIM == 3
-static void store_texel_r16(struct gl_texture_image *texImage,
-			    GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLushort *rgba = (const GLushort *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_AL88_REV ******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D al88_rev texture, return 4 GLchans */
-static void FETCH(f_al88_rev)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = 
-   texel[GCOMP] = 
-   texel[BCOMP] = UBYTE_TO_FLOAT( s >> 8 );
-   texel[ACOMP] = UBYTE_TO_FLOAT( s & 0xff );
-}
-
-#if DIM == 3
-static void store_texel_al88_rev(struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_88(rgba[RCOMP], rgba[ACOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_RG1616 ********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D rg1616 texture, return 4 GLchans */
-static void FETCH(f_rg1616)( const struct gl_texture_image *texImage,
-                           GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = USHORT_TO_FLOAT( s & 0xffff );
-   texel[GCOMP] = USHORT_TO_FLOAT( s >> 16 );
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = 1.0;
-}
-
-#if DIM == 3
-static void store_texel_rg1616(struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_1616(rgba[RCOMP], rgba[GCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_RG1616_REV ****************************************************/
-
-/* Fetch texel from 1D, 2D or 3D rg1616_rev texture, return 4 GLchans */
-static void FETCH(f_rg1616_rev)( const struct gl_texture_image *texImage,
-                           GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = USHORT_TO_FLOAT( s >> 16 );
-   texel[GCOMP] = USHORT_TO_FLOAT( s & 0xffff );
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = 1.0;
-}
-
-#if DIM == 3
-static void store_texel_rg1616_rev(struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_1616(rgba[GCOMP], rgba[RCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_AL1616 ********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D al1616 texture, return 4 GLchans */
-static void FETCH(f_al1616)( const struct gl_texture_image *texImage,
-			     GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = USHORT_TO_FLOAT( s & 0xffff );
-   texel[ACOMP] = USHORT_TO_FLOAT( s >> 16 );
-}
-
-#if DIM == 3
-static void store_texel_al1616(struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLushort *rgba = (const GLushort *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_1616(rgba[ACOMP], rgba[RCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_AL1616_REV ****************************************************/
-
-/* Fetch texel from 1D, 2D or 3D al1616_rev texture, return 4 GLchans */
-static void FETCH(f_al1616_rev)( const struct gl_texture_image *texImage,
-				 GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = USHORT_TO_FLOAT( s >> 16 );
-   texel[ACOMP] = USHORT_TO_FLOAT( s & 0xffff );
-}
-
-#if DIM == 3
-static void store_texel_al1616_rev(struct gl_texture_image *texImage,
-				   GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLushort *rgba = (const GLushort *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_1616(rgba[RCOMP], rgba[ACOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_RGB332 ********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D rgb332 texture, return 4 GLchans */
-static void FETCH(f_rgb332)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   const GLubyte s = *src;
-   texel[RCOMP] = ((s >> 5) & 0x7) * (1.0F / 7.0F);
-   texel[GCOMP] = ((s >> 2) & 0x7) * (1.0F / 7.0F);
-   texel[BCOMP] = ((s     ) & 0x3) * (1.0F / 3.0F);
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_rgb332(struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_332(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_A8 ************************************************************/
-
-/* Fetch texel from 1D, 2D or 3D a8 texture, return 4 GLchans */
-static void FETCH(f_a8)( const struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = 0.0F;
-   texel[ACOMP] = UBYTE_TO_FLOAT( src[0] );
-}
-
-#if DIM == 3
-static void store_texel_a8(struct gl_texture_image *texImage,
-                           GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   *dst = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_A16 ************************************************************/
-
-/* Fetch texel from 1D, 2D or 3D a8 texture, return 4 GLchans */
-static void FETCH(f_a16)( const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = 0.0F;
-   texel[ACOMP] = USHORT_TO_FLOAT( src[0] );
-}
-
-#if DIM == 3
-static void store_texel_a16(struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLushort *rgba = (const GLushort *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_L8 ************************************************************/
-
-/* Fetch texel from 1D, 2D or 3D l8 texture, return 4 GLchans */
-static void FETCH(f_l8)( const struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = UBYTE_TO_FLOAT( src[0] );
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_l8(struct gl_texture_image *texImage,
-                           GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_L16 ***********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D l16 texture, return 4 GLchans */
-static void FETCH(f_l16)( const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = USHORT_TO_FLOAT( src[0] );
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_l16(struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLushort *rgba = (const GLushort *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_I8 ************************************************************/
-
-/* Fetch texel from 1D, 2D or 3D i8 texture, return 4 GLchans */
-static void FETCH(f_i8)( const struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] =
-   texel[ACOMP] = UBYTE_TO_FLOAT( src[0] );
-}
-
-#if DIM == 3
-static void store_texel_i8(struct gl_texture_image *texImage,
-                           GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_I16 ***********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D i16 texture, return 4 GLchans */
-static void FETCH(f_i16)( const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] =
-   texel[ACOMP] = USHORT_TO_FLOAT( src[0] );
-}
-
-#if DIM == 3
-static void store_texel_i16(struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLushort *rgba = (const GLushort *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_CI8 ***********************************************************/
-
-/* Fetch CI texel from 1D, 2D or 3D ci8 texture, lookup the index in a
- * color table, and return 4 GLchans.
- */
-static void FETCH(f_ci8)( const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   const struct gl_color_table *palette;
-   GLuint index;
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (ctx->Texture.SharedPalette) {
-      palette = &ctx->Texture.Palette;
-   }
-   else {
-      palette = &texImage->TexObject->Palette;
-   }
-   if (palette->Size == 0)
-      return; /* undefined results */
-
-   /* Mask the index against size of palette to avoid going out of bounds */
-   index = (*src) & (palette->Size - 1);
-
-   {
-      const GLfloat *table = palette->TableF;
-      switch (palette->_BaseFormat) {
-      case GL_ALPHA:
-         texel[RCOMP] =
-         texel[GCOMP] =
-         texel[BCOMP] = 0.0F;
-         texel[ACOMP] = table[index];
-         break;
-      case GL_LUMINANCE:
-         texel[RCOMP] =
-         texel[GCOMP] =
-         texel[BCOMP] = table[index];
-         texel[ACOMP] = 1.0F;
-         break;
-      case GL_INTENSITY:
-         texel[RCOMP] =
-         texel[GCOMP] =
-         texel[BCOMP] =
-         texel[ACOMP] = table[index];
-         break;
-      case GL_LUMINANCE_ALPHA:
-         texel[RCOMP] =
-         texel[GCOMP] =
-         texel[BCOMP] = table[index * 2 + 0];
-         texel[ACOMP] = table[index * 2 + 1];
-         break;
-      case GL_RGB:
-         texel[RCOMP] = table[index * 3 + 0];
-         texel[GCOMP] = table[index * 3 + 1];
-         texel[BCOMP] = table[index * 3 + 2];
-         texel[ACOMP] = 1.0F;
-         break;
-      case GL_RGBA:
-         texel[RCOMP] = table[index * 4 + 0];
-         texel[GCOMP] = table[index * 4 + 1];
-         texel[BCOMP] = table[index * 4 + 2];
-         texel[ACOMP] = table[index * 4 + 3];
-         break;
-      default:
-         _mesa_problem(ctx, "Bad palette format in fetch_texel_ci8");
-         return;
-      }
-   }
-}
-
-#if DIM == 3
-static void store_texel_ci8(struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *index = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   *dst = *index;
-}
-#endif
-
-
-/* Fetch texel from 1D, 2D or 3D srgb8 texture, return 4 GLfloats */
-/* Note: component order is same as for MESA_FORMAT_RGB888 */
-static void FETCH(srgb8)(const struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   texel[RCOMP] = nonlinear_to_linear(src[2]);
-   texel[GCOMP] = nonlinear_to_linear(src[1]);
-   texel[BCOMP] = nonlinear_to_linear(src[0]);
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_srgb8(struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   dst[0] = rgba[BCOMP]; /* no conversion */
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[RCOMP];
-}
-#endif
-
-/* Fetch texel from 1D, 2D or 3D srgba8 texture, return 4 GLfloats */
-static void FETCH(srgba8)(const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = nonlinear_to_linear( (s >> 24) );
-   texel[GCOMP] = nonlinear_to_linear( (s >> 16) & 0xff );
-   texel[BCOMP] = nonlinear_to_linear( (s >>  8) & 0xff );
-   texel[ACOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff ); /* linear! */
-}
-
-#if DIM == 3
-static void store_texel_srgba8(struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);
-}
-#endif
-
-/* Fetch texel from 1D, 2D or 3D sargb8 texture, return 4 GLfloats */
-static void FETCH(sargb8)(const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = nonlinear_to_linear( (s >> 16) & 0xff );
-   texel[GCOMP] = nonlinear_to_linear( (s >>  8) & 0xff );
-   texel[BCOMP] = nonlinear_to_linear( (s      ) & 0xff );
-   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24) ); /* linear! */
-}
-
-#if DIM == 3
-static void store_texel_sargb8(struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_8888(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
-}
-#endif
-
-/* Fetch texel from 1D, 2D or 3D sl8 texture, return 4 GLfloats */
-static void FETCH(sl8)(const struct gl_texture_image *texImage,
-                       GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   texel[RCOMP] = 
-   texel[GCOMP] = 
-   texel[BCOMP] = nonlinear_to_linear(src[0]);
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_sl8(struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   dst[0] = rgba[RCOMP];
-}
-#endif
-
-/* Fetch texel from 1D, 2D or 3D sla8 texture, return 4 GLfloats */
-static void FETCH(sla8)(const struct gl_texture_image *texImage,
-                       GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 2);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = nonlinear_to_linear(src[0]);
-   texel[ACOMP] = UBYTE_TO_FLOAT(src[1]); /* linear */
-}
-
-#if DIM == 3
-static void store_texel_sla8(struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 2);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_RGBA_INT8 **************************************************/
-
-static void
-FETCH(rgba_int8)(const struct gl_texture_image *texImage,
-                 GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLbyte *src = TEXEL_ADDR(GLbyte, texImage, i, j, k, 4);
-   texel[RCOMP] = (GLfloat) src[0];
-   texel[GCOMP] = (GLfloat) src[1];
-   texel[BCOMP] = (GLfloat) src[2];
-   texel[ACOMP] = (GLfloat) src[3];
-}
-
-#if DIM == 3
-static void
-store_texel_rgba_int8(struct gl_texture_image *texImage,
-                      GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLbyte *rgba = (const GLbyte *) texel;
-   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 4);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
-   dst[3] = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_RGBA_INT16 **************************************************/
-
-static void
-FETCH(rgba_int16)(const struct gl_texture_image *texImage,
-                  GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLshort *src = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);
-   texel[RCOMP] = (GLfloat) src[0];
-   texel[GCOMP] = (GLfloat) src[1];
-   texel[BCOMP] = (GLfloat) src[2];
-   texel[ACOMP] = (GLfloat) src[3];
-}
-
-#if DIM == 3
-static void
-store_texel_rgba_int16(struct gl_texture_image *texImage,
-                       GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLshort *rgba = (const GLshort *) texel;
-   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
-   dst[3] = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_RGBA_INT32 **************************************************/
-
-static void
-FETCH(rgba_int32)(const struct gl_texture_image *texImage,
-                  GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLint *src = TEXEL_ADDR(GLint, texImage, i, j, k, 4);
-   texel[RCOMP] = (GLfloat) src[0];
-   texel[GCOMP] = (GLfloat) src[1];
-   texel[BCOMP] = (GLfloat) src[2];
-   texel[ACOMP] = (GLfloat) src[3];
-}
-
-#if DIM == 3
-static void
-store_texel_rgba_int32(struct gl_texture_image *texImage,
-                       GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLint *rgba = (const GLint *) texel;
-   GLint *dst = TEXEL_ADDR(GLint, texImage, i, j, k, 4);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
-   dst[3] = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_RGBA_UINT8 **************************************************/
-
-static void
-FETCH(rgba_uint8)(const struct gl_texture_image *texImage,
-                 GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);
-   texel[RCOMP] = (GLfloat) src[0];
-   texel[GCOMP] = (GLfloat) src[1];
-   texel[BCOMP] = (GLfloat) src[2];
-   texel[ACOMP] = (GLfloat) src[3];
-}
-
-#if DIM == 3
-static void
-store_texel_rgba_uint8(struct gl_texture_image *texImage,
-                      GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
-   dst[3] = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_RGBA_UINT16 **************************************************/
-
-static void
-FETCH(rgba_uint16)(const struct gl_texture_image *texImage,
-                  GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);
-   texel[RCOMP] = (GLfloat) src[0];
-   texel[GCOMP] = (GLfloat) src[1];
-   texel[BCOMP] = (GLfloat) src[2];
-   texel[ACOMP] = (GLfloat) src[3];
-}
-
-#if DIM == 3
-static void
-store_texel_rgba_uint16(struct gl_texture_image *texImage,
-                       GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLushort *rgba = (const GLushort *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
-   dst[3] = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_RGBA_UINT32 **************************************************/
-
-static void
-FETCH(rgba_uint32)(const struct gl_texture_image *texImage,
-                  GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 4);
-   texel[RCOMP] = (GLfloat) src[0];
-   texel[GCOMP] = (GLfloat) src[1];
-   texel[BCOMP] = (GLfloat) src[2];
-   texel[ACOMP] = (GLfloat) src[3];
-}
-
-#if DIM == 3
-static void
-store_texel_rgba_uint32(struct gl_texture_image *texImage,
-                       GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLuint *rgba = (const GLuint *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 4);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
-   dst[3] = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_DUDV8 ********************************************************/
-
-/* this format by definition produces 0,0,0,1 as rgba values,
-   however we'll return the dudv values as rg and fix up elsewhere */
-static void FETCH(dudv8)(const struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLbyte *src = TEXEL_ADDR(GLbyte, texImage, i, j, k, 2);
-   texel[RCOMP] = BYTE_TO_FLOAT(src[0]);
-   texel[GCOMP] = BYTE_TO_FLOAT(src[1]);
-   texel[BCOMP] = 0;
-   texel[ACOMP] = 0;
-}
-
-
-/* MESA_FORMAT_SIGNED_R8 ***********************************************/
-
-static void FETCH(signed_r8)( const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
-   texel[RCOMP] = BYTE_TO_FLOAT_TEX( s );
-   texel[GCOMP] = 0.0F;
-   texel[BCOMP] = 0.0F;
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_signed_r8(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLbyte *rgba = (const GLbyte *) texel;
-   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_A8 ***********************************************/
-
-static void FETCH(signed_a8)( const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
-   texel[RCOMP] = 0.0F;
-   texel[GCOMP] = 0.0F;
-   texel[BCOMP] = 0.0F;
-   texel[ACOMP] = BYTE_TO_FLOAT_TEX( s );
-}
-
-#if DIM == 3
-static void store_texel_signed_a8(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLbyte *rgba = (const GLbyte *) texel;
-   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
-   *dst = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_L8 ***********************************************/
-
-static void FETCH(signed_l8)( const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = BYTE_TO_FLOAT_TEX( s );
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_signed_l8(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLbyte *rgba = (const GLbyte *) texel;
-   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_I8 ***********************************************/
-
-static void FETCH(signed_i8)( const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] =
-   texel[ACOMP] = BYTE_TO_FLOAT_TEX( s );
-}
-
-#if DIM == 3
-static void store_texel_signed_i8(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLbyte *rgba = (const GLbyte *) texel;
-   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_RG88_REV ***********************************************/
-
-static void FETCH(signed_rg88_rev)( const struct gl_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
-   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s & 0xff) );
-   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 8) );
-   texel[BCOMP] = 0.0F;
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_signed_rg88_rev(struct gl_texture_image *texImage,
-                                        GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLbyte *rg = (const GLbyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   dst[0] = PACK_COLOR_88(rg[GCOMP], rg[RCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_AL88 ***********************************************/
-
-static void FETCH(signed_al88)( const struct gl_texture_image *texImage,
-                                GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s & 0xff) );
-   texel[ACOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 8) );
-}
-
-#if DIM == 3
-static void store_texel_signed_al88(struct gl_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLbyte *rg = (const GLbyte *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   dst[0] = PACK_COLOR_88(rg[ACOMP], rg[RCOMP]);
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_RGBX8888 ***********************************************/
-
-static void FETCH(signed_rgbx8888)( const struct gl_texture_image *texImage,
-			            GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 24) );
-   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 16) );
-   texel[BCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >>  8) );
-   texel[ACOMP] = 1.0f;
-}
-
-#if DIM == 3
-static void store_texel_signed_rgbx8888(struct gl_texture_image *texImage,
-                                        GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLbyte *rgba = (const GLbyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], 255);
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_RGBA8888 ***********************************************/
-
-static void FETCH(signed_rgba8888)( const struct gl_texture_image *texImage,
-			            GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 24) );
-   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 16) );
-   texel[BCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >>  8) );
-   texel[ACOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s      ) );
-}
-
-#if DIM == 3
-static void store_texel_signed_rgba8888(struct gl_texture_image *texImage,
-                                        GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLbyte *rgba = (const GLbyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);
-}
-#endif
-
-static void FETCH(signed_rgba8888_rev)( const struct gl_texture_image *texImage,
-                                        GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s      ) );
-   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >>  8) );
-   texel[BCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 16) );
-   texel[ACOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 24) );
-}
-
-#if DIM == 3
-static void store_texel_signed_rgba8888_rev(struct gl_texture_image *texImage,
-                                            GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLubyte *rgba = (const GLubyte *) texel;
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   *dst = PACK_COLOR_8888_REV(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);
-}
-#endif
-
-
-
-/* MESA_FORMAT_SIGNED_R16 ***********************************************/
-
-static void
-FETCH(signed_r16)(const struct gl_texture_image *texImage,
-                  GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
-   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s );
-   texel[GCOMP] = 0.0F;
-   texel[BCOMP] = 0.0F;
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void
-store_texel_signed_r16(struct gl_texture_image *texImage,
-                       GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLshort *rgba = (const GLshort *) texel;
-   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
-   *dst = rgba[0];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_A16 ***********************************************/
-
-static void
-FETCH(signed_a16)(const struct gl_texture_image *texImage,
-                  GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
-   texel[RCOMP] = 0.0F;
-   texel[GCOMP] = 0.0F;
-   texel[BCOMP] = 0.0F;
-   texel[ACOMP] = SHORT_TO_FLOAT_TEX( s );
-}
-
-#if DIM == 3
-static void
-store_texel_signed_a16(struct gl_texture_image *texImage,
-                       GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLshort *rgba = (const GLshort *) texel;
-   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
-   *dst = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_L16 ***********************************************/
-
-static void
-FETCH(signed_l16)(const struct gl_texture_image *texImage,
-                  GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = SHORT_TO_FLOAT_TEX( s );
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void
-store_texel_signed_l16(struct gl_texture_image *texImage,
-                       GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLshort *rgba = (const GLshort *) texel;
-   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_I16 ***********************************************/
-
-static void
-FETCH(signed_i16)(const struct gl_texture_image *texImage,
-                  GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] =
-   texel[ACOMP] = SHORT_TO_FLOAT_TEX( s );
-}
-
-#if DIM == 3
-static void
-store_texel_signed_i16(struct gl_texture_image *texImage,
-                       GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLshort *rgba = (const GLshort *) texel;
-   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_RG1616 ***********************************************/
-
-static void
-FETCH(signed_rg1616)(const struct gl_texture_image *texImage,
-                    GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 2);
-   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s[0] );
-   texel[GCOMP] = SHORT_TO_FLOAT_TEX( s[1] );
-   texel[BCOMP] = 0.0F;
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void
-store_texel_signed_rg1616(struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLshort *rgba = (const GLshort *) texel;
-   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 2);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_AL1616 ***********************************************/
-
-static void
-FETCH(signed_al1616)(const struct gl_texture_image *texImage,
-                    GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 2);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[0] );
-   texel[ACOMP] = SHORT_TO_FLOAT_TEX( s[1] );
-}
-
-#if DIM == 3
-static void
-store_texel_signed_al1616(struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLshort *rgba = (const GLshort *) texel;
-   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 2);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[ACOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_RGB_16 ***********************************************/
-
-static void 
-FETCH(signed_rgb_16)(const struct gl_texture_image *texImage,
-                     GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 3);
-   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s[0] );
-   texel[GCOMP] = SHORT_TO_FLOAT_TEX( s[1] );
-   texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[2] );
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void
-store_texel_signed_rgb_16(struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLshort *rgba = (const GLshort *) texel;
-   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 3);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_RGBA_16 ***********************************************/
-
-static void
-FETCH(signed_rgba_16)(const struct gl_texture_image *texImage,
-                      GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);
-   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s[0] );
-   texel[GCOMP] = SHORT_TO_FLOAT_TEX( s[1] );
-   texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[2] );
-   texel[ACOMP] = SHORT_TO_FLOAT_TEX( s[3] );
-}
-
-#if DIM == 3
-static void
-store_texel_signed_rgba_16(struct gl_texture_image *texImage,
-                           GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLshort *rgba = (const GLshort *) texel;
-   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
-   dst[3] = rgba[ACOMP];
-}
-#endif
-
-
-
-/* MESA_FORMAT_RGBA_16 ***********************************************/
-
-static void
-FETCH(rgba_16)(const struct gl_texture_image *texImage,
-               GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   const GLushort *s = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);
-   texel[RCOMP] = USHORT_TO_FLOAT( s[0] );
-   texel[GCOMP] = USHORT_TO_FLOAT( s[1] );
-   texel[BCOMP] = USHORT_TO_FLOAT( s[2] );
-   texel[ACOMP] = USHORT_TO_FLOAT( s[3] );
-}
-
-#if DIM == 3
-static void
-store_texel_rgba_16(struct gl_texture_image *texImage,
-                    GLint i, GLint j, GLint k, const void *texel)
-{
-   const GLushort *rgba = (const GLushort *) texel;
-   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-   dst[2] = rgba[BCOMP];
-   dst[3] = rgba[ACOMP];
-}
-#endif
-
-
-
-/* MESA_FORMAT_YCBCR *********************************************************/
-
-/* Fetch texel from 1D, 2D or 3D ycbcr texture, return 4 GLfloats.
- * We convert YCbCr to RGB here.
- */
-static void FETCH(f_ycbcr)( const struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */
-   const GLushort *src1 = src0 + 1;                               /* odd */
-   const GLubyte y0 = (*src0 >> 8) & 0xff;  /* luminance */
-   const GLubyte cb = *src0 & 0xff;         /* chroma U */
-   const GLubyte y1 = (*src1 >> 8) & 0xff;  /* luminance */
-   const GLubyte cr = *src1 & 0xff;         /* chroma V */
-   const GLubyte y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */
-   GLfloat r = 1.164F * (y - 16) + 1.596F * (cr - 128);
-   GLfloat g = 1.164F * (y - 16) - 0.813F * (cr - 128) - 0.391F * (cb - 128);
-   GLfloat b = 1.164F * (y - 16) + 2.018F * (cb - 128);
-   r *= (1.0F / 255.0F);
-   g *= (1.0F / 255.0F);
-   b *= (1.0F / 255.0F);
-   texel[RCOMP] = CLAMP(r, 0.0F, 1.0F);
-   texel[GCOMP] = CLAMP(g, 0.0F, 1.0F);
-   texel[BCOMP] = CLAMP(b, 0.0F, 1.0F);
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_ycbcr(struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, const void *texel)
-{
-   (void) texImage;
-   (void) i;
-   (void) j;
-   (void) k;
-   (void) texel;
-   /* XXX to do */
-}
-#endif
-
-
-/* MESA_FORMAT_YCBCR_REV *****************************************************/
-
-/* Fetch texel from 1D, 2D or 3D ycbcr_rev texture, return 4 GLfloats.
- * We convert YCbCr to RGB here.
- */
-static void FETCH(f_ycbcr_rev)( const struct gl_texture_image *texImage,
-                                GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */
-   const GLushort *src1 = src0 + 1;                               /* odd */
-   const GLubyte y0 = *src0 & 0xff;         /* luminance */
-   const GLubyte cr = (*src0 >> 8) & 0xff;  /* chroma V */
-   const GLubyte y1 = *src1 & 0xff;         /* luminance */
-   const GLubyte cb = (*src1 >> 8) & 0xff;  /* chroma U */
-   const GLubyte y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */
-   GLfloat r = 1.164F * (y - 16) + 1.596F * (cr - 128);
-   GLfloat g = 1.164F * (y - 16) - 0.813F * (cr - 128) - 0.391F * (cb - 128);
-   GLfloat b = 1.164F * (y - 16) + 2.018F * (cb - 128);
-   r *= (1.0F / 255.0F);
-   g *= (1.0F / 255.0F);
-   b *= (1.0F / 255.0F);
-   texel[RCOMP] = CLAMP(r, 0.0F, 1.0F);
-   texel[GCOMP] = CLAMP(g, 0.0F, 1.0F);
-   texel[BCOMP] = CLAMP(b, 0.0F, 1.0F);
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_ycbcr_rev(struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, const void *texel)
-{
-   (void) texImage;
-   (void) i;
-   (void) j;
-   (void) k;
-   (void) texel;
-   /* XXX to do */
-}
-#endif
-
-
-/* MESA_TEXFORMAT_Z24_S8 ***************************************************/
-
-static void FETCH(f_z24_s8)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   /* only return Z, not stencil data */
-   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   const GLfloat scale = 1.0F / (GLfloat) 0xffffff;
-   texel[0] = ((*src) >> 8) * scale;
-   ASSERT(texImage->TexFormat == MESA_FORMAT_Z24_S8);
-   ASSERT(texel[0] >= 0.0F);
-   ASSERT(texel[0] <= 1.0F);
-}
-
-#if DIM == 3
-static void store_texel_z24_s8(struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, const void *texel)
-{
-   /* only store Z, not stencil */
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   GLfloat depth = *((GLfloat *) texel);
-   GLuint zi = ((GLuint) (depth * 0xffffff)) << 8;
-   *dst = zi | (*dst & 0xff);
-}
-#endif
-
-
-/* MESA_TEXFORMAT_S8_Z24 ***************************************************/
-
-static void FETCH(f_s8_z24)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   /* only return Z, not stencil data */
-   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   const GLfloat scale = 1.0F / (GLfloat) 0xffffff;
-   texel[0] = ((*src) & 0x00ffffff) * scale;
-   ASSERT(texImage->TexFormat == MESA_FORMAT_S8_Z24);
-   ASSERT(texel[0] >= 0.0F);
-   ASSERT(texel[0] <= 1.0F);
-}
-
-#if DIM == 3
-static void store_texel_s8_z24(struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, const void *texel)
-{
-   /* only store Z, not stencil */
-   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   GLfloat depth = *((GLfloat *) texel);
-   GLuint zi = (GLuint) (depth * 0xffffff);
-   *dst = zi | (*dst & 0xff000000);
-}
-#endif
-
-
-#undef TEXEL_ADDR
-#undef DIM
-#undef FETCH
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.7

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (c) 2008-2009  VMware, Inc.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file texfetch_tmp.h

+ * Texel fetch functions template.

+ * 

+ * This template file is used by texfetch.c to generate texel fetch functions

+ * for 1-D, 2-D and 3-D texture images. 

+ *

+ * It should be expanded by defining \p DIM as the number texture dimensions

+ * (1, 2 or 3).  According to the value of \p DIM a series of macros is defined

+ * for the texel lookup in the gl_texture_image::Data.

+ * 

+ * \author Gareth Hughes

+ * \author Brian Paul

+ */

+

+

+#if DIM == 1

+

+#define TEXEL_ADDR( type, image, i, j, k, size ) \

+	((void) (j), (void) (k), ((type *)(image)->Data + (i) * (size)))

+

+#define FETCH(x) fetch_texel_1d_##x

+

+#elif DIM == 2

+

+#define TEXEL_ADDR( type, image, i, j, k, size )			\

+	((void) (k),							\

+	 ((type *)(image)->Data + ((image)->RowStride * (j) + (i)) * (size)))

+

+#define FETCH(x) fetch_texel_2d_##x

+

+#elif DIM == 3

+

+#define TEXEL_ADDR( type, image, i, j, k, size )			\

+	((type *)(image)->Data + ((image)->ImageOffsets[k]		\

+             + (image)->RowStride * (j) + (i)) * (size))

+

+#define FETCH(x) fetch_texel_3d_##x

+

+#else

+#error	illegal number of texture dimensions

+#endif

+

+

+/* MESA_FORMAT_Z32 ***********************************************************/

+

+/* Fetch depth texel from 1D, 2D or 3D 32-bit depth texture,

+ * returning 1 GLfloat.

+ * Note: no GLchan version of this function.

+ */

+static void FETCH(f_z32)( const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[0] = src[0] * (1.0F / 0xffffffff);

+}

+

+#if DIM == 3

+static void store_texel_z32(struct gl_texture_image *texImage,

+                            GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLuint *depth = (const GLuint *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   dst[0] = *depth;

+}

+#endif

+

+

+/* MESA_FORMAT_Z16 ***********************************************************/

+

+/* Fetch depth texel from 1D, 2D or 3D 16-bit depth texture,

+ * returning 1 GLfloat.

+ * Note: no GLchan version of this function.

+ */

+static void FETCH(f_z16)(const struct gl_texture_image *texImage,

+                         GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   texel[0] = src[0] * (1.0F / 65535.0F);

+}

+

+#if DIM == 3

+static void store_texel_z16(struct gl_texture_image *texImage,

+                            GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLushort *depth = (const GLushort *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   dst[0] = *depth;

+}

+#endif

+

+

+/* MESA_FORMAT_RGBA_F32 ******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT32 texture, returning 4 GLfloats.

+ */

+static void FETCH(f_rgba_f32)( const struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 4);

+   texel[RCOMP] = src[0];

+   texel[GCOMP] = src[1];

+   texel[BCOMP] = src[2];

+   texel[ACOMP] = src[3];

+}

+

+#if DIM == 3

+static void store_texel_rgba_f32(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *depth = (const GLfloat *) texel;

+   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 4);

+   dst[0] = depth[RCOMP];

+   dst[1] = depth[GCOMP];

+   dst[2] = depth[BCOMP];

+   dst[3] = depth[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_RGBA_F16 ******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT16 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_rgba_f16)( const struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 4);

+   texel[RCOMP] = _mesa_half_to_float(src[0]);

+   texel[GCOMP] = _mesa_half_to_float(src[1]);

+   texel[BCOMP] = _mesa_half_to_float(src[2]);

+   texel[ACOMP] = _mesa_half_to_float(src[3]);

+}

+

+#if DIM == 3

+static void store_texel_rgba_f16(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *src = (const GLfloat *) texel;

+   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 4);

+   dst[0] = _mesa_float_to_half(src[RCOMP]);

+   dst[1] = _mesa_float_to_half(src[GCOMP]);

+   dst[2] = _mesa_float_to_half(src[BCOMP]);

+   dst[3] = _mesa_float_to_half(src[ACOMP]);

+}

+#endif

+

+/* MESA_FORMAT_RGB_F32 *******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D RGB_FLOAT32 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_rgb_f32)( const struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 3);

+   texel[RCOMP] = src[0];

+   texel[GCOMP] = src[1];

+   texel[BCOMP] = src[2];

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_rgb_f32(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *src = (const GLfloat *) texel;

+   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 3);

+   dst[0] = src[RCOMP];

+   dst[1] = src[GCOMP];

+   dst[2] = src[BCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_RGB_F16 *******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D RGB_FLOAT16 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_rgb_f16)( const struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 3);

+   texel[RCOMP] = _mesa_half_to_float(src[0]);

+   texel[GCOMP] = _mesa_half_to_float(src[1]);

+   texel[BCOMP] = _mesa_half_to_float(src[2]);

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_rgb_f16(struct gl_texture_image *texImage,

+                                GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *src = (const GLfloat *) texel;

+   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 3);

+   dst[0] = _mesa_float_to_half(src[RCOMP]);

+   dst[1] = _mesa_float_to_half(src[GCOMP]);

+   dst[2] = _mesa_float_to_half(src[BCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_ALPHA_F32 *****************************************************/

+

+/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT32 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_alpha_f32)( const struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = src[0];

+}

+

+#if DIM == 3

+static void store_texel_alpha_f32(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);

+   dst[0] = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_ALPHA_F32 *****************************************************/

+

+/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT16 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_alpha_f16)( const struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = _mesa_half_to_float(src[0]);

+}

+

+#if DIM == 3

+static void store_texel_alpha_f16(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);

+   dst[0] = _mesa_float_to_half(rgba[ACOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_LUMINANCE_F32 *************************************************/

+

+/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT32 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_luminance_f32)( const struct gl_texture_image *texImage,

+                                    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = src[0];

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_luminance_f32(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);

+   dst[0] = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_LUMINANCE_F16 *************************************************/

+

+/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT16 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_luminance_f16)( const struct gl_texture_image *texImage,

+                                    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = _mesa_half_to_float(src[0]);

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_luminance_f16(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);

+   dst[0] = _mesa_float_to_half(rgba[RCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_LUMINANCE_ALPHA_F32 *******************************************/

+

+/* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT32 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_luminance_alpha_f32)( const struct gl_texture_image *texImage,

+                                    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = src[0];

+   texel[ACOMP] = src[1];

+}

+

+#if DIM == 3

+static void store_texel_luminance_alpha_f32(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_LUMINANCE_ALPHA_F16 *******************************************/

+

+/* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT16 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_luminance_alpha_f16)( const struct gl_texture_image *texImage,

+                                    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = _mesa_half_to_float(src[0]);

+   texel[ACOMP] = _mesa_half_to_float(src[1]);

+}

+

+#if DIM == 3

+static void store_texel_luminance_alpha_f16(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2);

+   dst[0] = _mesa_float_to_half(rgba[RCOMP]);

+   dst[1] = _mesa_float_to_half(rgba[ACOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_INTENSITY_F32 *************************************************/

+

+/* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT32 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_intensity_f32)( const struct gl_texture_image *texImage,

+                                    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] =

+   texel[ACOMP] = src[0];

+}

+

+#if DIM == 3

+static void store_texel_intensity_f32(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);

+   dst[0] = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_INTENSITY_F16 *************************************************/

+

+/* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT16 texture,

+ * returning 4 GLfloats.

+ */

+static void FETCH(f_intensity_f16)( const struct gl_texture_image *texImage,

+                                    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] =

+   texel[ACOMP] = _mesa_half_to_float(src[0]);

+}

+

+#if DIM == 3

+static void store_texel_intensity_f16(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLfloat *rgba = (const GLfloat *) texel;

+   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);

+   dst[0] = _mesa_float_to_half(rgba[RCOMP]);

+}

+#endif

+

+

+

+

+/*

+ * Begin Hardware formats

+ */

+

+/* MESA_FORMAT_RGBA8888 ******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D rgba8888 texture, return 4 GLfloats */

+static void FETCH(f_rgba8888)( const struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = UBYTE_TO_FLOAT( (s >> 24)        );

+   texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );

+   texel[BCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );

+   texel[ACOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );

+}

+

+

+

+#if DIM == 3

+static void store_texel_rgba8888(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_RGBA888_REV ***************************************************/

+

+/* Fetch texel from 1D, 2D or 3D abgr8888 texture, return 4 GLchans */

+static void FETCH(f_rgba8888_rev)( const struct gl_texture_image *texImage,

+                                   GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );

+   texel[GCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );

+   texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );

+   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24)        );

+}

+

+#if DIM == 3

+static void store_texel_rgba8888_rev(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_8888_REV(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_ARGB8888 ******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D argb8888 texture, return 4 GLchans */

+static void FETCH(f_argb8888)( const struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );

+   texel[GCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );

+   texel[BCOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );

+   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24)        );

+}

+

+#if DIM == 3

+static void store_texel_argb8888(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_8888(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_ARGB8888_REV **************************************************/

+

+/* Fetch texel from 1D, 2D or 3D argb8888_rev texture, return 4 GLfloats */

+static void FETCH(f_argb8888_rev)( const struct gl_texture_image *texImage,

+                                   GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );

+   texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );

+   texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 24)        );

+   texel[ACOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );

+}

+

+#if DIM == 3

+static void store_texel_argb8888_rev(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_8888(rgba[BCOMP], rgba[GCOMP], rgba[RCOMP], rgba[ACOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_XRGB8888 ******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D xrgb8888 texture, return 4 GLchans */

+static void FETCH(f_xrgb8888)( const struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );

+   texel[GCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );

+   texel[BCOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );

+   texel[ACOMP] = 1.0f;

+}

+

+#if DIM == 3

+static void store_texel_xrgb8888(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_8888(0xff, rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_XRGB8888_REV **************************************************/

+

+/* Fetch texel from 1D, 2D or 3D xrgb8888_rev texture, return 4 GLfloats */

+static void FETCH(f_xrgb8888_rev)( const struct gl_texture_image *texImage,

+                                   GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );

+   texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );

+   texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 24)        );

+   texel[ACOMP] = 1.0f;

+}

+

+#if DIM == 3

+static void store_texel_xrgb8888_rev(struct gl_texture_image *texImage,

+                                     GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_8888(rgba[BCOMP], rgba[GCOMP], rgba[RCOMP], 0xff);

+}

+#endif

+

+

+/* MESA_FORMAT_RGB888 ********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D rgb888 texture, return 4 GLchans */

+static void FETCH(f_rgb888)( const struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);

+   texel[RCOMP] = UBYTE_TO_FLOAT( src[2] );

+   texel[GCOMP] = UBYTE_TO_FLOAT( src[1] );

+   texel[BCOMP] = UBYTE_TO_FLOAT( src[0] );

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_rgb888(struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);

+   dst[0] = rgba[BCOMP];

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_BGR888 ********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D bgr888 texture, return 4 GLchans */

+static void FETCH(f_bgr888)( const struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);

+   texel[RCOMP] = UBYTE_TO_FLOAT( src[0] );

+   texel[GCOMP] = UBYTE_TO_FLOAT( src[1] );

+   texel[BCOMP] = UBYTE_TO_FLOAT( src[2] );

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_bgr888(struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[BCOMP];

+}

+#endif

+

+

+/* use color expansion like (g << 2) | (g >> 4) (does somewhat random rounding)

+   instead of slow (g << 2) * 255 / 252 (always rounds down) */

+

+/* MESA_FORMAT_RGB565 ********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D rgb565 texture, return 4 GLchans */

+static void FETCH(f_rgb565)( const struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   const GLushort s = *src;

+   texel[RCOMP] = ((s >> 11) & 0x1f) * (1.0F / 31.0F);

+   texel[GCOMP] = ((s >> 5 ) & 0x3f) * (1.0F / 63.0F);

+   texel[BCOMP] = ((s      ) & 0x1f) * (1.0F / 31.0F);

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_rgb565(struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_565(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_RGB565_REV ****************************************************/

+

+/* Fetch texel from 1D, 2D or 3D rgb565_rev texture, return 4 GLchans */

+static void FETCH(f_rgb565_rev)( const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   const GLushort s = (*src >> 8) | (*src << 8); /* byte swap */

+   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >> 8) & 0xf8) | ((s >> 13) & 0x7) );

+   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >> 3) & 0xfc) | ((s >>  9) & 0x3) );

+   texel[BCOMP] = UBYTE_TO_FLOAT( ((s << 3) & 0xf8) | ((s >>  2) & 0x7) );

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_rgb565_rev(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_565(rgba[BCOMP], rgba[GCOMP], rgba[RCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_ARGB4444 ******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D argb444 texture, return 4 GLchans */

+static void FETCH(f_argb4444)( const struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   const GLushort s = *src;

+   texel[RCOMP] = ((s >>  8) & 0xf) * (1.0F / 15.0F);

+   texel[GCOMP] = ((s >>  4) & 0xf) * (1.0F / 15.0F);

+   texel[BCOMP] = ((s      ) & 0xf) * (1.0F / 15.0F);

+   texel[ACOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F);

+}

+

+#if DIM == 3

+static void store_texel_argb4444(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_4444(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_ARGB4444_REV **************************************************/

+

+/* Fetch texel from 1D, 2D or 3D argb4444_rev texture, return 4 GLchans */

+static void FETCH(f_argb4444_rev)( const struct gl_texture_image *texImage,

+                                   GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   texel[RCOMP] = ((s      ) & 0xf) * (1.0F / 15.0F);

+   texel[GCOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F);

+   texel[BCOMP] = ((s >>  8) & 0xf) * (1.0F / 15.0F);

+   texel[ACOMP] = ((s >>  4) & 0xf) * (1.0F / 15.0F);

+}

+

+#if DIM == 3

+static void store_texel_argb4444_rev(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_4444(rgba[ACOMP], rgba[BCOMP], rgba[GCOMP], rgba[RCOMP]);

+}

+#endif

+

+/* MESA_FORMAT_RGBA5551 ******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D argb1555 texture, return 4 GLchans */

+static void FETCH(f_rgba5551)( const struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   const GLushort s = *src;

+   texel[RCOMP] = ((s >> 11) & 0x1f) * (1.0F / 31.0F);

+   texel[GCOMP] = ((s >>  6) & 0x1f) * (1.0F / 31.0F);

+   texel[BCOMP] = ((s >>  1) & 0x1f) * (1.0F / 31.0F);

+   texel[ACOMP] = ((s      ) & 0x01) * 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_rgba5551(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_5551(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);

+}

+#endif

+

+/* MESA_FORMAT_ARGB1555 ******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D argb1555 texture, return 4 GLchans */

+static void FETCH(f_argb1555)( const struct gl_texture_image *texImage,

+			     GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   const GLushort s = *src;

+   texel[RCOMP] = ((s >> 10) & 0x1f) * (1.0F / 31.0F);

+   texel[GCOMP] = ((s >>  5) & 0x1f) * (1.0F / 31.0F);

+   texel[BCOMP] = ((s >>  0) & 0x1f) * (1.0F / 31.0F);

+   texel[ACOMP] = ((s >> 15) & 0x01) * 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_argb1555(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_1555(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_ARGB1555_REV **************************************************/

+

+/* Fetch texel from 1D, 2D or 3D argb1555_rev texture, return 4 GLchans */

+static void FETCH(f_argb1555_rev)( const struct gl_texture_image *texImage,

+                                   GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   const GLushort s = (*src << 8) | (*src >> 8); /* byteswap */

+   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >>  7) & 0xf8) | ((s >> 12) & 0x7) );

+   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >>  2) & 0xf8) | ((s >>  7) & 0x7) );

+   texel[BCOMP] = UBYTE_TO_FLOAT( ((s <<  3) & 0xf8) | ((s >>  2) & 0x7) );

+   texel[ACOMP] = UBYTE_TO_FLOAT( ((s >> 15) & 0x01) * 255 );

+}

+

+#if DIM == 3

+static void store_texel_argb1555_rev(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_1555_REV(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_ARGB2101010 ***************************************************/

+

+/* Fetch texel from 1D, 2D or 3D argb2101010 texture, return 4 GLchans */

+static void FETCH(f_argb2101010)( const struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   const GLuint s = *src;

+   texel[RCOMP] = ((s >> 20) & 0x3ff) * (1.0F / 1023.0F);

+   texel[GCOMP] = ((s >> 10) & 0x3ff) * (1.0F / 1023.0F);

+   texel[BCOMP] = ((s >>  0) & 0x3ff) * (1.0F / 1023.0F);

+   texel[ACOMP] = ((s >> 30) & 0x03) * (1.0F / 3.0F);

+}

+

+#if DIM == 3

+static void store_texel_argb2101010(struct gl_texture_image *texImage,

+                                    GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_2101010_UB(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_RG88 **********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D rg88 texture, return 4 GLchans */

+static void FETCH(f_rg88)( const struct gl_texture_image *texImage,

+                           GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   texel[RCOMP] = UBYTE_TO_FLOAT( s & 0xff );

+   texel[GCOMP] = UBYTE_TO_FLOAT( s >> 8 );

+   texel[BCOMP] = 0.0;

+   texel[ACOMP] = 1.0;

+}

+

+#if DIM == 3

+static void store_texel_rg88(struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_88(rgba[RCOMP], rgba[GCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_RG88_REV ******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D rg88_rev texture, return 4 GLchans */

+static void FETCH(f_rg88_rev)( const struct gl_texture_image *texImage,

+                           GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   texel[RCOMP] = UBYTE_TO_FLOAT( s & 0xff );

+   texel[GCOMP] = UBYTE_TO_FLOAT( s >> 8 );

+   texel[BCOMP] = 0.0;

+   texel[ACOMP] = 1.0;

+}

+

+#if DIM == 3

+static void store_texel_rg88_rev(struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_88(rgba[GCOMP], rgba[RCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_AL44 **********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D al44 texture, return 4 GLchans */

+static void FETCH(f_al44)( const struct gl_texture_image *texImage,

+                           GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte s = *TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = (s & 0xf) * (1.0F / 15.0F);

+   texel[ACOMP] = ((s >> 4) & 0xf) * (1.0F / 15.0F);

+}

+

+#if DIM == 3

+static void store_texel_al44(struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_44(rgba[ACOMP], rgba[RCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_AL88 **********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D al88 texture, return 4 GLchans */

+static void FETCH(f_al88)( const struct gl_texture_image *texImage,

+                           GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   texel[RCOMP] = 

+   texel[GCOMP] = 

+   texel[BCOMP] = UBYTE_TO_FLOAT( s & 0xff );

+   texel[ACOMP] = UBYTE_TO_FLOAT( s >> 8 );

+}

+

+#if DIM == 3

+static void store_texel_al88(struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_88(rgba[ACOMP], rgba[RCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_R8 ************************************************************/

+

+/* Fetch texel from 1D, 2D or 3D rg88 texture, return 4 GLchans */

+static void FETCH(f_r8)(const struct gl_texture_image *texImage,

+			GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   const GLubyte s = *TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   texel[RCOMP] = UBYTE_TO_FLOAT(s);

+   texel[GCOMP] = 0.0;

+   texel[BCOMP] = 0.0;

+   texel[ACOMP] = 1.0;

+}

+

+#if DIM == 3

+static void store_texel_r8(struct gl_texture_image *texImage,

+			   GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   *dst = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_R16 ***********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D r16 texture, return 4 GLchans */

+static void FETCH(f_r16)(const struct gl_texture_image *texImage,

+			GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   texel[RCOMP] = USHORT_TO_FLOAT(s);

+   texel[GCOMP] = 0.0;

+   texel[BCOMP] = 0.0;

+   texel[ACOMP] = 1.0;

+}

+

+#if DIM == 3

+static void store_texel_r16(struct gl_texture_image *texImage,

+			    GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLushort *rgba = (const GLushort *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_AL88_REV ******************************************************/

+

+/* Fetch texel from 1D, 2D or 3D al88_rev texture, return 4 GLchans */

+static void FETCH(f_al88_rev)( const struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   texel[RCOMP] = 

+   texel[GCOMP] = 

+   texel[BCOMP] = UBYTE_TO_FLOAT( s >> 8 );

+   texel[ACOMP] = UBYTE_TO_FLOAT( s & 0xff );

+}

+

+#if DIM == 3

+static void store_texel_al88_rev(struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_88(rgba[RCOMP], rgba[ACOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_RG1616 ********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D rg1616 texture, return 4 GLchans */

+static void FETCH(f_rg1616)( const struct gl_texture_image *texImage,

+                           GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = USHORT_TO_FLOAT( s & 0xffff );

+   texel[GCOMP] = USHORT_TO_FLOAT( s >> 16 );

+   texel[BCOMP] = 0.0;

+   texel[ACOMP] = 1.0;

+}

+

+#if DIM == 3

+static void store_texel_rg1616(struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_1616(rgba[RCOMP], rgba[GCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_RG1616_REV ****************************************************/

+

+/* Fetch texel from 1D, 2D or 3D rg1616_rev texture, return 4 GLchans */

+static void FETCH(f_rg1616_rev)( const struct gl_texture_image *texImage,

+                           GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = USHORT_TO_FLOAT( s >> 16 );

+   texel[GCOMP] = USHORT_TO_FLOAT( s & 0xffff );

+   texel[BCOMP] = 0.0;

+   texel[ACOMP] = 1.0;

+}

+

+#if DIM == 3

+static void store_texel_rg1616_rev(struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_1616(rgba[GCOMP], rgba[RCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_AL1616 ********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D al1616 texture, return 4 GLchans */

+static void FETCH(f_al1616)( const struct gl_texture_image *texImage,

+			     GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = USHORT_TO_FLOAT( s & 0xffff );

+   texel[ACOMP] = USHORT_TO_FLOAT( s >> 16 );

+}

+

+#if DIM == 3

+static void store_texel_al1616(struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLushort *rgba = (const GLushort *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_1616(rgba[ACOMP], rgba[RCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_AL1616_REV ****************************************************/

+

+/* Fetch texel from 1D, 2D or 3D al1616_rev texture, return 4 GLchans */

+static void FETCH(f_al1616_rev)( const struct gl_texture_image *texImage,

+				 GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = USHORT_TO_FLOAT( s >> 16 );

+   texel[ACOMP] = USHORT_TO_FLOAT( s & 0xffff );

+}

+

+#if DIM == 3

+static void store_texel_al1616_rev(struct gl_texture_image *texImage,

+				   GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLushort *rgba = (const GLushort *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_1616(rgba[RCOMP], rgba[ACOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_RGB332 ********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D rgb332 texture, return 4 GLchans */

+static void FETCH(f_rgb332)( const struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   const GLubyte s = *src;

+   texel[RCOMP] = ((s >> 5) & 0x7) * (1.0F / 7.0F);

+   texel[GCOMP] = ((s >> 2) & 0x7) * (1.0F / 7.0F);

+   texel[BCOMP] = ((s     ) & 0x3) * (1.0F / 3.0F);

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_rgb332(struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_332(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_A8 ************************************************************/

+

+/* Fetch texel from 1D, 2D or 3D a8 texture, return 4 GLchans */

+static void FETCH(f_a8)( const struct gl_texture_image *texImage,

+                         GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = UBYTE_TO_FLOAT( src[0] );

+}

+

+#if DIM == 3

+static void store_texel_a8(struct gl_texture_image *texImage,

+                           GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   *dst = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_A16 ************************************************************/

+

+/* Fetch texel from 1D, 2D or 3D a8 texture, return 4 GLchans */

+static void FETCH(f_a16)( const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = USHORT_TO_FLOAT( src[0] );

+}

+

+#if DIM == 3

+static void store_texel_a16(struct gl_texture_image *texImage,

+                            GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLushort *rgba = (const GLushort *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_L8 ************************************************************/

+

+/* Fetch texel from 1D, 2D or 3D l8 texture, return 4 GLchans */

+static void FETCH(f_l8)( const struct gl_texture_image *texImage,

+                         GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = UBYTE_TO_FLOAT( src[0] );

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_l8(struct gl_texture_image *texImage,

+                           GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   *dst = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_L16 ***********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D l16 texture, return 4 GLchans */

+static void FETCH(f_l16)( const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = USHORT_TO_FLOAT( src[0] );

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_l16(struct gl_texture_image *texImage,

+                            GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLushort *rgba = (const GLushort *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_I8 ************************************************************/

+

+/* Fetch texel from 1D, 2D or 3D i8 texture, return 4 GLchans */

+static void FETCH(f_i8)( const struct gl_texture_image *texImage,

+                         GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] =

+   texel[ACOMP] = UBYTE_TO_FLOAT( src[0] );

+}

+

+#if DIM == 3

+static void store_texel_i8(struct gl_texture_image *texImage,

+                           GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   *dst = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_I16 ***********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D i16 texture, return 4 GLchans */

+static void FETCH(f_i16)( const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] =

+   texel[ACOMP] = USHORT_TO_FLOAT( src[0] );

+}

+

+#if DIM == 3

+static void store_texel_i16(struct gl_texture_image *texImage,

+                            GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLushort *rgba = (const GLushort *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   *dst = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_CI8 ***********************************************************/

+

+/* Fetch CI texel from 1D, 2D or 3D ci8 texture, lookup the index in a

+ * color table, and return 4 GLchans.

+ */

+static void FETCH(f_ci8)( const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   const struct gl_color_table *palette;

+   GLuint index;

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (ctx->Texture.SharedPalette) {

+      palette = &ctx->Texture.Palette;

+   }

+   else {

+      palette = &texImage->TexObject->Palette;

+   }

+   if (palette->Size == 0)

+      return; /* undefined results */

+

+   /* Mask the index against size of palette to avoid going out of bounds */

+   index = (*src) & (palette->Size - 1);

+

+   {

+      const GLfloat *table = palette->TableF;

+      switch (palette->_BaseFormat) {

+      case GL_ALPHA:

+         texel[RCOMP] =

+         texel[GCOMP] =

+         texel[BCOMP] = 0.0F;

+         texel[ACOMP] = table[index];

+         break;

+      case GL_LUMINANCE:

+         texel[RCOMP] =

+         texel[GCOMP] =

+         texel[BCOMP] = table[index];

+         texel[ACOMP] = 1.0F;

+         break;

+      case GL_INTENSITY:

+         texel[RCOMP] =

+         texel[GCOMP] =

+         texel[BCOMP] =

+         texel[ACOMP] = table[index];

+         break;

+      case GL_LUMINANCE_ALPHA:

+         texel[RCOMP] =

+         texel[GCOMP] =

+         texel[BCOMP] = table[index * 2 + 0];

+         texel[ACOMP] = table[index * 2 + 1];

+         break;

+      case GL_RGB:

+         texel[RCOMP] = table[index * 3 + 0];

+         texel[GCOMP] = table[index * 3 + 1];

+         texel[BCOMP] = table[index * 3 + 2];

+         texel[ACOMP] = 1.0F;

+         break;

+      case GL_RGBA:

+         texel[RCOMP] = table[index * 4 + 0];

+         texel[GCOMP] = table[index * 4 + 1];

+         texel[BCOMP] = table[index * 4 + 2];

+         texel[ACOMP] = table[index * 4 + 3];

+         break;

+      default:

+         _mesa_problem(ctx, "Bad palette format in fetch_texel_ci8");

+         return;

+      }

+   }

+}

+

+#if DIM == 3

+static void store_texel_ci8(struct gl_texture_image *texImage,

+                            GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *index = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   *dst = *index;

+}

+#endif

+

+

+/* Fetch texel from 1D, 2D or 3D srgb8 texture, return 4 GLfloats */

+/* Note: component order is same as for MESA_FORMAT_RGB888 */

+static void FETCH(srgb8)(const struct gl_texture_image *texImage,

+                         GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);

+   texel[RCOMP] = nonlinear_to_linear(src[2]);

+   texel[GCOMP] = nonlinear_to_linear(src[1]);

+   texel[BCOMP] = nonlinear_to_linear(src[0]);

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_srgb8(struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);

+   dst[0] = rgba[BCOMP]; /* no conversion */

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[RCOMP];

+}

+#endif

+

+/* Fetch texel from 1D, 2D or 3D srgba8 texture, return 4 GLfloats */

+static void FETCH(srgba8)(const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = nonlinear_to_linear( (s >> 24) );

+   texel[GCOMP] = nonlinear_to_linear( (s >> 16) & 0xff );

+   texel[BCOMP] = nonlinear_to_linear( (s >>  8) & 0xff );

+   texel[ACOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff ); /* linear! */

+}

+

+#if DIM == 3

+static void store_texel_srgba8(struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);

+}

+#endif

+

+/* Fetch texel from 1D, 2D or 3D sargb8 texture, return 4 GLfloats */

+static void FETCH(sargb8)(const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = nonlinear_to_linear( (s >> 16) & 0xff );

+   texel[GCOMP] = nonlinear_to_linear( (s >>  8) & 0xff );

+   texel[BCOMP] = nonlinear_to_linear( (s      ) & 0xff );

+   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24) ); /* linear! */

+}

+

+#if DIM == 3

+static void store_texel_sargb8(struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_8888(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);

+}

+#endif

+

+/* Fetch texel from 1D, 2D or 3D sl8 texture, return 4 GLfloats */

+static void FETCH(sl8)(const struct gl_texture_image *texImage,

+                       GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   texel[RCOMP] = 

+   texel[GCOMP] = 

+   texel[BCOMP] = nonlinear_to_linear(src[0]);

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_sl8(struct gl_texture_image *texImage,

+                            GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);

+   dst[0] = rgba[RCOMP];

+}

+#endif

+

+/* Fetch texel from 1D, 2D or 3D sla8 texture, return 4 GLfloats */

+static void FETCH(sla8)(const struct gl_texture_image *texImage,

+                       GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 2);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = nonlinear_to_linear(src[0]);

+   texel[ACOMP] = UBYTE_TO_FLOAT(src[1]); /* linear */

+}

+

+#if DIM == 3

+static void store_texel_sla8(struct gl_texture_image *texImage,

+                            GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 2);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_RGBA_INT8 **************************************************/

+

+static void

+FETCH(rgba_int8)(const struct gl_texture_image *texImage,

+                 GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLbyte *src = TEXEL_ADDR(GLbyte, texImage, i, j, k, 4);

+   texel[RCOMP] = (GLfloat) src[0];

+   texel[GCOMP] = (GLfloat) src[1];

+   texel[BCOMP] = (GLfloat) src[2];

+   texel[ACOMP] = (GLfloat) src[3];

+}

+

+#if DIM == 3

+static void

+store_texel_rgba_int8(struct gl_texture_image *texImage,

+                      GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLbyte *rgba = (const GLbyte *) texel;

+   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 4);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[BCOMP];

+   dst[3] = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_RGBA_INT16 **************************************************/

+

+static void

+FETCH(rgba_int16)(const struct gl_texture_image *texImage,

+                  GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLshort *src = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);

+   texel[RCOMP] = (GLfloat) src[0];

+   texel[GCOMP] = (GLfloat) src[1];

+   texel[BCOMP] = (GLfloat) src[2];

+   texel[ACOMP] = (GLfloat) src[3];

+}

+

+#if DIM == 3

+static void

+store_texel_rgba_int16(struct gl_texture_image *texImage,

+                       GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLshort *rgba = (const GLshort *) texel;

+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[BCOMP];

+   dst[3] = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_RGBA_INT32 **************************************************/

+

+static void

+FETCH(rgba_int32)(const struct gl_texture_image *texImage,

+                  GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLint *src = TEXEL_ADDR(GLint, texImage, i, j, k, 4);

+   texel[RCOMP] = (GLfloat) src[0];

+   texel[GCOMP] = (GLfloat) src[1];

+   texel[BCOMP] = (GLfloat) src[2];

+   texel[ACOMP] = (GLfloat) src[3];

+}

+

+#if DIM == 3

+static void

+store_texel_rgba_int32(struct gl_texture_image *texImage,

+                       GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLint *rgba = (const GLint *) texel;

+   GLint *dst = TEXEL_ADDR(GLint, texImage, i, j, k, 4);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[BCOMP];

+   dst[3] = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_RGBA_UINT8 **************************************************/

+

+static void

+FETCH(rgba_uint8)(const struct gl_texture_image *texImage,

+                 GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);

+   texel[RCOMP] = (GLfloat) src[0];

+   texel[GCOMP] = (GLfloat) src[1];

+   texel[BCOMP] = (GLfloat) src[2];

+   texel[ACOMP] = (GLfloat) src[3];

+}

+

+#if DIM == 3

+static void

+store_texel_rgba_uint8(struct gl_texture_image *texImage,

+                      GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 4);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[BCOMP];

+   dst[3] = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_RGBA_UINT16 **************************************************/

+

+static void

+FETCH(rgba_uint16)(const struct gl_texture_image *texImage,

+                  GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);

+   texel[RCOMP] = (GLfloat) src[0];

+   texel[GCOMP] = (GLfloat) src[1];

+   texel[BCOMP] = (GLfloat) src[2];

+   texel[ACOMP] = (GLfloat) src[3];

+}

+

+#if DIM == 3

+static void

+store_texel_rgba_uint16(struct gl_texture_image *texImage,

+                       GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLushort *rgba = (const GLushort *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[BCOMP];

+   dst[3] = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_RGBA_UINT32 **************************************************/

+

+static void

+FETCH(rgba_uint32)(const struct gl_texture_image *texImage,

+                  GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 4);

+   texel[RCOMP] = (GLfloat) src[0];

+   texel[GCOMP] = (GLfloat) src[1];

+   texel[BCOMP] = (GLfloat) src[2];

+   texel[ACOMP] = (GLfloat) src[3];

+}

+

+#if DIM == 3

+static void

+store_texel_rgba_uint32(struct gl_texture_image *texImage,

+                       GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLuint *rgba = (const GLuint *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 4);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[BCOMP];

+   dst[3] = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_DUDV8 ********************************************************/

+

+/* this format by definition produces 0,0,0,1 as rgba values,

+   however we'll return the dudv values as rg and fix up elsewhere */

+static void FETCH(dudv8)(const struct gl_texture_image *texImage,

+                         GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLbyte *src = TEXEL_ADDR(GLbyte, texImage, i, j, k, 2);

+   texel[RCOMP] = BYTE_TO_FLOAT(src[0]);

+   texel[GCOMP] = BYTE_TO_FLOAT(src[1]);

+   texel[BCOMP] = 0;

+   texel[ACOMP] = 0;

+}

+

+

+/* MESA_FORMAT_SIGNED_R8 ***********************************************/

+

+static void FETCH(signed_r8)( const struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);

+   texel[RCOMP] = BYTE_TO_FLOAT_TEX( s );

+   texel[GCOMP] = 0.0F;

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_signed_r8(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLbyte *rgba = (const GLbyte *) texel;

+   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);

+   *dst = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_A8 ***********************************************/

+

+static void FETCH(signed_a8)( const struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);

+   texel[RCOMP] = 0.0F;

+   texel[GCOMP] = 0.0F;

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = BYTE_TO_FLOAT_TEX( s );

+}

+

+#if DIM == 3

+static void store_texel_signed_a8(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLbyte *rgba = (const GLbyte *) texel;

+   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);

+   *dst = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_L8 ***********************************************/

+

+static void FETCH(signed_l8)( const struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = BYTE_TO_FLOAT_TEX( s );

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_signed_l8(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLbyte *rgba = (const GLbyte *) texel;

+   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);

+   *dst = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_I8 ***********************************************/

+

+static void FETCH(signed_i8)( const struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLbyte s = *TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] =

+   texel[ACOMP] = BYTE_TO_FLOAT_TEX( s );

+}

+

+#if DIM == 3

+static void store_texel_signed_i8(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLbyte *rgba = (const GLbyte *) texel;

+   GLbyte *dst = TEXEL_ADDR(GLbyte, texImage, i, j, k, 1);

+   *dst = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_RG88_REV ***********************************************/

+

+static void FETCH(signed_rg88_rev)( const struct gl_texture_image *texImage,

+                                    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);

+   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s & 0xff) );

+   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 8) );

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_signed_rg88_rev(struct gl_texture_image *texImage,

+                                        GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLbyte *rg = (const GLbyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   dst[0] = PACK_COLOR_88(rg[GCOMP], rg[RCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_AL88 ***********************************************/

+

+static void FETCH(signed_al88)( const struct gl_texture_image *texImage,

+                                GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s & 0xff) );

+   texel[ACOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 8) );

+}

+

+#if DIM == 3

+static void store_texel_signed_al88(struct gl_texture_image *texImage,

+                                    GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLbyte *rg = (const GLbyte *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);

+   dst[0] = PACK_COLOR_88(rg[ACOMP], rg[RCOMP]);

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_RGBX8888 ***********************************************/

+

+static void FETCH(signed_rgbx8888)( const struct gl_texture_image *texImage,

+			            GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 24) );

+   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 16) );

+   texel[BCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >>  8) );

+   texel[ACOMP] = 1.0f;

+}

+

+#if DIM == 3

+static void store_texel_signed_rgbx8888(struct gl_texture_image *texImage,

+                                        GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLbyte *rgba = (const GLbyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], 255);

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_RGBA8888 ***********************************************/

+

+static void FETCH(signed_rgba8888)( const struct gl_texture_image *texImage,

+			            GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 24) );

+   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 16) );

+   texel[BCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >>  8) );

+   texel[ACOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s      ) );

+}

+

+#if DIM == 3

+static void store_texel_signed_rgba8888(struct gl_texture_image *texImage,

+                                        GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLbyte *rgba = (const GLbyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_8888(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);

+}

+#endif

+

+static void FETCH(signed_rgba8888_rev)( const struct gl_texture_image *texImage,

+                                        GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   texel[RCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s      ) );

+   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >>  8) );

+   texel[BCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 16) );

+   texel[ACOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s >> 24) );

+}

+

+#if DIM == 3

+static void store_texel_signed_rgba8888_rev(struct gl_texture_image *texImage,

+                                            GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLubyte *rgba = (const GLubyte *) texel;

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   *dst = PACK_COLOR_8888_REV(rgba[RCOMP], rgba[GCOMP], rgba[BCOMP], rgba[ACOMP]);

+}

+#endif

+

+

+

+/* MESA_FORMAT_SIGNED_R16 ***********************************************/

+

+static void

+FETCH(signed_r16)(const struct gl_texture_image *texImage,

+                  GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);

+   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s );

+   texel[GCOMP] = 0.0F;

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void

+store_texel_signed_r16(struct gl_texture_image *texImage,

+                       GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLshort *rgba = (const GLshort *) texel;

+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 1);

+   *dst = rgba[0];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_A16 ***********************************************/

+

+static void

+FETCH(signed_a16)(const struct gl_texture_image *texImage,

+                  GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);

+   texel[RCOMP] = 0.0F;

+   texel[GCOMP] = 0.0F;

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = SHORT_TO_FLOAT_TEX( s );

+}

+

+#if DIM == 3

+static void

+store_texel_signed_a16(struct gl_texture_image *texImage,

+                       GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLshort *rgba = (const GLshort *) texel;

+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 1);

+   *dst = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_L16 ***********************************************/

+

+static void

+FETCH(signed_l16)(const struct gl_texture_image *texImage,

+                  GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = SHORT_TO_FLOAT_TEX( s );

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void

+store_texel_signed_l16(struct gl_texture_image *texImage,

+                       GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLshort *rgba = (const GLshort *) texel;

+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 1);

+   *dst = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_I16 ***********************************************/

+

+static void

+FETCH(signed_i16)(const struct gl_texture_image *texImage,

+                  GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   const GLshort s = *TEXEL_ADDR(GLshort, texImage, i, j, k, 1);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] =

+   texel[ACOMP] = SHORT_TO_FLOAT_TEX( s );

+}

+

+#if DIM == 3

+static void

+store_texel_signed_i16(struct gl_texture_image *texImage,

+                       GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLshort *rgba = (const GLshort *) texel;

+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 1);

+   *dst = rgba[RCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_RG1616 ***********************************************/

+

+static void

+FETCH(signed_rg1616)(const struct gl_texture_image *texImage,

+                    GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 2);

+   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s[0] );

+   texel[GCOMP] = SHORT_TO_FLOAT_TEX( s[1] );

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void

+store_texel_signed_rg1616(struct gl_texture_image *texImage,

+                         GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLshort *rgba = (const GLshort *) texel;

+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 2);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_AL1616 ***********************************************/

+

+static void

+FETCH(signed_al1616)(const struct gl_texture_image *texImage,

+                    GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 2);

+   texel[RCOMP] =

+   texel[GCOMP] =

+   texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[0] );

+   texel[ACOMP] = SHORT_TO_FLOAT_TEX( s[1] );

+}

+

+#if DIM == 3

+static void

+store_texel_signed_al1616(struct gl_texture_image *texImage,

+                         GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLshort *rgba = (const GLshort *) texel;

+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 2);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[ACOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_RGB_16 ***********************************************/

+

+static void 

+FETCH(signed_rgb_16)(const struct gl_texture_image *texImage,

+                     GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 3);

+   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s[0] );

+   texel[GCOMP] = SHORT_TO_FLOAT_TEX( s[1] );

+   texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[2] );

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void

+store_texel_signed_rgb_16(struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLshort *rgba = (const GLshort *) texel;

+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 3);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[BCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_RGBA_16 ***********************************************/

+

+static void

+FETCH(signed_rgba_16)(const struct gl_texture_image *texImage,

+                      GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);

+   texel[RCOMP] = SHORT_TO_FLOAT_TEX( s[0] );

+   texel[GCOMP] = SHORT_TO_FLOAT_TEX( s[1] );

+   texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[2] );

+   texel[ACOMP] = SHORT_TO_FLOAT_TEX( s[3] );

+}

+

+#if DIM == 3

+static void

+store_texel_signed_rgba_16(struct gl_texture_image *texImage,

+                           GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLshort *rgba = (const GLshort *) texel;

+   GLshort *dst = TEXEL_ADDR(GLshort, texImage, i, j, k, 4);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[BCOMP];

+   dst[3] = rgba[ACOMP];

+}

+#endif

+

+

+

+/* MESA_FORMAT_RGBA_16 ***********************************************/

+

+static void

+FETCH(rgba_16)(const struct gl_texture_image *texImage,

+               GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   const GLushort *s = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);

+   texel[RCOMP] = USHORT_TO_FLOAT( s[0] );

+   texel[GCOMP] = USHORT_TO_FLOAT( s[1] );

+   texel[BCOMP] = USHORT_TO_FLOAT( s[2] );

+   texel[ACOMP] = USHORT_TO_FLOAT( s[3] );

+}

+

+#if DIM == 3

+static void

+store_texel_rgba_16(struct gl_texture_image *texImage,

+                    GLint i, GLint j, GLint k, const void *texel)

+{

+   const GLushort *rgba = (const GLushort *) texel;

+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 4);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+   dst[2] = rgba[BCOMP];

+   dst[3] = rgba[ACOMP];

+}

+#endif

+

+

+

+/* MESA_FORMAT_YCBCR *********************************************************/

+

+/* Fetch texel from 1D, 2D or 3D ycbcr texture, return 4 GLfloats.

+ * We convert YCbCr to RGB here.

+ */

+static void FETCH(f_ycbcr)( const struct gl_texture_image *texImage,

+                            GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */

+   const GLushort *src1 = src0 + 1;                               /* odd */

+   const GLubyte y0 = (*src0 >> 8) & 0xff;  /* luminance */

+   const GLubyte cb = *src0 & 0xff;         /* chroma U */

+   const GLubyte y1 = (*src1 >> 8) & 0xff;  /* luminance */

+   const GLubyte cr = *src1 & 0xff;         /* chroma V */

+   const GLubyte y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */

+   GLfloat r = 1.164F * (y - 16) + 1.596F * (cr - 128);

+   GLfloat g = 1.164F * (y - 16) - 0.813F * (cr - 128) - 0.391F * (cb - 128);

+   GLfloat b = 1.164F * (y - 16) + 2.018F * (cb - 128);

+   r *= (1.0F / 255.0F);

+   g *= (1.0F / 255.0F);

+   b *= (1.0F / 255.0F);

+   texel[RCOMP] = CLAMP(r, 0.0F, 1.0F);

+   texel[GCOMP] = CLAMP(g, 0.0F, 1.0F);

+   texel[BCOMP] = CLAMP(b, 0.0F, 1.0F);

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_ycbcr(struct gl_texture_image *texImage,

+                              GLint i, GLint j, GLint k, const void *texel)

+{

+   (void) texImage;

+   (void) i;

+   (void) j;

+   (void) k;

+   (void) texel;

+   /* XXX to do */

+}

+#endif

+

+

+/* MESA_FORMAT_YCBCR_REV *****************************************************/

+

+/* Fetch texel from 1D, 2D or 3D ycbcr_rev texture, return 4 GLfloats.

+ * We convert YCbCr to RGB here.

+ */

+static void FETCH(f_ycbcr_rev)( const struct gl_texture_image *texImage,

+                                GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */

+   const GLushort *src1 = src0 + 1;                               /* odd */

+   const GLubyte y0 = *src0 & 0xff;         /* luminance */

+   const GLubyte cr = (*src0 >> 8) & 0xff;  /* chroma V */

+   const GLubyte y1 = *src1 & 0xff;         /* luminance */

+   const GLubyte cb = (*src1 >> 8) & 0xff;  /* chroma U */

+   const GLubyte y = (i & 1) ? y1 : y0;     /* choose even/odd luminance */

+   GLfloat r = 1.164F * (y - 16) + 1.596F * (cr - 128);

+   GLfloat g = 1.164F * (y - 16) - 0.813F * (cr - 128) - 0.391F * (cb - 128);

+   GLfloat b = 1.164F * (y - 16) + 2.018F * (cb - 128);

+   r *= (1.0F / 255.0F);

+   g *= (1.0F / 255.0F);

+   b *= (1.0F / 255.0F);

+   texel[RCOMP] = CLAMP(r, 0.0F, 1.0F);

+   texel[GCOMP] = CLAMP(g, 0.0F, 1.0F);

+   texel[BCOMP] = CLAMP(b, 0.0F, 1.0F);

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_ycbcr_rev(struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, const void *texel)

+{

+   (void) texImage;

+   (void) i;

+   (void) j;

+   (void) k;

+   (void) texel;

+   /* XXX to do */

+}

+#endif

+

+

+/* MESA_TEXFORMAT_Z24_S8 ***************************************************/

+

+static void FETCH(f_z24_s8)( const struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   /* only return Z, not stencil data */

+   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   const GLfloat scale = 1.0F / (GLfloat) 0xffffff;

+   texel[0] = ((*src) >> 8) * scale;

+   ASSERT(texImage->TexFormat == MESA_FORMAT_Z24_S8);

+   ASSERT(texel[0] >= 0.0F);

+   ASSERT(texel[0] <= 1.0F);

+}

+

+#if DIM == 3

+static void store_texel_z24_s8(struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, const void *texel)

+{

+   /* only store Z, not stencil */

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   GLfloat depth = *((GLfloat *) texel);

+   GLuint zi = ((GLuint) (depth * 0xffffff)) << 8;

+   *dst = zi | (*dst & 0xff);

+}

+#endif

+

+

+/* MESA_TEXFORMAT_S8_Z24 ***************************************************/

+

+static void FETCH(f_s8_z24)( const struct gl_texture_image *texImage,

+                             GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   /* only return Z, not stencil data */

+   const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   const GLfloat scale = 1.0F / (GLfloat) 0xffffff;

+   texel[0] = ((*src) & 0x00ffffff) * scale;

+   ASSERT(texImage->TexFormat == MESA_FORMAT_S8_Z24);

+   ASSERT(texel[0] >= 0.0F);

+   ASSERT(texel[0] <= 1.0F);

+}

+

+#if DIM == 3

+static void store_texel_s8_z24(struct gl_texture_image *texImage,

+                               GLint i, GLint j, GLint k, const void *texel)

+{

+   /* only store Z, not stencil */

+   GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);

+   GLfloat depth = *((GLfloat *) texel);

+   GLuint zi = (GLuint) (depth * 0xffffff);

+   *dst = zi | (*dst & 0xff000000);

+}

+#endif

+

+

+#undef TEXEL_ADDR

+#undef DIM

+#undef FETCH

diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c
index da907455b..e22e90693 100644
--- a/mesalib/src/mesa/main/texformat.c
+++ b/mesalib/src/mesa/main/texformat.c
@@ -1,693 +1,693 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.7
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (c) 2008-2009 VMware, Inc.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file texformat.c
- * Texture formats.
- *
- * \author Gareth Hughes
- * \author Brian Paul
- */
-
-
-#include "context.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "texcompress.h"
-#include "texformat.h"
-
-#define RETURN_IF_SUPPORTED(f) do {		\
-   if (ctx->TextureFormatSupported[f])		\
-      return f;					\
-} while (0)
-
-/**
- * Choose an appropriate texture format given the format, type and
- * internalFormat parameters passed to glTexImage().
- *
- * \param ctx  the GL context.
- * \param internalFormat  user's prefered internal texture format.
- * \param format  incoming image pixel format.
- * \param type  incoming image data type.
- *
- * \return a pointer to a gl_texture_format object which describes the
- * choosen texture format, or NULL on failure.
- * 
- * This is called via dd_function_table::ChooseTextureFormat.  Hardware drivers
- * will typically override this function with a specialized version.
- */
-gl_format
-_mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
-                         GLenum format, GLenum type )
-{
-   (void) format;
-   (void) type;
-
-   switch (internalFormat) {
-      /* shallow RGBA formats */
-      case 4:
-      case GL_RGBA:
-	 if (type == GL_UNSIGNED_SHORT_4_4_4_4_REV) {
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);
-	 } else if (type == GL_UNSIGNED_SHORT_1_5_5_5_REV) {
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);
-	 }
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-
-      case GL_RGBA8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      case GL_RGB5_A1:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);
-	 break;
-      case GL_RGBA2:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444_REV); /* just to test another format*/
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);
-	 break;
-      case GL_RGBA4:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);
-	 break;
-
-      /* deep RGBA formats */
-      case GL_RGB10_A2:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB2101010);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      case GL_RGBA12:
-      case GL_RGBA16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-
-      /* shallow RGB formats */
-      case 3:
-      case GL_RGB:
-      case GL_RGB8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      case GL_R3_G3_B2:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB332);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      case GL_RGB4:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565_REV); /* just to test another format */
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);
-	 break;
-      case GL_RGB5:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);
-	 break;
-
-      /* deep RGB formats */
-      case GL_RGB10:
-      case GL_RGB12:
-      case GL_RGB16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-
-      /* Alpha formats */
-      case GL_ALPHA:
-      case GL_ALPHA4:
-      case GL_ALPHA8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
-	 break;
-
-      case GL_ALPHA12:
-      case GL_ALPHA16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_A16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
-	 break;
-
-      /* Luminance formats */
-      case 1:
-      case GL_LUMINANCE:
-      case GL_LUMINANCE4:
-      case GL_LUMINANCE8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
-	 break;
-
-      case GL_LUMINANCE12:
-      case GL_LUMINANCE16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_L16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
-	 break;
-
-      /* Luminance/Alpha formats */
-      case GL_LUMINANCE4_ALPHA4:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL44);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
-	 break;
-
-      case 2:
-      case GL_LUMINANCE_ALPHA:
-      case GL_LUMINANCE6_ALPHA2:
-      case GL_LUMINANCE8_ALPHA8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
-	 break;
-
-      case GL_LUMINANCE12_ALPHA4:
-      case GL_LUMINANCE12_ALPHA12:
-      case GL_LUMINANCE16_ALPHA16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL1616);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
-	 break;
-
-      case GL_INTENSITY:
-      case GL_INTENSITY4:
-      case GL_INTENSITY8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
-	 break;
-
-      case GL_INTENSITY12:
-      case GL_INTENSITY16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_I16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
-	 break;
-
-      case GL_COLOR_INDEX:
-      case GL_COLOR_INDEX1_EXT:
-      case GL_COLOR_INDEX2_EXT:
-      case GL_COLOR_INDEX4_EXT:
-      case GL_COLOR_INDEX12_EXT:
-      case GL_COLOR_INDEX16_EXT:
-      case GL_COLOR_INDEX8_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_CI8);
-	 break;
-
-      default:
-         ; /* fallthrough */
-   }
-
-   if (ctx->Extensions.ARB_depth_texture) {
-      switch (internalFormat) {
-         case GL_DEPTH_COMPONENT:
-         case GL_DEPTH_COMPONENT24:
-         case GL_DEPTH_COMPONENT32:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z32);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
-	    break;
-         case GL_DEPTH_COMPONENT16:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   switch (internalFormat) {
-      case GL_COMPRESSED_ALPHA_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
-	 break;
-      case GL_COMPRESSED_LUMINANCE_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
-	 break;
-      case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
-	 break;
-      case GL_COMPRESSED_INTENSITY_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
-	 break;
-      case GL_COMPRESSED_RGB_ARB:
-         if (ctx->Extensions.EXT_texture_compression_s3tc ||
-             ctx->Extensions.S3_s3tc)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
-         if (ctx->Extensions.TDFX_texture_compression_FXT1)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      case GL_COMPRESSED_RGBA_ARB:
-         if (ctx->Extensions.EXT_texture_compression_s3tc ||
-             ctx->Extensions.S3_s3tc)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */
-         if (ctx->Extensions.TDFX_texture_compression_FXT1)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      default:
-         ; /* fallthrough */
-   }
-
-   if (ctx->Extensions.MESA_ycbcr_texture) {
-      if (internalFormat == GL_YCBCR_MESA) {
-         if (type == GL_UNSIGNED_SHORT_8_8_MESA)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR);
-         else
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR_REV);
-      }
-   }
-
-#if FEATURE_texture_fxt1
-   if (ctx->Extensions.TDFX_texture_compression_FXT1) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_RGB_FXT1_3DFX:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);
-	 break;
-         case GL_COMPRESSED_RGBA_FXT1_3DFX:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);
-	 break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-#endif
-
-#if FEATURE_texture_s3tc
-   if (ctx->Extensions.EXT_texture_compression_s3tc) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
-	    break;
-         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT1);
-	    break;
-         case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);
-	    break;
-         case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT5);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.S3_s3tc) {
-      switch (internalFormat) {
-         case GL_RGB_S3TC:
-         case GL_RGB4_S3TC:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
-	    break;
-         case GL_RGBA_S3TC:
-         case GL_RGBA4_S3TC:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-#endif
-
-   if (ctx->Extensions.ARB_texture_float) {
-      switch (internalFormat) {
-         case GL_ALPHA16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);
-	    break;
-         case GL_ALPHA32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32);
-	    break;
-         case GL_LUMINANCE16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16);
-	    break;
-         case GL_LUMINANCE32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32);
-	    break;
-         case GL_LUMINANCE_ALPHA16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16);
-	    break;
-         case GL_LUMINANCE_ALPHA32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32);
-	    break;
-         case GL_INTENSITY16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);
-	    break;
-         case GL_INTENSITY32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32);
-	    break;
-         case GL_RGB16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);
-	    break;
-         case GL_RGB32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT32);
-	    break;
-         case GL_RGBA16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
-	    break;
-         case GL_RGBA32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_packed_depth_stencil) {
-      switch (internalFormat) {
-         case GL_DEPTH_STENCIL_EXT:
-         case GL_DEPTH24_STENCIL8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_S8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ATI_envmap_bumpmap) {
-      switch (internalFormat) {
-         case GL_DUDV_ATI:
-         case GL_DU8DV8_ATI:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_DUDV8);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_texture_snorm) {
-      switch (internalFormat) {
-         case GL_RED_SNORM:
-         case GL_R8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R8);
-	    break;
-         case GL_RG_SNORM:
-         case GL_RG8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG88_REV);
-	    break;
-         case GL_RGB_SNORM:
-         case GL_RGB8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);
-	    /* FALLTHROUGH */
-         case GL_RGBA_SNORM:
-         case GL_RGBA8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
-	    break;
-         case GL_ALPHA_SNORM:
-         case GL_ALPHA8_SNORM:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_A8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
-            break;
-         case GL_LUMINANCE_SNORM:
-         case GL_LUMINANCE8_SNORM:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
-            break;
-         case GL_LUMINANCE_ALPHA_SNORM:
-         case GL_LUMINANCE8_ALPHA8_SNORM:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_AL88);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
-            break;
-         case GL_INTENSITY_SNORM:
-         case GL_INTENSITY8_SNORM:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_I8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
-            break;
-         case GL_R16_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R16);
-	    break;
-         case GL_RG16_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_GR1616);
-	    break;
-         case GL_RGB16_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGB_16);
-	    /* FALLTHROUGH */
-         case GL_RGBA16_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
-	    break;
-         case GL_ALPHA16_SNORM:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_A16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
-            break;
-         case GL_LUMINANCE16_SNORM:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L16);
-	    /* FALLTHROUGH */
-         case GL_LUMINANCE16_ALPHA16_SNORM:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_AL1616);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
-            break;
-         case GL_INTENSITY16_SNORM:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_I16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
-            break;
-         default:
-            ; /* fall-through */
-      }
-   }
-
-#if FEATURE_EXT_texture_sRGB
-   if (ctx->Extensions.EXT_texture_sRGB) {
-      switch (internalFormat) {
-         case GL_SRGB_EXT:
-         case GL_SRGB8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_SRGB_ALPHA_EXT:
-         case GL_SRGB8_ALPHA8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_SLUMINANCE_EXT:
-         case GL_SLUMINANCE8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_SLUMINANCE_ALPHA_EXT:
-         case GL_SLUMINANCE8_ALPHA8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SLUMINANCE_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SRGB_EXT:
-#if FEATURE_texture_s3tc
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);
-#endif
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SRGB_ALPHA_EXT:
-#if FEATURE_texture_s3tc
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */
-#endif
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-#if FEATURE_texture_s3tc
-         case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-            break;
-         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT1);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-            break;
-         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-            break;
-         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT5);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-            break;
-#endif
-         default:
-            ; /* fallthrough */
-      }
-   }
-#endif /* FEATURE_EXT_texture_sRGB */
-
-   if (ctx->Extensions.EXT_texture_integer) {
-      switch (internalFormat) {
-      case GL_RGBA32UI_EXT:
-      case GL_RGB32UI_EXT:
-      case GL_ALPHA32UI_EXT:
-      case GL_INTENSITY32UI_EXT:
-      case GL_LUMINANCE32UI_EXT:
-      case GL_LUMINANCE_ALPHA32UI_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
-	 break;
-      case GL_RGBA16UI_EXT:
-      case GL_RGB16UI_EXT:
-      case GL_ALPHA16UI_EXT:
-      case GL_INTENSITY16UI_EXT:
-      case GL_LUMINANCE16UI_EXT:
-      case GL_LUMINANCE_ALPHA16UI_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
-	 break;
-      case GL_RGBA8UI_EXT:
-      case GL_RGB8UI_EXT:
-      case GL_ALPHA8UI_EXT:
-      case GL_INTENSITY8UI_EXT:
-      case GL_LUMINANCE8UI_EXT:
-      case GL_LUMINANCE_ALPHA8UI_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
-	 break;
-      case GL_RGBA32I_EXT:
-      case GL_RGB32I_EXT:
-      case GL_ALPHA32I_EXT:
-      case GL_INTENSITY32I_EXT:
-      case GL_LUMINANCE32I_EXT:
-      case GL_LUMINANCE_ALPHA32I_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
-	 break;
-      case GL_RGBA16I_EXT:
-      case GL_RGB16I_EXT:
-      case GL_ALPHA16I_EXT:
-      case GL_INTENSITY16I_EXT:
-      case GL_LUMINANCE16I_EXT:
-      case GL_LUMINANCE_ALPHA16I_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
-	 break;
-      case GL_RGBA8I_EXT:
-      case GL_RGB8I_EXT:
-      case GL_ALPHA8I_EXT:
-      case GL_INTENSITY8I_EXT:
-      case GL_LUMINANCE8I_EXT:
-      case GL_LUMINANCE_ALPHA8I_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
-	 break;
-      }
-   }
-
-   if (ctx->Extensions.ARB_texture_rg) {
-      switch (internalFormat) {
-      case GL_R8:
-      case GL_RED:
-      case GL_COMPRESSED_RED:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_R8);
-	 break;
-
-      case GL_R16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_R16);
-	 break;
-
-      case GL_RG:
-      case GL_RG8:
-      case GL_COMPRESSED_RG:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG88);
-	 break;
-
-      case GL_RG16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG1616);
-	 break;
-
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_texture_format_BGRA8888) {
-      switch (internalFormat) {
-      case GL_BGRA:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ARB_texture_compression_rgtc) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_RED_RGTC1:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RED_RGTC1);
-	    break;
-         case GL_COMPRESSED_SIGNED_RED_RGTC1:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RED_RGTC1);
-	    break;
-         case GL_COMPRESSED_RG_RGTC2:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2);
-	    break;
-         case GL_COMPRESSED_SIGNED_RG_RGTC2:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG_RGTC2);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_texture_compression_latc) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_LUMINANCE_LATC1_EXT:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_L_LATC1);
-            break;
-         case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L_LATC1);
-            break;
-         case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_LA_LATC2);
-            break;
-         case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_LA_LATC2);
-            break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ATI_texture_compression_3dc) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_LA_LATC2);
-            break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");
-   return MESA_FORMAT_NONE;
-}
-
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.7

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (c) 2008-2009 VMware, Inc.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file texformat.c

+ * Texture formats.

+ *

+ * \author Gareth Hughes

+ * \author Brian Paul

+ */

+

+

+#include "context.h"

+#include "mfeatures.h"

+#include "mtypes.h"

+#include "texcompress.h"

+#include "texformat.h"

+

+#define RETURN_IF_SUPPORTED(f) do {		\

+   if (ctx->TextureFormatSupported[f])		\

+      return f;					\

+} while (0)

+

+/**

+ * Choose an appropriate texture format given the format, type and

+ * internalFormat parameters passed to glTexImage().

+ *

+ * \param ctx  the GL context.

+ * \param internalFormat  user's prefered internal texture format.

+ * \param format  incoming image pixel format.

+ * \param type  incoming image data type.

+ *

+ * \return a pointer to a gl_texture_format object which describes the

+ * choosen texture format, or NULL on failure.

+ * 

+ * This is called via dd_function_table::ChooseTextureFormat.  Hardware drivers

+ * will typically override this function with a specialized version.

+ */

+gl_format

+_mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,

+                         GLenum format, GLenum type )

+{

+   (void) format;

+   (void) type;

+

+   switch (internalFormat) {

+      /* shallow RGBA formats */

+      case 4:

+      case GL_RGBA:

+	 if (type == GL_UNSIGNED_SHORT_4_4_4_4_REV) {

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);

+	 } else if (type == GL_UNSIGNED_SHORT_1_5_5_5_REV) {

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);

+	 }

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+

+      case GL_RGBA8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      case GL_RGB5_A1:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);

+	 break;

+      case GL_RGBA2:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444_REV); /* just to test another format*/

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);

+	 break;

+      case GL_RGBA4:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);

+	 break;

+

+      /* deep RGBA formats */

+      case GL_RGB10_A2:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB2101010);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      case GL_RGBA12:

+      case GL_RGBA16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+

+      /* shallow RGB formats */

+      case 3:

+      case GL_RGB:

+      case GL_RGB8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      case GL_R3_G3_B2:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB332);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      case GL_RGB4:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565_REV); /* just to test another format */

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);

+	 break;

+      case GL_RGB5:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);

+	 break;

+

+      /* deep RGB formats */

+      case GL_RGB10:

+      case GL_RGB12:

+      case GL_RGB16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+

+      /* Alpha formats */

+      case GL_ALPHA:

+      case GL_ALPHA4:

+      case GL_ALPHA8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);

+	 break;

+

+      case GL_ALPHA12:

+      case GL_ALPHA16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);

+	 break;

+

+      /* Luminance formats */

+      case 1:

+      case GL_LUMINANCE:

+      case GL_LUMINANCE4:

+      case GL_LUMINANCE8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);

+	 break;

+

+      case GL_LUMINANCE12:

+      case GL_LUMINANCE16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);

+	 break;

+

+      /* Luminance/Alpha formats */

+      case GL_LUMINANCE4_ALPHA4:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL44);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

+

+      case 2:

+      case GL_LUMINANCE_ALPHA:

+      case GL_LUMINANCE6_ALPHA2:

+      case GL_LUMINANCE8_ALPHA8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

+

+      case GL_LUMINANCE12_ALPHA4:

+      case GL_LUMINANCE12_ALPHA12:

+      case GL_LUMINANCE16_ALPHA16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL1616);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

+

+      case GL_INTENSITY:

+      case GL_INTENSITY4:

+      case GL_INTENSITY8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);

+	 break;

+

+      case GL_INTENSITY12:

+      case GL_INTENSITY16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);

+	 break;

+

+      case GL_COLOR_INDEX:

+      case GL_COLOR_INDEX1_EXT:

+      case GL_COLOR_INDEX2_EXT:

+      case GL_COLOR_INDEX4_EXT:

+      case GL_COLOR_INDEX12_EXT:

+      case GL_COLOR_INDEX16_EXT:

+      case GL_COLOR_INDEX8_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_CI8);

+	 break;

+

+      default:

+         ; /* fallthrough */

+   }

+

+   if (ctx->Extensions.ARB_depth_texture) {

+      switch (internalFormat) {

+         case GL_DEPTH_COMPONENT:

+         case GL_DEPTH_COMPONENT24:

+         case GL_DEPTH_COMPONENT32:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z32);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);

+	    break;

+         case GL_DEPTH_COMPONENT16:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z16);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   switch (internalFormat) {

+      case GL_COMPRESSED_ALPHA_ARB:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);

+	 break;

+      case GL_COMPRESSED_LUMINANCE_ARB:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);

+	 break;

+      case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

+      case GL_COMPRESSED_INTENSITY_ARB:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);

+	 break;

+      case GL_COMPRESSED_RGB_ARB:

+         if (ctx->Extensions.EXT_texture_compression_s3tc ||

+             ctx->Extensions.S3_s3tc)

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);

+         if (ctx->Extensions.TDFX_texture_compression_FXT1)

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      case GL_COMPRESSED_RGBA_ARB:

+         if (ctx->Extensions.EXT_texture_compression_s3tc ||

+             ctx->Extensions.S3_s3tc)

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */

+         if (ctx->Extensions.TDFX_texture_compression_FXT1)

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      default:

+         ; /* fallthrough */

+   }

+

+   if (ctx->Extensions.MESA_ycbcr_texture) {

+      if (internalFormat == GL_YCBCR_MESA) {

+         if (type == GL_UNSIGNED_SHORT_8_8_MESA)

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR);

+         else

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR_REV);

+      }

+   }

+

+#if FEATURE_texture_fxt1

+   if (ctx->Extensions.TDFX_texture_compression_FXT1) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_RGB_FXT1_3DFX:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);

+	 break;

+         case GL_COMPRESSED_RGBA_FXT1_3DFX:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);

+	 break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+#endif

+

+#if FEATURE_texture_s3tc

+   if (ctx->Extensions.EXT_texture_compression_s3tc) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);

+	    break;

+         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT1);

+	    break;

+         case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);

+	    break;

+         case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT5);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.S3_s3tc) {

+      switch (internalFormat) {

+         case GL_RGB_S3TC:

+         case GL_RGB4_S3TC:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);

+	    break;

+         case GL_RGBA_S3TC:

+         case GL_RGBA4_S3TC:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+#endif

+

+   if (ctx->Extensions.ARB_texture_float) {

+      switch (internalFormat) {

+         case GL_ALPHA16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);

+	    break;

+         case GL_ALPHA32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32);

+	    break;

+         case GL_LUMINANCE16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16);

+	    break;

+         case GL_LUMINANCE32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32);

+	    break;

+         case GL_LUMINANCE_ALPHA16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16);

+	    break;

+         case GL_LUMINANCE_ALPHA32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32);

+	    break;

+         case GL_INTENSITY16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);

+	    break;

+         case GL_INTENSITY32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32);

+	    break;

+         case GL_RGB16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);

+	    break;

+         case GL_RGB32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT32);

+	    break;

+         case GL_RGBA16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);

+	    break;

+         case GL_RGBA32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.EXT_packed_depth_stencil) {

+      switch (internalFormat) {

+         case GL_DEPTH_STENCIL_EXT:

+         case GL_DEPTH24_STENCIL8_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_S8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ATI_envmap_bumpmap) {

+      switch (internalFormat) {

+         case GL_DUDV_ATI:

+         case GL_DU8DV8_ATI:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_DUDV8);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.EXT_texture_snorm) {

+      switch (internalFormat) {

+         case GL_RED_SNORM:

+         case GL_R8_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R8);

+	    break;

+         case GL_RG_SNORM:

+         case GL_RG8_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG88_REV);

+	    break;

+         case GL_RGB_SNORM:

+         case GL_RGB8_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);

+	    /* FALLTHROUGH */

+         case GL_RGBA_SNORM:

+         case GL_RGBA8_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);

+	    break;

+         case GL_ALPHA_SNORM:

+         case GL_ALPHA8_SNORM:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_A8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);

+            break;

+         case GL_LUMINANCE_SNORM:

+         case GL_LUMINANCE8_SNORM:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);

+            break;

+         case GL_LUMINANCE_ALPHA_SNORM:

+         case GL_LUMINANCE8_ALPHA8_SNORM:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_AL88);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);

+            break;

+         case GL_INTENSITY_SNORM:

+         case GL_INTENSITY8_SNORM:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_I8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);

+            break;

+         case GL_R16_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R16);

+	    break;

+         case GL_RG16_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_GR1616);

+	    break;

+         case GL_RGB16_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGB_16);

+	    /* FALLTHROUGH */

+         case GL_RGBA16_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);

+	    break;

+         case GL_ALPHA16_SNORM:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_A16);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);

+            break;

+         case GL_LUMINANCE16_SNORM:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L16);

+	    /* FALLTHROUGH */

+         case GL_LUMINANCE16_ALPHA16_SNORM:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_AL1616);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);

+            break;

+         case GL_INTENSITY16_SNORM:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_I16);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);

+            break;

+         default:

+            ; /* fall-through */

+      }

+   }

+

+#if FEATURE_EXT_texture_sRGB

+   if (ctx->Extensions.EXT_texture_sRGB) {

+      switch (internalFormat) {

+         case GL_SRGB_EXT:

+         case GL_SRGB8_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_SRGB_ALPHA_EXT:

+         case GL_SRGB8_ALPHA8_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_SLUMINANCE_EXT:

+         case GL_SLUMINANCE8_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_SLUMINANCE_ALPHA_EXT:

+         case GL_SLUMINANCE8_ALPHA8_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_COMPRESSED_SLUMINANCE_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_COMPRESSED_SRGB_EXT:

+#if FEATURE_texture_s3tc

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);

+#endif

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_COMPRESSED_SRGB_ALPHA_EXT:

+#if FEATURE_texture_s3tc

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */

+#endif

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+#if FEATURE_texture_s3tc

+         case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+            break;

+         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT1);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+            break;

+         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+            break;

+         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT5);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+            break;

+#endif

+         default:

+            ; /* fallthrough */

+      }

+   }

+#endif /* FEATURE_EXT_texture_sRGB */

+

+   if (ctx->Extensions.EXT_texture_integer) {

+      switch (internalFormat) {

+      case GL_RGBA32UI_EXT:

+      case GL_RGB32UI_EXT:

+      case GL_ALPHA32UI_EXT:

+      case GL_INTENSITY32UI_EXT:

+      case GL_LUMINANCE32UI_EXT:

+      case GL_LUMINANCE_ALPHA32UI_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);

+	 break;

+      case GL_RGBA16UI_EXT:

+      case GL_RGB16UI_EXT:

+      case GL_ALPHA16UI_EXT:

+      case GL_INTENSITY16UI_EXT:

+      case GL_LUMINANCE16UI_EXT:

+      case GL_LUMINANCE_ALPHA16UI_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);

+	 break;

+      case GL_RGBA8UI_EXT:

+      case GL_RGB8UI_EXT:

+      case GL_ALPHA8UI_EXT:

+      case GL_INTENSITY8UI_EXT:

+      case GL_LUMINANCE8UI_EXT:

+      case GL_LUMINANCE_ALPHA8UI_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);

+	 break;

+      case GL_RGBA32I_EXT:

+      case GL_RGB32I_EXT:

+      case GL_ALPHA32I_EXT:

+      case GL_INTENSITY32I_EXT:

+      case GL_LUMINANCE32I_EXT:

+      case GL_LUMINANCE_ALPHA32I_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);

+	 break;

+      case GL_RGBA16I_EXT:

+      case GL_RGB16I_EXT:

+      case GL_ALPHA16I_EXT:

+      case GL_INTENSITY16I_EXT:

+      case GL_LUMINANCE16I_EXT:

+      case GL_LUMINANCE_ALPHA16I_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);

+	 break;

+      case GL_RGBA8I_EXT:

+      case GL_RGB8I_EXT:

+      case GL_ALPHA8I_EXT:

+      case GL_INTENSITY8I_EXT:

+      case GL_LUMINANCE8I_EXT:

+      case GL_LUMINANCE_ALPHA8I_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);

+	 break;

+      }

+   }

+

+   if (ctx->Extensions.ARB_texture_rg) {

+      switch (internalFormat) {

+      case GL_R8:

+      case GL_RED:

+      case GL_COMPRESSED_RED:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_R8);

+	 break;

+

+      case GL_R16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_R16);

+	 break;

+

+      case GL_RG:

+      case GL_RG8:

+      case GL_COMPRESSED_RG:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG88);

+	 break;

+

+      case GL_RG16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG1616);

+	 break;

+

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.EXT_texture_format_BGRA8888) {

+      switch (internalFormat) {

+      case GL_BGRA:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ARB_texture_compression_rgtc) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_RED_RGTC1:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RED_RGTC1);

+	    break;

+         case GL_COMPRESSED_SIGNED_RED_RGTC1:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RED_RGTC1);

+	    break;

+         case GL_COMPRESSED_RG_RGTC2:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2);

+	    break;

+         case GL_COMPRESSED_SIGNED_RG_RGTC2:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG_RGTC2);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.EXT_texture_compression_latc) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_L_LATC1);

+            break;

+         case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L_LATC1);

+            break;

+         case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_LA_LATC2);

+            break;

+         case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_LA_LATC2);

+            break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ATI_texture_compression_3dc) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

+            RETURN_IF_SUPPORTED(MESA_FORMAT_LA_LATC2);

+            break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");

+   return MESA_FORMAT_NONE;

+}

+

diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index 34b6addb9..81696b0e0 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -1,1460 +1,1460 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-/** 
- * \file texparam.c
- *
- * glTexParameter-related functions
- */
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/context.h"
-#include "main/enums.h"
-#include "main/formats.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-#include "main/mtypes.h"
-#include "main/state.h"
-#include "main/texcompress.h"
-#include "main/texparam.h"
-#include "main/teximage.h"
-#include "main/texstate.h"
-#include "main/texfetch.h"
-#include "program/prog_instruction.h"
-
-
-/**
- * Check if a coordinate wrap mode is supported for the texture target.
- * \return GL_TRUE if legal, GL_FALSE otherwise
- */
-static GLboolean 
-validate_texture_wrap_mode(struct gl_context * ctx, GLenum target, GLenum wrap)
-{
-   const struct gl_extensions * const e = & ctx->Extensions;
-
-   if (wrap == GL_CLAMP || wrap == GL_CLAMP_TO_EDGE ||
-       (wrap == GL_CLAMP_TO_BORDER && e->ARB_texture_border_clamp)) {
-      /* any texture target */
-      return GL_TRUE;
-   }
-   else if (target != GL_TEXTURE_RECTANGLE_NV &&
-	    (wrap == GL_REPEAT ||
-	     (wrap == GL_MIRRORED_REPEAT &&
-	      e->ARB_texture_mirrored_repeat) ||
-	     (wrap == GL_MIRROR_CLAMP_EXT &&
-	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||
-	     (wrap == GL_MIRROR_CLAMP_TO_EDGE_EXT &&
-	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||
-	     (wrap == GL_MIRROR_CLAMP_TO_BORDER_EXT &&
-	      (e->EXT_texture_mirror_clamp)))) {
-      /* non-rectangle texture */
-      return GL_TRUE;
-   }
-
-   _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)", wrap );
-   return GL_FALSE;
-}
-
-
-/**
- * Get current texture object for given target.
- * Return NULL if any error (and record the error).
- * Note that this is different from _mesa_select_tex_object() in that proxy
- * targets are not accepted.
- * Only the glGetTexLevelParameter() functions accept proxy targets.
- */
-static struct gl_texture_object *
-get_texobj(struct gl_context *ctx, GLenum target, GLboolean get)
-{
-   struct gl_texture_unit *texUnit;
-
-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxCombinedTextureImageUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "gl%sTexParameter(current unit)", get ? "Get" : "");
-      return NULL;
-   }
-
-   texUnit = _mesa_get_current_tex_unit(ctx);
-
-   switch (target) {
-   case GL_TEXTURE_1D:
-      return texUnit->CurrentTex[TEXTURE_1D_INDEX];
-   case GL_TEXTURE_2D:
-      return texUnit->CurrentTex[TEXTURE_2D_INDEX];
-   case GL_TEXTURE_3D:
-      return texUnit->CurrentTex[TEXTURE_3D_INDEX];
-   case GL_TEXTURE_CUBE_MAP:
-      if (ctx->Extensions.ARB_texture_cube_map) {
-         return texUnit->CurrentTex[TEXTURE_CUBE_INDEX];
-      }
-      break;
-   case GL_TEXTURE_RECTANGLE_NV:
-      if (ctx->Extensions.NV_texture_rectangle) {
-         return texUnit->CurrentTex[TEXTURE_RECT_INDEX];
-      }
-      break;
-   case GL_TEXTURE_1D_ARRAY_EXT:
-      if (ctx->Extensions.MESA_texture_array ||
-          ctx->Extensions.EXT_texture_array) {
-         return texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX];
-      }
-      break;
-   case GL_TEXTURE_2D_ARRAY_EXT:
-      if (ctx->Extensions.MESA_texture_array ||
-          ctx->Extensions.EXT_texture_array) {
-         return texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX];
-      }
-      break;
-   default:
-      ;
-   }
-
-   _mesa_error(ctx, GL_INVALID_ENUM,
-                  "gl%sTexParameter(target)", get ? "Get" : "");
-   return NULL;
-}
-
-
-/**
- * Convert GL_RED/GREEN/BLUE/ALPHA/ZERO/ONE to SWIZZLE_X/Y/Z/W/ZERO/ONE.
- * \return -1 if error.
- */
-static GLint
-comp_to_swizzle(GLenum comp)
-{
-   switch (comp) {
-   case GL_RED:
-      return SWIZZLE_X;
-   case GL_GREEN:
-      return SWIZZLE_Y;
-   case GL_BLUE:
-      return SWIZZLE_Z;
-   case GL_ALPHA:
-      return SWIZZLE_W;
-   case GL_ZERO:
-      return SWIZZLE_ZERO;
-   case GL_ONE:
-      return SWIZZLE_ONE;
-   default:
-      return -1;
-   }
-}
-
-
-static void
-set_swizzle_component(GLuint *swizzle, GLuint comp, GLuint swz)
-{
-   ASSERT(comp < 4);
-   ASSERT(swz <= SWIZZLE_NIL);
-   {
-      GLuint mask = 0x7 << (3 * comp);
-      GLuint s = (*swizzle & ~mask) | (swz << (3 * comp));
-      *swizzle = s;
-   }
-}
-
-
-/**
- * This is called just prior to changing any texture object state which
- * will not effect texture completeness.
- */
-static INLINE void
-flush(struct gl_context *ctx)
-{
-   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-}
-
-
-/**
- * This is called just prior to changing any texture object state which
- * can effect texture completeness (texture base level, max level,
- * minification filter).
- * Any pending rendering will be flushed out, we'll set the _NEW_TEXTURE
- * state flag and then mark the texture object as 'incomplete' so that any
- * per-texture derived state gets recomputed.
- */
-static INLINE void
-incomplete(struct gl_context *ctx, struct gl_texture_object *texObj)
-{
-   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-   texObj->_Complete = GL_FALSE;
-}
-
-
-/**
- * Set an integer-valued texture parameter
- * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise
- */
-static GLboolean
-set_tex_parameteri(struct gl_context *ctx,
-                   struct gl_texture_object *texObj,
-                   GLenum pname, const GLint *params)
-{
-   switch (pname) {
-   case GL_TEXTURE_MIN_FILTER:
-      if (texObj->MinFilter == params[0])
-         return GL_FALSE;
-      switch (params[0]) {
-      case GL_NEAREST:
-      case GL_LINEAR:
-         incomplete(ctx, texObj);
-         texObj->MinFilter = params[0];
-         return GL_TRUE;
-      case GL_NEAREST_MIPMAP_NEAREST:
-      case GL_LINEAR_MIPMAP_NEAREST:
-      case GL_NEAREST_MIPMAP_LINEAR:
-      case GL_LINEAR_MIPMAP_LINEAR:
-         if (texObj->Target != GL_TEXTURE_RECTANGLE_NV) {
-            incomplete(ctx, texObj);
-            texObj->MinFilter = params[0];
-            return GL_TRUE;
-         }
-         /* fall-through */
-      default:
-         goto invalid_param;
-      }
-      return GL_FALSE;
-
-   case GL_TEXTURE_MAG_FILTER:
-      if (texObj->MagFilter == params[0])
-         return GL_FALSE;
-      switch (params[0]) {
-      case GL_NEAREST:
-      case GL_LINEAR:
-         flush(ctx); /* does not effect completeness */
-         texObj->MagFilter = params[0];
-         return GL_TRUE;
-      default:
-         goto invalid_param;
-      }
-      return GL_FALSE;
-
-   case GL_TEXTURE_WRAP_S:
-      if (texObj->WrapS == params[0])
-         return GL_FALSE;
-      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
-         flush(ctx);
-         texObj->WrapS = params[0];
-         return GL_TRUE;
-      }
-      return GL_FALSE;
-
-   case GL_TEXTURE_WRAP_T:
-      if (texObj->WrapT == params[0])
-         return GL_FALSE;
-      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
-         flush(ctx);
-         texObj->WrapT = params[0];
-         return GL_TRUE;
-      }
-      return GL_FALSE;
-
-   case GL_TEXTURE_WRAP_R:
-      if (texObj->WrapR == params[0])
-         return GL_FALSE;
-      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {
-         flush(ctx);
-         texObj->WrapR = params[0];
-         return GL_TRUE;
-      }
-      return GL_FALSE;
-
-   case GL_TEXTURE_BASE_LEVEL:
-      if (texObj->BaseLevel == params[0])
-         return GL_FALSE;
-      if (params[0] < 0 ||
-          (texObj->Target == GL_TEXTURE_RECTANGLE_ARB && params[0] != 0)) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glTexParameter(param=%d)", params[0]);
-         return GL_FALSE;
-      }
-      incomplete(ctx, texObj);
-      texObj->BaseLevel = params[0];
-      return GL_TRUE;
-
-   case GL_TEXTURE_MAX_LEVEL:
-      if (texObj->MaxLevel == params[0])
-         return GL_FALSE;
-      if (params[0] < 0 || texObj->Target == GL_TEXTURE_RECTANGLE_ARB) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexParameter(param=%d)", params[0]);
-         return GL_FALSE;
-      }
-      incomplete(ctx, texObj);
-      texObj->MaxLevel = params[0];
-      return GL_TRUE;
-
-   case GL_GENERATE_MIPMAP_SGIS:
-      if (texObj->GenerateMipmap != params[0]) {
-         /* no flush() */
-	 texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
-	 return GL_TRUE;
-      }
-      return GL_FALSE;
-
-   case GL_TEXTURE_COMPARE_MODE_ARB:
-      if (ctx->Extensions.ARB_shadow) {
-         if (texObj->CompareMode == params[0])
-            return GL_FALSE;
-         if (params[0] == GL_NONE ||
-             params[0] == GL_COMPARE_R_TO_TEXTURE_ARB) {
-            flush(ctx);
-            texObj->CompareMode = params[0];
-            return GL_TRUE;
-         }
-         goto invalid_param;
-      }
-      goto invalid_pname;
-
-   case GL_TEXTURE_COMPARE_FUNC_ARB:
-      if (ctx->Extensions.ARB_shadow) {
-         if (texObj->CompareFunc == params[0])
-            return GL_FALSE;
-         switch (params[0]) {
-         case GL_LEQUAL:
-         case GL_GEQUAL:
-            flush(ctx);
-            texObj->CompareFunc = params[0];
-            return GL_TRUE;
-         case GL_EQUAL:
-         case GL_NOTEQUAL:
-         case GL_LESS:
-         case GL_GREATER:
-         case GL_ALWAYS:
-         case GL_NEVER:
-            if (ctx->Extensions.EXT_shadow_funcs) {
-               flush(ctx);
-               texObj->CompareFunc = params[0];
-               return GL_TRUE;
-            }
-            /* fall-through */
-         default:
-            goto invalid_param;
-         }
-      }
-      goto invalid_pname;
-
-   case GL_DEPTH_TEXTURE_MODE_ARB:
-      if (ctx->Extensions.ARB_depth_texture) {
-         if (texObj->DepthMode == params[0])
-            return GL_FALSE;
-         if (params[0] == GL_LUMINANCE ||
-             params[0] == GL_INTENSITY ||
-             params[0] == GL_ALPHA ||
-             (ctx->Extensions.ARB_texture_rg && params[0] == GL_RED)) {
-            flush(ctx);
-            texObj->DepthMode = params[0];
-            return GL_TRUE;
-         }
-         goto invalid_param;
-      }
-      goto invalid_pname;
-
-#if FEATURE_OES_draw_texture
-   case GL_TEXTURE_CROP_RECT_OES:
-      texObj->CropRect[0] = params[0];
-      texObj->CropRect[1] = params[1];
-      texObj->CropRect[2] = params[2];
-      texObj->CropRect[3] = params[3];
-      return GL_TRUE;
-#endif
-
-   case GL_TEXTURE_SWIZZLE_R_EXT:
-   case GL_TEXTURE_SWIZZLE_G_EXT:
-   case GL_TEXTURE_SWIZZLE_B_EXT:
-   case GL_TEXTURE_SWIZZLE_A_EXT:
-      if (ctx->Extensions.EXT_texture_swizzle) {
-         const GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
-         const GLint swz = comp_to_swizzle(params[0]);
-         if (swz < 0) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glTexParameter(swizzle 0x%x)", params[0]);
-            return GL_FALSE;
-         }
-         ASSERT(comp < 4);
-         if (swz >= 0) {
-            flush(ctx);
-            texObj->Swizzle[comp] = params[0];
-            set_swizzle_component(&texObj->_Swizzle, comp, swz);
-            return GL_TRUE;
-         }
-      }
-      goto invalid_pname;
-
-   case GL_TEXTURE_SWIZZLE_RGBA_EXT:
-      if (ctx->Extensions.EXT_texture_swizzle) {
-         GLuint comp;
-         flush(ctx);
-         for (comp = 0; comp < 4; comp++) {
-            const GLint swz = comp_to_swizzle(params[comp]);
-            if (swz >= 0) {
-               texObj->Swizzle[comp] = params[comp];
-               set_swizzle_component(&texObj->_Swizzle, comp, swz);
-            }
-            else {
-               _mesa_error(ctx, GL_INVALID_OPERATION,
-                           "glTexParameter(swizzle 0x%x)", params[comp]);
-               return GL_FALSE;
-            }
-         }
-         return GL_TRUE;
-      }
-      goto invalid_pname;
-
-   case GL_TEXTURE_SRGB_DECODE_EXT:
-      if (ctx->Extensions.EXT_texture_sRGB_decode) {
-	 GLenum decode = params[0];
-	 if (decode == GL_DECODE_EXT || decode == GL_SKIP_DECODE_EXT) {
-	    if (texObj->sRGBDecode != decode) {
-	       flush(ctx);
-	       texObj->sRGBDecode = decode;
-	       _mesa_update_fetch_functions(texObj);
-	    }
-	    return GL_TRUE;
-	 }
-      }
-      goto invalid_pname;
-
-   default:
-      goto invalid_pname;
-   }
-
-invalid_pname:
-   _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=%s)",
-               _mesa_lookup_enum_by_nr(pname));
-   return GL_FALSE;
-
-invalid_param:
-   _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param=%s)",
-               _mesa_lookup_enum_by_nr(params[0]));
-   return GL_FALSE;
-}
-
-
-/**
- * Set a float-valued texture parameter
- * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise
- */
-static GLboolean
-set_tex_parameterf(struct gl_context *ctx,
-                   struct gl_texture_object *texObj,
-                   GLenum pname, const GLfloat *params)
-{
-   switch (pname) {
-   case GL_TEXTURE_MIN_LOD:
-      if (texObj->MinLod == params[0])
-         return GL_FALSE;
-      flush(ctx);
-      texObj->MinLod = params[0];
-      return GL_TRUE;
-
-   case GL_TEXTURE_MAX_LOD:
-      if (texObj->MaxLod == params[0])
-         return GL_FALSE;
-      flush(ctx);
-      texObj->MaxLod = params[0];
-      return GL_TRUE;
-
-   case GL_TEXTURE_PRIORITY:
-      flush(ctx);
-      texObj->Priority = CLAMP(params[0], 0.0F, 1.0F);
-      return GL_TRUE;
-
-   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-      if (ctx->Extensions.EXT_texture_filter_anisotropic) {
-         if (texObj->MaxAnisotropy == params[0])
-            return GL_FALSE;
-         if (params[0] < 1.0) {
-            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
-            return GL_FALSE;
-         }
-         flush(ctx);
-         /* clamp to max, that's what NVIDIA does */
-         texObj->MaxAnisotropy = MIN2(params[0],
-                                      ctx->Const.MaxTextureMaxAnisotropy);
-         return GL_TRUE;
-      }
-      else {
-         static GLuint count = 0;
-         if (count++ < 10)
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");
-      }
-      return GL_FALSE;
-
-   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
-      if (ctx->Extensions.ARB_shadow_ambient) {
-         if (texObj->CompareFailValue != params[0]) {
-            flush(ctx);
-            texObj->CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);
-            return GL_TRUE;
-         }
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                    "glTexParameter(pname=GL_TEXTURE_COMPARE_FAIL_VALUE_ARB)");
-      }
-      return GL_FALSE;
-
-   case GL_TEXTURE_LOD_BIAS:
-      /* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias */
-      if (ctx->Extensions.EXT_texture_lod_bias) {
-         if (texObj->LodBias != params[0]) {
-            flush(ctx);
-            texObj->LodBias = params[0];
-            return GL_TRUE;
-         }
-         return GL_FALSE;
-      }
-      break;
-
-   case GL_TEXTURE_BORDER_COLOR:
-      flush(ctx);
-      /* ARB_texture_float disables clamping */
-      if (ctx->Extensions.ARB_texture_float) {
-         texObj->BorderColor.f[RCOMP] = params[0];
-         texObj->BorderColor.f[GCOMP] = params[1];
-         texObj->BorderColor.f[BCOMP] = params[2];
-         texObj->BorderColor.f[ACOMP] = params[3];
-      } else {
-         texObj->BorderColor.f[RCOMP] = CLAMP(params[0], 0.0F, 1.0F);
-         texObj->BorderColor.f[GCOMP] = CLAMP(params[1], 0.0F, 1.0F);
-         texObj->BorderColor.f[BCOMP] = CLAMP(params[2], 0.0F, 1.0F);
-         texObj->BorderColor.f[ACOMP] = CLAMP(params[3], 0.0F, 1.0F);
-      }
-      return GL_TRUE;
-
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
-   }
-   return GL_FALSE;
-}
-
-
-void GLAPIENTRY
-_mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
-{
-   GLboolean need_update;
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   texObj = get_texobj(ctx, target, GL_FALSE);
-   if (!texObj)
-      return;
-
-   switch (pname) {
-   case GL_TEXTURE_MIN_FILTER:
-   case GL_TEXTURE_MAG_FILTER:
-   case GL_TEXTURE_WRAP_S:
-   case GL_TEXTURE_WRAP_T:
-   case GL_TEXTURE_WRAP_R:
-   case GL_TEXTURE_BASE_LEVEL:
-   case GL_TEXTURE_MAX_LEVEL:
-   case GL_GENERATE_MIPMAP_SGIS:
-   case GL_TEXTURE_COMPARE_MODE_ARB:
-   case GL_TEXTURE_COMPARE_FUNC_ARB:
-   case GL_DEPTH_TEXTURE_MODE_ARB:
-   case GL_TEXTURE_SRGB_DECODE_EXT:
-      {
-         /* convert float param to int */
-         GLint p[4];
-         p[0] = (GLint) param;
-         p[1] = p[2] = p[3] = 0;
-         need_update = set_tex_parameteri(ctx, texObj, pname, p);
-      }
-      break;
-   default:
-      {
-         /* this will generate an error if pname is illegal */
-         GLfloat p[4];
-         p[0] = param;
-         p[1] = p[2] = p[3] = 0.0F;
-         need_update = set_tex_parameterf(ctx, texObj, pname, p);
-      }
-   }
-
-   if (ctx->Driver.TexParameter && need_update) {
-      ctx->Driver.TexParameter(ctx, target, texObj, pname, &param);
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-   GLboolean need_update;
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   texObj = get_texobj(ctx, target, GL_FALSE);
-   if (!texObj)
-      return;
-
-   switch (pname) {
-   case GL_TEXTURE_MIN_FILTER:
-   case GL_TEXTURE_MAG_FILTER:
-   case GL_TEXTURE_WRAP_S:
-   case GL_TEXTURE_WRAP_T:
-   case GL_TEXTURE_WRAP_R:
-   case GL_TEXTURE_BASE_LEVEL:
-   case GL_TEXTURE_MAX_LEVEL:
-   case GL_GENERATE_MIPMAP_SGIS:
-   case GL_TEXTURE_COMPARE_MODE_ARB:
-   case GL_TEXTURE_COMPARE_FUNC_ARB:
-   case GL_DEPTH_TEXTURE_MODE_ARB:
-   case GL_TEXTURE_SRGB_DECODE_EXT:
-      {
-         /* convert float param to int */
-         GLint p[4];
-         p[0] = (GLint) params[0];
-         p[1] = p[2] = p[3] = 0;
-         need_update = set_tex_parameteri(ctx, texObj, pname, p);
-      }
-      break;
-
-#if FEATURE_OES_draw_texture
-   case GL_TEXTURE_CROP_RECT_OES:
-      {
-         /* convert float params to int */
-         GLint iparams[4];
-         iparams[0] = (GLint) params[0];
-         iparams[1] = (GLint) params[1];
-         iparams[2] = (GLint) params[2];
-         iparams[3] = (GLint) params[3];
-         need_update = set_tex_parameteri(ctx, texObj, pname, iparams);
-      }
-      break;
-#endif
-
-   default:
-      /* this will generate an error if pname is illegal */
-      need_update = set_tex_parameterf(ctx, texObj, pname, params);
-   }
-
-   if (ctx->Driver.TexParameter && need_update) {
-      ctx->Driver.TexParameter(ctx, target, texObj, pname, params);
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_TexParameteri(GLenum target, GLenum pname, GLint param)
-{
-   GLboolean need_update;
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   texObj = get_texobj(ctx, target, GL_FALSE);
-   if (!texObj)
-      return;
-
-   switch (pname) {
-   case GL_TEXTURE_MIN_LOD:
-   case GL_TEXTURE_MAX_LOD:
-   case GL_TEXTURE_PRIORITY:
-   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-   case GL_TEXTURE_LOD_BIAS:
-   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
-      {
-         GLfloat fparam[4];
-         fparam[0] = (GLfloat) param;
-         fparam[1] = fparam[2] = fparam[3] = 0.0F;
-         /* convert int param to float */
-         need_update = set_tex_parameterf(ctx, texObj, pname, fparam);
-      }
-      break;
-   default:
-      /* this will generate an error if pname is illegal */
-      {
-         GLint iparam[4];
-         iparam[0] = param;
-         iparam[1] = iparam[2] = iparam[3] = 0;
-         need_update = set_tex_parameteri(ctx, texObj, pname, iparam);
-      }
-   }
-
-   if (ctx->Driver.TexParameter && need_update) {
-      GLfloat fparam = (GLfloat) param;
-      ctx->Driver.TexParameter(ctx, target, texObj, pname, &fparam);
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-   GLboolean need_update;
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   texObj = get_texobj(ctx, target, GL_FALSE);
-   if (!texObj)
-      return;
-
-   switch (pname) {
-   case GL_TEXTURE_BORDER_COLOR:
-      {
-         /* convert int params to float */
-         GLfloat fparams[4];
-         fparams[0] = INT_TO_FLOAT(params[0]);
-         fparams[1] = INT_TO_FLOAT(params[1]);
-         fparams[2] = INT_TO_FLOAT(params[2]);
-         fparams[3] = INT_TO_FLOAT(params[3]);
-         need_update = set_tex_parameterf(ctx, texObj, pname, fparams);
-      }
-      break;
-   case GL_TEXTURE_MIN_LOD:
-   case GL_TEXTURE_MAX_LOD:
-   case GL_TEXTURE_PRIORITY:
-   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-   case GL_TEXTURE_LOD_BIAS:
-   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
-      {
-         /* convert int param to float */
-         GLfloat fparams[4];
-         fparams[0] = (GLfloat) params[0];
-         fparams[1] = fparams[2] = fparams[3] = 0.0F;
-         need_update = set_tex_parameterf(ctx, texObj, pname, fparams);
-      }
-      break;
-   default:
-      /* this will generate an error if pname is illegal */
-      need_update = set_tex_parameteri(ctx, texObj, pname, params);
-   }
-
-   if (ctx->Driver.TexParameter && need_update) {
-      GLfloat fparams[4];
-      fparams[0] = INT_TO_FLOAT(params[0]);
-      if (pname == GL_TEXTURE_BORDER_COLOR ||
-          pname == GL_TEXTURE_CROP_RECT_OES) {
-         fparams[1] = INT_TO_FLOAT(params[1]);
-         fparams[2] = INT_TO_FLOAT(params[2]);
-         fparams[3] = INT_TO_FLOAT(params[3]);
-      }
-      ctx->Driver.TexParameter(ctx, target, texObj, pname, fparams);
-   }
-}
-
-
-/**
- * Set tex parameter to integer value(s).  Primarily intended to set
- * integer-valued texture border color (for integer-valued textures).
- * New in GL 3.0.
- */
-void GLAPIENTRY
-_mesa_TexParameterIiv(GLenum target, GLenum pname, const GLint *params)
-{
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   texObj = get_texobj(ctx, target, GL_FALSE);
-   if (!texObj)
-      return;
-
-   switch (pname) {
-   case GL_TEXTURE_BORDER_COLOR:
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-      /* set the integer-valued border color */
-      COPY_4V(texObj->BorderColor.i, params);
-      break;
-   default:
-      _mesa_TexParameteriv(target, pname, params);
-      break;
-   }
-   /* XXX no driver hook for TexParameterIiv() yet */
-}
-
-
-/**
- * Set tex parameter to unsigned integer value(s).  Primarily intended to set
- * uint-valued texture border color (for integer-valued textures).
- * New in GL 3.0
- */
-void GLAPIENTRY
-_mesa_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
-{
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   texObj = get_texobj(ctx, target, GL_FALSE);
-   if (!texObj)
-      return;
-
-   switch (pname) {
-   case GL_TEXTURE_BORDER_COLOR:
-      FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-      /* set the unsigned integer-valued border color */
-      COPY_4V(texObj->BorderColor.ui, params);
-      break;
-   default:
-      _mesa_TexParameteriv(target, pname, (const GLint *) params);
-      break;
-   }
-   /* XXX no driver hook for TexParameterIuiv() yet */
-}
-
-
-
-
-void GLAPIENTRY
-_mesa_GetTexLevelParameterfv( GLenum target, GLint level,
-                              GLenum pname, GLfloat *params )
-{
-   GLint iparam;
-   _mesa_GetTexLevelParameteriv( target, level, pname, &iparam );
-   *params = (GLfloat) iparam;
-}
-
-
-void GLAPIENTRY
-_mesa_GetTexLevelParameteriv( GLenum target, GLint level,
-                              GLenum pname, GLint *params )
-{
-   const struct gl_texture_unit *texUnit;
-   struct gl_texture_object *texObj;
-   const struct gl_texture_image *img = NULL;
-   GLint maxLevels;
-   gl_format texFormat;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxCombinedTextureImageUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetTexLevelParameteriv(current unit)");
-      return;
-   }
-
-   texUnit = _mesa_get_current_tex_unit(ctx);
-
-   /* this will catch bad target values */
-   maxLevels = _mesa_max_texture_levels(ctx, target);
-   if (maxLevels == 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetTexLevelParameter[if]v(target=0x%x)", target);
-      return;
-   }
-
-   if (level < 0 || level >= maxLevels) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexLevelParameter[if]v" );
-      return;
-   }
-
-   texObj = _mesa_select_tex_object(ctx, texUnit, target);
-
-   img = _mesa_select_tex_image(ctx, texObj, target, level);
-   if (!img || !img->TexFormat) {
-      /* undefined texture image */
-      if (pname == GL_TEXTURE_COMPONENTS)
-         *params = 1;
-      else
-         *params = 0;
-      return;
-   }
-
-   texFormat = img->TexFormat;
-
-   switch (pname) {
-      case GL_TEXTURE_WIDTH:
-         *params = img->Width;
-         break;
-      case GL_TEXTURE_HEIGHT:
-         *params = img->Height;
-         break;
-      case GL_TEXTURE_DEPTH:
-         *params = img->Depth;
-         break;
-      case GL_TEXTURE_INTERNAL_FORMAT:
-         if (_mesa_is_format_compressed(texFormat)) {
-            /* need to return the actual compressed format */
-            *params = _mesa_compressed_format_to_glenum(ctx, texFormat);
-         }
-         else {
-            /* return the user's requested internal format */
-            *params = img->InternalFormat;
-         }
-         break;
-      case GL_TEXTURE_BORDER:
-         *params = img->Border;
-         break;
-      case GL_TEXTURE_RED_SIZE:
-         if (img->_BaseFormat == GL_RED) {
-            *params = _mesa_get_format_bits(texFormat, pname);
-	    break;
-	 }
-	 /* FALLTHROUGH */
-      case GL_TEXTURE_GREEN_SIZE:
-         if (img->_BaseFormat == GL_RG) {
-            *params = _mesa_get_format_bits(texFormat, pname);
-	    break;
-	 }
-	 /* FALLTHROUGH */
-      case GL_TEXTURE_BLUE_SIZE:
-         if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)
-            *params = _mesa_get_format_bits(texFormat, pname);
-         else
-            *params = 0;
-         break;
-      case GL_TEXTURE_ALPHA_SIZE:
-         if (img->_BaseFormat == GL_ALPHA ||
-             img->_BaseFormat == GL_LUMINANCE_ALPHA ||
-             img->_BaseFormat == GL_RGBA)
-            *params = _mesa_get_format_bits(texFormat, pname);
-         else
-            *params = 0;
-         break;
-      case GL_TEXTURE_INTENSITY_SIZE:
-         if (img->_BaseFormat != GL_INTENSITY)
-            *params = 0;
-         else {
-            *params = _mesa_get_format_bits(texFormat, pname);
-            if (*params == 0) {
-               /* intensity probably stored as rgb texture */
-               *params = MIN2(_mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE),
-                              _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE));
-            }
-         }
-         break;
-      case GL_TEXTURE_LUMINANCE_SIZE:
-         if (img->_BaseFormat != GL_LUMINANCE &&
-             img->_BaseFormat != GL_LUMINANCE_ALPHA)
-            *params = 0;
-         else {
-            *params = _mesa_get_format_bits(texFormat, pname);
-            if (*params == 0) {
-               /* luminance probably stored as rgb texture */
-               *params = MIN2(_mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE),
-                              _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE));
-            }
-         }
-         break;
-      case GL_TEXTURE_INDEX_SIZE_EXT:
-         if (img->_BaseFormat == GL_COLOR_INDEX)
-            *params = _mesa_get_format_bits(texFormat, pname);
-         else
-            *params = 0;
-         break;
-      case GL_TEXTURE_DEPTH_SIZE_ARB:
-         if (ctx->Extensions.ARB_depth_texture)
-            *params = _mesa_get_format_bits(texFormat, pname);
-         else
-            goto invalid_pname;
-         break;
-      case GL_TEXTURE_STENCIL_SIZE_EXT:
-         if (ctx->Extensions.EXT_packed_depth_stencil ||
-             ctx->Extensions.ARB_framebuffer_object) {
-            *params = _mesa_get_format_bits(texFormat, pname);
-         }
-         else {
-            goto invalid_pname;
-         }
-         break;
-      case GL_TEXTURE_SHARED_SIZE:
-         if (ctx->VersionMajor >= 3) {
-            /* XXX return number of exponent bits for shared exponent texture
-             * formats, like GL_RGB9_E5.
-             */
-            *params = 0;
-         }
-         else {
-            goto invalid_pname;
-         }
-         break;
-
-      /* GL_ARB_texture_compression */
-      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
-	 if (_mesa_is_format_compressed(texFormat) &&
-             !_mesa_is_proxy_texture(target)) {
-            *params = _mesa_format_image_size(texFormat, img->Width,
-                                              img->Height, img->Depth);
-	 }
-	 else {
-	    _mesa_error(ctx, GL_INVALID_OPERATION,
-			"glGetTexLevelParameter[if]v(pname)");
-	 }
-         break;
-      case GL_TEXTURE_COMPRESSED:
-         *params = (GLint) _mesa_is_format_compressed(texFormat);
-         break;
-
-      /* GL_ARB_texture_float */
-      case GL_TEXTURE_RED_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE) ?
-               _mesa_get_format_datatype(texFormat) : GL_NONE;
-         }
-         else {
-            goto invalid_pname;
-         }
-         break;
-      case GL_TEXTURE_GREEN_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE) ?
-               _mesa_get_format_datatype(texFormat) : GL_NONE;
-         }
-         else {
-            goto invalid_pname;
-         }
-         break;
-      case GL_TEXTURE_BLUE_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_BLUE_SIZE) ?
-               _mesa_get_format_datatype(texFormat) : GL_NONE;
-         }
-         else {
-            goto invalid_pname;
-         }
-         break;
-      case GL_TEXTURE_ALPHA_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_ALPHA_SIZE) ?
-               _mesa_get_format_datatype(texFormat) : GL_NONE;
-         }
-         else {
-            goto invalid_pname;
-         }
-         break;
-      case GL_TEXTURE_LUMINANCE_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_LUMINANCE_SIZE) ?
-               _mesa_get_format_datatype(texFormat) : GL_NONE;
-         }
-         else {
-            goto invalid_pname;
-         }
-         break;
-      case GL_TEXTURE_INTENSITY_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_INTENSITY_SIZE) ?
-               _mesa_get_format_datatype(texFormat) : GL_NONE;
-         }
-         else {
-            goto invalid_pname;
-         }
-         break;
-      case GL_TEXTURE_DEPTH_TYPE_ARB:
-         if (ctx->Extensions.ARB_texture_float) {
-            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_DEPTH_SIZE) ?
-               _mesa_get_format_datatype(texFormat) : GL_NONE;
-         }
-         else {
-            goto invalid_pname;
-         }
-         break;
-
-      default:
-         goto invalid_pname;
-   }
-
-   /* no error if we get here */
-   return;
-
-invalid_pname:
-   _mesa_error(ctx, GL_INVALID_ENUM,
-               "glGetTexLevelParameter[if]v(pname=%s)",
-               _mesa_lookup_enum_by_nr(pname));
-}
-
-
-
-void GLAPIENTRY
-_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
-{
-   struct gl_texture_object *obj;
-   GLboolean error = GL_FALSE;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   obj = get_texobj(ctx, target, GL_TRUE);
-   if (!obj)
-      return;
-
-   _mesa_lock_texture(ctx, obj);
-   switch (pname) {
-      case GL_TEXTURE_MAG_FILTER:
-	 *params = ENUM_TO_FLOAT(obj->MagFilter);
-	 break;
-      case GL_TEXTURE_MIN_FILTER:
-         *params = ENUM_TO_FLOAT(obj->MinFilter);
-         break;
-      case GL_TEXTURE_WRAP_S:
-         *params = ENUM_TO_FLOAT(obj->WrapS);
-         break;
-      case GL_TEXTURE_WRAP_T:
-         *params = ENUM_TO_FLOAT(obj->WrapT);
-         break;
-      case GL_TEXTURE_WRAP_R:
-         *params = ENUM_TO_FLOAT(obj->WrapR);
-         break;
-      case GL_TEXTURE_BORDER_COLOR:
-         if(ctx->NewState & (_NEW_BUFFERS | _NEW_FRAG_CLAMP))
-            _mesa_update_state_locked(ctx);
-         if(ctx->Color._ClampFragmentColor)
-         {
-            params[0] = CLAMP(obj->BorderColor.f[0], 0.0F, 1.0F);
-            params[1] = CLAMP(obj->BorderColor.f[1], 0.0F, 1.0F);
-            params[2] = CLAMP(obj->BorderColor.f[2], 0.0F, 1.0F);
-            params[3] = CLAMP(obj->BorderColor.f[3], 0.0F, 1.0F);
-         }
-         else
-         {
-            params[0] = obj->BorderColor.f[0];
-            params[1] = obj->BorderColor.f[1];
-            params[2] = obj->BorderColor.f[2];
-            params[3] = obj->BorderColor.f[3];
-         }
-         break;
-      case GL_TEXTURE_RESIDENT:
-         {
-            GLboolean resident;
-            if (ctx->Driver.IsTextureResident)
-               resident = ctx->Driver.IsTextureResident(ctx, obj);
-            else
-               resident = GL_TRUE;
-            *params = ENUM_TO_FLOAT(resident);
-         }
-         break;
-      case GL_TEXTURE_PRIORITY:
-         *params = obj->Priority;
-         break;
-      case GL_TEXTURE_MIN_LOD:
-         *params = obj->MinLod;
-         break;
-      case GL_TEXTURE_MAX_LOD:
-         *params = obj->MaxLod;
-         break;
-      case GL_TEXTURE_BASE_LEVEL:
-         *params = (GLfloat) obj->BaseLevel;
-         break;
-      case GL_TEXTURE_MAX_LEVEL:
-         *params = (GLfloat) obj->MaxLevel;
-         break;
-      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
-            *params = obj->MaxAnisotropy;
-         }
-	 else
-	    error = GL_TRUE;
-         break;
-      case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
-         if (ctx->Extensions.ARB_shadow_ambient) {
-            *params = obj->CompareFailValue;
-         }
-	 else 
-	    error = GL_TRUE;
-         break;
-      case GL_GENERATE_MIPMAP_SGIS:
-	 *params = (GLfloat) obj->GenerateMipmap;
-         break;
-      case GL_TEXTURE_COMPARE_MODE_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            *params = (GLfloat) obj->CompareMode;
-         }
-	 else 
-	    error = GL_TRUE;
-         break;
-      case GL_TEXTURE_COMPARE_FUNC_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            *params = (GLfloat) obj->CompareFunc;
-         }
-	 else 
-	    error = GL_TRUE;
-         break;
-      case GL_DEPTH_TEXTURE_MODE_ARB:
-         if (ctx->Extensions.ARB_depth_texture) {
-            *params = (GLfloat) obj->DepthMode;
-         }
-	 else 
-	    error = GL_TRUE;
-         break;
-      case GL_TEXTURE_LOD_BIAS:
-         if (ctx->Extensions.EXT_texture_lod_bias) {
-            *params = obj->LodBias;
-         }
-	 else 
-	    error = GL_TRUE;
-         break;
-#if FEATURE_OES_draw_texture
-      case GL_TEXTURE_CROP_RECT_OES:
-         params[0] = obj->CropRect[0];
-         params[1] = obj->CropRect[1];
-         params[2] = obj->CropRect[2];
-         params[3] = obj->CropRect[3];
-         break;
-#endif
-
-      case GL_TEXTURE_SWIZZLE_R_EXT:
-      case GL_TEXTURE_SWIZZLE_G_EXT:
-      case GL_TEXTURE_SWIZZLE_B_EXT:
-      case GL_TEXTURE_SWIZZLE_A_EXT:
-         if (ctx->Extensions.EXT_texture_swizzle) {
-            GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
-            *params = (GLfloat) obj->Swizzle[comp];
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-
-      case GL_TEXTURE_SWIZZLE_RGBA_EXT:
-         if (ctx->Extensions.EXT_texture_swizzle) {
-            GLuint comp;
-            for (comp = 0; comp < 4; comp++) {
-               params[comp] = (GLfloat) obj->Swizzle[comp];
-            }
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-
-      default:
-	 error = GL_TRUE;
-	 break;
-   }
-
-   if (error)
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(pname=0x%x)",
-		  pname);
-
-   _mesa_unlock_texture(ctx, obj);
-}
-
-
-void GLAPIENTRY
-_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
-{
-   struct gl_texture_object *obj;
-   GLboolean error = GL_FALSE;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-    obj = get_texobj(ctx, target, GL_TRUE);
-    if (!obj)
-       return;
-
-   _mesa_lock_texture(ctx, obj);
-   switch (pname) {
-      case GL_TEXTURE_MAG_FILTER:
-         *params = (GLint) obj->MagFilter;
-         break;;
-      case GL_TEXTURE_MIN_FILTER:
-         *params = (GLint) obj->MinFilter;
-         break;;
-      case GL_TEXTURE_WRAP_S:
-         *params = (GLint) obj->WrapS;
-         break;;
-      case GL_TEXTURE_WRAP_T:
-         *params = (GLint) obj->WrapT;
-         break;;
-      case GL_TEXTURE_WRAP_R:
-         *params = (GLint) obj->WrapR;
-         break;;
-      case GL_TEXTURE_BORDER_COLOR:
-         {
-            GLfloat b[4];
-            b[0] = CLAMP(obj->BorderColor.f[0], 0.0F, 1.0F);
-            b[1] = CLAMP(obj->BorderColor.f[1], 0.0F, 1.0F);
-            b[2] = CLAMP(obj->BorderColor.f[2], 0.0F, 1.0F);
-            b[3] = CLAMP(obj->BorderColor.f[3], 0.0F, 1.0F);
-            params[0] = FLOAT_TO_INT(b[0]);
-            params[1] = FLOAT_TO_INT(b[1]);
-            params[2] = FLOAT_TO_INT(b[2]);
-            params[3] = FLOAT_TO_INT(b[3]);
-         }
-         break;;
-      case GL_TEXTURE_RESIDENT:
-         {
-            GLboolean resident;
-            if (ctx->Driver.IsTextureResident)
-               resident = ctx->Driver.IsTextureResident(ctx, obj);
-            else
-               resident = GL_TRUE;
-            *params = (GLint) resident;
-         }
-         break;;
-      case GL_TEXTURE_PRIORITY:
-         *params = FLOAT_TO_INT(obj->Priority);
-         break;;
-      case GL_TEXTURE_MIN_LOD:
-         *params = (GLint) obj->MinLod;
-         break;;
-      case GL_TEXTURE_MAX_LOD:
-         *params = (GLint) obj->MaxLod;
-         break;;
-      case GL_TEXTURE_BASE_LEVEL:
-         *params = obj->BaseLevel;
-         break;;
-      case GL_TEXTURE_MAX_LEVEL:
-         *params = obj->MaxLevel;
-         break;;
-      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
-            *params = (GLint) obj->MaxAnisotropy;
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
-         if (ctx->Extensions.ARB_shadow_ambient) {
-            *params = (GLint) FLOAT_TO_INT(obj->CompareFailValue);
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-      case GL_GENERATE_MIPMAP_SGIS:
-	 *params = (GLint) obj->GenerateMipmap;
-         break;
-      case GL_TEXTURE_COMPARE_MODE_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            *params = (GLint) obj->CompareMode;
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-      case GL_TEXTURE_COMPARE_FUNC_ARB:
-         if (ctx->Extensions.ARB_shadow) {
-            *params = (GLint) obj->CompareFunc;
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-      case GL_DEPTH_TEXTURE_MODE_ARB:
-         if (ctx->Extensions.ARB_depth_texture) {
-            *params = (GLint) obj->DepthMode;
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-      case GL_TEXTURE_LOD_BIAS:
-         if (ctx->Extensions.EXT_texture_lod_bias) {
-            *params = (GLint) obj->LodBias;
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-#if FEATURE_OES_draw_texture
-      case GL_TEXTURE_CROP_RECT_OES:
-         params[0] = obj->CropRect[0];
-         params[1] = obj->CropRect[1];
-         params[2] = obj->CropRect[2];
-         params[3] = obj->CropRect[3];
-         break;
-#endif
-      case GL_TEXTURE_SWIZZLE_R_EXT:
-      case GL_TEXTURE_SWIZZLE_G_EXT:
-      case GL_TEXTURE_SWIZZLE_B_EXT:
-      case GL_TEXTURE_SWIZZLE_A_EXT:
-         if (ctx->Extensions.EXT_texture_swizzle) {
-            GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
-            *params = obj->Swizzle[comp];
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-
-      case GL_TEXTURE_SWIZZLE_RGBA_EXT:
-         if (ctx->Extensions.EXT_texture_swizzle) {
-            COPY_4V(params, obj->Swizzle);
-         }
-         else {
-            error = GL_TRUE;
-         }
-         break;
-
-      default:
-         ; /* silence warnings */
-   }
-
-   if (error)
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(pname=0x%x)",
-		  pname);
-
-   _mesa_unlock_texture(ctx, obj);
-}
-
-
-/** New in GL 3.0 */
-void GLAPIENTRY
-_mesa_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
-{
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   texObj = get_texobj(ctx, target, GL_TRUE);
-   
-   switch (pname) {
-   case GL_TEXTURE_BORDER_COLOR:
-      COPY_4V(params, texObj->BorderColor.i);
-      break;
-   default:
-      _mesa_GetTexParameteriv(target, pname, params);
-   }
-}
-
-
-/** New in GL 3.0 */
-void GLAPIENTRY
-_mesa_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
-{
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   texObj = get_texobj(ctx, target, GL_TRUE);
-   
-   switch (pname) {
-   case GL_TEXTURE_BORDER_COLOR:
-      COPY_4V(params, texObj->BorderColor.i);
-      break;
-   default:
-      {
-         GLint ip[4];
-         _mesa_GetTexParameteriv(target, pname, ip);
-         params[0] = ip[0];
-         if (pname == GL_TEXTURE_SWIZZLE_RGBA_EXT || 
-             pname == GL_TEXTURE_CROP_RECT_OES) {
-            params[1] = ip[1];
-            params[2] = ip[2];
-            params[3] = ip[3];
-         }
-      }
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+/** 

+ * \file texparam.c

+ *

+ * glTexParameter-related functions

+ */

+

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/context.h"

+#include "main/enums.h"

+#include "main/formats.h"

+#include "main/macros.h"

+#include "main/mfeatures.h"

+#include "main/mtypes.h"

+#include "main/state.h"

+#include "main/texcompress.h"

+#include "main/texparam.h"

+#include "main/teximage.h"

+#include "main/texstate.h"

+#include "main/texfetch.h"

+#include "program/prog_instruction.h"

+

+

+/**

+ * Check if a coordinate wrap mode is supported for the texture target.

+ * \return GL_TRUE if legal, GL_FALSE otherwise

+ */

+static GLboolean 

+validate_texture_wrap_mode(struct gl_context * ctx, GLenum target, GLenum wrap)

+{

+   const struct gl_extensions * const e = & ctx->Extensions;

+

+   if (wrap == GL_CLAMP || wrap == GL_CLAMP_TO_EDGE ||

+       (wrap == GL_CLAMP_TO_BORDER && e->ARB_texture_border_clamp)) {

+      /* any texture target */

+      return GL_TRUE;

+   }

+   else if (target != GL_TEXTURE_RECTANGLE_NV &&

+	    (wrap == GL_REPEAT ||

+	     (wrap == GL_MIRRORED_REPEAT &&

+	      e->ARB_texture_mirrored_repeat) ||

+	     (wrap == GL_MIRROR_CLAMP_EXT &&

+	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||

+	     (wrap == GL_MIRROR_CLAMP_TO_EDGE_EXT &&

+	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||

+	     (wrap == GL_MIRROR_CLAMP_TO_BORDER_EXT &&

+	      (e->EXT_texture_mirror_clamp)))) {

+      /* non-rectangle texture */

+      return GL_TRUE;

+   }

+

+   _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)", wrap );

+   return GL_FALSE;

+}

+

+

+/**

+ * Get current texture object for given target.

+ * Return NULL if any error (and record the error).

+ * Note that this is different from _mesa_select_tex_object() in that proxy

+ * targets are not accepted.

+ * Only the glGetTexLevelParameter() functions accept proxy targets.

+ */

+static struct gl_texture_object *

+get_texobj(struct gl_context *ctx, GLenum target, GLboolean get)

+{

+   struct gl_texture_unit *texUnit;

+

+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxCombinedTextureImageUnits) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "gl%sTexParameter(current unit)", get ? "Get" : "");

+      return NULL;

+   }

+

+   texUnit = _mesa_get_current_tex_unit(ctx);

+

+   switch (target) {

+   case GL_TEXTURE_1D:

+      return texUnit->CurrentTex[TEXTURE_1D_INDEX];

+   case GL_TEXTURE_2D:

+      return texUnit->CurrentTex[TEXTURE_2D_INDEX];

+   case GL_TEXTURE_3D:

+      return texUnit->CurrentTex[TEXTURE_3D_INDEX];

+   case GL_TEXTURE_CUBE_MAP:

+      if (ctx->Extensions.ARB_texture_cube_map) {

+         return texUnit->CurrentTex[TEXTURE_CUBE_INDEX];

+      }

+      break;

+   case GL_TEXTURE_RECTANGLE_NV:

+      if (ctx->Extensions.NV_texture_rectangle) {

+         return texUnit->CurrentTex[TEXTURE_RECT_INDEX];

+      }

+      break;

+   case GL_TEXTURE_1D_ARRAY_EXT:

+      if (ctx->Extensions.MESA_texture_array ||

+          ctx->Extensions.EXT_texture_array) {

+         return texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX];

+      }

+      break;

+   case GL_TEXTURE_2D_ARRAY_EXT:

+      if (ctx->Extensions.MESA_texture_array ||

+          ctx->Extensions.EXT_texture_array) {

+         return texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX];

+      }

+      break;

+   default:

+      ;

+   }

+

+   _mesa_error(ctx, GL_INVALID_ENUM,

+                  "gl%sTexParameter(target)", get ? "Get" : "");

+   return NULL;

+}

+

+

+/**

+ * Convert GL_RED/GREEN/BLUE/ALPHA/ZERO/ONE to SWIZZLE_X/Y/Z/W/ZERO/ONE.

+ * \return -1 if error.

+ */

+static GLint

+comp_to_swizzle(GLenum comp)

+{

+   switch (comp) {

+   case GL_RED:

+      return SWIZZLE_X;

+   case GL_GREEN:

+      return SWIZZLE_Y;

+   case GL_BLUE:

+      return SWIZZLE_Z;

+   case GL_ALPHA:

+      return SWIZZLE_W;

+   case GL_ZERO:

+      return SWIZZLE_ZERO;

+   case GL_ONE:

+      return SWIZZLE_ONE;

+   default:

+      return -1;

+   }

+}

+

+

+static void

+set_swizzle_component(GLuint *swizzle, GLuint comp, GLuint swz)

+{

+   ASSERT(comp < 4);

+   ASSERT(swz <= SWIZZLE_NIL);

+   {

+      GLuint mask = 0x7 << (3 * comp);

+      GLuint s = (*swizzle & ~mask) | (swz << (3 * comp));

+      *swizzle = s;

+   }

+}

+

+

+/**

+ * This is called just prior to changing any texture object state which

+ * will not effect texture completeness.

+ */

+static INLINE void

+flush(struct gl_context *ctx)

+{

+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+}

+

+

+/**

+ * This is called just prior to changing any texture object state which

+ * can effect texture completeness (texture base level, max level,

+ * minification filter).

+ * Any pending rendering will be flushed out, we'll set the _NEW_TEXTURE

+ * state flag and then mark the texture object as 'incomplete' so that any

+ * per-texture derived state gets recomputed.

+ */

+static INLINE void

+incomplete(struct gl_context *ctx, struct gl_texture_object *texObj)

+{

+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+   texObj->_Complete = GL_FALSE;

+}

+

+

+/**

+ * Set an integer-valued texture parameter

+ * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise

+ */

+static GLboolean

+set_tex_parameteri(struct gl_context *ctx,

+                   struct gl_texture_object *texObj,

+                   GLenum pname, const GLint *params)

+{

+   switch (pname) {

+   case GL_TEXTURE_MIN_FILTER:

+      if (texObj->MinFilter == params[0])

+         return GL_FALSE;

+      switch (params[0]) {

+      case GL_NEAREST:

+      case GL_LINEAR:

+         incomplete(ctx, texObj);

+         texObj->MinFilter = params[0];

+         return GL_TRUE;

+      case GL_NEAREST_MIPMAP_NEAREST:

+      case GL_LINEAR_MIPMAP_NEAREST:

+      case GL_NEAREST_MIPMAP_LINEAR:

+      case GL_LINEAR_MIPMAP_LINEAR:

+         if (texObj->Target != GL_TEXTURE_RECTANGLE_NV) {

+            incomplete(ctx, texObj);

+            texObj->MinFilter = params[0];

+            return GL_TRUE;

+         }

+         /* fall-through */

+      default:

+         goto invalid_param;

+      }

+      return GL_FALSE;

+

+   case GL_TEXTURE_MAG_FILTER:

+      if (texObj->MagFilter == params[0])

+         return GL_FALSE;

+      switch (params[0]) {

+      case GL_NEAREST:

+      case GL_LINEAR:

+         flush(ctx); /* does not effect completeness */

+         texObj->MagFilter = params[0];

+         return GL_TRUE;

+      default:

+         goto invalid_param;

+      }

+      return GL_FALSE;

+

+   case GL_TEXTURE_WRAP_S:

+      if (texObj->WrapS == params[0])

+         return GL_FALSE;

+      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {

+         flush(ctx);

+         texObj->WrapS = params[0];

+         return GL_TRUE;

+      }

+      return GL_FALSE;

+

+   case GL_TEXTURE_WRAP_T:

+      if (texObj->WrapT == params[0])

+         return GL_FALSE;

+      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {

+         flush(ctx);

+         texObj->WrapT = params[0];

+         return GL_TRUE;

+      }

+      return GL_FALSE;

+

+   case GL_TEXTURE_WRAP_R:

+      if (texObj->WrapR == params[0])

+         return GL_FALSE;

+      if (validate_texture_wrap_mode(ctx, texObj->Target, params[0])) {

+         flush(ctx);

+         texObj->WrapR = params[0];

+         return GL_TRUE;

+      }

+      return GL_FALSE;

+

+   case GL_TEXTURE_BASE_LEVEL:

+      if (texObj->BaseLevel == params[0])

+         return GL_FALSE;

+      if (params[0] < 0 ||

+          (texObj->Target == GL_TEXTURE_RECTANGLE_ARB && params[0] != 0)) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glTexParameter(param=%d)", params[0]);

+         return GL_FALSE;

+      }

+      incomplete(ctx, texObj);

+      texObj->BaseLevel = params[0];

+      return GL_TRUE;

+

+   case GL_TEXTURE_MAX_LEVEL:

+      if (texObj->MaxLevel == params[0])

+         return GL_FALSE;

+      if (params[0] < 0 || texObj->Target == GL_TEXTURE_RECTANGLE_ARB) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glTexParameter(param=%d)", params[0]);

+         return GL_FALSE;

+      }

+      incomplete(ctx, texObj);

+      texObj->MaxLevel = params[0];

+      return GL_TRUE;

+

+   case GL_GENERATE_MIPMAP_SGIS:

+      if (texObj->GenerateMipmap != params[0]) {

+         /* no flush() */

+	 texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;

+	 return GL_TRUE;

+      }

+      return GL_FALSE;

+

+   case GL_TEXTURE_COMPARE_MODE_ARB:

+      if (ctx->Extensions.ARB_shadow) {

+         if (texObj->CompareMode == params[0])

+            return GL_FALSE;

+         if (params[0] == GL_NONE ||

+             params[0] == GL_COMPARE_R_TO_TEXTURE_ARB) {

+            flush(ctx);

+            texObj->CompareMode = params[0];

+            return GL_TRUE;

+         }

+         goto invalid_param;

+      }

+      goto invalid_pname;

+

+   case GL_TEXTURE_COMPARE_FUNC_ARB:

+      if (ctx->Extensions.ARB_shadow) {

+         if (texObj->CompareFunc == params[0])

+            return GL_FALSE;

+         switch (params[0]) {

+         case GL_LEQUAL:

+         case GL_GEQUAL:

+            flush(ctx);

+            texObj->CompareFunc = params[0];

+            return GL_TRUE;

+         case GL_EQUAL:

+         case GL_NOTEQUAL:

+         case GL_LESS:

+         case GL_GREATER:

+         case GL_ALWAYS:

+         case GL_NEVER:

+            if (ctx->Extensions.EXT_shadow_funcs) {

+               flush(ctx);

+               texObj->CompareFunc = params[0];

+               return GL_TRUE;

+            }

+            /* fall-through */

+         default:

+            goto invalid_param;

+         }

+      }

+      goto invalid_pname;

+

+   case GL_DEPTH_TEXTURE_MODE_ARB:

+      if (ctx->Extensions.ARB_depth_texture) {

+         if (texObj->DepthMode == params[0])

+            return GL_FALSE;

+         if (params[0] == GL_LUMINANCE ||

+             params[0] == GL_INTENSITY ||

+             params[0] == GL_ALPHA ||

+             (ctx->Extensions.ARB_texture_rg && params[0] == GL_RED)) {

+            flush(ctx);

+            texObj->DepthMode = params[0];

+            return GL_TRUE;

+         }

+         goto invalid_param;

+      }

+      goto invalid_pname;

+

+#if FEATURE_OES_draw_texture

+   case GL_TEXTURE_CROP_RECT_OES:

+      texObj->CropRect[0] = params[0];

+      texObj->CropRect[1] = params[1];

+      texObj->CropRect[2] = params[2];

+      texObj->CropRect[3] = params[3];

+      return GL_TRUE;

+#endif

+

+   case GL_TEXTURE_SWIZZLE_R_EXT:

+   case GL_TEXTURE_SWIZZLE_G_EXT:

+   case GL_TEXTURE_SWIZZLE_B_EXT:

+   case GL_TEXTURE_SWIZZLE_A_EXT:

+      if (ctx->Extensions.EXT_texture_swizzle) {

+         const GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;

+         const GLint swz = comp_to_swizzle(params[0]);

+         if (swz < 0) {

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glTexParameter(swizzle 0x%x)", params[0]);

+            return GL_FALSE;

+         }

+         ASSERT(comp < 4);

+         if (swz >= 0) {

+            flush(ctx);

+            texObj->Swizzle[comp] = params[0];

+            set_swizzle_component(&texObj->_Swizzle, comp, swz);

+            return GL_TRUE;

+         }

+      }

+      goto invalid_pname;

+

+   case GL_TEXTURE_SWIZZLE_RGBA_EXT:

+      if (ctx->Extensions.EXT_texture_swizzle) {

+         GLuint comp;

+         flush(ctx);

+         for (comp = 0; comp < 4; comp++) {

+            const GLint swz = comp_to_swizzle(params[comp]);

+            if (swz >= 0) {

+               texObj->Swizzle[comp] = params[comp];

+               set_swizzle_component(&texObj->_Swizzle, comp, swz);

+            }

+            else {

+               _mesa_error(ctx, GL_INVALID_OPERATION,

+                           "glTexParameter(swizzle 0x%x)", params[comp]);

+               return GL_FALSE;

+            }

+         }

+         return GL_TRUE;

+      }

+      goto invalid_pname;

+

+   case GL_TEXTURE_SRGB_DECODE_EXT:

+      if (ctx->Extensions.EXT_texture_sRGB_decode) {

+	 GLenum decode = params[0];

+	 if (decode == GL_DECODE_EXT || decode == GL_SKIP_DECODE_EXT) {

+	    if (texObj->sRGBDecode != decode) {

+	       flush(ctx);

+	       texObj->sRGBDecode = decode;

+	       _mesa_update_fetch_functions(texObj);

+	    }

+	    return GL_TRUE;

+	 }

+      }

+      goto invalid_pname;

+

+   default:

+      goto invalid_pname;

+   }

+

+invalid_pname:

+   _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=%s)",

+               _mesa_lookup_enum_by_nr(pname));

+   return GL_FALSE;

+

+invalid_param:

+   _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param=%s)",

+               _mesa_lookup_enum_by_nr(params[0]));

+   return GL_FALSE;

+}

+

+

+/**

+ * Set a float-valued texture parameter

+ * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise

+ */

+static GLboolean

+set_tex_parameterf(struct gl_context *ctx,

+                   struct gl_texture_object *texObj,

+                   GLenum pname, const GLfloat *params)

+{

+   switch (pname) {

+   case GL_TEXTURE_MIN_LOD:

+      if (texObj->MinLod == params[0])

+         return GL_FALSE;

+      flush(ctx);

+      texObj->MinLod = params[0];

+      return GL_TRUE;

+

+   case GL_TEXTURE_MAX_LOD:

+      if (texObj->MaxLod == params[0])

+         return GL_FALSE;

+      flush(ctx);

+      texObj->MaxLod = params[0];

+      return GL_TRUE;

+

+   case GL_TEXTURE_PRIORITY:

+      flush(ctx);

+      texObj->Priority = CLAMP(params[0], 0.0F, 1.0F);

+      return GL_TRUE;

+

+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:

+      if (ctx->Extensions.EXT_texture_filter_anisotropic) {

+         if (texObj->MaxAnisotropy == params[0])

+            return GL_FALSE;

+         if (params[0] < 1.0) {

+            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );

+            return GL_FALSE;

+         }

+         flush(ctx);

+         /* clamp to max, that's what NVIDIA does */

+         texObj->MaxAnisotropy = MIN2(params[0],

+                                      ctx->Const.MaxTextureMaxAnisotropy);

+         return GL_TRUE;

+      }

+      else {

+         static GLuint count = 0;

+         if (count++ < 10)

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");

+      }

+      return GL_FALSE;

+

+   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:

+      if (ctx->Extensions.ARB_shadow_ambient) {

+         if (texObj->CompareFailValue != params[0]) {

+            flush(ctx);

+            texObj->CompareFailValue = CLAMP(params[0], 0.0F, 1.0F);

+            return GL_TRUE;

+         }

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                    "glTexParameter(pname=GL_TEXTURE_COMPARE_FAIL_VALUE_ARB)");

+      }

+      return GL_FALSE;

+

+   case GL_TEXTURE_LOD_BIAS:

+      /* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias */

+      if (ctx->Extensions.EXT_texture_lod_bias) {

+         if (texObj->LodBias != params[0]) {

+            flush(ctx);

+            texObj->LodBias = params[0];

+            return GL_TRUE;

+         }

+         return GL_FALSE;

+      }

+      break;

+

+   case GL_TEXTURE_BORDER_COLOR:

+      flush(ctx);

+      /* ARB_texture_float disables clamping */

+      if (ctx->Extensions.ARB_texture_float) {

+         texObj->BorderColor.f[RCOMP] = params[0];

+         texObj->BorderColor.f[GCOMP] = params[1];

+         texObj->BorderColor.f[BCOMP] = params[2];

+         texObj->BorderColor.f[ACOMP] = params[3];

+      } else {

+         texObj->BorderColor.f[RCOMP] = CLAMP(params[0], 0.0F, 1.0F);

+         texObj->BorderColor.f[GCOMP] = CLAMP(params[1], 0.0F, 1.0F);

+         texObj->BorderColor.f[BCOMP] = CLAMP(params[2], 0.0F, 1.0F);

+         texObj->BorderColor.f[ACOMP] = CLAMP(params[3], 0.0F, 1.0F);

+      }

+      return GL_TRUE;

+

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);

+   }

+   return GL_FALSE;

+}

+

+

+void GLAPIENTRY

+_mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)

+{

+   GLboolean need_update;

+   struct gl_texture_object *texObj;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   texObj = get_texobj(ctx, target, GL_FALSE);

+   if (!texObj)

+      return;

+

+   switch (pname) {

+   case GL_TEXTURE_MIN_FILTER:

+   case GL_TEXTURE_MAG_FILTER:

+   case GL_TEXTURE_WRAP_S:

+   case GL_TEXTURE_WRAP_T:

+   case GL_TEXTURE_WRAP_R:

+   case GL_TEXTURE_BASE_LEVEL:

+   case GL_TEXTURE_MAX_LEVEL:

+   case GL_GENERATE_MIPMAP_SGIS:

+   case GL_TEXTURE_COMPARE_MODE_ARB:

+   case GL_TEXTURE_COMPARE_FUNC_ARB:

+   case GL_DEPTH_TEXTURE_MODE_ARB:

+   case GL_TEXTURE_SRGB_DECODE_EXT:

+      {

+         /* convert float param to int */

+         GLint p[4];

+         p[0] = (GLint) param;

+         p[1] = p[2] = p[3] = 0;

+         need_update = set_tex_parameteri(ctx, texObj, pname, p);

+      }

+      break;

+   default:

+      {

+         /* this will generate an error if pname is illegal */

+         GLfloat p[4];

+         p[0] = param;

+         p[1] = p[2] = p[3] = 0.0F;

+         need_update = set_tex_parameterf(ctx, texObj, pname, p);

+      }

+   }

+

+   if (ctx->Driver.TexParameter && need_update) {

+      ctx->Driver.TexParameter(ctx, target, texObj, pname, &param);

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)

+{

+   GLboolean need_update;

+   struct gl_texture_object *texObj;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   texObj = get_texobj(ctx, target, GL_FALSE);

+   if (!texObj)

+      return;

+

+   switch (pname) {

+   case GL_TEXTURE_MIN_FILTER:

+   case GL_TEXTURE_MAG_FILTER:

+   case GL_TEXTURE_WRAP_S:

+   case GL_TEXTURE_WRAP_T:

+   case GL_TEXTURE_WRAP_R:

+   case GL_TEXTURE_BASE_LEVEL:

+   case GL_TEXTURE_MAX_LEVEL:

+   case GL_GENERATE_MIPMAP_SGIS:

+   case GL_TEXTURE_COMPARE_MODE_ARB:

+   case GL_TEXTURE_COMPARE_FUNC_ARB:

+   case GL_DEPTH_TEXTURE_MODE_ARB:

+   case GL_TEXTURE_SRGB_DECODE_EXT:

+      {

+         /* convert float param to int */

+         GLint p[4];

+         p[0] = (GLint) params[0];

+         p[1] = p[2] = p[3] = 0;

+         need_update = set_tex_parameteri(ctx, texObj, pname, p);

+      }

+      break;

+

+#if FEATURE_OES_draw_texture

+   case GL_TEXTURE_CROP_RECT_OES:

+      {

+         /* convert float params to int */

+         GLint iparams[4];

+         iparams[0] = (GLint) params[0];

+         iparams[1] = (GLint) params[1];

+         iparams[2] = (GLint) params[2];

+         iparams[3] = (GLint) params[3];

+         need_update = set_tex_parameteri(ctx, texObj, pname, iparams);

+      }

+      break;

+#endif

+

+   default:

+      /* this will generate an error if pname is illegal */

+      need_update = set_tex_parameterf(ctx, texObj, pname, params);

+   }

+

+   if (ctx->Driver.TexParameter && need_update) {

+      ctx->Driver.TexParameter(ctx, target, texObj, pname, params);

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_TexParameteri(GLenum target, GLenum pname, GLint param)

+{

+   GLboolean need_update;

+   struct gl_texture_object *texObj;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   texObj = get_texobj(ctx, target, GL_FALSE);

+   if (!texObj)

+      return;

+

+   switch (pname) {

+   case GL_TEXTURE_MIN_LOD:

+   case GL_TEXTURE_MAX_LOD:

+   case GL_TEXTURE_PRIORITY:

+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:

+   case GL_TEXTURE_LOD_BIAS:

+   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:

+      {

+         GLfloat fparam[4];

+         fparam[0] = (GLfloat) param;

+         fparam[1] = fparam[2] = fparam[3] = 0.0F;

+         /* convert int param to float */

+         need_update = set_tex_parameterf(ctx, texObj, pname, fparam);

+      }

+      break;

+   default:

+      /* this will generate an error if pname is illegal */

+      {

+         GLint iparam[4];

+         iparam[0] = param;

+         iparam[1] = iparam[2] = iparam[3] = 0;

+         need_update = set_tex_parameteri(ctx, texObj, pname, iparam);

+      }

+   }

+

+   if (ctx->Driver.TexParameter && need_update) {

+      GLfloat fparam = (GLfloat) param;

+      ctx->Driver.TexParameter(ctx, target, texObj, pname, &fparam);

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)

+{

+   GLboolean need_update;

+   struct gl_texture_object *texObj;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   texObj = get_texobj(ctx, target, GL_FALSE);

+   if (!texObj)

+      return;

+

+   switch (pname) {

+   case GL_TEXTURE_BORDER_COLOR:

+      {

+         /* convert int params to float */

+         GLfloat fparams[4];

+         fparams[0] = INT_TO_FLOAT(params[0]);

+         fparams[1] = INT_TO_FLOAT(params[1]);

+         fparams[2] = INT_TO_FLOAT(params[2]);

+         fparams[3] = INT_TO_FLOAT(params[3]);

+         need_update = set_tex_parameterf(ctx, texObj, pname, fparams);

+      }

+      break;

+   case GL_TEXTURE_MIN_LOD:

+   case GL_TEXTURE_MAX_LOD:

+   case GL_TEXTURE_PRIORITY:

+   case GL_TEXTURE_MAX_ANISOTROPY_EXT:

+   case GL_TEXTURE_LOD_BIAS:

+   case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:

+      {

+         /* convert int param to float */

+         GLfloat fparams[4];

+         fparams[0] = (GLfloat) params[0];

+         fparams[1] = fparams[2] = fparams[3] = 0.0F;

+         need_update = set_tex_parameterf(ctx, texObj, pname, fparams);

+      }

+      break;

+   default:

+      /* this will generate an error if pname is illegal */

+      need_update = set_tex_parameteri(ctx, texObj, pname, params);

+   }

+

+   if (ctx->Driver.TexParameter && need_update) {

+      GLfloat fparams[4];

+      fparams[0] = INT_TO_FLOAT(params[0]);

+      if (pname == GL_TEXTURE_BORDER_COLOR ||

+          pname == GL_TEXTURE_CROP_RECT_OES) {

+         fparams[1] = INT_TO_FLOAT(params[1]);

+         fparams[2] = INT_TO_FLOAT(params[2]);

+         fparams[3] = INT_TO_FLOAT(params[3]);

+      }

+      ctx->Driver.TexParameter(ctx, target, texObj, pname, fparams);

+   }

+}

+

+

+/**

+ * Set tex parameter to integer value(s).  Primarily intended to set

+ * integer-valued texture border color (for integer-valued textures).

+ * New in GL 3.0.

+ */

+void GLAPIENTRY

+_mesa_TexParameterIiv(GLenum target, GLenum pname, const GLint *params)

+{

+   struct gl_texture_object *texObj;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   texObj = get_texobj(ctx, target, GL_FALSE);

+   if (!texObj)

+      return;

+

+   switch (pname) {

+   case GL_TEXTURE_BORDER_COLOR:

+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+      /* set the integer-valued border color */

+      COPY_4V(texObj->BorderColor.i, params);

+      break;

+   default:

+      _mesa_TexParameteriv(target, pname, params);

+      break;

+   }

+   /* XXX no driver hook for TexParameterIiv() yet */

+}

+

+

+/**

+ * Set tex parameter to unsigned integer value(s).  Primarily intended to set

+ * uint-valued texture border color (for integer-valued textures).

+ * New in GL 3.0

+ */

+void GLAPIENTRY

+_mesa_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)

+{

+   struct gl_texture_object *texObj;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   texObj = get_texobj(ctx, target, GL_FALSE);

+   if (!texObj)

+      return;

+

+   switch (pname) {

+   case GL_TEXTURE_BORDER_COLOR:

+      FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+      /* set the unsigned integer-valued border color */

+      COPY_4V(texObj->BorderColor.ui, params);

+      break;

+   default:

+      _mesa_TexParameteriv(target, pname, (const GLint *) params);

+      break;

+   }

+   /* XXX no driver hook for TexParameterIuiv() yet */

+}

+

+

+

+

+void GLAPIENTRY

+_mesa_GetTexLevelParameterfv( GLenum target, GLint level,

+                              GLenum pname, GLfloat *params )

+{

+   GLint iparam;

+   _mesa_GetTexLevelParameteriv( target, level, pname, &iparam );

+   *params = (GLfloat) iparam;

+}

+

+

+void GLAPIENTRY

+_mesa_GetTexLevelParameteriv( GLenum target, GLint level,

+                              GLenum pname, GLint *params )

+{

+   const struct gl_texture_unit *texUnit;

+   struct gl_texture_object *texObj;

+   const struct gl_texture_image *img = NULL;

+   GLint maxLevels;

+   gl_format texFormat;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxCombinedTextureImageUnits) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glGetTexLevelParameteriv(current unit)");

+      return;

+   }

+

+   texUnit = _mesa_get_current_tex_unit(ctx);

+

+   /* this will catch bad target values */

+   maxLevels = _mesa_max_texture_levels(ctx, target);

+   if (maxLevels == 0) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glGetTexLevelParameter[if]v(target=0x%x)", target);

+      return;

+   }

+

+   if (level < 0 || level >= maxLevels) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexLevelParameter[if]v" );

+      return;

+   }

+

+   texObj = _mesa_select_tex_object(ctx, texUnit, target);

+

+   img = _mesa_select_tex_image(ctx, texObj, target, level);

+   if (!img || !img->TexFormat) {

+      /* undefined texture image */

+      if (pname == GL_TEXTURE_COMPONENTS)

+         *params = 1;

+      else

+         *params = 0;

+      return;

+   }

+

+   texFormat = img->TexFormat;

+

+   switch (pname) {

+      case GL_TEXTURE_WIDTH:

+         *params = img->Width;

+         break;

+      case GL_TEXTURE_HEIGHT:

+         *params = img->Height;

+         break;

+      case GL_TEXTURE_DEPTH:

+         *params = img->Depth;

+         break;

+      case GL_TEXTURE_INTERNAL_FORMAT:

+         if (_mesa_is_format_compressed(texFormat)) {

+            /* need to return the actual compressed format */

+            *params = _mesa_compressed_format_to_glenum(ctx, texFormat);

+         }

+         else {

+            /* return the user's requested internal format */

+            *params = img->InternalFormat;

+         }

+         break;

+      case GL_TEXTURE_BORDER:

+         *params = img->Border;

+         break;

+      case GL_TEXTURE_RED_SIZE:

+         if (img->_BaseFormat == GL_RED) {

+            *params = _mesa_get_format_bits(texFormat, pname);

+	    break;

+	 }

+	 /* FALLTHROUGH */

+      case GL_TEXTURE_GREEN_SIZE:

+         if (img->_BaseFormat == GL_RG) {

+            *params = _mesa_get_format_bits(texFormat, pname);

+	    break;

+	 }

+	 /* FALLTHROUGH */

+      case GL_TEXTURE_BLUE_SIZE:

+         if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)

+            *params = _mesa_get_format_bits(texFormat, pname);

+         else

+            *params = 0;

+         break;

+      case GL_TEXTURE_ALPHA_SIZE:

+         if (img->_BaseFormat == GL_ALPHA ||

+             img->_BaseFormat == GL_LUMINANCE_ALPHA ||

+             img->_BaseFormat == GL_RGBA)

+            *params = _mesa_get_format_bits(texFormat, pname);

+         else

+            *params = 0;

+         break;

+      case GL_TEXTURE_INTENSITY_SIZE:

+         if (img->_BaseFormat != GL_INTENSITY)

+            *params = 0;

+         else {

+            *params = _mesa_get_format_bits(texFormat, pname);

+            if (*params == 0) {

+               /* intensity probably stored as rgb texture */

+               *params = MIN2(_mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE),

+                              _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE));

+            }

+         }

+         break;

+      case GL_TEXTURE_LUMINANCE_SIZE:

+         if (img->_BaseFormat != GL_LUMINANCE &&

+             img->_BaseFormat != GL_LUMINANCE_ALPHA)

+            *params = 0;

+         else {

+            *params = _mesa_get_format_bits(texFormat, pname);

+            if (*params == 0) {

+               /* luminance probably stored as rgb texture */

+               *params = MIN2(_mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE),

+                              _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE));

+            }

+         }

+         break;

+      case GL_TEXTURE_INDEX_SIZE_EXT:

+         if (img->_BaseFormat == GL_COLOR_INDEX)

+            *params = _mesa_get_format_bits(texFormat, pname);

+         else

+            *params = 0;

+         break;

+      case GL_TEXTURE_DEPTH_SIZE_ARB:

+         if (ctx->Extensions.ARB_depth_texture)

+            *params = _mesa_get_format_bits(texFormat, pname);

+         else

+            goto invalid_pname;

+         break;

+      case GL_TEXTURE_STENCIL_SIZE_EXT:

+         if (ctx->Extensions.EXT_packed_depth_stencil ||

+             ctx->Extensions.ARB_framebuffer_object) {

+            *params = _mesa_get_format_bits(texFormat, pname);

+         }

+         else {

+            goto invalid_pname;

+         }

+         break;

+      case GL_TEXTURE_SHARED_SIZE:

+         if (ctx->VersionMajor >= 3) {

+            /* XXX return number of exponent bits for shared exponent texture

+             * formats, like GL_RGB9_E5.

+             */

+            *params = 0;

+         }

+         else {

+            goto invalid_pname;

+         }

+         break;

+

+      /* GL_ARB_texture_compression */

+      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:

+	 if (_mesa_is_format_compressed(texFormat) &&

+             !_mesa_is_proxy_texture(target)) {

+            *params = _mesa_format_image_size(texFormat, img->Width,

+                                              img->Height, img->Depth);

+	 }

+	 else {

+	    _mesa_error(ctx, GL_INVALID_OPERATION,

+			"glGetTexLevelParameter[if]v(pname)");

+	 }

+         break;

+      case GL_TEXTURE_COMPRESSED:

+         *params = (GLint) _mesa_is_format_compressed(texFormat);

+         break;

+

+      /* GL_ARB_texture_float */

+      case GL_TEXTURE_RED_TYPE_ARB:

+         if (ctx->Extensions.ARB_texture_float) {

+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE) ?

+               _mesa_get_format_datatype(texFormat) : GL_NONE;

+         }

+         else {

+            goto invalid_pname;

+         }

+         break;

+      case GL_TEXTURE_GREEN_TYPE_ARB:

+         if (ctx->Extensions.ARB_texture_float) {

+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE) ?

+               _mesa_get_format_datatype(texFormat) : GL_NONE;

+         }

+         else {

+            goto invalid_pname;

+         }

+         break;

+      case GL_TEXTURE_BLUE_TYPE_ARB:

+         if (ctx->Extensions.ARB_texture_float) {

+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_BLUE_SIZE) ?

+               _mesa_get_format_datatype(texFormat) : GL_NONE;

+         }

+         else {

+            goto invalid_pname;

+         }

+         break;

+      case GL_TEXTURE_ALPHA_TYPE_ARB:

+         if (ctx->Extensions.ARB_texture_float) {

+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_ALPHA_SIZE) ?

+               _mesa_get_format_datatype(texFormat) : GL_NONE;

+         }

+         else {

+            goto invalid_pname;

+         }

+         break;

+      case GL_TEXTURE_LUMINANCE_TYPE_ARB:

+         if (ctx->Extensions.ARB_texture_float) {

+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_LUMINANCE_SIZE) ?

+               _mesa_get_format_datatype(texFormat) : GL_NONE;

+         }

+         else {

+            goto invalid_pname;

+         }

+         break;

+      case GL_TEXTURE_INTENSITY_TYPE_ARB:

+         if (ctx->Extensions.ARB_texture_float) {

+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_INTENSITY_SIZE) ?

+               _mesa_get_format_datatype(texFormat) : GL_NONE;

+         }

+         else {

+            goto invalid_pname;

+         }

+         break;

+      case GL_TEXTURE_DEPTH_TYPE_ARB:

+         if (ctx->Extensions.ARB_texture_float) {

+            *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_DEPTH_SIZE) ?

+               _mesa_get_format_datatype(texFormat) : GL_NONE;

+         }

+         else {

+            goto invalid_pname;

+         }

+         break;

+

+      default:

+         goto invalid_pname;

+   }

+

+   /* no error if we get here */

+   return;

+

+invalid_pname:

+   _mesa_error(ctx, GL_INVALID_ENUM,

+               "glGetTexLevelParameter[if]v(pname=%s)",

+               _mesa_lookup_enum_by_nr(pname));

+}

+

+

+

+void GLAPIENTRY

+_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )

+{

+   struct gl_texture_object *obj;

+   GLboolean error = GL_FALSE;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   obj = get_texobj(ctx, target, GL_TRUE);

+   if (!obj)

+      return;

+

+   _mesa_lock_texture(ctx, obj);

+   switch (pname) {

+      case GL_TEXTURE_MAG_FILTER:

+	 *params = ENUM_TO_FLOAT(obj->MagFilter);

+	 break;

+      case GL_TEXTURE_MIN_FILTER:

+         *params = ENUM_TO_FLOAT(obj->MinFilter);

+         break;

+      case GL_TEXTURE_WRAP_S:

+         *params = ENUM_TO_FLOAT(obj->WrapS);

+         break;

+      case GL_TEXTURE_WRAP_T:

+         *params = ENUM_TO_FLOAT(obj->WrapT);

+         break;

+      case GL_TEXTURE_WRAP_R:

+         *params = ENUM_TO_FLOAT(obj->WrapR);

+         break;

+      case GL_TEXTURE_BORDER_COLOR:

+         if(ctx->NewState & (_NEW_BUFFERS | _NEW_FRAG_CLAMP))

+            _mesa_update_state_locked(ctx);

+         if(ctx->Color._ClampFragmentColor)

+         {

+            params[0] = CLAMP(obj->BorderColor.f[0], 0.0F, 1.0F);

+            params[1] = CLAMP(obj->BorderColor.f[1], 0.0F, 1.0F);

+            params[2] = CLAMP(obj->BorderColor.f[2], 0.0F, 1.0F);

+            params[3] = CLAMP(obj->BorderColor.f[3], 0.0F, 1.0F);

+         }

+         else

+         {

+            params[0] = obj->BorderColor.f[0];

+            params[1] = obj->BorderColor.f[1];

+            params[2] = obj->BorderColor.f[2];

+            params[3] = obj->BorderColor.f[3];

+         }

+         break;

+      case GL_TEXTURE_RESIDENT:

+         {

+            GLboolean resident;

+            if (ctx->Driver.IsTextureResident)

+               resident = ctx->Driver.IsTextureResident(ctx, obj);

+            else

+               resident = GL_TRUE;

+            *params = ENUM_TO_FLOAT(resident);

+         }

+         break;

+      case GL_TEXTURE_PRIORITY:

+         *params = obj->Priority;

+         break;

+      case GL_TEXTURE_MIN_LOD:

+         *params = obj->MinLod;

+         break;

+      case GL_TEXTURE_MAX_LOD:

+         *params = obj->MaxLod;

+         break;

+      case GL_TEXTURE_BASE_LEVEL:

+         *params = (GLfloat) obj->BaseLevel;

+         break;

+      case GL_TEXTURE_MAX_LEVEL:

+         *params = (GLfloat) obj->MaxLevel;

+         break;

+      case GL_TEXTURE_MAX_ANISOTROPY_EXT:

+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {

+            *params = obj->MaxAnisotropy;

+         }

+	 else

+	    error = GL_TRUE;

+         break;

+      case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:

+         if (ctx->Extensions.ARB_shadow_ambient) {

+            *params = obj->CompareFailValue;

+         }

+	 else 

+	    error = GL_TRUE;

+         break;

+      case GL_GENERATE_MIPMAP_SGIS:

+	 *params = (GLfloat) obj->GenerateMipmap;

+         break;

+      case GL_TEXTURE_COMPARE_MODE_ARB:

+         if (ctx->Extensions.ARB_shadow) {

+            *params = (GLfloat) obj->CompareMode;

+         }

+	 else 

+	    error = GL_TRUE;

+         break;

+      case GL_TEXTURE_COMPARE_FUNC_ARB:

+         if (ctx->Extensions.ARB_shadow) {

+            *params = (GLfloat) obj->CompareFunc;

+         }

+	 else 

+	    error = GL_TRUE;

+         break;

+      case GL_DEPTH_TEXTURE_MODE_ARB:

+         if (ctx->Extensions.ARB_depth_texture) {

+            *params = (GLfloat) obj->DepthMode;

+         }

+	 else 

+	    error = GL_TRUE;

+         break;

+      case GL_TEXTURE_LOD_BIAS:

+         if (ctx->Extensions.EXT_texture_lod_bias) {

+            *params = obj->LodBias;

+         }

+	 else 

+	    error = GL_TRUE;

+         break;

+#if FEATURE_OES_draw_texture

+      case GL_TEXTURE_CROP_RECT_OES:

+         params[0] = obj->CropRect[0];

+         params[1] = obj->CropRect[1];

+         params[2] = obj->CropRect[2];

+         params[3] = obj->CropRect[3];

+         break;

+#endif

+

+      case GL_TEXTURE_SWIZZLE_R_EXT:

+      case GL_TEXTURE_SWIZZLE_G_EXT:

+      case GL_TEXTURE_SWIZZLE_B_EXT:

+      case GL_TEXTURE_SWIZZLE_A_EXT:

+         if (ctx->Extensions.EXT_texture_swizzle) {

+            GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;

+            *params = (GLfloat) obj->Swizzle[comp];

+         }

+         else {

+            error = GL_TRUE;

+         }

+         break;

+

+      case GL_TEXTURE_SWIZZLE_RGBA_EXT:

+         if (ctx->Extensions.EXT_texture_swizzle) {

+            GLuint comp;

+            for (comp = 0; comp < 4; comp++) {

+               params[comp] = (GLfloat) obj->Swizzle[comp];

+            }

+         }

+         else {

+            error = GL_TRUE;

+         }

+         break;

+

+      default:

+	 error = GL_TRUE;

+	 break;

+   }

+

+   if (error)

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(pname=0x%x)",

+		  pname);

+

+   _mesa_unlock_texture(ctx, obj);

+}

+

+

+void GLAPIENTRY

+_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )

+{

+   struct gl_texture_object *obj;

+   GLboolean error = GL_FALSE;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+    obj = get_texobj(ctx, target, GL_TRUE);

+    if (!obj)

+       return;

+

+   _mesa_lock_texture(ctx, obj);

+   switch (pname) {

+      case GL_TEXTURE_MAG_FILTER:

+         *params = (GLint) obj->MagFilter;

+         break;;

+      case GL_TEXTURE_MIN_FILTER:

+         *params = (GLint) obj->MinFilter;

+         break;;

+      case GL_TEXTURE_WRAP_S:

+         *params = (GLint) obj->WrapS;

+         break;;

+      case GL_TEXTURE_WRAP_T:

+         *params = (GLint) obj->WrapT;

+         break;;

+      case GL_TEXTURE_WRAP_R:

+         *params = (GLint) obj->WrapR;

+         break;;

+      case GL_TEXTURE_BORDER_COLOR:

+         {

+            GLfloat b[4];

+            b[0] = CLAMP(obj->BorderColor.f[0], 0.0F, 1.0F);

+            b[1] = CLAMP(obj->BorderColor.f[1], 0.0F, 1.0F);

+            b[2] = CLAMP(obj->BorderColor.f[2], 0.0F, 1.0F);

+            b[3] = CLAMP(obj->BorderColor.f[3], 0.0F, 1.0F);

+            params[0] = FLOAT_TO_INT(b[0]);

+            params[1] = FLOAT_TO_INT(b[1]);

+            params[2] = FLOAT_TO_INT(b[2]);

+            params[3] = FLOAT_TO_INT(b[3]);

+         }

+         break;;

+      case GL_TEXTURE_RESIDENT:

+         {

+            GLboolean resident;

+            if (ctx->Driver.IsTextureResident)

+               resident = ctx->Driver.IsTextureResident(ctx, obj);

+            else

+               resident = GL_TRUE;

+            *params = (GLint) resident;

+         }

+         break;;

+      case GL_TEXTURE_PRIORITY:

+         *params = FLOAT_TO_INT(obj->Priority);

+         break;;

+      case GL_TEXTURE_MIN_LOD:

+         *params = (GLint) obj->MinLod;

+         break;;

+      case GL_TEXTURE_MAX_LOD:

+         *params = (GLint) obj->MaxLod;

+         break;;

+      case GL_TEXTURE_BASE_LEVEL:

+         *params = obj->BaseLevel;

+         break;;

+      case GL_TEXTURE_MAX_LEVEL:

+         *params = obj->MaxLevel;

+         break;;

+      case GL_TEXTURE_MAX_ANISOTROPY_EXT:

+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {

+            *params = (GLint) obj->MaxAnisotropy;

+         }

+         else {

+            error = GL_TRUE;

+         }

+         break;

+      case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:

+         if (ctx->Extensions.ARB_shadow_ambient) {

+            *params = (GLint) FLOAT_TO_INT(obj->CompareFailValue);

+         }

+         else {

+            error = GL_TRUE;

+         }

+         break;

+      case GL_GENERATE_MIPMAP_SGIS:

+	 *params = (GLint) obj->GenerateMipmap;

+         break;

+      case GL_TEXTURE_COMPARE_MODE_ARB:

+         if (ctx->Extensions.ARB_shadow) {

+            *params = (GLint) obj->CompareMode;

+         }

+         else {

+            error = GL_TRUE;

+         }

+         break;

+      case GL_TEXTURE_COMPARE_FUNC_ARB:

+         if (ctx->Extensions.ARB_shadow) {

+            *params = (GLint) obj->CompareFunc;

+         }

+         else {

+            error = GL_TRUE;

+         }

+         break;

+      case GL_DEPTH_TEXTURE_MODE_ARB:

+         if (ctx->Extensions.ARB_depth_texture) {

+            *params = (GLint) obj->DepthMode;

+         }

+         else {

+            error = GL_TRUE;

+         }

+         break;

+      case GL_TEXTURE_LOD_BIAS:

+         if (ctx->Extensions.EXT_texture_lod_bias) {

+            *params = (GLint) obj->LodBias;

+         }

+         else {

+            error = GL_TRUE;

+         }

+         break;

+#if FEATURE_OES_draw_texture

+      case GL_TEXTURE_CROP_RECT_OES:

+         params[0] = obj->CropRect[0];

+         params[1] = obj->CropRect[1];

+         params[2] = obj->CropRect[2];

+         params[3] = obj->CropRect[3];

+         break;

+#endif

+      case GL_TEXTURE_SWIZZLE_R_EXT:

+      case GL_TEXTURE_SWIZZLE_G_EXT:

+      case GL_TEXTURE_SWIZZLE_B_EXT:

+      case GL_TEXTURE_SWIZZLE_A_EXT:

+         if (ctx->Extensions.EXT_texture_swizzle) {

+            GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;

+            *params = obj->Swizzle[comp];

+         }

+         else {

+            error = GL_TRUE;

+         }

+         break;

+

+      case GL_TEXTURE_SWIZZLE_RGBA_EXT:

+         if (ctx->Extensions.EXT_texture_swizzle) {

+            COPY_4V(params, obj->Swizzle);

+         }

+         else {

+            error = GL_TRUE;

+         }

+         break;

+

+      default:

+         ; /* silence warnings */

+   }

+

+   if (error)

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(pname=0x%x)",

+		  pname);

+

+   _mesa_unlock_texture(ctx, obj);

+}

+

+

+/** New in GL 3.0 */

+void GLAPIENTRY

+_mesa_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params)

+{

+   struct gl_texture_object *texObj;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   texObj = get_texobj(ctx, target, GL_TRUE);

+   

+   switch (pname) {

+   case GL_TEXTURE_BORDER_COLOR:

+      COPY_4V(params, texObj->BorderColor.i);

+      break;

+   default:

+      _mesa_GetTexParameteriv(target, pname, params);

+   }

+}

+

+

+/** New in GL 3.0 */

+void GLAPIENTRY

+_mesa_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)

+{

+   struct gl_texture_object *texObj;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   texObj = get_texobj(ctx, target, GL_TRUE);

+   

+   switch (pname) {

+   case GL_TEXTURE_BORDER_COLOR:

+      COPY_4V(params, texObj->BorderColor.i);

+      break;

+   default:

+      {

+         GLint ip[4];

+         _mesa_GetTexParameteriv(target, pname, ip);

+         params[0] = ip[0];

+         if (pname == GL_TEXTURE_SWIZZLE_RGBA_EXT || 

+             pname == GL_TEXTURE_CROP_RECT_OES) {

+            params[1] = ip[1];

+            params[2] = ip[2];

+            params[3] = ip[3];

+         }

+      }

+   }

+}

diff --git a/mesalib/src/mesa/main/texstore.h b/mesalib/src/mesa/main/texstore.h
index d56318709..1d0ce7d4a 100644
--- a/mesalib/src/mesa/main/texstore.h
+++ b/mesalib/src/mesa/main/texstore.h
@@ -1,209 +1,209 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.1
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- * Copyright (c) 2008 VMware, Inc.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file texstore.h
- * Texture image storage routines.
- *
- * \author Brian Paul
- */
-
-
-#ifndef TEXSTORE_H
-#define TEXSTORE_H
-
-
-#include "mtypes.h"
-#include "formats.h"
-
-
-/**
- * This macro defines the (many) parameters to the texstore functions.
- * \param dims  either 1 or 2 or 3
- * \param baseInternalFormat  user-specified base internal format
- * \param dstFormat  destination Mesa texture format
- * \param dstAddr  destination image address
- * \param dstX/Y/Zoffset  destination x/y/z offset (ala TexSubImage), in texels
- * \param dstRowStride  destination image row stride, in bytes
- * \param dstImageOffsets  offset of each 2D slice within 3D texture, in texels
- * \param srcWidth/Height/Depth  source image size, in pixels
- * \param srcFormat  incoming image format
- * \param srcType  incoming image data type
- * \param srcAddr  source image address
- * \param srcPacking  source image packing parameters
- */
-#define TEXSTORE_PARAMS \
-	struct gl_context *ctx, GLuint dims, \
-	GLenum baseInternalFormat, \
-	gl_format dstFormat, \
-	GLvoid *dstAddr, \
-	GLint dstXoffset, GLint dstYoffset, GLint dstZoffset, \
-	GLint dstRowStride, const GLuint *dstImageOffsets, \
-	GLint srcWidth, GLint srcHeight, GLint srcDepth, \
-	GLenum srcFormat, GLenum srcType, \
-	const GLvoid *srcAddr, \
-	const struct gl_pixelstore_attrib *srcPacking
-
-
-extern GLboolean
-_mesa_texstore(TEXSTORE_PARAMS);
-
-
-extern GLchan *
-_mesa_make_temp_chan_image(struct gl_context *ctx, GLuint dims,
-                           GLenum logicalBaseFormat,
-                           GLenum textureBaseFormat,
-                           GLint srcWidth, GLint srcHeight, GLint srcDepth,
-                           GLenum srcFormat, GLenum srcType,
-                           const GLvoid *srcAddr,
-                           const struct gl_pixelstore_attrib *srcPacking);
-
-GLfloat *
-_mesa_make_temp_float_image(struct gl_context *ctx, GLuint dims,
-			    GLenum logicalBaseFormat,
-			    GLenum textureBaseFormat,
-			    GLint srcWidth, GLint srcHeight, GLint srcDepth,
-			    GLenum srcFormat, GLenum srcType,
-			    const GLvoid *srcAddr,
-			    const struct gl_pixelstore_attrib *srcPacking,
-			    GLbitfield transferOps);
-
-extern void
-_mesa_store_teximage1d(struct gl_context *ctx, GLenum target, GLint level,
-                       GLint internalFormat,
-                       GLint width, GLint border,
-                       GLenum format, GLenum type, const GLvoid *pixels,
-                       const struct gl_pixelstore_attrib *packing,
-                       struct gl_texture_object *texObj,
-                       struct gl_texture_image *texImage);
-
-
-extern void
-_mesa_store_teximage2d(struct gl_context *ctx, GLenum target, GLint level,
-                       GLint internalFormat,
-                       GLint width, GLint height, GLint border,
-                       GLenum format, GLenum type, const GLvoid *pixels,
-                       const struct gl_pixelstore_attrib *packing,
-                       struct gl_texture_object *texObj,
-                       struct gl_texture_image *texImage);
-
-
-extern void
-_mesa_store_teximage3d(struct gl_context *ctx, GLenum target, GLint level,
-                       GLint internalFormat,
-                       GLint width, GLint height, GLint depth, GLint border,
-                       GLenum format, GLenum type, const GLvoid *pixels,
-                       const struct gl_pixelstore_attrib *packing,
-                       struct gl_texture_object *texObj,
-                       struct gl_texture_image *texImage);
-
-
-extern void
-_mesa_store_texsubimage1d(struct gl_context *ctx, GLenum target, GLint level,
-                          GLint xoffset, GLint width,
-                          GLenum format, GLenum type, const GLvoid *pixels,
-                          const struct gl_pixelstore_attrib *packing,
-                          struct gl_texture_object *texObj,
-                          struct gl_texture_image *texImage);
-
-
-extern void
-_mesa_store_texsubimage2d(struct gl_context *ctx, GLenum target, GLint level,
-                          GLint xoffset, GLint yoffset,
-                          GLint width, GLint height,
-                          GLenum format, GLenum type, const GLvoid *pixels,
-                          const struct gl_pixelstore_attrib *packing,
-                          struct gl_texture_object *texObj,
-                          struct gl_texture_image *texImage);
-
-
-extern void
-_mesa_store_texsubimage3d(struct gl_context *ctx, GLenum target, GLint level,
-                          GLint xoffset, GLint yoffset, GLint zoffset,
-                          GLint width, GLint height, GLint depth,
-                          GLenum format, GLenum type, const GLvoid *pixels,
-                          const struct gl_pixelstore_attrib *packing,
-                          struct gl_texture_object *texObj,
-                          struct gl_texture_image *texImage);
-
-
-extern void
-_mesa_store_compressed_teximage1d(struct gl_context *ctx, GLenum target, GLint level,
-                                  GLint internalFormat,
-                                  GLint width, GLint border,
-                                  GLsizei imageSize, const GLvoid *data,
-                                  struct gl_texture_object *texObj,
-                                  struct gl_texture_image *texImage);
-
-extern void
-_mesa_store_compressed_teximage2d(struct gl_context *ctx, GLenum target, GLint level,
-                                  GLint internalFormat,
-                                  GLint width, GLint height, GLint border,
-                                  GLsizei imageSize, const GLvoid *data,
-                                  struct gl_texture_object *texObj,
-                                  struct gl_texture_image *texImage);
-
-extern void
-_mesa_store_compressed_teximage3d(struct gl_context *ctx, GLenum target, GLint level,
-                                  GLint internalFormat,
-                                  GLint width, GLint height, GLint depth,
-                                  GLint border,
-                                  GLsizei imageSize, const GLvoid *data,
-                                  struct gl_texture_object *texObj,
-                                  struct gl_texture_image *texImage);
-
-
-extern void
-_mesa_store_compressed_texsubimage1d(struct gl_context *ctx, GLenum target,
-                                     GLint level,
-                                     GLint xoffset, GLsizei width,
-                                     GLenum format,
-                                     GLsizei imageSize, const GLvoid *data,
-                                     struct gl_texture_object *texObj,
-                                     struct gl_texture_image *texImage);
-
-extern void
-_mesa_store_compressed_texsubimage2d(struct gl_context *ctx, GLenum target,
-                                     GLint level,
-                                     GLint xoffset, GLint yoffset,
-                                     GLsizei width, GLsizei height,
-                                     GLenum format,
-                                     GLsizei imageSize, const GLvoid *data,
-                                     struct gl_texture_object *texObj,
-                                     struct gl_texture_image *texImage);
-
-extern void
-_mesa_store_compressed_texsubimage3d(struct gl_context *ctx, GLenum target,
-                                GLint level,
-                                GLint xoffset, GLint yoffset, GLint zoffset,
-                                GLsizei width, GLsizei height, GLsizei depth,
-                                GLenum format,
-                                GLsizei imageSize, const GLvoid *data,
-                                struct gl_texture_object *texObj,
-                                struct gl_texture_image *texImage);
-
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.1

+ *

+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

+ * Copyright (c) 2008 VMware, Inc.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file texstore.h

+ * Texture image storage routines.

+ *

+ * \author Brian Paul

+ */

+

+

+#ifndef TEXSTORE_H

+#define TEXSTORE_H

+

+

+#include "mtypes.h"

+#include "formats.h"

+

+

+/**

+ * This macro defines the (many) parameters to the texstore functions.

+ * \param dims  either 1 or 2 or 3

+ * \param baseInternalFormat  user-specified base internal format

+ * \param dstFormat  destination Mesa texture format

+ * \param dstAddr  destination image address

+ * \param dstX/Y/Zoffset  destination x/y/z offset (ala TexSubImage), in texels

+ * \param dstRowStride  destination image row stride, in bytes

+ * \param dstImageOffsets  offset of each 2D slice within 3D texture, in texels

+ * \param srcWidth/Height/Depth  source image size, in pixels

+ * \param srcFormat  incoming image format

+ * \param srcType  incoming image data type

+ * \param srcAddr  source image address

+ * \param srcPacking  source image packing parameters

+ */

+#define TEXSTORE_PARAMS \

+	struct gl_context *ctx, GLuint dims, \

+	GLenum baseInternalFormat, \

+	gl_format dstFormat, \

+	GLvoid *dstAddr, \

+	GLint dstXoffset, GLint dstYoffset, GLint dstZoffset, \

+	GLint dstRowStride, const GLuint *dstImageOffsets, \

+	GLint srcWidth, GLint srcHeight, GLint srcDepth, \

+	GLenum srcFormat, GLenum srcType, \

+	const GLvoid *srcAddr, \

+	const struct gl_pixelstore_attrib *srcPacking

+

+

+extern GLboolean

+_mesa_texstore(TEXSTORE_PARAMS);

+

+

+extern GLchan *

+_mesa_make_temp_chan_image(struct gl_context *ctx, GLuint dims,

+                           GLenum logicalBaseFormat,

+                           GLenum textureBaseFormat,

+                           GLint srcWidth, GLint srcHeight, GLint srcDepth,

+                           GLenum srcFormat, GLenum srcType,

+                           const GLvoid *srcAddr,

+                           const struct gl_pixelstore_attrib *srcPacking);

+

+GLfloat *

+_mesa_make_temp_float_image(struct gl_context *ctx, GLuint dims,

+			    GLenum logicalBaseFormat,

+			    GLenum textureBaseFormat,

+			    GLint srcWidth, GLint srcHeight, GLint srcDepth,

+			    GLenum srcFormat, GLenum srcType,

+			    const GLvoid *srcAddr,

+			    const struct gl_pixelstore_attrib *srcPacking,

+			    GLbitfield transferOps);

+

+extern void

+_mesa_store_teximage1d(struct gl_context *ctx, GLenum target, GLint level,

+                       GLint internalFormat,

+                       GLint width, GLint border,

+                       GLenum format, GLenum type, const GLvoid *pixels,

+                       const struct gl_pixelstore_attrib *packing,

+                       struct gl_texture_object *texObj,

+                       struct gl_texture_image *texImage);

+

+

+extern void

+_mesa_store_teximage2d(struct gl_context *ctx, GLenum target, GLint level,

+                       GLint internalFormat,

+                       GLint width, GLint height, GLint border,

+                       GLenum format, GLenum type, const GLvoid *pixels,

+                       const struct gl_pixelstore_attrib *packing,

+                       struct gl_texture_object *texObj,

+                       struct gl_texture_image *texImage);

+

+

+extern void

+_mesa_store_teximage3d(struct gl_context *ctx, GLenum target, GLint level,

+                       GLint internalFormat,

+                       GLint width, GLint height, GLint depth, GLint border,

+                       GLenum format, GLenum type, const GLvoid *pixels,

+                       const struct gl_pixelstore_attrib *packing,

+                       struct gl_texture_object *texObj,

+                       struct gl_texture_image *texImage);

+

+

+extern void

+_mesa_store_texsubimage1d(struct gl_context *ctx, GLenum target, GLint level,

+                          GLint xoffset, GLint width,

+                          GLenum format, GLenum type, const GLvoid *pixels,

+                          const struct gl_pixelstore_attrib *packing,

+                          struct gl_texture_object *texObj,

+                          struct gl_texture_image *texImage);

+

+

+extern void

+_mesa_store_texsubimage2d(struct gl_context *ctx, GLenum target, GLint level,

+                          GLint xoffset, GLint yoffset,

+                          GLint width, GLint height,

+                          GLenum format, GLenum type, const GLvoid *pixels,

+                          const struct gl_pixelstore_attrib *packing,

+                          struct gl_texture_object *texObj,

+                          struct gl_texture_image *texImage);

+

+

+extern void

+_mesa_store_texsubimage3d(struct gl_context *ctx, GLenum target, GLint level,

+                          GLint xoffset, GLint yoffset, GLint zoffset,

+                          GLint width, GLint height, GLint depth,

+                          GLenum format, GLenum type, const GLvoid *pixels,

+                          const struct gl_pixelstore_attrib *packing,

+                          struct gl_texture_object *texObj,

+                          struct gl_texture_image *texImage);

+

+

+extern void

+_mesa_store_compressed_teximage1d(struct gl_context *ctx, GLenum target, GLint level,

+                                  GLint internalFormat,

+                                  GLint width, GLint border,

+                                  GLsizei imageSize, const GLvoid *data,

+                                  struct gl_texture_object *texObj,

+                                  struct gl_texture_image *texImage);

+

+extern void

+_mesa_store_compressed_teximage2d(struct gl_context *ctx, GLenum target, GLint level,

+                                  GLint internalFormat,

+                                  GLint width, GLint height, GLint border,

+                                  GLsizei imageSize, const GLvoid *data,

+                                  struct gl_texture_object *texObj,

+                                  struct gl_texture_image *texImage);

+

+extern void

+_mesa_store_compressed_teximage3d(struct gl_context *ctx, GLenum target, GLint level,

+                                  GLint internalFormat,

+                                  GLint width, GLint height, GLint depth,

+                                  GLint border,

+                                  GLsizei imageSize, const GLvoid *data,

+                                  struct gl_texture_object *texObj,

+                                  struct gl_texture_image *texImage);

+

+

+extern void

+_mesa_store_compressed_texsubimage1d(struct gl_context *ctx, GLenum target,

+                                     GLint level,

+                                     GLint xoffset, GLsizei width,

+                                     GLenum format,

+                                     GLsizei imageSize, const GLvoid *data,

+                                     struct gl_texture_object *texObj,

+                                     struct gl_texture_image *texImage);

+

+extern void

+_mesa_store_compressed_texsubimage2d(struct gl_context *ctx, GLenum target,

+                                     GLint level,

+                                     GLint xoffset, GLint yoffset,

+                                     GLsizei width, GLsizei height,

+                                     GLenum format,

+                                     GLsizei imageSize, const GLvoid *data,

+                                     struct gl_texture_object *texObj,

+                                     struct gl_texture_image *texImage);

+

+extern void

+_mesa_store_compressed_texsubimage3d(struct gl_context *ctx, GLenum target,

+                                GLint level,

+                                GLint xoffset, GLint yoffset, GLint zoffset,

+                                GLsizei width, GLsizei height, GLsizei depth,

+                                GLenum format,

+                                GLsizei imageSize, const GLvoid *data,

+                                struct gl_texture_object *texObj,

+                                struct gl_texture_image *texImage);

+

+

+#endif

diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c
index f984ce3bc..24dc1336c 100644
--- a/mesalib/src/mesa/main/uniforms.c
+++ b/mesalib/src/mesa/main/uniforms.c
@@ -1,1459 +1,1459 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2004-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.
- * Copyright © 2010 Intel Corporation
- *
- * 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
- * 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.
- */
-
-/**
- * \file uniforms.c
- * Functions related to GLSL uniform variables.
- * \author Brian Paul
- */
-
-/**
- * XXX things to do:
- * 1. Check that the right error code is generated for all _mesa_error() calls.
- * 2. Insert FLUSH_VERTICES calls in various places
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/dispatch.h"
-#include "main/mfeatures.h"
-#include "main/mtypes.h"
-#include "main/shaderapi.h"
-#include "main/shaderobj.h"
-#include "main/uniforms.h"
-#include "program/prog_parameter.h"
-#include "program/prog_statevars.h"
-#include "program/prog_uniform.h"
-#include "program/prog_instruction.h"
-
-
-static GLenum
-base_uniform_type(GLenum type)
-{
-   switch (type) {
-#if 0 /* not needed, for now */
-   case GL_BOOL:
-   case GL_BOOL_VEC2:
-   case GL_BOOL_VEC3:
-   case GL_BOOL_VEC4:
-      return GL_BOOL;
-#endif
-   case GL_FLOAT:
-   case GL_FLOAT_VEC2:
-   case GL_FLOAT_VEC3:
-   case GL_FLOAT_VEC4:
-      return GL_FLOAT;
-   case GL_UNSIGNED_INT:
-   case GL_UNSIGNED_INT_VEC2:
-   case GL_UNSIGNED_INT_VEC3:
-   case GL_UNSIGNED_INT_VEC4:
-      return GL_UNSIGNED_INT;
-   case GL_INT:
-   case GL_INT_VEC2:
-   case GL_INT_VEC3:
-   case GL_INT_VEC4:
-      return GL_INT;
-   default:
-      _mesa_problem(NULL, "Invalid type in base_uniform_type()");
-      return GL_FLOAT;
-   }
-}
-
-
-static GLboolean
-is_boolean_type(GLenum type)
-{
-   switch (type) {
-   case GL_BOOL:
-   case GL_BOOL_VEC2:
-   case GL_BOOL_VEC3:
-   case GL_BOOL_VEC4:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-static GLboolean
-is_sampler_type(GLenum type)
-{
-   switch (type) {
-   case GL_SAMPLER_1D:
-   case GL_SAMPLER_2D:
-   case GL_SAMPLER_3D:
-   case GL_SAMPLER_CUBE:
-   case GL_SAMPLER_1D_SHADOW:
-   case GL_SAMPLER_2D_SHADOW:
-   case GL_SAMPLER_2D_RECT_ARB:
-   case GL_SAMPLER_2D_RECT_SHADOW_ARB:
-   case GL_SAMPLER_1D_ARRAY_EXT:
-   case GL_SAMPLER_2D_ARRAY_EXT:
-   case GL_SAMPLER_1D_ARRAY_SHADOW_EXT:
-   case GL_SAMPLER_2D_ARRAY_SHADOW_EXT:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-static struct gl_program_parameter *
-get_uniform_parameter(const struct gl_shader_program *shProg, GLuint index)
-{
-   const struct gl_program *prog = NULL;
-   GLint progPos;
-
-   progPos = shProg->Uniforms->Uniforms[index].VertPos;
-   if (progPos >= 0) {
-      prog = &shProg->VertexProgram->Base;
-   }
-   else {
-      progPos = shProg->Uniforms->Uniforms[index].FragPos;
-      if (progPos >= 0) {
-         prog = &shProg->FragmentProgram->Base;
-      } else {
-         progPos = shProg->Uniforms->Uniforms[index].GeomPos;
-         if (progPos >= 0) {
-            prog = &shProg->GeometryProgram->Base;
-         }
-      }
-   }
-
-   if (!prog || progPos < 0)
-      return NULL; /* should never happen */
-
-   return &prog->Parameters->Parameters[progPos];
-}
-
-
-/**
- * Called by glGetActiveUniform().
- */
-static void
-_mesa_get_active_uniform(struct gl_context *ctx, GLuint program, GLuint index,
-                         GLsizei maxLength, GLsizei *length, GLint *size,
-                         GLenum *type, GLchar *nameOut)
-{
-   const struct gl_shader_program *shProg;
-   const struct gl_program *prog = NULL;
-   const struct gl_program_parameter *param;
-   GLint progPos;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveUniform");
-   if (!shProg)
-      return;
-
-   if (!shProg->Uniforms || index >= shProg->Uniforms->NumUniforms) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform(index)");
-      return;
-   }
-
-   progPos = shProg->Uniforms->Uniforms[index].VertPos;
-   if (progPos >= 0) {
-      prog = &shProg->VertexProgram->Base;
-   }
-   else {
-      progPos = shProg->Uniforms->Uniforms[index].FragPos;
-      if (progPos >= 0) {
-         prog = &shProg->FragmentProgram->Base;
-      } else {
-         progPos = shProg->Uniforms->Uniforms[index].GeomPos;
-         if (progPos >= 0) {
-            prog = &shProg->GeometryProgram->Base;
-         }
-      }
-   }
-
-   if (!prog || progPos < 0)
-      return; /* should never happen */
-
-   ASSERT(progPos < prog->Parameters->NumParameters);
-   param = &prog->Parameters->Parameters[progPos];
-
-   if (nameOut) {
-      _mesa_copy_string(nameOut, maxLength, length, param->Name);
-   }
-
-   if (size) {
-      GLint typeSize = _mesa_sizeof_glsl_type(param->DataType);
-      if ((GLint) param->Size > typeSize) {
-         /* This is an array.
-          * Array elements are placed on vector[4] boundaries so they're
-          * a multiple of four floats.  We round typeSize up to next multiple
-          * of four to get the right size below.
-          */
-         typeSize = (typeSize + 3) & ~3;
-      }
-      /* Note that the returned size is in units of the <type>, not bytes */
-      *size = param->Size / typeSize;
-   }
-
-   if (type) {
-      *type = param->DataType;
-   }
-}
-
-
-static unsigned
-get_vector_elements(GLenum type)
-{
-   switch (type) {
-   case GL_FLOAT:
-   case GL_INT:
-   case GL_BOOL:
-   case GL_UNSIGNED_INT:
-   default: /* Catch all the various sampler types. */
-      return 1;
-
-   case GL_FLOAT_VEC2:
-   case GL_INT_VEC2:
-   case GL_BOOL_VEC2:
-   case GL_UNSIGNED_INT_VEC2:
-      return 2;
-
-   case GL_FLOAT_VEC3:
-   case GL_INT_VEC3:
-   case GL_BOOL_VEC3:
-   case GL_UNSIGNED_INT_VEC3:
-      return 3;
-
-   case GL_FLOAT_VEC4:
-   case GL_INT_VEC4:
-   case GL_BOOL_VEC4:
-   case GL_UNSIGNED_INT_VEC4:
-      return 4;
-   }
-}
-
-static void
-get_matrix_dims(GLenum type, GLint *rows, GLint *cols)
-{
-   switch (type) {
-   case GL_FLOAT_MAT2:
-      *rows = *cols = 2;
-      break;
-   case GL_FLOAT_MAT2x3:
-      *rows = 3;
-      *cols = 2;
-      break;
-   case GL_FLOAT_MAT2x4:
-      *rows = 4;
-      *cols = 2;
-      break;
-   case GL_FLOAT_MAT3:
-      *rows = 3;
-      *cols = 3;
-      break;
-   case GL_FLOAT_MAT3x2:
-      *rows = 2;
-      *cols = 3;
-      break;
-   case GL_FLOAT_MAT3x4:
-      *rows = 4;
-      *cols = 3;
-      break;
-   case GL_FLOAT_MAT4:
-      *rows = 4;
-      *cols = 4;
-      break;
-   case GL_FLOAT_MAT4x2:
-      *rows = 2;
-      *cols = 4;
-      break;
-   case GL_FLOAT_MAT4x3:
-      *rows = 3;
-      *cols = 4;
-      break;
-   default:
-      *rows = *cols = 0;
-   }
-}
-
-
-/**
- * Determine the number of rows and columns occupied by a uniform
- * according to its datatype.  For non-matrix types (such as GL_FLOAT_VEC4),
- * the number of rows = 1 and cols = number of elements in the vector.
- */
-static void
-get_uniform_rows_cols(const struct gl_program_parameter *p,
-                      GLint *rows, GLint *cols)
-{
-   get_matrix_dims(p->DataType, rows, cols);
-   if (*rows == 0 && *cols == 0) {
-      /* not a matrix type, probably a float or vector */
-      *rows = 1;
-      *cols = get_vector_elements(p->DataType);
-   }
-}
-
-
-/**
- * Helper for get_uniform[fi]v() functions.
- * Given a shader program name and uniform location, return a pointer
- * to the shader program and return the program parameter position.
- */
-static void
-lookup_uniform_parameter(struct gl_context *ctx, GLuint program, GLint location,
-                         struct gl_program **progOut, GLint *paramPosOut)
-{
-   struct gl_shader_program *shProg
-      = _mesa_lookup_shader_program_err(ctx, program, "glGetUniform[if]v");
-   struct gl_program *prog = NULL;
-   GLint progPos = -1;
-
-   /* if shProg is NULL, we'll have already recorded an error */
-
-   if (shProg) {
-      if (!shProg->Uniforms ||
-          location < 0 ||
-          location >= (GLint) shProg->Uniforms->NumUniforms) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,  "glGetUniformfv(location)");
-      }
-      else {
-         /* OK, find the gl_program and program parameter location */
-         progPos = shProg->Uniforms->Uniforms[location].VertPos;
-         if (progPos >= 0) {
-            prog = &shProg->VertexProgram->Base;
-         }
-         else {
-            progPos = shProg->Uniforms->Uniforms[location].FragPos;
-            if (progPos >= 0) {
-               prog = &shProg->FragmentProgram->Base;
-            } else {
-               progPos = shProg->Uniforms->Uniforms[location].GeomPos;
-               if (progPos >= 0) {
-                  prog = &shProg->GeometryProgram->Base;
-               }
-            }
-         }
-      }
-   }
-
-   *progOut = prog;
-   *paramPosOut = progPos;
-}
-
-
-/**
- * GLGL uniform arrays and structs require special handling.
- *
- * The GL_ARB_shader_objects spec says that if you use
- * glGetUniformLocation to get the location of an array, you CANNOT
- * access other elements of the array by adding an offset to the
- * returned location.  For example, you must call
- * glGetUniformLocation("foo[16]") if you want to set the 16th element
- * of the array with glUniform().
- *
- * HOWEVER, some other OpenGL drivers allow accessing array elements
- * by adding an offset to the returned array location.  And some apps
- * seem to depend on that behaviour.
- *
- * Mesa's gl_uniform_list doesn't directly support this since each
- * entry in the list describes one uniform variable, not one uniform
- * element.  We could insert dummy entries in the list for each array
- * element after [0] but that causes complications elsewhere.
- *
- * We solve this problem by encoding two values in the location that's
- * returned by glGetUniformLocation():
- *  a) index into gl_uniform_list::Uniforms[] for the uniform
- *  b) an array/field offset (0 for simple types)
- *
- * These two values are encoded in the high and low halves of a GLint.
- * By putting the uniform number in the high part and the offset in the
- * low part, we can support the unofficial ability to index into arrays
- * by adding offsets to the location value.
- */
-static void
-merge_location_offset(GLint *location, GLint offset)
-{
-   *location = (*location << 16) | offset;
-}
-
-
-/**
- * Separate the uniform location and parameter offset.  See above.
- */
-static void
-split_location_offset(GLint *location, GLint *offset)
-{
-   *offset = *location & 0xffff;
-   *location = *location >> 16;
-}
-
-
-
-/**
- * Called via glGetUniformfv().
- */
-static void
-_mesa_get_uniformfv(struct gl_context *ctx, GLuint program, GLint location,
-                    GLfloat *params)
-{
-   struct gl_program *prog;
-   GLint paramPos;
-   GLint offset;
-
-   split_location_offset(&location, &offset);
-
-   lookup_uniform_parameter(ctx, program, location, &prog, &paramPos);
-
-   if (prog) {
-      const struct gl_program_parameter *p =
-         &prog->Parameters->Parameters[paramPos];
-      GLint rows, cols, i, j, k;
-
-      get_uniform_rows_cols(p, &rows, &cols);
-
-      k = 0;
-      for (i = 0; i < rows; i++) {
-	 const int base = paramPos + offset + i;
-
-         for (j = 0; j < cols; j++ ) {
-            params[k++] = prog->Parameters->ParameterValues[base][j];
-         }
-      }
-   }
-}
-
-
-/**
- * Called via glGetUniformiv().
- * \sa _mesa_get_uniformfv, only difference is a cast.
- */
-static void
-_mesa_get_uniformiv(struct gl_context *ctx, GLuint program, GLint location,
-                    GLint *params)
-{
-   struct gl_program *prog;
-   GLint paramPos;
-   GLint offset;
-
-   split_location_offset(&location, &offset);
-
-   lookup_uniform_parameter(ctx, program, location, &prog, &paramPos);
-
-   if (prog) {
-      const struct gl_program_parameter *p =
-         &prog->Parameters->Parameters[paramPos];
-      GLint rows, cols, i, j, k;
-
-      get_uniform_rows_cols(p, &rows, &cols);
-
-      k = 0;
-      for (i = 0; i < rows; i++) {
-	 const int base = paramPos + offset + i;
-
-         for (j = 0; j < cols; j++ ) {
-            params[k++] = (GLint) prog->Parameters->ParameterValues[base][j];
-         }
-      }
-   }
-}
-
-
-/**
- * Called via glGetUniformuiv().
- * New in GL_EXT_gpu_shader4, OpenGL 3.0
- * \sa _mesa_get_uniformfv, only difference is a cast.
- */
-static void
-_mesa_get_uniformuiv(struct gl_context *ctx, GLuint program, GLint location,
-                     GLuint *params)
-{
-   struct gl_program *prog;
-   GLint paramPos;
-   GLint offset;
-
-   split_location_offset(&location, &offset);
-
-   lookup_uniform_parameter(ctx, program, location, &prog, &paramPos);
-
-   if (prog) {
-      const struct gl_program_parameter *p =
-         &prog->Parameters->Parameters[paramPos];
-      GLint rows, cols, i, j, k;
-
-      get_uniform_rows_cols(p, &rows, &cols);
-
-      k = 0;
-      for (i = 0; i < rows; i++) {
-	 const int base = paramPos + offset + i;
-
-         for (j = 0; j < cols; j++ ) {
-            params[k++] = (GLuint) prog->Parameters->ParameterValues[base][j];
-         }
-      }
-   }
-}
-
-
-/**
- * Called via glGetUniformLocation().
- *
- * The return value will encode two values, the uniform location and an
- * offset (used for arrays, structs).
- */
-GLint
-_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,
-			   const GLchar *name)
-{
-   GLint offset = 0, location = -1;
-
-   if (shProg->LinkStatus == GL_FALSE) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(program)");
-      return -1;
-   }
-
-   /* XXX we should return -1 if the uniform was declared, but not
-    * actually used.
-    */
-
-   /* XXX we need to be able to parse uniform names for structs and arrays
-    * such as:
-    *   mymatrix[1]
-    *   mystruct.field1
-    */
-
-   {
-      /* handle 1-dimension arrays here... */
-      char *c = strchr(name, '[');
-      if (c) {
-         /* truncate name at [ */
-         const GLint len = c - name;
-         GLchar *newName = malloc(len + 1);
-         if (!newName)
-            return -1; /* out of mem */
-         memcpy(newName, name, len);
-         newName[len] = 0;
-
-         location = _mesa_lookup_uniform(shProg->Uniforms, newName);
-         if (location >= 0) {
-            const GLint element = atoi(c + 1);
-            if (element > 0) {
-               /* get type of the uniform array element */
-               struct gl_program_parameter *p;
-               p = get_uniform_parameter(shProg, location);
-               if (p) {
-                  GLint rows, cols;
-                  get_matrix_dims(p->DataType, &rows, &cols);
-                  if (rows < 1)
-                     rows = 1;
-                  offset = element * rows;
-               }
-            }
-         }
-
-         free(newName);
-      }
-   }
-
-   if (location < 0) {
-      location = _mesa_lookup_uniform(shProg->Uniforms, name);
-   }
-
-   if (location >= 0) {
-      merge_location_offset(&location, offset);
-   }
-
-   return location;
-}
-
-
-
-/**
- * Update the vertex/fragment program's TexturesUsed array.
- *
- * This needs to be called after glUniform(set sampler var) is called.
- * A call to glUniform(samplerVar, value) causes a sampler to point to a
- * particular texture unit.  We know the sampler's texture target
- * (1D/2D/3D/etc) from compile time but the sampler's texture unit is
- * set by glUniform() calls.
- *
- * So, scan the program->SamplerUnits[] and program->SamplerTargets[]
- * information to update the prog->TexturesUsed[] values.
- * Each value of TexturesUsed[unit] is one of zero, TEXTURE_1D_INDEX,
- * TEXTURE_2D_INDEX, TEXTURE_3D_INDEX, etc.
- * We'll use that info for state validation before rendering.
- */
-void
-_mesa_update_shader_textures_used(struct gl_program *prog)
-{
-   GLuint s;
-
-   memset(prog->TexturesUsed, 0, sizeof(prog->TexturesUsed));
-
-   for (s = 0; s < MAX_SAMPLERS; s++) {
-      if (prog->SamplersUsed & (1 << s)) {
-         GLuint unit = prog->SamplerUnits[s];
-         GLuint tgt = prog->SamplerTargets[s];
-         assert(unit < MAX_TEXTURE_IMAGE_UNITS);
-         assert(tgt < NUM_TEXTURE_TARGETS);
-         prog->TexturesUsed[unit] |= (1 << tgt);
-      }
-   }
-}
-
-
-/**
- * Check if the type given by userType is allowed to set a uniform of the
- * target type.  Generally, equivalence is required, but setting Boolean
- * uniforms can be done with glUniformiv or glUniformfv.
- */
-static GLboolean
-compatible_types(GLenum userType, GLenum targetType)
-{
-   if (userType == targetType)
-      return GL_TRUE;
-
-   if (targetType == GL_BOOL && (userType == GL_FLOAT ||
-                                 userType == GL_UNSIGNED_INT ||
-                                 userType == GL_INT))
-      return GL_TRUE;
-
-   if (targetType == GL_BOOL_VEC2 && (userType == GL_FLOAT_VEC2 ||
-                                      userType == GL_UNSIGNED_INT_VEC2 ||
-                                      userType == GL_INT_VEC2))
-      return GL_TRUE;
-
-   if (targetType == GL_BOOL_VEC3 && (userType == GL_FLOAT_VEC3 ||
-                                      userType == GL_UNSIGNED_INT_VEC3 ||
-                                      userType == GL_INT_VEC3))
-      return GL_TRUE;
-
-   if (targetType == GL_BOOL_VEC4 && (userType == GL_FLOAT_VEC4 ||
-                                      userType == GL_UNSIGNED_INT_VEC4 ||
-                                      userType == GL_INT_VEC4))
-      return GL_TRUE;
-
-   if (is_sampler_type(targetType) && userType == GL_INT)
-      return GL_TRUE;
-
-   return GL_FALSE;
-}
-
-
-/**
- * Set the value of a program's uniform variable.
- * \param program  the program whose uniform to update
- * \param index  the index of the program parameter for the uniform
- * \param offset  additional parameter slot offset (for arrays)
- * \param type  the incoming datatype of 'values'
- * \param count  the number of uniforms to set
- * \param elems  number of elements per uniform (1, 2, 3 or 4)
- * \param values  the new values, of datatype 'type'
- */
-static void
-set_program_uniform(struct gl_context *ctx, struct gl_program *program,
-                    GLint index, GLint offset,
-                    GLenum type, GLsizei count, GLint elems,
-                    const void *values)
-{
-   const struct gl_program_parameter *param =
-      &program->Parameters->Parameters[index];
-
-   assert(offset >= 0);
-   assert(elems >= 1);
-   assert(elems <= 4);
-
-   if (!compatible_types(type, param->DataType)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(type mismatch)");
-      return;
-   }
-
-   if (index + offset > (GLint) program->Parameters->Size) {
-      /* out of bounds! */
-      return;
-   }
-
-   if (param->Type == PROGRAM_SAMPLER) {
-      /* This controls which texture unit which is used by a sampler */
-      GLboolean changed = GL_FALSE;
-      GLint i;
-
-      /* this should have been caught by the compatible_types() check */
-      ASSERT(type == GL_INT);
-
-      /* loop over number of samplers to change */
-      for (i = 0; i < count; i++) {
-         GLuint sampler =
-            (GLuint) program->Parameters->ParameterValues[index + offset + i][0];
-         GLuint texUnit = ((GLuint *) values)[i];
-
-         /* check that the sampler (tex unit index) is legal */
-         if (texUnit >= ctx->Const.MaxTextureImageUnits) {
-            _mesa_error(ctx, GL_INVALID_VALUE,
-                        "glUniform1(invalid sampler/tex unit index for '%s')",
-                        param->Name);
-            return;
-         }
-
-         /* This maps a sampler to a texture unit: */
-         if (sampler < MAX_SAMPLERS) {
-#if 0
-            printf("Set program %p sampler %d '%s' to unit %u\n",
-		   program, sampler, param->Name, texUnit);
-#endif
-            if (program->SamplerUnits[sampler] != texUnit) {
-               program->SamplerUnits[sampler] = texUnit;
-               changed = GL_TRUE;
-            }
-         }
-      }
-
-      if (changed) {
-         /* When a sampler's value changes it usually requires rewriting
-          * a GPU program's TEX instructions since there may not be a
-          * sampler->texture lookup table.  We signal this with the
-          * ProgramStringNotify() callback.
-          */
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE | _NEW_PROGRAM);
-         _mesa_update_shader_textures_used(program);
-         /* Do we need to care about the return value here?
-          * This should not be the first time the driver was notified of
-          * this program.
-          */
-         (void) ctx->Driver.ProgramStringNotify(ctx, program->Target, program);
-      }
-   }
-   else {
-      /* ordinary uniform variable */
-      const GLboolean isUniformBool = is_boolean_type(param->DataType);
-      const GLenum basicType = base_uniform_type(type);
-      const GLint slots = (param->Size + 3) / 4;
-      const GLint typeSize = _mesa_sizeof_glsl_type(param->DataType);
-      GLsizei k, i;
-
-      if ((GLint) param->Size > typeSize) {
-         /* an array */
-         /* we'll ignore extra data below */
-      }
-      else {
-         /* non-array: count must be at most one; count == 0 is handled by the loop below */
-         if (count > 1) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glUniform(uniform '%s' is not an array)",
-                        param->Name);
-            return;
-         }
-      }
-
-      /* loop over number of array elements */
-      for (k = 0; k < count; k++) {
-         GLfloat *uniformVal;
-
-         if (offset + k >= slots) {
-            /* Extra array data is ignored */
-            break;
-         }
-
-         /* uniformVal (the destination) is always float[4] */
-         uniformVal = program->Parameters->ParameterValues[index + offset + k];
-
-         if (basicType == GL_INT) {
-            /* convert user's ints to floats */
-            const GLint *iValues = ((const GLint *) values) + k * elems;
-            for (i = 0; i < elems; i++) {
-               uniformVal[i] = (GLfloat) iValues[i];
-            }
-         }
-         else if (basicType == GL_UNSIGNED_INT) {
-            /* convert user's uints to floats */
-            const GLuint *iValues = ((const GLuint *) values) + k * elems;
-            for (i = 0; i < elems; i++) {
-               uniformVal[i] = (GLfloat) iValues[i];
-            }
-         }
-         else {
-            const GLfloat *fValues = ((const GLfloat *) values) + k * elems;
-            assert(basicType == GL_FLOAT);
-            for (i = 0; i < elems; i++) {
-               uniformVal[i] = fValues[i];
-            }
-         }
-
-         /* if the uniform is bool-valued, convert to 1.0 or 0.0 */
-         if (isUniformBool) {
-            for (i = 0; i < elems; i++) {
-               uniformVal[i] = uniformVal[i] ? 1.0f : 0.0f;
-            }
-         }
-      }
-   }
-}
-
-
-/**
- * Called via glUniform*() functions.
- */
-void
-_mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg,
-	      GLint location, GLsizei count,
-              const GLvoid *values, GLenum type)
-{
-   struct gl_uniform *uniform;
-   GLint elems, offset;
-
-   if (!shProg || !shProg->LinkStatus) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(program not linked)");
-      return;
-   }
-
-   if (location == -1)
-      return;   /* The standard specifies this as a no-op */
-
-   if (location < -1) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(location=%d)",
-                  location);
-      return;
-   }
-
-   split_location_offset(&location, &offset);
-
-   if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(location=%d)", location);
-      return;
-   }
-
-   if (count < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(count < 0)");
-      return;
-   }
-
-   elems = _mesa_sizeof_glsl_type(type);
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
-
-   uniform = &shProg->Uniforms->Uniforms[location];
-
-   if (ctx->Shader.Flags & GLSL_UNIFORMS) {
-      const GLenum basicType = base_uniform_type(type);
-      GLint i;
-      printf("Mesa: set program %u uniform %s (loc %d) to: ",
-	     shProg->Name, uniform->Name, location);
-      if (basicType == GL_INT) {
-         const GLint *v = (const GLint *) values;
-         for (i = 0; i < count * elems; i++) {
-            printf("%d ", v[i]);
-         }
-      }
-      else if (basicType == GL_UNSIGNED_INT) {
-         const GLuint *v = (const GLuint *) values;
-         for (i = 0; i < count * elems; i++) {
-            printf("%u ", v[i]);
-         }
-      }
-      else {
-         const GLfloat *v = (const GLfloat *) values;
-         assert(basicType == GL_FLOAT);
-         for (i = 0; i < count * elems; i++) {
-            printf("%g ", v[i]);
-         }
-      }
-      printf("\n");
-   }
-
-   /* A uniform var may be used by both a vertex shader and a fragment
-    * shader.  We may need to update one or both shader's uniform here:
-    */
-   if (shProg->VertexProgram) {
-      /* convert uniform location to program parameter index */
-      GLint index = uniform->VertPos;
-      if (index >= 0) {
-         set_program_uniform(ctx, &shProg->VertexProgram->Base,
-                             index, offset, type, count, elems, values);
-      }
-   }
-
-   if (shProg->FragmentProgram) {
-      /* convert uniform location to program parameter index */
-      GLint index = uniform->FragPos;
-      if (index >= 0) {
-         set_program_uniform(ctx, &shProg->FragmentProgram->Base,
-                             index, offset, type, count, elems, values);
-      }
-   }
-
-   if (shProg->GeometryProgram) {
-      /* convert uniform location to program parameter index */
-      GLint index = uniform->GeomPos;
-      if (index >= 0) {
-         set_program_uniform(ctx, &shProg->GeometryProgram->Base,
-                             index, offset, type, count, elems, values);
-      }
-   }
-
-   uniform->Initialized = GL_TRUE;
-}
-
-
-/**
- * Set a matrix-valued program parameter.
- */
-static void
-set_program_uniform_matrix(struct gl_context *ctx, struct gl_program *program,
-                           GLuint index, GLuint offset,
-                           GLuint count, GLuint rows, GLuint cols,
-                           GLboolean transpose, const GLfloat *values)
-{
-   GLuint mat, row, col;
-   GLuint src = 0;
-   const struct gl_program_parameter * param = &program->Parameters->Parameters[index];
-   const GLuint slots = (param->Size + 3) / 4;
-   const GLint typeSize = _mesa_sizeof_glsl_type(param->DataType);
-   GLint nr, nc;
-
-   /* check that the number of rows, columns is correct */
-   get_matrix_dims(param->DataType, &nr, &nc);
-   if (rows != nr || cols != nc) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glUniformMatrix(matrix size mismatch)");
-      return;
-   }
-
-   if ((GLint) param->Size <= typeSize) {
-      /* non-array: count must be at most one; count == 0 is handled by the loop below */
-      if (count > 1) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glUniformMatrix(uniform is not an array)");
-         return;
-      }
-   }
-
-   /*
-    * Note: the _columns_ of a matrix are stored in program registers, not
-    * the rows.  So, the loops below look a little funny.
-    * XXX could optimize this a bit...
-    */
-
-   /* loop over matrices */
-   for (mat = 0; mat < count; mat++) {
-
-      /* each matrix: */
-      for (col = 0; col < cols; col++) {
-         GLfloat *v;
-         if (offset >= slots) {
-            /* Ignore writes beyond the end of (the used part of) an array */
-            return;
-         }
-         v = program->Parameters->ParameterValues[index + offset];
-         for (row = 0; row < rows; row++) {
-            if (transpose) {
-               v[row] = values[src + row * cols + col];
-            }
-            else {
-               v[row] = values[src + col * rows + row];
-            }
-         }
-
-         offset++;
-      }
-
-      src += rows * cols;  /* next matrix */
-   }
-}
-
-
-/**
- * Called by glUniformMatrix*() functions.
- * Note: cols=2, rows=4  ==>  array[2] of vec4
- */
-void
-_mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
-		     GLint cols, GLint rows,
-                     GLint location, GLsizei count,
-                     GLboolean transpose, const GLfloat *values)
-{
-   struct gl_uniform *uniform;
-   GLint offset;
-
-   if (!shProg || !shProg->LinkStatus) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-         "glUniformMatrix(program not linked)");
-      return;
-   }
-
-   if (location == -1)
-      return;   /* The standard specifies this as a no-op */
-
-   if (location < -1) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniformMatrix(location)");
-      return;
-   }
-
-   split_location_offset(&location, &offset);
-
-   if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix(location)");
-      return;
-   }
-   if (values == NULL) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix");
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
-
-   uniform = &shProg->Uniforms->Uniforms[location];
-
-   if (shProg->VertexProgram) {
-      /* convert uniform location to program parameter index */
-      GLint index = uniform->VertPos;
-      if (index >= 0) {
-         set_program_uniform_matrix(ctx, &shProg->VertexProgram->Base,
-                                    index, offset,
-                                    count, rows, cols, transpose, values);
-      }
-   }
-
-   if (shProg->FragmentProgram) {
-      /* convert uniform location to program parameter index */
-      GLint index = uniform->FragPos;
-      if (index >= 0) {
-         set_program_uniform_matrix(ctx, &shProg->FragmentProgram->Base,
-                                    index, offset,
-                                    count, rows, cols, transpose, values);
-      }
-   }
-
-   if (shProg->GeometryProgram) {
-      /* convert uniform location to program parameter index */
-      GLint index = uniform->GeomPos;
-      if (index >= 0) {
-         set_program_uniform_matrix(ctx, &shProg->GeometryProgram->Base,
-                                    index, offset,
-                                    count, rows, cols, transpose, values);
-      }
-   }
-
-   uniform->Initialized = GL_TRUE;
-}
-
-
-void GLAPIENTRY
-_mesa_Uniform1fARB(GLint location, GLfloat v0)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_FLOAT);
-}
-
-void GLAPIENTRY
-_mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat v[2];
-   v[0] = v0;
-   v[1] = v1;
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_FLOAT_VEC2);
-}
-
-void GLAPIENTRY
-_mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat v[3];
-   v[0] = v0;
-   v[1] = v1;
-   v[2] = v2;
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_FLOAT_VEC3);
-}
-
-void GLAPIENTRY
-_mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
-                   GLfloat v3)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat v[4];
-   v[0] = v0;
-   v[1] = v1;
-   v[2] = v2;
-   v[3] = v3;
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_FLOAT_VEC4);
-}
-
-void GLAPIENTRY
-_mesa_Uniform1iARB(GLint location, GLint v0)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_INT);
-}
-
-void GLAPIENTRY
-_mesa_Uniform2iARB(GLint location, GLint v0, GLint v1)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint v[2];
-   v[0] = v0;
-   v[1] = v1;
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_INT_VEC2);
-}
-
-void GLAPIENTRY
-_mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint v[3];
-   v[0] = v0;
-   v[1] = v1;
-   v[2] = v2;
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_INT_VEC3);
-}
-
-void GLAPIENTRY
-_mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint v[4];
-   v[0] = v0;
-   v[1] = v1;
-   v[2] = v2;
-   v[3] = v3;
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_INT_VEC4);
-}
-
-void GLAPIENTRY
-_mesa_Uniform1fvARB(GLint location, GLsizei count, const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT);
-}
-
-void GLAPIENTRY
-_mesa_Uniform2fvARB(GLint location, GLsizei count, const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC2);
-}
-
-void GLAPIENTRY
-_mesa_Uniform3fvARB(GLint location, GLsizei count, const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC3);
-}
-
-void GLAPIENTRY
-_mesa_Uniform4fvARB(GLint location, GLsizei count, const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC4);
-}
-
-void GLAPIENTRY
-_mesa_Uniform1ivARB(GLint location, GLsizei count, const GLint * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT);
-}
-
-void GLAPIENTRY
-_mesa_Uniform2ivARB(GLint location, GLsizei count, const GLint * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC2);
-}
-
-void GLAPIENTRY
-_mesa_Uniform3ivARB(GLint location, GLsizei count, const GLint * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC3);
-}
-
-void GLAPIENTRY
-_mesa_Uniform4ivARB(GLint location, GLsizei count, const GLint * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC4);
-}
-
-
-/** OpenGL 3.0 GLuint-valued functions **/
-void GLAPIENTRY
-_mesa_Uniform1ui(GLint location, GLuint v0)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_UNSIGNED_INT);
-}
-
-void GLAPIENTRY
-_mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint v[2];
-   v[0] = v0;
-   v[1] = v1;
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_UNSIGNED_INT_VEC2);
-}
-
-void GLAPIENTRY
-_mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint v[3];
-   v[0] = v0;
-   v[1] = v1;
-   v[2] = v2;
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_UNSIGNED_INT_VEC3);
-}
-
-void GLAPIENTRY
-_mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint v[4];
-   v[0] = v0;
-   v[1] = v1;
-   v[2] = v2;
-   v[3] = v3;
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_UNSIGNED_INT_VEC4);
-}
-
-void GLAPIENTRY
-_mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_UNSIGNED_INT);
-}
-
-void GLAPIENTRY
-_mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_UNSIGNED_INT_VEC2);
-}
-
-void GLAPIENTRY
-_mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_UNSIGNED_INT_VEC3);
-}
-
-void GLAPIENTRY
-_mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_UNSIGNED_INT_VEC4);
-}
-
-
-
-void GLAPIENTRY
-_mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
-                          const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,
-			2, 2, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
-                          const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,
-			3, 3, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,
-                          const GLfloat * value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,
-			4, 4, location, count, transpose, value);
-}
-
-
-/**
- * Non-square UniformMatrix are OpenGL 2.1
- */
-void GLAPIENTRY
-_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,
-			2, 3, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,
-			3, 2, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,
-			2, 4, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,
-			4, 2, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,
-			3, 4, location, count, transpose, value);
-}
-
-void GLAPIENTRY
-_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,
-			4, 3, location, count, transpose, value);
-}
-
-
-void GLAPIENTRY
-_mesa_GetUniformfvARB(GLhandleARB program, GLint location, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_get_uniformfv(ctx, program, location, params);
-}
-
-
-void GLAPIENTRY
-_mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_get_uniformiv(ctx, program, location, params);
-}
-
-
-/* GL3 */
-void GLAPIENTRY
-_mesa_GetUniformuiv(GLhandleARB program, GLint location, GLuint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_get_uniformuiv(ctx, program, location, params);
-}
-
-
-
-GLint GLAPIENTRY
-_mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name)
-{
-   struct gl_shader_program *shProg;
-
-   GET_CURRENT_CONTEXT(ctx);
-
-   shProg = _mesa_lookup_shader_program_err(ctx, programObj,
-					    "glGetUniformLocation");
-   if (!shProg)
-      return -1;
-
-   return _mesa_get_uniform_location(ctx, shProg, name);
-}
-
-
-void GLAPIENTRY
-_mesa_GetActiveUniformARB(GLhandleARB program, GLuint index,
-                          GLsizei maxLength, GLsizei * length, GLint * size,
-                          GLenum * type, GLcharARB * name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_get_active_uniform(ctx, program, index, maxLength, length, size,
-                            type, name);
-}
-
-
-/**
- * Plug in shader uniform-related functions into API dispatch table.
- */
-void
-_mesa_init_shader_uniform_dispatch(struct _glapi_table *exec)
-{
-#if FEATURE_GL
-   SET_Uniform1fARB(exec, _mesa_Uniform1fARB);
-   SET_Uniform2fARB(exec, _mesa_Uniform2fARB);
-   SET_Uniform3fARB(exec, _mesa_Uniform3fARB);
-   SET_Uniform4fARB(exec, _mesa_Uniform4fARB);
-   SET_Uniform1iARB(exec, _mesa_Uniform1iARB);
-   SET_Uniform2iARB(exec, _mesa_Uniform2iARB);
-   SET_Uniform3iARB(exec, _mesa_Uniform3iARB);
-   SET_Uniform4iARB(exec, _mesa_Uniform4iARB);
-   SET_Uniform1fvARB(exec, _mesa_Uniform1fvARB);
-   SET_Uniform2fvARB(exec, _mesa_Uniform2fvARB);
-   SET_Uniform3fvARB(exec, _mesa_Uniform3fvARB);
-   SET_Uniform4fvARB(exec, _mesa_Uniform4fvARB);
-   SET_Uniform1ivARB(exec, _mesa_Uniform1ivARB);
-   SET_Uniform2ivARB(exec, _mesa_Uniform2ivARB);
-   SET_Uniform3ivARB(exec, _mesa_Uniform3ivARB);
-   SET_Uniform4ivARB(exec, _mesa_Uniform4ivARB);
-   SET_UniformMatrix2fvARB(exec, _mesa_UniformMatrix2fvARB);
-   SET_UniformMatrix3fvARB(exec, _mesa_UniformMatrix3fvARB);
-   SET_UniformMatrix4fvARB(exec, _mesa_UniformMatrix4fvARB);
-
-   SET_GetActiveUniformARB(exec, _mesa_GetActiveUniformARB);
-   SET_GetUniformLocationARB(exec, _mesa_GetUniformLocationARB);
-   SET_GetUniformfvARB(exec, _mesa_GetUniformfvARB);
-   SET_GetUniformivARB(exec, _mesa_GetUniformivARB);
-
-   /* OpenGL 2.1 */
-   SET_UniformMatrix2x3fv(exec, _mesa_UniformMatrix2x3fv);
-   SET_UniformMatrix3x2fv(exec, _mesa_UniformMatrix3x2fv);
-   SET_UniformMatrix2x4fv(exec, _mesa_UniformMatrix2x4fv);
-   SET_UniformMatrix4x2fv(exec, _mesa_UniformMatrix4x2fv);
-   SET_UniformMatrix3x4fv(exec, _mesa_UniformMatrix3x4fv);
-   SET_UniformMatrix4x3fv(exec, _mesa_UniformMatrix4x3fv);
-
-   /* OpenGL 3.0 */
-   /* XXX finish dispatch */
-   SET_Uniform1uiEXT(exec, _mesa_Uniform1ui);
-   SET_Uniform2uiEXT(exec, _mesa_Uniform2ui);
-   SET_Uniform3uiEXT(exec, _mesa_Uniform3ui);
-   SET_Uniform4uiEXT(exec, _mesa_Uniform4ui);
-   SET_Uniform1uivEXT(exec, _mesa_Uniform1uiv);
-   SET_Uniform2uivEXT(exec, _mesa_Uniform2uiv);
-   SET_Uniform3uivEXT(exec, _mesa_Uniform3uiv);
-   SET_Uniform4uivEXT(exec, _mesa_Uniform4uiv);
-   SET_GetUniformuivEXT(exec, _mesa_GetUniformuiv);
-
-
-#endif /* FEATURE_GL */
-}
+/*

+ * Mesa 3-D graphics library

+ *

+ * Copyright (C) 2004-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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

+ * 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.

+ */

+

+/**

+ * \file uniforms.c

+ * Functions related to GLSL uniform variables.

+ * \author Brian Paul

+ */

+

+/**

+ * XXX things to do:

+ * 1. Check that the right error code is generated for all _mesa_error() calls.

+ * 2. Insert FLUSH_VERTICES calls in various places

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/dispatch.h"

+#include "main/mfeatures.h"

+#include "main/mtypes.h"

+#include "main/shaderapi.h"

+#include "main/shaderobj.h"

+#include "main/uniforms.h"

+#include "program/prog_parameter.h"

+#include "program/prog_statevars.h"

+#include "program/prog_uniform.h"

+#include "program/prog_instruction.h"

+

+

+static GLenum

+base_uniform_type(GLenum type)

+{

+   switch (type) {

+#if 0 /* not needed, for now */

+   case GL_BOOL:

+   case GL_BOOL_VEC2:

+   case GL_BOOL_VEC3:

+   case GL_BOOL_VEC4:

+      return GL_BOOL;

+#endif

+   case GL_FLOAT:

+   case GL_FLOAT_VEC2:

+   case GL_FLOAT_VEC3:

+   case GL_FLOAT_VEC4:

+      return GL_FLOAT;

+   case GL_UNSIGNED_INT:

+   case GL_UNSIGNED_INT_VEC2:

+   case GL_UNSIGNED_INT_VEC3:

+   case GL_UNSIGNED_INT_VEC4:

+      return GL_UNSIGNED_INT;

+   case GL_INT:

+   case GL_INT_VEC2:

+   case GL_INT_VEC3:

+   case GL_INT_VEC4:

+      return GL_INT;

+   default:

+      _mesa_problem(NULL, "Invalid type in base_uniform_type()");

+      return GL_FLOAT;

+   }

+}

+

+

+static GLboolean

+is_boolean_type(GLenum type)

+{

+   switch (type) {

+   case GL_BOOL:

+   case GL_BOOL_VEC2:

+   case GL_BOOL_VEC3:

+   case GL_BOOL_VEC4:

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+static GLboolean

+is_sampler_type(GLenum type)

+{

+   switch (type) {

+   case GL_SAMPLER_1D:

+   case GL_SAMPLER_2D:

+   case GL_SAMPLER_3D:

+   case GL_SAMPLER_CUBE:

+   case GL_SAMPLER_1D_SHADOW:

+   case GL_SAMPLER_2D_SHADOW:

+   case GL_SAMPLER_2D_RECT_ARB:

+   case GL_SAMPLER_2D_RECT_SHADOW_ARB:

+   case GL_SAMPLER_1D_ARRAY_EXT:

+   case GL_SAMPLER_2D_ARRAY_EXT:

+   case GL_SAMPLER_1D_ARRAY_SHADOW_EXT:

+   case GL_SAMPLER_2D_ARRAY_SHADOW_EXT:

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+static struct gl_program_parameter *

+get_uniform_parameter(const struct gl_shader_program *shProg, GLuint index)

+{

+   const struct gl_program *prog = NULL;

+   GLint progPos;

+

+   progPos = shProg->Uniforms->Uniforms[index].VertPos;

+   if (progPos >= 0) {

+      prog = &shProg->VertexProgram->Base;

+   }

+   else {

+      progPos = shProg->Uniforms->Uniforms[index].FragPos;

+      if (progPos >= 0) {

+         prog = &shProg->FragmentProgram->Base;

+      } else {

+         progPos = shProg->Uniforms->Uniforms[index].GeomPos;

+         if (progPos >= 0) {

+            prog = &shProg->GeometryProgram->Base;

+         }

+      }

+   }

+

+   if (!prog || progPos < 0)

+      return NULL; /* should never happen */

+

+   return &prog->Parameters->Parameters[progPos];

+}

+

+

+/**

+ * Called by glGetActiveUniform().

+ */

+static void

+_mesa_get_active_uniform(struct gl_context *ctx, GLuint program, GLuint index,

+                         GLsizei maxLength, GLsizei *length, GLint *size,

+                         GLenum *type, GLchar *nameOut)

+{

+   const struct gl_shader_program *shProg;

+   const struct gl_program *prog = NULL;

+   const struct gl_program_parameter *param;

+   GLint progPos;

+

+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveUniform");

+   if (!shProg)

+      return;

+

+   if (!shProg->Uniforms || index >= shProg->Uniforms->NumUniforms) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform(index)");

+      return;

+   }

+

+   progPos = shProg->Uniforms->Uniforms[index].VertPos;

+   if (progPos >= 0) {

+      prog = &shProg->VertexProgram->Base;

+   }

+   else {

+      progPos = shProg->Uniforms->Uniforms[index].FragPos;

+      if (progPos >= 0) {

+         prog = &shProg->FragmentProgram->Base;

+      } else {

+         progPos = shProg->Uniforms->Uniforms[index].GeomPos;

+         if (progPos >= 0) {

+            prog = &shProg->GeometryProgram->Base;

+         }

+      }

+   }

+

+   if (!prog || progPos < 0)

+      return; /* should never happen */

+

+   ASSERT(progPos < prog->Parameters->NumParameters);

+   param = &prog->Parameters->Parameters[progPos];

+

+   if (nameOut) {

+      _mesa_copy_string(nameOut, maxLength, length, param->Name);

+   }

+

+   if (size) {

+      GLint typeSize = _mesa_sizeof_glsl_type(param->DataType);

+      if ((GLint) param->Size > typeSize) {

+         /* This is an array.

+          * Array elements are placed on vector[4] boundaries so they're

+          * a multiple of four floats.  We round typeSize up to next multiple

+          * of four to get the right size below.

+          */

+         typeSize = (typeSize + 3) & ~3;

+      }

+      /* Note that the returned size is in units of the <type>, not bytes */

+      *size = param->Size / typeSize;

+   }

+

+   if (type) {

+      *type = param->DataType;

+   }

+}

+

+

+static unsigned

+get_vector_elements(GLenum type)

+{

+   switch (type) {

+   case GL_FLOAT:

+   case GL_INT:

+   case GL_BOOL:

+   case GL_UNSIGNED_INT:

+   default: /* Catch all the various sampler types. */

+      return 1;

+

+   case GL_FLOAT_VEC2:

+   case GL_INT_VEC2:

+   case GL_BOOL_VEC2:

+   case GL_UNSIGNED_INT_VEC2:

+      return 2;

+

+   case GL_FLOAT_VEC3:

+   case GL_INT_VEC3:

+   case GL_BOOL_VEC3:

+   case GL_UNSIGNED_INT_VEC3:

+      return 3;

+

+   case GL_FLOAT_VEC4:

+   case GL_INT_VEC4:

+   case GL_BOOL_VEC4:

+   case GL_UNSIGNED_INT_VEC4:

+      return 4;

+   }

+}

+

+static void

+get_matrix_dims(GLenum type, GLint *rows, GLint *cols)

+{

+   switch (type) {

+   case GL_FLOAT_MAT2:

+      *rows = *cols = 2;

+      break;

+   case GL_FLOAT_MAT2x3:

+      *rows = 3;

+      *cols = 2;

+      break;

+   case GL_FLOAT_MAT2x4:

+      *rows = 4;

+      *cols = 2;

+      break;

+   case GL_FLOAT_MAT3:

+      *rows = 3;

+      *cols = 3;

+      break;

+   case GL_FLOAT_MAT3x2:

+      *rows = 2;

+      *cols = 3;

+      break;

+   case GL_FLOAT_MAT3x4:

+      *rows = 4;

+      *cols = 3;

+      break;

+   case GL_FLOAT_MAT4:

+      *rows = 4;

+      *cols = 4;

+      break;

+   case GL_FLOAT_MAT4x2:

+      *rows = 2;

+      *cols = 4;

+      break;

+   case GL_FLOAT_MAT4x3:

+      *rows = 3;

+      *cols = 4;

+      break;

+   default:

+      *rows = *cols = 0;

+   }

+}

+

+

+/**

+ * Determine the number of rows and columns occupied by a uniform

+ * according to its datatype.  For non-matrix types (such as GL_FLOAT_VEC4),

+ * the number of rows = 1 and cols = number of elements in the vector.

+ */

+static void

+get_uniform_rows_cols(const struct gl_program_parameter *p,

+                      GLint *rows, GLint *cols)

+{

+   get_matrix_dims(p->DataType, rows, cols);

+   if (*rows == 0 && *cols == 0) {

+      /* not a matrix type, probably a float or vector */

+      *rows = 1;

+      *cols = get_vector_elements(p->DataType);

+   }

+}

+

+

+/**

+ * Helper for get_uniform[fi]v() functions.

+ * Given a shader program name and uniform location, return a pointer

+ * to the shader program and return the program parameter position.

+ */

+static void

+lookup_uniform_parameter(struct gl_context *ctx, GLuint program, GLint location,

+                         struct gl_program **progOut, GLint *paramPosOut)

+{

+   struct gl_shader_program *shProg

+      = _mesa_lookup_shader_program_err(ctx, program, "glGetUniform[if]v");

+   struct gl_program *prog = NULL;

+   GLint progPos = -1;

+

+   /* if shProg is NULL, we'll have already recorded an error */

+

+   if (shProg) {

+      if (!shProg->Uniforms ||

+          location < 0 ||

+          location >= (GLint) shProg->Uniforms->NumUniforms) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,  "glGetUniformfv(location)");

+      }

+      else {

+         /* OK, find the gl_program and program parameter location */

+         progPos = shProg->Uniforms->Uniforms[location].VertPos;

+         if (progPos >= 0) {

+            prog = &shProg->VertexProgram->Base;

+         }

+         else {

+            progPos = shProg->Uniforms->Uniforms[location].FragPos;

+            if (progPos >= 0) {

+               prog = &shProg->FragmentProgram->Base;

+            } else {

+               progPos = shProg->Uniforms->Uniforms[location].GeomPos;

+               if (progPos >= 0) {

+                  prog = &shProg->GeometryProgram->Base;

+               }

+            }

+         }

+      }

+   }

+

+   *progOut = prog;

+   *paramPosOut = progPos;

+}

+

+

+/**

+ * GLGL uniform arrays and structs require special handling.

+ *

+ * The GL_ARB_shader_objects spec says that if you use

+ * glGetUniformLocation to get the location of an array, you CANNOT

+ * access other elements of the array by adding an offset to the

+ * returned location.  For example, you must call

+ * glGetUniformLocation("foo[16]") if you want to set the 16th element

+ * of the array with glUniform().

+ *

+ * HOWEVER, some other OpenGL drivers allow accessing array elements

+ * by adding an offset to the returned array location.  And some apps

+ * seem to depend on that behaviour.

+ *

+ * Mesa's gl_uniform_list doesn't directly support this since each

+ * entry in the list describes one uniform variable, not one uniform

+ * element.  We could insert dummy entries in the list for each array

+ * element after [0] but that causes complications elsewhere.

+ *

+ * We solve this problem by encoding two values in the location that's

+ * returned by glGetUniformLocation():

+ *  a) index into gl_uniform_list::Uniforms[] for the uniform

+ *  b) an array/field offset (0 for simple types)

+ *

+ * These two values are encoded in the high and low halves of a GLint.

+ * By putting the uniform number in the high part and the offset in the

+ * low part, we can support the unofficial ability to index into arrays

+ * by adding offsets to the location value.

+ */

+static void

+merge_location_offset(GLint *location, GLint offset)

+{

+   *location = (*location << 16) | offset;

+}

+

+

+/**

+ * Separate the uniform location and parameter offset.  See above.

+ */

+static void

+split_location_offset(GLint *location, GLint *offset)

+{

+   *offset = *location & 0xffff;

+   *location = *location >> 16;

+}

+

+

+

+/**

+ * Called via glGetUniformfv().

+ */

+static void

+_mesa_get_uniformfv(struct gl_context *ctx, GLuint program, GLint location,

+                    GLfloat *params)

+{

+   struct gl_program *prog;

+   GLint paramPos;

+   GLint offset;

+

+   split_location_offset(&location, &offset);

+

+   lookup_uniform_parameter(ctx, program, location, &prog, &paramPos);

+

+   if (prog) {

+      const struct gl_program_parameter *p =

+         &prog->Parameters->Parameters[paramPos];

+      GLint rows, cols, i, j, k;

+

+      get_uniform_rows_cols(p, &rows, &cols);

+

+      k = 0;

+      for (i = 0; i < rows; i++) {

+	 const int base = paramPos + offset + i;

+

+         for (j = 0; j < cols; j++ ) {

+            params[k++] = prog->Parameters->ParameterValues[base][j];

+         }

+      }

+   }

+}

+

+

+/**

+ * Called via glGetUniformiv().

+ * \sa _mesa_get_uniformfv, only difference is a cast.

+ */

+static void

+_mesa_get_uniformiv(struct gl_context *ctx, GLuint program, GLint location,

+                    GLint *params)

+{

+   struct gl_program *prog;

+   GLint paramPos;

+   GLint offset;

+

+   split_location_offset(&location, &offset);

+

+   lookup_uniform_parameter(ctx, program, location, &prog, &paramPos);

+

+   if (prog) {

+      const struct gl_program_parameter *p =

+         &prog->Parameters->Parameters[paramPos];

+      GLint rows, cols, i, j, k;

+

+      get_uniform_rows_cols(p, &rows, &cols);

+

+      k = 0;

+      for (i = 0; i < rows; i++) {

+	 const int base = paramPos + offset + i;

+

+         for (j = 0; j < cols; j++ ) {

+            params[k++] = (GLint) prog->Parameters->ParameterValues[base][j];

+         }

+      }

+   }

+}

+

+

+/**

+ * Called via glGetUniformuiv().

+ * New in GL_EXT_gpu_shader4, OpenGL 3.0

+ * \sa _mesa_get_uniformfv, only difference is a cast.

+ */

+static void

+_mesa_get_uniformuiv(struct gl_context *ctx, GLuint program, GLint location,

+                     GLuint *params)

+{

+   struct gl_program *prog;

+   GLint paramPos;

+   GLint offset;

+

+   split_location_offset(&location, &offset);

+

+   lookup_uniform_parameter(ctx, program, location, &prog, &paramPos);

+

+   if (prog) {

+      const struct gl_program_parameter *p =

+         &prog->Parameters->Parameters[paramPos];

+      GLint rows, cols, i, j, k;

+

+      get_uniform_rows_cols(p, &rows, &cols);

+

+      k = 0;

+      for (i = 0; i < rows; i++) {

+	 const int base = paramPos + offset + i;

+

+         for (j = 0; j < cols; j++ ) {

+            params[k++] = (GLuint) prog->Parameters->ParameterValues[base][j];

+         }

+      }

+   }

+}

+

+

+/**

+ * Called via glGetUniformLocation().

+ *

+ * The return value will encode two values, the uniform location and an

+ * offset (used for arrays, structs).

+ */

+GLint

+_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,

+			   const GLchar *name)

+{

+   GLint offset = 0, location = -1;

+

+   if (shProg->LinkStatus == GL_FALSE) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(program)");

+      return -1;

+   }

+

+   /* XXX we should return -1 if the uniform was declared, but not

+    * actually used.

+    */

+

+   /* XXX we need to be able to parse uniform names for structs and arrays

+    * such as:

+    *   mymatrix[1]

+    *   mystruct.field1

+    */

+

+   {

+      /* handle 1-dimension arrays here... */

+      char *c = strchr(name, '[');

+      if (c) {

+         /* truncate name at [ */

+         const GLint len = c - name;

+         GLchar *newName = malloc(len + 1);

+         if (!newName)

+            return -1; /* out of mem */

+         memcpy(newName, name, len);

+         newName[len] = 0;

+

+         location = _mesa_lookup_uniform(shProg->Uniforms, newName);

+         if (location >= 0) {

+            const GLint element = atoi(c + 1);

+            if (element > 0) {

+               /* get type of the uniform array element */

+               struct gl_program_parameter *p;

+               p = get_uniform_parameter(shProg, location);

+               if (p) {

+                  GLint rows, cols;

+                  get_matrix_dims(p->DataType, &rows, &cols);

+                  if (rows < 1)

+                     rows = 1;

+                  offset = element * rows;

+               }

+            }

+         }

+

+         free(newName);

+      }

+   }

+

+   if (location < 0) {

+      location = _mesa_lookup_uniform(shProg->Uniforms, name);

+   }

+

+   if (location >= 0) {

+      merge_location_offset(&location, offset);

+   }

+

+   return location;

+}

+

+

+

+/**

+ * Update the vertex/fragment program's TexturesUsed array.

+ *

+ * This needs to be called after glUniform(set sampler var) is called.

+ * A call to glUniform(samplerVar, value) causes a sampler to point to a

+ * particular texture unit.  We know the sampler's texture target

+ * (1D/2D/3D/etc) from compile time but the sampler's texture unit is

+ * set by glUniform() calls.

+ *

+ * So, scan the program->SamplerUnits[] and program->SamplerTargets[]

+ * information to update the prog->TexturesUsed[] values.

+ * Each value of TexturesUsed[unit] is one of zero, TEXTURE_1D_INDEX,

+ * TEXTURE_2D_INDEX, TEXTURE_3D_INDEX, etc.

+ * We'll use that info for state validation before rendering.

+ */

+void

+_mesa_update_shader_textures_used(struct gl_program *prog)

+{

+   GLuint s;

+

+   memset(prog->TexturesUsed, 0, sizeof(prog->TexturesUsed));

+

+   for (s = 0; s < MAX_SAMPLERS; s++) {

+      if (prog->SamplersUsed & (1 << s)) {

+         GLuint unit = prog->SamplerUnits[s];

+         GLuint tgt = prog->SamplerTargets[s];

+         assert(unit < MAX_TEXTURE_IMAGE_UNITS);

+         assert(tgt < NUM_TEXTURE_TARGETS);

+         prog->TexturesUsed[unit] |= (1 << tgt);

+      }

+   }

+}

+

+

+/**

+ * Check if the type given by userType is allowed to set a uniform of the

+ * target type.  Generally, equivalence is required, but setting Boolean

+ * uniforms can be done with glUniformiv or glUniformfv.

+ */

+static GLboolean

+compatible_types(GLenum userType, GLenum targetType)

+{

+   if (userType == targetType)

+      return GL_TRUE;

+

+   if (targetType == GL_BOOL && (userType == GL_FLOAT ||

+                                 userType == GL_UNSIGNED_INT ||

+                                 userType == GL_INT))

+      return GL_TRUE;

+

+   if (targetType == GL_BOOL_VEC2 && (userType == GL_FLOAT_VEC2 ||

+                                      userType == GL_UNSIGNED_INT_VEC2 ||

+                                      userType == GL_INT_VEC2))

+      return GL_TRUE;

+

+   if (targetType == GL_BOOL_VEC3 && (userType == GL_FLOAT_VEC3 ||

+                                      userType == GL_UNSIGNED_INT_VEC3 ||

+                                      userType == GL_INT_VEC3))

+      return GL_TRUE;

+

+   if (targetType == GL_BOOL_VEC4 && (userType == GL_FLOAT_VEC4 ||

+                                      userType == GL_UNSIGNED_INT_VEC4 ||

+                                      userType == GL_INT_VEC4))

+      return GL_TRUE;

+

+   if (is_sampler_type(targetType) && userType == GL_INT)

+      return GL_TRUE;

+

+   return GL_FALSE;

+}

+

+

+/**

+ * Set the value of a program's uniform variable.

+ * \param program  the program whose uniform to update

+ * \param index  the index of the program parameter for the uniform

+ * \param offset  additional parameter slot offset (for arrays)

+ * \param type  the incoming datatype of 'values'

+ * \param count  the number of uniforms to set

+ * \param elems  number of elements per uniform (1, 2, 3 or 4)

+ * \param values  the new values, of datatype 'type'

+ */

+static void

+set_program_uniform(struct gl_context *ctx, struct gl_program *program,

+                    GLint index, GLint offset,

+                    GLenum type, GLsizei count, GLint elems,

+                    const void *values)

+{

+   const struct gl_program_parameter *param =

+      &program->Parameters->Parameters[index];

+

+   assert(offset >= 0);

+   assert(elems >= 1);

+   assert(elems <= 4);

+

+   if (!compatible_types(type, param->DataType)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(type mismatch)");

+      return;

+   }

+

+   if (index + offset > (GLint) program->Parameters->Size) {

+      /* out of bounds! */

+      return;

+   }

+

+   if (param->Type == PROGRAM_SAMPLER) {

+      /* This controls which texture unit which is used by a sampler */

+      GLboolean changed = GL_FALSE;

+      GLint i;

+

+      /* this should have been caught by the compatible_types() check */

+      ASSERT(type == GL_INT);

+

+      /* loop over number of samplers to change */

+      for (i = 0; i < count; i++) {

+         GLuint sampler =

+            (GLuint) program->Parameters->ParameterValues[index + offset + i][0];

+         GLuint texUnit = ((GLuint *) values)[i];

+

+         /* check that the sampler (tex unit index) is legal */

+         if (texUnit >= ctx->Const.MaxTextureImageUnits) {

+            _mesa_error(ctx, GL_INVALID_VALUE,

+                        "glUniform1(invalid sampler/tex unit index for '%s')",

+                        param->Name);

+            return;

+         }

+

+         /* This maps a sampler to a texture unit: */

+         if (sampler < MAX_SAMPLERS) {

+#if 0

+            printf("Set program %p sampler %d '%s' to unit %u\n",

+		   program, sampler, param->Name, texUnit);

+#endif

+            if (program->SamplerUnits[sampler] != texUnit) {

+               program->SamplerUnits[sampler] = texUnit;

+               changed = GL_TRUE;

+            }

+         }

+      }

+

+      if (changed) {

+         /* When a sampler's value changes it usually requires rewriting

+          * a GPU program's TEX instructions since there may not be a

+          * sampler->texture lookup table.  We signal this with the

+          * ProgramStringNotify() callback.

+          */

+         FLUSH_VERTICES(ctx, _NEW_TEXTURE | _NEW_PROGRAM);

+         _mesa_update_shader_textures_used(program);

+         /* Do we need to care about the return value here?

+          * This should not be the first time the driver was notified of

+          * this program.

+          */

+         (void) ctx->Driver.ProgramStringNotify(ctx, program->Target, program);

+      }

+   }

+   else {

+      /* ordinary uniform variable */

+      const GLboolean isUniformBool = is_boolean_type(param->DataType);

+      const GLenum basicType = base_uniform_type(type);

+      const GLint slots = (param->Size + 3) / 4;

+      const GLint typeSize = _mesa_sizeof_glsl_type(param->DataType);

+      GLsizei k, i;

+

+      if ((GLint) param->Size > typeSize) {

+         /* an array */

+         /* we'll ignore extra data below */

+      }

+      else {

+         /* non-array: count must be at most one; count == 0 is handled by the loop below */

+         if (count > 1) {

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glUniform(uniform '%s' is not an array)",

+                        param->Name);

+            return;

+         }

+      }

+

+      /* loop over number of array elements */

+      for (k = 0; k < count; k++) {

+         GLfloat *uniformVal;

+

+         if (offset + k >= slots) {

+            /* Extra array data is ignored */

+            break;

+         }

+

+         /* uniformVal (the destination) is always float[4] */

+         uniformVal = program->Parameters->ParameterValues[index + offset + k];

+

+         if (basicType == GL_INT) {

+            /* convert user's ints to floats */

+            const GLint *iValues = ((const GLint *) values) + k * elems;

+            for (i = 0; i < elems; i++) {

+               uniformVal[i] = (GLfloat) iValues[i];

+            }

+         }

+         else if (basicType == GL_UNSIGNED_INT) {

+            /* convert user's uints to floats */

+            const GLuint *iValues = ((const GLuint *) values) + k * elems;

+            for (i = 0; i < elems; i++) {

+               uniformVal[i] = (GLfloat) iValues[i];

+            }

+         }

+         else {

+            const GLfloat *fValues = ((const GLfloat *) values) + k * elems;

+            assert(basicType == GL_FLOAT);

+            for (i = 0; i < elems; i++) {

+               uniformVal[i] = fValues[i];

+            }

+         }

+

+         /* if the uniform is bool-valued, convert to 1.0 or 0.0 */

+         if (isUniformBool) {

+            for (i = 0; i < elems; i++) {

+               uniformVal[i] = uniformVal[i] ? 1.0f : 0.0f;

+            }

+         }

+      }

+   }

+}

+

+

+/**

+ * Called via glUniform*() functions.

+ */

+void

+_mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg,

+	      GLint location, GLsizei count,

+              const GLvoid *values, GLenum type)

+{

+   struct gl_uniform *uniform;

+   GLint elems, offset;

+

+   if (!shProg || !shProg->LinkStatus) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(program not linked)");

+      return;

+   }

+

+   if (location == -1)

+      return;   /* The standard specifies this as a no-op */

+

+   if (location < -1) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniform(location=%d)",

+                  location);

+      return;

+   }

+

+   split_location_offset(&location, &offset);

+

+   if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(location=%d)", location);

+      return;

+   }

+

+   if (count < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(count < 0)");

+      return;

+   }

+

+   elems = _mesa_sizeof_glsl_type(type);

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);

+

+   uniform = &shProg->Uniforms->Uniforms[location];

+

+   if (ctx->Shader.Flags & GLSL_UNIFORMS) {

+      const GLenum basicType = base_uniform_type(type);

+      GLint i;

+      printf("Mesa: set program %u uniform %s (loc %d) to: ",

+	     shProg->Name, uniform->Name, location);

+      if (basicType == GL_INT) {

+         const GLint *v = (const GLint *) values;

+         for (i = 0; i < count * elems; i++) {

+            printf("%d ", v[i]);

+         }

+      }

+      else if (basicType == GL_UNSIGNED_INT) {

+         const GLuint *v = (const GLuint *) values;

+         for (i = 0; i < count * elems; i++) {

+            printf("%u ", v[i]);

+         }

+      }

+      else {

+         const GLfloat *v = (const GLfloat *) values;

+         assert(basicType == GL_FLOAT);

+         for (i = 0; i < count * elems; i++) {

+            printf("%g ", v[i]);

+         }

+      }

+      printf("\n");

+   }

+

+   /* A uniform var may be used by both a vertex shader and a fragment

+    * shader.  We may need to update one or both shader's uniform here:

+    */

+   if (shProg->VertexProgram) {

+      /* convert uniform location to program parameter index */

+      GLint index = uniform->VertPos;

+      if (index >= 0) {

+         set_program_uniform(ctx, &shProg->VertexProgram->Base,

+                             index, offset, type, count, elems, values);

+      }

+   }

+

+   if (shProg->FragmentProgram) {

+      /* convert uniform location to program parameter index */

+      GLint index = uniform->FragPos;

+      if (index >= 0) {

+         set_program_uniform(ctx, &shProg->FragmentProgram->Base,

+                             index, offset, type, count, elems, values);

+      }

+   }

+

+   if (shProg->GeometryProgram) {

+      /* convert uniform location to program parameter index */

+      GLint index = uniform->GeomPos;

+      if (index >= 0) {

+         set_program_uniform(ctx, &shProg->GeometryProgram->Base,

+                             index, offset, type, count, elems, values);

+      }

+   }

+

+   uniform->Initialized = GL_TRUE;

+}

+

+

+/**

+ * Set a matrix-valued program parameter.

+ */

+static void

+set_program_uniform_matrix(struct gl_context *ctx, struct gl_program *program,

+                           GLuint index, GLuint offset,

+                           GLuint count, GLuint rows, GLuint cols,

+                           GLboolean transpose, const GLfloat *values)

+{

+   GLuint mat, row, col;

+   GLuint src = 0;

+   const struct gl_program_parameter * param = &program->Parameters->Parameters[index];

+   const GLuint slots = (param->Size + 3) / 4;

+   const GLint typeSize = _mesa_sizeof_glsl_type(param->DataType);

+   GLint nr, nc;

+

+   /* check that the number of rows, columns is correct */

+   get_matrix_dims(param->DataType, &nr, &nc);

+   if (rows != nr || cols != nc) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glUniformMatrix(matrix size mismatch)");

+      return;

+   }

+

+   if ((GLint) param->Size <= typeSize) {

+      /* non-array: count must be at most one; count == 0 is handled by the loop below */

+      if (count > 1) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glUniformMatrix(uniform is not an array)");

+         return;

+      }

+   }

+

+   /*

+    * Note: the _columns_ of a matrix are stored in program registers, not

+    * the rows.  So, the loops below look a little funny.

+    * XXX could optimize this a bit...

+    */

+

+   /* loop over matrices */

+   for (mat = 0; mat < count; mat++) {

+

+      /* each matrix: */

+      for (col = 0; col < cols; col++) {

+         GLfloat *v;

+         if (offset >= slots) {

+            /* Ignore writes beyond the end of (the used part of) an array */

+            return;

+         }

+         v = program->Parameters->ParameterValues[index + offset];

+         for (row = 0; row < rows; row++) {

+            if (transpose) {

+               v[row] = values[src + row * cols + col];

+            }

+            else {

+               v[row] = values[src + col * rows + row];

+            }

+         }

+

+         offset++;

+      }

+

+      src += rows * cols;  /* next matrix */

+   }

+}

+

+

+/**

+ * Called by glUniformMatrix*() functions.

+ * Note: cols=2, rows=4  ==>  array[2] of vec4

+ */

+void

+_mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,

+		     GLint cols, GLint rows,

+                     GLint location, GLsizei count,

+                     GLboolean transpose, const GLfloat *values)

+{

+   struct gl_uniform *uniform;

+   GLint offset;

+

+   if (!shProg || !shProg->LinkStatus) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+         "glUniformMatrix(program not linked)");

+      return;

+   }

+

+   if (location == -1)

+      return;   /* The standard specifies this as a no-op */

+

+   if (location < -1) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUniformMatrix(location)");

+      return;

+   }

+

+   split_location_offset(&location, &offset);

+

+   if (location < 0 || location >= (GLint) shProg->Uniforms->NumUniforms) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix(location)");

+      return;

+   }

+   if (values == NULL) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix");

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);

+

+   uniform = &shProg->Uniforms->Uniforms[location];

+

+   if (shProg->VertexProgram) {

+      /* convert uniform location to program parameter index */

+      GLint index = uniform->VertPos;

+      if (index >= 0) {

+         set_program_uniform_matrix(ctx, &shProg->VertexProgram->Base,

+                                    index, offset,

+                                    count, rows, cols, transpose, values);

+      }

+   }

+

+   if (shProg->FragmentProgram) {

+      /* convert uniform location to program parameter index */

+      GLint index = uniform->FragPos;

+      if (index >= 0) {

+         set_program_uniform_matrix(ctx, &shProg->FragmentProgram->Base,

+                                    index, offset,

+                                    count, rows, cols, transpose, values);

+      }

+   }

+

+   if (shProg->GeometryProgram) {

+      /* convert uniform location to program parameter index */

+      GLint index = uniform->GeomPos;

+      if (index >= 0) {

+         set_program_uniform_matrix(ctx, &shProg->GeometryProgram->Base,

+                                    index, offset,

+                                    count, rows, cols, transpose, values);

+      }

+   }

+

+   uniform->Initialized = GL_TRUE;

+}

+

+

+void GLAPIENTRY

+_mesa_Uniform1fARB(GLint location, GLfloat v0)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_FLOAT);

+}

+

+void GLAPIENTRY

+_mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat v[2];

+   v[0] = v0;

+   v[1] = v1;

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_FLOAT_VEC2);

+}

+

+void GLAPIENTRY

+_mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat v[3];

+   v[0] = v0;

+   v[1] = v1;

+   v[2] = v2;

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_FLOAT_VEC3);

+}

+

+void GLAPIENTRY

+_mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,

+                   GLfloat v3)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat v[4];

+   v[0] = v0;

+   v[1] = v1;

+   v[2] = v2;

+   v[3] = v3;

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_FLOAT_VEC4);

+}

+

+void GLAPIENTRY

+_mesa_Uniform1iARB(GLint location, GLint v0)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_INT);

+}

+

+void GLAPIENTRY

+_mesa_Uniform2iARB(GLint location, GLint v0, GLint v1)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint v[2];

+   v[0] = v0;

+   v[1] = v1;

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_INT_VEC2);

+}

+

+void GLAPIENTRY

+_mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint v[3];

+   v[0] = v0;

+   v[1] = v1;

+   v[2] = v2;

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_INT_VEC3);

+}

+

+void GLAPIENTRY

+_mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint v[4];

+   v[0] = v0;

+   v[1] = v1;

+   v[2] = v2;

+   v[3] = v3;

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_INT_VEC4);

+}

+

+void GLAPIENTRY

+_mesa_Uniform1fvARB(GLint location, GLsizei count, const GLfloat * value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT);

+}

+

+void GLAPIENTRY

+_mesa_Uniform2fvARB(GLint location, GLsizei count, const GLfloat * value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC2);

+}

+

+void GLAPIENTRY

+_mesa_Uniform3fvARB(GLint location, GLsizei count, const GLfloat * value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC3);

+}

+

+void GLAPIENTRY

+_mesa_Uniform4fvARB(GLint location, GLsizei count, const GLfloat * value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC4);

+}

+

+void GLAPIENTRY

+_mesa_Uniform1ivARB(GLint location, GLsizei count, const GLint * value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT);

+}

+

+void GLAPIENTRY

+_mesa_Uniform2ivARB(GLint location, GLsizei count, const GLint * value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC2);

+}

+

+void GLAPIENTRY

+_mesa_Uniform3ivARB(GLint location, GLsizei count, const GLint * value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC3);

+}

+

+void GLAPIENTRY

+_mesa_Uniform4ivARB(GLint location, GLsizei count, const GLint * value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC4);

+}

+

+

+/** OpenGL 3.0 GLuint-valued functions **/

+void GLAPIENTRY

+_mesa_Uniform1ui(GLint location, GLuint v0)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_UNSIGNED_INT);

+}

+

+void GLAPIENTRY

+_mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint v[2];

+   v[0] = v0;

+   v[1] = v1;

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_UNSIGNED_INT_VEC2);

+}

+

+void GLAPIENTRY

+_mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint v[3];

+   v[0] = v0;

+   v[1] = v1;

+   v[2] = v2;

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_UNSIGNED_INT_VEC3);

+}

+

+void GLAPIENTRY

+_mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint v[4];

+   v[0] = v0;

+   v[1] = v1;

+   v[2] = v2;

+   v[3] = v3;

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, v, GL_UNSIGNED_INT_VEC4);

+}

+

+void GLAPIENTRY

+_mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_UNSIGNED_INT);

+}

+

+void GLAPIENTRY

+_mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_UNSIGNED_INT_VEC2);

+}

+

+void GLAPIENTRY

+_mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_UNSIGNED_INT_VEC3);

+}

+

+void GLAPIENTRY

+_mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_UNSIGNED_INT_VEC4);

+}

+

+

+

+void GLAPIENTRY

+_mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,

+                          const GLfloat * value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,

+			2, 2, location, count, transpose, value);

+}

+

+void GLAPIENTRY

+_mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,

+                          const GLfloat * value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,

+			3, 3, location, count, transpose, value);

+}

+

+void GLAPIENTRY

+_mesa_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,

+                          const GLfloat * value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,

+			4, 4, location, count, transpose, value);

+}

+

+

+/**

+ * Non-square UniformMatrix are OpenGL 2.1

+ */

+void GLAPIENTRY

+_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,

+			2, 3, location, count, transpose, value);

+}

+

+void GLAPIENTRY

+_mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,

+			3, 2, location, count, transpose, value);

+}

+

+void GLAPIENTRY

+_mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,

+			2, 4, location, count, transpose, value);

+}

+

+void GLAPIENTRY

+_mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,

+			4, 2, location, count, transpose, value);

+}

+

+void GLAPIENTRY

+_mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,

+			3, 4, location, count, transpose, value);

+}

+

+void GLAPIENTRY

+_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_uniform_matrix(ctx, ctx->Shader.ActiveProgram,

+			4, 3, location, count, transpose, value);

+}

+

+

+void GLAPIENTRY

+_mesa_GetUniformfvARB(GLhandleARB program, GLint location, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_get_uniformfv(ctx, program, location, params);

+}

+

+

+void GLAPIENTRY

+_mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_get_uniformiv(ctx, program, location, params);

+}

+

+

+/* GL3 */

+void GLAPIENTRY

+_mesa_GetUniformuiv(GLhandleARB program, GLint location, GLuint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_get_uniformuiv(ctx, program, location, params);

+}

+

+

+

+GLint GLAPIENTRY

+_mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name)

+{

+   struct gl_shader_program *shProg;

+

+   GET_CURRENT_CONTEXT(ctx);

+

+   shProg = _mesa_lookup_shader_program_err(ctx, programObj,

+					    "glGetUniformLocation");

+   if (!shProg)

+      return -1;

+

+   return _mesa_get_uniform_location(ctx, shProg, name);

+}

+

+

+void GLAPIENTRY

+_mesa_GetActiveUniformARB(GLhandleARB program, GLuint index,

+                          GLsizei maxLength, GLsizei * length, GLint * size,

+                          GLenum * type, GLcharARB * name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_get_active_uniform(ctx, program, index, maxLength, length, size,

+                            type, name);

+}

+

+

+/**

+ * Plug in shader uniform-related functions into API dispatch table.

+ */

+void

+_mesa_init_shader_uniform_dispatch(struct _glapi_table *exec)

+{

+#if FEATURE_GL

+   SET_Uniform1fARB(exec, _mesa_Uniform1fARB);

+   SET_Uniform2fARB(exec, _mesa_Uniform2fARB);

+   SET_Uniform3fARB(exec, _mesa_Uniform3fARB);

+   SET_Uniform4fARB(exec, _mesa_Uniform4fARB);

+   SET_Uniform1iARB(exec, _mesa_Uniform1iARB);

+   SET_Uniform2iARB(exec, _mesa_Uniform2iARB);

+   SET_Uniform3iARB(exec, _mesa_Uniform3iARB);

+   SET_Uniform4iARB(exec, _mesa_Uniform4iARB);

+   SET_Uniform1fvARB(exec, _mesa_Uniform1fvARB);

+   SET_Uniform2fvARB(exec, _mesa_Uniform2fvARB);

+   SET_Uniform3fvARB(exec, _mesa_Uniform3fvARB);

+   SET_Uniform4fvARB(exec, _mesa_Uniform4fvARB);

+   SET_Uniform1ivARB(exec, _mesa_Uniform1ivARB);

+   SET_Uniform2ivARB(exec, _mesa_Uniform2ivARB);

+   SET_Uniform3ivARB(exec, _mesa_Uniform3ivARB);

+   SET_Uniform4ivARB(exec, _mesa_Uniform4ivARB);

+   SET_UniformMatrix2fvARB(exec, _mesa_UniformMatrix2fvARB);

+   SET_UniformMatrix3fvARB(exec, _mesa_UniformMatrix3fvARB);

+   SET_UniformMatrix4fvARB(exec, _mesa_UniformMatrix4fvARB);

+

+   SET_GetActiveUniformARB(exec, _mesa_GetActiveUniformARB);

+   SET_GetUniformLocationARB(exec, _mesa_GetUniformLocationARB);

+   SET_GetUniformfvARB(exec, _mesa_GetUniformfvARB);

+   SET_GetUniformivARB(exec, _mesa_GetUniformivARB);

+

+   /* OpenGL 2.1 */

+   SET_UniformMatrix2x3fv(exec, _mesa_UniformMatrix2x3fv);

+   SET_UniformMatrix3x2fv(exec, _mesa_UniformMatrix3x2fv);

+   SET_UniformMatrix2x4fv(exec, _mesa_UniformMatrix2x4fv);

+   SET_UniformMatrix4x2fv(exec, _mesa_UniformMatrix4x2fv);

+   SET_UniformMatrix3x4fv(exec, _mesa_UniformMatrix3x4fv);

+   SET_UniformMatrix4x3fv(exec, _mesa_UniformMatrix4x3fv);

+

+   /* OpenGL 3.0 */

+   /* XXX finish dispatch */

+   SET_Uniform1uiEXT(exec, _mesa_Uniform1ui);

+   SET_Uniform2uiEXT(exec, _mesa_Uniform2ui);

+   SET_Uniform3uiEXT(exec, _mesa_Uniform3ui);

+   SET_Uniform4uiEXT(exec, _mesa_Uniform4ui);

+   SET_Uniform1uivEXT(exec, _mesa_Uniform1uiv);

+   SET_Uniform2uivEXT(exec, _mesa_Uniform2uiv);

+   SET_Uniform3uivEXT(exec, _mesa_Uniform3uiv);

+   SET_Uniform4uivEXT(exec, _mesa_Uniform4uiv);

+   SET_GetUniformuivEXT(exec, _mesa_GetUniformuiv);

+

+

+#endif /* FEATURE_GL */

+}

diff --git a/mesalib/src/mesa/program/arbprogparse.c b/mesalib/src/mesa/program/arbprogparse.c
index 7f778c3c3..08b57930b 100644
--- a/mesalib/src/mesa/program/arbprogparse.c
+++ b/mesalib/src/mesa/program/arbprogparse.c
@@ -1,222 +1,222 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-#define DEBUG_PARSING 0
-
-/**
- * \file arbprogparse.c
- * ARB_*_program parser core
- * \author Karl Rasche
- */
-
-/**
-Notes on program parameters, etc.
-
-The instructions we emit will use six kinds of source registers:
-
-  PROGRAM_INPUT      - input registers
-  PROGRAM_TEMPORARY  - temp registers
-  PROGRAM_ADDRESS    - address/indirect register
-  PROGRAM_SAMPLER    - texture sampler
-  PROGRAM_CONSTANT   - indexes into program->Parameters, a known constant/literal
-  PROGRAM_STATE_VAR  - indexes into program->Parameters, and may actually be:
-                       + a state variable, like "state.fog.color", or
-                       + a pointer to a "program.local[k]" parameter, or
-                       + a pointer to a "program.env[k]" parameter
-
-Basically, all the program.local[] and program.env[] values will get mapped
-into the unified gl_program->Parameters array.  This solves the problem of
-having three separate program parameter arrays.
-*/
-
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/context.h"
-#include "main/mtypes.h"
-#include "arbprogparse.h"
-#include "programopt.h"
-#include "prog_parameter.h"
-#include "prog_statevars.h"
-#include "prog_instruction.h"
-#include "program_parser.h"
-
-
-void
-_mesa_parse_arb_fragment_program(struct gl_context* ctx, GLenum target,
-                                 const GLvoid *str, GLsizei len,
-                                 struct gl_fragment_program *program)
-{
-   struct gl_program prog;
-   struct asm_parser_state state;
-   GLuint i;
-
-   ASSERT(target == GL_FRAGMENT_PROGRAM_ARB);
-
-   memset(&prog, 0, sizeof(prog));
-   memset(&state, 0, sizeof(state));
-   state.prog = &prog;
-
-   if (!_mesa_parse_arb_program(ctx, target, (const GLubyte*) str, len,
-				&state)) {
-      /* Error in the program. Just return. */
-      return;
-   }
-
-   if (program->Base.String != NULL)
-      free(program->Base.String);
-
-   /* Copy the relevant contents of the arb_program struct into the
-    * fragment_program struct.
-    */
-   program->Base.String          = prog.String;
-   program->Base.NumInstructions = prog.NumInstructions;
-   program->Base.NumTemporaries  = prog.NumTemporaries;
-   program->Base.NumParameters   = prog.NumParameters;
-   program->Base.NumAttributes   = prog.NumAttributes;
-   program->Base.NumAddressRegs  = prog.NumAddressRegs;
-   program->Base.NumNativeInstructions = prog.NumNativeInstructions;
-   program->Base.NumNativeTemporaries = prog.NumNativeTemporaries;
-   program->Base.NumNativeParameters = prog.NumNativeParameters;
-   program->Base.NumNativeAttributes = prog.NumNativeAttributes;
-   program->Base.NumNativeAddressRegs = prog.NumNativeAddressRegs;
-   program->Base.NumAluInstructions   = prog.NumAluInstructions;
-   program->Base.NumTexInstructions   = prog.NumTexInstructions;
-   program->Base.NumTexIndirections   = prog.NumTexIndirections;
-   program->Base.NumNativeAluInstructions = prog.NumAluInstructions;
-   program->Base.NumNativeTexInstructions = prog.NumTexInstructions;
-   program->Base.NumNativeTexIndirections = prog.NumTexIndirections;
-   program->Base.InputsRead      = prog.InputsRead;
-   program->Base.OutputsWritten  = prog.OutputsWritten;
-   program->Base.IndirectRegisterFiles = prog.IndirectRegisterFiles;
-   for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++) {
-      program->Base.TexturesUsed[i] = prog.TexturesUsed[i];
-      if (prog.TexturesUsed[i])
-         program->Base.SamplersUsed |= (1 << i);
-   }
-   program->Base.ShadowSamplers = prog.ShadowSamplers;
-   switch (state.option.Fog) {
-   case OPTION_FOG_EXP:    program->FogOption = GL_EXP;    break;
-   case OPTION_FOG_EXP2:   program->FogOption = GL_EXP2;   break;
-   case OPTION_FOG_LINEAR: program->FogOption = GL_LINEAR; break;
-   default:                program->FogOption = GL_NONE;   break;
-   }
-   program->OriginUpperLeft = state.option.OriginUpperLeft;
-   program->PixelCenterInteger = state.option.PixelCenterInteger;
-
-   program->UsesKill            = state.fragment.UsesKill;
-
-   if (program->FogOption)
-      program->Base.InputsRead |= FRAG_BIT_FOGC;
-
-   if (program->Base.Instructions)
-      free(program->Base.Instructions);
-   program->Base.Instructions = prog.Instructions;
-
-   if (program->Base.Parameters)
-      _mesa_free_parameter_list(program->Base.Parameters);
-   program->Base.Parameters    = prog.Parameters;
-
-   /* Append fog instructions now if the program has "OPTION ARB_fog_exp"
-    * or similar.  We used to leave this up to drivers, but it appears
-    * there's no hardware that wants to do fog in a discrete stage separate
-    * from the fragment shader.
-    */
-   if (program->FogOption != GL_NONE) {
-      /* XXX: we should somehow recompile this to remove clamping if disabled
-       * On the ATI driver, this is unclampled if fragment clamping is disabled
-       */
-      _mesa_append_fog_code(ctx, program, GL_TRUE);
-      program->FogOption = GL_NONE;
-   }
-
-#if DEBUG_FP
-   printf("____________Fragment program %u ________\n", program->Base.Id);
-   _mesa_print_program(&program->Base);
-#endif
-}
-
-
-
-/**
- * Parse the vertex program string.  If success, update the given
- * vertex_program object with the new program.  Else, leave the vertex_program
- * object unchanged.
- */
-void
-_mesa_parse_arb_vertex_program(struct gl_context *ctx, GLenum target,
-			       const GLvoid *str, GLsizei len,
-			       struct gl_vertex_program *program)
-{
-   struct gl_program prog;
-   struct asm_parser_state state;
-
-   ASSERT(target == GL_VERTEX_PROGRAM_ARB);
-
-   memset(&prog, 0, sizeof(prog));
-   memset(&state, 0, sizeof(state));
-   state.prog = &prog;
-
-   if (!_mesa_parse_arb_program(ctx, target, (const GLubyte*) str, len,
-				&state)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glProgramString(bad program)");
-      return;
-   }
-
-   if (program->Base.String != NULL)
-      free(program->Base.String);
-
-   /* Copy the relevant contents of the arb_program struct into the 
-    * vertex_program struct.
-    */
-   program->Base.String          = prog.String;
-   program->Base.NumInstructions = prog.NumInstructions;
-   program->Base.NumTemporaries  = prog.NumTemporaries;
-   program->Base.NumParameters   = prog.NumParameters;
-   program->Base.NumAttributes   = prog.NumAttributes;
-   program->Base.NumAddressRegs  = prog.NumAddressRegs;
-   program->Base.NumNativeInstructions = prog.NumNativeInstructions;
-   program->Base.NumNativeTemporaries = prog.NumNativeTemporaries;
-   program->Base.NumNativeParameters = prog.NumNativeParameters;
-   program->Base.NumNativeAttributes = prog.NumNativeAttributes;
-   program->Base.NumNativeAddressRegs = prog.NumNativeAddressRegs;
-   program->Base.InputsRead     = prog.InputsRead;
-   program->Base.OutputsWritten = prog.OutputsWritten;
-   program->Base.IndirectRegisterFiles = prog.IndirectRegisterFiles;
-   program->IsPositionInvariant = (state.option.PositionInvariant)
-      ? GL_TRUE : GL_FALSE;
-
-   if (program->Base.Instructions)
-      free(program->Base.Instructions);
-   program->Base.Instructions = prog.Instructions;
-
-   if (program->Base.Parameters)
-      _mesa_free_parameter_list(program->Base.Parameters);
-   program->Base.Parameters = prog.Parameters; 
-
-#if DEBUG_VP
-   printf("____________Vertex program %u __________\n", program->Base.Id);
-   _mesa_print_program(&program->Base);
-#endif
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+#define DEBUG_PARSING 0

+

+/**

+ * \file arbprogparse.c

+ * ARB_*_program parser core

+ * \author Karl Rasche

+ */

+

+/**

+Notes on program parameters, etc.

+

+The instructions we emit will use six kinds of source registers:

+

+  PROGRAM_INPUT      - input registers

+  PROGRAM_TEMPORARY  - temp registers

+  PROGRAM_ADDRESS    - address/indirect register

+  PROGRAM_SAMPLER    - texture sampler

+  PROGRAM_CONSTANT   - indexes into program->Parameters, a known constant/literal

+  PROGRAM_STATE_VAR  - indexes into program->Parameters, and may actually be:

+                       + a state variable, like "state.fog.color", or

+                       + a pointer to a "program.local[k]" parameter, or

+                       + a pointer to a "program.env[k]" parameter

+

+Basically, all the program.local[] and program.env[] values will get mapped

+into the unified gl_program->Parameters array.  This solves the problem of

+having three separate program parameter arrays.

+*/

+

+

+#include "main/glheader.h"

+#include "main/imports.h"

+#include "main/context.h"

+#include "main/mtypes.h"

+#include "arbprogparse.h"

+#include "programopt.h"

+#include "prog_parameter.h"

+#include "prog_statevars.h"

+#include "prog_instruction.h"

+#include "program_parser.h"

+

+

+void

+_mesa_parse_arb_fragment_program(struct gl_context* ctx, GLenum target,

+                                 const GLvoid *str, GLsizei len,

+                                 struct gl_fragment_program *program)

+{

+   struct gl_program prog;

+   struct asm_parser_state state;

+   GLuint i;

+

+   ASSERT(target == GL_FRAGMENT_PROGRAM_ARB);

+

+   memset(&prog, 0, sizeof(prog));

+   memset(&state, 0, sizeof(state));

+   state.prog = &prog;

+

+   if (!_mesa_parse_arb_program(ctx, target, (const GLubyte*) str, len,

+				&state)) {

+      /* Error in the program. Just return. */

+      return;

+   }

+

+   if (program->Base.String != NULL)

+      free(program->Base.String);

+

+   /* Copy the relevant contents of the arb_program struct into the

+    * fragment_program struct.

+    */

+   program->Base.String          = prog.String;

+   program->Base.NumInstructions = prog.NumInstructions;

+   program->Base.NumTemporaries  = prog.NumTemporaries;

+   program->Base.NumParameters   = prog.NumParameters;

+   program->Base.NumAttributes   = prog.NumAttributes;

+   program->Base.NumAddressRegs  = prog.NumAddressRegs;

+   program->Base.NumNativeInstructions = prog.NumNativeInstructions;

+   program->Base.NumNativeTemporaries = prog.NumNativeTemporaries;

+   program->Base.NumNativeParameters = prog.NumNativeParameters;

+   program->Base.NumNativeAttributes = prog.NumNativeAttributes;

+   program->Base.NumNativeAddressRegs = prog.NumNativeAddressRegs;

+   program->Base.NumAluInstructions   = prog.NumAluInstructions;

+   program->Base.NumTexInstructions   = prog.NumTexInstructions;

+   program->Base.NumTexIndirections   = prog.NumTexIndirections;

+   program->Base.NumNativeAluInstructions = prog.NumAluInstructions;

+   program->Base.NumNativeTexInstructions = prog.NumTexInstructions;

+   program->Base.NumNativeTexIndirections = prog.NumTexIndirections;

+   program->Base.InputsRead      = prog.InputsRead;

+   program->Base.OutputsWritten  = prog.OutputsWritten;

+   program->Base.IndirectRegisterFiles = prog.IndirectRegisterFiles;

+   for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++) {

+      program->Base.TexturesUsed[i] = prog.TexturesUsed[i];

+      if (prog.TexturesUsed[i])

+         program->Base.SamplersUsed |= (1 << i);

+   }

+   program->Base.ShadowSamplers = prog.ShadowSamplers;

+   switch (state.option.Fog) {

+   case OPTION_FOG_EXP:    program->FogOption = GL_EXP;    break;

+   case OPTION_FOG_EXP2:   program->FogOption = GL_EXP2;   break;

+   case OPTION_FOG_LINEAR: program->FogOption = GL_LINEAR; break;

+   default:                program->FogOption = GL_NONE;   break;

+   }

+   program->OriginUpperLeft = state.option.OriginUpperLeft;

+   program->PixelCenterInteger = state.option.PixelCenterInteger;

+

+   program->UsesKill            = state.fragment.UsesKill;

+

+   if (program->FogOption)

+      program->Base.InputsRead |= FRAG_BIT_FOGC;

+

+   if (program->Base.Instructions)

+      free(program->Base.Instructions);

+   program->Base.Instructions = prog.Instructions;

+

+   if (program->Base.Parameters)

+      _mesa_free_parameter_list(program->Base.Parameters);

+   program->Base.Parameters    = prog.Parameters;

+

+   /* Append fog instructions now if the program has "OPTION ARB_fog_exp"

+    * or similar.  We used to leave this up to drivers, but it appears

+    * there's no hardware that wants to do fog in a discrete stage separate

+    * from the fragment shader.

+    */

+   if (program->FogOption != GL_NONE) {

+      /* XXX: we should somehow recompile this to remove clamping if disabled

+       * On the ATI driver, this is unclampled if fragment clamping is disabled

+       */

+      _mesa_append_fog_code(ctx, program, GL_TRUE);

+      program->FogOption = GL_NONE;

+   }

+

+#if DEBUG_FP

+   printf("____________Fragment program %u ________\n", program->Base.Id);

+   _mesa_print_program(&program->Base);

+#endif

+}

+

+

+

+/**

+ * Parse the vertex program string.  If success, update the given

+ * vertex_program object with the new program.  Else, leave the vertex_program

+ * object unchanged.

+ */

+void

+_mesa_parse_arb_vertex_program(struct gl_context *ctx, GLenum target,

+			       const GLvoid *str, GLsizei len,

+			       struct gl_vertex_program *program)

+{

+   struct gl_program prog;

+   struct asm_parser_state state;

+

+   ASSERT(target == GL_VERTEX_PROGRAM_ARB);

+

+   memset(&prog, 0, sizeof(prog));

+   memset(&state, 0, sizeof(state));

+   state.prog = &prog;

+

+   if (!_mesa_parse_arb_program(ctx, target, (const GLubyte*) str, len,

+				&state)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glProgramString(bad program)");

+      return;

+   }

+

+   if (program->Base.String != NULL)

+      free(program->Base.String);

+

+   /* Copy the relevant contents of the arb_program struct into the 

+    * vertex_program struct.

+    */

+   program->Base.String          = prog.String;

+   program->Base.NumInstructions = prog.NumInstructions;

+   program->Base.NumTemporaries  = prog.NumTemporaries;

+   program->Base.NumParameters   = prog.NumParameters;

+   program->Base.NumAttributes   = prog.NumAttributes;

+   program->Base.NumAddressRegs  = prog.NumAddressRegs;

+   program->Base.NumNativeInstructions = prog.NumNativeInstructions;

+   program->Base.NumNativeTemporaries = prog.NumNativeTemporaries;

+   program->Base.NumNativeParameters = prog.NumNativeParameters;

+   program->Base.NumNativeAttributes = prog.NumNativeAttributes;

+   program->Base.NumNativeAddressRegs = prog.NumNativeAddressRegs;

+   program->Base.InputsRead     = prog.InputsRead;

+   program->Base.OutputsWritten = prog.OutputsWritten;

+   program->Base.IndirectRegisterFiles = prog.IndirectRegisterFiles;

+   program->IsPositionInvariant = (state.option.PositionInvariant)

+      ? GL_TRUE : GL_FALSE;

+

+   if (program->Base.Instructions)

+      free(program->Base.Instructions);

+   program->Base.Instructions = prog.Instructions;

+

+   if (program->Base.Parameters)

+      _mesa_free_parameter_list(program->Base.Parameters);

+   program->Base.Parameters = prog.Parameters; 

+

+#if DEBUG_VP

+   printf("____________Vertex program %u __________\n", program->Base.Id);

+   _mesa_print_program(&program->Base);

+#endif

+}

diff --git a/mesalib/src/mesa/program/doflexbison.bat b/mesalib/src/mesa/program/doflexbison.bat
new file mode 100644
index 000000000..d54e5ac65
--- /dev/null
+++ b/mesalib/src/mesa/program/doflexbison.bat
@@ -0,0 +1,18 @@
+@echo off

+setlocal

+

+cd "%~dp0"

+

+set M4=..\..\..\..\tools\mhmake\m4.exe

+set BISON_PKGDATADIR=../../../../tools/mhmake/src/bisondata

+

+set path=..\..\..\..\tools\mhmake;%path%

+

+..\..\..\..\tools\mhmake\bison.exe -v -d --output=program_parse.tab.c program_parse.y

+

+copy "..\..\..\..\tools\mhmake\flex++.exe" flex.exe

+flex.exe --never-interactive --outfile=lex.yy.c program_lexer.l

+del flex.exe

+

+endlocal

+

diff --git a/mesalib/src/mesa/program/prog_instruction.h b/mesalib/src/mesa/program/prog_instruction.h
index 669d71029..11f2ac53e 100644
--- a/mesalib/src/mesa/program/prog_instruction.h
+++ b/mesalib/src/mesa/program/prog_instruction.h
@@ -1,454 +1,454 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-/**
- * \file prog_instruction.h
- *
- * Vertex/fragment program instruction datatypes and constants.
- *
- * \author Brian Paul
- * \author Keith Whitwell
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-
-#ifndef PROG_INSTRUCTION_H
-#define PROG_INSTRUCTION_H
-
-
-#include "main/glheader.h"
-
-
-/**
- * Swizzle indexes.
- * Do not change!
- */
-/*@{*/
-#define SWIZZLE_X    0
-#define SWIZZLE_Y    1
-#define SWIZZLE_Z    2
-#define SWIZZLE_W    3
-#define SWIZZLE_ZERO 4   /**< For SWZ instruction only */
-#define SWIZZLE_ONE  5   /**< For SWZ instruction only */
-#define SWIZZLE_NIL  7   /**< used during shader code gen (undefined value) */
-/*@}*/
-
-#define MAKE_SWIZZLE4(a,b,c,d) (((a)<<0) | ((b)<<3) | ((c)<<6) | ((d)<<9))
-#define SWIZZLE_NOOP           MAKE_SWIZZLE4(0,1,2,3)
-#define GET_SWZ(swz, idx)      (((swz) >> ((idx)*3)) & 0x7)
-#define GET_BIT(msk, idx)      (((msk) >> (idx)) & 0x1)
-
-#define SWIZZLE_XYZW MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W)
-#define SWIZZLE_XXXX MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_X, SWIZZLE_X, SWIZZLE_X)
-#define SWIZZLE_YYYY MAKE_SWIZZLE4(SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y)
-#define SWIZZLE_ZZZZ MAKE_SWIZZLE4(SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z)
-#define SWIZZLE_WWWW MAKE_SWIZZLE4(SWIZZLE_W, SWIZZLE_W, SWIZZLE_W, SWIZZLE_W)
-
-
-/**
- * Writemask values, 1 bit per component.
- */
-/*@{*/
-#define WRITEMASK_X     0x1
-#define WRITEMASK_Y     0x2
-#define WRITEMASK_XY    0x3
-#define WRITEMASK_Z     0x4
-#define WRITEMASK_XZ    0x5
-#define WRITEMASK_YZ    0x6
-#define WRITEMASK_XYZ   0x7
-#define WRITEMASK_W     0x8
-#define WRITEMASK_XW    0x9
-#define WRITEMASK_YW    0xa
-#define WRITEMASK_XYW   0xb
-#define WRITEMASK_ZW    0xc
-#define WRITEMASK_XZW   0xd
-#define WRITEMASK_YZW   0xe
-#define WRITEMASK_XYZW  0xf
-/*@}*/
-
-
-/**
- * Condition codes
- */
-/*@{*/
-#define COND_GT  1  /**< greater than zero */
-#define COND_EQ  2  /**< equal to zero */
-#define COND_LT  3  /**< less than zero */
-#define COND_UN  4  /**< unordered (NaN) */
-#define COND_GE  5  /**< greater than or equal to zero */
-#define COND_LE  6  /**< less than or equal to zero */
-#define COND_NE  7  /**< not equal to zero */
-#define COND_TR  8  /**< always true */
-#define COND_FL  9  /**< always false */
-/*@}*/
-
-
-/**
- * Instruction precision for GL_NV_fragment_program
- */
-/*@{*/
-#define FLOAT32  0x1
-#define FLOAT16  0x2
-#define FIXED12  0x4
-/*@}*/
-
-
-/**
- * Saturation modes when storing values.
- */
-/*@{*/
-#define SATURATE_OFF            0
-#define SATURATE_ZERO_ONE       1
-/*@}*/
-
-
-/**
- * Per-component negation masks
- */
-/*@{*/
-#define NEGATE_X    0x1
-#define NEGATE_Y    0x2
-#define NEGATE_Z    0x4
-#define NEGATE_W    0x8
-#define NEGATE_XYZ  0x7
-#define NEGATE_XYZW 0xf
-#define NEGATE_NONE 0x0
-/*@}*/
-
-
-/**
- * Program instruction opcodes for vertex, fragment and geometry programs.
- */
-typedef enum prog_opcode {
-                     /* ARB_vp   ARB_fp   NV_vp   NV_fp     GLSL */
-                     /*------------------------------------------*/
-   OPCODE_NOP = 0,   /*                                      X   */
-   OPCODE_ABS,       /*   X        X       1.1               X   */
-   OPCODE_ADD,       /*   X        X       X       X         X   */
-   OPCODE_AND,       /*                                          */
-   OPCODE_ARA,       /*                    2                     */
-   OPCODE_ARL,       /*   X                X                 X   */
-   OPCODE_ARL_NV,    /*                    2                     */
-   OPCODE_ARR,       /*                    2                     */
-   OPCODE_BGNLOOP,   /*                                     opt  */
-   OPCODE_BGNSUB,    /*                                     opt  */
-   OPCODE_BRA,       /*                    2                 X   */
-   OPCODE_BRK,       /*                    2                opt  */
-   OPCODE_CAL,       /*                    2       2         X   */
-   OPCODE_CMP,       /*            X                         X   */
-   OPCODE_CONT,      /*                                     opt  */
-   OPCODE_COS,       /*            X       2       X         X   */
-   OPCODE_DDX,       /*                            X         X   */
-   OPCODE_DDY,       /*                            X         X   */
-   OPCODE_DP2,       /*                            2         X   */
-   OPCODE_DP2A,      /*                            2             */
-   OPCODE_DP3,       /*   X        X       X       X         X   */
-   OPCODE_DP4,       /*   X        X       X       X         X   */
-   OPCODE_DPH,       /*   X        X       1.1                   */
-   OPCODE_DST,       /*   X        X       X       X             */
-   OPCODE_ELSE,      /*                                      X   */
-   OPCODE_EMIT_VERTEX,/*                                     X   */
-   OPCODE_END,       /*   X        X       X       X        opt  */
-   OPCODE_END_PRIMITIVE,/*                                   X   */
-   OPCODE_ENDIF,     /*                                     opt  */
-   OPCODE_ENDLOOP,   /*                                     opt  */
-   OPCODE_ENDSUB,    /*                                     opt  */
-   OPCODE_EX2,       /*   X        X       2       X         X   */
-   OPCODE_EXP,       /*   X                X                 X   */
-   OPCODE_FLR,       /*   X        X       2       X         X   */
-   OPCODE_FRC,       /*   X        X       2       X         X   */
-   OPCODE_IF,        /*                                     opt  */
-   OPCODE_KIL,       /*            X                             */
-   OPCODE_KIL_NV,    /*                            X         X   */
-   OPCODE_LG2,       /*   X        X       2       X         X   */
-   OPCODE_LIT,       /*   X        X       X       X             */
-   OPCODE_LOG,       /*   X                X                 X   */
-   OPCODE_LRP,       /*            X               X         X   */
-   OPCODE_MAD,       /*   X        X       X       X         X   */
-   OPCODE_MAX,       /*   X        X       X       X         X   */
-   OPCODE_MIN,       /*   X        X       X       X         X   */
-   OPCODE_MOV,       /*   X        X       X       X         X   */
-   OPCODE_MUL,       /*   X        X       X       X         X   */
-   OPCODE_NOISE1,    /*                                      X   */
-   OPCODE_NOISE2,    /*                                      X   */
-   OPCODE_NOISE3,    /*                                      X   */
-   OPCODE_NOISE4,    /*                                      X   */
-   OPCODE_NOT,       /*                                          */
-   OPCODE_NRM3,      /*                                      X   */
-   OPCODE_NRM4,      /*                                      X   */
-   OPCODE_OR,        /*                                          */
-   OPCODE_PK2H,      /*                            X             */
-   OPCODE_PK2US,     /*                            X             */
-   OPCODE_PK4B,      /*                            X             */
-   OPCODE_PK4UB,     /*                            X             */
-   OPCODE_POW,       /*   X        X               X         X   */
-   OPCODE_POPA,      /*                    3                     */
-   OPCODE_PRINT,     /*                    X       X             */
-   OPCODE_PUSHA,     /*                    3                     */
-   OPCODE_RCC,       /*                    1.1                   */
-   OPCODE_RCP,       /*   X        X       X       X         X   */
-   OPCODE_RET,       /*                    2       2         X   */
-   OPCODE_RFL,       /*            X               X             */
-   OPCODE_RSQ,       /*   X        X       X       X         X   */
-   OPCODE_SCS,       /*            X                             */
-   OPCODE_SEQ,       /*                    2       X         X   */
-   OPCODE_SFL,       /*                    2       X             */
-   OPCODE_SGE,       /*   X        X       X       X         X   */
-   OPCODE_SGT,       /*                    2       X         X   */
-   OPCODE_SIN,       /*            X       2       X         X   */
-   OPCODE_SLE,       /*                    2       X         X   */
-   OPCODE_SLT,       /*   X        X       X       X         X   */
-   OPCODE_SNE,       /*                    2       X         X   */
-   OPCODE_SSG,       /*                    2                     */
-   OPCODE_STR,       /*                    2       X             */
-   OPCODE_SUB,       /*   X        X       1.1     X         X   */
-   OPCODE_SWZ,       /*   X        X                             */
-   OPCODE_TEX,       /*            X       3       X         X   */
-   OPCODE_TXB,       /*            X       3                 X   */
-   OPCODE_TXD,       /*                            X         X   */
-   OPCODE_TXL,       /*                    3       2         X   */
-   OPCODE_TXP,       /*            X                         X   */
-   OPCODE_TXP_NV,    /*                    3       X             */
-   OPCODE_TRUNC,     /*                                      X   */
-   OPCODE_UP2H,      /*                            X             */
-   OPCODE_UP2US,     /*                            X             */
-   OPCODE_UP4B,      /*                            X             */
-   OPCODE_UP4UB,     /*                            X             */
-   OPCODE_X2D,       /*                            X             */
-   OPCODE_XOR,       /*                                          */
-   OPCODE_XPD,       /*   X        X                         X   */
-   MAX_OPCODE
-} gl_inst_opcode;
-
-
-/**
- * Number of bits for the src/dst register Index field.
- * This limits the size of temp/uniform register files.
- */
-#define INST_INDEX_BITS 12
-
-
-/**
- * Instruction source register.
- */
-struct prog_src_register
-{
-   GLuint File:4;	/**< One of the PROGRAM_* register file values. */
-   GLint Index:(INST_INDEX_BITS+1); /**< Extra bit here for sign bit.
-                                     * May be negative for relative addressing.
-                                     */
-   GLuint Swizzle:12;
-   GLuint RelAddr:1;
-
-   /** Take the component-wise absolute value */
-   GLuint Abs:1;
-
-   /**
-    * Post-Abs negation.
-    * This will either be NEGATE_NONE or NEGATE_XYZW, except for the SWZ
-    * instruction which allows per-component negation.
-    */
-   GLuint Negate:4;
-
-   /**
-    * Is the register two-dimensional.
-    * Two dimensional registers are of the
-    * REGISTER[index][index2] format.
-    * They are used by the geometry shaders where
-    * the first index is the index within an array
-    * and the second index is the semantic of the
-    * array, e.g. gl_PositionIn[index] would become
-    * INPUT[index][gl_PositionIn]
-    */
-   GLuint HasIndex2:1;
-   GLuint RelAddr2:1;
-   GLint Index2:(INST_INDEX_BITS+1); /**< Extra bit here for sign bit.
-                                       * May be negative for relative
-                                       * addressing. */
-};
-
-
-/**
- * Instruction destination register.
- */
-struct prog_dst_register
-{
-   GLuint File:4;      /**< One of the PROGRAM_* register file values */
-   GLuint Index:INST_INDEX_BITS;  /**< Unsigned, never negative */
-   GLuint WriteMask:4;
-   GLuint RelAddr:1;
-
-   /**
-    * \name Conditional destination update control.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
-    * NV_vertex_program2_option.
-    */
-   /*@{*/
-   /**
-    * Takes one of the 9 possible condition values (EQ, FL, GT, GE, LE, LT,
-    * NE, TR, or UN).  Dest reg is only written to if the matching
-    * (swizzled) condition code value passes.  When a conditional update mask
-    * is not specified, this will be \c COND_TR.
-    */
-   GLuint CondMask:4;
-
-   /**
-    * Condition code swizzle value.
-    */
-   GLuint CondSwizzle:12;
-
-   /**
-    * Selects the condition code register to use for conditional destination
-    * update masking.  In NV_fragmnet_program or NV_vertex_program2 mode, only
-    * condition code register 0 is available.  In NV_vertex_program3 mode,
-    * condition code registers 0 and 1 are available.
-    */
-   GLuint CondSrc:1;
-   /*@}*/
-};
-
-
-/**
- * Vertex/fragment program instruction.
- */
-struct prog_instruction
-{
-   gl_inst_opcode Opcode;
-   struct prog_src_register SrcReg[3];
-   struct prog_dst_register DstReg;
-
-   /**
-    * Indicates that the instruction should update the condition code
-    * register.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
-    * NV_vertex_program2_option.
-    */
-   GLuint CondUpdate:1;
-
-   /**
-    * If prog_instruction::CondUpdate is \c GL_TRUE, this value selects the
-    * condition code register that is to be updated.
-    *
-    * In GL_NV_fragment_program or GL_NV_vertex_program2 mode, only condition
-    * code register 0 is available.  In GL_NV_vertex_program3 mode, condition
-    * code registers 0 and 1 are available.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
-    * NV_vertex_program2_option.
-    */
-   GLuint CondDst:1;
-
-   /**
-    * Saturate each value of the vectored result to the range [0,1] or the
-    * range [-1,1].  \c SSAT mode (i.e., saturation to the range [-1,1]) is
-    * only available in NV_fragment_program2 mode.
-    * Value is one of the SATURATE_* tokens.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program3.
-    */
-   GLuint SaturateMode:2;
-
-   /**
-    * Per-instruction selectable precision: FLOAT32, FLOAT16, FIXED12.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option.
-    */
-   GLuint Precision:3;
-
-   /**
-    * \name Extra fields for TEX, TXB, TXD, TXL, TXP instructions.
-    */
-   /*@{*/
-   /** Source texture unit. */
-   GLuint TexSrcUnit:5;
-
-   /** Source texture target, one of TEXTURE_{1D,2D,3D,CUBE,RECT}_INDEX */
-   GLuint TexSrcTarget:3;
-
-   /** True if tex instruction should do shadow comparison */
-   GLuint TexShadow:1;
-   /*@}*/
-
-   /**
-    * For BRA and CAL instructions, the location to jump to.
-    * For BGNLOOP, points to ENDLOOP (and vice-versa).
-    * For BRK, points to ENDLOOP
-    * For IF, points to ELSE or ENDIF.
-    * For ELSE, points to ENDIF.
-    */
-   GLint BranchTarget;
-
-   /** for debugging purposes */
-   const char *Comment;
-
-   /** Arbitrary data.  Used for OPCODE_PRINT and some drivers */
-   void *Data;
-
-   /** for driver use (try to remove someday) */
-   GLint Aux;
-};
-
-
-extern void
-_mesa_init_instructions(struct prog_instruction *inst, GLuint count);
-
-extern struct prog_instruction *
-_mesa_alloc_instructions(GLuint numInst);
-
-extern struct prog_instruction *
-_mesa_realloc_instructions(struct prog_instruction *oldInst,
-                           GLuint numOldInst, GLuint numNewInst);
-
-extern struct prog_instruction *
-_mesa_copy_instructions(struct prog_instruction *dest,
-                        const struct prog_instruction *src, GLuint n);
-
-extern void
-_mesa_free_instructions(struct prog_instruction *inst, GLuint count);
-
-extern GLuint
-_mesa_num_inst_src_regs(gl_inst_opcode opcode);
-
-extern GLuint
-_mesa_num_inst_dst_regs(gl_inst_opcode opcode);
-
-extern GLboolean
-_mesa_is_tex_instruction(gl_inst_opcode opcode);
-
-extern GLboolean
-_mesa_check_soa_dependencies(const struct prog_instruction *inst);
-
-extern const char *
-_mesa_opcode_string(gl_inst_opcode opcode);
-
-
-#endif /* PROG_INSTRUCTION_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.3

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+/**

+ * \file prog_instruction.h

+ *

+ * Vertex/fragment program instruction datatypes and constants.

+ *

+ * \author Brian Paul

+ * \author Keith Whitwell

+ * \author Ian Romanick <idr@us.ibm.com>

+ */

+

+

+#ifndef PROG_INSTRUCTION_H

+#define PROG_INSTRUCTION_H

+

+

+#include "main/glheader.h"

+

+

+/**

+ * Swizzle indexes.

+ * Do not change!

+ */

+/*@{*/

+#define SWIZZLE_X    0

+#define SWIZZLE_Y    1

+#define SWIZZLE_Z    2

+#define SWIZZLE_W    3

+#define SWIZZLE_ZERO 4   /**< For SWZ instruction only */

+#define SWIZZLE_ONE  5   /**< For SWZ instruction only */

+#define SWIZZLE_NIL  7   /**< used during shader code gen (undefined value) */

+/*@}*/

+

+#define MAKE_SWIZZLE4(a,b,c,d) (((a)<<0) | ((b)<<3) | ((c)<<6) | ((d)<<9))

+#define SWIZZLE_NOOP           MAKE_SWIZZLE4(0,1,2,3)

+#define GET_SWZ(swz, idx)      (((swz) >> ((idx)*3)) & 0x7)

+#define GET_BIT(msk, idx)      (((msk) >> (idx)) & 0x1)

+

+#define SWIZZLE_XYZW MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W)

+#define SWIZZLE_XXXX MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_X, SWIZZLE_X, SWIZZLE_X)

+#define SWIZZLE_YYYY MAKE_SWIZZLE4(SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y)

+#define SWIZZLE_ZZZZ MAKE_SWIZZLE4(SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z)

+#define SWIZZLE_WWWW MAKE_SWIZZLE4(SWIZZLE_W, SWIZZLE_W, SWIZZLE_W, SWIZZLE_W)

+

+

+/**

+ * Writemask values, 1 bit per component.

+ */

+/*@{*/

+#define WRITEMASK_X     0x1

+#define WRITEMASK_Y     0x2

+#define WRITEMASK_XY    0x3

+#define WRITEMASK_Z     0x4

+#define WRITEMASK_XZ    0x5

+#define WRITEMASK_YZ    0x6

+#define WRITEMASK_XYZ   0x7

+#define WRITEMASK_W     0x8

+#define WRITEMASK_XW    0x9

+#define WRITEMASK_YW    0xa

+#define WRITEMASK_XYW   0xb

+#define WRITEMASK_ZW    0xc

+#define WRITEMASK_XZW   0xd

+#define WRITEMASK_YZW   0xe

+#define WRITEMASK_XYZW  0xf

+/*@}*/

+

+

+/**

+ * Condition codes

+ */

+/*@{*/

+#define COND_GT  1  /**< greater than zero */

+#define COND_EQ  2  /**< equal to zero */

+#define COND_LT  3  /**< less than zero */

+#define COND_UN  4  /**< unordered (NaN) */

+#define COND_GE  5  /**< greater than or equal to zero */

+#define COND_LE  6  /**< less than or equal to zero */

+#define COND_NE  7  /**< not equal to zero */

+#define COND_TR  8  /**< always true */

+#define COND_FL  9  /**< always false */

+/*@}*/

+

+

+/**

+ * Instruction precision for GL_NV_fragment_program

+ */

+/*@{*/

+#define FLOAT32  0x1

+#define FLOAT16  0x2

+#define FIXED12  0x4

+/*@}*/

+

+

+/**

+ * Saturation modes when storing values.

+ */

+/*@{*/

+#define SATURATE_OFF            0

+#define SATURATE_ZERO_ONE       1

+/*@}*/

+

+

+/**

+ * Per-component negation masks

+ */

+/*@{*/

+#define NEGATE_X    0x1

+#define NEGATE_Y    0x2

+#define NEGATE_Z    0x4

+#define NEGATE_W    0x8

+#define NEGATE_XYZ  0x7

+#define NEGATE_XYZW 0xf

+#define NEGATE_NONE 0x0

+/*@}*/

+

+

+/**

+ * Program instruction opcodes for vertex, fragment and geometry programs.

+ */

+typedef enum prog_opcode {

+                     /* ARB_vp   ARB_fp   NV_vp   NV_fp     GLSL */

+                     /*------------------------------------------*/

+   OPCODE_NOP = 0,   /*                                      X   */

+   OPCODE_ABS,       /*   X        X       1.1               X   */

+   OPCODE_ADD,       /*   X        X       X       X         X   */

+   OPCODE_AND,       /*                                          */

+   OPCODE_ARA,       /*                    2                     */

+   OPCODE_ARL,       /*   X                X                 X   */

+   OPCODE_ARL_NV,    /*                    2                     */

+   OPCODE_ARR,       /*                    2                     */

+   OPCODE_BGNLOOP,   /*                                     opt  */

+   OPCODE_BGNSUB,    /*                                     opt  */

+   OPCODE_BRA,       /*                    2                 X   */

+   OPCODE_BRK,       /*                    2                opt  */

+   OPCODE_CAL,       /*                    2       2         X   */

+   OPCODE_CMP,       /*            X                         X   */

+   OPCODE_CONT,      /*                                     opt  */

+   OPCODE_COS,       /*            X       2       X         X   */

+   OPCODE_DDX,       /*                            X         X   */

+   OPCODE_DDY,       /*                            X         X   */

+   OPCODE_DP2,       /*                            2         X   */

+   OPCODE_DP2A,      /*                            2             */

+   OPCODE_DP3,       /*   X        X       X       X         X   */

+   OPCODE_DP4,       /*   X        X       X       X         X   */

+   OPCODE_DPH,       /*   X        X       1.1                   */

+   OPCODE_DST,       /*   X        X       X       X             */

+   OPCODE_ELSE,      /*                                      X   */

+   OPCODE_EMIT_VERTEX,/*                                     X   */

+   OPCODE_END,       /*   X        X       X       X        opt  */

+   OPCODE_END_PRIMITIVE,/*                                   X   */

+   OPCODE_ENDIF,     /*                                     opt  */

+   OPCODE_ENDLOOP,   /*                                     opt  */

+   OPCODE_ENDSUB,    /*                                     opt  */

+   OPCODE_EX2,       /*   X        X       2       X         X   */

+   OPCODE_EXP,       /*   X                X                 X   */

+   OPCODE_FLR,       /*   X        X       2       X         X   */

+   OPCODE_FRC,       /*   X        X       2       X         X   */

+   OPCODE_IF,        /*                                     opt  */

+   OPCODE_KIL,       /*            X                             */

+   OPCODE_KIL_NV,    /*                            X         X   */

+   OPCODE_LG2,       /*   X        X       2       X         X   */

+   OPCODE_LIT,       /*   X        X       X       X             */

+   OPCODE_LOG,       /*   X                X                 X   */

+   OPCODE_LRP,       /*            X               X         X   */

+   OPCODE_MAD,       /*   X        X       X       X         X   */

+   OPCODE_MAX,       /*   X        X       X       X         X   */

+   OPCODE_MIN,       /*   X        X       X       X         X   */

+   OPCODE_MOV,       /*   X        X       X       X         X   */

+   OPCODE_MUL,       /*   X        X       X       X         X   */

+   OPCODE_NOISE1,    /*                                      X   */

+   OPCODE_NOISE2,    /*                                      X   */

+   OPCODE_NOISE3,    /*                                      X   */

+   OPCODE_NOISE4,    /*                                      X   */

+   OPCODE_NOT,       /*                                          */

+   OPCODE_NRM3,      /*                                      X   */

+   OPCODE_NRM4,      /*                                      X   */

+   OPCODE_OR,        /*                                          */

+   OPCODE_PK2H,      /*                            X             */

+   OPCODE_PK2US,     /*                            X             */

+   OPCODE_PK4B,      /*                            X             */

+   OPCODE_PK4UB,     /*                            X             */

+   OPCODE_POW,       /*   X        X               X         X   */

+   OPCODE_POPA,      /*                    3                     */

+   OPCODE_PRINT,     /*                    X       X             */

+   OPCODE_PUSHA,     /*                    3                     */

+   OPCODE_RCC,       /*                    1.1                   */

+   OPCODE_RCP,       /*   X        X       X       X         X   */

+   OPCODE_RET,       /*                    2       2         X   */

+   OPCODE_RFL,       /*            X               X             */

+   OPCODE_RSQ,       /*   X        X       X       X         X   */

+   OPCODE_SCS,       /*            X                             */

+   OPCODE_SEQ,       /*                    2       X         X   */

+   OPCODE_SFL,       /*                    2       X             */

+   OPCODE_SGE,       /*   X        X       X       X         X   */

+   OPCODE_SGT,       /*                    2       X         X   */

+   OPCODE_SIN,       /*            X       2       X         X   */

+   OPCODE_SLE,       /*                    2       X         X   */

+   OPCODE_SLT,       /*   X        X       X       X         X   */

+   OPCODE_SNE,       /*                    2       X         X   */

+   OPCODE_SSG,       /*                    2                     */

+   OPCODE_STR,       /*                    2       X             */

+   OPCODE_SUB,       /*   X        X       1.1     X         X   */

+   OPCODE_SWZ,       /*   X        X                             */

+   OPCODE_TEX,       /*            X       3       X         X   */

+   OPCODE_TXB,       /*            X       3                 X   */

+   OPCODE_TXD,       /*                            X         X   */

+   OPCODE_TXL,       /*                    3       2         X   */

+   OPCODE_TXP,       /*            X                         X   */

+   OPCODE_TXP_NV,    /*                    3       X             */

+   OPCODE_TRUNC,     /*                                      X   */

+   OPCODE_UP2H,      /*                            X             */

+   OPCODE_UP2US,     /*                            X             */

+   OPCODE_UP4B,      /*                            X             */

+   OPCODE_UP4UB,     /*                            X             */

+   OPCODE_X2D,       /*                            X             */

+   OPCODE_XOR,       /*                                          */

+   OPCODE_XPD,       /*   X        X                         X   */

+   MAX_OPCODE

+} gl_inst_opcode;

+

+

+/**

+ * Number of bits for the src/dst register Index field.

+ * This limits the size of temp/uniform register files.

+ */

+#define INST_INDEX_BITS 12

+

+

+/**

+ * Instruction source register.

+ */

+struct prog_src_register

+{

+   GLuint File:4;	/**< One of the PROGRAM_* register file values. */

+   GLint Index:(INST_INDEX_BITS+1); /**< Extra bit here for sign bit.

+                                     * May be negative for relative addressing.

+                                     */

+   GLuint Swizzle:12;

+   GLuint RelAddr:1;

+

+   /** Take the component-wise absolute value */

+   GLuint Abs:1;

+

+   /**

+    * Post-Abs negation.

+    * This will either be NEGATE_NONE or NEGATE_XYZW, except for the SWZ

+    * instruction which allows per-component negation.

+    */

+   GLuint Negate:4;

+

+   /**

+    * Is the register two-dimensional.

+    * Two dimensional registers are of the

+    * REGISTER[index][index2] format.

+    * They are used by the geometry shaders where

+    * the first index is the index within an array

+    * and the second index is the semantic of the

+    * array, e.g. gl_PositionIn[index] would become

+    * INPUT[index][gl_PositionIn]

+    */

+   GLuint HasIndex2:1;

+   GLuint RelAddr2:1;

+   GLint Index2:(INST_INDEX_BITS+1); /**< Extra bit here for sign bit.

+                                       * May be negative for relative

+                                       * addressing. */

+};

+

+

+/**

+ * Instruction destination register.

+ */

+struct prog_dst_register

+{

+   GLuint File:4;      /**< One of the PROGRAM_* register file values */

+   GLuint Index:INST_INDEX_BITS;  /**< Unsigned, never negative */

+   GLuint WriteMask:4;

+   GLuint RelAddr:1;

+

+   /**

+    * \name Conditional destination update control.

+    *

+    * \since

+    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,

+    * NV_vertex_program2_option.

+    */

+   /*@{*/

+   /**

+    * Takes one of the 9 possible condition values (EQ, FL, GT, GE, LE, LT,

+    * NE, TR, or UN).  Dest reg is only written to if the matching

+    * (swizzled) condition code value passes.  When a conditional update mask

+    * is not specified, this will be \c COND_TR.

+    */

+   GLuint CondMask:4;

+

+   /**

+    * Condition code swizzle value.

+    */

+   GLuint CondSwizzle:12;

+

+   /**

+    * Selects the condition code register to use for conditional destination

+    * update masking.  In NV_fragmnet_program or NV_vertex_program2 mode, only

+    * condition code register 0 is available.  In NV_vertex_program3 mode,

+    * condition code registers 0 and 1 are available.

+    */

+   GLuint CondSrc:1;

+   /*@}*/

+};

+

+

+/**

+ * Vertex/fragment program instruction.

+ */

+struct prog_instruction

+{

+   gl_inst_opcode Opcode;

+   struct prog_src_register SrcReg[3];

+   struct prog_dst_register DstReg;

+

+   /**

+    * Indicates that the instruction should update the condition code

+    * register.

+    *

+    * \since

+    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,

+    * NV_vertex_program2_option.

+    */

+   GLuint CondUpdate:1;

+

+   /**

+    * If prog_instruction::CondUpdate is \c GL_TRUE, this value selects the

+    * condition code register that is to be updated.

+    *

+    * In GL_NV_fragment_program or GL_NV_vertex_program2 mode, only condition

+    * code register 0 is available.  In GL_NV_vertex_program3 mode, condition

+    * code registers 0 and 1 are available.

+    *

+    * \since

+    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,

+    * NV_vertex_program2_option.

+    */

+   GLuint CondDst:1;

+

+   /**

+    * Saturate each value of the vectored result to the range [0,1] or the

+    * range [-1,1].  \c SSAT mode (i.e., saturation to the range [-1,1]) is

+    * only available in NV_fragment_program2 mode.

+    * Value is one of the SATURATE_* tokens.

+    *

+    * \since

+    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program3.

+    */

+   GLuint SaturateMode:2;

+

+   /**

+    * Per-instruction selectable precision: FLOAT32, FLOAT16, FIXED12.

+    *

+    * \since

+    * NV_fragment_program, NV_fragment_program_option.

+    */

+   GLuint Precision:3;

+

+   /**

+    * \name Extra fields for TEX, TXB, TXD, TXL, TXP instructions.

+    */

+   /*@{*/

+   /** Source texture unit. */

+   GLuint TexSrcUnit:5;

+

+   /** Source texture target, one of TEXTURE_{1D,2D,3D,CUBE,RECT}_INDEX */

+   GLuint TexSrcTarget:3;

+

+   /** True if tex instruction should do shadow comparison */

+   GLuint TexShadow:1;

+   /*@}*/

+

+   /**

+    * For BRA and CAL instructions, the location to jump to.

+    * For BGNLOOP, points to ENDLOOP (and vice-versa).

+    * For BRK, points to ENDLOOP

+    * For IF, points to ELSE or ENDIF.

+    * For ELSE, points to ENDIF.

+    */

+   GLint BranchTarget;

+

+   /** for debugging purposes */

+   const char *Comment;

+

+   /** Arbitrary data.  Used for OPCODE_PRINT and some drivers */

+   void *Data;

+

+   /** for driver use (try to remove someday) */

+   GLint Aux;

+};

+

+

+extern void

+_mesa_init_instructions(struct prog_instruction *inst, GLuint count);

+

+extern struct prog_instruction *

+_mesa_alloc_instructions(GLuint numInst);

+

+extern struct prog_instruction *

+_mesa_realloc_instructions(struct prog_instruction *oldInst,

+                           GLuint numOldInst, GLuint numNewInst);

+

+extern struct prog_instruction *

+_mesa_copy_instructions(struct prog_instruction *dest,

+                        const struct prog_instruction *src, GLuint n);

+

+extern void

+_mesa_free_instructions(struct prog_instruction *inst, GLuint count);

+

+extern GLuint

+_mesa_num_inst_src_regs(gl_inst_opcode opcode);

+

+extern GLuint

+_mesa_num_inst_dst_regs(gl_inst_opcode opcode);

+

+extern GLboolean

+_mesa_is_tex_instruction(gl_inst_opcode opcode);

+

+extern GLboolean

+_mesa_check_soa_dependencies(const struct prog_instruction *inst);

+

+extern const char *

+_mesa_opcode_string(gl_inst_opcode opcode);

+

+

+#endif /* PROG_INSTRUCTION_H */

diff --git a/mesalib/src/mesa/program/prog_optimize.c b/mesalib/src/mesa/program/prog_optimize.c
index 164297a34..5ffe8411c 100644
--- a/mesalib/src/mesa/program/prog_optimize.c
+++ b/mesalib/src/mesa/program/prog_optimize.c
@@ -1,1261 +1,1261 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
- *
- * 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
- * VMWARE 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.
- */
-
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "program.h"
-#include "prog_instruction.h"
-#include "prog_optimize.h"
-#include "prog_print.h"
-
-
-#define MAX_LOOP_NESTING 50
-/* MAX_PROGRAM_TEMPS is a low number (256), and we want to be able to
- * register allocate many temporary values into that small number of
- * temps.  So allow large temporary indices coming into the register
- * allocator.
- */
-#define REG_ALLOCATE_MAX_PROGRAM_TEMPS	((1 << INST_INDEX_BITS) - 1)
-
-static GLboolean dbg = GL_FALSE;
-
-#define NO_MASK 0xf
-
-/**
- * Returns the mask of channels (bitmask of WRITEMASK_X,Y,Z,W) which
- * are read from the given src in this instruction, We also provide
- * one optional masks which may mask other components in the dst
- * register
- */
-static GLuint
-get_src_arg_mask(const struct prog_instruction *inst,
-                 GLuint arg, GLuint dst_mask)
-{
-   GLuint read_mask, channel_mask;
-   GLuint comp;
-
-   ASSERT(arg < _mesa_num_inst_src_regs(inst->Opcode));
-
-   /* Form the dst register, find the written channels */
-   if (inst->CondUpdate) {
-      channel_mask = WRITEMASK_XYZW;
-   }
-   else {
-      switch (inst->Opcode) {
-      case OPCODE_MOV:
-      case OPCODE_MIN:
-      case OPCODE_MAX:
-      case OPCODE_ABS:
-      case OPCODE_ADD:
-      case OPCODE_MAD:
-      case OPCODE_MUL:
-      case OPCODE_SUB:
-         channel_mask = inst->DstReg.WriteMask & dst_mask;
-         break;
-      case OPCODE_RCP:
-      case OPCODE_SIN:
-      case OPCODE_COS:
-      case OPCODE_RSQ:
-      case OPCODE_POW:
-      case OPCODE_EX2:
-      case OPCODE_LOG:
-         channel_mask = WRITEMASK_X;
-         break;
-      case OPCODE_DP2:
-         channel_mask = WRITEMASK_XY;
-         break;
-      case OPCODE_DP3:
-      case OPCODE_XPD:
-         channel_mask = WRITEMASK_XYZ;
-         break;
-      default:
-         channel_mask = WRITEMASK_XYZW;
-         break;
-      }
-   }
-
-   /* Now, given the src swizzle and the written channels, find which
-    * components are actually read
-    */
-   read_mask = 0x0;
-   for (comp = 0; comp < 4; ++comp) {
-      const GLuint coord = GET_SWZ(inst->SrcReg[arg].Swizzle, comp);
-      ASSERT(coord < 4);
-      if (channel_mask & (1 << comp) && coord <= SWIZZLE_W)
-         read_mask |= 1 << coord;
-   }
-
-   return read_mask;
-}
-
-
-/**
- * For a MOV instruction, compute a write mask when src register also has
- * a mask
- */
-static GLuint
-get_dst_mask_for_mov(const struct prog_instruction *mov, GLuint src_mask)
-{
-   const GLuint mask = mov->DstReg.WriteMask;
-   GLuint comp;
-   GLuint updated_mask = 0x0;
-
-   ASSERT(mov->Opcode == OPCODE_MOV);
-
-   for (comp = 0; comp < 4; ++comp) {
-      GLuint src_comp;
-      if ((mask & (1 << comp)) == 0)
-         continue;
-      src_comp = GET_SWZ(mov->SrcReg[0].Swizzle, comp);
-      if ((src_mask & (1 << src_comp)) == 0)
-         continue;
-      updated_mask |= 1 << comp;
-   }
-
-   return updated_mask;
-}
-
-
-/**
- * Ensure that the swizzle is regular.  That is, all of the swizzle
- * terms are SWIZZLE_X,Y,Z,W and not SWIZZLE_ZERO or SWIZZLE_ONE.
- */
-static GLboolean
-is_swizzle_regular(GLuint swz)
-{
-   return GET_SWZ(swz,0) <= SWIZZLE_W &&
-          GET_SWZ(swz,1) <= SWIZZLE_W &&
-          GET_SWZ(swz,2) <= SWIZZLE_W &&
-          GET_SWZ(swz,3) <= SWIZZLE_W;
-}
-
-
-/**
- * In 'prog' remove instruction[i] if removeFlags[i] == TRUE.
- * \return number of instructions removed
- */
-static GLuint
-remove_instructions(struct gl_program *prog, const GLboolean *removeFlags)
-{
-   GLint i, removeEnd = 0, removeCount = 0;
-   GLuint totalRemoved = 0;
-
-   /* go backward */
-   for (i = prog->NumInstructions - 1; i >= 0; i--) {
-      if (removeFlags[i]) {
-         totalRemoved++;
-         if (removeCount == 0) {
-            /* begin a run of instructions to remove */
-            removeEnd = i;
-            removeCount = 1;
-         }
-         else {
-            /* extend the run of instructions to remove */
-            removeCount++;
-         }
-      }
-      else {
-         /* don't remove this instruction, but check if the preceeding
-          * instructions are to be removed.
-          */
-         if (removeCount > 0) {
-            GLint removeStart = removeEnd - removeCount + 1;
-            _mesa_delete_instructions(prog, removeStart, removeCount);
-            removeStart = removeCount = 0; /* reset removal info */
-         }
-      }
-   }
-   /* Finish removing if the first instruction was to be removed. */
-   if (removeCount > 0) {
-      GLint removeStart = removeEnd - removeCount + 1;
-      _mesa_delete_instructions(prog, removeStart, removeCount);
-   }
-   return totalRemoved;
-}
-
-
-/**
- * Remap register indexes according to map.
- * \param prog  the program to search/replace
- * \param file  the type of register file to search/replace
- * \param map  maps old register indexes to new indexes
- */
-static void
-replace_regs(struct gl_program *prog, gl_register_file file, const GLint map[])
-{
-   GLuint i;
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
-      GLuint j;
-      for (j = 0; j < numSrc; j++) {
-         if (inst->SrcReg[j].File == file) {
-            GLuint index = inst->SrcReg[j].Index;
-            ASSERT(map[index] >= 0);
-            inst->SrcReg[j].Index = map[index];
-         }
-      }
-      if (inst->DstReg.File == file) {
-         const GLuint index = inst->DstReg.Index;
-         ASSERT(map[index] >= 0);
-         inst->DstReg.Index = map[index];
-      }
-   }
-}
-
-
-/**
- * Remove dead instructions from the given program.
- * This is very primitive for now.  Basically look for temp registers
- * that are written to but never read.  Remove any instructions that
- * write to such registers.  Be careful with condition code setters.
- */
-static GLboolean
-_mesa_remove_dead_code_global(struct gl_program *prog)
-{
-   GLboolean tempRead[REG_ALLOCATE_MAX_PROGRAM_TEMPS][4];
-   GLboolean *removeInst; /* per-instruction removal flag */
-   GLuint i, rem = 0, comp;
-
-   memset(tempRead, 0, sizeof(tempRead));
-
-   if (dbg) {
-      printf("Optimize: Begin dead code removal\n");
-      /*_mesa_print_program(prog);*/
-   }
-
-   removeInst = (GLboolean *)
-      calloc(1, prog->NumInstructions * sizeof(GLboolean));
-
-   /* Determine which temps are read and written */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
-      GLuint j;
-
-      /* check src regs */
-      for (j = 0; j < numSrc; j++) {
-         if (inst->SrcReg[j].File == PROGRAM_TEMPORARY) {
-            const GLuint index = inst->SrcReg[j].Index;
-            GLuint read_mask;
-            ASSERT(index < REG_ALLOCATE_MAX_PROGRAM_TEMPS);
-	    read_mask = get_src_arg_mask(inst, j, NO_MASK);
-
-            if (inst->SrcReg[j].RelAddr) {
-               if (dbg)
-                  printf("abort remove dead code (indirect temp)\n");
-               goto done;
-            }
-
-	    for (comp = 0; comp < 4; comp++) {
-	       const GLuint swz = GET_SWZ(inst->SrcReg[j].Swizzle, comp);
-	       ASSERT(swz < 4);
-               if ((read_mask & (1 << swz)) == 0)
-		  continue;
-               if (swz <= SWIZZLE_W)
-                  tempRead[index][swz] = GL_TRUE;
-	    }
-         }
-      }
-
-      /* check dst reg */
-      if (inst->DstReg.File == PROGRAM_TEMPORARY) {
-         const GLuint index = inst->DstReg.Index;
-         ASSERT(index < REG_ALLOCATE_MAX_PROGRAM_TEMPS);
-
-         if (inst->DstReg.RelAddr) {
-            if (dbg)
-               printf("abort remove dead code (indirect temp)\n");
-            goto done;
-         }
-
-         if (inst->CondUpdate) {
-            /* If we're writing to this register and setting condition
-             * codes we cannot remove the instruction.  Prevent removal
-             * by setting the 'read' flag.
-             */
-            tempRead[index][0] = GL_TRUE;
-            tempRead[index][1] = GL_TRUE;
-            tempRead[index][2] = GL_TRUE;
-            tempRead[index][3] = GL_TRUE;
-         }
-      }
-   }
-
-   /* find instructions that write to dead registers, flag for removal */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint numDst = _mesa_num_inst_dst_regs(inst->Opcode);
-
-      if (numDst != 0 && inst->DstReg.File == PROGRAM_TEMPORARY) {
-         GLint chan, index = inst->DstReg.Index;
-
-	 for (chan = 0; chan < 4; chan++) {
-	    if (!tempRead[index][chan] &&
-		inst->DstReg.WriteMask & (1 << chan)) {
-	       if (dbg) {
-		  printf("Remove writemask on %u.%c\n", i,
-			       chan == 3 ? 'w' : 'x' + chan);
-	       }
-	       inst->DstReg.WriteMask &= ~(1 << chan);
-	       rem++;
-	    }
-	 }
-
-	 if (inst->DstReg.WriteMask == 0) {
-	    /* If we cleared all writes, the instruction can be removed. */
-	    if (dbg)
-	       printf("Remove instruction %u: \n", i);
-	    removeInst[i] = GL_TRUE;
-	 }
-      }
-   }
-
-   /* now remove the instructions which aren't needed */
-   rem = remove_instructions(prog, removeInst);
-
-   if (dbg) {
-      printf("Optimize: End dead code removal.\n");
-      printf("  %u channel writes removed\n", rem);
-      printf("  %u instructions removed\n", rem);
-      /*_mesa_print_program(prog);*/
-   }
-
-done:
-   free(removeInst);
-   return rem != 0;
-}
-
-
-enum inst_use
-{
-   READ,
-   WRITE,
-   FLOW,
-   END
-};
-
-
-/**
- * Scan forward in program from 'start' for the next occurances of TEMP[index].
- * We look if an instruction reads the component given by the masks and if they
- * are overwritten.
- * Return READ, WRITE, FLOW or END to indicate the next usage or an indicator
- * that we can't look further.
- */
-static enum inst_use
-find_next_use(const struct gl_program *prog,
-              GLuint start,
-              GLuint index,
-              GLuint mask)
-{
-   GLuint i;
-
-   for (i = start; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-      switch (inst->Opcode) {
-      case OPCODE_BGNLOOP:
-      case OPCODE_BGNSUB:
-      case OPCODE_BRA:
-      case OPCODE_CAL:
-      case OPCODE_CONT:
-      case OPCODE_IF:
-      case OPCODE_ELSE:
-      case OPCODE_ENDIF:
-      case OPCODE_ENDLOOP:
-      case OPCODE_ENDSUB:
-      case OPCODE_RET:
-         return FLOW;
-      case OPCODE_END:
-         return END;
-      default:
-         {
-            const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
-            GLuint j;
-            for (j = 0; j < numSrc; j++) {
-               if (inst->SrcReg[j].RelAddr ||
-                   (inst->SrcReg[j].File == PROGRAM_TEMPORARY &&
-                   inst->SrcReg[j].Index == index &&
-                   (get_src_arg_mask(inst,j,NO_MASK) & mask)))
-                  return READ;
-            }
-            if (_mesa_num_inst_dst_regs(inst->Opcode) == 1 &&
-                inst->DstReg.File == PROGRAM_TEMPORARY &&
-                inst->DstReg.Index == index) {
-               mask &= ~inst->DstReg.WriteMask;
-               if (mask == 0)
-                  return WRITE;
-            }
-         }
-      }
-   }
-   return END;
-}
-
-
-/**
- * Is the given instruction opcode a flow-control opcode?
- * XXX maybe move this into prog_instruction.[ch]
- */
-static GLboolean
-_mesa_is_flow_control_opcode(enum prog_opcode opcode)
-{
-   switch (opcode) {
-   case OPCODE_BGNLOOP:
-   case OPCODE_BGNSUB:
-   case OPCODE_BRA:
-   case OPCODE_CAL:
-   case OPCODE_CONT:
-   case OPCODE_IF:
-   case OPCODE_ELSE:
-   case OPCODE_END:
-   case OPCODE_ENDIF:
-   case OPCODE_ENDLOOP:
-   case OPCODE_ENDSUB:
-   case OPCODE_RET:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the given instruction is a simple MOV (no conditional updating,
- * not relative addressing, no negation/abs, etc).
- */
-static GLboolean
-can_downward_mov_be_modifed(const struct prog_instruction *mov)
-{
-   return
-      mov->Opcode == OPCODE_MOV &&
-      mov->CondUpdate == GL_FALSE &&
-      mov->SrcReg[0].RelAddr == 0 &&
-      mov->SrcReg[0].Negate == 0 &&
-      mov->SrcReg[0].Abs == 0 &&
-      mov->SrcReg[0].HasIndex2 == 0 &&
-      mov->SrcReg[0].RelAddr2 == 0 &&
-      mov->DstReg.RelAddr == 0 &&
-      mov->DstReg.CondMask == COND_TR &&
-      mov->SaturateMode == SATURATE_OFF;
-}
-
-
-static GLboolean
-can_upward_mov_be_modifed(const struct prog_instruction *mov)
-{
-   return
-      can_downward_mov_be_modifed(mov) &&
-      mov->DstReg.File == PROGRAM_TEMPORARY;
-}
-
-
-/**
- * Try to remove use of extraneous MOV instructions, to free them up for dead
- * code removal.
- */
-static void
-_mesa_remove_extra_move_use(struct gl_program *prog)
-{
-   GLuint i, j;
-
-   if (dbg) {
-      printf("Optimize: Begin remove extra move use\n");
-      _mesa_print_program(prog);
-   }
-
-   /*
-    * Look for sequences such as this:
-    *    MOV tmpX, arg0;
-    *    ...
-    *    FOO tmpY, tmpX, arg1;
-    * and convert into:
-    *    MOV tmpX, arg0;
-    *    ...
-    *    FOO tmpY, arg0, arg1;
-    */
-
-   for (i = 0; i + 1 < prog->NumInstructions; i++) {
-      const struct prog_instruction *mov = prog->Instructions + i;
-      GLuint dst_mask, src_mask;
-      if (can_upward_mov_be_modifed(mov) == GL_FALSE)
-         continue;
-
-      /* Scanning the code, we maintain the components which are still active in
-       * these two masks
-       */
-      dst_mask = mov->DstReg.WriteMask;
-      src_mask = get_src_arg_mask(mov, 0, NO_MASK);
-
-      /* Walk through remaining instructions until the or src reg gets
-       * rewritten or we get into some flow-control, eliminating the use of
-       * this MOV.
-       */
-      for (j = i + 1; j < prog->NumInstructions; j++) {
-	 struct prog_instruction *inst2 = prog->Instructions + j;
-         GLuint arg;
-
-	 if (_mesa_is_flow_control_opcode(inst2->Opcode))
-	     break;
-
-	 /* First rewrite this instruction's args if appropriate. */
-	 for (arg = 0; arg < _mesa_num_inst_src_regs(inst2->Opcode); arg++) {
-	    GLuint comp, read_mask;
-
-	    if (inst2->SrcReg[arg].File != mov->DstReg.File ||
-		inst2->SrcReg[arg].Index != mov->DstReg.Index ||
-		inst2->SrcReg[arg].RelAddr ||
-		inst2->SrcReg[arg].Abs)
-	       continue;
-            read_mask = get_src_arg_mask(inst2, arg, NO_MASK);
-
-	    /* Adjust the swizzles of inst2 to point at MOV's source if ALL the
-             * components read still come from the mov instructions
-             */
-            if (is_swizzle_regular(inst2->SrcReg[arg].Swizzle) &&
-               (read_mask & dst_mask) == read_mask) {
-               for (comp = 0; comp < 4; comp++) {
-                  const GLuint inst2_swz =
-                     GET_SWZ(inst2->SrcReg[arg].Swizzle, comp);
-                  const GLuint s = GET_SWZ(mov->SrcReg[0].Swizzle, inst2_swz);
-                  inst2->SrcReg[arg].Swizzle &= ~(7 << (3 * comp));
-                  inst2->SrcReg[arg].Swizzle |= s << (3 * comp);
-                  inst2->SrcReg[arg].Negate ^= (((mov->SrcReg[0].Negate >>
-                                                  inst2_swz) & 0x1) << comp);
-               }
-               inst2->SrcReg[arg].File = mov->SrcReg[0].File;
-               inst2->SrcReg[arg].Index = mov->SrcReg[0].Index;
-            }
-	 }
-
-	 /* The source of MOV is written. This potentially deactivates some
-          * components from the src and dst of the MOV instruction
-          */
-	 if (inst2->DstReg.File == mov->DstReg.File &&
-	     (inst2->DstReg.RelAddr ||
-	      inst2->DstReg.Index == mov->DstReg.Index)) {
-            dst_mask &= ~inst2->DstReg.WriteMask;
-            src_mask = get_src_arg_mask(mov, 0, dst_mask);
-         }
-
-         /* Idem when the destination of mov is written */
-	 if (inst2->DstReg.File == mov->SrcReg[0].File &&
-	     (inst2->DstReg.RelAddr ||
-	      inst2->DstReg.Index == mov->SrcReg[0].Index)) {
-            src_mask &= ~inst2->DstReg.WriteMask;
-            dst_mask &= get_dst_mask_for_mov(mov, src_mask);
-         }
-         if (dst_mask == 0)
-            break;
-      }
-   }
-
-   if (dbg) {
-      printf("Optimize: End remove extra move use.\n");
-      /*_mesa_print_program(prog);*/
-   }
-}
-
-
-/**
- * Complements dead_code_global. Try to remove code in block of code by
- * carefully monitoring the swizzles. Both functions should be merged into one
- * with a proper control flow graph
- */
-static GLboolean
-_mesa_remove_dead_code_local(struct gl_program *prog)
-{
-   GLboolean *removeInst;
-   GLuint i, arg, rem = 0;
-
-   removeInst = (GLboolean *)
-      calloc(1, prog->NumInstructions * sizeof(GLboolean));
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint index = inst->DstReg.Index;
-      const GLuint mask = inst->DstReg.WriteMask;
-      enum inst_use use;
-
-      /* We must deactivate the pass as soon as some indirection is used */
-      if (inst->DstReg.RelAddr)
-         goto done;
-      for (arg = 0; arg < _mesa_num_inst_src_regs(inst->Opcode); arg++)
-         if (inst->SrcReg[arg].RelAddr)
-            goto done;
-
-      if (_mesa_is_flow_control_opcode(inst->Opcode) ||
-          _mesa_num_inst_dst_regs(inst->Opcode) == 0 ||
-          inst->DstReg.File != PROGRAM_TEMPORARY ||
-          inst->DstReg.RelAddr)
-         continue;
-
-      use = find_next_use(prog, i+1, index, mask);
-      if (use == WRITE || use == END)
-         removeInst[i] = GL_TRUE;
-   }
-
-   rem = remove_instructions(prog, removeInst);
-
-done:
-   free(removeInst);
-   return rem != 0;
-}
-
-
-/**
- * Try to inject the destination of mov as the destination of inst and recompute
- * the swizzles operators for the sources of inst if required. Return GL_TRUE
- * of the substitution was possible, GL_FALSE otherwise
- */
-static GLboolean
-_mesa_merge_mov_into_inst(struct prog_instruction *inst,
-                          const struct prog_instruction *mov)
-{
-   /* Indirection table which associates destination and source components for
-    * the mov instruction
-    */
-   const GLuint mask = get_src_arg_mask(mov, 0, NO_MASK);
-
-   /* Some components are not written by inst. We cannot remove the mov */
-   if (mask != (inst->DstReg.WriteMask & mask))
-      return GL_FALSE;
-
-   /* Depending on the instruction, we may need to recompute the swizzles.
-    * Also, some other instructions (like TEX) are not linear. We will only
-    * consider completely active sources and destinations
-    */
-   switch (inst->Opcode) {
-
-   /* Carstesian instructions: we compute the swizzle */
-   case OPCODE_MOV:
-   case OPCODE_MIN:
-   case OPCODE_MAX:
-   case OPCODE_ABS:
-   case OPCODE_ADD:
-   case OPCODE_MAD:
-   case OPCODE_MUL:
-   case OPCODE_SUB:
-   {
-      GLuint dst_to_src_comp[4] = {0,0,0,0};
-      GLuint dst_comp, arg;
-      for (dst_comp = 0; dst_comp < 4; ++dst_comp) {
-         if (mov->DstReg.WriteMask & (1 << dst_comp)) {
-            const GLuint src_comp = GET_SWZ(mov->SrcReg[0].Swizzle, dst_comp);
-            ASSERT(src_comp < 4);
-            dst_to_src_comp[dst_comp] = src_comp;
-         }
-      }
-
-      /* Patch each source of the instruction */
-      for (arg = 0; arg < _mesa_num_inst_src_regs(inst->Opcode); arg++) {
-         const GLuint arg_swz = inst->SrcReg[arg].Swizzle;
-         inst->SrcReg[arg].Swizzle = 0;
-
-         /* Reset each active component of the swizzle */
-         for (dst_comp = 0; dst_comp < 4; ++dst_comp) {
-            GLuint src_comp, arg_comp;
-            if ((mov->DstReg.WriteMask & (1 << dst_comp)) == 0)
-               continue;
-            src_comp = dst_to_src_comp[dst_comp];
-            ASSERT(src_comp < 4);
-            arg_comp = GET_SWZ(arg_swz, src_comp);
-            ASSERT(arg_comp < 4);
-            inst->SrcReg[arg].Swizzle |= arg_comp << (3*dst_comp);
-         }
-      }
-      inst->DstReg = mov->DstReg;
-      return GL_TRUE;
-   }
-
-   /* Dot products and scalar instructions: we only change the destination */
-   case OPCODE_RCP:
-   case OPCODE_SIN:
-   case OPCODE_COS:
-   case OPCODE_RSQ:
-   case OPCODE_POW:
-   case OPCODE_EX2:
-   case OPCODE_LOG:
-   case OPCODE_DP2:
-   case OPCODE_DP3:
-   case OPCODE_DP4:
-      inst->DstReg = mov->DstReg;
-      return GL_TRUE;
-
-   /* All other instructions require fully active components with no swizzle */
-   default:
-      if (mov->SrcReg[0].Swizzle != SWIZZLE_XYZW ||
-          inst->DstReg.WriteMask != WRITEMASK_XYZW)
-         return GL_FALSE;
-      inst->DstReg = mov->DstReg;
-      return GL_TRUE;
-   }
-}
-
-
-/**
- * Try to remove extraneous MOV instructions from the given program.
- */
-static GLboolean
-_mesa_remove_extra_moves(struct gl_program *prog)
-{
-   GLboolean *removeInst; /* per-instruction removal flag */
-   GLuint i, rem = 0, nesting = 0;
-
-   if (dbg) {
-      printf("Optimize: Begin remove extra moves\n");
-      _mesa_print_program(prog);
-   }
-
-   removeInst = (GLboolean *)
-      calloc(1, prog->NumInstructions * sizeof(GLboolean));
-
-   /*
-    * Look for sequences such as this:
-    *    FOO tmpX, arg0, arg1;
-    *    MOV tmpY, tmpX;
-    * and convert into:
-    *    FOO tmpY, arg0, arg1;
-    */
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *mov = prog->Instructions + i;
-
-      switch (mov->Opcode) {
-      case OPCODE_BGNLOOP:
-      case OPCODE_BGNSUB:
-      case OPCODE_IF:
-         nesting++;
-         break;
-      case OPCODE_ENDLOOP:
-      case OPCODE_ENDSUB:
-      case OPCODE_ENDIF:
-         nesting--;
-         break;
-      case OPCODE_MOV:
-         if (i > 0 &&
-             can_downward_mov_be_modifed(mov) &&
-             mov->SrcReg[0].File == PROGRAM_TEMPORARY &&
-             nesting == 0)
-         {
-
-            /* see if this MOV can be removed */
-            const GLuint id = mov->SrcReg[0].Index;
-            struct prog_instruction *prevInst;
-            GLuint prevI;
-
-            /* get pointer to previous instruction */
-            prevI = i - 1;
-            while (prevI > 0 && removeInst[prevI])
-               prevI--;
-            prevInst = prog->Instructions + prevI;
-
-            if (prevInst->DstReg.File == PROGRAM_TEMPORARY &&
-                prevInst->DstReg.Index == id &&
-                prevInst->DstReg.RelAddr == 0 &&
-                prevInst->DstReg.CondSrc == 0 && 
-                prevInst->DstReg.CondMask == COND_TR) {
-
-               const GLuint dst_mask = prevInst->DstReg.WriteMask;
-               enum inst_use next_use = find_next_use(prog, i+1, id, dst_mask);
-
-               if (next_use == WRITE || next_use == END) {
-                  /* OK, we can safely remove this MOV instruction.
-                   * Transform:
-                   *   prevI: FOO tempIndex, x, y;
-                   *       i: MOV z, tempIndex;
-                   * Into:
-                   *   prevI: FOO z, x, y;
-                   */
-                  if (_mesa_merge_mov_into_inst(prevInst, mov)) {
-                     removeInst[i] = GL_TRUE;
-                     if (dbg) {
-                        printf("Remove MOV at %u\n", i);
-                        printf("new prev inst %u: ", prevI);
-                        _mesa_print_instruction(prevInst);
-                     }
-                  }
-               }
-            }
-         }
-         break;
-      default:
-         ; /* nothing */
-      }
-   }
-
-   /* now remove the instructions which aren't needed */
-   rem = remove_instructions(prog, removeInst);
-
-   free(removeInst);
-
-   if (dbg) {
-      printf("Optimize: End remove extra moves.  %u instructions removed\n", rem);
-      /*_mesa_print_program(prog);*/
-   }
-
-   return rem != 0;
-}
-
-
-/** A live register interval */
-struct interval
-{
-   GLuint Reg;         /** The temporary register index */
-   GLuint Start, End;  /** Start/end instruction numbers */
-};
-
-
-/** A list of register intervals */
-struct interval_list
-{
-   GLuint Num;
-   struct interval Intervals[REG_ALLOCATE_MAX_PROGRAM_TEMPS];
-};
-
-
-static void
-append_interval(struct interval_list *list, const struct interval *inv)
-{
-   list->Intervals[list->Num++] = *inv;
-}
-
-
-/** Insert interval inv into list, sorted by interval end */
-static void
-insert_interval_by_end(struct interval_list *list, const struct interval *inv)
-{
-   /* XXX we could do a binary search insertion here since list is sorted */
-   GLint i = list->Num - 1;
-   while (i >= 0 && list->Intervals[i].End > inv->End) {
-      list->Intervals[i + 1] = list->Intervals[i];
-      i--;
-   }
-   list->Intervals[i + 1] = *inv;
-   list->Num++;
-
-#ifdef DEBUG
-   {
-      GLuint i;
-      for (i = 0; i + 1 < list->Num; i++) {
-         ASSERT(list->Intervals[i].End <= list->Intervals[i + 1].End);
-      }
-   }
-#endif
-}
-
-
-/** Remove the given interval from the interval list */
-static void
-remove_interval(struct interval_list *list, const struct interval *inv)
-{
-   /* XXX we could binary search since list is sorted */
-   GLuint k;
-   for (k = 0; k < list->Num; k++) {
-      if (list->Intervals[k].Reg == inv->Reg) {
-         /* found, remove it */
-         ASSERT(list->Intervals[k].Start == inv->Start);
-         ASSERT(list->Intervals[k].End == inv->End);
-         while (k < list->Num - 1) {
-            list->Intervals[k] = list->Intervals[k + 1];
-            k++;
-         }
-         list->Num--;
-         return;
-      }
-   }
-}
-
-
-/** called by qsort() */
-static int
-compare_start(const void *a, const void *b)
-{
-   const struct interval *ia = (const struct interval *) a;
-   const struct interval *ib = (const struct interval *) b;
-   if (ia->Start < ib->Start)
-      return -1;
-   else if (ia->Start > ib->Start)
-      return +1;
-   else
-      return 0;
-}
-
-
-/** sort the interval list according to interval starts */
-static void
-sort_interval_list_by_start(struct interval_list *list)
-{
-   qsort(list->Intervals, list->Num, sizeof(struct interval), compare_start);
-#ifdef DEBUG
-   {
-      GLuint i;
-      for (i = 0; i + 1 < list->Num; i++) {
-         ASSERT(list->Intervals[i].Start <= list->Intervals[i + 1].Start);
-      }
-   }
-#endif
-}
-
-struct loop_info
-{
-   GLuint Start, End;  /**< Start, end instructions of loop */
-};
-
-/**
- * Update the intermediate interval info for register 'index' and
- * instruction 'ic'.
- */
-static void
-update_interval(GLint intBegin[], GLint intEnd[],
-		struct loop_info *loopStack, GLuint loopStackDepth,
-		GLuint index, GLuint ic)
-{
-   int i;
-   GLuint begin = ic;
-   GLuint end = ic;
-
-   /* If the register is used in a loop, extend its lifetime through the end
-    * of the outermost loop that doesn't contain its definition.
-    */
-   for (i = 0; i < loopStackDepth; i++) {
-      if (intBegin[index] < loopStack[i].Start) {
-	 end = loopStack[i].End;
-	 break;
-      }
-   }
-
-   /* Variables that are live at the end of a loop will also be live at the
-    * beginning, so an instruction inside of a loop should have its live
-    * interval begin at the start of the outermost loop.
-    */
-   if (loopStackDepth > 0 && ic > loopStack[0].Start && ic < loopStack[0].End) {
-      begin = loopStack[0].Start;
-   }
-
-   ASSERT(index < REG_ALLOCATE_MAX_PROGRAM_TEMPS);
-   if (intBegin[index] == -1) {
-      ASSERT(intEnd[index] == -1);
-      intBegin[index] = begin;
-      intEnd[index] = end;
-   }
-   else {
-      intEnd[index] = end;
-   }
-}
-
-
-/**
- * Find first/last instruction that references each temporary register.
- */
-GLboolean
-_mesa_find_temp_intervals(const struct prog_instruction *instructions,
-                          GLuint numInstructions,
-                          GLint intBegin[REG_ALLOCATE_MAX_PROGRAM_TEMPS],
-                          GLint intEnd[REG_ALLOCATE_MAX_PROGRAM_TEMPS])
-{
-   struct loop_info loopStack[MAX_LOOP_NESTING];
-   GLuint loopStackDepth = 0;
-   GLuint i;
-
-   for (i = 0; i < REG_ALLOCATE_MAX_PROGRAM_TEMPS; i++){
-      intBegin[i] = intEnd[i] = -1;
-   }
-
-   /* Scan instructions looking for temporary registers */
-   for (i = 0; i < numInstructions; i++) {
-      const struct prog_instruction *inst = instructions + i;
-      if (inst->Opcode == OPCODE_BGNLOOP) {
-         loopStack[loopStackDepth].Start = i;
-         loopStack[loopStackDepth].End = inst->BranchTarget;
-         loopStackDepth++;
-      }
-      else if (inst->Opcode == OPCODE_ENDLOOP) {
-         loopStackDepth--;
-      }
-      else if (inst->Opcode == OPCODE_CAL) {
-         return GL_FALSE;
-      }
-      else {
-         const GLuint numSrc = 3;/*_mesa_num_inst_src_regs(inst->Opcode);*/
-         GLuint j;
-         for (j = 0; j < numSrc; j++) {
-            if (inst->SrcReg[j].File == PROGRAM_TEMPORARY) {
-               const GLuint index = inst->SrcReg[j].Index;
-               if (inst->SrcReg[j].RelAddr)
-                  return GL_FALSE;
-               update_interval(intBegin, intEnd, loopStack, loopStackDepth,
-			       index, i);
-            }
-         }
-         if (inst->DstReg.File == PROGRAM_TEMPORARY) {
-            const GLuint index = inst->DstReg.Index;
-            if (inst->DstReg.RelAddr)
-               return GL_FALSE;
-            update_interval(intBegin, intEnd, loopStack, loopStackDepth,
-			    index, i);
-         }
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Find the live intervals for each temporary register in the program.
- * For register R, the interval [A,B] indicates that R is referenced
- * from instruction A through instruction B.
- * Special consideration is needed for loops and subroutines.
- * \return GL_TRUE if success, GL_FALSE if we cannot proceed for some reason
- */
-static GLboolean
-find_live_intervals(struct gl_program *prog,
-                    struct interval_list *liveIntervals)
-{
-   GLint intBegin[REG_ALLOCATE_MAX_PROGRAM_TEMPS];
-   GLint intEnd[REG_ALLOCATE_MAX_PROGRAM_TEMPS];
-   GLuint i;
-
-   /*
-    * Note: we'll return GL_FALSE below if we find relative indexing
-    * into the TEMP register file.  We can't handle that yet.
-    * We also give up on subroutines for now.
-    */
-
-   if (dbg) {
-      printf("Optimize: Begin find intervals\n");
-   }
-
-   /* build intermediate arrays */
-   if (!_mesa_find_temp_intervals(prog->Instructions, prog->NumInstructions,
-                                  intBegin, intEnd))
-      return GL_FALSE;
-
-   /* Build live intervals list from intermediate arrays */
-   liveIntervals->Num = 0;
-   for (i = 0; i < REG_ALLOCATE_MAX_PROGRAM_TEMPS; i++) {
-      if (intBegin[i] >= 0) {
-         struct interval inv;
-         inv.Reg = i;
-         inv.Start = intBegin[i];
-         inv.End = intEnd[i];
-         append_interval(liveIntervals, &inv);
-      }
-   }
-
-   /* Sort the list according to interval starts */
-   sort_interval_list_by_start(liveIntervals);
-
-   if (dbg) {
-      /* print interval info */
-      for (i = 0; i < liveIntervals->Num; i++) {
-         const struct interval *inv = liveIntervals->Intervals + i;
-         printf("Reg[%d] live [%d, %d]:",
-                      inv->Reg, inv->Start, inv->End);
-         if (1) {
-            GLuint j;
-            for (j = 0; j < inv->Start; j++)
-               printf(" ");
-            for (j = inv->Start; j <= inv->End; j++)
-               printf("x");
-         }
-         printf("\n");
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-/** Scan the array of used register flags to find free entry */
-static GLint
-alloc_register(GLboolean usedRegs[REG_ALLOCATE_MAX_PROGRAM_TEMPS])
-{
-   GLuint k;
-   for (k = 0; k < REG_ALLOCATE_MAX_PROGRAM_TEMPS; k++) {
-      if (!usedRegs[k]) {
-         usedRegs[k] = GL_TRUE;
-         return k;
-      }
-   }
-   return -1;
-}
-
-
-/**
- * This function implements "Linear Scan Register Allocation" to reduce
- * the number of temporary registers used by the program.
- *
- * We compute the "live interval" for all temporary registers then
- * examine the overlap of the intervals to allocate new registers.
- * Basically, if two intervals do not overlap, they can use the same register.
- */
-static void
-_mesa_reallocate_registers(struct gl_program *prog)
-{
-   struct interval_list liveIntervals;
-   GLint registerMap[REG_ALLOCATE_MAX_PROGRAM_TEMPS];
-   GLboolean usedRegs[REG_ALLOCATE_MAX_PROGRAM_TEMPS];
-   GLuint i;
-   GLint maxTemp = -1;
-
-   if (dbg) {
-      printf("Optimize: Begin live-interval register reallocation\n");
-      _mesa_print_program(prog);
-   }
-
-   for (i = 0; i < REG_ALLOCATE_MAX_PROGRAM_TEMPS; i++){
-      registerMap[i] = -1;
-      usedRegs[i] = GL_FALSE;
-   }
-
-   if (!find_live_intervals(prog, &liveIntervals)) {
-      if (dbg)
-         printf("Aborting register reallocation\n");
-      return;
-   }
-
-   {
-      struct interval_list activeIntervals;
-      activeIntervals.Num = 0;
-
-      /* loop over live intervals, allocating a new register for each */
-      for (i = 0; i < liveIntervals.Num; i++) {
-         const struct interval *live = liveIntervals.Intervals + i;
-
-         if (dbg)
-            printf("Consider register %u\n", live->Reg);
-
-         /* Expire old intervals.  Intervals which have ended with respect
-          * to the live interval can have their remapped registers freed.
-          */
-         {
-            GLint j;
-            for (j = 0; j < (GLint) activeIntervals.Num; j++) {
-               const struct interval *inv = activeIntervals.Intervals + j;
-               if (inv->End >= live->Start) {
-                  /* Stop now.  Since the activeInterval list is sorted
-                   * we know we don't have to go further.
-                   */
-                  break;
-               }
-               else {
-                  /* Interval 'inv' has expired */
-                  const GLint regNew = registerMap[inv->Reg];
-                  ASSERT(regNew >= 0);
-
-                  if (dbg)
-                     printf("  expire interval for reg %u\n", inv->Reg);
-
-                  /* remove interval j from active list */
-                  remove_interval(&activeIntervals, inv);
-                  j--;  /* counter-act j++ in for-loop above */
-
-                  /* return register regNew to the free pool */
-                  if (dbg)
-                     printf("  free reg %d\n", regNew);
-                  ASSERT(usedRegs[regNew] == GL_TRUE);
-                  usedRegs[regNew] = GL_FALSE;
-               }
-            }
-         }
-
-         /* find a free register for this live interval */
-         {
-            const GLint k = alloc_register(usedRegs);
-            if (k < 0) {
-               /* out of registers, give up */
-               return;
-            }
-            registerMap[live->Reg] = k;
-            maxTemp = MAX2(maxTemp, k);
-            if (dbg)
-               printf("  remap register %u -> %d\n", live->Reg, k);
-         }
-
-         /* Insert this live interval into the active list which is sorted
-          * by increasing end points.
-          */
-         insert_interval_by_end(&activeIntervals, live);
-      }
-   }
-
-   if (maxTemp + 1 < (GLint) liveIntervals.Num) {
-      /* OK, we've reduced the number of registers needed.
-       * Scan the program and replace all the old temporary register
-       * indexes with the new indexes.
-       */
-      replace_regs(prog, PROGRAM_TEMPORARY, registerMap);
-
-      prog->NumTemporaries = maxTemp + 1;
-   }
-
-   if (dbg) {
-      printf("Optimize: End live-interval register reallocation\n");
-      printf("Num temp regs before: %u  after: %u\n",
-                   liveIntervals.Num, maxTemp + 1);
-      _mesa_print_program(prog);
-   }
-}
-
-
-#if 0
-static void
-print_it(struct gl_context *ctx, struct gl_program *program, const char *txt) {
-   fprintf(stderr, "%s (%u inst):\n", txt, program->NumInstructions);
-   _mesa_print_program(program);
-   _mesa_print_program_parameters(ctx, program);
-   fprintf(stderr, "\n\n");
-}
-#endif
-
-
-/**
- * Apply optimizations to the given program to eliminate unnecessary
- * instructions, temp regs, etc.
- */
-void
-_mesa_optimize_program(struct gl_context *ctx, struct gl_program *program)
-{
-   GLboolean any_change;
-
-   /* Stop when no modifications were output */
-   do {
-      any_change = GL_FALSE;
-      _mesa_remove_extra_move_use(program);
-      if (_mesa_remove_dead_code_global(program))
-         any_change = GL_TRUE;
-      if (_mesa_remove_extra_moves(program))
-         any_change = GL_TRUE;
-      if (_mesa_remove_dead_code_local(program))
-         any_change = GL_TRUE;
-      _mesa_reallocate_registers(program);
-   } while (any_change);
-}
-
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

+ *

+ * 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

+ * VMWARE 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.

+ */

+

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/macros.h"

+#include "program.h"

+#include "prog_instruction.h"

+#include "prog_optimize.h"

+#include "prog_print.h"

+

+

+#define MAX_LOOP_NESTING 50

+/* MAX_PROGRAM_TEMPS is a low number (256), and we want to be able to

+ * register allocate many temporary values into that small number of

+ * temps.  So allow large temporary indices coming into the register

+ * allocator.

+ */

+#define REG_ALLOCATE_MAX_PROGRAM_TEMPS	((1 << INST_INDEX_BITS) - 1)

+

+static GLboolean dbg = GL_FALSE;

+

+#define NO_MASK 0xf

+

+/**

+ * Returns the mask of channels (bitmask of WRITEMASK_X,Y,Z,W) which

+ * are read from the given src in this instruction, We also provide

+ * one optional masks which may mask other components in the dst

+ * register

+ */

+static GLuint

+get_src_arg_mask(const struct prog_instruction *inst,

+                 GLuint arg, GLuint dst_mask)

+{

+   GLuint read_mask, channel_mask;

+   GLuint comp;

+

+   ASSERT(arg < _mesa_num_inst_src_regs(inst->Opcode));

+

+   /* Form the dst register, find the written channels */

+   if (inst->CondUpdate) {

+      channel_mask = WRITEMASK_XYZW;

+   }

+   else {

+      switch (inst->Opcode) {

+      case OPCODE_MOV:

+      case OPCODE_MIN:

+      case OPCODE_MAX:

+      case OPCODE_ABS:

+      case OPCODE_ADD:

+      case OPCODE_MAD:

+      case OPCODE_MUL:

+      case OPCODE_SUB:

+         channel_mask = inst->DstReg.WriteMask & dst_mask;

+         break;

+      case OPCODE_RCP:

+      case OPCODE_SIN:

+      case OPCODE_COS:

+      case OPCODE_RSQ:

+      case OPCODE_POW:

+      case OPCODE_EX2:

+      case OPCODE_LOG:

+         channel_mask = WRITEMASK_X;

+         break;

+      case OPCODE_DP2:

+         channel_mask = WRITEMASK_XY;

+         break;

+      case OPCODE_DP3:

+      case OPCODE_XPD:

+         channel_mask = WRITEMASK_XYZ;

+         break;

+      default:

+         channel_mask = WRITEMASK_XYZW;

+         break;

+      }

+   }

+

+   /* Now, given the src swizzle and the written channels, find which

+    * components are actually read

+    */

+   read_mask = 0x0;

+   for (comp = 0; comp < 4; ++comp) {

+      const GLuint coord = GET_SWZ(inst->SrcReg[arg].Swizzle, comp);

+      ASSERT(coord < 4);

+      if (channel_mask & (1 << comp) && coord <= SWIZZLE_W)

+         read_mask |= 1 << coord;

+   }

+

+   return read_mask;

+}

+

+

+/**

+ * For a MOV instruction, compute a write mask when src register also has

+ * a mask

+ */

+static GLuint

+get_dst_mask_for_mov(const struct prog_instruction *mov, GLuint src_mask)

+{

+   const GLuint mask = mov->DstReg.WriteMask;

+   GLuint comp;

+   GLuint updated_mask = 0x0;

+

+   ASSERT(mov->Opcode == OPCODE_MOV);

+

+   for (comp = 0; comp < 4; ++comp) {

+      GLuint src_comp;

+      if ((mask & (1 << comp)) == 0)

+         continue;

+      src_comp = GET_SWZ(mov->SrcReg[0].Swizzle, comp);

+      if ((src_mask & (1 << src_comp)) == 0)

+         continue;

+      updated_mask |= 1 << comp;

+   }

+

+   return updated_mask;

+}

+

+

+/**

+ * Ensure that the swizzle is regular.  That is, all of the swizzle

+ * terms are SWIZZLE_X,Y,Z,W and not SWIZZLE_ZERO or SWIZZLE_ONE.

+ */

+static GLboolean

+is_swizzle_regular(GLuint swz)

+{

+   return GET_SWZ(swz,0) <= SWIZZLE_W &&

+          GET_SWZ(swz,1) <= SWIZZLE_W &&

+          GET_SWZ(swz,2) <= SWIZZLE_W &&

+          GET_SWZ(swz,3) <= SWIZZLE_W;

+}

+

+

+/**

+ * In 'prog' remove instruction[i] if removeFlags[i] == TRUE.

+ * \return number of instructions removed

+ */

+static GLuint

+remove_instructions(struct gl_program *prog, const GLboolean *removeFlags)

+{

+   GLint i, removeEnd = 0, removeCount = 0;

+   GLuint totalRemoved = 0;

+

+   /* go backward */

+   for (i = prog->NumInstructions - 1; i >= 0; i--) {

+      if (removeFlags[i]) {

+         totalRemoved++;

+         if (removeCount == 0) {

+            /* begin a run of instructions to remove */

+            removeEnd = i;

+            removeCount = 1;

+         }

+         else {

+            /* extend the run of instructions to remove */

+            removeCount++;

+         }

+      }

+      else {

+         /* don't remove this instruction, but check if the preceeding

+          * instructions are to be removed.

+          */

+         if (removeCount > 0) {

+            GLint removeStart = removeEnd - removeCount + 1;

+            _mesa_delete_instructions(prog, removeStart, removeCount);

+            removeStart = removeCount = 0; /* reset removal info */

+         }

+      }

+   }

+   /* Finish removing if the first instruction was to be removed. */

+   if (removeCount > 0) {

+      GLint removeStart = removeEnd - removeCount + 1;

+      _mesa_delete_instructions(prog, removeStart, removeCount);

+   }

+   return totalRemoved;

+}

+

+

+/**

+ * Remap register indexes according to map.

+ * \param prog  the program to search/replace

+ * \param file  the type of register file to search/replace

+ * \param map  maps old register indexes to new indexes

+ */

+static void

+replace_regs(struct gl_program *prog, gl_register_file file, const GLint map[])

+{

+   GLuint i;

+

+   for (i = 0; i < prog->NumInstructions; i++) {

+      struct prog_instruction *inst = prog->Instructions + i;

+      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);

+      GLuint j;

+      for (j = 0; j < numSrc; j++) {

+         if (inst->SrcReg[j].File == file) {

+            GLuint index = inst->SrcReg[j].Index;

+            ASSERT(map[index] >= 0);

+            inst->SrcReg[j].Index = map[index];

+         }

+      }

+      if (inst->DstReg.File == file) {

+         const GLuint index = inst->DstReg.Index;

+         ASSERT(map[index] >= 0);

+         inst->DstReg.Index = map[index];

+      }

+   }

+}

+

+

+/**

+ * Remove dead instructions from the given program.

+ * This is very primitive for now.  Basically look for temp registers

+ * that are written to but never read.  Remove any instructions that

+ * write to such registers.  Be careful with condition code setters.

+ */

+static GLboolean

+_mesa_remove_dead_code_global(struct gl_program *prog)

+{

+   GLboolean tempRead[REG_ALLOCATE_MAX_PROGRAM_TEMPS][4];

+   GLboolean *removeInst; /* per-instruction removal flag */

+   GLuint i, rem = 0, comp;

+

+   memset(tempRead, 0, sizeof(tempRead));

+

+   if (dbg) {

+      printf("Optimize: Begin dead code removal\n");

+      /*_mesa_print_program(prog);*/

+   }

+

+   removeInst = (GLboolean *)

+      calloc(1, prog->NumInstructions * sizeof(GLboolean));

+

+   /* Determine which temps are read and written */

+   for (i = 0; i < prog->NumInstructions; i++) {

+      const struct prog_instruction *inst = prog->Instructions + i;

+      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);

+      GLuint j;

+

+      /* check src regs */

+      for (j = 0; j < numSrc; j++) {

+         if (inst->SrcReg[j].File == PROGRAM_TEMPORARY) {

+            const GLuint index = inst->SrcReg[j].Index;

+            GLuint read_mask;

+            ASSERT(index < REG_ALLOCATE_MAX_PROGRAM_TEMPS);

+	    read_mask = get_src_arg_mask(inst, j, NO_MASK);

+

+            if (inst->SrcReg[j].RelAddr) {

+               if (dbg)

+                  printf("abort remove dead code (indirect temp)\n");

+               goto done;

+            }

+

+	    for (comp = 0; comp < 4; comp++) {

+	       const GLuint swz = GET_SWZ(inst->SrcReg[j].Swizzle, comp);

+	       ASSERT(swz < 4);

+               if ((read_mask & (1 << swz)) == 0)

+		  continue;

+               if (swz <= SWIZZLE_W)

+                  tempRead[index][swz] = GL_TRUE;

+	    }

+         }

+      }

+

+      /* check dst reg */

+      if (inst->DstReg.File == PROGRAM_TEMPORARY) {

+         const GLuint index = inst->DstReg.Index;

+         ASSERT(index < REG_ALLOCATE_MAX_PROGRAM_TEMPS);

+

+         if (inst->DstReg.RelAddr) {

+            if (dbg)

+               printf("abort remove dead code (indirect temp)\n");

+            goto done;

+         }

+

+         if (inst->CondUpdate) {

+            /* If we're writing to this register and setting condition

+             * codes we cannot remove the instruction.  Prevent removal

+             * by setting the 'read' flag.

+             */

+            tempRead[index][0] = GL_TRUE;

+            tempRead[index][1] = GL_TRUE;

+            tempRead[index][2] = GL_TRUE;

+            tempRead[index][3] = GL_TRUE;

+         }

+      }

+   }

+

+   /* find instructions that write to dead registers, flag for removal */

+   for (i = 0; i < prog->NumInstructions; i++) {

+      struct prog_instruction *inst = prog->Instructions + i;

+      const GLuint numDst = _mesa_num_inst_dst_regs(inst->Opcode);

+

+      if (numDst != 0 && inst->DstReg.File == PROGRAM_TEMPORARY) {

+         GLint chan, index = inst->DstReg.Index;

+

+	 for (chan = 0; chan < 4; chan++) {

+	    if (!tempRead[index][chan] &&

+		inst->DstReg.WriteMask & (1 << chan)) {

+	       if (dbg) {

+		  printf("Remove writemask on %u.%c\n", i,

+			       chan == 3 ? 'w' : 'x' + chan);

+	       }

+	       inst->DstReg.WriteMask &= ~(1 << chan);

+	       rem++;

+	    }

+	 }

+

+	 if (inst->DstReg.WriteMask == 0) {

+	    /* If we cleared all writes, the instruction can be removed. */

+	    if (dbg)

+	       printf("Remove instruction %u: \n", i);

+	    removeInst[i] = GL_TRUE;

+	 }

+      }

+   }

+

+   /* now remove the instructions which aren't needed */

+   rem = remove_instructions(prog, removeInst);

+

+   if (dbg) {

+      printf("Optimize: End dead code removal.\n");

+      printf("  %u channel writes removed\n", rem);

+      printf("  %u instructions removed\n", rem);

+      /*_mesa_print_program(prog);*/

+   }

+

+done:

+   free(removeInst);

+   return rem != 0;

+}

+

+

+enum inst_use

+{

+   READ,

+   WRITE,

+   FLOW,

+   END

+};

+

+

+/**

+ * Scan forward in program from 'start' for the next occurances of TEMP[index].

+ * We look if an instruction reads the component given by the masks and if they

+ * are overwritten.

+ * Return READ, WRITE, FLOW or END to indicate the next usage or an indicator

+ * that we can't look further.

+ */

+static enum inst_use

+find_next_use(const struct gl_program *prog,

+              GLuint start,

+              GLuint index,

+              GLuint mask)

+{

+   GLuint i;

+

+   for (i = start; i < prog->NumInstructions; i++) {

+      const struct prog_instruction *inst = prog->Instructions + i;

+      switch (inst->Opcode) {

+      case OPCODE_BGNLOOP:

+      case OPCODE_BGNSUB:

+      case OPCODE_BRA:

+      case OPCODE_CAL:

+      case OPCODE_CONT:

+      case OPCODE_IF:

+      case OPCODE_ELSE:

+      case OPCODE_ENDIF:

+      case OPCODE_ENDLOOP:

+      case OPCODE_ENDSUB:

+      case OPCODE_RET:

+         return FLOW;

+      case OPCODE_END:

+         return END;

+      default:

+         {

+            const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);

+            GLuint j;

+            for (j = 0; j < numSrc; j++) {

+               if (inst->SrcReg[j].RelAddr ||

+                   (inst->SrcReg[j].File == PROGRAM_TEMPORARY &&

+                   inst->SrcReg[j].Index == index &&

+                   (get_src_arg_mask(inst,j,NO_MASK) & mask)))

+                  return READ;

+            }

+            if (_mesa_num_inst_dst_regs(inst->Opcode) == 1 &&

+                inst->DstReg.File == PROGRAM_TEMPORARY &&

+                inst->DstReg.Index == index) {

+               mask &= ~inst->DstReg.WriteMask;

+               if (mask == 0)

+                  return WRITE;

+            }

+         }

+      }

+   }

+   return END;

+}

+

+

+/**

+ * Is the given instruction opcode a flow-control opcode?

+ * XXX maybe move this into prog_instruction.[ch]

+ */

+static GLboolean

+_mesa_is_flow_control_opcode(enum prog_opcode opcode)

+{

+   switch (opcode) {

+   case OPCODE_BGNLOOP:

+   case OPCODE_BGNSUB:

+   case OPCODE_BRA:

+   case OPCODE_CAL:

+   case OPCODE_CONT:

+   case OPCODE_IF:

+   case OPCODE_ELSE:

+   case OPCODE_END:

+   case OPCODE_ENDIF:

+   case OPCODE_ENDLOOP:

+   case OPCODE_ENDSUB:

+   case OPCODE_RET:

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if the given instruction is a simple MOV (no conditional updating,

+ * not relative addressing, no negation/abs, etc).

+ */

+static GLboolean

+can_downward_mov_be_modifed(const struct prog_instruction *mov)

+{

+   return

+      mov->Opcode == OPCODE_MOV &&

+      mov->CondUpdate == GL_FALSE &&

+      mov->SrcReg[0].RelAddr == 0 &&

+      mov->SrcReg[0].Negate == 0 &&

+      mov->SrcReg[0].Abs == 0 &&

+      mov->SrcReg[0].HasIndex2 == 0 &&

+      mov->SrcReg[0].RelAddr2 == 0 &&

+      mov->DstReg.RelAddr == 0 &&

+      mov->DstReg.CondMask == COND_TR &&

+      mov->SaturateMode == SATURATE_OFF;

+}

+

+

+static GLboolean

+can_upward_mov_be_modifed(const struct prog_instruction *mov)

+{

+   return

+      can_downward_mov_be_modifed(mov) &&

+      mov->DstReg.File == PROGRAM_TEMPORARY;

+}

+

+

+/**

+ * Try to remove use of extraneous MOV instructions, to free them up for dead

+ * code removal.

+ */

+static void

+_mesa_remove_extra_move_use(struct gl_program *prog)

+{

+   GLuint i, j;

+

+   if (dbg) {

+      printf("Optimize: Begin remove extra move use\n");

+      _mesa_print_program(prog);

+   }

+

+   /*

+    * Look for sequences such as this:

+    *    MOV tmpX, arg0;

+    *    ...

+    *    FOO tmpY, tmpX, arg1;

+    * and convert into:

+    *    MOV tmpX, arg0;

+    *    ...

+    *    FOO tmpY, arg0, arg1;

+    */

+

+   for (i = 0; i + 1 < prog->NumInstructions; i++) {

+      const struct prog_instruction *mov = prog->Instructions + i;

+      GLuint dst_mask, src_mask;

+      if (can_upward_mov_be_modifed(mov) == GL_FALSE)

+         continue;

+

+      /* Scanning the code, we maintain the components which are still active in

+       * these two masks

+       */

+      dst_mask = mov->DstReg.WriteMask;

+      src_mask = get_src_arg_mask(mov, 0, NO_MASK);

+

+      /* Walk through remaining instructions until the or src reg gets

+       * rewritten or we get into some flow-control, eliminating the use of

+       * this MOV.

+       */

+      for (j = i + 1; j < prog->NumInstructions; j++) {

+	 struct prog_instruction *inst2 = prog->Instructions + j;

+         GLuint arg;

+

+	 if (_mesa_is_flow_control_opcode(inst2->Opcode))

+	     break;

+

+	 /* First rewrite this instruction's args if appropriate. */

+	 for (arg = 0; arg < _mesa_num_inst_src_regs(inst2->Opcode); arg++) {

+	    GLuint comp, read_mask;

+

+	    if (inst2->SrcReg[arg].File != mov->DstReg.File ||

+		inst2->SrcReg[arg].Index != mov->DstReg.Index ||

+		inst2->SrcReg[arg].RelAddr ||

+		inst2->SrcReg[arg].Abs)

+	       continue;

+            read_mask = get_src_arg_mask(inst2, arg, NO_MASK);

+

+	    /* Adjust the swizzles of inst2 to point at MOV's source if ALL the

+             * components read still come from the mov instructions

+             */

+            if (is_swizzle_regular(inst2->SrcReg[arg].Swizzle) &&

+               (read_mask & dst_mask) == read_mask) {

+               for (comp = 0; comp < 4; comp++) {

+                  const GLuint inst2_swz =

+                     GET_SWZ(inst2->SrcReg[arg].Swizzle, comp);

+                  const GLuint s = GET_SWZ(mov->SrcReg[0].Swizzle, inst2_swz);

+                  inst2->SrcReg[arg].Swizzle &= ~(7 << (3 * comp));

+                  inst2->SrcReg[arg].Swizzle |= s << (3 * comp);

+                  inst2->SrcReg[arg].Negate ^= (((mov->SrcReg[0].Negate >>

+                                                  inst2_swz) & 0x1) << comp);

+               }

+               inst2->SrcReg[arg].File = mov->SrcReg[0].File;

+               inst2->SrcReg[arg].Index = mov->SrcReg[0].Index;

+            }

+	 }

+

+	 /* The source of MOV is written. This potentially deactivates some

+          * components from the src and dst of the MOV instruction

+          */

+	 if (inst2->DstReg.File == mov->DstReg.File &&

+	     (inst2->DstReg.RelAddr ||

+	      inst2->DstReg.Index == mov->DstReg.Index)) {

+            dst_mask &= ~inst2->DstReg.WriteMask;

+            src_mask = get_src_arg_mask(mov, 0, dst_mask);

+         }

+

+         /* Idem when the destination of mov is written */

+	 if (inst2->DstReg.File == mov->SrcReg[0].File &&

+	     (inst2->DstReg.RelAddr ||

+	      inst2->DstReg.Index == mov->SrcReg[0].Index)) {

+            src_mask &= ~inst2->DstReg.WriteMask;

+            dst_mask &= get_dst_mask_for_mov(mov, src_mask);

+         }

+         if (dst_mask == 0)

+            break;

+      }

+   }

+

+   if (dbg) {

+      printf("Optimize: End remove extra move use.\n");

+      /*_mesa_print_program(prog);*/

+   }

+}

+

+

+/**

+ * Complements dead_code_global. Try to remove code in block of code by

+ * carefully monitoring the swizzles. Both functions should be merged into one

+ * with a proper control flow graph

+ */

+static GLboolean

+_mesa_remove_dead_code_local(struct gl_program *prog)

+{

+   GLboolean *removeInst;

+   GLuint i, arg, rem = 0;

+

+   removeInst = (GLboolean *)

+      calloc(1, prog->NumInstructions * sizeof(GLboolean));

+

+   for (i = 0; i < prog->NumInstructions; i++) {

+      const struct prog_instruction *inst = prog->Instructions + i;

+      const GLuint index = inst->DstReg.Index;

+      const GLuint mask = inst->DstReg.WriteMask;

+      enum inst_use use;

+

+      /* We must deactivate the pass as soon as some indirection is used */

+      if (inst->DstReg.RelAddr)

+         goto done;

+      for (arg = 0; arg < _mesa_num_inst_src_regs(inst->Opcode); arg++)

+         if (inst->SrcReg[arg].RelAddr)

+            goto done;

+

+      if (_mesa_is_flow_control_opcode(inst->Opcode) ||

+          _mesa_num_inst_dst_regs(inst->Opcode) == 0 ||

+          inst->DstReg.File != PROGRAM_TEMPORARY ||

+          inst->DstReg.RelAddr)

+         continue;

+

+      use = find_next_use(prog, i+1, index, mask);

+      if (use == WRITE || use == END)

+         removeInst[i] = GL_TRUE;

+   }

+

+   rem = remove_instructions(prog, removeInst);

+

+done:

+   free(removeInst);

+   return rem != 0;

+}

+

+

+/**

+ * Try to inject the destination of mov as the destination of inst and recompute

+ * the swizzles operators for the sources of inst if required. Return GL_TRUE

+ * of the substitution was possible, GL_FALSE otherwise

+ */

+static GLboolean

+_mesa_merge_mov_into_inst(struct prog_instruction *inst,

+                          const struct prog_instruction *mov)

+{

+   /* Indirection table which associates destination and source components for

+    * the mov instruction

+    */

+   const GLuint mask = get_src_arg_mask(mov, 0, NO_MASK);

+

+   /* Some components are not written by inst. We cannot remove the mov */

+   if (mask != (inst->DstReg.WriteMask & mask))

+      return GL_FALSE;

+

+   /* Depending on the instruction, we may need to recompute the swizzles.

+    * Also, some other instructions (like TEX) are not linear. We will only

+    * consider completely active sources and destinations

+    */

+   switch (inst->Opcode) {

+

+   /* Carstesian instructions: we compute the swizzle */

+   case OPCODE_MOV:

+   case OPCODE_MIN:

+   case OPCODE_MAX:

+   case OPCODE_ABS:

+   case OPCODE_ADD:

+   case OPCODE_MAD:

+   case OPCODE_MUL:

+   case OPCODE_SUB:

+   {

+      GLuint dst_to_src_comp[4] = {0,0,0,0};

+      GLuint dst_comp, arg;

+      for (dst_comp = 0; dst_comp < 4; ++dst_comp) {

+         if (mov->DstReg.WriteMask & (1 << dst_comp)) {

+            const GLuint src_comp = GET_SWZ(mov->SrcReg[0].Swizzle, dst_comp);

+            ASSERT(src_comp < 4);

+            dst_to_src_comp[dst_comp] = src_comp;

+         }

+      }

+

+      /* Patch each source of the instruction */

+      for (arg = 0; arg < _mesa_num_inst_src_regs(inst->Opcode); arg++) {

+         const GLuint arg_swz = inst->SrcReg[arg].Swizzle;

+         inst->SrcReg[arg].Swizzle = 0;

+

+         /* Reset each active component of the swizzle */

+         for (dst_comp = 0; dst_comp < 4; ++dst_comp) {

+            GLuint src_comp, arg_comp;

+            if ((mov->DstReg.WriteMask & (1 << dst_comp)) == 0)

+               continue;

+            src_comp = dst_to_src_comp[dst_comp];

+            ASSERT(src_comp < 4);

+            arg_comp = GET_SWZ(arg_swz, src_comp);

+            ASSERT(arg_comp < 4);

+            inst->SrcReg[arg].Swizzle |= arg_comp << (3*dst_comp);

+         }

+      }

+      inst->DstReg = mov->DstReg;

+      return GL_TRUE;

+   }

+

+   /* Dot products and scalar instructions: we only change the destination */

+   case OPCODE_RCP:

+   case OPCODE_SIN:

+   case OPCODE_COS:

+   case OPCODE_RSQ:

+   case OPCODE_POW:

+   case OPCODE_EX2:

+   case OPCODE_LOG:

+   case OPCODE_DP2:

+   case OPCODE_DP3:

+   case OPCODE_DP4:

+      inst->DstReg = mov->DstReg;

+      return GL_TRUE;

+

+   /* All other instructions require fully active components with no swizzle */

+   default:

+      if (mov->SrcReg[0].Swizzle != SWIZZLE_XYZW ||

+          inst->DstReg.WriteMask != WRITEMASK_XYZW)

+         return GL_FALSE;

+      inst->DstReg = mov->DstReg;

+      return GL_TRUE;

+   }

+}

+

+

+/**

+ * Try to remove extraneous MOV instructions from the given program.

+ */

+static GLboolean

+_mesa_remove_extra_moves(struct gl_program *prog)

+{

+   GLboolean *removeInst; /* per-instruction removal flag */

+   GLuint i, rem = 0, nesting = 0;

+

+   if (dbg) {

+      printf("Optimize: Begin remove extra moves\n");

+      _mesa_print_program(prog);

+   }

+

+   removeInst = (GLboolean *)

+      calloc(1, prog->NumInstructions * sizeof(GLboolean));

+

+   /*

+    * Look for sequences such as this:

+    *    FOO tmpX, arg0, arg1;

+    *    MOV tmpY, tmpX;

+    * and convert into:

+    *    FOO tmpY, arg0, arg1;

+    */

+

+   for (i = 0; i < prog->NumInstructions; i++) {

+      const struct prog_instruction *mov = prog->Instructions + i;

+

+      switch (mov->Opcode) {

+      case OPCODE_BGNLOOP:

+      case OPCODE_BGNSUB:

+      case OPCODE_IF:

+         nesting++;

+         break;

+      case OPCODE_ENDLOOP:

+      case OPCODE_ENDSUB:

+      case OPCODE_ENDIF:

+         nesting--;

+         break;

+      case OPCODE_MOV:

+         if (i > 0 &&

+             can_downward_mov_be_modifed(mov) &&

+             mov->SrcReg[0].File == PROGRAM_TEMPORARY &&

+             nesting == 0)

+         {

+

+            /* see if this MOV can be removed */

+            const GLuint id = mov->SrcReg[0].Index;

+            struct prog_instruction *prevInst;

+            GLuint prevI;

+

+            /* get pointer to previous instruction */

+            prevI = i - 1;

+            while (prevI > 0 && removeInst[prevI])

+               prevI--;

+            prevInst = prog->Instructions + prevI;

+

+            if (prevInst->DstReg.File == PROGRAM_TEMPORARY &&

+                prevInst->DstReg.Index == id &&

+                prevInst->DstReg.RelAddr == 0 &&

+                prevInst->DstReg.CondSrc == 0 && 

+                prevInst->DstReg.CondMask == COND_TR) {

+

+               const GLuint dst_mask = prevInst->DstReg.WriteMask;

+               enum inst_use next_use = find_next_use(prog, i+1, id, dst_mask);

+

+               if (next_use == WRITE || next_use == END) {

+                  /* OK, we can safely remove this MOV instruction.

+                   * Transform:

+                   *   prevI: FOO tempIndex, x, y;

+                   *       i: MOV z, tempIndex;

+                   * Into:

+                   *   prevI: FOO z, x, y;

+                   */

+                  if (_mesa_merge_mov_into_inst(prevInst, mov)) {

+                     removeInst[i] = GL_TRUE;

+                     if (dbg) {

+                        printf("Remove MOV at %u\n", i);

+                        printf("new prev inst %u: ", prevI);

+                        _mesa_print_instruction(prevInst);

+                     }

+                  }

+               }

+            }

+         }

+         break;

+      default:

+         ; /* nothing */

+      }

+   }

+

+   /* now remove the instructions which aren't needed */

+   rem = remove_instructions(prog, removeInst);

+

+   free(removeInst);

+

+   if (dbg) {

+      printf("Optimize: End remove extra moves.  %u instructions removed\n", rem);

+      /*_mesa_print_program(prog);*/

+   }

+

+   return rem != 0;

+}

+

+

+/** A live register interval */

+struct interval

+{

+   GLuint Reg;         /** The temporary register index */

+   GLuint Start, End;  /** Start/end instruction numbers */

+};

+

+

+/** A list of register intervals */

+struct interval_list

+{

+   GLuint Num;

+   struct interval Intervals[REG_ALLOCATE_MAX_PROGRAM_TEMPS];

+};

+

+

+static void

+append_interval(struct interval_list *list, const struct interval *inv)

+{

+   list->Intervals[list->Num++] = *inv;

+}

+

+

+/** Insert interval inv into list, sorted by interval end */

+static void

+insert_interval_by_end(struct interval_list *list, const struct interval *inv)

+{

+   /* XXX we could do a binary search insertion here since list is sorted */

+   GLint i = list->Num - 1;

+   while (i >= 0 && list->Intervals[i].End > inv->End) {

+      list->Intervals[i + 1] = list->Intervals[i];

+      i--;

+   }

+   list->Intervals[i + 1] = *inv;

+   list->Num++;

+

+#ifdef DEBUG

+   {

+      GLuint i;

+      for (i = 0; i + 1 < list->Num; i++) {

+         ASSERT(list->Intervals[i].End <= list->Intervals[i + 1].End);

+      }

+   }

+#endif

+}

+

+

+/** Remove the given interval from the interval list */

+static void

+remove_interval(struct interval_list *list, const struct interval *inv)

+{

+   /* XXX we could binary search since list is sorted */

+   GLuint k;

+   for (k = 0; k < list->Num; k++) {

+      if (list->Intervals[k].Reg == inv->Reg) {

+         /* found, remove it */

+         ASSERT(list->Intervals[k].Start == inv->Start);

+         ASSERT(list->Intervals[k].End == inv->End);

+         while (k < list->Num - 1) {

+            list->Intervals[k] = list->Intervals[k + 1];

+            k++;

+         }

+         list->Num--;

+         return;

+      }

+   }

+}

+

+

+/** called by qsort() */

+static int

+compare_start(const void *a, const void *b)

+{

+   const struct interval *ia = (const struct interval *) a;

+   const struct interval *ib = (const struct interval *) b;

+   if (ia->Start < ib->Start)

+      return -1;

+   else if (ia->Start > ib->Start)

+      return +1;

+   else

+      return 0;

+}

+

+

+/** sort the interval list according to interval starts */

+static void

+sort_interval_list_by_start(struct interval_list *list)

+{

+   qsort(list->Intervals, list->Num, sizeof(struct interval), compare_start);

+#ifdef DEBUG

+   {

+      GLuint i;

+      for (i = 0; i + 1 < list->Num; i++) {

+         ASSERT(list->Intervals[i].Start <= list->Intervals[i + 1].Start);

+      }

+   }

+#endif

+}

+

+struct loop_info

+{

+   GLuint Start, End;  /**< Start, end instructions of loop */

+};

+

+/**

+ * Update the intermediate interval info for register 'index' and

+ * instruction 'ic'.

+ */

+static void

+update_interval(GLint intBegin[], GLint intEnd[],

+		struct loop_info *loopStack, GLuint loopStackDepth,

+		GLuint index, GLuint ic)

+{

+   int i;

+   GLuint begin = ic;

+   GLuint end = ic;

+

+   /* If the register is used in a loop, extend its lifetime through the end

+    * of the outermost loop that doesn't contain its definition.

+    */

+   for (i = 0; i < loopStackDepth; i++) {

+      if (intBegin[index] < loopStack[i].Start) {

+	 end = loopStack[i].End;

+	 break;

+      }

+   }

+

+   /* Variables that are live at the end of a loop will also be live at the

+    * beginning, so an instruction inside of a loop should have its live

+    * interval begin at the start of the outermost loop.

+    */

+   if (loopStackDepth > 0 && ic > loopStack[0].Start && ic < loopStack[0].End) {

+      begin = loopStack[0].Start;

+   }

+

+   ASSERT(index < REG_ALLOCATE_MAX_PROGRAM_TEMPS);

+   if (intBegin[index] == -1) {

+      ASSERT(intEnd[index] == -1);

+      intBegin[index] = begin;

+      intEnd[index] = end;

+   }

+   else {

+      intEnd[index] = end;

+   }

+}

+

+

+/**

+ * Find first/last instruction that references each temporary register.

+ */

+GLboolean

+_mesa_find_temp_intervals(const struct prog_instruction *instructions,

+                          GLuint numInstructions,

+                          GLint intBegin[REG_ALLOCATE_MAX_PROGRAM_TEMPS],

+                          GLint intEnd[REG_ALLOCATE_MAX_PROGRAM_TEMPS])

+{

+   struct loop_info loopStack[MAX_LOOP_NESTING];

+   GLuint loopStackDepth = 0;

+   GLuint i;

+

+   for (i = 0; i < REG_ALLOCATE_MAX_PROGRAM_TEMPS; i++){

+      intBegin[i] = intEnd[i] = -1;

+   }

+

+   /* Scan instructions looking for temporary registers */

+   for (i = 0; i < numInstructions; i++) {

+      const struct prog_instruction *inst = instructions + i;

+      if (inst->Opcode == OPCODE_BGNLOOP) {

+         loopStack[loopStackDepth].Start = i;

+         loopStack[loopStackDepth].End = inst->BranchTarget;

+         loopStackDepth++;

+      }

+      else if (inst->Opcode == OPCODE_ENDLOOP) {

+         loopStackDepth--;

+      }

+      else if (inst->Opcode == OPCODE_CAL) {

+         return GL_FALSE;

+      }

+      else {

+         const GLuint numSrc = 3;/*_mesa_num_inst_src_regs(inst->Opcode);*/

+         GLuint j;

+         for (j = 0; j < numSrc; j++) {

+            if (inst->SrcReg[j].File == PROGRAM_TEMPORARY) {

+               const GLuint index = inst->SrcReg[j].Index;

+               if (inst->SrcReg[j].RelAddr)

+                  return GL_FALSE;

+               update_interval(intBegin, intEnd, loopStack, loopStackDepth,

+			       index, i);

+            }

+         }

+         if (inst->DstReg.File == PROGRAM_TEMPORARY) {

+            const GLuint index = inst->DstReg.Index;

+            if (inst->DstReg.RelAddr)

+               return GL_FALSE;

+            update_interval(intBegin, intEnd, loopStack, loopStackDepth,

+			    index, i);

+         }

+      }

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Find the live intervals for each temporary register in the program.

+ * For register R, the interval [A,B] indicates that R is referenced

+ * from instruction A through instruction B.

+ * Special consideration is needed for loops and subroutines.

+ * \return GL_TRUE if success, GL_FALSE if we cannot proceed for some reason

+ */

+static GLboolean

+find_live_intervals(struct gl_program *prog,

+                    struct interval_list *liveIntervals)

+{

+   GLint intBegin[REG_ALLOCATE_MAX_PROGRAM_TEMPS];

+   GLint intEnd[REG_ALLOCATE_MAX_PROGRAM_TEMPS];

+   GLuint i;

+

+   /*

+    * Note: we'll return GL_FALSE below if we find relative indexing

+    * into the TEMP register file.  We can't handle that yet.

+    * We also give up on subroutines for now.

+    */

+

+   if (dbg) {

+      printf("Optimize: Begin find intervals\n");

+   }

+

+   /* build intermediate arrays */

+   if (!_mesa_find_temp_intervals(prog->Instructions, prog->NumInstructions,

+                                  intBegin, intEnd))

+      return GL_FALSE;

+

+   /* Build live intervals list from intermediate arrays */

+   liveIntervals->Num = 0;

+   for (i = 0; i < REG_ALLOCATE_MAX_PROGRAM_TEMPS; i++) {

+      if (intBegin[i] >= 0) {

+         struct interval inv;

+         inv.Reg = i;

+         inv.Start = intBegin[i];

+         inv.End = intEnd[i];

+         append_interval(liveIntervals, &inv);

+      }

+   }

+

+   /* Sort the list according to interval starts */

+   sort_interval_list_by_start(liveIntervals);

+

+   if (dbg) {

+      /* print interval info */

+      for (i = 0; i < liveIntervals->Num; i++) {

+         const struct interval *inv = liveIntervals->Intervals + i;

+         printf("Reg[%d] live [%d, %d]:",

+                      inv->Reg, inv->Start, inv->End);

+         if (1) {

+            GLuint j;

+            for (j = 0; j < inv->Start; j++)

+               printf(" ");

+            for (j = inv->Start; j <= inv->End; j++)

+               printf("x");

+         }

+         printf("\n");

+      }

+   }

+

+   return GL_TRUE;

+}

+

+

+/** Scan the array of used register flags to find free entry */

+static GLint

+alloc_register(GLboolean usedRegs[REG_ALLOCATE_MAX_PROGRAM_TEMPS])

+{

+   GLuint k;

+   for (k = 0; k < REG_ALLOCATE_MAX_PROGRAM_TEMPS; k++) {

+      if (!usedRegs[k]) {

+         usedRegs[k] = GL_TRUE;

+         return k;

+      }

+   }

+   return -1;

+}

+

+

+/**

+ * This function implements "Linear Scan Register Allocation" to reduce

+ * the number of temporary registers used by the program.

+ *

+ * We compute the "live interval" for all temporary registers then

+ * examine the overlap of the intervals to allocate new registers.

+ * Basically, if two intervals do not overlap, they can use the same register.

+ */

+static void

+_mesa_reallocate_registers(struct gl_program *prog)

+{

+   struct interval_list liveIntervals;

+   GLint registerMap[REG_ALLOCATE_MAX_PROGRAM_TEMPS];

+   GLboolean usedRegs[REG_ALLOCATE_MAX_PROGRAM_TEMPS];

+   GLuint i;

+   GLint maxTemp = -1;

+

+   if (dbg) {

+      printf("Optimize: Begin live-interval register reallocation\n");

+      _mesa_print_program(prog);

+   }

+

+   for (i = 0; i < REG_ALLOCATE_MAX_PROGRAM_TEMPS; i++){

+      registerMap[i] = -1;

+      usedRegs[i] = GL_FALSE;

+   }

+

+   if (!find_live_intervals(prog, &liveIntervals)) {

+      if (dbg)

+         printf("Aborting register reallocation\n");

+      return;

+   }

+

+   {

+      struct interval_list activeIntervals;

+      activeIntervals.Num = 0;

+

+      /* loop over live intervals, allocating a new register for each */

+      for (i = 0; i < liveIntervals.Num; i++) {

+         const struct interval *live = liveIntervals.Intervals + i;

+

+         if (dbg)

+            printf("Consider register %u\n", live->Reg);

+

+         /* Expire old intervals.  Intervals which have ended with respect

+          * to the live interval can have their remapped registers freed.

+          */

+         {

+            GLint j;

+            for (j = 0; j < (GLint) activeIntervals.Num; j++) {

+               const struct interval *inv = activeIntervals.Intervals + j;

+               if (inv->End >= live->Start) {

+                  /* Stop now.  Since the activeInterval list is sorted

+                   * we know we don't have to go further.

+                   */

+                  break;

+               }

+               else {

+                  /* Interval 'inv' has expired */

+                  const GLint regNew = registerMap[inv->Reg];

+                  ASSERT(regNew >= 0);

+

+                  if (dbg)

+                     printf("  expire interval for reg %u\n", inv->Reg);

+

+                  /* remove interval j from active list */

+                  remove_interval(&activeIntervals, inv);

+                  j--;  /* counter-act j++ in for-loop above */

+

+                  /* return register regNew to the free pool */

+                  if (dbg)

+                     printf("  free reg %d\n", regNew);

+                  ASSERT(usedRegs[regNew] == GL_TRUE);

+                  usedRegs[regNew] = GL_FALSE;

+               }

+            }

+         }

+

+         /* find a free register for this live interval */

+         {

+            const GLint k = alloc_register(usedRegs);

+            if (k < 0) {

+               /* out of registers, give up */

+               return;

+            }

+            registerMap[live->Reg] = k;

+            maxTemp = MAX2(maxTemp, k);

+            if (dbg)

+               printf("  remap register %u -> %d\n", live->Reg, k);

+         }

+

+         /* Insert this live interval into the active list which is sorted

+          * by increasing end points.

+          */

+         insert_interval_by_end(&activeIntervals, live);

+      }

+   }

+

+   if (maxTemp + 1 < (GLint) liveIntervals.Num) {

+      /* OK, we've reduced the number of registers needed.

+       * Scan the program and replace all the old temporary register

+       * indexes with the new indexes.

+       */

+      replace_regs(prog, PROGRAM_TEMPORARY, registerMap);

+

+      prog->NumTemporaries = maxTemp + 1;

+   }

+

+   if (dbg) {

+      printf("Optimize: End live-interval register reallocation\n");

+      printf("Num temp regs before: %u  after: %u\n",

+                   liveIntervals.Num, maxTemp + 1);

+      _mesa_print_program(prog);

+   }

+}

+

+

+#if 0

+static void

+print_it(struct gl_context *ctx, struct gl_program *program, const char *txt) {

+   fprintf(stderr, "%s (%u inst):\n", txt, program->NumInstructions);

+   _mesa_print_program(program);

+   _mesa_print_program_parameters(ctx, program);

+   fprintf(stderr, "\n\n");

+}

+#endif

+

+

+/**

+ * Apply optimizations to the given program to eliminate unnecessary

+ * instructions, temp regs, etc.

+ */

+void

+_mesa_optimize_program(struct gl_context *ctx, struct gl_program *program)

+{

+   GLboolean any_change;

+

+   /* Stop when no modifications were output */

+   do {

+      any_change = GL_FALSE;

+      _mesa_remove_extra_move_use(program);

+      if (_mesa_remove_dead_code_global(program))

+         any_change = GL_TRUE;

+      if (_mesa_remove_extra_moves(program))

+         any_change = GL_TRUE;

+      if (_mesa_remove_dead_code_local(program))

+         any_change = GL_TRUE;

+      _mesa_reallocate_registers(program);

+   } while (any_change);

+}

+

diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c
index 384aa2cb2..11176208c 100644
--- a/mesalib/src/mesa/program/prog_statevars.c
+++ b/mesalib/src/mesa/program/prog_statevars.c
@@ -1,1208 +1,1208 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-/**
- * \file prog_statevars.c
- * Program state variable management.
- * \author Brian Paul
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-#include "prog_statevars.h"
-#include "prog_parameter.h"
-
-
-/**
- * Use the list of tokens in the state[] array to find global GL state
- * and return it in <value>.  Usually, four values are returned in <value>
- * but matrix queries may return as many as 16 values.
- * This function is used for ARB vertex/fragment programs.
- * The program parser will produce the state[] values.
- */
-static void
-_mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],
-                  GLfloat *value)
-{
-   switch (state[0]) {
-   case STATE_MATERIAL:
-      {
-         /* state[1] is either 0=front or 1=back side */
-         const GLuint face = (GLuint) state[1];
-         const struct gl_material *mat = &ctx->Light.Material;
-         ASSERT(face == 0 || face == 1);
-         /* we rely on tokens numbered so that _BACK_ == _FRONT_+ 1 */
-         ASSERT(MAT_ATTRIB_FRONT_AMBIENT + 1 == MAT_ATTRIB_BACK_AMBIENT);
-         /* XXX we could get rid of this switch entirely with a little
-          * work in arbprogparse.c's parse_state_single_item().
-          */
-         /* state[2] is the material attribute */
-         switch (state[2]) {
-         case STATE_AMBIENT:
-            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_AMBIENT + face]);
-            return;
-         case STATE_DIFFUSE:
-            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_DIFFUSE + face]);
-            return;
-         case STATE_SPECULAR:
-            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_SPECULAR + face]);
-            return;
-         case STATE_EMISSION:
-            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_EMISSION + face]);
-            return;
-         case STATE_SHININESS:
-            value[0] = mat->Attrib[MAT_ATTRIB_FRONT_SHININESS + face][0];
-            value[1] = 0.0F;
-            value[2] = 0.0F;
-            value[3] = 1.0F;
-            return;
-         default:
-            _mesa_problem(ctx, "Invalid material state in fetch_state");
-            return;
-         }
-      }
-   case STATE_LIGHT:
-      {
-         /* state[1] is the light number */
-         const GLuint ln = (GLuint) state[1];
-         /* state[2] is the light attribute */
-         switch (state[2]) {
-         case STATE_AMBIENT:
-            COPY_4V(value, ctx->Light.Light[ln].Ambient);
-            return;
-         case STATE_DIFFUSE:
-            COPY_4V(value, ctx->Light.Light[ln].Diffuse);
-            return;
-         case STATE_SPECULAR:
-            COPY_4V(value, ctx->Light.Light[ln].Specular);
-            return;
-         case STATE_POSITION:
-            COPY_4V(value, ctx->Light.Light[ln].EyePosition);
-            return;
-         case STATE_ATTENUATION:
-            value[0] = ctx->Light.Light[ln].ConstantAttenuation;
-            value[1] = ctx->Light.Light[ln].LinearAttenuation;
-            value[2] = ctx->Light.Light[ln].QuadraticAttenuation;
-            value[3] = ctx->Light.Light[ln].SpotExponent;
-            return;
-         case STATE_SPOT_DIRECTION:
-            COPY_3V(value, ctx->Light.Light[ln].SpotDirection);
-            value[3] = ctx->Light.Light[ln]._CosCutoff;
-            return;
-         case STATE_SPOT_CUTOFF:
-            value[0] = ctx->Light.Light[ln].SpotCutoff;
-            return;
-         case STATE_HALF_VECTOR:
-            {
-               static const GLfloat eye_z[] = {0, 0, 1};
-               GLfloat p[3];
-               /* Compute infinite half angle vector:
-                *   halfVector = normalize(normalize(lightPos) + (0, 0, 1))
-		* light.EyePosition.w should be 0 for infinite lights.
-                */
-               COPY_3V(p, ctx->Light.Light[ln].EyePosition);
-               NORMALIZE_3FV(p);
-	       ADD_3V(value, p, eye_z);
-	       NORMALIZE_3FV(value);
-	       value[3] = 1.0;
-            }
-            return;
-         default:
-            _mesa_problem(ctx, "Invalid light state in fetch_state");
-            return;
-         }
-      }
-   case STATE_LIGHTMODEL_AMBIENT:
-      COPY_4V(value, ctx->Light.Model.Ambient);
-      return;
-   case STATE_LIGHTMODEL_SCENECOLOR:
-      if (state[1] == 0) {
-         /* front */
-         GLint i;
-         for (i = 0; i < 3; i++) {
-            value[i] = ctx->Light.Model.Ambient[i]
-               * ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT][i]
-               + ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_EMISSION][i];
-         }
-	 value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
-      }
-      else {
-         /* back */
-         GLint i;
-         for (i = 0; i < 3; i++) {
-            value[i] = ctx->Light.Model.Ambient[i]
-               * ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_AMBIENT][i]
-               + ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_EMISSION][i];
-         }
-	 value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
-      }
-      return;
-   case STATE_LIGHTPROD:
-      {
-         const GLuint ln = (GLuint) state[1];
-         const GLuint face = (GLuint) state[2];
-         GLint i;
-         ASSERT(face == 0 || face == 1);
-         switch (state[3]) {
-            case STATE_AMBIENT:
-               for (i = 0; i < 3; i++) {
-                  value[i] = ctx->Light.Light[ln].Ambient[i] *
-                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT+face][i];
-               }
-               /* [3] = material alpha */
-               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT+face][3];
-               return;
-            case STATE_DIFFUSE:
-               for (i = 0; i < 3; i++) {
-                  value[i] = ctx->Light.Light[ln].Diffuse[i] *
-                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][i];
-               }
-               /* [3] = material alpha */
-               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][3];
-               return;
-            case STATE_SPECULAR:
-               for (i = 0; i < 3; i++) {
-                  value[i] = ctx->Light.Light[ln].Specular[i] *
-                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SPECULAR+face][i];
-               }
-               /* [3] = material alpha */
-               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SPECULAR+face][3];
-               return;
-            default:
-               _mesa_problem(ctx, "Invalid lightprod state in fetch_state");
-               return;
-         }
-      }
-   case STATE_TEXGEN:
-      {
-         /* state[1] is the texture unit */
-         const GLuint unit = (GLuint) state[1];
-         /* state[2] is the texgen attribute */
-         switch (state[2]) {
-         case STATE_TEXGEN_EYE_S:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenS.EyePlane);
-            return;
-         case STATE_TEXGEN_EYE_T:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenT.EyePlane);
-            return;
-         case STATE_TEXGEN_EYE_R:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenR.EyePlane);
-            return;
-         case STATE_TEXGEN_EYE_Q:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenQ.EyePlane);
-            return;
-         case STATE_TEXGEN_OBJECT_S:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenS.ObjectPlane);
-            return;
-         case STATE_TEXGEN_OBJECT_T:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenT.ObjectPlane);
-            return;
-         case STATE_TEXGEN_OBJECT_R:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenR.ObjectPlane);
-            return;
-         case STATE_TEXGEN_OBJECT_Q:
-            COPY_4V(value, ctx->Texture.Unit[unit].GenQ.ObjectPlane);
-            return;
-         default:
-            _mesa_problem(ctx, "Invalid texgen state in fetch_state");
-            return;
-         }
-      }
-   case STATE_TEXENV_COLOR:
-      {
-         /* state[1] is the texture unit */
-         const GLuint unit = (GLuint) state[1];
-         if(ctx->Color._ClampFragmentColor)
-            COPY_4V(value, ctx->Texture.Unit[unit].EnvColor);
-         else
-            COPY_4V(value, ctx->Texture.Unit[unit].EnvColorUnclamped);
-      }
-      return;
-   case STATE_FOG_COLOR:
-      if(ctx->Color._ClampFragmentColor)
-         COPY_4V(value, ctx->Fog.Color);
-      else
-         COPY_4V(value, ctx->Fog.ColorUnclamped);
-      return;
-   case STATE_FOG_PARAMS:
-      value[0] = ctx->Fog.Density;
-      value[1] = ctx->Fog.Start;
-      value[2] = ctx->Fog.End;
-      value[3] = (ctx->Fog.End == ctx->Fog.Start)
-         ? 1.0f : (GLfloat)(1.0 / (ctx->Fog.End - ctx->Fog.Start));
-      return;
-   case STATE_CLIPPLANE:
-      {
-         const GLuint plane = (GLuint) state[1];
-         COPY_4V(value, ctx->Transform.EyeUserPlane[plane]);
-      }
-      return;
-   case STATE_POINT_SIZE:
-      value[0] = ctx->Point.Size;
-      value[1] = ctx->Point.MinSize;
-      value[2] = ctx->Point.MaxSize;
-      value[3] = ctx->Point.Threshold;
-      return;
-   case STATE_POINT_ATTENUATION:
-      value[0] = ctx->Point.Params[0];
-      value[1] = ctx->Point.Params[1];
-      value[2] = ctx->Point.Params[2];
-      value[3] = 1.0F;
-      return;
-   case STATE_MODELVIEW_MATRIX:
-   case STATE_PROJECTION_MATRIX:
-   case STATE_MVP_MATRIX:
-   case STATE_TEXTURE_MATRIX:
-   case STATE_PROGRAM_MATRIX:
-      {
-         /* state[0] = modelview, projection, texture, etc. */
-         /* state[1] = which texture matrix or program matrix */
-         /* state[2] = first row to fetch */
-         /* state[3] = last row to fetch */
-         /* state[4] = transpose, inverse or invtrans */
-         const GLmatrix *matrix;
-         const gl_state_index mat = state[0];
-         const GLuint index = (GLuint) state[1];
-         const GLuint firstRow = (GLuint) state[2];
-         const GLuint lastRow = (GLuint) state[3];
-         const gl_state_index modifier = state[4];
-         const GLfloat *m;
-         GLuint row, i;
-         ASSERT(firstRow >= 0);
-         ASSERT(firstRow < 4);
-         ASSERT(lastRow >= 0);
-         ASSERT(lastRow < 4);
-         if (mat == STATE_MODELVIEW_MATRIX) {
-            matrix = ctx->ModelviewMatrixStack.Top;
-         }
-         else if (mat == STATE_PROJECTION_MATRIX) {
-            matrix = ctx->ProjectionMatrixStack.Top;
-         }
-         else if (mat == STATE_MVP_MATRIX) {
-            matrix = &ctx->_ModelProjectMatrix;
-         }
-         else if (mat == STATE_TEXTURE_MATRIX) {
-            ASSERT(index < Elements(ctx->TextureMatrixStack));
-            matrix = ctx->TextureMatrixStack[index].Top;
-         }
-         else if (mat == STATE_PROGRAM_MATRIX) {
-            ASSERT(index < Elements(ctx->ProgramMatrixStack));
-            matrix = ctx->ProgramMatrixStack[index].Top;
-         }
-         else {
-            _mesa_problem(ctx, "Bad matrix name in _mesa_fetch_state()");
-            return;
-         }
-         if (modifier == STATE_MATRIX_INVERSE ||
-             modifier == STATE_MATRIX_INVTRANS) {
-            /* Be sure inverse is up to date:
-	     */
-            _math_matrix_alloc_inv( (GLmatrix *) matrix );
-	    _math_matrix_analyse( (GLmatrix*) matrix );
-            m = matrix->inv;
-         }
-         else {
-            m = matrix->m;
-         }
-         if (modifier == STATE_MATRIX_TRANSPOSE ||
-             modifier == STATE_MATRIX_INVTRANS) {
-            for (i = 0, row = firstRow; row <= lastRow; row++) {
-               value[i++] = m[row * 4 + 0];
-               value[i++] = m[row * 4 + 1];
-               value[i++] = m[row * 4 + 2];
-               value[i++] = m[row * 4 + 3];
-            }
-         }
-         else {
-            for (i = 0, row = firstRow; row <= lastRow; row++) {
-               value[i++] = m[row + 0];
-               value[i++] = m[row + 4];
-               value[i++] = m[row + 8];
-               value[i++] = m[row + 12];
-            }
-         }
-      }
-      return;
-   case STATE_DEPTH_RANGE:
-      value[0] = ctx->Viewport.Near;                     /* near       */
-      value[1] = ctx->Viewport.Far;                      /* far        */
-      value[2] = ctx->Viewport.Far - ctx->Viewport.Near; /* far - near */
-      value[3] = 1.0;
-      return;
-   case STATE_FRAGMENT_PROGRAM:
-      {
-         /* state[1] = {STATE_ENV, STATE_LOCAL} */
-         /* state[2] = parameter index          */
-         const int idx = (int) state[2];
-         switch (state[1]) {
-            case STATE_ENV:
-               COPY_4V(value, ctx->FragmentProgram.Parameters[idx]);
-               return;
-            case STATE_LOCAL:
-               COPY_4V(value, ctx->FragmentProgram.Current->Base.LocalParams[idx]);
-               return;
-            default:
-               _mesa_problem(ctx, "Bad state switch in _mesa_fetch_state()");
-               return;
-         }
-      }
-      return;
-
-   case STATE_VERTEX_PROGRAM:
-      {
-         /* state[1] = {STATE_ENV, STATE_LOCAL} */
-         /* state[2] = parameter index          */
-         const int idx = (int) state[2];
-         switch (state[1]) {
-            case STATE_ENV:
-               COPY_4V(value, ctx->VertexProgram.Parameters[idx]);
-               return;
-            case STATE_LOCAL:
-               COPY_4V(value, ctx->VertexProgram.Current->Base.LocalParams[idx]);
-               return;
-            default:
-               _mesa_problem(ctx, "Bad state switch in _mesa_fetch_state()");
-               return;
-         }
-      }
-      return;
-
-   case STATE_NORMAL_SCALE:
-      ASSIGN_4V(value, ctx->_ModelViewInvScale, 0, 0, 1);
-      return;
-
-   case STATE_INTERNAL:
-      switch (state[1]) {
-      case STATE_CURRENT_ATTRIB:
-         {
-            const GLuint idx = (GLuint) state[2];
-            COPY_4V(value, ctx->Current.Attrib[idx]);
-         }
-         return;
-
-      case STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED:
-         {
-            const GLuint idx = (GLuint) state[2];
-            if(ctx->Light._ClampVertexColor &&
-               (idx == VERT_ATTRIB_COLOR0 ||
-                idx == VERT_ATTRIB_COLOR1)) {
-               value[0] = CLAMP(ctx->Current.Attrib[idx][0], 0.0f, 1.0f);
-               value[1] = CLAMP(ctx->Current.Attrib[idx][1], 0.0f, 1.0f);
-               value[2] = CLAMP(ctx->Current.Attrib[idx][2], 0.0f, 1.0f);
-               value[3] = CLAMP(ctx->Current.Attrib[idx][3], 0.0f, 1.0f);
-            }
-            else
-               COPY_4V(value, ctx->Current.Attrib[idx]);
-         }
-         return;
-
-      case STATE_NORMAL_SCALE:
-         ASSIGN_4V(value, 
-                   ctx->_ModelViewInvScale, 
-                   ctx->_ModelViewInvScale, 
-                   ctx->_ModelViewInvScale, 
-                   1);
-         return;
-
-      case STATE_TEXRECT_SCALE:
-         /* Value = { 1/texWidth, 1/texHeight, 0, 1 }.
-          * Used to convert unnormalized texcoords to normalized texcoords.
-          */
-         {
-            const int unit = (int) state[2];
-            const struct gl_texture_object *texObj
-               = ctx->Texture.Unit[unit]._Current;
-            if (texObj) {
-               struct gl_texture_image *texImage = texObj->Image[0][0];
-               ASSIGN_4V(value,
-                         (GLfloat) (1.0 / texImage->Width),
-                         (GLfloat) (1.0 / texImage->Height),
-                         0.0f, 1.0f);
-            }
-         }
-         return;
-
-      case STATE_FOG_PARAMS_OPTIMIZED:
-         /* for simpler per-vertex/pixel fog calcs. POW (for EXP/EXP2 fog)
-          * might be more expensive than EX2 on some hw, plus it needs
-          * another constant (e) anyway. Linear fog can now be done with a
-          * single MAD.
-          * linear: fogcoord * -1/(end-start) + end/(end-start)
-          * exp: 2^-(density/ln(2) * fogcoord)
-          * exp2: 2^-((density/(ln(2)^2) * fogcoord)^2)
-          */
-         value[0] = (ctx->Fog.End == ctx->Fog.Start)
-            ? 1.0f : (GLfloat)(-1.0F / (ctx->Fog.End - ctx->Fog.Start));
-         value[1] = ctx->Fog.End * -value[0];
-         value[2] = (GLfloat)(ctx->Fog.Density * ONE_DIV_LN2);
-         value[3] = (GLfloat)(ctx->Fog.Density * ONE_DIV_SQRT_LN2);
-         return;
-
-      case STATE_POINT_SIZE_CLAMPED:
-         {
-           /* this includes implementation dependent limits, to avoid
-            * another potentially necessary clamp.
-            * Note: for sprites, point smooth (point AA) is ignored
-            * and we'll clamp to MinPointSizeAA and MaxPointSize, because we
-            * expect drivers will want to say their minimum for AA size is 0.0
-            * but for non-AA it's 1.0 (because normal points with size below 1.0
-            * need to get rounded up to 1.0, hence never disappear). GL does
-            * not specify max clamp size for sprites, other than it needs to be
-            * at least as large as max AA size, hence use non-AA size there.
-            */
-            GLfloat minImplSize;
-            GLfloat maxImplSize;
-            if (ctx->Point.PointSprite) {
-               minImplSize = ctx->Const.MinPointSizeAA;
-               maxImplSize = ctx->Const.MaxPointSize;
-            }
-            else if (ctx->Point.SmoothFlag || ctx->Multisample._Enabled) {
-               minImplSize = ctx->Const.MinPointSizeAA;
-               maxImplSize = ctx->Const.MaxPointSizeAA;
-            }
-            else {
-               minImplSize = ctx->Const.MinPointSize;
-               maxImplSize = ctx->Const.MaxPointSize;
-            }
-            value[0] = ctx->Point.Size;
-            value[1] = ctx->Point.MinSize >= minImplSize ? ctx->Point.MinSize : minImplSize;
-            value[2] = ctx->Point.MaxSize <= maxImplSize ? ctx->Point.MaxSize : maxImplSize;
-            value[3] = ctx->Point.Threshold;
-         }
-         return;
-      case STATE_POINT_SIZE_IMPL_CLAMP:
-         {
-           /* for implementation clamp only in vs */
-            GLfloat minImplSize;
-            GLfloat maxImplSize;
-            if (ctx->Point.PointSprite) {
-               minImplSize = ctx->Const.MinPointSizeAA;
-               maxImplSize = ctx->Const.MaxPointSize;
-            }
-            else if (ctx->Point.SmoothFlag || ctx->Multisample._Enabled) {
-               minImplSize = ctx->Const.MinPointSizeAA;
-               maxImplSize = ctx->Const.MaxPointSizeAA;
-            }
-            else {
-               minImplSize = ctx->Const.MinPointSize;
-               maxImplSize = ctx->Const.MaxPointSize;
-            }
-            value[0] = ctx->Point.Size;
-            value[1] = minImplSize;
-            value[2] = maxImplSize;
-            value[3] = ctx->Point.Threshold;
-         }
-         return;
-      case STATE_LIGHT_SPOT_DIR_NORMALIZED:
-         {
-            /* here, state[2] is the light number */
-            /* pre-normalize spot dir */
-            const GLuint ln = (GLuint) state[2];
-            COPY_3V(value, ctx->Light.Light[ln]._NormSpotDirection);
-            value[3] = ctx->Light.Light[ln]._CosCutoff;
-         }
-         return;
-
-      case STATE_LIGHT_POSITION:
-         {
-            const GLuint ln = (GLuint) state[2];
-            COPY_4V(value, ctx->Light.Light[ln]._Position);
-         }
-         return;
-
-      case STATE_LIGHT_POSITION_NORMALIZED:
-         {
-            const GLuint ln = (GLuint) state[2];
-            COPY_4V(value, ctx->Light.Light[ln]._Position);
-            NORMALIZE_3FV( value );
-         }
-         return;
-
-      case STATE_LIGHT_HALF_VECTOR:
-         {
-            const GLuint ln = (GLuint) state[2];
-            GLfloat p[3];
-            /* Compute infinite half angle vector:
-             *   halfVector = normalize(normalize(lightPos) + (0, 0, 1))
-             * light.EyePosition.w should be 0 for infinite lights.
-             */
-            COPY_3V(p, ctx->Light.Light[ln]._Position);
-            NORMALIZE_3FV(p);
-            ADD_3V(value, p, ctx->_EyeZDir);
-            NORMALIZE_3FV(value);
-            value[3] = 1.0;
-         }
-         return;
-
-      case STATE_PT_SCALE:
-         value[0] = ctx->Pixel.RedScale;
-         value[1] = ctx->Pixel.GreenScale;
-         value[2] = ctx->Pixel.BlueScale;
-         value[3] = ctx->Pixel.AlphaScale;
-         return;
-
-      case STATE_PT_BIAS:
-         value[0] = ctx->Pixel.RedBias;
-         value[1] = ctx->Pixel.GreenBias;
-         value[2] = ctx->Pixel.BlueBias;
-         value[3] = ctx->Pixel.AlphaBias;
-         return;
-
-      case STATE_SHADOW_AMBIENT:
-         {
-            const int unit = (int) state[2];
-            const struct gl_texture_object *texObj
-               = ctx->Texture.Unit[unit]._Current;
-            if (texObj) {
-               value[0] =
-               value[1] =
-               value[2] =
-               value[3] = texObj->CompareFailValue;
-            }
-         }
-         return;
-
-      case STATE_FB_SIZE:
-         value[0] = (GLfloat) (ctx->DrawBuffer->Width - 1);
-         value[1] = (GLfloat) (ctx->DrawBuffer->Height - 1);
-         value[2] = 0.0F;
-         value[3] = 0.0F;
-         return;
-
-      case STATE_FB_WPOS_Y_TRANSFORM:
-         /* A driver may negate this conditional by using ZW swizzle
-          * instead of XY (based on e.g. some other state). */
-         if (ctx->DrawBuffer->Name != 0) {
-            /* Identity (XY) followed by flipping Y upside down (ZW). */
-            value[0] = 1.0F;
-            value[1] = 0.0F;
-            value[2] = -1.0F;
-            value[3] = (GLfloat) (ctx->DrawBuffer->Height - 1);
-         } else {
-            /* Flipping Y upside down (XY) followed by identity (ZW). */
-            value[0] = -1.0F;
-            value[1] = (GLfloat) (ctx->DrawBuffer->Height - 1);
-            value[2] = 1.0F;
-            value[3] = 0.0F;
-         }
-         return;
-
-      case STATE_ROT_MATRIX_0:
-         {
-            const int unit = (int) state[2];
-            GLfloat *rotMat22 = ctx->Texture.Unit[unit].RotMatrix;
-            value[0] = rotMat22[0]; 
-            value[1] = rotMat22[2];
-            value[2] = 0.0;
-            value[3] = 0.0;
-         }
-         return;
-
-      case STATE_ROT_MATRIX_1:
-         {
-            const int unit = (int) state[2];
-            GLfloat *rotMat22 = ctx->Texture.Unit[unit].RotMatrix;
-            value[0] = rotMat22[1];
-            value[1] = rotMat22[3];
-            value[2] = 0.0;
-            value[3] = 0.0;
-         }
-         return;
-
-      /* XXX: make sure new tokens added here are also handled in the 
-       * _mesa_program_state_flags() switch, below.
-       */
-      default:
-         /* Unknown state indexes are silently ignored here.
-          * Drivers may do something special.
-          */
-         return;
-      }
-      return;
-
-   default:
-      _mesa_problem(ctx, "Invalid state in _mesa_fetch_state");
-      return;
-   }
-}
-
-
-/**
- * Return a bitmask of the Mesa state flags (_NEW_* values) which would
- * indicate that the given context state may have changed.
- * The bitmask is used during validation to determine if we need to update
- * vertex/fragment program parameters (like "state.material.color") when
- * some GL state has changed.
- */
-GLbitfield
-_mesa_program_state_flags(const gl_state_index state[STATE_LENGTH])
-{
-   switch (state[0]) {
-   case STATE_MATERIAL:
-   case STATE_LIGHT:
-   case STATE_LIGHTMODEL_AMBIENT:
-   case STATE_LIGHTMODEL_SCENECOLOR:
-   case STATE_LIGHTPROD:
-      return _NEW_LIGHT;
-
-   case STATE_TEXGEN:
-      return _NEW_TEXTURE;
-   case STATE_TEXENV_COLOR:
-      return _NEW_TEXTURE | _NEW_BUFFERS | _NEW_FRAG_CLAMP;
-
-   case STATE_FOG_COLOR:
-      return _NEW_FOG | _NEW_BUFFERS | _NEW_FRAG_CLAMP;
-   case STATE_FOG_PARAMS:
-      return _NEW_FOG;
-
-   case STATE_CLIPPLANE:
-      return _NEW_TRANSFORM;
-
-   case STATE_POINT_SIZE:
-   case STATE_POINT_ATTENUATION:
-      return _NEW_POINT;
-
-   case STATE_MODELVIEW_MATRIX:
-      return _NEW_MODELVIEW;
-   case STATE_PROJECTION_MATRIX:
-      return _NEW_PROJECTION;
-   case STATE_MVP_MATRIX:
-      return _NEW_MODELVIEW | _NEW_PROJECTION;
-   case STATE_TEXTURE_MATRIX:
-      return _NEW_TEXTURE_MATRIX;
-   case STATE_PROGRAM_MATRIX:
-      return _NEW_TRACK_MATRIX;
-
-   case STATE_DEPTH_RANGE:
-      return _NEW_VIEWPORT;
-
-   case STATE_FRAGMENT_PROGRAM:
-   case STATE_VERTEX_PROGRAM:
-      return _NEW_PROGRAM;
-
-   case STATE_NORMAL_SCALE:
-      return _NEW_MODELVIEW;
-
-   case STATE_INTERNAL:
-      switch (state[1]) {
-      case STATE_CURRENT_ATTRIB:
-         return _NEW_CURRENT_ATTRIB;
-      case STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED:
-         return _NEW_CURRENT_ATTRIB | _NEW_LIGHT | _NEW_BUFFERS;
-
-      case STATE_NORMAL_SCALE:
-         return _NEW_MODELVIEW;
-
-      case STATE_TEXRECT_SCALE:
-      case STATE_SHADOW_AMBIENT:
-      case STATE_ROT_MATRIX_0:
-      case STATE_ROT_MATRIX_1:
-	 return _NEW_TEXTURE;
-      case STATE_FOG_PARAMS_OPTIMIZED:
-	 return _NEW_FOG;
-      case STATE_POINT_SIZE_CLAMPED:
-      case STATE_POINT_SIZE_IMPL_CLAMP:
-         return _NEW_POINT | _NEW_MULTISAMPLE;
-      case STATE_LIGHT_SPOT_DIR_NORMALIZED:
-      case STATE_LIGHT_POSITION:
-      case STATE_LIGHT_POSITION_NORMALIZED:
-      case STATE_LIGHT_HALF_VECTOR:
-         return _NEW_LIGHT;
-
-      case STATE_PT_SCALE:
-      case STATE_PT_BIAS:
-         return _NEW_PIXEL;
-
-      case STATE_FB_SIZE:
-      case STATE_FB_WPOS_Y_TRANSFORM:
-         return _NEW_BUFFERS;
-
-      default:
-         /* unknown state indexes are silently ignored and
-         *  no flag set, since it is handled by the driver.
-         */
-	 return 0;
-      }
-
-   default:
-      _mesa_problem(NULL, "unexpected state[0] in make_state_flags()");
-      return 0;
-   }
-}
-
-
-static void
-append(char *dst, const char *src)
-{
-   while (*dst)
-      dst++;
-   while (*src)
-     *dst++ = *src++;
-   *dst = 0;
-}
-
-
-/**
- * Convert token 'k' to a string, append it onto 'dst' string.
- */
-static void
-append_token(char *dst, gl_state_index k)
-{
-   switch (k) {
-   case STATE_MATERIAL:
-      append(dst, "material");
-      break;
-   case STATE_LIGHT:
-      append(dst, "light");
-      break;
-   case STATE_LIGHTMODEL_AMBIENT:
-      append(dst, "lightmodel.ambient");
-      break;
-   case STATE_LIGHTMODEL_SCENECOLOR:
-      break;
-   case STATE_LIGHTPROD:
-      append(dst, "lightprod");
-      break;
-   case STATE_TEXGEN:
-      append(dst, "texgen");
-      break;
-   case STATE_FOG_COLOR:
-      append(dst, "fog.color");
-      break;
-   case STATE_FOG_PARAMS:
-      append(dst, "fog.params");
-      break;
-   case STATE_CLIPPLANE:
-      append(dst, "clip");
-      break;
-   case STATE_POINT_SIZE:
-      append(dst, "point.size");
-      break;
-   case STATE_POINT_ATTENUATION:
-      append(dst, "point.attenuation");
-      break;
-   case STATE_MODELVIEW_MATRIX:
-      append(dst, "matrix.modelview");
-      break;
-   case STATE_PROJECTION_MATRIX:
-      append(dst, "matrix.projection");
-      break;
-   case STATE_MVP_MATRIX:
-      append(dst, "matrix.mvp");
-      break;
-   case STATE_TEXTURE_MATRIX:
-      append(dst, "matrix.texture");
-      break;
-   case STATE_PROGRAM_MATRIX:
-      append(dst, "matrix.program");
-      break;
-   case STATE_MATRIX_INVERSE:
-      append(dst, ".inverse");
-      break;
-   case STATE_MATRIX_TRANSPOSE:
-      append(dst, ".transpose");
-      break;
-   case STATE_MATRIX_INVTRANS:
-      append(dst, ".invtrans");
-      break;
-   case STATE_AMBIENT:
-      append(dst, ".ambient");
-      break;
-   case STATE_DIFFUSE:
-      append(dst, ".diffuse");
-      break;
-   case STATE_SPECULAR:
-      append(dst, ".specular");
-      break;
-   case STATE_EMISSION:
-      append(dst, ".emission");
-      break;
-   case STATE_SHININESS:
-      append(dst, "lshininess");
-      break;
-   case STATE_HALF_VECTOR:
-      append(dst, ".half");
-      break;
-   case STATE_POSITION:
-      append(dst, ".position");
-      break;
-   case STATE_ATTENUATION:
-      append(dst, ".attenuation");
-      break;
-   case STATE_SPOT_DIRECTION:
-      append(dst, ".spot.direction");
-      break;
-   case STATE_SPOT_CUTOFF:
-      append(dst, ".spot.cutoff");
-      break;
-   case STATE_TEXGEN_EYE_S:
-      append(dst, ".eye.s");
-      break;
-   case STATE_TEXGEN_EYE_T:
-      append(dst, ".eye.t");
-      break;
-   case STATE_TEXGEN_EYE_R:
-      append(dst, ".eye.r");
-      break;
-   case STATE_TEXGEN_EYE_Q:
-      append(dst, ".eye.q");
-      break;
-   case STATE_TEXGEN_OBJECT_S:
-      append(dst, ".object.s");
-      break;
-   case STATE_TEXGEN_OBJECT_T:
-      append(dst, ".object.t");
-      break;
-   case STATE_TEXGEN_OBJECT_R:
-      append(dst, ".object.r");
-      break;
-   case STATE_TEXGEN_OBJECT_Q:
-      append(dst, ".object.q");
-      break;
-   case STATE_TEXENV_COLOR:
-      append(dst, "texenv");
-      break;
-   case STATE_DEPTH_RANGE:
-      append(dst, "depth.range");
-      break;
-   case STATE_VERTEX_PROGRAM:
-   case STATE_FRAGMENT_PROGRAM:
-      break;
-   case STATE_ENV:
-      append(dst, "env");
-      break;
-   case STATE_LOCAL:
-      append(dst, "local");
-      break;
-   /* BEGIN internal state vars */
-   case STATE_INTERNAL:
-      append(dst, ".internal.");
-      break;
-   case STATE_CURRENT_ATTRIB:
-      append(dst, "current");
-      break;
-   case STATE_NORMAL_SCALE:
-      append(dst, "normalScale");
-      break;
-   case STATE_TEXRECT_SCALE:
-      append(dst, "texrectScale");
-      break;
-   case STATE_FOG_PARAMS_OPTIMIZED:
-      append(dst, "fogParamsOptimized");
-      break;
-   case STATE_POINT_SIZE_CLAMPED:
-      append(dst, "pointSizeClamped");
-      break;
-   case STATE_POINT_SIZE_IMPL_CLAMP:
-      append(dst, "pointSizeImplClamp");
-      break;
-   case STATE_LIGHT_SPOT_DIR_NORMALIZED:
-      append(dst, "lightSpotDirNormalized");
-      break;
-   case STATE_LIGHT_POSITION:
-      append(dst, "lightPosition");
-      break;
-   case STATE_LIGHT_POSITION_NORMALIZED:
-      append(dst, "light.position.normalized");
-      break;
-   case STATE_LIGHT_HALF_VECTOR:
-      append(dst, "lightHalfVector");
-      break;
-   case STATE_PT_SCALE:
-      append(dst, "PTscale");
-      break;
-   case STATE_PT_BIAS:
-      append(dst, "PTbias");
-      break;
-   case STATE_SHADOW_AMBIENT:
-      append(dst, "CompareFailValue");
-      break;
-   case STATE_FB_SIZE:
-      append(dst, "FbSize");
-      break;
-   case STATE_FB_WPOS_Y_TRANSFORM:
-      append(dst, "FbWposYTransform");
-      break;
-   case STATE_ROT_MATRIX_0:
-      append(dst, "rotMatrixRow0");
-      break;
-   case STATE_ROT_MATRIX_1:
-      append(dst, "rotMatrixRow1");
-      break;
-   default:
-      /* probably STATE_INTERNAL_DRIVER+i (driver private state) */
-      append(dst, "driverState");
-   }
-}
-
-static void
-append_face(char *dst, GLint face)
-{
-   if (face == 0)
-      append(dst, "front.");
-   else
-      append(dst, "back.");
-}
-
-static void
-append_index(char *dst, GLint index)
-{
-   char s[20];
-   sprintf(s, "[%d]", index);
-   append(dst, s);
-}
-
-/**
- * Make a string from the given state vector.
- * For example, return "state.matrix.texture[2].inverse".
- * Use free() to deallocate the string.
- */
-char *
-_mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
-{
-   char str[1000] = "";
-   char tmp[30];
-
-   append(str, "state.");
-   append_token(str, state[0]);
-
-   switch (state[0]) {
-   case STATE_MATERIAL:
-      append_face(str, state[1]);
-      append_token(str, state[2]);
-      break;
-   case STATE_LIGHT:
-      append_index(str, state[1]); /* light number [i]. */
-      append_token(str, state[2]); /* coefficients */
-      break;
-   case STATE_LIGHTMODEL_AMBIENT:
-      append(str, "lightmodel.ambient");
-      break;
-   case STATE_LIGHTMODEL_SCENECOLOR:
-      if (state[1] == 0) {
-         append(str, "lightmodel.front.scenecolor");
-      }
-      else {
-         append(str, "lightmodel.back.scenecolor");
-      }
-      break;
-   case STATE_LIGHTPROD:
-      append_index(str, state[1]); /* light number [i]. */
-      append_face(str, state[2]);
-      append_token(str, state[3]);
-      break;
-   case STATE_TEXGEN:
-      append_index(str, state[1]); /* tex unit [i] */
-      append_token(str, state[2]); /* plane coef */
-      break;
-   case STATE_TEXENV_COLOR:
-      append_index(str, state[1]); /* tex unit [i] */
-      append(str, "color");
-      break;
-   case STATE_CLIPPLANE:
-      append_index(str, state[1]); /* plane [i] */
-      append(str, ".plane");
-      break;
-   case STATE_MODELVIEW_MATRIX:
-   case STATE_PROJECTION_MATRIX:
-   case STATE_MVP_MATRIX:
-   case STATE_TEXTURE_MATRIX:
-   case STATE_PROGRAM_MATRIX:
-      {
-         /* state[0] = modelview, projection, texture, etc. */
-         /* state[1] = which texture matrix or program matrix */
-         /* state[2] = first row to fetch */
-         /* state[3] = last row to fetch */
-         /* state[4] = transpose, inverse or invtrans */
-         const gl_state_index mat = state[0];
-         const GLuint index = (GLuint) state[1];
-         const GLuint firstRow = (GLuint) state[2];
-         const GLuint lastRow = (GLuint) state[3];
-         const gl_state_index modifier = state[4];
-         if (index ||
-             mat == STATE_TEXTURE_MATRIX ||
-             mat == STATE_PROGRAM_MATRIX)
-            append_index(str, index);
-         if (modifier)
-            append_token(str, modifier);
-         if (firstRow == lastRow)
-            sprintf(tmp, ".row[%d]", firstRow);
-         else
-            sprintf(tmp, ".row[%d..%d]", firstRow, lastRow);
-         append(str, tmp);
-      }
-      break;
-   case STATE_POINT_SIZE:
-      break;
-   case STATE_POINT_ATTENUATION:
-      break;
-   case STATE_FOG_PARAMS:
-      break;
-   case STATE_FOG_COLOR:
-      break;
-   case STATE_DEPTH_RANGE:
-      break;
-   case STATE_FRAGMENT_PROGRAM:
-   case STATE_VERTEX_PROGRAM:
-      /* state[1] = {STATE_ENV, STATE_LOCAL} */
-      /* state[2] = parameter index          */
-      append_token(str, state[1]);
-      append_index(str, state[2]);
-      break;
-   case STATE_NORMAL_SCALE:
-      break;
-   case STATE_INTERNAL:
-      append_token(str, state[1]);
-      if (state[1] == STATE_CURRENT_ATTRIB)
-         append_index(str, state[2]);
-       break;
-   default:
-      _mesa_problem(NULL, "Invalid state in _mesa_program_state_string");
-      break;
-   }
-
-   return _mesa_strdup(str);
-}
-
-
-/**
- * Loop over all the parameters in a parameter list.  If the parameter
- * is a GL state reference, look up the current value of that state
- * variable and put it into the parameter's Value[4] array.
- * Other parameter types never change or are explicitly set by the user
- * with glUniform() or glProgramParameter(), etc.
- * This would be called at glBegin time.
- */
-void
-_mesa_load_state_parameters(struct gl_context *ctx,
-                            struct gl_program_parameter_list *paramList)
-{
-   GLuint i;
-
-   if (!paramList)
-      return;
-
-   for (i = 0; i < paramList->NumParameters; i++) {
-      if (paramList->Parameters[i].Type == PROGRAM_STATE_VAR) {
-         _mesa_fetch_state(ctx,
-			   paramList->Parameters[i].StateIndexes,
-                           paramList->ParameterValues[i]);
-      }
-   }
-}
-
-
-/**
- * Copy the 16 elements of a matrix into four consecutive program
- * registers starting at 'pos'.
- */
-static void
-load_matrix(GLfloat registers[][4], GLuint pos, const GLfloat mat[16])
-{
-   GLuint i;
-   for (i = 0; i < 4; i++) {
-      registers[pos + i][0] = mat[0 + i];
-      registers[pos + i][1] = mat[4 + i];
-      registers[pos + i][2] = mat[8 + i];
-      registers[pos + i][3] = mat[12 + i];
-   }
-}
-
-
-/**
- * As above, but transpose the matrix.
- */
-static void
-load_transpose_matrix(GLfloat registers[][4], GLuint pos,
-                      const GLfloat mat[16])
-{
-   memcpy(registers[pos], mat, 16 * sizeof(GLfloat));
-}
-
-
-/**
- * Load current vertex program's parameter registers with tracked
- * matrices (if NV program).  This only needs to be done per
- * glBegin/glEnd, not per-vertex.
- */
-void
-_mesa_load_tracked_matrices(struct gl_context *ctx)
-{
-   GLuint i;
-
-   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {
-      /* point 'mat' at source matrix */
-      GLmatrix *mat;
-      if (ctx->VertexProgram.TrackMatrix[i] == GL_MODELVIEW) {
-         mat = ctx->ModelviewMatrixStack.Top;
-      }
-      else if (ctx->VertexProgram.TrackMatrix[i] == GL_PROJECTION) {
-         mat = ctx->ProjectionMatrixStack.Top;
-      }
-      else if (ctx->VertexProgram.TrackMatrix[i] == GL_TEXTURE) {
-         GLuint unit = MIN2(ctx->Texture.CurrentUnit,
-                            Elements(ctx->TextureMatrixStack) - 1);
-         mat = ctx->TextureMatrixStack[unit].Top;
-      }
-      else if (ctx->VertexProgram.TrackMatrix[i]==GL_MODELVIEW_PROJECTION_NV) {
-         /* XXX verify the combined matrix is up to date */
-         mat = &ctx->_ModelProjectMatrix;
-      }
-      else if (ctx->VertexProgram.TrackMatrix[i] >= GL_MATRIX0_NV &&
-               ctx->VertexProgram.TrackMatrix[i] <= GL_MATRIX7_NV) {
-         GLuint n = ctx->VertexProgram.TrackMatrix[i] - GL_MATRIX0_NV;
-         ASSERT(n < Elements(ctx->ProgramMatrixStack));
-         mat = ctx->ProgramMatrixStack[n].Top;
-      }
-      else {
-         /* no matrix is tracked, but we leave the register values as-is */
-         assert(ctx->VertexProgram.TrackMatrix[i] == GL_NONE);
-         continue;
-      }
-
-      /* load the matrix values into sequential registers */
-      if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_IDENTITY_NV) {
-         load_matrix(ctx->VertexProgram.Parameters, i*4, mat->m);
-      }
-      else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_INVERSE_NV) {
-         _math_matrix_analyse(mat); /* update the inverse */
-         ASSERT(!_math_matrix_is_dirty(mat));
-         load_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv);
-      }
-      else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_TRANSPOSE_NV) {
-         load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->m);
-      }
-      else {
-         assert(ctx->VertexProgram.TrackMatrixTransform[i]
-                == GL_INVERSE_TRANSPOSE_NV);
-         _math_matrix_analyse(mat); /* update the inverse */
-         ASSERT(!_math_matrix_is_dirty(mat));
-         load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv);
-      }
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+/**

+ * \file prog_statevars.c

+ * Program state variable management.

+ * \author Brian Paul

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/mtypes.h"

+#include "prog_statevars.h"

+#include "prog_parameter.h"

+

+

+/**

+ * Use the list of tokens in the state[] array to find global GL state

+ * and return it in <value>.  Usually, four values are returned in <value>

+ * but matrix queries may return as many as 16 values.

+ * This function is used for ARB vertex/fragment programs.

+ * The program parser will produce the state[] values.

+ */

+static void

+_mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],

+                  GLfloat *value)

+{

+   switch (state[0]) {

+   case STATE_MATERIAL:

+      {

+         /* state[1] is either 0=front or 1=back side */

+         const GLuint face = (GLuint) state[1];

+         const struct gl_material *mat = &ctx->Light.Material;

+         ASSERT(face == 0 || face == 1);

+         /* we rely on tokens numbered so that _BACK_ == _FRONT_+ 1 */

+         ASSERT(MAT_ATTRIB_FRONT_AMBIENT + 1 == MAT_ATTRIB_BACK_AMBIENT);

+         /* XXX we could get rid of this switch entirely with a little

+          * work in arbprogparse.c's parse_state_single_item().

+          */

+         /* state[2] is the material attribute */

+         switch (state[2]) {

+         case STATE_AMBIENT:

+            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_AMBIENT + face]);

+            return;

+         case STATE_DIFFUSE:

+            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_DIFFUSE + face]);

+            return;

+         case STATE_SPECULAR:

+            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_SPECULAR + face]);

+            return;

+         case STATE_EMISSION:

+            COPY_4V(value, mat->Attrib[MAT_ATTRIB_FRONT_EMISSION + face]);

+            return;

+         case STATE_SHININESS:

+            value[0] = mat->Attrib[MAT_ATTRIB_FRONT_SHININESS + face][0];

+            value[1] = 0.0F;

+            value[2] = 0.0F;

+            value[3] = 1.0F;

+            return;

+         default:

+            _mesa_problem(ctx, "Invalid material state in fetch_state");

+            return;

+         }

+      }

+   case STATE_LIGHT:

+      {

+         /* state[1] is the light number */

+         const GLuint ln = (GLuint) state[1];

+         /* state[2] is the light attribute */

+         switch (state[2]) {

+         case STATE_AMBIENT:

+            COPY_4V(value, ctx->Light.Light[ln].Ambient);

+            return;

+         case STATE_DIFFUSE:

+            COPY_4V(value, ctx->Light.Light[ln].Diffuse);

+            return;

+         case STATE_SPECULAR:

+            COPY_4V(value, ctx->Light.Light[ln].Specular);

+            return;

+         case STATE_POSITION:

+            COPY_4V(value, ctx->Light.Light[ln].EyePosition);

+            return;

+         case STATE_ATTENUATION:

+            value[0] = ctx->Light.Light[ln].ConstantAttenuation;

+            value[1] = ctx->Light.Light[ln].LinearAttenuation;

+            value[2] = ctx->Light.Light[ln].QuadraticAttenuation;

+            value[3] = ctx->Light.Light[ln].SpotExponent;

+            return;

+         case STATE_SPOT_DIRECTION:

+            COPY_3V(value, ctx->Light.Light[ln].SpotDirection);

+            value[3] = ctx->Light.Light[ln]._CosCutoff;

+            return;

+         case STATE_SPOT_CUTOFF:

+            value[0] = ctx->Light.Light[ln].SpotCutoff;

+            return;

+         case STATE_HALF_VECTOR:

+            {

+               static const GLfloat eye_z[] = {0, 0, 1};

+               GLfloat p[3];

+               /* Compute infinite half angle vector:

+                *   halfVector = normalize(normalize(lightPos) + (0, 0, 1))

+		* light.EyePosition.w should be 0 for infinite lights.

+                */

+               COPY_3V(p, ctx->Light.Light[ln].EyePosition);

+               NORMALIZE_3FV(p);

+	       ADD_3V(value, p, eye_z);

+	       NORMALIZE_3FV(value);

+	       value[3] = 1.0;

+            }

+            return;

+         default:

+            _mesa_problem(ctx, "Invalid light state in fetch_state");

+            return;

+         }

+      }

+   case STATE_LIGHTMODEL_AMBIENT:

+      COPY_4V(value, ctx->Light.Model.Ambient);

+      return;

+   case STATE_LIGHTMODEL_SCENECOLOR:

+      if (state[1] == 0) {

+         /* front */

+         GLint i;

+         for (i = 0; i < 3; i++) {

+            value[i] = ctx->Light.Model.Ambient[i]

+               * ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT][i]

+               + ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_EMISSION][i];

+         }

+	 value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];

+      }

+      else {

+         /* back */

+         GLint i;

+         for (i = 0; i < 3; i++) {

+            value[i] = ctx->Light.Model.Ambient[i]

+               * ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_AMBIENT][i]

+               + ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_EMISSION][i];

+         }

+	 value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];

+      }

+      return;

+   case STATE_LIGHTPROD:

+      {

+         const GLuint ln = (GLuint) state[1];

+         const GLuint face = (GLuint) state[2];

+         GLint i;

+         ASSERT(face == 0 || face == 1);

+         switch (state[3]) {

+            case STATE_AMBIENT:

+               for (i = 0; i < 3; i++) {

+                  value[i] = ctx->Light.Light[ln].Ambient[i] *

+                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT+face][i];

+               }

+               /* [3] = material alpha */

+               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT+face][3];

+               return;

+            case STATE_DIFFUSE:

+               for (i = 0; i < 3; i++) {

+                  value[i] = ctx->Light.Light[ln].Diffuse[i] *

+                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][i];

+               }

+               /* [3] = material alpha */

+               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][3];

+               return;

+            case STATE_SPECULAR:

+               for (i = 0; i < 3; i++) {

+                  value[i] = ctx->Light.Light[ln].Specular[i] *

+                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SPECULAR+face][i];

+               }

+               /* [3] = material alpha */

+               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SPECULAR+face][3];

+               return;

+            default:

+               _mesa_problem(ctx, "Invalid lightprod state in fetch_state");

+               return;

+         }

+      }

+   case STATE_TEXGEN:

+      {

+         /* state[1] is the texture unit */

+         const GLuint unit = (GLuint) state[1];

+         /* state[2] is the texgen attribute */

+         switch (state[2]) {

+         case STATE_TEXGEN_EYE_S:

+            COPY_4V(value, ctx->Texture.Unit[unit].GenS.EyePlane);

+            return;

+         case STATE_TEXGEN_EYE_T:

+            COPY_4V(value, ctx->Texture.Unit[unit].GenT.EyePlane);

+            return;

+         case STATE_TEXGEN_EYE_R:

+            COPY_4V(value, ctx->Texture.Unit[unit].GenR.EyePlane);

+            return;

+         case STATE_TEXGEN_EYE_Q:

+            COPY_4V(value, ctx->Texture.Unit[unit].GenQ.EyePlane);

+            return;

+         case STATE_TEXGEN_OBJECT_S:

+            COPY_4V(value, ctx->Texture.Unit[unit].GenS.ObjectPlane);

+            return;

+         case STATE_TEXGEN_OBJECT_T:

+            COPY_4V(value, ctx->Texture.Unit[unit].GenT.ObjectPlane);

+            return;

+         case STATE_TEXGEN_OBJECT_R:

+            COPY_4V(value, ctx->Texture.Unit[unit].GenR.ObjectPlane);

+            return;

+         case STATE_TEXGEN_OBJECT_Q:

+            COPY_4V(value, ctx->Texture.Unit[unit].GenQ.ObjectPlane);

+            return;

+         default:

+            _mesa_problem(ctx, "Invalid texgen state in fetch_state");

+            return;

+         }

+      }

+   case STATE_TEXENV_COLOR:

+      {

+         /* state[1] is the texture unit */

+         const GLuint unit = (GLuint) state[1];

+         if(ctx->Color._ClampFragmentColor)

+            COPY_4V(value, ctx->Texture.Unit[unit].EnvColor);

+         else

+            COPY_4V(value, ctx->Texture.Unit[unit].EnvColorUnclamped);

+      }

+      return;

+   case STATE_FOG_COLOR:

+      if(ctx->Color._ClampFragmentColor)

+         COPY_4V(value, ctx->Fog.Color);

+      else

+         COPY_4V(value, ctx->Fog.ColorUnclamped);

+      return;

+   case STATE_FOG_PARAMS:

+      value[0] = ctx->Fog.Density;

+      value[1] = ctx->Fog.Start;

+      value[2] = ctx->Fog.End;

+      value[3] = (ctx->Fog.End == ctx->Fog.Start)

+         ? 1.0f : (GLfloat)(1.0 / (ctx->Fog.End - ctx->Fog.Start));

+      return;

+   case STATE_CLIPPLANE:

+      {

+         const GLuint plane = (GLuint) state[1];

+         COPY_4V(value, ctx->Transform.EyeUserPlane[plane]);

+      }

+      return;

+   case STATE_POINT_SIZE:

+      value[0] = ctx->Point.Size;

+      value[1] = ctx->Point.MinSize;

+      value[2] = ctx->Point.MaxSize;

+      value[3] = ctx->Point.Threshold;

+      return;

+   case STATE_POINT_ATTENUATION:

+      value[0] = ctx->Point.Params[0];

+      value[1] = ctx->Point.Params[1];

+      value[2] = ctx->Point.Params[2];

+      value[3] = 1.0F;

+      return;

+   case STATE_MODELVIEW_MATRIX:

+   case STATE_PROJECTION_MATRIX:

+   case STATE_MVP_MATRIX:

+   case STATE_TEXTURE_MATRIX:

+   case STATE_PROGRAM_MATRIX:

+      {

+         /* state[0] = modelview, projection, texture, etc. */

+         /* state[1] = which texture matrix or program matrix */

+         /* state[2] = first row to fetch */

+         /* state[3] = last row to fetch */

+         /* state[4] = transpose, inverse or invtrans */

+         const GLmatrix *matrix;

+         const gl_state_index mat = state[0];

+         const GLuint index = (GLuint) state[1];

+         const GLuint firstRow = (GLuint) state[2];

+         const GLuint lastRow = (GLuint) state[3];

+         const gl_state_index modifier = state[4];

+         const GLfloat *m;

+         GLuint row, i;

+         ASSERT(firstRow >= 0);

+         ASSERT(firstRow < 4);

+         ASSERT(lastRow >= 0);

+         ASSERT(lastRow < 4);

+         if (mat == STATE_MODELVIEW_MATRIX) {

+            matrix = ctx->ModelviewMatrixStack.Top;

+         }

+         else if (mat == STATE_PROJECTION_MATRIX) {

+            matrix = ctx->ProjectionMatrixStack.Top;

+         }

+         else if (mat == STATE_MVP_MATRIX) {

+            matrix = &ctx->_ModelProjectMatrix;

+         }

+         else if (mat == STATE_TEXTURE_MATRIX) {

+            ASSERT(index < Elements(ctx->TextureMatrixStack));

+            matrix = ctx->TextureMatrixStack[index].Top;

+         }

+         else if (mat == STATE_PROGRAM_MATRIX) {

+            ASSERT(index < Elements(ctx->ProgramMatrixStack));

+            matrix = ctx->ProgramMatrixStack[index].Top;

+         }

+         else {

+            _mesa_problem(ctx, "Bad matrix name in _mesa_fetch_state()");

+            return;

+         }

+         if (modifier == STATE_MATRIX_INVERSE ||

+             modifier == STATE_MATRIX_INVTRANS) {

+            /* Be sure inverse is up to date:

+	     */

+            _math_matrix_alloc_inv( (GLmatrix *) matrix );

+	    _math_matrix_analyse( (GLmatrix*) matrix );

+            m = matrix->inv;

+         }

+         else {

+            m = matrix->m;

+         }

+         if (modifier == STATE_MATRIX_TRANSPOSE ||

+             modifier == STATE_MATRIX_INVTRANS) {

+            for (i = 0, row = firstRow; row <= lastRow; row++) {

+               value[i++] = m[row * 4 + 0];

+               value[i++] = m[row * 4 + 1];

+               value[i++] = m[row * 4 + 2];

+               value[i++] = m[row * 4 + 3];

+            }

+         }

+         else {

+            for (i = 0, row = firstRow; row <= lastRow; row++) {

+               value[i++] = m[row + 0];

+               value[i++] = m[row + 4];

+               value[i++] = m[row + 8];

+               value[i++] = m[row + 12];

+            }

+         }

+      }

+      return;

+   case STATE_DEPTH_RANGE:

+      value[0] = ctx->Viewport.Near;                     /* near       */

+      value[1] = ctx->Viewport.Far;                      /* far        */

+      value[2] = ctx->Viewport.Far - ctx->Viewport.Near; /* far - near */

+      value[3] = 1.0;

+      return;

+   case STATE_FRAGMENT_PROGRAM:

+      {

+         /* state[1] = {STATE_ENV, STATE_LOCAL} */

+         /* state[2] = parameter index          */

+         const int idx = (int) state[2];

+         switch (state[1]) {

+            case STATE_ENV:

+               COPY_4V(value, ctx->FragmentProgram.Parameters[idx]);

+               return;

+            case STATE_LOCAL:

+               COPY_4V(value, ctx->FragmentProgram.Current->Base.LocalParams[idx]);

+               return;

+            default:

+               _mesa_problem(ctx, "Bad state switch in _mesa_fetch_state()");

+               return;

+         }

+      }

+      return;

+

+   case STATE_VERTEX_PROGRAM:

+      {

+         /* state[1] = {STATE_ENV, STATE_LOCAL} */

+         /* state[2] = parameter index          */

+         const int idx = (int) state[2];

+         switch (state[1]) {

+            case STATE_ENV:

+               COPY_4V(value, ctx->VertexProgram.Parameters[idx]);

+               return;

+            case STATE_LOCAL:

+               COPY_4V(value, ctx->VertexProgram.Current->Base.LocalParams[idx]);

+               return;

+            default:

+               _mesa_problem(ctx, "Bad state switch in _mesa_fetch_state()");

+               return;

+         }

+      }

+      return;

+

+   case STATE_NORMAL_SCALE:

+      ASSIGN_4V(value, ctx->_ModelViewInvScale, 0, 0, 1);

+      return;

+

+   case STATE_INTERNAL:

+      switch (state[1]) {

+      case STATE_CURRENT_ATTRIB:

+         {

+            const GLuint idx = (GLuint) state[2];

+            COPY_4V(value, ctx->Current.Attrib[idx]);

+         }

+         return;

+

+      case STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED:

+         {

+            const GLuint idx = (GLuint) state[2];

+            if(ctx->Light._ClampVertexColor &&

+               (idx == VERT_ATTRIB_COLOR0 ||

+                idx == VERT_ATTRIB_COLOR1)) {

+               value[0] = CLAMP(ctx->Current.Attrib[idx][0], 0.0f, 1.0f);

+               value[1] = CLAMP(ctx->Current.Attrib[idx][1], 0.0f, 1.0f);

+               value[2] = CLAMP(ctx->Current.Attrib[idx][2], 0.0f, 1.0f);

+               value[3] = CLAMP(ctx->Current.Attrib[idx][3], 0.0f, 1.0f);

+            }

+            else

+               COPY_4V(value, ctx->Current.Attrib[idx]);

+         }

+         return;

+

+      case STATE_NORMAL_SCALE:

+         ASSIGN_4V(value, 

+                   ctx->_ModelViewInvScale, 

+                   ctx->_ModelViewInvScale, 

+                   ctx->_ModelViewInvScale, 

+                   1);

+         return;

+

+      case STATE_TEXRECT_SCALE:

+         /* Value = { 1/texWidth, 1/texHeight, 0, 1 }.

+          * Used to convert unnormalized texcoords to normalized texcoords.

+          */

+         {

+            const int unit = (int) state[2];

+            const struct gl_texture_object *texObj

+               = ctx->Texture.Unit[unit]._Current;

+            if (texObj) {

+               struct gl_texture_image *texImage = texObj->Image[0][0];

+               ASSIGN_4V(value,

+                         (GLfloat) (1.0 / texImage->Width),

+                         (GLfloat) (1.0 / texImage->Height),

+                         0.0f, 1.0f);

+            }

+         }

+         return;

+

+      case STATE_FOG_PARAMS_OPTIMIZED:

+         /* for simpler per-vertex/pixel fog calcs. POW (for EXP/EXP2 fog)

+          * might be more expensive than EX2 on some hw, plus it needs

+          * another constant (e) anyway. Linear fog can now be done with a

+          * single MAD.

+          * linear: fogcoord * -1/(end-start) + end/(end-start)

+          * exp: 2^-(density/ln(2) * fogcoord)

+          * exp2: 2^-((density/(ln(2)^2) * fogcoord)^2)

+          */

+         value[0] = (ctx->Fog.End == ctx->Fog.Start)

+            ? 1.0f : (GLfloat)(-1.0F / (ctx->Fog.End - ctx->Fog.Start));

+         value[1] = ctx->Fog.End * -value[0];

+         value[2] = (GLfloat)(ctx->Fog.Density * ONE_DIV_LN2);

+         value[3] = (GLfloat)(ctx->Fog.Density * ONE_DIV_SQRT_LN2);

+         return;

+

+      case STATE_POINT_SIZE_CLAMPED:

+         {

+           /* this includes implementation dependent limits, to avoid

+            * another potentially necessary clamp.

+            * Note: for sprites, point smooth (point AA) is ignored

+            * and we'll clamp to MinPointSizeAA and MaxPointSize, because we

+            * expect drivers will want to say their minimum for AA size is 0.0

+            * but for non-AA it's 1.0 (because normal points with size below 1.0

+            * need to get rounded up to 1.0, hence never disappear). GL does

+            * not specify max clamp size for sprites, other than it needs to be

+            * at least as large as max AA size, hence use non-AA size there.

+            */

+            GLfloat minImplSize;

+            GLfloat maxImplSize;

+            if (ctx->Point.PointSprite) {

+               minImplSize = ctx->Const.MinPointSizeAA;

+               maxImplSize = ctx->Const.MaxPointSize;

+            }

+            else if (ctx->Point.SmoothFlag || ctx->Multisample._Enabled) {

+               minImplSize = ctx->Const.MinPointSizeAA;

+               maxImplSize = ctx->Const.MaxPointSizeAA;

+            }

+            else {

+               minImplSize = ctx->Const.MinPointSize;

+               maxImplSize = ctx->Const.MaxPointSize;

+            }

+            value[0] = ctx->Point.Size;

+            value[1] = ctx->Point.MinSize >= minImplSize ? ctx->Point.MinSize : minImplSize;

+            value[2] = ctx->Point.MaxSize <= maxImplSize ? ctx->Point.MaxSize : maxImplSize;

+            value[3] = ctx->Point.Threshold;

+         }

+         return;

+      case STATE_POINT_SIZE_IMPL_CLAMP:

+         {

+           /* for implementation clamp only in vs */

+            GLfloat minImplSize;

+            GLfloat maxImplSize;

+            if (ctx->Point.PointSprite) {

+               minImplSize = ctx->Const.MinPointSizeAA;

+               maxImplSize = ctx->Const.MaxPointSize;

+            }

+            else if (ctx->Point.SmoothFlag || ctx->Multisample._Enabled) {

+               minImplSize = ctx->Const.MinPointSizeAA;

+               maxImplSize = ctx->Const.MaxPointSizeAA;

+            }

+            else {

+               minImplSize = ctx->Const.MinPointSize;

+               maxImplSize = ctx->Const.MaxPointSize;

+            }

+            value[0] = ctx->Point.Size;

+            value[1] = minImplSize;

+            value[2] = maxImplSize;

+            value[3] = ctx->Point.Threshold;

+         }

+         return;

+      case STATE_LIGHT_SPOT_DIR_NORMALIZED:

+         {

+            /* here, state[2] is the light number */

+            /* pre-normalize spot dir */

+            const GLuint ln = (GLuint) state[2];

+            COPY_3V(value, ctx->Light.Light[ln]._NormSpotDirection);

+            value[3] = ctx->Light.Light[ln]._CosCutoff;

+         }

+         return;

+

+      case STATE_LIGHT_POSITION:

+         {

+            const GLuint ln = (GLuint) state[2];

+            COPY_4V(value, ctx->Light.Light[ln]._Position);

+         }

+         return;

+

+      case STATE_LIGHT_POSITION_NORMALIZED:

+         {

+            const GLuint ln = (GLuint) state[2];

+            COPY_4V(value, ctx->Light.Light[ln]._Position);

+            NORMALIZE_3FV( value );

+         }

+         return;

+

+      case STATE_LIGHT_HALF_VECTOR:

+         {

+            const GLuint ln = (GLuint) state[2];

+            GLfloat p[3];

+            /* Compute infinite half angle vector:

+             *   halfVector = normalize(normalize(lightPos) + (0, 0, 1))

+             * light.EyePosition.w should be 0 for infinite lights.

+             */

+            COPY_3V(p, ctx->Light.Light[ln]._Position);

+            NORMALIZE_3FV(p);

+            ADD_3V(value, p, ctx->_EyeZDir);

+            NORMALIZE_3FV(value);

+            value[3] = 1.0;

+         }

+         return;

+

+      case STATE_PT_SCALE:

+         value[0] = ctx->Pixel.RedScale;

+         value[1] = ctx->Pixel.GreenScale;

+         value[2] = ctx->Pixel.BlueScale;

+         value[3] = ctx->Pixel.AlphaScale;

+         return;

+

+      case STATE_PT_BIAS:

+         value[0] = ctx->Pixel.RedBias;

+         value[1] = ctx->Pixel.GreenBias;

+         value[2] = ctx->Pixel.BlueBias;

+         value[3] = ctx->Pixel.AlphaBias;

+         return;

+

+      case STATE_SHADOW_AMBIENT:

+         {

+            const int unit = (int) state[2];

+            const struct gl_texture_object *texObj

+               = ctx->Texture.Unit[unit]._Current;

+            if (texObj) {

+               value[0] =

+               value[1] =

+               value[2] =

+               value[3] = texObj->CompareFailValue;

+            }

+         }

+         return;

+

+      case STATE_FB_SIZE:

+         value[0] = (GLfloat) (ctx->DrawBuffer->Width - 1);

+         value[1] = (GLfloat) (ctx->DrawBuffer->Height - 1);

+         value[2] = 0.0F;

+         value[3] = 0.0F;

+         return;

+

+      case STATE_FB_WPOS_Y_TRANSFORM:

+         /* A driver may negate this conditional by using ZW swizzle

+          * instead of XY (based on e.g. some other state). */

+         if (ctx->DrawBuffer->Name != 0) {

+            /* Identity (XY) followed by flipping Y upside down (ZW). */

+            value[0] = 1.0F;

+            value[1] = 0.0F;

+            value[2] = -1.0F;

+            value[3] = (GLfloat) (ctx->DrawBuffer->Height - 1);

+         } else {

+            /* Flipping Y upside down (XY) followed by identity (ZW). */

+            value[0] = -1.0F;

+            value[1] = (GLfloat) (ctx->DrawBuffer->Height - 1);

+            value[2] = 1.0F;

+            value[3] = 0.0F;

+         }

+         return;

+

+      case STATE_ROT_MATRIX_0:

+         {

+            const int unit = (int) state[2];

+            GLfloat *rotMat22 = ctx->Texture.Unit[unit].RotMatrix;

+            value[0] = rotMat22[0]; 

+            value[1] = rotMat22[2];

+            value[2] = 0.0;

+            value[3] = 0.0;

+         }

+         return;

+

+      case STATE_ROT_MATRIX_1:

+         {

+            const int unit = (int) state[2];

+            GLfloat *rotMat22 = ctx->Texture.Unit[unit].RotMatrix;

+            value[0] = rotMat22[1];

+            value[1] = rotMat22[3];

+            value[2] = 0.0;

+            value[3] = 0.0;

+         }

+         return;

+

+      /* XXX: make sure new tokens added here are also handled in the 

+       * _mesa_program_state_flags() switch, below.

+       */

+      default:

+         /* Unknown state indexes are silently ignored here.

+          * Drivers may do something special.

+          */

+         return;

+      }

+      return;

+

+   default:

+      _mesa_problem(ctx, "Invalid state in _mesa_fetch_state");

+      return;

+   }

+}

+

+

+/**

+ * Return a bitmask of the Mesa state flags (_NEW_* values) which would

+ * indicate that the given context state may have changed.

+ * The bitmask is used during validation to determine if we need to update

+ * vertex/fragment program parameters (like "state.material.color") when

+ * some GL state has changed.

+ */

+GLbitfield

+_mesa_program_state_flags(const gl_state_index state[STATE_LENGTH])

+{

+   switch (state[0]) {

+   case STATE_MATERIAL:

+   case STATE_LIGHT:

+   case STATE_LIGHTMODEL_AMBIENT:

+   case STATE_LIGHTMODEL_SCENECOLOR:

+   case STATE_LIGHTPROD:

+      return _NEW_LIGHT;

+

+   case STATE_TEXGEN:

+      return _NEW_TEXTURE;

+   case STATE_TEXENV_COLOR:

+      return _NEW_TEXTURE | _NEW_BUFFERS | _NEW_FRAG_CLAMP;

+

+   case STATE_FOG_COLOR:

+      return _NEW_FOG | _NEW_BUFFERS | _NEW_FRAG_CLAMP;

+   case STATE_FOG_PARAMS:

+      return _NEW_FOG;

+

+   case STATE_CLIPPLANE:

+      return _NEW_TRANSFORM;

+

+   case STATE_POINT_SIZE:

+   case STATE_POINT_ATTENUATION:

+      return _NEW_POINT;

+

+   case STATE_MODELVIEW_MATRIX:

+      return _NEW_MODELVIEW;

+   case STATE_PROJECTION_MATRIX:

+      return _NEW_PROJECTION;

+   case STATE_MVP_MATRIX:

+      return _NEW_MODELVIEW | _NEW_PROJECTION;

+   case STATE_TEXTURE_MATRIX:

+      return _NEW_TEXTURE_MATRIX;

+   case STATE_PROGRAM_MATRIX:

+      return _NEW_TRACK_MATRIX;

+

+   case STATE_DEPTH_RANGE:

+      return _NEW_VIEWPORT;

+

+   case STATE_FRAGMENT_PROGRAM:

+   case STATE_VERTEX_PROGRAM:

+      return _NEW_PROGRAM;

+

+   case STATE_NORMAL_SCALE:

+      return _NEW_MODELVIEW;

+

+   case STATE_INTERNAL:

+      switch (state[1]) {

+      case STATE_CURRENT_ATTRIB:

+         return _NEW_CURRENT_ATTRIB;

+      case STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED:

+         return _NEW_CURRENT_ATTRIB | _NEW_LIGHT | _NEW_BUFFERS;

+

+      case STATE_NORMAL_SCALE:

+         return _NEW_MODELVIEW;

+

+      case STATE_TEXRECT_SCALE:

+      case STATE_SHADOW_AMBIENT:

+      case STATE_ROT_MATRIX_0:

+      case STATE_ROT_MATRIX_1:

+	 return _NEW_TEXTURE;

+      case STATE_FOG_PARAMS_OPTIMIZED:

+	 return _NEW_FOG;

+      case STATE_POINT_SIZE_CLAMPED:

+      case STATE_POINT_SIZE_IMPL_CLAMP:

+         return _NEW_POINT | _NEW_MULTISAMPLE;

+      case STATE_LIGHT_SPOT_DIR_NORMALIZED:

+      case STATE_LIGHT_POSITION:

+      case STATE_LIGHT_POSITION_NORMALIZED:

+      case STATE_LIGHT_HALF_VECTOR:

+         return _NEW_LIGHT;

+

+      case STATE_PT_SCALE:

+      case STATE_PT_BIAS:

+         return _NEW_PIXEL;

+

+      case STATE_FB_SIZE:

+      case STATE_FB_WPOS_Y_TRANSFORM:

+         return _NEW_BUFFERS;

+

+      default:

+         /* unknown state indexes are silently ignored and

+         *  no flag set, since it is handled by the driver.

+         */

+	 return 0;

+      }

+

+   default:

+      _mesa_problem(NULL, "unexpected state[0] in make_state_flags()");

+      return 0;

+   }

+}

+

+

+static void

+append(char *dst, const char *src)

+{

+   while (*dst)

+      dst++;

+   while (*src)

+     *dst++ = *src++;

+   *dst = 0;

+}

+

+

+/**

+ * Convert token 'k' to a string, append it onto 'dst' string.

+ */

+static void

+append_token(char *dst, gl_state_index k)

+{

+   switch (k) {

+   case STATE_MATERIAL:

+      append(dst, "material");

+      break;

+   case STATE_LIGHT:

+      append(dst, "light");

+      break;

+   case STATE_LIGHTMODEL_AMBIENT:

+      append(dst, "lightmodel.ambient");

+      break;

+   case STATE_LIGHTMODEL_SCENECOLOR:

+      break;

+   case STATE_LIGHTPROD:

+      append(dst, "lightprod");

+      break;

+   case STATE_TEXGEN:

+      append(dst, "texgen");

+      break;

+   case STATE_FOG_COLOR:

+      append(dst, "fog.color");

+      break;

+   case STATE_FOG_PARAMS:

+      append(dst, "fog.params");

+      break;

+   case STATE_CLIPPLANE:

+      append(dst, "clip");

+      break;

+   case STATE_POINT_SIZE:

+      append(dst, "point.size");

+      break;

+   case STATE_POINT_ATTENUATION:

+      append(dst, "point.attenuation");

+      break;

+   case STATE_MODELVIEW_MATRIX:

+      append(dst, "matrix.modelview");

+      break;

+   case STATE_PROJECTION_MATRIX:

+      append(dst, "matrix.projection");

+      break;

+   case STATE_MVP_MATRIX:

+      append(dst, "matrix.mvp");

+      break;

+   case STATE_TEXTURE_MATRIX:

+      append(dst, "matrix.texture");

+      break;

+   case STATE_PROGRAM_MATRIX:

+      append(dst, "matrix.program");

+      break;

+   case STATE_MATRIX_INVERSE:

+      append(dst, ".inverse");

+      break;

+   case STATE_MATRIX_TRANSPOSE:

+      append(dst, ".transpose");

+      break;

+   case STATE_MATRIX_INVTRANS:

+      append(dst, ".invtrans");

+      break;

+   case STATE_AMBIENT:

+      append(dst, ".ambient");

+      break;

+   case STATE_DIFFUSE:

+      append(dst, ".diffuse");

+      break;

+   case STATE_SPECULAR:

+      append(dst, ".specular");

+      break;

+   case STATE_EMISSION:

+      append(dst, ".emission");

+      break;

+   case STATE_SHININESS:

+      append(dst, "lshininess");

+      break;

+   case STATE_HALF_VECTOR:

+      append(dst, ".half");

+      break;

+   case STATE_POSITION:

+      append(dst, ".position");

+      break;

+   case STATE_ATTENUATION:

+      append(dst, ".attenuation");

+      break;

+   case STATE_SPOT_DIRECTION:

+      append(dst, ".spot.direction");

+      break;

+   case STATE_SPOT_CUTOFF:

+      append(dst, ".spot.cutoff");

+      break;

+   case STATE_TEXGEN_EYE_S:

+      append(dst, ".eye.s");

+      break;

+   case STATE_TEXGEN_EYE_T:

+      append(dst, ".eye.t");

+      break;

+   case STATE_TEXGEN_EYE_R:

+      append(dst, ".eye.r");

+      break;

+   case STATE_TEXGEN_EYE_Q:

+      append(dst, ".eye.q");

+      break;

+   case STATE_TEXGEN_OBJECT_S:

+      append(dst, ".object.s");

+      break;

+   case STATE_TEXGEN_OBJECT_T:

+      append(dst, ".object.t");

+      break;

+   case STATE_TEXGEN_OBJECT_R:

+      append(dst, ".object.r");

+      break;

+   case STATE_TEXGEN_OBJECT_Q:

+      append(dst, ".object.q");

+      break;

+   case STATE_TEXENV_COLOR:

+      append(dst, "texenv");

+      break;

+   case STATE_DEPTH_RANGE:

+      append(dst, "depth.range");

+      break;

+   case STATE_VERTEX_PROGRAM:

+   case STATE_FRAGMENT_PROGRAM:

+      break;

+   case STATE_ENV:

+      append(dst, "env");

+      break;

+   case STATE_LOCAL:

+      append(dst, "local");

+      break;

+   /* BEGIN internal state vars */

+   case STATE_INTERNAL:

+      append(dst, ".internal.");

+      break;

+   case STATE_CURRENT_ATTRIB:

+      append(dst, "current");

+      break;

+   case STATE_NORMAL_SCALE:

+      append(dst, "normalScale");

+      break;

+   case STATE_TEXRECT_SCALE:

+      append(dst, "texrectScale");

+      break;

+   case STATE_FOG_PARAMS_OPTIMIZED:

+      append(dst, "fogParamsOptimized");

+      break;

+   case STATE_POINT_SIZE_CLAMPED:

+      append(dst, "pointSizeClamped");

+      break;

+   case STATE_POINT_SIZE_IMPL_CLAMP:

+      append(dst, "pointSizeImplClamp");

+      break;

+   case STATE_LIGHT_SPOT_DIR_NORMALIZED:

+      append(dst, "lightSpotDirNormalized");

+      break;

+   case STATE_LIGHT_POSITION:

+      append(dst, "lightPosition");

+      break;

+   case STATE_LIGHT_POSITION_NORMALIZED:

+      append(dst, "light.position.normalized");

+      break;

+   case STATE_LIGHT_HALF_VECTOR:

+      append(dst, "lightHalfVector");

+      break;

+   case STATE_PT_SCALE:

+      append(dst, "PTscale");

+      break;

+   case STATE_PT_BIAS:

+      append(dst, "PTbias");

+      break;

+   case STATE_SHADOW_AMBIENT:

+      append(dst, "CompareFailValue");

+      break;

+   case STATE_FB_SIZE:

+      append(dst, "FbSize");

+      break;

+   case STATE_FB_WPOS_Y_TRANSFORM:

+      append(dst, "FbWposYTransform");

+      break;

+   case STATE_ROT_MATRIX_0:

+      append(dst, "rotMatrixRow0");

+      break;

+   case STATE_ROT_MATRIX_1:

+      append(dst, "rotMatrixRow1");

+      break;

+   default:

+      /* probably STATE_INTERNAL_DRIVER+i (driver private state) */

+      append(dst, "driverState");

+   }

+}

+

+static void

+append_face(char *dst, GLint face)

+{

+   if (face == 0)

+      append(dst, "front.");

+   else

+      append(dst, "back.");

+}

+

+static void

+append_index(char *dst, GLint index)

+{

+   char s[20];

+   sprintf(s, "[%d]", index);

+   append(dst, s);

+}

+

+/**

+ * Make a string from the given state vector.

+ * For example, return "state.matrix.texture[2].inverse".

+ * Use free() to deallocate the string.

+ */

+char *

+_mesa_program_state_string(const gl_state_index state[STATE_LENGTH])

+{

+   char str[1000] = "";

+   char tmp[30];

+

+   append(str, "state.");

+   append_token(str, state[0]);

+

+   switch (state[0]) {

+   case STATE_MATERIAL:

+      append_face(str, state[1]);

+      append_token(str, state[2]);

+      break;

+   case STATE_LIGHT:

+      append_index(str, state[1]); /* light number [i]. */

+      append_token(str, state[2]); /* coefficients */

+      break;

+   case STATE_LIGHTMODEL_AMBIENT:

+      append(str, "lightmodel.ambient");

+      break;

+   case STATE_LIGHTMODEL_SCENECOLOR:

+      if (state[1] == 0) {

+         append(str, "lightmodel.front.scenecolor");

+      }

+      else {

+         append(str, "lightmodel.back.scenecolor");

+      }

+      break;

+   case STATE_LIGHTPROD:

+      append_index(str, state[1]); /* light number [i]. */

+      append_face(str, state[2]);

+      append_token(str, state[3]);

+      break;

+   case STATE_TEXGEN:

+      append_index(str, state[1]); /* tex unit [i] */

+      append_token(str, state[2]); /* plane coef */

+      break;

+   case STATE_TEXENV_COLOR:

+      append_index(str, state[1]); /* tex unit [i] */

+      append(str, "color");

+      break;

+   case STATE_CLIPPLANE:

+      append_index(str, state[1]); /* plane [i] */

+      append(str, ".plane");

+      break;

+   case STATE_MODELVIEW_MATRIX:

+   case STATE_PROJECTION_MATRIX:

+   case STATE_MVP_MATRIX:

+   case STATE_TEXTURE_MATRIX:

+   case STATE_PROGRAM_MATRIX:

+      {

+         /* state[0] = modelview, projection, texture, etc. */

+         /* state[1] = which texture matrix or program matrix */

+         /* state[2] = first row to fetch */

+         /* state[3] = last row to fetch */

+         /* state[4] = transpose, inverse or invtrans */

+         const gl_state_index mat = state[0];

+         const GLuint index = (GLuint) state[1];

+         const GLuint firstRow = (GLuint) state[2];

+         const GLuint lastRow = (GLuint) state[3];

+         const gl_state_index modifier = state[4];

+         if (index ||

+             mat == STATE_TEXTURE_MATRIX ||

+             mat == STATE_PROGRAM_MATRIX)

+            append_index(str, index);

+         if (modifier)

+            append_token(str, modifier);

+         if (firstRow == lastRow)

+            sprintf(tmp, ".row[%d]", firstRow);

+         else

+            sprintf(tmp, ".row[%d..%d]", firstRow, lastRow);

+         append(str, tmp);

+      }

+      break;

+   case STATE_POINT_SIZE:

+      break;

+   case STATE_POINT_ATTENUATION:

+      break;

+   case STATE_FOG_PARAMS:

+      break;

+   case STATE_FOG_COLOR:

+      break;

+   case STATE_DEPTH_RANGE:

+      break;

+   case STATE_FRAGMENT_PROGRAM:

+   case STATE_VERTEX_PROGRAM:

+      /* state[1] = {STATE_ENV, STATE_LOCAL} */

+      /* state[2] = parameter index          */

+      append_token(str, state[1]);

+      append_index(str, state[2]);

+      break;

+   case STATE_NORMAL_SCALE:

+      break;

+   case STATE_INTERNAL:

+      append_token(str, state[1]);

+      if (state[1] == STATE_CURRENT_ATTRIB)

+         append_index(str, state[2]);

+       break;

+   default:

+      _mesa_problem(NULL, "Invalid state in _mesa_program_state_string");

+      break;

+   }

+

+   return _mesa_strdup(str);

+}

+

+

+/**

+ * Loop over all the parameters in a parameter list.  If the parameter

+ * is a GL state reference, look up the current value of that state

+ * variable and put it into the parameter's Value[4] array.

+ * Other parameter types never change or are explicitly set by the user

+ * with glUniform() or glProgramParameter(), etc.

+ * This would be called at glBegin time.

+ */

+void

+_mesa_load_state_parameters(struct gl_context *ctx,

+                            struct gl_program_parameter_list *paramList)

+{

+   GLuint i;

+

+   if (!paramList)

+      return;

+

+   for (i = 0; i < paramList->NumParameters; i++) {

+      if (paramList->Parameters[i].Type == PROGRAM_STATE_VAR) {

+         _mesa_fetch_state(ctx,

+			   paramList->Parameters[i].StateIndexes,

+                           paramList->ParameterValues[i]);

+      }

+   }

+}

+

+

+/**

+ * Copy the 16 elements of a matrix into four consecutive program

+ * registers starting at 'pos'.

+ */

+static void

+load_matrix(GLfloat registers[][4], GLuint pos, const GLfloat mat[16])

+{

+   GLuint i;

+   for (i = 0; i < 4; i++) {

+      registers[pos + i][0] = mat[0 + i];

+      registers[pos + i][1] = mat[4 + i];

+      registers[pos + i][2] = mat[8 + i];

+      registers[pos + i][3] = mat[12 + i];

+   }

+}

+

+

+/**

+ * As above, but transpose the matrix.

+ */

+static void

+load_transpose_matrix(GLfloat registers[][4], GLuint pos,

+                      const GLfloat mat[16])

+{

+   memcpy(registers[pos], mat, 16 * sizeof(GLfloat));

+}

+

+

+/**

+ * Load current vertex program's parameter registers with tracked

+ * matrices (if NV program).  This only needs to be done per

+ * glBegin/glEnd, not per-vertex.

+ */

+void

+_mesa_load_tracked_matrices(struct gl_context *ctx)

+{

+   GLuint i;

+

+   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {

+      /* point 'mat' at source matrix */

+      GLmatrix *mat;

+      if (ctx->VertexProgram.TrackMatrix[i] == GL_MODELVIEW) {

+         mat = ctx->ModelviewMatrixStack.Top;

+      }

+      else if (ctx->VertexProgram.TrackMatrix[i] == GL_PROJECTION) {

+         mat = ctx->ProjectionMatrixStack.Top;

+      }

+      else if (ctx->VertexProgram.TrackMatrix[i] == GL_TEXTURE) {

+         GLuint unit = MIN2(ctx->Texture.CurrentUnit,

+                            Elements(ctx->TextureMatrixStack) - 1);

+         mat = ctx->TextureMatrixStack[unit].Top;

+      }

+      else if (ctx->VertexProgram.TrackMatrix[i]==GL_MODELVIEW_PROJECTION_NV) {

+         /* XXX verify the combined matrix is up to date */

+         mat = &ctx->_ModelProjectMatrix;

+      }

+      else if (ctx->VertexProgram.TrackMatrix[i] >= GL_MATRIX0_NV &&

+               ctx->VertexProgram.TrackMatrix[i] <= GL_MATRIX7_NV) {

+         GLuint n = ctx->VertexProgram.TrackMatrix[i] - GL_MATRIX0_NV;

+         ASSERT(n < Elements(ctx->ProgramMatrixStack));

+         mat = ctx->ProgramMatrixStack[n].Top;

+      }

+      else {

+         /* no matrix is tracked, but we leave the register values as-is */

+         assert(ctx->VertexProgram.TrackMatrix[i] == GL_NONE);

+         continue;

+      }

+

+      /* load the matrix values into sequential registers */

+      if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_IDENTITY_NV) {

+         load_matrix(ctx->VertexProgram.Parameters, i*4, mat->m);

+      }

+      else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_INVERSE_NV) {

+         _math_matrix_analyse(mat); /* update the inverse */

+         ASSERT(!_math_matrix_is_dirty(mat));

+         load_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv);

+      }

+      else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_TRANSPOSE_NV) {

+         load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->m);

+      }

+      else {

+         assert(ctx->VertexProgram.TrackMatrixTransform[i]

+                == GL_INVERSE_TRANSPOSE_NV);

+         _math_matrix_analyse(mat); /* update the inverse */

+         ASSERT(!_math_matrix_is_dirty(mat));

+         load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv);

+      }

+   }

+}

diff --git a/mesalib/src/mesa/program/prog_statevars.h b/mesalib/src/mesa/program/prog_statevars.h
index 9fe8d81b3..53cb1d1c2 100644
--- a/mesalib/src/mesa/program/prog_statevars.h
+++ b/mesalib/src/mesa/program/prog_statevars.h
@@ -1,148 +1,148 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-#ifndef PROG_STATEVARS_H
-#define PROG_STATEVARS_H
-
-#include "main/glheader.h"
-
-struct gl_context;
-struct gl_program_parameter_list;
-
-/**
- * Number of STATE_* values we need to address any GL state.
- * Used to dimension arrays.
- */
-#define STATE_LENGTH 5
-
-
-/**
- * Used for describing GL state referenced from inside ARB vertex and
- * fragment programs.
- * A string such as "state.light[0].ambient" gets translated into a
- * sequence of tokens such as [ STATE_LIGHT, 0, STATE_AMBIENT ].
- *
- * For state that's an array, like STATE_CLIPPLANE, the 2nd token [1] should
- * always be the array index.
- */
-typedef enum gl_state_index_ {
-   STATE_MATERIAL = 100,  /* start at 100 so small ints are seen as ints */
-
-   STATE_LIGHT,
-   STATE_LIGHTMODEL_AMBIENT,
-   STATE_LIGHTMODEL_SCENECOLOR,
-   STATE_LIGHTPROD,
-
-   STATE_TEXGEN,
-
-   STATE_FOG_COLOR,
-   STATE_FOG_PARAMS,
-
-   STATE_CLIPPLANE,
-
-   STATE_POINT_SIZE,
-   STATE_POINT_ATTENUATION,
-
-   STATE_MODELVIEW_MATRIX,
-   STATE_PROJECTION_MATRIX,
-   STATE_MVP_MATRIX,
-   STATE_TEXTURE_MATRIX,
-   STATE_PROGRAM_MATRIX,
-   STATE_MATRIX_INVERSE,
-   STATE_MATRIX_TRANSPOSE,
-   STATE_MATRIX_INVTRANS,
-
-   STATE_AMBIENT,
-   STATE_DIFFUSE,
-   STATE_SPECULAR,
-   STATE_EMISSION,
-   STATE_SHININESS,
-   STATE_HALF_VECTOR,
-
-   STATE_POSITION,       /**< xyzw = position */
-   STATE_ATTENUATION,    /**< xyz = attenuation, w = spot exponent */
-   STATE_SPOT_DIRECTION, /**< xyz = direction, w = cos(cutoff) */
-   STATE_SPOT_CUTOFF,    /**< x = cutoff, yzw = undefined */
-
-   STATE_TEXGEN_EYE_S,
-   STATE_TEXGEN_EYE_T,
-   STATE_TEXGEN_EYE_R,
-   STATE_TEXGEN_EYE_Q,
-   STATE_TEXGEN_OBJECT_S,
-   STATE_TEXGEN_OBJECT_T,
-   STATE_TEXGEN_OBJECT_R,
-   STATE_TEXGEN_OBJECT_Q,
-
-   STATE_TEXENV_COLOR,
-
-   STATE_DEPTH_RANGE,
-
-   STATE_VERTEX_PROGRAM,
-   STATE_FRAGMENT_PROGRAM,
-
-   STATE_ENV,
-   STATE_LOCAL,
-
-   STATE_INTERNAL,		/* Mesa additions */
-   STATE_CURRENT_ATTRIB,        /* ctx->Current vertex attrib value */
-   STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED,        /* ctx->Current vertex attrib value after passthrough vertex processing */
-   STATE_NORMAL_SCALE,
-   STATE_TEXRECT_SCALE,
-   STATE_FOG_PARAMS_OPTIMIZED,  /* for faster fog calc */
-   STATE_POINT_SIZE_CLAMPED,    /* includes implementation dependent size clamp */
-   STATE_POINT_SIZE_IMPL_CLAMP, /* for implementation clamp only in vs */
-   STATE_LIGHT_SPOT_DIR_NORMALIZED,   /* pre-normalized spot dir */
-   STATE_LIGHT_POSITION,              /* object vs eye space */
-   STATE_LIGHT_POSITION_NORMALIZED,   /* object vs eye space */
-   STATE_LIGHT_HALF_VECTOR,           /* object vs eye space */
-   STATE_PT_SCALE,              /**< Pixel transfer RGBA scale */
-   STATE_PT_BIAS,               /**< Pixel transfer RGBA bias */
-   STATE_SHADOW_AMBIENT,        /**< ARB_shadow_ambient fail value; token[2] is texture unit index */
-   STATE_FB_SIZE,               /**< (width-1, height-1, 0, 0) */
-   STATE_FB_WPOS_Y_TRANSFORM,   /**< (1, 0, -1, height-1) if a FBO is bound, (-1, height-1, 1, 0) otherwise */
-   STATE_ROT_MATRIX_0,          /**< ATI_envmap_bumpmap, rot matrix row 0 */
-   STATE_ROT_MATRIX_1,          /**< ATI_envmap_bumpmap, rot matrix row 1 */
-   STATE_INTERNAL_DRIVER	/* first available state index for drivers (must be last) */
-} gl_state_index;
-
-
-
-extern void
-_mesa_load_state_parameters(struct gl_context *ctx,
-                            struct gl_program_parameter_list *paramList);
-
-
-extern GLbitfield
-_mesa_program_state_flags(const gl_state_index state[STATE_LENGTH]);
-
-
-extern char *
-_mesa_program_state_string(const gl_state_index state[STATE_LENGTH]);
-
-
-extern void
-_mesa_load_tracked_matrices(struct gl_context *ctx);
-
-
-#endif /* PROG_STATEVARS_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+#ifndef PROG_STATEVARS_H

+#define PROG_STATEVARS_H

+

+#include "main/glheader.h"

+

+struct gl_context;

+struct gl_program_parameter_list;

+

+/**

+ * Number of STATE_* values we need to address any GL state.

+ * Used to dimension arrays.

+ */

+#define STATE_LENGTH 5

+

+

+/**

+ * Used for describing GL state referenced from inside ARB vertex and

+ * fragment programs.

+ * A string such as "state.light[0].ambient" gets translated into a

+ * sequence of tokens such as [ STATE_LIGHT, 0, STATE_AMBIENT ].

+ *

+ * For state that's an array, like STATE_CLIPPLANE, the 2nd token [1] should

+ * always be the array index.

+ */

+typedef enum gl_state_index_ {

+   STATE_MATERIAL = 100,  /* start at 100 so small ints are seen as ints */

+

+   STATE_LIGHT,

+   STATE_LIGHTMODEL_AMBIENT,

+   STATE_LIGHTMODEL_SCENECOLOR,

+   STATE_LIGHTPROD,

+

+   STATE_TEXGEN,

+

+   STATE_FOG_COLOR,

+   STATE_FOG_PARAMS,

+

+   STATE_CLIPPLANE,

+

+   STATE_POINT_SIZE,

+   STATE_POINT_ATTENUATION,

+

+   STATE_MODELVIEW_MATRIX,

+   STATE_PROJECTION_MATRIX,

+   STATE_MVP_MATRIX,

+   STATE_TEXTURE_MATRIX,

+   STATE_PROGRAM_MATRIX,

+   STATE_MATRIX_INVERSE,

+   STATE_MATRIX_TRANSPOSE,

+   STATE_MATRIX_INVTRANS,

+

+   STATE_AMBIENT,

+   STATE_DIFFUSE,

+   STATE_SPECULAR,

+   STATE_EMISSION,

+   STATE_SHININESS,

+   STATE_HALF_VECTOR,

+

+   STATE_POSITION,       /**< xyzw = position */

+   STATE_ATTENUATION,    /**< xyz = attenuation, w = spot exponent */

+   STATE_SPOT_DIRECTION, /**< xyz = direction, w = cos(cutoff) */

+   STATE_SPOT_CUTOFF,    /**< x = cutoff, yzw = undefined */

+

+   STATE_TEXGEN_EYE_S,

+   STATE_TEXGEN_EYE_T,

+   STATE_TEXGEN_EYE_R,

+   STATE_TEXGEN_EYE_Q,

+   STATE_TEXGEN_OBJECT_S,

+   STATE_TEXGEN_OBJECT_T,

+   STATE_TEXGEN_OBJECT_R,

+   STATE_TEXGEN_OBJECT_Q,

+

+   STATE_TEXENV_COLOR,

+

+   STATE_DEPTH_RANGE,

+

+   STATE_VERTEX_PROGRAM,

+   STATE_FRAGMENT_PROGRAM,

+

+   STATE_ENV,

+   STATE_LOCAL,

+

+   STATE_INTERNAL,		/* Mesa additions */

+   STATE_CURRENT_ATTRIB,        /* ctx->Current vertex attrib value */

+   STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED,        /* ctx->Current vertex attrib value after passthrough vertex processing */

+   STATE_NORMAL_SCALE,

+   STATE_TEXRECT_SCALE,

+   STATE_FOG_PARAMS_OPTIMIZED,  /* for faster fog calc */

+   STATE_POINT_SIZE_CLAMPED,    /* includes implementation dependent size clamp */

+   STATE_POINT_SIZE_IMPL_CLAMP, /* for implementation clamp only in vs */

+   STATE_LIGHT_SPOT_DIR_NORMALIZED,   /* pre-normalized spot dir */

+   STATE_LIGHT_POSITION,              /* object vs eye space */

+   STATE_LIGHT_POSITION_NORMALIZED,   /* object vs eye space */

+   STATE_LIGHT_HALF_VECTOR,           /* object vs eye space */

+   STATE_PT_SCALE,              /**< Pixel transfer RGBA scale */

+   STATE_PT_BIAS,               /**< Pixel transfer RGBA bias */

+   STATE_SHADOW_AMBIENT,        /**< ARB_shadow_ambient fail value; token[2] is texture unit index */

+   STATE_FB_SIZE,               /**< (width-1, height-1, 0, 0) */

+   STATE_FB_WPOS_Y_TRANSFORM,   /**< (1, 0, -1, height-1) if a FBO is bound, (-1, height-1, 1, 0) otherwise */

+   STATE_ROT_MATRIX_0,          /**< ATI_envmap_bumpmap, rot matrix row 0 */

+   STATE_ROT_MATRIX_1,          /**< ATI_envmap_bumpmap, rot matrix row 1 */

+   STATE_INTERNAL_DRIVER	/* first available state index for drivers (must be last) */

+} gl_state_index;

+

+

+

+extern void

+_mesa_load_state_parameters(struct gl_context *ctx,

+                            struct gl_program_parameter_list *paramList);

+

+

+extern GLbitfield

+_mesa_program_state_flags(const gl_state_index state[STATE_LENGTH]);

+

+

+extern char *

+_mesa_program_state_string(const gl_state_index state[STATE_LENGTH]);

+

+

+extern void

+_mesa_load_tracked_matrices(struct gl_context *ctx);

+

+

+#endif /* PROG_STATEVARS_H */

diff --git a/mesalib/src/mesa/program/program_parse.y b/mesalib/src/mesa/program/program_parse.y
index 19aa8ccdb..e63a9f1e1 100644
--- a/mesalib/src/mesa/program/program_parse.y
+++ b/mesalib/src/mesa/program/program_parse.y
@@ -1,2768 +1,2768 @@
-%{
-/*
- * Copyright © 2009 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "main/mtypes.h"
-#include "main/imports.h"
-#include "program/program.h"
-#include "program/prog_parameter.h"
-#include "program/prog_parameter_layout.h"
-#include "program/prog_statevars.h"
-#include "program/prog_instruction.h"
-
-#include "program/symbol_table.h"
-#include "program/program_parser.h"
-
-extern void *yy_scan_string(char *);
-extern void yy_delete_buffer(void *);
-
-static struct asm_symbol *declare_variable(struct asm_parser_state *state,
-    char *name, enum asm_type t, struct YYLTYPE *locp);
-
-static int add_state_reference(struct gl_program_parameter_list *param_list,
-    const gl_state_index tokens[STATE_LENGTH]);
-
-static int initialize_symbol_from_state(struct gl_program *prog,
-    struct asm_symbol *param_var, const gl_state_index tokens[STATE_LENGTH]);
-
-static int initialize_symbol_from_param(struct gl_program *prog,
-    struct asm_symbol *param_var, const gl_state_index tokens[STATE_LENGTH]);
-
-static int initialize_symbol_from_const(struct gl_program *prog,
-    struct asm_symbol *param_var, const struct asm_vector *vec,
-    GLboolean allowSwizzle);
-
-static int yyparse(struct asm_parser_state *state);
-
-static char *make_error_string(const char *fmt, ...);
-
-static void yyerror(struct YYLTYPE *locp, struct asm_parser_state *state,
-    const char *s);
-
-static int validate_inputs(struct YYLTYPE *locp,
-    struct asm_parser_state *state);
-
-static void init_dst_reg(struct prog_dst_register *r);
-
-static void set_dst_reg(struct prog_dst_register *r,
-                        gl_register_file file, GLint index);
-
-static void init_src_reg(struct asm_src_register *r);
-
-static void set_src_reg(struct asm_src_register *r,
-                        gl_register_file file, GLint index);
-
-static void set_src_reg_swz(struct asm_src_register *r,
-                            gl_register_file file, GLint index, GLuint swizzle);
-
-static void asm_instruction_set_operands(struct asm_instruction *inst,
-    const struct prog_dst_register *dst, const struct asm_src_register *src0,
-    const struct asm_src_register *src1, const struct asm_src_register *src2);
-
-static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op,
-    const struct prog_dst_register *dst, const struct asm_src_register *src0,
-    const struct asm_src_register *src1, const struct asm_src_register *src2);
-
-static struct asm_instruction *asm_instruction_copy_ctor(
-    const struct prog_instruction *base, const struct prog_dst_register *dst,
-    const struct asm_src_register *src0, const struct asm_src_register *src1,
-    const struct asm_src_register *src2);
-
-#ifndef FALSE
-#define FALSE 0
-#define TRUE (!FALSE)
-#endif
-
-#define YYLLOC_DEFAULT(Current, Rhs, N)					\
-   do {									\
-      if (YYID(N)) {							\
-	 (Current).first_line = YYRHSLOC(Rhs, 1).first_line;		\
-	 (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\
-	 (Current).position = YYRHSLOC(Rhs, 1).position;		\
-	 (Current).last_line = YYRHSLOC(Rhs, N).last_line;		\
-	 (Current).last_column = YYRHSLOC(Rhs, N).last_column;		\
-      } else {								\
-	 (Current).first_line = YYRHSLOC(Rhs, 0).last_line;		\
-	 (Current).last_line = (Current).first_line;			\
-	 (Current).first_column = YYRHSLOC(Rhs, 0).last_column;		\
-	 (Current).last_column = (Current).first_column;		\
-	 (Current).position = YYRHSLOC(Rhs, 0).position			\
-	    + (Current).first_column;					\
-      }									\
-   } while(YYID(0))
-
-#define YYLEX_PARAM state->scanner
-%}
-
-%pure-parser
-%locations
-%parse-param { struct asm_parser_state *state }
-%error-verbose
-%lex-param { void *scanner }
-
-%union {
-   struct asm_instruction *inst;
-   struct asm_symbol *sym;
-   struct asm_symbol temp_sym;
-   struct asm_swizzle_mask swiz_mask;
-   struct asm_src_register src_reg;
-   struct prog_dst_register dst_reg;
-   struct prog_instruction temp_inst;
-   char *string;
-   unsigned result;
-   unsigned attrib;
-   int integer;
-   float real;
-   gl_state_index state[STATE_LENGTH];
-   int negate;
-   struct asm_vector vector;
-   gl_inst_opcode opcode;
-
-   struct {
-      unsigned swz;
-      unsigned rgba_valid:1;
-      unsigned xyzw_valid:1;
-      unsigned negate:1;
-   } ext_swizzle;
-}
-
-%token ARBvp_10 ARBfp_10
-
-/* Tokens for assembler pseudo-ops */
-%token <integer> ADDRESS
-%token ALIAS ATTRIB
-%token OPTION OUTPUT
-%token PARAM
-%token <integer> TEMP
-%token END
-
- /* Tokens for instructions */
-%token <temp_inst> BIN_OP BINSC_OP SAMPLE_OP SCALAR_OP TRI_OP VECTOR_OP
-%token <temp_inst> ARL KIL SWZ TXD_OP
-
-%token <integer> INTEGER
-%token <real> REAL
-
-%token AMBIENT ATTENUATION
-%token BACK
-%token CLIP COLOR
-%token DEPTH DIFFUSE DIRECTION
-%token EMISSION ENV EYE
-%token FOG FOGCOORD FRAGMENT FRONT
-%token HALF
-%token INVERSE INVTRANS
-%token LIGHT LIGHTMODEL LIGHTPROD LOCAL
-%token MATERIAL MAT_PROGRAM MATRIX MATRIXINDEX MODELVIEW MVP
-%token NORMAL
-%token OBJECT
-%token PALETTE PARAMS PLANE POINT_TOK POINTSIZE POSITION PRIMARY PROGRAM PROJECTION
-%token RANGE RESULT ROW
-%token SCENECOLOR SECONDARY SHININESS SIZE_TOK SPECULAR SPOT STATE
-%token TEXCOORD TEXENV TEXGEN TEXGEN_Q TEXGEN_R TEXGEN_S TEXGEN_T TEXTURE TRANSPOSE
-%token TEXTURE_UNIT TEX_1D TEX_2D TEX_3D TEX_CUBE TEX_RECT
-%token TEX_SHADOW1D TEX_SHADOW2D TEX_SHADOWRECT
-%token TEX_ARRAY1D TEX_ARRAY2D TEX_ARRAYSHADOW1D TEX_ARRAYSHADOW2D 
-%token VERTEX VTXATTRIB
-%token WEIGHT
-
-%token <string> IDENTIFIER USED_IDENTIFIER
-%type <string> string
-%token <swiz_mask> MASK4 MASK3 MASK2 MASK1 SWIZZLE
-%token DOT_DOT
-%token DOT
-
-%type <inst> instruction ALU_instruction TexInstruction
-%type <inst> ARL_instruction VECTORop_instruction
-%type <inst> SCALARop_instruction BINSCop_instruction BINop_instruction
-%type <inst> TRIop_instruction TXD_instruction SWZ_instruction SAMPLE_instruction
-%type <inst> KIL_instruction
-
-%type <dst_reg> dstReg maskedDstReg maskedAddrReg
-%type <src_reg> srcReg scalarUse scalarSrcReg swizzleSrcReg
-%type <swiz_mask> scalarSuffix swizzleSuffix extendedSwizzle
-%type <ext_swizzle> extSwizComp extSwizSel
-%type <swiz_mask> optionalMask
-
-%type <sym> progParamArray
-%type <integer> addrRegRelOffset addrRegPosOffset addrRegNegOffset
-%type <src_reg> progParamArrayMem progParamArrayAbs progParamArrayRel
-%type <sym> addrReg
-%type <swiz_mask> addrComponent addrWriteMask
-
-%type <dst_reg> ccMaskRule ccTest ccMaskRule2 ccTest2 optionalCcMask
-
-%type <result> resultBinding resultColBinding
-%type <integer> optFaceType optColorType
-%type <integer> optResultFaceType optResultColorType
-
-%type <integer> optTexImageUnitNum texImageUnitNum
-%type <integer> optTexCoordUnitNum texCoordUnitNum
-%type <integer> optLegacyTexUnitNum legacyTexUnitNum
-%type <integer> texImageUnit texTarget
-%type <integer> vtxAttribNum
-
-%type <attrib> attribBinding vtxAttribItem fragAttribItem
-
-%type <temp_sym> paramSingleInit paramSingleItemDecl
-%type <integer> optArraySize
-
-%type <state> stateSingleItem stateMultipleItem
-%type <state> stateMaterialItem
-%type <state> stateLightItem stateLightModelItem stateLightProdItem
-%type <state> stateTexGenItem stateFogItem stateClipPlaneItem statePointItem
-%type <state> stateMatrixItem stateMatrixRow stateMatrixRows
-%type <state> stateTexEnvItem stateDepthItem
-
-%type <state> stateLModProperty
-%type <state> stateMatrixName optMatrixRows
-
-%type <integer> stateMatProperty
-%type <integer> stateLightProperty stateSpotProperty
-%type <integer> stateLightNumber stateLProdProperty
-%type <integer> stateTexGenType stateTexGenCoord
-%type <integer> stateTexEnvProperty
-%type <integer> stateFogProperty
-%type <integer> stateClipPlaneNum
-%type <integer> statePointProperty
-
-%type <integer> stateOptMatModifier stateMatModifier stateMatrixRowNum
-%type <integer> stateOptModMatNum stateModMatNum statePaletteMatNum 
-%type <integer> stateProgramMatNum
-
-%type <integer> ambDiffSpecProperty
-
-%type <state> programSingleItem progEnvParam progLocalParam
-%type <state> programMultipleItem progEnvParams progLocalParams
-
-%type <temp_sym> paramMultipleInit paramMultInitList paramMultipleItem
-%type <temp_sym> paramSingleItemUse
-
-%type <integer> progEnvParamNum progLocalParamNum
-%type <state> progEnvParamNums progLocalParamNums
-
-%type <vector> paramConstDecl paramConstUse
-%type <vector> paramConstScalarDecl paramConstScalarUse paramConstVector
-%type <real> signedFloatConstant
-%type <negate> optionalSign
-
-%{
-extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
-    void *yyscanner);
-%}
-
-%%
-
-program: language optionSequence statementSequence END
-	;
-
-language: ARBvp_10
-	{
-	   if (state->prog->Target != GL_VERTEX_PROGRAM_ARB) {
-	      yyerror(& @1, state, "invalid fragment program header");
-
-	   }
-	   state->mode = ARB_vertex;
-	}
-	| ARBfp_10
-	{
-	   if (state->prog->Target != GL_FRAGMENT_PROGRAM_ARB) {
-	      yyerror(& @1, state, "invalid vertex program header");
-	   }
-	   state->mode = ARB_fragment;
-
-	   state->option.TexRect =
-	      (state->ctx->Extensions.NV_texture_rectangle != GL_FALSE);
-	}
-	;
-
-optionSequence: optionSequence option
-	|
-	;
-
-option: OPTION string ';'
-	{
-	   int valid = 0;
-
-	   if (state->mode == ARB_vertex) {
-	      valid = _mesa_ARBvp_parse_option(state, $2);
-	   } else if (state->mode == ARB_fragment) {
-	      valid = _mesa_ARBfp_parse_option(state, $2);
-	   }
-
-
-	   free($2);
-
-	   if (!valid) {
-	      const char *const err_str = (state->mode == ARB_vertex)
-		 ? "invalid ARB vertex program option"
-		 : "invalid ARB fragment program option";
-
-	      yyerror(& @2, state, err_str);
-	      YYERROR;
-	   }
-	}
-	;
-
-statementSequence: statementSequence statement
-	|
-	;
-
-statement: instruction ';'
-	{
-	   if ($1 != NULL) {
-	      if (state->inst_tail == NULL) {
-		 state->inst_head = $1;
-	      } else {
-		 state->inst_tail->next = $1;
-	      }
-
-	      state->inst_tail = $1;
-	      $1->next = NULL;
-
-	      state->prog->NumInstructions++;
-	   }
-	}
-	| namingStatement ';'
-	;
-
-instruction: ALU_instruction
-	{
-	   $$ = $1;
-	   state->prog->NumAluInstructions++;
-	}
-	| TexInstruction
-	{
-	   $$ = $1;
-	   state->prog->NumTexInstructions++;
-	}
-	;
-
-ALU_instruction: ARL_instruction
-	| VECTORop_instruction
-	| SCALARop_instruction
-	| BINSCop_instruction
-	| BINop_instruction
-	| TRIop_instruction
-	| SWZ_instruction
-	;
-
-TexInstruction: SAMPLE_instruction
-	| KIL_instruction
-	| TXD_instruction
-	;
-
-ARL_instruction: ARL maskedAddrReg ',' scalarSrcReg
-	{
-	   $$ = asm_instruction_ctor(OPCODE_ARL, & $2, & $4, NULL, NULL);
-	}
-	;
-
-VECTORop_instruction: VECTOR_OP maskedDstReg ',' swizzleSrcReg
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
-	}
-	;
-
-SCALARop_instruction: SCALAR_OP maskedDstReg ',' scalarSrcReg
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
-	}
-	;
-
-BINSCop_instruction: BINSC_OP maskedDstReg ',' scalarSrcReg ',' scalarSrcReg
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, NULL);
-	}
-	;
-
-
-BINop_instruction: BIN_OP maskedDstReg ',' swizzleSrcReg ',' swizzleSrcReg
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, NULL);
-	}
-	;
-
-TRIop_instruction: TRI_OP maskedDstReg ','
-                   swizzleSrcReg ',' swizzleSrcReg ',' swizzleSrcReg
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, & $8);
-	}
-	;
-
-SAMPLE_instruction: SAMPLE_OP maskedDstReg ',' swizzleSrcReg ',' texImageUnit ',' texTarget
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
-	   if ($$ != NULL) {
-	      const GLbitfield tex_mask = (1U << $6);
-	      GLbitfield shadow_tex = 0;
-	      GLbitfield target_mask = 0;
-
-
-	      $$->Base.TexSrcUnit = $6;
-
-	      if ($8 < 0) {
-		 shadow_tex = tex_mask;
-
-		 $$->Base.TexSrcTarget = -$8;
-		 $$->Base.TexShadow = 1;
-	      } else {
-		 $$->Base.TexSrcTarget = $8;
-	      }
-
-	      target_mask = (1U << $$->Base.TexSrcTarget);
-
-	      /* If this texture unit was previously accessed and that access
-	       * had a different texture target, generate an error.
-	       *
-	       * If this texture unit was previously accessed and that access
-	       * had a different shadow mode, generate an error.
-	       */
-	      if ((state->prog->TexturesUsed[$6] != 0)
-		  && ((state->prog->TexturesUsed[$6] != target_mask)
-		      || ((state->prog->ShadowSamplers & tex_mask)
-			  != shadow_tex))) {
-		 yyerror(& @8, state,
-			 "multiple targets used on one texture image unit");
-		 YYERROR;
-	      }
-
-
-	      state->prog->TexturesUsed[$6] |= target_mask;
-	      state->prog->ShadowSamplers |= shadow_tex;
-	   }
-	}
-	;
-
-KIL_instruction: KIL swizzleSrcReg
-	{
-	   $$ = asm_instruction_ctor(OPCODE_KIL, NULL, & $2, NULL, NULL);
-	   state->fragment.UsesKill = 1;
-	}
-	| KIL ccTest
-	{
-	   $$ = asm_instruction_ctor(OPCODE_KIL_NV, NULL, NULL, NULL, NULL);
-	   $$->Base.DstReg.CondMask = $2.CondMask;
-	   $$->Base.DstReg.CondSwizzle = $2.CondSwizzle;
-	   $$->Base.DstReg.CondSrc = $2.CondSrc;
-	   state->fragment.UsesKill = 1;
-	}
-	;
-
-TXD_instruction: TXD_OP maskedDstReg ',' swizzleSrcReg ',' swizzleSrcReg ',' swizzleSrcReg ',' texImageUnit ',' texTarget
-	{
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, & $8);
-	   if ($$ != NULL) {
-	      const GLbitfield tex_mask = (1U << $10);
-	      GLbitfield shadow_tex = 0;
-	      GLbitfield target_mask = 0;
-
-
-	      $$->Base.TexSrcUnit = $10;
-
-	      if ($12 < 0) {
-		 shadow_tex = tex_mask;
-
-		 $$->Base.TexSrcTarget = -$12;
-		 $$->Base.TexShadow = 1;
-	      } else {
-		 $$->Base.TexSrcTarget = $12;
-	      }
-
-	      target_mask = (1U << $$->Base.TexSrcTarget);
-
-	      /* If this texture unit was previously accessed and that access
-	       * had a different texture target, generate an error.
-	       *
-	       * If this texture unit was previously accessed and that access
-	       * had a different shadow mode, generate an error.
-	       */
-	      if ((state->prog->TexturesUsed[$10] != 0)
-		  && ((state->prog->TexturesUsed[$10] != target_mask)
-		      || ((state->prog->ShadowSamplers & tex_mask)
-			  != shadow_tex))) {
-		 yyerror(& @12, state,
-			 "multiple targets used on one texture image unit");
-		 YYERROR;
-	      }
-
-
-	      state->prog->TexturesUsed[$10] |= target_mask;
-	      state->prog->ShadowSamplers |= shadow_tex;
-	   }
-	}
-	;
-
-texImageUnit: TEXTURE_UNIT optTexImageUnitNum
-	{
-	   $$ = $2;
-	}
-	;
-
-texTarget: TEX_1D  { $$ = TEXTURE_1D_INDEX; }
-	| TEX_2D   { $$ = TEXTURE_2D_INDEX; }
-	| TEX_3D   { $$ = TEXTURE_3D_INDEX; }
-	| TEX_CUBE { $$ = TEXTURE_CUBE_INDEX; }
-	| TEX_RECT { $$ = TEXTURE_RECT_INDEX; }
-	| TEX_SHADOW1D   { $$ = -TEXTURE_1D_INDEX; }
-	| TEX_SHADOW2D   { $$ = -TEXTURE_2D_INDEX; }
-	| TEX_SHADOWRECT { $$ = -TEXTURE_RECT_INDEX; }
-	| TEX_ARRAY1D         { $$ = TEXTURE_1D_ARRAY_INDEX; }
-	| TEX_ARRAY2D         { $$ = TEXTURE_2D_ARRAY_INDEX; }
-	| TEX_ARRAYSHADOW1D   { $$ = -TEXTURE_1D_ARRAY_INDEX; }
-	| TEX_ARRAYSHADOW2D   { $$ = -TEXTURE_2D_ARRAY_INDEX; }
-	;
-
-SWZ_instruction: SWZ maskedDstReg ',' srcReg ',' extendedSwizzle
-	{
-	   /* FIXME: Is this correct?  Should the extenedSwizzle be applied
-	    * FIXME: to the existing swizzle?
-	    */
-	   $4.Base.Swizzle = $6.swizzle;
-	   $4.Base.Negate = $6.mask;
-
-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
-	}
-	;
-
-scalarSrcReg: optionalSign scalarUse
-	{
-	   $$ = $2;
-
-	   if ($1) {
-	      $$.Base.Negate = ~$$.Base.Negate;
-	   }
-	}
-	| optionalSign '|' scalarUse '|'
-	{
-	   $$ = $3;
-
-	   if (!state->option.NV_fragment) {
-	      yyerror(& @2, state, "unexpected character '|'");
-	      YYERROR;
-	   }
-
-	   if ($1) {
-	      $$.Base.Negate = ~$$.Base.Negate;
-	   }
-
-	   $$.Base.Abs = 1;
-	}
-	;
-
-scalarUse:  srcReg scalarSuffix
-	{
-	   $$ = $1;
-
-	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,
-						    $2.swizzle);
-	}
-	| paramConstScalarUse
-	{
-	   struct asm_symbol temp_sym;
-
-	   if (!state->option.NV_fragment) {
-	      yyerror(& @1, state, "expected scalar suffix");
-	      YYERROR;
-	   }
-
-	   memset(& temp_sym, 0, sizeof(temp_sym));
-	   temp_sym.param_binding_begin = ~0;
-	   initialize_symbol_from_const(state->prog, & temp_sym, & $1, GL_TRUE);
-
-	   set_src_reg_swz(& $$, PROGRAM_CONSTANT,
-                           temp_sym.param_binding_begin,
-                           temp_sym.param_binding_swizzle);
-	}
-	;
-
-swizzleSrcReg: optionalSign srcReg swizzleSuffix
-	{
-	   $$ = $2;
-
-	   if ($1) {
-	      $$.Base.Negate = ~$$.Base.Negate;
-	   }
-
-	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,
-						    $3.swizzle);
-	}
-	| optionalSign '|' srcReg swizzleSuffix '|'
-	{
-	   $$ = $3;
-
-	   if (!state->option.NV_fragment) {
-	      yyerror(& @2, state, "unexpected character '|'");
-	      YYERROR;
-	   }
-
-	   if ($1) {
-	      $$.Base.Negate = ~$$.Base.Negate;
-	   }
-
-	   $$.Base.Abs = 1;
-	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,
-						    $4.swizzle);
-	}
-
-	;
-
-maskedDstReg: dstReg optionalMask optionalCcMask
-	{
-	   $$ = $1;
-	   $$.WriteMask = $2.mask;
-	   $$.CondMask = $3.CondMask;
-	   $$.CondSwizzle = $3.CondSwizzle;
-	   $$.CondSrc = $3.CondSrc;
-
-	   if ($$.File == PROGRAM_OUTPUT) {
-	      /* Technically speaking, this should check that it is in
-	       * vertex program mode.  However, PositionInvariant can never be
-	       * set in fragment program mode, so it is somewhat irrelevant.
-	       */
-	      if (state->option.PositionInvariant
-	       && ($$.Index == VERT_RESULT_HPOS)) {
-		 yyerror(& @1, state, "position-invariant programs cannot "
-			 "write position");
-		 YYERROR;
-	      }
-
-	      state->prog->OutputsWritten |= BITFIELD64_BIT($$.Index);
-	   }
-	}
-	;
-
-maskedAddrReg: addrReg addrWriteMask
-	{
-	   set_dst_reg(& $$, PROGRAM_ADDRESS, 0);
-	   $$.WriteMask = $2.mask;
-	}
-	;
-
-extendedSwizzle: extSwizComp ',' extSwizComp ',' extSwizComp ',' extSwizComp
-	{
-	   const unsigned xyzw_valid =
-	      ($1.xyzw_valid << 0)
-	      | ($3.xyzw_valid << 1)
-	      | ($5.xyzw_valid << 2)
-	      | ($7.xyzw_valid << 3);
-	   const unsigned rgba_valid =
-	      ($1.rgba_valid << 0)
-	      | ($3.rgba_valid << 1)
-	      | ($5.rgba_valid << 2)
-	      | ($7.rgba_valid << 3);
-
-	   /* All of the swizzle components have to be valid in either RGBA
-	    * or XYZW.  Note that 0 and 1 are valid in both, so both masks
-	    * can have some bits set.
-	    *
-	    * We somewhat deviate from the spec here.  It would be really hard
-	    * to figure out which component is the error, and there probably
-	    * isn't a lot of benefit.
-	    */
-	   if ((rgba_valid != 0x0f) && (xyzw_valid != 0x0f)) {
-	      yyerror(& @1, state, "cannot combine RGBA and XYZW swizzle "
-		      "components");
-	      YYERROR;
-	   }
-
-	   $$.swizzle = MAKE_SWIZZLE4($1.swz, $3.swz, $5.swz, $7.swz);
-	   $$.mask = ($1.negate) | ($3.negate << 1) | ($5.negate << 2)
-	      | ($7.negate << 3);
-	}
-	;
-
-extSwizComp: optionalSign extSwizSel
-	{
-	   $$ = $2;
-	   $$.negate = ($1) ? 1 : 0;
-	}
-	;
-
-extSwizSel: INTEGER
-	{
-	   if (($1 != 0) && ($1 != 1)) {
-	      yyerror(& @1, state, "invalid extended swizzle selector");
-	      YYERROR;
-	   }
-
-	   $$.swz = ($1 == 0) ? SWIZZLE_ZERO : SWIZZLE_ONE;
-
-	   /* 0 and 1 are valid for both RGBA swizzle names and XYZW
-	    * swizzle names.
-	    */
-	   $$.xyzw_valid = 1;
-	   $$.rgba_valid = 1;
-	}
-	| string
-	{
-	   char s;
-
-	   if (strlen($1) > 1) {
-	      yyerror(& @1, state, "invalid extended swizzle selector");
-	      YYERROR;
-	   }
-
-	   s = $1[0];
-	   free($1);
-
-	   switch (s) {
-	   case 'x':
-	      $$.swz = SWIZZLE_X;
-	      $$.xyzw_valid = 1;
-	      break;
-	   case 'y':
-	      $$.swz = SWIZZLE_Y;
-	      $$.xyzw_valid = 1;
-	      break;
-	   case 'z':
-	      $$.swz = SWIZZLE_Z;
-	      $$.xyzw_valid = 1;
-	      break;
-	   case 'w':
-	      $$.swz = SWIZZLE_W;
-	      $$.xyzw_valid = 1;
-	      break;
-
-	   case 'r':
-	      $$.swz = SWIZZLE_X;
-	      $$.rgba_valid = 1;
-	      break;
-	   case 'g':
-	      $$.swz = SWIZZLE_Y;
-	      $$.rgba_valid = 1;
-	      break;
-	   case 'b':
-	      $$.swz = SWIZZLE_Z;
-	      $$.rgba_valid = 1;
-	      break;
-	   case 'a':
-	      $$.swz = SWIZZLE_W;
-	      $$.rgba_valid = 1;
-	      break;
-
-	   default:
-	      yyerror(& @1, state, "invalid extended swizzle selector");
-	      YYERROR;
-	      break;
-	   }
-	}
-	;
-
-srcReg: USED_IDENTIFIER /* temporaryReg | progParamSingle */
-	{
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
-
-	   free($1);
-
-	   if (s == NULL) {
-	      yyerror(& @1, state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type != at_param) && (s->type != at_temp)
-		      && (s->type != at_attrib)) {
-	      yyerror(& @1, state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type == at_param) && s->param_is_array) {
-	      yyerror(& @1, state, "non-array access to array PARAM");
-	      YYERROR;
-	   }
-
-	   init_src_reg(& $$);
-	   switch (s->type) {
-	   case at_temp:
-	      set_src_reg(& $$, PROGRAM_TEMPORARY, s->temp_binding);
-	      break;
-	   case at_param:
-              set_src_reg_swz(& $$, s->param_binding_type,
-                              s->param_binding_begin,
-                              s->param_binding_swizzle);
-	      break;
-	   case at_attrib:
-	      set_src_reg(& $$, PROGRAM_INPUT, s->attrib_binding);
-	      state->prog->InputsRead |= (1U << $$.Base.Index);
-
-	      if (!validate_inputs(& @1, state)) {
-		 YYERROR;
-	      }
-	      break;
-
-	   default:
-	      YYERROR;
-	      break;
-	   }
-	}
-	| attribBinding
-	{
-	   set_src_reg(& $$, PROGRAM_INPUT, $1);
-	   state->prog->InputsRead |= (1U << $$.Base.Index);
-
-	   if (!validate_inputs(& @1, state)) {
-	      YYERROR;
-	   }
-	}
-	| progParamArray '[' progParamArrayMem ']'
-	{
-	   if (! $3.Base.RelAddr
-	       && ((unsigned) $3.Base.Index >= $1->param_binding_length)) {
-	      yyerror(& @3, state, "out of bounds array access");
-	      YYERROR;
-	   }
-
-	   init_src_reg(& $$);
-	   $$.Base.File = $1->param_binding_type;
-
-	   if ($3.Base.RelAddr) {
-              state->prog->IndirectRegisterFiles |= (1 << $$.Base.File);
-	      $1->param_accessed_indirectly = 1;
-
-	      $$.Base.RelAddr = 1;
-	      $$.Base.Index = $3.Base.Index;
-	      $$.Symbol = $1;
-	   } else {
-	      $$.Base.Index = $1->param_binding_begin + $3.Base.Index;
-	   }
-	}
-	| paramSingleItemUse
-	{
-           gl_register_file file = ($1.name != NULL) 
-	      ? $1.param_binding_type
-	      : PROGRAM_CONSTANT;
-           set_src_reg_swz(& $$, file, $1.param_binding_begin,
-                           $1.param_binding_swizzle);
-	}
-	;
-
-dstReg: resultBinding
-	{
-	   set_dst_reg(& $$, PROGRAM_OUTPUT, $1);
-	}
-	| USED_IDENTIFIER /* temporaryReg | vertexResultReg */
-	{
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
-
-	   free($1);
-
-	   if (s == NULL) {
-	      yyerror(& @1, state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type != at_output) && (s->type != at_temp)) {
-	      yyerror(& @1, state, "invalid operand variable");
-	      YYERROR;
-	   }
-
-	   switch (s->type) {
-	   case at_temp:
-	      set_dst_reg(& $$, PROGRAM_TEMPORARY, s->temp_binding);
-	      break;
-	   case at_output:
-	      set_dst_reg(& $$, PROGRAM_OUTPUT, s->output_binding);
-	      break;
-	   default:
-	      set_dst_reg(& $$, s->param_binding_type, s->param_binding_begin);
-	      break;
-	   }
-	}
-	;
-
-progParamArray: USED_IDENTIFIER
-	{
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
-
-	   free($1);
-
-	   if (s == NULL) {
-	      yyerror(& @1, state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type != at_param) || !s->param_is_array) {
-	      yyerror(& @1, state, "array access to non-PARAM variable");
-	      YYERROR;
-	   } else {
-	      $$ = s;
-	   }
-	}
-	;
-
-progParamArrayMem: progParamArrayAbs | progParamArrayRel;
-
-progParamArrayAbs: INTEGER
-	{
-	   init_src_reg(& $$);
-	   $$.Base.Index = $1;
-	}
-	;
-
-progParamArrayRel: addrReg addrComponent addrRegRelOffset
-	{
-	   /* FINISHME: Add support for multiple address registers.
-	    */
-	   /* FINISHME: Add support for 4-component address registers.
-	    */
-	   init_src_reg(& $$);
-	   $$.Base.RelAddr = 1;
-	   $$.Base.Index = $3;
-	}
-	;
-
-addrRegRelOffset:              { $$ = 0; }
-	| '+' addrRegPosOffset { $$ = $2; }
-	| '-' addrRegNegOffset { $$ = -$2; }
-	;
-
-addrRegPosOffset: INTEGER
-	{
-	   if (($1 < 0) || ($1 > (state->limits->MaxAddressOffset - 1))) {
-              char s[100];
-              _mesa_snprintf(s, sizeof(s),
-                             "relative address offset too large (%d)", $1);
-	      yyerror(& @1, state, s);
-	      YYERROR;
-	   } else {
-	      $$ = $1;
-	   }
-	}
-	;
-
-addrRegNegOffset: INTEGER
-	{
-	   if (($1 < 0) || ($1 > state->limits->MaxAddressOffset)) {
-              char s[100];
-              _mesa_snprintf(s, sizeof(s),
-                             "relative address offset too large (%d)", $1);
-	      yyerror(& @1, state, s);
-	      YYERROR;
-	   } else {
-	      $$ = $1;
-	   }
-	}
-	;
-
-addrReg: USED_IDENTIFIER
-	{
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
-
-	   free($1);
-
-	   if (s == NULL) {
-	      yyerror(& @1, state, "invalid array member");
-	      YYERROR;
-	   } else if (s->type != at_address) {
-	      yyerror(& @1, state,
-		      "invalid variable for indexed array access");
-	      YYERROR;
-	   } else {
-	      $$ = s;
-	   }
-	}
-	;
-
-addrComponent: MASK1
-	{
-	   if ($1.mask != WRITEMASK_X) {
-	      yyerror(& @1, state, "invalid address component selector");
-	      YYERROR;
-	   } else {
-	      $$ = $1;
-	   }
-	}
-	;
-
-addrWriteMask: MASK1
-	{
-	   if ($1.mask != WRITEMASK_X) {
-	      yyerror(& @1, state,
-		      "address register write mask must be \".x\"");
-	      YYERROR;
-	   } else {
-	      $$ = $1;
-	   }
-	}
-	;
-
-scalarSuffix: MASK1;
-
-swizzleSuffix: MASK1
-	| MASK4
-	| SWIZZLE
-	|              { $$.swizzle = SWIZZLE_NOOP; $$.mask = WRITEMASK_XYZW; }
-	;
-
-optionalMask: MASK4 | MASK3 | MASK2 | MASK1 
-	|              { $$.swizzle = SWIZZLE_NOOP; $$.mask = WRITEMASK_XYZW; }
-	;
-
-optionalCcMask: '(' ccTest ')'
-	{
-	   $$ = $2;
-	}
-	| '(' ccTest2 ')'
-	{
-	   $$ = $2;
-	}
-	|
-	{
-	   $$.CondMask = COND_TR;
-	   $$.CondSwizzle = SWIZZLE_NOOP;
-	   $$.CondSrc = 0;
-	}
-	;
-
-ccTest: ccMaskRule swizzleSuffix
-	{
-	   $$ = $1;
-	   $$.CondSwizzle = $2.swizzle;
-	}
-	;
-
-ccTest2: ccMaskRule2 swizzleSuffix
-	{
-	   $$ = $1;
-	   $$.CondSwizzle = $2.swizzle;
-	}
-	;
-
-ccMaskRule: IDENTIFIER
-	{
-	   const int cond = _mesa_parse_cc($1);
-	   if ((cond == 0) || ($1[2] != '\0')) {
-	      char *const err_str =
-		 make_error_string("invalid condition code \"%s\"", $1);
-
-	      yyerror(& @1, state, (err_str != NULL)
-		      ? err_str : "invalid condition code");
-
-	      if (err_str != NULL) {
-		 free(err_str);
-	      }
-
-	      YYERROR;
-	   }
-
-	   $$.CondMask = cond;
-	   $$.CondSwizzle = SWIZZLE_NOOP;
-	   $$.CondSrc = 0;
-	}
-	;
-
-ccMaskRule2: USED_IDENTIFIER
-	{
-	   const int cond = _mesa_parse_cc($1);
-	   if ((cond == 0) || ($1[2] != '\0')) {
-	      char *const err_str =
-		 make_error_string("invalid condition code \"%s\"", $1);
-
-	      yyerror(& @1, state, (err_str != NULL)
-		      ? err_str : "invalid condition code");
-
-	      if (err_str != NULL) {
-		 free(err_str);
-	      }
-
-	      YYERROR;
-	   }
-
-	   $$.CondMask = cond;
-	   $$.CondSwizzle = SWIZZLE_NOOP;
-	   $$.CondSrc = 0;
-	}
-	;
-
-namingStatement: ATTRIB_statement
-	| PARAM_statement
-	| TEMP_statement
-	| ADDRESS_statement
-	| OUTPUT_statement
-	| ALIAS_statement
-	;
-
-ATTRIB_statement: ATTRIB IDENTIFIER '=' attribBinding
-	{
-	   struct asm_symbol *const s =
-	      declare_variable(state, $2, at_attrib, & @2);
-
-	   if (s == NULL) {
-	      free($2);
-	      YYERROR;
-	   } else {
-	      s->attrib_binding = $4;
-	      state->InputsBound |= (1U << s->attrib_binding);
-
-	      if (!validate_inputs(& @4, state)) {
-		 YYERROR;
-	      }
-	   }
-	}
-	;
-
-attribBinding: VERTEX vtxAttribItem
-	{
-	   $$ = $2;
-	}
-	| FRAGMENT fragAttribItem
-	{
-	   $$ = $2;
-	}
-	;
-
-vtxAttribItem: POSITION
-	{
-	   $$ = VERT_ATTRIB_POS;
-	}
-	| WEIGHT vtxOptWeightNum
-	{
-	   $$ = VERT_ATTRIB_WEIGHT;
-	}
-	| NORMAL
-	{
-	   $$ = VERT_ATTRIB_NORMAL;
-	}
-	| COLOR optColorType
-	{
-	   if (!state->ctx->Extensions.EXT_secondary_color) {
-	      yyerror(& @2, state, "GL_EXT_secondary_color not supported");
-	      YYERROR;
-	   }
-
-	   $$ = VERT_ATTRIB_COLOR0 + $2;
-	}
-	| FOGCOORD
-	{
-	   if (!state->ctx->Extensions.EXT_fog_coord) {
-	      yyerror(& @1, state, "GL_EXT_fog_coord not supported");
-	      YYERROR;
-	   }
-
-	   $$ = VERT_ATTRIB_FOG;
-	}
-	| TEXCOORD optTexCoordUnitNum
-	{
-	   $$ = VERT_ATTRIB_TEX0 + $2;
-	}
-	| MATRIXINDEX '[' vtxWeightNum ']'
-	{
-	   yyerror(& @1, state, "GL_ARB_matrix_palette not supported");
-	   YYERROR;
-	}
-	| VTXATTRIB '[' vtxAttribNum ']'
-	{
-	   $$ = VERT_ATTRIB_GENERIC0 + $3;
-	}
-	;
-
-vtxAttribNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->limits->MaxAttribs) {
-	      yyerror(& @1, state, "invalid vertex attribute reference");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-vtxOptWeightNum:  | '[' vtxWeightNum ']';
-vtxWeightNum: INTEGER;
-
-fragAttribItem: POSITION
-	{
-	   $$ = FRAG_ATTRIB_WPOS;
-	}
-	| COLOR optColorType
-	{
-	   $$ = FRAG_ATTRIB_COL0 + $2;
-	}
-	| FOGCOORD
-	{
-	   $$ = FRAG_ATTRIB_FOGC;
-	}
-	| TEXCOORD optTexCoordUnitNum
-	{
-	   $$ = FRAG_ATTRIB_TEX0 + $2;
-	}
-	;
-
-PARAM_statement: PARAM_singleStmt | PARAM_multipleStmt;
-
-PARAM_singleStmt: PARAM IDENTIFIER paramSingleInit
-	{
-	   struct asm_symbol *const s =
-	      declare_variable(state, $2, at_param, & @2);
-
-	   if (s == NULL) {
-	      free($2);
-	      YYERROR;
-	   } else {
-	      s->param_binding_type = $3.param_binding_type;
-	      s->param_binding_begin = $3.param_binding_begin;
-	      s->param_binding_length = $3.param_binding_length;
-              s->param_binding_swizzle = $3.param_binding_swizzle;
-	      s->param_is_array = 0;
-	   }
-	}
-	;
-
-PARAM_multipleStmt: PARAM IDENTIFIER '[' optArraySize ']' paramMultipleInit
-	{
-	   if (($4 != 0) && ((unsigned) $4 != $6.param_binding_length)) {
-	      free($2);
-	      yyerror(& @4, state, 
-		      "parameter array size and number of bindings must match");
-	      YYERROR;
-	   } else {
-	      struct asm_symbol *const s =
-		 declare_variable(state, $2, $6.type, & @2);
-
-	      if (s == NULL) {
-		 free($2);
-		 YYERROR;
-	      } else {
-		 s->param_binding_type = $6.param_binding_type;
-		 s->param_binding_begin = $6.param_binding_begin;
-		 s->param_binding_length = $6.param_binding_length;
-                 s->param_binding_swizzle = SWIZZLE_XYZW;
-		 s->param_is_array = 1;
-	      }
-	   }
-	}
-	;
-
-optArraySize:
-	{
-	   $$ = 0;
-	}
-	| INTEGER
-        {
-	   if (($1 < 1) || ((unsigned) $1 > state->limits->MaxParameters)) {
-	      yyerror(& @1, state, "invalid parameter array size");
-	      YYERROR;
-	   } else {
-	      $$ = $1;
-	   }
-	}
-	;
-
-paramSingleInit: '=' paramSingleItemDecl
-	{
-	   $$ = $2;
-	}
-	;
-
-paramMultipleInit: '=' '{' paramMultInitList '}'
-	{
-	   $$ = $3;
-	}
-	;
-
-paramMultInitList: paramMultipleItem
-	| paramMultInitList ',' paramMultipleItem
-	{
-	   $1.param_binding_length += $3.param_binding_length;
-	   $$ = $1;
-	}
-	;
-
-paramSingleItemDecl: stateSingleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_state(state->prog, & $$, $1);
-	}
-	| programSingleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_param(state->prog, & $$, $1);
-	}
-	| paramConstDecl
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_TRUE);
-	}
-	;
-
-paramSingleItemUse: stateSingleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_state(state->prog, & $$, $1);
-	}
-	| programSingleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_param(state->prog, & $$, $1);
-	}
-	| paramConstUse
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_TRUE);
-	}
-	;
-
-paramMultipleItem: stateMultipleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_state(state->prog, & $$, $1);
-	}
-	| programMultipleItem
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_param(state->prog, & $$, $1);
-	}
-	| paramConstDecl
-	{
-	   memset(& $$, 0, sizeof($$));
-	   $$.param_binding_begin = ~0;
-	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_FALSE);
-	}
-	;
-
-stateMultipleItem: stateSingleItem        { memcpy($$, $1, sizeof($$)); }
-	| STATE stateMatrixRows           { memcpy($$, $2, sizeof($$)); }
-	;
-
-stateSingleItem: STATE stateMaterialItem  { memcpy($$, $2, sizeof($$)); }
-	| STATE stateLightItem            { memcpy($$, $2, sizeof($$)); }
-	| STATE stateLightModelItem       { memcpy($$, $2, sizeof($$)); }
-	| STATE stateLightProdItem        { memcpy($$, $2, sizeof($$)); }
-	| STATE stateTexGenItem           { memcpy($$, $2, sizeof($$)); }
-	| STATE stateTexEnvItem           { memcpy($$, $2, sizeof($$)); }
-	| STATE stateFogItem              { memcpy($$, $2, sizeof($$)); }
-	| STATE stateClipPlaneItem        { memcpy($$, $2, sizeof($$)); }
-	| STATE statePointItem            { memcpy($$, $2, sizeof($$)); }
-	| STATE stateMatrixRow            { memcpy($$, $2, sizeof($$)); }
-	| STATE stateDepthItem            { memcpy($$, $2, sizeof($$)); }
-	;
-
-stateMaterialItem: MATERIAL optFaceType stateMatProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_MATERIAL;
-	   $$[1] = $2;
-	   $$[2] = $3;
-	}
-	;
-
-stateMatProperty: ambDiffSpecProperty
-	{
-	   $$ = $1;
-	}
-	| EMISSION
-	{
-	   $$ = STATE_EMISSION;
-	}
-	| SHININESS
-	{
-	   $$ = STATE_SHININESS;
-	}
-	;
-
-stateLightItem: LIGHT '[' stateLightNumber ']' stateLightProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_LIGHT;
-	   $$[1] = $3;
-	   $$[2] = $5;
-	}
-	;
-
-stateLightProperty: ambDiffSpecProperty
-	{
-	   $$ = $1;
-	}
-	| POSITION
-	{
-	   $$ = STATE_POSITION;
-	}
-	| ATTENUATION
-	{
-	   if (!state->ctx->Extensions.EXT_point_parameters) {
-	      yyerror(& @1, state, "GL_ARB_point_parameters not supported");
-	      YYERROR;
-	   }
-
-	   $$ = STATE_ATTENUATION;
-	}
-	| SPOT stateSpotProperty
-	{
-	   $$ = $2;
-	}
-	| HALF
-	{
-	   $$ = STATE_HALF_VECTOR;
-	}
-	;
-
-stateSpotProperty: DIRECTION
-	{
-	   $$ = STATE_SPOT_DIRECTION;
-	}
-	;
-
-stateLightModelItem: LIGHTMODEL stateLModProperty
-	{
-	   $$[0] = $2[0];
-	   $$[1] = $2[1];
-	}
-	;
-
-stateLModProperty: AMBIENT
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_LIGHTMODEL_AMBIENT;
-	}
-	| optFaceType SCENECOLOR
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_LIGHTMODEL_SCENECOLOR;
-	   $$[1] = $1;
-	}
-	;
-
-stateLightProdItem: LIGHTPROD '[' stateLightNumber ']' optFaceType stateLProdProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_LIGHTPROD;
-	   $$[1] = $3;
-	   $$[2] = $5;
-	   $$[3] = $6;
-	}
-	;
-
-stateLProdProperty: ambDiffSpecProperty;
-
-stateTexEnvItem: TEXENV optLegacyTexUnitNum stateTexEnvProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = $3;
-	   $$[1] = $2;
-	}
-	;
-
-stateTexEnvProperty: COLOR
-	{
-	   $$ = STATE_TEXENV_COLOR;
-	}
-	;
-
-ambDiffSpecProperty: AMBIENT
-	{
-	   $$ = STATE_AMBIENT;
-	}
-	| DIFFUSE
-	{
-	   $$ = STATE_DIFFUSE;
-	}
-	| SPECULAR
-	{
-	   $$ = STATE_SPECULAR;
-	}
-	;
-
-stateLightNumber: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxLights) {
-	      yyerror(& @1, state, "invalid light selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-stateTexGenItem: TEXGEN optTexCoordUnitNum stateTexGenType stateTexGenCoord
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_TEXGEN;
-	   $$[1] = $2;
-	   $$[2] = $3 + $4;
-	}
-	;
-
-stateTexGenType: EYE
-	{
-	   $$ = STATE_TEXGEN_EYE_S;
-	}
-	| OBJECT
-	{
-	   $$ = STATE_TEXGEN_OBJECT_S;
-	}
-	;
-stateTexGenCoord: TEXGEN_S
-	{
-	   $$ = STATE_TEXGEN_EYE_S - STATE_TEXGEN_EYE_S;
-	}
-	| TEXGEN_T
-	{
-	   $$ = STATE_TEXGEN_EYE_T - STATE_TEXGEN_EYE_S;
-	}
-	| TEXGEN_R
-	{
-	   $$ = STATE_TEXGEN_EYE_R - STATE_TEXGEN_EYE_S;
-	}
-	| TEXGEN_Q
-	{
-	   $$ = STATE_TEXGEN_EYE_Q - STATE_TEXGEN_EYE_S;
-	}
-	;
-
-stateFogItem: FOG stateFogProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = $2;
-	}
-	;
-
-stateFogProperty: COLOR
-	{
-	   $$ = STATE_FOG_COLOR;
-	}
-	| PARAMS
-	{
-	   $$ = STATE_FOG_PARAMS;
-	}
-	;
-
-stateClipPlaneItem: CLIP '[' stateClipPlaneNum ']' PLANE
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_CLIPPLANE;
-	   $$[1] = $3;
-	}
-	;
-
-stateClipPlaneNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxClipPlanes) {
-	      yyerror(& @1, state, "invalid clip plane selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-statePointItem: POINT_TOK statePointProperty
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = $2;
-	}
-	;
-
-statePointProperty: SIZE_TOK
-	{
-	   $$ = STATE_POINT_SIZE;
-	}
-	| ATTENUATION
-	{
-	   $$ = STATE_POINT_ATTENUATION;
-	}
-	;
-
-stateMatrixRow: stateMatrixItem ROW '[' stateMatrixRowNum ']'
-	{
-	   $$[0] = $1[0];
-	   $$[1] = $1[1];
-	   $$[2] = $4;
-	   $$[3] = $4;
-	   $$[4] = $1[2];
-	}
-	;
-
-stateMatrixRows: stateMatrixItem optMatrixRows
-	{
-	   $$[0] = $1[0];
-	   $$[1] = $1[1];
-	   $$[2] = $2[2];
-	   $$[3] = $2[3];
-	   $$[4] = $1[2];
-	}
-	;
-
-optMatrixRows:
-	{
-	   $$[2] = 0;
-	   $$[3] = 3;
-	}
-	| ROW '[' stateMatrixRowNum DOT_DOT stateMatrixRowNum ']'
-	{
-	   /* It seems logical that the matrix row range specifier would have
-	    * to specify a range or more than one row (i.e., $5 > $3).
-	    * However, the ARB_vertex_program spec says "a program will fail
-	    * to load if <a> is greater than <b>."  This means that $3 == $5
-	    * is valid.
-	    */
-	   if ($3 > $5) {
-	      yyerror(& @3, state, "invalid matrix row range");
-	      YYERROR;
-	   }
-
-	   $$[2] = $3;
-	   $$[3] = $5;
-	}
-	;
-
-stateMatrixItem: MATRIX stateMatrixName stateOptMatModifier
-	{
-	   $$[0] = $2[0];
-	   $$[1] = $2[1];
-	   $$[2] = $3;
-	}
-	;
-
-stateOptMatModifier: 
-	{
-	   $$ = 0;
-	}
-	| stateMatModifier
-	{
-	   $$ = $1;
-	}
-	;
-
-stateMatModifier: INVERSE 
-	{
-	   $$ = STATE_MATRIX_INVERSE;
-	}
-	| TRANSPOSE 
-	{
-	   $$ = STATE_MATRIX_TRANSPOSE;
-	}
-	| INVTRANS
-	{
-	   $$ = STATE_MATRIX_INVTRANS;
-	}
-	;
-
-stateMatrixRowNum: INTEGER
-	{
-	   if ($1 > 3) {
-	      yyerror(& @1, state, "invalid matrix row reference");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-stateMatrixName: MODELVIEW stateOptModMatNum
-	{
-	   $$[0] = STATE_MODELVIEW_MATRIX;
-	   $$[1] = $2;
-	}
-	| PROJECTION
-	{
-	   $$[0] = STATE_PROJECTION_MATRIX;
-	   $$[1] = 0;
-	}
-	| MVP
-	{
-	   $$[0] = STATE_MVP_MATRIX;
-	   $$[1] = 0;
-	}
-	| TEXTURE optTexCoordUnitNum
-	{
-	   $$[0] = STATE_TEXTURE_MATRIX;
-	   $$[1] = $2;
-	}
-	| PALETTE '[' statePaletteMatNum ']'
-	{
-	   yyerror(& @1, state, "GL_ARB_matrix_palette not supported");
-	   YYERROR;
-	}
-	| MAT_PROGRAM '[' stateProgramMatNum ']'
-	{
-	   $$[0] = STATE_PROGRAM_MATRIX;
-	   $$[1] = $3;
-	}
-	;
-
-stateOptModMatNum:
-	{
-	   $$ = 0;
-	}
-	| '[' stateModMatNum ']'
-	{
-	   $$ = $2;
-	}
-	;
-stateModMatNum: INTEGER
-	{
-	   /* Since GL_ARB_vertex_blend isn't supported, only modelview matrix
-	    * zero is valid.
-	    */
-	   if ($1 != 0) {
-	      yyerror(& @1, state, "invalid modelview matrix index");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-statePaletteMatNum: INTEGER
-	{
-	   /* Since GL_ARB_matrix_palette isn't supported, just let any value
-	    * through here.  The error will be generated later.
-	    */
-	   $$ = $1;
-	}
-	;
-stateProgramMatNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxProgramMatrices) {
-	      yyerror(& @1, state, "invalid program matrix selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-stateDepthItem: DEPTH RANGE
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = STATE_DEPTH_RANGE;
-	}
-	;
-
-
-programSingleItem: progEnvParam | progLocalParam;
-
-programMultipleItem: progEnvParams | progLocalParams;
-
-progEnvParams: PROGRAM ENV '[' progEnvParamNums ']'
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = state->state_param_enum;
-	   $$[1] = STATE_ENV;
-	   $$[2] = $4[0];
-	   $$[3] = $4[1];
-	}
-	;
-
-progEnvParamNums: progEnvParamNum
-	{
-	   $$[0] = $1;
-	   $$[1] = $1;
-	}
-	| progEnvParamNum DOT_DOT progEnvParamNum
-	{
-	   $$[0] = $1;
-	   $$[1] = $3;
-	}
-	;
-
-progEnvParam: PROGRAM ENV '[' progEnvParamNum ']'
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = state->state_param_enum;
-	   $$[1] = STATE_ENV;
-	   $$[2] = $4;
-	   $$[3] = $4;
-	}
-	;
-
-progLocalParams: PROGRAM LOCAL '[' progLocalParamNums ']'
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = state->state_param_enum;
-	   $$[1] = STATE_LOCAL;
-	   $$[2] = $4[0];
-	   $$[3] = $4[1];
-	}
-
-progLocalParamNums: progLocalParamNum
-	{
-	   $$[0] = $1;
-	   $$[1] = $1;
-	}
-	| progLocalParamNum DOT_DOT progLocalParamNum
-	{
-	   $$[0] = $1;
-	   $$[1] = $3;
-	}
-	;
-
-progLocalParam: PROGRAM LOCAL '[' progLocalParamNum ']'
-	{
-	   memset($$, 0, sizeof($$));
-	   $$[0] = state->state_param_enum;
-	   $$[1] = STATE_LOCAL;
-	   $$[2] = $4;
-	   $$[3] = $4;
-	}
-	;
-
-progEnvParamNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->limits->MaxEnvParams) {
-	      yyerror(& @1, state, "invalid environment parameter reference");
-	      YYERROR;
-	   }
-	   $$ = $1;
-	}
-	;
-
-progLocalParamNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->limits->MaxLocalParams) {
-	      yyerror(& @1, state, "invalid local parameter reference");
-	      YYERROR;
-	   }
-	   $$ = $1;
-	}
-	;
-
-
-
-paramConstDecl: paramConstScalarDecl | paramConstVector;
-paramConstUse: paramConstScalarUse | paramConstVector;
-
-paramConstScalarDecl: signedFloatConstant
-	{
-	   $$.count = 4;
-	   $$.data[0] = $1;
-	   $$.data[1] = $1;
-	   $$.data[2] = $1;
-	   $$.data[3] = $1;
-	}
-	;
-
-paramConstScalarUse: REAL
-	{
-	   $$.count = 1;
-	   $$.data[0] = $1;
-	   $$.data[1] = $1;
-	   $$.data[2] = $1;
-	   $$.data[3] = $1;
-	}
-	| INTEGER
-	{
-	   $$.count = 1;
-	   $$.data[0] = (float) $1;
-	   $$.data[1] = (float) $1;
-	   $$.data[2] = (float) $1;
-	   $$.data[3] = (float) $1;
-	}
-	;
-
-paramConstVector: '{' signedFloatConstant '}'
-	{
-	   $$.count = 4;
-	   $$.data[0] = $2;
-	   $$.data[1] = 0.0f;
-	   $$.data[2] = 0.0f;
-	   $$.data[3] = 1.0f;
-	}
-	| '{' signedFloatConstant ',' signedFloatConstant '}'
-	{
-	   $$.count = 4;
-	   $$.data[0] = $2;
-	   $$.data[1] = $4;
-	   $$.data[2] = 0.0f;
-	   $$.data[3] = 1.0f;
-	}
-	| '{' signedFloatConstant ',' signedFloatConstant ','
-              signedFloatConstant '}'
-	{
-	   $$.count = 4;
-	   $$.data[0] = $2;
-	   $$.data[1] = $4;
-	   $$.data[2] = $6;
-	   $$.data[3] = 1.0f;
-	}
-	| '{' signedFloatConstant ',' signedFloatConstant ','
-              signedFloatConstant ',' signedFloatConstant '}'
-	{
-	   $$.count = 4;
-	   $$.data[0] = $2;
-	   $$.data[1] = $4;
-	   $$.data[2] = $6;
-	   $$.data[3] = $8;
-	}
-	;
-
-signedFloatConstant: optionalSign REAL
-	{
-	   $$ = ($1) ? -$2 : $2;
-	}
-	| optionalSign INTEGER
-	{
-	   $$ = (float)(($1) ? -$2 : $2);
-	}
-	;
-
-optionalSign: '+'        { $$ = FALSE; }
-	| '-'            { $$ = TRUE;  }
-	|                { $$ = FALSE; }
-	;
-
-TEMP_statement: optVarSize TEMP { $<integer>$ = $2; } varNameList
-	;
-
-optVarSize: string
-	{
-	   /* NV_fragment_program_option defines the size qualifiers in a
-	    * fairly broken way.  "SHORT" or "LONG" can optionally be used
-	    * before TEMP or OUTPUT.  However, neither is a reserved word!
-	    * This means that we have to parse it as an identifier, then check
-	    * to make sure it's one of the valid values.  *sigh*
-	    *
-	    * In addition, the grammar in the extension spec does *not* allow
-	    * the size specifier to be optional, but all known implementations
-	    * do.
-	    */
-	   if (!state->option.NV_fragment) {
-	      yyerror(& @1, state, "unexpected IDENTIFIER");
-	      YYERROR;
-	   }
-
-	   if (strcmp("SHORT", $1) == 0) {
-	   } else if (strcmp("LONG", $1) == 0) {
-	   } else {
-	      char *const err_str =
-		 make_error_string("invalid storage size specifier \"%s\"",
-				   $1);
-
-	      yyerror(& @1, state, (err_str != NULL)
-		      ? err_str : "invalid storage size specifier");
-
-	      if (err_str != NULL) {
-		 free(err_str);
-	      }
-
-	      YYERROR;
-	   }
-	}
-	|
-	{
-	}
-	;
-
-ADDRESS_statement: ADDRESS { $<integer>$ = $1; } varNameList
-	;
-
-varNameList: varNameList ',' IDENTIFIER
-	{
-	   if (!declare_variable(state, $3, $<integer>0, & @3)) {
-	      free($3);
-	      YYERROR;
-	   }
-	}
-	| IDENTIFIER
-	{
-	   if (!declare_variable(state, $1, $<integer>0, & @1)) {
-	      free($1);
-	      YYERROR;
-	   }
-	}
-	;
-
-OUTPUT_statement: optVarSize OUTPUT IDENTIFIER '=' resultBinding
-	{
-	   struct asm_symbol *const s =
-	      declare_variable(state, $3, at_output, & @3);
-
-	   if (s == NULL) {
-	      free($3);
-	      YYERROR;
-	   } else {
-	      s->output_binding = $5;
-	   }
-	}
-	;
-
-resultBinding: RESULT POSITION
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_HPOS;
-	   } else {
-	      yyerror(& @2, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| RESULT FOGCOORD
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_FOGC;
-	   } else {
-	      yyerror(& @2, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| RESULT resultColBinding
-	{
-	   $$ = $2;
-	}
-	| RESULT POINTSIZE
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_PSIZ;
-	   } else {
-	      yyerror(& @2, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| RESULT TEXCOORD optTexCoordUnitNum
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_TEX0 + $3;
-	   } else {
-	      yyerror(& @2, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| RESULT DEPTH
-	{
-	   if (state->mode == ARB_fragment) {
-	      $$ = FRAG_RESULT_DEPTH;
-	   } else {
-	      yyerror(& @2, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	;
-
-resultColBinding: COLOR optResultFaceType optResultColorType
-	{
-	   $$ = $2 + $3;
-	}
-	;
-
-optResultFaceType:
-	{
-	   $$ = (state->mode == ARB_vertex)
-	      ? VERT_RESULT_COL0
-	      : FRAG_RESULT_COLOR;
-	}
-	| FRONT
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_COL0;
-	   } else {
-	      yyerror(& @1, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| BACK
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = VERT_RESULT_BFC0;
-	   } else {
-	      yyerror(& @1, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	;
-
-optResultColorType:
-	{
-	   $$ = 0; 
-	}
-	| PRIMARY
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = 0;
-	   } else {
-	      yyerror(& @1, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	| SECONDARY
-	{
-	   if (state->mode == ARB_vertex) {
-	      $$ = 1;
-	   } else {
-	      yyerror(& @1, state, "invalid program result name");
-	      YYERROR;
-	   }
-	}
-	;
-
-optFaceType:    { $$ = 0; }
-	| FRONT	{ $$ = 0; }
-	| BACK  { $$ = 1; }
-	;
-
-optColorType:       { $$ = 0; }
-	| PRIMARY   { $$ = 0; }
-	| SECONDARY { $$ = 1; }
-	;
-
-optTexCoordUnitNum:                { $$ = 0; }
-	| '[' texCoordUnitNum ']'  { $$ = $2; }
-	;
-
-optTexImageUnitNum:                { $$ = 0; }
-	| '[' texImageUnitNum ']'  { $$ = $2; }
-	;
-
-optLegacyTexUnitNum:               { $$ = 0; }
-	| '[' legacyTexUnitNum ']' { $$ = $2; }
-	;
-
-texCoordUnitNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxTextureCoordUnits) {
-	      yyerror(& @1, state, "invalid texture coordinate unit selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-texImageUnitNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxTextureImageUnits) {
-	      yyerror(& @1, state, "invalid texture image unit selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-legacyTexUnitNum: INTEGER
-	{
-	   if ((unsigned) $1 >= state->MaxTextureUnits) {
-	      yyerror(& @1, state, "invalid texture unit selector");
-	      YYERROR;
-	   }
-
-	   $$ = $1;
-	}
-	;
-
-ALIAS_statement: ALIAS IDENTIFIER '=' USED_IDENTIFIER
-	{
-	   struct asm_symbol *exist = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $2);
-	   struct asm_symbol *target = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, $4);
-
-	   free($4);
-
-	   if (exist != NULL) {
-	      char m[1000];
-	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", $2);
-	      free($2);
-	      yyerror(& @2, state, m);
-	      YYERROR;
-	   } else if (target == NULL) {
-	      free($2);
-	      yyerror(& @4, state,
-		      "undefined variable binding in ALIAS statement");
-	      YYERROR;
-	   } else {
-	      _mesa_symbol_table_add_symbol(state->st, 0, $2, target);
-	   }
-	}
-	;
-
-string: IDENTIFIER
-	| USED_IDENTIFIER
-	;
-
-%%
-
-void
-asm_instruction_set_operands(struct asm_instruction *inst,
-			     const struct prog_dst_register *dst,
-			     const struct asm_src_register *src0,
-			     const struct asm_src_register *src1,
-			     const struct asm_src_register *src2)
-{
-   /* In the core ARB extensions only the KIL instruction doesn't have a
-    * destination register.
-    */
-   if (dst == NULL) {
-      init_dst_reg(& inst->Base.DstReg);
-   } else {
-      inst->Base.DstReg = *dst;
-   }
-
-   /* The only instruction that doesn't have any source registers is the
-    * condition-code based KIL instruction added by NV_fragment_program_option.
-    */
-   if (src0 != NULL) {
-      inst->Base.SrcReg[0] = src0->Base;
-      inst->SrcReg[0] = *src0;
-   } else {
-      init_src_reg(& inst->SrcReg[0]);
-   }
-
-   if (src1 != NULL) {
-      inst->Base.SrcReg[1] = src1->Base;
-      inst->SrcReg[1] = *src1;
-   } else {
-      init_src_reg(& inst->SrcReg[1]);
-   }
-
-   if (src2 != NULL) {
-      inst->Base.SrcReg[2] = src2->Base;
-      inst->SrcReg[2] = *src2;
-   } else {
-      init_src_reg(& inst->SrcReg[2]);
-   }
-}
-
-
-struct asm_instruction *
-asm_instruction_ctor(gl_inst_opcode op,
-		     const struct prog_dst_register *dst,
-		     const struct asm_src_register *src0,
-		     const struct asm_src_register *src1,
-		     const struct asm_src_register *src2)
-{
-   struct asm_instruction *inst = CALLOC_STRUCT(asm_instruction);
-
-   if (inst) {
-      _mesa_init_instructions(& inst->Base, 1);
-      inst->Base.Opcode = op;
-
-      asm_instruction_set_operands(inst, dst, src0, src1, src2);
-   }
-
-   return inst;
-}
-
-
-struct asm_instruction *
-asm_instruction_copy_ctor(const struct prog_instruction *base,
-			  const struct prog_dst_register *dst,
-			  const struct asm_src_register *src0,
-			  const struct asm_src_register *src1,
-			  const struct asm_src_register *src2)
-{
-   struct asm_instruction *inst = CALLOC_STRUCT(asm_instruction);
-
-   if (inst) {
-      _mesa_init_instructions(& inst->Base, 1);
-      inst->Base.Opcode = base->Opcode;
-      inst->Base.CondUpdate = base->CondUpdate;
-      inst->Base.CondDst = base->CondDst;
-      inst->Base.SaturateMode = base->SaturateMode;
-      inst->Base.Precision = base->Precision;
-
-      asm_instruction_set_operands(inst, dst, src0, src1, src2);
-   }
-
-   return inst;
-}
-
-
-void
-init_dst_reg(struct prog_dst_register *r)
-{
-   memset(r, 0, sizeof(*r));
-   r->File = PROGRAM_UNDEFINED;
-   r->WriteMask = WRITEMASK_XYZW;
-   r->CondMask = COND_TR;
-   r->CondSwizzle = SWIZZLE_NOOP;
-}
-
-
-/** Like init_dst_reg() but set the File and Index fields. */
-void
-set_dst_reg(struct prog_dst_register *r, gl_register_file file, GLint index)
-{
-   const GLint maxIndex = 1 << INST_INDEX_BITS;
-   const GLint minIndex = 0;
-   ASSERT(index >= minIndex);
-   (void) minIndex;
-   ASSERT(index <= maxIndex);
-   (void) maxIndex;
-   ASSERT(file == PROGRAM_TEMPORARY ||
-	  file == PROGRAM_ADDRESS ||
-	  file == PROGRAM_OUTPUT);
-   memset(r, 0, sizeof(*r));
-   r->File = file;
-   r->Index = index;
-   r->WriteMask = WRITEMASK_XYZW;
-   r->CondMask = COND_TR;
-   r->CondSwizzle = SWIZZLE_NOOP;
-}
-
-
-void
-init_src_reg(struct asm_src_register *r)
-{
-   memset(r, 0, sizeof(*r));
-   r->Base.File = PROGRAM_UNDEFINED;
-   r->Base.Swizzle = SWIZZLE_NOOP;
-   r->Symbol = NULL;
-}
-
-
-/** Like init_src_reg() but set the File and Index fields.
- * \return GL_TRUE if a valid src register, GL_FALSE otherwise
- */
-void
-set_src_reg(struct asm_src_register *r, gl_register_file file, GLint index)
-{
-   set_src_reg_swz(r, file, index, SWIZZLE_XYZW);
-}
-
-
-void
-set_src_reg_swz(struct asm_src_register *r, gl_register_file file, GLint index,
-                GLuint swizzle)
-{
-   const GLint maxIndex = (1 << INST_INDEX_BITS) - 1;
-   const GLint minIndex = -(1 << INST_INDEX_BITS);
-   ASSERT(file < PROGRAM_FILE_MAX);
-   ASSERT(index >= minIndex);
-   (void) minIndex;
-   ASSERT(index <= maxIndex);
-   (void) maxIndex;
-   memset(r, 0, sizeof(*r));
-   r->Base.File = file;
-   r->Base.Index = index;
-   r->Base.Swizzle = swizzle;
-   r->Symbol = NULL;
-}
-
-
-/**
- * Validate the set of inputs used by a program
- *
- * Validates that legal sets of inputs are used by the program.  In this case
- * "used" included both reading the input or binding the input to a name using
- * the \c ATTRIB command.
- *
- * \return
- * \c TRUE if the combination of inputs used is valid, \c FALSE otherwise.
- */
-int
-validate_inputs(struct YYLTYPE *locp, struct asm_parser_state *state)
-{
-   const int inputs = state->prog->InputsRead | state->InputsBound;
-
-   if (((inputs & 0x0ffff) & (inputs >> 16)) != 0) {
-      yyerror(locp, state, "illegal use of generic attribute and name attribute");
-      return 0;
-   }
-
-   return 1;
-}
-
-
-struct asm_symbol *
-declare_variable(struct asm_parser_state *state, char *name, enum asm_type t,
-		 struct YYLTYPE *locp)
-{
-   struct asm_symbol *s = NULL;
-   struct asm_symbol *exist = (struct asm_symbol *)
-      _mesa_symbol_table_find_symbol(state->st, 0, name);
-
-
-   if (exist != NULL) {
-      yyerror(locp, state, "redeclared identifier");
-   } else {
-      s = calloc(1, sizeof(struct asm_symbol));
-      s->name = name;
-      s->type = t;
-
-      switch (t) {
-      case at_temp:
-	 if (state->prog->NumTemporaries >= state->limits->MaxTemps) {
-	    yyerror(locp, state, "too many temporaries declared");
-	    free(s);
-	    return NULL;
-	 }
-
-	 s->temp_binding = state->prog->NumTemporaries;
-	 state->prog->NumTemporaries++;
-	 break;
-
-      case at_address:
-	 if (state->prog->NumAddressRegs >= state->limits->MaxAddressRegs) {
-	    yyerror(locp, state, "too many address registers declared");
-	    free(s);
-	    return NULL;
-	 }
-
-	 /* FINISHME: Add support for multiple address registers.
-	  */
-	 state->prog->NumAddressRegs++;
-	 break;
-
-      default:
-	 break;
-      }
-
-      _mesa_symbol_table_add_symbol(state->st, 0, s->name, s);
-      s->next = state->sym;
-      state->sym = s;
-   }
-
-   return s;
-}
-
-
-int add_state_reference(struct gl_program_parameter_list *param_list,
-			const gl_state_index tokens[STATE_LENGTH])
-{
-   const GLuint size = 4; /* XXX fix */
-   char *name;
-   GLint index;
-
-   name = _mesa_program_state_string(tokens);
-   index = _mesa_add_parameter(param_list, PROGRAM_STATE_VAR, name,
-                               size, GL_NONE, NULL, tokens, 0x0);
-   param_list->StateFlags |= _mesa_program_state_flags(tokens);
-
-   /* free name string here since we duplicated it in add_parameter() */
-   free(name);
-
-   return index;
-}
-
-
-int
-initialize_symbol_from_state(struct gl_program *prog,
-			     struct asm_symbol *param_var, 
-			     const gl_state_index tokens[STATE_LENGTH])
-{
-   int idx = -1;
-   gl_state_index state_tokens[STATE_LENGTH];
-
-
-   memcpy(state_tokens, tokens, sizeof(state_tokens));
-
-   param_var->type = at_param;
-   param_var->param_binding_type = PROGRAM_STATE_VAR;
-
-   /* If we are adding a STATE_MATRIX that has multiple rows, we need to
-    * unroll it and call add_state_reference() for each row
-    */
-   if ((state_tokens[0] == STATE_MODELVIEW_MATRIX ||
-	state_tokens[0] == STATE_PROJECTION_MATRIX ||
-	state_tokens[0] == STATE_MVP_MATRIX ||
-	state_tokens[0] == STATE_TEXTURE_MATRIX ||
-	state_tokens[0] == STATE_PROGRAM_MATRIX)
-       && (state_tokens[2] != state_tokens[3])) {
-      int row;
-      const int first_row = state_tokens[2];
-      const int last_row = state_tokens[3];
-
-      for (row = first_row; row <= last_row; row++) {
-	 state_tokens[2] = state_tokens[3] = row;
-
-	 idx = add_state_reference(prog->Parameters, state_tokens);
-	 if (param_var->param_binding_begin == ~0U) {
-	    param_var->param_binding_begin = idx;
-            param_var->param_binding_swizzle = SWIZZLE_XYZW;
-         }
-
-	 param_var->param_binding_length++;
-      }
-   }
-   else {
-      idx = add_state_reference(prog->Parameters, state_tokens);
-      if (param_var->param_binding_begin == ~0U) {
-	 param_var->param_binding_begin = idx;
-         param_var->param_binding_swizzle = SWIZZLE_XYZW;
-      }
-      param_var->param_binding_length++;
-   }
-
-   return idx;
-}
-
-
-int
-initialize_symbol_from_param(struct gl_program *prog,
-			     struct asm_symbol *param_var, 
-			     const gl_state_index tokens[STATE_LENGTH])
-{
-   int idx = -1;
-   gl_state_index state_tokens[STATE_LENGTH];
-
-
-   memcpy(state_tokens, tokens, sizeof(state_tokens));
-
-   assert((state_tokens[0] == STATE_VERTEX_PROGRAM)
-	  || (state_tokens[0] == STATE_FRAGMENT_PROGRAM));
-   assert((state_tokens[1] == STATE_ENV)
-	  || (state_tokens[1] == STATE_LOCAL));
-
-   /*
-    * The param type is STATE_VAR.  The program parameter entry will
-    * effectively be a pointer into the LOCAL or ENV parameter array.
-    */
-   param_var->type = at_param;
-   param_var->param_binding_type = PROGRAM_STATE_VAR;
-
-   /* If we are adding a STATE_ENV or STATE_LOCAL that has multiple elements,
-    * we need to unroll it and call add_state_reference() for each row
-    */
-   if (state_tokens[2] != state_tokens[3]) {
-      int row;
-      const int first_row = state_tokens[2];
-      const int last_row = state_tokens[3];
-
-      for (row = first_row; row <= last_row; row++) {
-	 state_tokens[2] = state_tokens[3] = row;
-
-	 idx = add_state_reference(prog->Parameters, state_tokens);
-	 if (param_var->param_binding_begin == ~0U) {
-	    param_var->param_binding_begin = idx;
-            param_var->param_binding_swizzle = SWIZZLE_XYZW;
-         }
-	 param_var->param_binding_length++;
-      }
-   }
-   else {
-      idx = add_state_reference(prog->Parameters, state_tokens);
-      if (param_var->param_binding_begin == ~0U) {
-	 param_var->param_binding_begin = idx;
-         param_var->param_binding_swizzle = SWIZZLE_XYZW;
-      }
-      param_var->param_binding_length++;
-   }
-
-   return idx;
-}
-
-
-/**
- * Put a float/vector constant/literal into the parameter list.
- * \param param_var  returns info about the parameter/constant's location,
- *                   binding, type, etc.
- * \param vec  the vector/constant to add
- * \param allowSwizzle  if true, try to consolidate constants which only differ
- *                      by a swizzle.  We don't want to do this when building
- *                      arrays of constants that may be indexed indirectly.
- * \return index of the constant in the parameter list.
- */
-int
-initialize_symbol_from_const(struct gl_program *prog,
-			     struct asm_symbol *param_var, 
-			     const struct asm_vector *vec,
-                             GLboolean allowSwizzle)
-{
-   unsigned swizzle;
-   const int idx = _mesa_add_unnamed_constant(prog->Parameters,
-                                              vec->data, vec->count,
-                                              allowSwizzle ? &swizzle : NULL);
-
-   param_var->type = at_param;
-   param_var->param_binding_type = PROGRAM_CONSTANT;
-
-   if (param_var->param_binding_begin == ~0U) {
-      param_var->param_binding_begin = idx;
-      param_var->param_binding_swizzle = allowSwizzle ? swizzle : SWIZZLE_XYZW;
-   }
-   param_var->param_binding_length++;
-
-   return idx;
-}
-
-
-char *
-make_error_string(const char *fmt, ...)
-{
-   int length;
-   char *str;
-   va_list args;
-
-
-   /* Call vsnprintf once to determine how large the final string is.  Call it
-    * again to do the actual formatting.  from the vsnprintf manual page:
-    *
-    *    Upon successful return, these functions return the number of
-    *    characters printed  (not including the trailing '\0' used to end
-    *    output to strings).
-    */
-   va_start(args, fmt);
-   length = 1 + vsnprintf(NULL, 0, fmt, args);
-   va_end(args);
-
-   str = malloc(length);
-   if (str) {
-      va_start(args, fmt);
-      vsnprintf(str, length, fmt, args);
-      va_end(args);
-   }
-
-   return str;
-}
-
-
-void
-yyerror(YYLTYPE *locp, struct asm_parser_state *state, const char *s)
-{
-   char *err_str;
-
-
-   err_str = make_error_string("glProgramStringARB(%s)\n", s);
-   if (err_str) {
-      _mesa_error(state->ctx, GL_INVALID_OPERATION, "%s", err_str);
-      free(err_str);
-   }
-
-   err_str = make_error_string("line %u, char %u: error: %s\n",
-			       locp->first_line, locp->first_column, s);
-   _mesa_set_program_error(state->ctx, locp->position, err_str);
-
-   if (err_str) {
-      free(err_str);
-   }
-}
-
-
-GLboolean
-_mesa_parse_arb_program(struct gl_context *ctx, GLenum target, const GLubyte *str,
-			GLsizei len, struct asm_parser_state *state)
-{
-   struct asm_instruction *inst;
-   unsigned i;
-   GLubyte *strz;
-   GLboolean result = GL_FALSE;
-   void *temp;
-   struct asm_symbol *sym;
-
-   state->ctx = ctx;
-   state->prog->Target = target;
-   state->prog->Parameters = _mesa_new_parameter_list();
-
-   /* Make a copy of the program string and force it to be NUL-terminated.
-    */
-   strz = (GLubyte *) malloc(len + 1);
-   if (strz == NULL) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
-      return GL_FALSE;
-   }
-   memcpy (strz, str, len);
-   strz[len] = '\0';
-
-   state->prog->String = strz;
-
-   state->st = _mesa_symbol_table_ctor();
-
-   state->limits = (target == GL_VERTEX_PROGRAM_ARB)
-      ? & ctx->Const.VertexProgram
-      : & ctx->Const.FragmentProgram;
-
-   state->MaxTextureImageUnits = ctx->Const.MaxTextureImageUnits;
-   state->MaxTextureCoordUnits = ctx->Const.MaxTextureCoordUnits;
-   state->MaxTextureUnits = ctx->Const.MaxTextureUnits;
-   state->MaxClipPlanes = ctx->Const.MaxClipPlanes;
-   state->MaxLights = ctx->Const.MaxLights;
-   state->MaxProgramMatrices = ctx->Const.MaxProgramMatrices;
-
-   state->state_param_enum = (target == GL_VERTEX_PROGRAM_ARB)
-      ? STATE_VERTEX_PROGRAM : STATE_FRAGMENT_PROGRAM;
-
-   _mesa_set_program_error(ctx, -1, NULL);
-
-   _mesa_program_lexer_ctor(& state->scanner, state, (const char *) str, len);
-   yyparse(state);
-   _mesa_program_lexer_dtor(state->scanner);
-
-
-   if (ctx->Program.ErrorPos != -1) {
-      goto error;
-   }
-
-   if (! _mesa_layout_parameters(state)) {
-      struct YYLTYPE loc;
-
-      loc.first_line = 0;
-      loc.first_column = 0;
-      loc.position = len;
-
-      yyerror(& loc, state, "invalid PARAM usage");
-      goto error;
-   }
-
-
-   
-   /* Add one instruction to store the "END" instruction.
-    */
-   state->prog->Instructions =
-      _mesa_alloc_instructions(state->prog->NumInstructions + 1);
-   inst = state->inst_head;
-   for (i = 0; i < state->prog->NumInstructions; i++) {
-      struct asm_instruction *const temp = inst->next;
-
-      state->prog->Instructions[i] = inst->Base;
-      inst = temp;
-   }
-
-   /* Finally, tag on an OPCODE_END instruction */
-   {
-      const GLuint numInst = state->prog->NumInstructions;
-      _mesa_init_instructions(state->prog->Instructions + numInst, 1);
-      state->prog->Instructions[numInst].Opcode = OPCODE_END;
-   }
-   state->prog->NumInstructions++;
-
-   state->prog->NumParameters = state->prog->Parameters->NumParameters;
-   state->prog->NumAttributes = _mesa_bitcount(state->prog->InputsRead);
-
-   /*
-    * Initialize native counts to logical counts.  The device driver may
-    * change them if program is translated into a hardware program.
-    */
-   state->prog->NumNativeInstructions = state->prog->NumInstructions;
-   state->prog->NumNativeTemporaries = state->prog->NumTemporaries;
-   state->prog->NumNativeParameters = state->prog->NumParameters;
-   state->prog->NumNativeAttributes = state->prog->NumAttributes;
-   state->prog->NumNativeAddressRegs = state->prog->NumAddressRegs;
-
-   result = GL_TRUE;
-
-error:
-   for (inst = state->inst_head; inst != NULL; inst = temp) {
-      temp = inst->next;
-      free(inst);
-   }
-
-   state->inst_head = NULL;
-   state->inst_tail = NULL;
-
-   for (sym = state->sym; sym != NULL; sym = temp) {
-      temp = sym->next;
-
-      free((void *) sym->name);
-      free(sym);
-   }
-   state->sym = NULL;
-
-   _mesa_symbol_table_dtor(state->st);
-   state->st = NULL;
-
-   return result;
-}
+%{

+/*

+ * Copyright © 2009 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+#include <stdio.h>

+#include <stdlib.h>

+#include <string.h>

+

+#include "main/mtypes.h"

+#include "main/imports.h"

+#include "program/program.h"

+#include "program/prog_parameter.h"

+#include "program/prog_parameter_layout.h"

+#include "program/prog_statevars.h"

+#include "program/prog_instruction.h"

+

+#include "program/symbol_table.h"

+#include "program/program_parser.h"

+

+extern void *yy_scan_string(char *);

+extern void yy_delete_buffer(void *);

+

+static struct asm_symbol *declare_variable(struct asm_parser_state *state,

+    char *name, enum asm_type t, struct YYLTYPE *locp);

+

+static int add_state_reference(struct gl_program_parameter_list *param_list,

+    const gl_state_index tokens[STATE_LENGTH]);

+

+static int initialize_symbol_from_state(struct gl_program *prog,

+    struct asm_symbol *param_var, const gl_state_index tokens[STATE_LENGTH]);

+

+static int initialize_symbol_from_param(struct gl_program *prog,

+    struct asm_symbol *param_var, const gl_state_index tokens[STATE_LENGTH]);

+

+static int initialize_symbol_from_const(struct gl_program *prog,

+    struct asm_symbol *param_var, const struct asm_vector *vec,

+    GLboolean allowSwizzle);

+

+static int yyparse(struct asm_parser_state *state);

+

+static char *make_error_string(const char *fmt, ...);

+

+static void yyerror(struct YYLTYPE *locp, struct asm_parser_state *state,

+    const char *s);

+

+static int validate_inputs(struct YYLTYPE *locp,

+    struct asm_parser_state *state);

+

+static void init_dst_reg(struct prog_dst_register *r);

+

+static void set_dst_reg(struct prog_dst_register *r,

+                        gl_register_file file, GLint index);

+

+static void init_src_reg(struct asm_src_register *r);

+

+static void set_src_reg(struct asm_src_register *r,

+                        gl_register_file file, GLint index);

+

+static void set_src_reg_swz(struct asm_src_register *r,

+                            gl_register_file file, GLint index, GLuint swizzle);

+

+static void asm_instruction_set_operands(struct asm_instruction *inst,

+    const struct prog_dst_register *dst, const struct asm_src_register *src0,

+    const struct asm_src_register *src1, const struct asm_src_register *src2);

+

+static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op,

+    const struct prog_dst_register *dst, const struct asm_src_register *src0,

+    const struct asm_src_register *src1, const struct asm_src_register *src2);

+

+static struct asm_instruction *asm_instruction_copy_ctor(

+    const struct prog_instruction *base, const struct prog_dst_register *dst,

+    const struct asm_src_register *src0, const struct asm_src_register *src1,

+    const struct asm_src_register *src2);

+

+#ifndef FALSE

+#define FALSE 0

+#define TRUE (!FALSE)

+#endif

+

+#define YYLLOC_DEFAULT(Current, Rhs, N)					\

+   do {									\

+      if (YYID(N)) {							\

+	 (Current).first_line = YYRHSLOC(Rhs, 1).first_line;		\

+	 (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\

+	 (Current).position = YYRHSLOC(Rhs, 1).position;		\

+	 (Current).last_line = YYRHSLOC(Rhs, N).last_line;		\

+	 (Current).last_column = YYRHSLOC(Rhs, N).last_column;		\

+      } else {								\

+	 (Current).first_line = YYRHSLOC(Rhs, 0).last_line;		\

+	 (Current).last_line = (Current).first_line;			\

+	 (Current).first_column = YYRHSLOC(Rhs, 0).last_column;		\

+	 (Current).last_column = (Current).first_column;		\

+	 (Current).position = YYRHSLOC(Rhs, 0).position			\

+	    + (Current).first_column;					\

+      }									\

+   } while(YYID(0))

+

+#define YYLEX_PARAM state->scanner

+%}

+

+%pure-parser

+%locations

+%parse-param { struct asm_parser_state *state }

+%error-verbose

+%lex-param { void *scanner }

+

+%union {

+   struct asm_instruction *inst;

+   struct asm_symbol *sym;

+   struct asm_symbol temp_sym;

+   struct asm_swizzle_mask swiz_mask;

+   struct asm_src_register src_reg;

+   struct prog_dst_register dst_reg;

+   struct prog_instruction temp_inst;

+   char *string;

+   unsigned result;

+   unsigned attrib;

+   int integer;

+   float real;

+   gl_state_index state[STATE_LENGTH];

+   int negate;

+   struct asm_vector vector;

+   gl_inst_opcode opcode;

+

+   struct {

+      unsigned swz;

+      unsigned rgba_valid:1;

+      unsigned xyzw_valid:1;

+      unsigned negate:1;

+   } ext_swizzle;

+}

+

+%token ARBvp_10 ARBfp_10

+

+/* Tokens for assembler pseudo-ops */

+%token <integer> ADDRESS

+%token ALIAS ATTRIB

+%token OPTION OUTPUT

+%token PARAM

+%token <integer> TEMP

+%token END

+

+ /* Tokens for instructions */

+%token <temp_inst> BIN_OP BINSC_OP SAMPLE_OP SCALAR_OP TRI_OP VECTOR_OP

+%token <temp_inst> ARL KIL SWZ TXD_OP

+

+%token <integer> INTEGER

+%token <real> REAL

+

+%token AMBIENT ATTENUATION

+%token BACK

+%token CLIP COLOR

+%token DEPTH DIFFUSE DIRECTION

+%token EMISSION ENV EYE

+%token FOG FOGCOORD FRAGMENT FRONT

+%token HALF

+%token INVERSE INVTRANS

+%token LIGHT LIGHTMODEL LIGHTPROD LOCAL

+%token MATERIAL MAT_PROGRAM MATRIX MATRIXINDEX MODELVIEW MVP

+%token NORMAL

+%token OBJECT

+%token PALETTE PARAMS PLANE POINT_TOK POINTSIZE POSITION PRIMARY PROGRAM PROJECTION

+%token RANGE RESULT ROW

+%token SCENECOLOR SECONDARY SHININESS SIZE_TOK SPECULAR SPOT STATE

+%token TEXCOORD TEXENV TEXGEN TEXGEN_Q TEXGEN_R TEXGEN_S TEXGEN_T TEXTURE TRANSPOSE

+%token TEXTURE_UNIT TEX_1D TEX_2D TEX_3D TEX_CUBE TEX_RECT

+%token TEX_SHADOW1D TEX_SHADOW2D TEX_SHADOWRECT

+%token TEX_ARRAY1D TEX_ARRAY2D TEX_ARRAYSHADOW1D TEX_ARRAYSHADOW2D 

+%token VERTEX VTXATTRIB

+%token WEIGHT

+

+%token <string> IDENTIFIER USED_IDENTIFIER

+%type <string> string

+%token <swiz_mask> MASK4 MASK3 MASK2 MASK1 SWIZZLE

+%token DOT_DOT

+%token DOT

+

+%type <inst> instruction ALU_instruction TexInstruction

+%type <inst> ARL_instruction VECTORop_instruction

+%type <inst> SCALARop_instruction BINSCop_instruction BINop_instruction

+%type <inst> TRIop_instruction TXD_instruction SWZ_instruction SAMPLE_instruction

+%type <inst> KIL_instruction

+

+%type <dst_reg> dstReg maskedDstReg maskedAddrReg

+%type <src_reg> srcReg scalarUse scalarSrcReg swizzleSrcReg

+%type <swiz_mask> scalarSuffix swizzleSuffix extendedSwizzle

+%type <ext_swizzle> extSwizComp extSwizSel

+%type <swiz_mask> optionalMask

+

+%type <sym> progParamArray

+%type <integer> addrRegRelOffset addrRegPosOffset addrRegNegOffset

+%type <src_reg> progParamArrayMem progParamArrayAbs progParamArrayRel

+%type <sym> addrReg

+%type <swiz_mask> addrComponent addrWriteMask

+

+%type <dst_reg> ccMaskRule ccTest ccMaskRule2 ccTest2 optionalCcMask

+

+%type <result> resultBinding resultColBinding

+%type <integer> optFaceType optColorType

+%type <integer> optResultFaceType optResultColorType

+

+%type <integer> optTexImageUnitNum texImageUnitNum

+%type <integer> optTexCoordUnitNum texCoordUnitNum

+%type <integer> optLegacyTexUnitNum legacyTexUnitNum

+%type <integer> texImageUnit texTarget

+%type <integer> vtxAttribNum

+

+%type <attrib> attribBinding vtxAttribItem fragAttribItem

+

+%type <temp_sym> paramSingleInit paramSingleItemDecl

+%type <integer> optArraySize

+

+%type <state> stateSingleItem stateMultipleItem

+%type <state> stateMaterialItem

+%type <state> stateLightItem stateLightModelItem stateLightProdItem

+%type <state> stateTexGenItem stateFogItem stateClipPlaneItem statePointItem

+%type <state> stateMatrixItem stateMatrixRow stateMatrixRows

+%type <state> stateTexEnvItem stateDepthItem

+

+%type <state> stateLModProperty

+%type <state> stateMatrixName optMatrixRows

+

+%type <integer> stateMatProperty

+%type <integer> stateLightProperty stateSpotProperty

+%type <integer> stateLightNumber stateLProdProperty

+%type <integer> stateTexGenType stateTexGenCoord

+%type <integer> stateTexEnvProperty

+%type <integer> stateFogProperty

+%type <integer> stateClipPlaneNum

+%type <integer> statePointProperty

+

+%type <integer> stateOptMatModifier stateMatModifier stateMatrixRowNum

+%type <integer> stateOptModMatNum stateModMatNum statePaletteMatNum 

+%type <integer> stateProgramMatNum

+

+%type <integer> ambDiffSpecProperty

+

+%type <state> programSingleItem progEnvParam progLocalParam

+%type <state> programMultipleItem progEnvParams progLocalParams

+

+%type <temp_sym> paramMultipleInit paramMultInitList paramMultipleItem

+%type <temp_sym> paramSingleItemUse

+

+%type <integer> progEnvParamNum progLocalParamNum

+%type <state> progEnvParamNums progLocalParamNums

+

+%type <vector> paramConstDecl paramConstUse

+%type <vector> paramConstScalarDecl paramConstScalarUse paramConstVector

+%type <real> signedFloatConstant

+%type <negate> optionalSign

+

+%{

+extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,

+    void *yyscanner);

+%}

+

+%%

+

+program: language optionSequence statementSequence END

+	;

+

+language: ARBvp_10

+	{

+	   if (state->prog->Target != GL_VERTEX_PROGRAM_ARB) {

+	      yyerror(& @1, state, "invalid fragment program header");

+

+	   }

+	   state->mode = ARB_vertex;

+	}

+	| ARBfp_10

+	{

+	   if (state->prog->Target != GL_FRAGMENT_PROGRAM_ARB) {

+	      yyerror(& @1, state, "invalid vertex program header");

+	   }

+	   state->mode = ARB_fragment;

+

+	   state->option.TexRect =

+	      (state->ctx->Extensions.NV_texture_rectangle != GL_FALSE);

+	}

+	;

+

+optionSequence: optionSequence option

+	|

+	;

+

+option: OPTION string ';'

+	{

+	   int valid = 0;

+

+	   if (state->mode == ARB_vertex) {

+	      valid = _mesa_ARBvp_parse_option(state, $2);

+	   } else if (state->mode == ARB_fragment) {

+	      valid = _mesa_ARBfp_parse_option(state, $2);

+	   }

+

+

+	   free($2);

+

+	   if (!valid) {

+	      const char *const err_str = (state->mode == ARB_vertex)

+		 ? "invalid ARB vertex program option"

+		 : "invalid ARB fragment program option";

+

+	      yyerror(& @2, state, err_str);

+	      YYERROR;

+	   }

+	}

+	;

+

+statementSequence: statementSequence statement

+	|

+	;

+

+statement: instruction ';'

+	{

+	   if ($1 != NULL) {

+	      if (state->inst_tail == NULL) {

+		 state->inst_head = $1;

+	      } else {

+		 state->inst_tail->next = $1;

+	      }

+

+	      state->inst_tail = $1;

+	      $1->next = NULL;

+

+	      state->prog->NumInstructions++;

+	   }

+	}

+	| namingStatement ';'

+	;

+

+instruction: ALU_instruction

+	{

+	   $$ = $1;

+	   state->prog->NumAluInstructions++;

+	}

+	| TexInstruction

+	{

+	   $$ = $1;

+	   state->prog->NumTexInstructions++;

+	}

+	;

+

+ALU_instruction: ARL_instruction

+	| VECTORop_instruction

+	| SCALARop_instruction

+	| BINSCop_instruction

+	| BINop_instruction

+	| TRIop_instruction

+	| SWZ_instruction

+	;

+

+TexInstruction: SAMPLE_instruction

+	| KIL_instruction

+	| TXD_instruction

+	;

+

+ARL_instruction: ARL maskedAddrReg ',' scalarSrcReg

+	{

+	   $$ = asm_instruction_ctor(OPCODE_ARL, & $2, & $4, NULL, NULL);

+	}

+	;

+

+VECTORop_instruction: VECTOR_OP maskedDstReg ',' swizzleSrcReg

+	{

+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);

+	}

+	;

+

+SCALARop_instruction: SCALAR_OP maskedDstReg ',' scalarSrcReg

+	{

+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);

+	}

+	;

+

+BINSCop_instruction: BINSC_OP maskedDstReg ',' scalarSrcReg ',' scalarSrcReg

+	{

+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, NULL);

+	}

+	;

+

+

+BINop_instruction: BIN_OP maskedDstReg ',' swizzleSrcReg ',' swizzleSrcReg

+	{

+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, NULL);

+	}

+	;

+

+TRIop_instruction: TRI_OP maskedDstReg ','

+                   swizzleSrcReg ',' swizzleSrcReg ',' swizzleSrcReg

+	{

+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, & $8);

+	}

+	;

+

+SAMPLE_instruction: SAMPLE_OP maskedDstReg ',' swizzleSrcReg ',' texImageUnit ',' texTarget

+	{

+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);

+	   if ($$ != NULL) {

+	      const GLbitfield tex_mask = (1U << $6);

+	      GLbitfield shadow_tex = 0;

+	      GLbitfield target_mask = 0;

+

+

+	      $$->Base.TexSrcUnit = $6;

+

+	      if ($8 < 0) {

+		 shadow_tex = tex_mask;

+

+		 $$->Base.TexSrcTarget = -$8;

+		 $$->Base.TexShadow = 1;

+	      } else {

+		 $$->Base.TexSrcTarget = $8;

+	      }

+

+	      target_mask = (1U << $$->Base.TexSrcTarget);

+

+	      /* If this texture unit was previously accessed and that access

+	       * had a different texture target, generate an error.

+	       *

+	       * If this texture unit was previously accessed and that access

+	       * had a different shadow mode, generate an error.

+	       */

+	      if ((state->prog->TexturesUsed[$6] != 0)

+		  && ((state->prog->TexturesUsed[$6] != target_mask)

+		      || ((state->prog->ShadowSamplers & tex_mask)

+			  != shadow_tex))) {

+		 yyerror(& @8, state,

+			 "multiple targets used on one texture image unit");

+		 YYERROR;

+	      }

+

+

+	      state->prog->TexturesUsed[$6] |= target_mask;

+	      state->prog->ShadowSamplers |= shadow_tex;

+	   }

+	}

+	;

+

+KIL_instruction: KIL swizzleSrcReg

+	{

+	   $$ = asm_instruction_ctor(OPCODE_KIL, NULL, & $2, NULL, NULL);

+	   state->fragment.UsesKill = 1;

+	}

+	| KIL ccTest

+	{

+	   $$ = asm_instruction_ctor(OPCODE_KIL_NV, NULL, NULL, NULL, NULL);

+	   $$->Base.DstReg.CondMask = $2.CondMask;

+	   $$->Base.DstReg.CondSwizzle = $2.CondSwizzle;

+	   $$->Base.DstReg.CondSrc = $2.CondSrc;

+	   state->fragment.UsesKill = 1;

+	}

+	;

+

+TXD_instruction: TXD_OP maskedDstReg ',' swizzleSrcReg ',' swizzleSrcReg ',' swizzleSrcReg ',' texImageUnit ',' texTarget

+	{

+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, & $8);

+	   if ($$ != NULL) {

+	      const GLbitfield tex_mask = (1U << $10);

+	      GLbitfield shadow_tex = 0;

+	      GLbitfield target_mask = 0;

+

+

+	      $$->Base.TexSrcUnit = $10;

+

+	      if ($12 < 0) {

+		 shadow_tex = tex_mask;

+

+		 $$->Base.TexSrcTarget = -$12;

+		 $$->Base.TexShadow = 1;

+	      } else {

+		 $$->Base.TexSrcTarget = $12;

+	      }

+

+	      target_mask = (1U << $$->Base.TexSrcTarget);

+

+	      /* If this texture unit was previously accessed and that access

+	       * had a different texture target, generate an error.

+	       *

+	       * If this texture unit was previously accessed and that access

+	       * had a different shadow mode, generate an error.

+	       */

+	      if ((state->prog->TexturesUsed[$10] != 0)

+		  && ((state->prog->TexturesUsed[$10] != target_mask)

+		      || ((state->prog->ShadowSamplers & tex_mask)

+			  != shadow_tex))) {

+		 yyerror(& @12, state,

+			 "multiple targets used on one texture image unit");

+		 YYERROR;

+	      }

+

+

+	      state->prog->TexturesUsed[$10] |= target_mask;

+	      state->prog->ShadowSamplers |= shadow_tex;

+	   }

+	}

+	;

+

+texImageUnit: TEXTURE_UNIT optTexImageUnitNum

+	{

+	   $$ = $2;

+	}

+	;

+

+texTarget: TEX_1D  { $$ = TEXTURE_1D_INDEX; }

+	| TEX_2D   { $$ = TEXTURE_2D_INDEX; }

+	| TEX_3D   { $$ = TEXTURE_3D_INDEX; }

+	| TEX_CUBE { $$ = TEXTURE_CUBE_INDEX; }

+	| TEX_RECT { $$ = TEXTURE_RECT_INDEX; }

+	| TEX_SHADOW1D   { $$ = -TEXTURE_1D_INDEX; }

+	| TEX_SHADOW2D   { $$ = -TEXTURE_2D_INDEX; }

+	| TEX_SHADOWRECT { $$ = -TEXTURE_RECT_INDEX; }

+	| TEX_ARRAY1D         { $$ = TEXTURE_1D_ARRAY_INDEX; }

+	| TEX_ARRAY2D         { $$ = TEXTURE_2D_ARRAY_INDEX; }

+	| TEX_ARRAYSHADOW1D   { $$ = -TEXTURE_1D_ARRAY_INDEX; }

+	| TEX_ARRAYSHADOW2D   { $$ = -TEXTURE_2D_ARRAY_INDEX; }

+	;

+

+SWZ_instruction: SWZ maskedDstReg ',' srcReg ',' extendedSwizzle

+	{

+	   /* FIXME: Is this correct?  Should the extenedSwizzle be applied

+	    * FIXME: to the existing swizzle?

+	    */

+	   $4.Base.Swizzle = $6.swizzle;

+	   $4.Base.Negate = $6.mask;

+

+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);

+	}

+	;

+

+scalarSrcReg: optionalSign scalarUse

+	{

+	   $$ = $2;

+

+	   if ($1) {

+	      $$.Base.Negate = ~$$.Base.Negate;

+	   }

+	}

+	| optionalSign '|' scalarUse '|'

+	{

+	   $$ = $3;

+

+	   if (!state->option.NV_fragment) {

+	      yyerror(& @2, state, "unexpected character '|'");

+	      YYERROR;

+	   }

+

+	   if ($1) {

+	      $$.Base.Negate = ~$$.Base.Negate;

+	   }

+

+	   $$.Base.Abs = 1;

+	}

+	;

+

+scalarUse:  srcReg scalarSuffix

+	{

+	   $$ = $1;

+

+	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,

+						    $2.swizzle);

+	}

+	| paramConstScalarUse

+	{

+	   struct asm_symbol temp_sym;

+

+	   if (!state->option.NV_fragment) {

+	      yyerror(& @1, state, "expected scalar suffix");

+	      YYERROR;

+	   }

+

+	   memset(& temp_sym, 0, sizeof(temp_sym));

+	   temp_sym.param_binding_begin = ~0;

+	   initialize_symbol_from_const(state->prog, & temp_sym, & $1, GL_TRUE);

+

+	   set_src_reg_swz(& $$, PROGRAM_CONSTANT,

+                           temp_sym.param_binding_begin,

+                           temp_sym.param_binding_swizzle);

+	}

+	;

+

+swizzleSrcReg: optionalSign srcReg swizzleSuffix

+	{

+	   $$ = $2;

+

+	   if ($1) {

+	      $$.Base.Negate = ~$$.Base.Negate;

+	   }

+

+	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,

+						    $3.swizzle);

+	}

+	| optionalSign '|' srcReg swizzleSuffix '|'

+	{

+	   $$ = $3;

+

+	   if (!state->option.NV_fragment) {

+	      yyerror(& @2, state, "unexpected character '|'");

+	      YYERROR;

+	   }

+

+	   if ($1) {

+	      $$.Base.Negate = ~$$.Base.Negate;

+	   }

+

+	   $$.Base.Abs = 1;

+	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,

+						    $4.swizzle);

+	}

+

+	;

+

+maskedDstReg: dstReg optionalMask optionalCcMask

+	{

+	   $$ = $1;

+	   $$.WriteMask = $2.mask;

+	   $$.CondMask = $3.CondMask;

+	   $$.CondSwizzle = $3.CondSwizzle;

+	   $$.CondSrc = $3.CondSrc;

+

+	   if ($$.File == PROGRAM_OUTPUT) {

+	      /* Technically speaking, this should check that it is in

+	       * vertex program mode.  However, PositionInvariant can never be

+	       * set in fragment program mode, so it is somewhat irrelevant.

+	       */

+	      if (state->option.PositionInvariant

+	       && ($$.Index == VERT_RESULT_HPOS)) {

+		 yyerror(& @1, state, "position-invariant programs cannot "

+			 "write position");

+		 YYERROR;

+	      }

+

+	      state->prog->OutputsWritten |= BITFIELD64_BIT($$.Index);

+	   }

+	}

+	;

+

+maskedAddrReg: addrReg addrWriteMask

+	{

+	   set_dst_reg(& $$, PROGRAM_ADDRESS, 0);

+	   $$.WriteMask = $2.mask;

+	}

+	;

+

+extendedSwizzle: extSwizComp ',' extSwizComp ',' extSwizComp ',' extSwizComp

+	{

+	   const unsigned xyzw_valid =

+	      ($1.xyzw_valid << 0)

+	      | ($3.xyzw_valid << 1)

+	      | ($5.xyzw_valid << 2)

+	      | ($7.xyzw_valid << 3);

+	   const unsigned rgba_valid =

+	      ($1.rgba_valid << 0)

+	      | ($3.rgba_valid << 1)

+	      | ($5.rgba_valid << 2)

+	      | ($7.rgba_valid << 3);

+

+	   /* All of the swizzle components have to be valid in either RGBA

+	    * or XYZW.  Note that 0 and 1 are valid in both, so both masks

+	    * can have some bits set.

+	    *

+	    * We somewhat deviate from the spec here.  It would be really hard

+	    * to figure out which component is the error, and there probably

+	    * isn't a lot of benefit.

+	    */

+	   if ((rgba_valid != 0x0f) && (xyzw_valid != 0x0f)) {

+	      yyerror(& @1, state, "cannot combine RGBA and XYZW swizzle "

+		      "components");

+	      YYERROR;

+	   }

+

+	   $$.swizzle = MAKE_SWIZZLE4($1.swz, $3.swz, $5.swz, $7.swz);

+	   $$.mask = ($1.negate) | ($3.negate << 1) | ($5.negate << 2)

+	      | ($7.negate << 3);

+	}

+	;

+

+extSwizComp: optionalSign extSwizSel

+	{

+	   $$ = $2;

+	   $$.negate = ($1) ? 1 : 0;

+	}

+	;

+

+extSwizSel: INTEGER

+	{

+	   if (($1 != 0) && ($1 != 1)) {

+	      yyerror(& @1, state, "invalid extended swizzle selector");

+	      YYERROR;

+	   }

+

+	   $$.swz = ($1 == 0) ? SWIZZLE_ZERO : SWIZZLE_ONE;

+

+	   /* 0 and 1 are valid for both RGBA swizzle names and XYZW

+	    * swizzle names.

+	    */

+	   $$.xyzw_valid = 1;

+	   $$.rgba_valid = 1;

+	}

+	| string

+	{

+	   char s;

+

+	   if (strlen($1) > 1) {

+	      yyerror(& @1, state, "invalid extended swizzle selector");

+	      YYERROR;

+	   }

+

+	   s = $1[0];

+	   free($1);

+

+	   switch (s) {

+	   case 'x':

+	      $$.swz = SWIZZLE_X;

+	      $$.xyzw_valid = 1;

+	      break;

+	   case 'y':

+	      $$.swz = SWIZZLE_Y;

+	      $$.xyzw_valid = 1;

+	      break;

+	   case 'z':

+	      $$.swz = SWIZZLE_Z;

+	      $$.xyzw_valid = 1;

+	      break;

+	   case 'w':

+	      $$.swz = SWIZZLE_W;

+	      $$.xyzw_valid = 1;

+	      break;

+

+	   case 'r':

+	      $$.swz = SWIZZLE_X;

+	      $$.rgba_valid = 1;

+	      break;

+	   case 'g':

+	      $$.swz = SWIZZLE_Y;

+	      $$.rgba_valid = 1;

+	      break;

+	   case 'b':

+	      $$.swz = SWIZZLE_Z;

+	      $$.rgba_valid = 1;

+	      break;

+	   case 'a':

+	      $$.swz = SWIZZLE_W;

+	      $$.rgba_valid = 1;

+	      break;

+

+	   default:

+	      yyerror(& @1, state, "invalid extended swizzle selector");

+	      YYERROR;

+	      break;

+	   }

+	}

+	;

+

+srcReg: USED_IDENTIFIER /* temporaryReg | progParamSingle */

+	{

+	   struct asm_symbol *const s = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, $1);

+

+	   free($1);

+

+	   if (s == NULL) {

+	      yyerror(& @1, state, "invalid operand variable");

+	      YYERROR;

+	   } else if ((s->type != at_param) && (s->type != at_temp)

+		      && (s->type != at_attrib)) {

+	      yyerror(& @1, state, "invalid operand variable");

+	      YYERROR;

+	   } else if ((s->type == at_param) && s->param_is_array) {

+	      yyerror(& @1, state, "non-array access to array PARAM");

+	      YYERROR;

+	   }

+

+	   init_src_reg(& $$);

+	   switch (s->type) {

+	   case at_temp:

+	      set_src_reg(& $$, PROGRAM_TEMPORARY, s->temp_binding);

+	      break;

+	   case at_param:

+              set_src_reg_swz(& $$, s->param_binding_type,

+                              s->param_binding_begin,

+                              s->param_binding_swizzle);

+	      break;

+	   case at_attrib:

+	      set_src_reg(& $$, PROGRAM_INPUT, s->attrib_binding);

+	      state->prog->InputsRead |= (1U << $$.Base.Index);

+

+	      if (!validate_inputs(& @1, state)) {

+		 YYERROR;

+	      }

+	      break;

+

+	   default:

+	      YYERROR;

+	      break;

+	   }

+	}

+	| attribBinding

+	{

+	   set_src_reg(& $$, PROGRAM_INPUT, $1);

+	   state->prog->InputsRead |= (1U << $$.Base.Index);

+

+	   if (!validate_inputs(& @1, state)) {

+	      YYERROR;

+	   }

+	}

+	| progParamArray '[' progParamArrayMem ']'

+	{

+	   if (! $3.Base.RelAddr

+	       && ((unsigned) $3.Base.Index >= $1->param_binding_length)) {

+	      yyerror(& @3, state, "out of bounds array access");

+	      YYERROR;

+	   }

+

+	   init_src_reg(& $$);

+	   $$.Base.File = $1->param_binding_type;

+

+	   if ($3.Base.RelAddr) {

+              state->prog->IndirectRegisterFiles |= (1 << $$.Base.File);

+	      $1->param_accessed_indirectly = 1;

+

+	      $$.Base.RelAddr = 1;

+	      $$.Base.Index = $3.Base.Index;

+	      $$.Symbol = $1;

+	   } else {

+	      $$.Base.Index = $1->param_binding_begin + $3.Base.Index;

+	   }

+	}

+	| paramSingleItemUse

+	{

+           gl_register_file file = ($1.name != NULL) 

+	      ? $1.param_binding_type

+	      : PROGRAM_CONSTANT;

+           set_src_reg_swz(& $$, file, $1.param_binding_begin,

+                           $1.param_binding_swizzle);

+	}

+	;

+

+dstReg: resultBinding

+	{

+	   set_dst_reg(& $$, PROGRAM_OUTPUT, $1);

+	}

+	| USED_IDENTIFIER /* temporaryReg | vertexResultReg */

+	{

+	   struct asm_symbol *const s = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, $1);

+

+	   free($1);

+

+	   if (s == NULL) {

+	      yyerror(& @1, state, "invalid operand variable");

+	      YYERROR;

+	   } else if ((s->type != at_output) && (s->type != at_temp)) {

+	      yyerror(& @1, state, "invalid operand variable");

+	      YYERROR;

+	   }

+

+	   switch (s->type) {

+	   case at_temp:

+	      set_dst_reg(& $$, PROGRAM_TEMPORARY, s->temp_binding);

+	      break;

+	   case at_output:

+	      set_dst_reg(& $$, PROGRAM_OUTPUT, s->output_binding);

+	      break;

+	   default:

+	      set_dst_reg(& $$, s->param_binding_type, s->param_binding_begin);

+	      break;

+	   }

+	}

+	;

+

+progParamArray: USED_IDENTIFIER

+	{

+	   struct asm_symbol *const s = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, $1);

+

+	   free($1);

+

+	   if (s == NULL) {

+	      yyerror(& @1, state, "invalid operand variable");

+	      YYERROR;

+	   } else if ((s->type != at_param) || !s->param_is_array) {

+	      yyerror(& @1, state, "array access to non-PARAM variable");

+	      YYERROR;

+	   } else {

+	      $$ = s;

+	   }

+	}

+	;

+

+progParamArrayMem: progParamArrayAbs | progParamArrayRel;

+

+progParamArrayAbs: INTEGER

+	{

+	   init_src_reg(& $$);

+	   $$.Base.Index = $1;

+	}

+	;

+

+progParamArrayRel: addrReg addrComponent addrRegRelOffset

+	{

+	   /* FINISHME: Add support for multiple address registers.

+	    */

+	   /* FINISHME: Add support for 4-component address registers.

+	    */

+	   init_src_reg(& $$);

+	   $$.Base.RelAddr = 1;

+	   $$.Base.Index = $3;

+	}

+	;

+

+addrRegRelOffset:              { $$ = 0; }

+	| '+' addrRegPosOffset { $$ = $2; }

+	| '-' addrRegNegOffset { $$ = -$2; }

+	;

+

+addrRegPosOffset: INTEGER

+	{

+	   if (($1 < 0) || ($1 > (state->limits->MaxAddressOffset - 1))) {

+              char s[100];

+              _mesa_snprintf(s, sizeof(s),

+                             "relative address offset too large (%d)", $1);

+	      yyerror(& @1, state, s);

+	      YYERROR;

+	   } else {

+	      $$ = $1;

+	   }

+	}

+	;

+

+addrRegNegOffset: INTEGER

+	{

+	   if (($1 < 0) || ($1 > state->limits->MaxAddressOffset)) {

+              char s[100];

+              _mesa_snprintf(s, sizeof(s),

+                             "relative address offset too large (%d)", $1);

+	      yyerror(& @1, state, s);

+	      YYERROR;

+	   } else {

+	      $$ = $1;

+	   }

+	}

+	;

+

+addrReg: USED_IDENTIFIER

+	{

+	   struct asm_symbol *const s = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, $1);

+

+	   free($1);

+

+	   if (s == NULL) {

+	      yyerror(& @1, state, "invalid array member");

+	      YYERROR;

+	   } else if (s->type != at_address) {

+	      yyerror(& @1, state,

+		      "invalid variable for indexed array access");

+	      YYERROR;

+	   } else {

+	      $$ = s;

+	   }

+	}

+	;

+

+addrComponent: MASK1

+	{

+	   if ($1.mask != WRITEMASK_X) {

+	      yyerror(& @1, state, "invalid address component selector");

+	      YYERROR;

+	   } else {

+	      $$ = $1;

+	   }

+	}

+	;

+

+addrWriteMask: MASK1

+	{

+	   if ($1.mask != WRITEMASK_X) {

+	      yyerror(& @1, state,

+		      "address register write mask must be \".x\"");

+	      YYERROR;

+	   } else {

+	      $$ = $1;

+	   }

+	}

+	;

+

+scalarSuffix: MASK1;

+

+swizzleSuffix: MASK1

+	| MASK4

+	| SWIZZLE

+	|              { $$.swizzle = SWIZZLE_NOOP; $$.mask = WRITEMASK_XYZW; }

+	;

+

+optionalMask: MASK4 | MASK3 | MASK2 | MASK1 

+	|              { $$.swizzle = SWIZZLE_NOOP; $$.mask = WRITEMASK_XYZW; }

+	;

+

+optionalCcMask: '(' ccTest ')'

+	{

+	   $$ = $2;

+	}

+	| '(' ccTest2 ')'

+	{

+	   $$ = $2;

+	}

+	|

+	{

+	   $$.CondMask = COND_TR;

+	   $$.CondSwizzle = SWIZZLE_NOOP;

+	   $$.CondSrc = 0;

+	}

+	;

+

+ccTest: ccMaskRule swizzleSuffix

+	{

+	   $$ = $1;

+	   $$.CondSwizzle = $2.swizzle;

+	}

+	;

+

+ccTest2: ccMaskRule2 swizzleSuffix

+	{

+	   $$ = $1;

+	   $$.CondSwizzle = $2.swizzle;

+	}

+	;

+

+ccMaskRule: IDENTIFIER

+	{

+	   const int cond = _mesa_parse_cc($1);

+	   if ((cond == 0) || ($1[2] != '\0')) {

+	      char *const err_str =

+		 make_error_string("invalid condition code \"%s\"", $1);

+

+	      yyerror(& @1, state, (err_str != NULL)

+		      ? err_str : "invalid condition code");

+

+	      if (err_str != NULL) {

+		 free(err_str);

+	      }

+

+	      YYERROR;

+	   }

+

+	   $$.CondMask = cond;

+	   $$.CondSwizzle = SWIZZLE_NOOP;

+	   $$.CondSrc = 0;

+	}

+	;

+

+ccMaskRule2: USED_IDENTIFIER

+	{

+	   const int cond = _mesa_parse_cc($1);

+	   if ((cond == 0) || ($1[2] != '\0')) {

+	      char *const err_str =

+		 make_error_string("invalid condition code \"%s\"", $1);

+

+	      yyerror(& @1, state, (err_str != NULL)

+		      ? err_str : "invalid condition code");

+

+	      if (err_str != NULL) {

+		 free(err_str);

+	      }

+

+	      YYERROR;

+	   }

+

+	   $$.CondMask = cond;

+	   $$.CondSwizzle = SWIZZLE_NOOP;

+	   $$.CondSrc = 0;

+	}

+	;

+

+namingStatement: ATTRIB_statement

+	| PARAM_statement

+	| TEMP_statement

+	| ADDRESS_statement

+	| OUTPUT_statement

+	| ALIAS_statement

+	;

+

+ATTRIB_statement: ATTRIB IDENTIFIER '=' attribBinding

+	{

+	   struct asm_symbol *const s =

+	      declare_variable(state, $2, at_attrib, & @2);

+

+	   if (s == NULL) {

+	      free($2);

+	      YYERROR;

+	   } else {

+	      s->attrib_binding = $4;

+	      state->InputsBound |= (1U << s->attrib_binding);

+

+	      if (!validate_inputs(& @4, state)) {

+		 YYERROR;

+	      }

+	   }

+	}

+	;

+

+attribBinding: VERTEX vtxAttribItem

+	{

+	   $$ = $2;

+	}

+	| FRAGMENT fragAttribItem

+	{

+	   $$ = $2;

+	}

+	;

+

+vtxAttribItem: POSITION

+	{

+	   $$ = VERT_ATTRIB_POS;

+	}

+	| WEIGHT vtxOptWeightNum

+	{

+	   $$ = VERT_ATTRIB_WEIGHT;

+	}

+	| NORMAL

+	{

+	   $$ = VERT_ATTRIB_NORMAL;

+	}

+	| COLOR optColorType

+	{

+	   if (!state->ctx->Extensions.EXT_secondary_color) {

+	      yyerror(& @2, state, "GL_EXT_secondary_color not supported");

+	      YYERROR;

+	   }

+

+	   $$ = VERT_ATTRIB_COLOR0 + $2;

+	}

+	| FOGCOORD

+	{

+	   if (!state->ctx->Extensions.EXT_fog_coord) {

+	      yyerror(& @1, state, "GL_EXT_fog_coord not supported");

+	      YYERROR;

+	   }

+

+	   $$ = VERT_ATTRIB_FOG;

+	}

+	| TEXCOORD optTexCoordUnitNum

+	{

+	   $$ = VERT_ATTRIB_TEX0 + $2;

+	}

+	| MATRIXINDEX '[' vtxWeightNum ']'

+	{

+	   yyerror(& @1, state, "GL_ARB_matrix_palette not supported");

+	   YYERROR;

+	}

+	| VTXATTRIB '[' vtxAttribNum ']'

+	{

+	   $$ = VERT_ATTRIB_GENERIC0 + $3;

+	}

+	;

+

+vtxAttribNum: INTEGER

+	{

+	   if ((unsigned) $1 >= state->limits->MaxAttribs) {

+	      yyerror(& @1, state, "invalid vertex attribute reference");

+	      YYERROR;

+	   }

+

+	   $$ = $1;

+	}

+	;

+

+vtxOptWeightNum:  | '[' vtxWeightNum ']';

+vtxWeightNum: INTEGER;

+

+fragAttribItem: POSITION

+	{

+	   $$ = FRAG_ATTRIB_WPOS;

+	}

+	| COLOR optColorType

+	{

+	   $$ = FRAG_ATTRIB_COL0 + $2;

+	}

+	| FOGCOORD

+	{

+	   $$ = FRAG_ATTRIB_FOGC;

+	}

+	| TEXCOORD optTexCoordUnitNum

+	{

+	   $$ = FRAG_ATTRIB_TEX0 + $2;

+	}

+	;

+

+PARAM_statement: PARAM_singleStmt | PARAM_multipleStmt;

+

+PARAM_singleStmt: PARAM IDENTIFIER paramSingleInit

+	{

+	   struct asm_symbol *const s =

+	      declare_variable(state, $2, at_param, & @2);

+

+	   if (s == NULL) {

+	      free($2);

+	      YYERROR;

+	   } else {

+	      s->param_binding_type = $3.param_binding_type;

+	      s->param_binding_begin = $3.param_binding_begin;

+	      s->param_binding_length = $3.param_binding_length;

+              s->param_binding_swizzle = $3.param_binding_swizzle;

+	      s->param_is_array = 0;

+	   }

+	}

+	;

+

+PARAM_multipleStmt: PARAM IDENTIFIER '[' optArraySize ']' paramMultipleInit

+	{

+	   if (($4 != 0) && ((unsigned) $4 != $6.param_binding_length)) {

+	      free($2);

+	      yyerror(& @4, state, 

+		      "parameter array size and number of bindings must match");

+	      YYERROR;

+	   } else {

+	      struct asm_symbol *const s =

+		 declare_variable(state, $2, $6.type, & @2);

+

+	      if (s == NULL) {

+		 free($2);

+		 YYERROR;

+	      } else {

+		 s->param_binding_type = $6.param_binding_type;

+		 s->param_binding_begin = $6.param_binding_begin;

+		 s->param_binding_length = $6.param_binding_length;

+                 s->param_binding_swizzle = SWIZZLE_XYZW;

+		 s->param_is_array = 1;

+	      }

+	   }

+	}

+	;

+

+optArraySize:

+	{

+	   $$ = 0;

+	}

+	| INTEGER

+        {

+	   if (($1 < 1) || ((unsigned) $1 > state->limits->MaxParameters)) {

+	      yyerror(& @1, state, "invalid parameter array size");

+	      YYERROR;

+	   } else {

+	      $$ = $1;

+	   }

+	}

+	;

+

+paramSingleInit: '=' paramSingleItemDecl

+	{

+	   $$ = $2;

+	}

+	;

+

+paramMultipleInit: '=' '{' paramMultInitList '}'

+	{

+	   $$ = $3;

+	}

+	;

+

+paramMultInitList: paramMultipleItem

+	| paramMultInitList ',' paramMultipleItem

+	{

+	   $1.param_binding_length += $3.param_binding_length;

+	   $$ = $1;

+	}

+	;

+

+paramSingleItemDecl: stateSingleItem

+	{

+	   memset(& $$, 0, sizeof($$));

+	   $$.param_binding_begin = ~0;

+	   initialize_symbol_from_state(state->prog, & $$, $1);

+	}

+	| programSingleItem

+	{

+	   memset(& $$, 0, sizeof($$));

+	   $$.param_binding_begin = ~0;

+	   initialize_symbol_from_param(state->prog, & $$, $1);

+	}

+	| paramConstDecl

+	{

+	   memset(& $$, 0, sizeof($$));

+	   $$.param_binding_begin = ~0;

+	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_TRUE);

+	}

+	;

+

+paramSingleItemUse: stateSingleItem

+	{

+	   memset(& $$, 0, sizeof($$));

+	   $$.param_binding_begin = ~0;

+	   initialize_symbol_from_state(state->prog, & $$, $1);

+	}

+	| programSingleItem

+	{

+	   memset(& $$, 0, sizeof($$));

+	   $$.param_binding_begin = ~0;

+	   initialize_symbol_from_param(state->prog, & $$, $1);

+	}

+	| paramConstUse

+	{

+	   memset(& $$, 0, sizeof($$));

+	   $$.param_binding_begin = ~0;

+	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_TRUE);

+	}

+	;

+

+paramMultipleItem: stateMultipleItem

+	{

+	   memset(& $$, 0, sizeof($$));

+	   $$.param_binding_begin = ~0;

+	   initialize_symbol_from_state(state->prog, & $$, $1);

+	}

+	| programMultipleItem

+	{

+	   memset(& $$, 0, sizeof($$));

+	   $$.param_binding_begin = ~0;

+	   initialize_symbol_from_param(state->prog, & $$, $1);

+	}

+	| paramConstDecl

+	{

+	   memset(& $$, 0, sizeof($$));

+	   $$.param_binding_begin = ~0;

+	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_FALSE);

+	}

+	;

+

+stateMultipleItem: stateSingleItem        { memcpy($$, $1, sizeof($$)); }

+	| STATE stateMatrixRows           { memcpy($$, $2, sizeof($$)); }

+	;

+

+stateSingleItem: STATE stateMaterialItem  { memcpy($$, $2, sizeof($$)); }

+	| STATE stateLightItem            { memcpy($$, $2, sizeof($$)); }

+	| STATE stateLightModelItem       { memcpy($$, $2, sizeof($$)); }

+	| STATE stateLightProdItem        { memcpy($$, $2, sizeof($$)); }

+	| STATE stateTexGenItem           { memcpy($$, $2, sizeof($$)); }

+	| STATE stateTexEnvItem           { memcpy($$, $2, sizeof($$)); }

+	| STATE stateFogItem              { memcpy($$, $2, sizeof($$)); }

+	| STATE stateClipPlaneItem        { memcpy($$, $2, sizeof($$)); }

+	| STATE statePointItem            { memcpy($$, $2, sizeof($$)); }

+	| STATE stateMatrixRow            { memcpy($$, $2, sizeof($$)); }

+	| STATE stateDepthItem            { memcpy($$, $2, sizeof($$)); }

+	;

+

+stateMaterialItem: MATERIAL optFaceType stateMatProperty

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = STATE_MATERIAL;

+	   $$[1] = $2;

+	   $$[2] = $3;

+	}

+	;

+

+stateMatProperty: ambDiffSpecProperty

+	{

+	   $$ = $1;

+	}

+	| EMISSION

+	{

+	   $$ = STATE_EMISSION;

+	}

+	| SHININESS

+	{

+	   $$ = STATE_SHININESS;

+	}

+	;

+

+stateLightItem: LIGHT '[' stateLightNumber ']' stateLightProperty

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = STATE_LIGHT;

+	   $$[1] = $3;

+	   $$[2] = $5;

+	}

+	;

+

+stateLightProperty: ambDiffSpecProperty

+	{

+	   $$ = $1;

+	}

+	| POSITION

+	{

+	   $$ = STATE_POSITION;

+	}

+	| ATTENUATION

+	{

+	   if (!state->ctx->Extensions.EXT_point_parameters) {

+	      yyerror(& @1, state, "GL_ARB_point_parameters not supported");

+	      YYERROR;

+	   }

+

+	   $$ = STATE_ATTENUATION;

+	}

+	| SPOT stateSpotProperty

+	{

+	   $$ = $2;

+	}

+	| HALF

+	{

+	   $$ = STATE_HALF_VECTOR;

+	}

+	;

+

+stateSpotProperty: DIRECTION

+	{

+	   $$ = STATE_SPOT_DIRECTION;

+	}

+	;

+

+stateLightModelItem: LIGHTMODEL stateLModProperty

+	{

+	   $$[0] = $2[0];

+	   $$[1] = $2[1];

+	}

+	;

+

+stateLModProperty: AMBIENT

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = STATE_LIGHTMODEL_AMBIENT;

+	}

+	| optFaceType SCENECOLOR

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = STATE_LIGHTMODEL_SCENECOLOR;

+	   $$[1] = $1;

+	}

+	;

+

+stateLightProdItem: LIGHTPROD '[' stateLightNumber ']' optFaceType stateLProdProperty

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = STATE_LIGHTPROD;

+	   $$[1] = $3;

+	   $$[2] = $5;

+	   $$[3] = $6;

+	}

+	;

+

+stateLProdProperty: ambDiffSpecProperty;

+

+stateTexEnvItem: TEXENV optLegacyTexUnitNum stateTexEnvProperty

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = $3;

+	   $$[1] = $2;

+	}

+	;

+

+stateTexEnvProperty: COLOR

+	{

+	   $$ = STATE_TEXENV_COLOR;

+	}

+	;

+

+ambDiffSpecProperty: AMBIENT

+	{

+	   $$ = STATE_AMBIENT;

+	}

+	| DIFFUSE

+	{

+	   $$ = STATE_DIFFUSE;

+	}

+	| SPECULAR

+	{

+	   $$ = STATE_SPECULAR;

+	}

+	;

+

+stateLightNumber: INTEGER

+	{

+	   if ((unsigned) $1 >= state->MaxLights) {

+	      yyerror(& @1, state, "invalid light selector");

+	      YYERROR;

+	   }

+

+	   $$ = $1;

+	}

+	;

+

+stateTexGenItem: TEXGEN optTexCoordUnitNum stateTexGenType stateTexGenCoord

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = STATE_TEXGEN;

+	   $$[1] = $2;

+	   $$[2] = $3 + $4;

+	}

+	;

+

+stateTexGenType: EYE

+	{

+	   $$ = STATE_TEXGEN_EYE_S;

+	}

+	| OBJECT

+	{

+	   $$ = STATE_TEXGEN_OBJECT_S;

+	}

+	;

+stateTexGenCoord: TEXGEN_S

+	{

+	   $$ = STATE_TEXGEN_EYE_S - STATE_TEXGEN_EYE_S;

+	}

+	| TEXGEN_T

+	{

+	   $$ = STATE_TEXGEN_EYE_T - STATE_TEXGEN_EYE_S;

+	}

+	| TEXGEN_R

+	{

+	   $$ = STATE_TEXGEN_EYE_R - STATE_TEXGEN_EYE_S;

+	}

+	| TEXGEN_Q

+	{

+	   $$ = STATE_TEXGEN_EYE_Q - STATE_TEXGEN_EYE_S;

+	}

+	;

+

+stateFogItem: FOG stateFogProperty

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = $2;

+	}

+	;

+

+stateFogProperty: COLOR

+	{

+	   $$ = STATE_FOG_COLOR;

+	}

+	| PARAMS

+	{

+	   $$ = STATE_FOG_PARAMS;

+	}

+	;

+

+stateClipPlaneItem: CLIP '[' stateClipPlaneNum ']' PLANE

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = STATE_CLIPPLANE;

+	   $$[1] = $3;

+	}

+	;

+

+stateClipPlaneNum: INTEGER

+	{

+	   if ((unsigned) $1 >= state->MaxClipPlanes) {

+	      yyerror(& @1, state, "invalid clip plane selector");

+	      YYERROR;

+	   }

+

+	   $$ = $1;

+	}

+	;

+

+statePointItem: POINT_TOK statePointProperty

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = $2;

+	}

+	;

+

+statePointProperty: SIZE_TOK

+	{

+	   $$ = STATE_POINT_SIZE;

+	}

+	| ATTENUATION

+	{

+	   $$ = STATE_POINT_ATTENUATION;

+	}

+	;

+

+stateMatrixRow: stateMatrixItem ROW '[' stateMatrixRowNum ']'

+	{

+	   $$[0] = $1[0];

+	   $$[1] = $1[1];

+	   $$[2] = $4;

+	   $$[3] = $4;

+	   $$[4] = $1[2];

+	}

+	;

+

+stateMatrixRows: stateMatrixItem optMatrixRows

+	{

+	   $$[0] = $1[0];

+	   $$[1] = $1[1];

+	   $$[2] = $2[2];

+	   $$[3] = $2[3];

+	   $$[4] = $1[2];

+	}

+	;

+

+optMatrixRows:

+	{

+	   $$[2] = 0;

+	   $$[3] = 3;

+	}

+	| ROW '[' stateMatrixRowNum DOT_DOT stateMatrixRowNum ']'

+	{

+	   /* It seems logical that the matrix row range specifier would have

+	    * to specify a range or more than one row (i.e., $5 > $3).

+	    * However, the ARB_vertex_program spec says "a program will fail

+	    * to load if <a> is greater than <b>."  This means that $3 == $5

+	    * is valid.

+	    */

+	   if ($3 > $5) {

+	      yyerror(& @3, state, "invalid matrix row range");

+	      YYERROR;

+	   }

+

+	   $$[2] = $3;

+	   $$[3] = $5;

+	}

+	;

+

+stateMatrixItem: MATRIX stateMatrixName stateOptMatModifier

+	{

+	   $$[0] = $2[0];

+	   $$[1] = $2[1];

+	   $$[2] = $3;

+	}

+	;

+

+stateOptMatModifier: 

+	{

+	   $$ = 0;

+	}

+	| stateMatModifier

+	{

+	   $$ = $1;

+	}

+	;

+

+stateMatModifier: INVERSE 

+	{

+	   $$ = STATE_MATRIX_INVERSE;

+	}

+	| TRANSPOSE 

+	{

+	   $$ = STATE_MATRIX_TRANSPOSE;

+	}

+	| INVTRANS

+	{

+	   $$ = STATE_MATRIX_INVTRANS;

+	}

+	;

+

+stateMatrixRowNum: INTEGER

+	{

+	   if ($1 > 3) {

+	      yyerror(& @1, state, "invalid matrix row reference");

+	      YYERROR;

+	   }

+

+	   $$ = $1;

+	}

+	;

+

+stateMatrixName: MODELVIEW stateOptModMatNum

+	{

+	   $$[0] = STATE_MODELVIEW_MATRIX;

+	   $$[1] = $2;

+	}

+	| PROJECTION

+	{

+	   $$[0] = STATE_PROJECTION_MATRIX;

+	   $$[1] = 0;

+	}

+	| MVP

+	{

+	   $$[0] = STATE_MVP_MATRIX;

+	   $$[1] = 0;

+	}

+	| TEXTURE optTexCoordUnitNum

+	{

+	   $$[0] = STATE_TEXTURE_MATRIX;

+	   $$[1] = $2;

+	}

+	| PALETTE '[' statePaletteMatNum ']'

+	{

+	   yyerror(& @1, state, "GL_ARB_matrix_palette not supported");

+	   YYERROR;

+	}

+	| MAT_PROGRAM '[' stateProgramMatNum ']'

+	{

+	   $$[0] = STATE_PROGRAM_MATRIX;

+	   $$[1] = $3;

+	}

+	;

+

+stateOptModMatNum:

+	{

+	   $$ = 0;

+	}

+	| '[' stateModMatNum ']'

+	{

+	   $$ = $2;

+	}

+	;

+stateModMatNum: INTEGER

+	{

+	   /* Since GL_ARB_vertex_blend isn't supported, only modelview matrix

+	    * zero is valid.

+	    */

+	   if ($1 != 0) {

+	      yyerror(& @1, state, "invalid modelview matrix index");

+	      YYERROR;

+	   }

+

+	   $$ = $1;

+	}

+	;

+statePaletteMatNum: INTEGER

+	{

+	   /* Since GL_ARB_matrix_palette isn't supported, just let any value

+	    * through here.  The error will be generated later.

+	    */

+	   $$ = $1;

+	}

+	;

+stateProgramMatNum: INTEGER

+	{

+	   if ((unsigned) $1 >= state->MaxProgramMatrices) {

+	      yyerror(& @1, state, "invalid program matrix selector");

+	      YYERROR;

+	   }

+

+	   $$ = $1;

+	}

+	;

+

+stateDepthItem: DEPTH RANGE

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = STATE_DEPTH_RANGE;

+	}

+	;

+

+

+programSingleItem: progEnvParam | progLocalParam;

+

+programMultipleItem: progEnvParams | progLocalParams;

+

+progEnvParams: PROGRAM ENV '[' progEnvParamNums ']'

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = state->state_param_enum;

+	   $$[1] = STATE_ENV;

+	   $$[2] = $4[0];

+	   $$[3] = $4[1];

+	}

+	;

+

+progEnvParamNums: progEnvParamNum

+	{

+	   $$[0] = $1;

+	   $$[1] = $1;

+	}

+	| progEnvParamNum DOT_DOT progEnvParamNum

+	{

+	   $$[0] = $1;

+	   $$[1] = $3;

+	}

+	;

+

+progEnvParam: PROGRAM ENV '[' progEnvParamNum ']'

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = state->state_param_enum;

+	   $$[1] = STATE_ENV;

+	   $$[2] = $4;

+	   $$[3] = $4;

+	}

+	;

+

+progLocalParams: PROGRAM LOCAL '[' progLocalParamNums ']'

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = state->state_param_enum;

+	   $$[1] = STATE_LOCAL;

+	   $$[2] = $4[0];

+	   $$[3] = $4[1];

+	}

+

+progLocalParamNums: progLocalParamNum

+	{

+	   $$[0] = $1;

+	   $$[1] = $1;

+	}

+	| progLocalParamNum DOT_DOT progLocalParamNum

+	{

+	   $$[0] = $1;

+	   $$[1] = $3;

+	}

+	;

+

+progLocalParam: PROGRAM LOCAL '[' progLocalParamNum ']'

+	{

+	   memset($$, 0, sizeof($$));

+	   $$[0] = state->state_param_enum;

+	   $$[1] = STATE_LOCAL;

+	   $$[2] = $4;

+	   $$[3] = $4;

+	}

+	;

+

+progEnvParamNum: INTEGER

+	{

+	   if ((unsigned) $1 >= state->limits->MaxEnvParams) {

+	      yyerror(& @1, state, "invalid environment parameter reference");

+	      YYERROR;

+	   }

+	   $$ = $1;

+	}

+	;

+

+progLocalParamNum: INTEGER

+	{

+	   if ((unsigned) $1 >= state->limits->MaxLocalParams) {

+	      yyerror(& @1, state, "invalid local parameter reference");

+	      YYERROR;

+	   }

+	   $$ = $1;

+	}

+	;

+

+

+

+paramConstDecl: paramConstScalarDecl | paramConstVector;

+paramConstUse: paramConstScalarUse | paramConstVector;

+

+paramConstScalarDecl: signedFloatConstant

+	{

+	   $$.count = 4;

+	   $$.data[0] = $1;

+	   $$.data[1] = $1;

+	   $$.data[2] = $1;

+	   $$.data[3] = $1;

+	}

+	;

+

+paramConstScalarUse: REAL

+	{

+	   $$.count = 1;

+	   $$.data[0] = $1;

+	   $$.data[1] = $1;

+	   $$.data[2] = $1;

+	   $$.data[3] = $1;

+	}

+	| INTEGER

+	{

+	   $$.count = 1;

+	   $$.data[0] = (float) $1;

+	   $$.data[1] = (float) $1;

+	   $$.data[2] = (float) $1;

+	   $$.data[3] = (float) $1;

+	}

+	;

+

+paramConstVector: '{' signedFloatConstant '}'

+	{

+	   $$.count = 4;

+	   $$.data[0] = $2;

+	   $$.data[1] = 0.0f;

+	   $$.data[2] = 0.0f;

+	   $$.data[3] = 1.0f;

+	}

+	| '{' signedFloatConstant ',' signedFloatConstant '}'

+	{

+	   $$.count = 4;

+	   $$.data[0] = $2;

+	   $$.data[1] = $4;

+	   $$.data[2] = 0.0f;

+	   $$.data[3] = 1.0f;

+	}

+	| '{' signedFloatConstant ',' signedFloatConstant ','

+              signedFloatConstant '}'

+	{

+	   $$.count = 4;

+	   $$.data[0] = $2;

+	   $$.data[1] = $4;

+	   $$.data[2] = $6;

+	   $$.data[3] = 1.0f;

+	}

+	| '{' signedFloatConstant ',' signedFloatConstant ','

+              signedFloatConstant ',' signedFloatConstant '}'

+	{

+	   $$.count = 4;

+	   $$.data[0] = $2;

+	   $$.data[1] = $4;

+	   $$.data[2] = $6;

+	   $$.data[3] = $8;

+	}

+	;

+

+signedFloatConstant: optionalSign REAL

+	{

+	   $$ = ($1) ? -$2 : $2;

+	}

+	| optionalSign INTEGER

+	{

+	   $$ = (float)(($1) ? -$2 : $2);

+	}

+	;

+

+optionalSign: '+'        { $$ = FALSE; }

+	| '-'            { $$ = TRUE;  }

+	|                { $$ = FALSE; }

+	;

+

+TEMP_statement: optVarSize TEMP { $<integer>$ = $2; } varNameList

+	;

+

+optVarSize: string

+	{

+	   /* NV_fragment_program_option defines the size qualifiers in a

+	    * fairly broken way.  "SHORT" or "LONG" can optionally be used

+	    * before TEMP or OUTPUT.  However, neither is a reserved word!

+	    * This means that we have to parse it as an identifier, then check

+	    * to make sure it's one of the valid values.  *sigh*

+	    *

+	    * In addition, the grammar in the extension spec does *not* allow

+	    * the size specifier to be optional, but all known implementations

+	    * do.

+	    */

+	   if (!state->option.NV_fragment) {

+	      yyerror(& @1, state, "unexpected IDENTIFIER");

+	      YYERROR;

+	   }

+

+	   if (strcmp("SHORT", $1) == 0) {

+	   } else if (strcmp("LONG", $1) == 0) {

+	   } else {

+	      char *const err_str =

+		 make_error_string("invalid storage size specifier \"%s\"",

+				   $1);

+

+	      yyerror(& @1, state, (err_str != NULL)

+		      ? err_str : "invalid storage size specifier");

+

+	      if (err_str != NULL) {

+		 free(err_str);

+	      }

+

+	      YYERROR;

+	   }

+	}

+	|

+	{

+	}

+	;

+

+ADDRESS_statement: ADDRESS { $<integer>$ = $1; } varNameList

+	;

+

+varNameList: varNameList ',' IDENTIFIER

+	{

+	   if (!declare_variable(state, $3, $<integer>0, & @3)) {

+	      free($3);

+	      YYERROR;

+	   }

+	}

+	| IDENTIFIER

+	{

+	   if (!declare_variable(state, $1, $<integer>0, & @1)) {

+	      free($1);

+	      YYERROR;

+	   }

+	}

+	;

+

+OUTPUT_statement: optVarSize OUTPUT IDENTIFIER '=' resultBinding

+	{

+	   struct asm_symbol *const s =

+	      declare_variable(state, $3, at_output, & @3);

+

+	   if (s == NULL) {

+	      free($3);

+	      YYERROR;

+	   } else {

+	      s->output_binding = $5;

+	   }

+	}

+	;

+

+resultBinding: RESULT POSITION

+	{

+	   if (state->mode == ARB_vertex) {

+	      $$ = VERT_RESULT_HPOS;

+	   } else {

+	      yyerror(& @2, state, "invalid program result name");

+	      YYERROR;

+	   }

+	}

+	| RESULT FOGCOORD

+	{

+	   if (state->mode == ARB_vertex) {

+	      $$ = VERT_RESULT_FOGC;

+	   } else {

+	      yyerror(& @2, state, "invalid program result name");

+	      YYERROR;

+	   }

+	}

+	| RESULT resultColBinding

+	{

+	   $$ = $2;

+	}

+	| RESULT POINTSIZE

+	{

+	   if (state->mode == ARB_vertex) {

+	      $$ = VERT_RESULT_PSIZ;

+	   } else {

+	      yyerror(& @2, state, "invalid program result name");

+	      YYERROR;

+	   }

+	}

+	| RESULT TEXCOORD optTexCoordUnitNum

+	{

+	   if (state->mode == ARB_vertex) {

+	      $$ = VERT_RESULT_TEX0 + $3;

+	   } else {

+	      yyerror(& @2, state, "invalid program result name");

+	      YYERROR;

+	   }

+	}

+	| RESULT DEPTH

+	{

+	   if (state->mode == ARB_fragment) {

+	      $$ = FRAG_RESULT_DEPTH;

+	   } else {

+	      yyerror(& @2, state, "invalid program result name");

+	      YYERROR;

+	   }

+	}

+	;

+

+resultColBinding: COLOR optResultFaceType optResultColorType

+	{

+	   $$ = $2 + $3;

+	}

+	;

+

+optResultFaceType:

+	{

+	   $$ = (state->mode == ARB_vertex)

+	      ? VERT_RESULT_COL0

+	      : FRAG_RESULT_COLOR;

+	}

+	| FRONT

+	{

+	   if (state->mode == ARB_vertex) {

+	      $$ = VERT_RESULT_COL0;

+	   } else {

+	      yyerror(& @1, state, "invalid program result name");

+	      YYERROR;

+	   }

+	}

+	| BACK

+	{

+	   if (state->mode == ARB_vertex) {

+	      $$ = VERT_RESULT_BFC0;

+	   } else {

+	      yyerror(& @1, state, "invalid program result name");

+	      YYERROR;

+	   }

+	}

+	;

+

+optResultColorType:

+	{

+	   $$ = 0; 

+	}

+	| PRIMARY

+	{

+	   if (state->mode == ARB_vertex) {

+	      $$ = 0;

+	   } else {

+	      yyerror(& @1, state, "invalid program result name");

+	      YYERROR;

+	   }

+	}

+	| SECONDARY

+	{

+	   if (state->mode == ARB_vertex) {

+	      $$ = 1;

+	   } else {

+	      yyerror(& @1, state, "invalid program result name");

+	      YYERROR;

+	   }

+	}

+	;

+

+optFaceType:    { $$ = 0; }

+	| FRONT	{ $$ = 0; }

+	| BACK  { $$ = 1; }

+	;

+

+optColorType:       { $$ = 0; }

+	| PRIMARY   { $$ = 0; }

+	| SECONDARY { $$ = 1; }

+	;

+

+optTexCoordUnitNum:                { $$ = 0; }

+	| '[' texCoordUnitNum ']'  { $$ = $2; }

+	;

+

+optTexImageUnitNum:                { $$ = 0; }

+	| '[' texImageUnitNum ']'  { $$ = $2; }

+	;

+

+optLegacyTexUnitNum:               { $$ = 0; }

+	| '[' legacyTexUnitNum ']' { $$ = $2; }

+	;

+

+texCoordUnitNum: INTEGER

+	{

+	   if ((unsigned) $1 >= state->MaxTextureCoordUnits) {

+	      yyerror(& @1, state, "invalid texture coordinate unit selector");

+	      YYERROR;

+	   }

+

+	   $$ = $1;

+	}

+	;

+

+texImageUnitNum: INTEGER

+	{

+	   if ((unsigned) $1 >= state->MaxTextureImageUnits) {

+	      yyerror(& @1, state, "invalid texture image unit selector");

+	      YYERROR;

+	   }

+

+	   $$ = $1;

+	}

+	;

+

+legacyTexUnitNum: INTEGER

+	{

+	   if ((unsigned) $1 >= state->MaxTextureUnits) {

+	      yyerror(& @1, state, "invalid texture unit selector");

+	      YYERROR;

+	   }

+

+	   $$ = $1;

+	}

+	;

+

+ALIAS_statement: ALIAS IDENTIFIER '=' USED_IDENTIFIER

+	{

+	   struct asm_symbol *exist = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, $2);

+	   struct asm_symbol *target = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, $4);

+

+	   free($4);

+

+	   if (exist != NULL) {

+	      char m[1000];

+	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", $2);

+	      free($2);

+	      yyerror(& @2, state, m);

+	      YYERROR;

+	   } else if (target == NULL) {

+	      free($2);

+	      yyerror(& @4, state,

+		      "undefined variable binding in ALIAS statement");

+	      YYERROR;

+	   } else {

+	      _mesa_symbol_table_add_symbol(state->st, 0, $2, target);

+	   }

+	}

+	;

+

+string: IDENTIFIER

+	| USED_IDENTIFIER

+	;

+

+%%

+

+void

+asm_instruction_set_operands(struct asm_instruction *inst,

+			     const struct prog_dst_register *dst,

+			     const struct asm_src_register *src0,

+			     const struct asm_src_register *src1,

+			     const struct asm_src_register *src2)

+{

+   /* In the core ARB extensions only the KIL instruction doesn't have a

+    * destination register.

+    */

+   if (dst == NULL) {

+      init_dst_reg(& inst->Base.DstReg);

+   } else {

+      inst->Base.DstReg = *dst;

+   }

+

+   /* The only instruction that doesn't have any source registers is the

+    * condition-code based KIL instruction added by NV_fragment_program_option.

+    */

+   if (src0 != NULL) {

+      inst->Base.SrcReg[0] = src0->Base;

+      inst->SrcReg[0] = *src0;

+   } else {

+      init_src_reg(& inst->SrcReg[0]);

+   }

+

+   if (src1 != NULL) {

+      inst->Base.SrcReg[1] = src1->Base;

+      inst->SrcReg[1] = *src1;

+   } else {

+      init_src_reg(& inst->SrcReg[1]);

+   }

+

+   if (src2 != NULL) {

+      inst->Base.SrcReg[2] = src2->Base;

+      inst->SrcReg[2] = *src2;

+   } else {

+      init_src_reg(& inst->SrcReg[2]);

+   }

+}

+

+

+struct asm_instruction *

+asm_instruction_ctor(gl_inst_opcode op,

+		     const struct prog_dst_register *dst,

+		     const struct asm_src_register *src0,

+		     const struct asm_src_register *src1,

+		     const struct asm_src_register *src2)

+{

+   struct asm_instruction *inst = CALLOC_STRUCT(asm_instruction);

+

+   if (inst) {

+      _mesa_init_instructions(& inst->Base, 1);

+      inst->Base.Opcode = op;

+

+      asm_instruction_set_operands(inst, dst, src0, src1, src2);

+   }

+

+   return inst;

+}

+

+

+struct asm_instruction *

+asm_instruction_copy_ctor(const struct prog_instruction *base,

+			  const struct prog_dst_register *dst,

+			  const struct asm_src_register *src0,

+			  const struct asm_src_register *src1,

+			  const struct asm_src_register *src2)

+{

+   struct asm_instruction *inst = CALLOC_STRUCT(asm_instruction);

+

+   if (inst) {

+      _mesa_init_instructions(& inst->Base, 1);

+      inst->Base.Opcode = base->Opcode;

+      inst->Base.CondUpdate = base->CondUpdate;

+      inst->Base.CondDst = base->CondDst;

+      inst->Base.SaturateMode = base->SaturateMode;

+      inst->Base.Precision = base->Precision;

+

+      asm_instruction_set_operands(inst, dst, src0, src1, src2);

+   }

+

+   return inst;

+}

+

+

+void

+init_dst_reg(struct prog_dst_register *r)

+{

+   memset(r, 0, sizeof(*r));

+   r->File = PROGRAM_UNDEFINED;

+   r->WriteMask = WRITEMASK_XYZW;

+   r->CondMask = COND_TR;

+   r->CondSwizzle = SWIZZLE_NOOP;

+}

+

+

+/** Like init_dst_reg() but set the File and Index fields. */

+void

+set_dst_reg(struct prog_dst_register *r, gl_register_file file, GLint index)

+{

+   const GLint maxIndex = 1 << INST_INDEX_BITS;

+   const GLint minIndex = 0;

+   ASSERT(index >= minIndex);

+   (void) minIndex;

+   ASSERT(index <= maxIndex);

+   (void) maxIndex;

+   ASSERT(file == PROGRAM_TEMPORARY ||

+	  file == PROGRAM_ADDRESS ||

+	  file == PROGRAM_OUTPUT);

+   memset(r, 0, sizeof(*r));

+   r->File = file;

+   r->Index = index;

+   r->WriteMask = WRITEMASK_XYZW;

+   r->CondMask = COND_TR;

+   r->CondSwizzle = SWIZZLE_NOOP;

+}

+

+

+void

+init_src_reg(struct asm_src_register *r)

+{

+   memset(r, 0, sizeof(*r));

+   r->Base.File = PROGRAM_UNDEFINED;

+   r->Base.Swizzle = SWIZZLE_NOOP;

+   r->Symbol = NULL;

+}

+

+

+/** Like init_src_reg() but set the File and Index fields.

+ * \return GL_TRUE if a valid src register, GL_FALSE otherwise

+ */

+void

+set_src_reg(struct asm_src_register *r, gl_register_file file, GLint index)

+{

+   set_src_reg_swz(r, file, index, SWIZZLE_XYZW);

+}

+

+

+void

+set_src_reg_swz(struct asm_src_register *r, gl_register_file file, GLint index,

+                GLuint swizzle)

+{

+   const GLint maxIndex = (1 << INST_INDEX_BITS) - 1;

+   const GLint minIndex = -(1 << INST_INDEX_BITS);

+   ASSERT(file < PROGRAM_FILE_MAX);

+   ASSERT(index >= minIndex);

+   (void) minIndex;

+   ASSERT(index <= maxIndex);

+   (void) maxIndex;

+   memset(r, 0, sizeof(*r));

+   r->Base.File = file;

+   r->Base.Index = index;

+   r->Base.Swizzle = swizzle;

+   r->Symbol = NULL;

+}

+

+

+/**

+ * Validate the set of inputs used by a program

+ *

+ * Validates that legal sets of inputs are used by the program.  In this case

+ * "used" included both reading the input or binding the input to a name using

+ * the \c ATTRIB command.

+ *

+ * \return

+ * \c TRUE if the combination of inputs used is valid, \c FALSE otherwise.

+ */

+int

+validate_inputs(struct YYLTYPE *locp, struct asm_parser_state *state)

+{

+   const int inputs = state->prog->InputsRead | state->InputsBound;

+

+   if (((inputs & 0x0ffff) & (inputs >> 16)) != 0) {

+      yyerror(locp, state, "illegal use of generic attribute and name attribute");

+      return 0;

+   }

+

+   return 1;

+}

+

+

+struct asm_symbol *

+declare_variable(struct asm_parser_state *state, char *name, enum asm_type t,

+		 struct YYLTYPE *locp)

+{

+   struct asm_symbol *s = NULL;

+   struct asm_symbol *exist = (struct asm_symbol *)

+      _mesa_symbol_table_find_symbol(state->st, 0, name);

+

+

+   if (exist != NULL) {

+      yyerror(locp, state, "redeclared identifier");

+   } else {

+      s = calloc(1, sizeof(struct asm_symbol));

+      s->name = name;

+      s->type = t;

+

+      switch (t) {

+      case at_temp:

+	 if (state->prog->NumTemporaries >= state->limits->MaxTemps) {

+	    yyerror(locp, state, "too many temporaries declared");

+	    free(s);

+	    return NULL;

+	 }

+

+	 s->temp_binding = state->prog->NumTemporaries;

+	 state->prog->NumTemporaries++;

+	 break;

+

+      case at_address:

+	 if (state->prog->NumAddressRegs >= state->limits->MaxAddressRegs) {

+	    yyerror(locp, state, "too many address registers declared");

+	    free(s);

+	    return NULL;

+	 }

+

+	 /* FINISHME: Add support for multiple address registers.

+	  */

+	 state->prog->NumAddressRegs++;

+	 break;

+

+      default:

+	 break;

+      }

+

+      _mesa_symbol_table_add_symbol(state->st, 0, s->name, s);

+      s->next = state->sym;

+      state->sym = s;

+   }

+

+   return s;

+}

+

+

+int add_state_reference(struct gl_program_parameter_list *param_list,

+			const gl_state_index tokens[STATE_LENGTH])

+{

+   const GLuint size = 4; /* XXX fix */

+   char *name;

+   GLint index;

+

+   name = _mesa_program_state_string(tokens);

+   index = _mesa_add_parameter(param_list, PROGRAM_STATE_VAR, name,

+                               size, GL_NONE, NULL, tokens, 0x0);

+   param_list->StateFlags |= _mesa_program_state_flags(tokens);

+

+   /* free name string here since we duplicated it in add_parameter() */

+   free(name);

+

+   return index;

+}

+

+

+int

+initialize_symbol_from_state(struct gl_program *prog,

+			     struct asm_symbol *param_var, 

+			     const gl_state_index tokens[STATE_LENGTH])

+{

+   int idx = -1;

+   gl_state_index state_tokens[STATE_LENGTH];

+

+

+   memcpy(state_tokens, tokens, sizeof(state_tokens));

+

+   param_var->type = at_param;

+   param_var->param_binding_type = PROGRAM_STATE_VAR;

+

+   /* If we are adding a STATE_MATRIX that has multiple rows, we need to

+    * unroll it and call add_state_reference() for each row

+    */

+   if ((state_tokens[0] == STATE_MODELVIEW_MATRIX ||

+	state_tokens[0] == STATE_PROJECTION_MATRIX ||

+	state_tokens[0] == STATE_MVP_MATRIX ||

+	state_tokens[0] == STATE_TEXTURE_MATRIX ||

+	state_tokens[0] == STATE_PROGRAM_MATRIX)

+       && (state_tokens[2] != state_tokens[3])) {

+      int row;

+      const int first_row = state_tokens[2];

+      const int last_row = state_tokens[3];

+

+      for (row = first_row; row <= last_row; row++) {

+	 state_tokens[2] = state_tokens[3] = row;

+

+	 idx = add_state_reference(prog->Parameters, state_tokens);

+	 if (param_var->param_binding_begin == ~0U) {

+	    param_var->param_binding_begin = idx;

+            param_var->param_binding_swizzle = SWIZZLE_XYZW;

+         }

+

+	 param_var->param_binding_length++;

+      }

+   }

+   else {

+      idx = add_state_reference(prog->Parameters, state_tokens);

+      if (param_var->param_binding_begin == ~0U) {

+	 param_var->param_binding_begin = idx;

+         param_var->param_binding_swizzle = SWIZZLE_XYZW;

+      }

+      param_var->param_binding_length++;

+   }

+

+   return idx;

+}

+

+

+int

+initialize_symbol_from_param(struct gl_program *prog,

+			     struct asm_symbol *param_var, 

+			     const gl_state_index tokens[STATE_LENGTH])

+{

+   int idx = -1;

+   gl_state_index state_tokens[STATE_LENGTH];

+

+

+   memcpy(state_tokens, tokens, sizeof(state_tokens));

+

+   assert((state_tokens[0] == STATE_VERTEX_PROGRAM)

+	  || (state_tokens[0] == STATE_FRAGMENT_PROGRAM));

+   assert((state_tokens[1] == STATE_ENV)

+	  || (state_tokens[1] == STATE_LOCAL));

+

+   /*

+    * The param type is STATE_VAR.  The program parameter entry will

+    * effectively be a pointer into the LOCAL or ENV parameter array.

+    */

+   param_var->type = at_param;

+   param_var->param_binding_type = PROGRAM_STATE_VAR;

+

+   /* If we are adding a STATE_ENV or STATE_LOCAL that has multiple elements,

+    * we need to unroll it and call add_state_reference() for each row

+    */

+   if (state_tokens[2] != state_tokens[3]) {

+      int row;

+      const int first_row = state_tokens[2];

+      const int last_row = state_tokens[3];

+

+      for (row = first_row; row <= last_row; row++) {

+	 state_tokens[2] = state_tokens[3] = row;

+

+	 idx = add_state_reference(prog->Parameters, state_tokens);

+	 if (param_var->param_binding_begin == ~0U) {

+	    param_var->param_binding_begin = idx;

+            param_var->param_binding_swizzle = SWIZZLE_XYZW;

+         }

+	 param_var->param_binding_length++;

+      }

+   }

+   else {

+      idx = add_state_reference(prog->Parameters, state_tokens);

+      if (param_var->param_binding_begin == ~0U) {

+	 param_var->param_binding_begin = idx;

+         param_var->param_binding_swizzle = SWIZZLE_XYZW;

+      }

+      param_var->param_binding_length++;

+   }

+

+   return idx;

+}

+

+

+/**

+ * Put a float/vector constant/literal into the parameter list.

+ * \param param_var  returns info about the parameter/constant's location,

+ *                   binding, type, etc.

+ * \param vec  the vector/constant to add

+ * \param allowSwizzle  if true, try to consolidate constants which only differ

+ *                      by a swizzle.  We don't want to do this when building

+ *                      arrays of constants that may be indexed indirectly.

+ * \return index of the constant in the parameter list.

+ */

+int

+initialize_symbol_from_const(struct gl_program *prog,

+			     struct asm_symbol *param_var, 

+			     const struct asm_vector *vec,

+                             GLboolean allowSwizzle)

+{

+   unsigned swizzle;

+   const int idx = _mesa_add_unnamed_constant(prog->Parameters,

+                                              vec->data, vec->count,

+                                              allowSwizzle ? &swizzle : NULL);

+

+   param_var->type = at_param;

+   param_var->param_binding_type = PROGRAM_CONSTANT;

+

+   if (param_var->param_binding_begin == ~0U) {

+      param_var->param_binding_begin = idx;

+      param_var->param_binding_swizzle = allowSwizzle ? swizzle : SWIZZLE_XYZW;

+   }

+   param_var->param_binding_length++;

+

+   return idx;

+}

+

+

+char *

+make_error_string(const char *fmt, ...)

+{

+   int length;

+   char *str;

+   va_list args;

+

+

+   /* Call vsnprintf once to determine how large the final string is.  Call it

+    * again to do the actual formatting.  from the vsnprintf manual page:

+    *

+    *    Upon successful return, these functions return the number of

+    *    characters printed  (not including the trailing '\0' used to end

+    *    output to strings).

+    */

+   va_start(args, fmt);

+   length = 1 + vsnprintf(NULL, 0, fmt, args);

+   va_end(args);

+

+   str = malloc(length);

+   if (str) {

+      va_start(args, fmt);

+      vsnprintf(str, length, fmt, args);

+      va_end(args);

+   }

+

+   return str;

+}

+

+

+void

+yyerror(YYLTYPE *locp, struct asm_parser_state *state, const char *s)

+{

+   char *err_str;

+

+

+   err_str = make_error_string("glProgramStringARB(%s)\n", s);

+   if (err_str) {

+      _mesa_error(state->ctx, GL_INVALID_OPERATION, "%s", err_str);

+      free(err_str);

+   }

+

+   err_str = make_error_string("line %u, char %u: error: %s\n",

+			       locp->first_line, locp->first_column, s);

+   _mesa_set_program_error(state->ctx, locp->position, err_str);

+

+   if (err_str) {

+      free(err_str);

+   }

+}

+

+

+GLboolean

+_mesa_parse_arb_program(struct gl_context *ctx, GLenum target, const GLubyte *str,

+			GLsizei len, struct asm_parser_state *state)

+{

+   struct asm_instruction *inst;

+   unsigned i;

+   GLubyte *strz;

+   GLboolean result = GL_FALSE;

+   void *temp;

+   struct asm_symbol *sym;

+

+   state->ctx = ctx;

+   state->prog->Target = target;

+   state->prog->Parameters = _mesa_new_parameter_list();

+

+   /* Make a copy of the program string and force it to be NUL-terminated.

+    */

+   strz = (GLubyte *) malloc(len + 1);

+   if (strz == NULL) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");

+      return GL_FALSE;

+   }

+   memcpy (strz, str, len);

+   strz[len] = '\0';

+

+   state->prog->String = strz;

+

+   state->st = _mesa_symbol_table_ctor();

+

+   state->limits = (target == GL_VERTEX_PROGRAM_ARB)

+      ? & ctx->Const.VertexProgram

+      : & ctx->Const.FragmentProgram;

+

+   state->MaxTextureImageUnits = ctx->Const.MaxTextureImageUnits;

+   state->MaxTextureCoordUnits = ctx->Const.MaxTextureCoordUnits;

+   state->MaxTextureUnits = ctx->Const.MaxTextureUnits;

+   state->MaxClipPlanes = ctx->Const.MaxClipPlanes;

+   state->MaxLights = ctx->Const.MaxLights;

+   state->MaxProgramMatrices = ctx->Const.MaxProgramMatrices;

+

+   state->state_param_enum = (target == GL_VERTEX_PROGRAM_ARB)

+      ? STATE_VERTEX_PROGRAM : STATE_FRAGMENT_PROGRAM;

+

+   _mesa_set_program_error(ctx, -1, NULL);

+

+   _mesa_program_lexer_ctor(& state->scanner, state, (const char *) str, len);

+   yyparse(state);

+   _mesa_program_lexer_dtor(state->scanner);

+

+

+   if (ctx->Program.ErrorPos != -1) {

+      goto error;

+   }

+

+   if (! _mesa_layout_parameters(state)) {

+      struct YYLTYPE loc;

+

+      loc.first_line = 0;

+      loc.first_column = 0;

+      loc.position = len;

+

+      yyerror(& loc, state, "invalid PARAM usage");

+      goto error;

+   }

+

+

+   

+   /* Add one instruction to store the "END" instruction.

+    */

+   state->prog->Instructions =

+      _mesa_alloc_instructions(state->prog->NumInstructions + 1);

+   inst = state->inst_head;

+   for (i = 0; i < state->prog->NumInstructions; i++) {

+      struct asm_instruction *const temp = inst->next;

+

+      state->prog->Instructions[i] = inst->Base;

+      inst = temp;

+   }

+

+   /* Finally, tag on an OPCODE_END instruction */

+   {

+      const GLuint numInst = state->prog->NumInstructions;

+      _mesa_init_instructions(state->prog->Instructions + numInst, 1);

+      state->prog->Instructions[numInst].Opcode = OPCODE_END;

+   }

+   state->prog->NumInstructions++;

+

+   state->prog->NumParameters = state->prog->Parameters->NumParameters;

+   state->prog->NumAttributes = _mesa_bitcount(state->prog->InputsRead);

+

+   /*

+    * Initialize native counts to logical counts.  The device driver may

+    * change them if program is translated into a hardware program.

+    */

+   state->prog->NumNativeInstructions = state->prog->NumInstructions;

+   state->prog->NumNativeTemporaries = state->prog->NumTemporaries;

+   state->prog->NumNativeParameters = state->prog->NumParameters;

+   state->prog->NumNativeAttributes = state->prog->NumAttributes;

+   state->prog->NumNativeAddressRegs = state->prog->NumAddressRegs;

+

+   result = GL_TRUE;

+

+error:

+   for (inst = state->inst_head; inst != NULL; inst = temp) {

+      temp = inst->next;

+      free(inst);

+   }

+

+   state->inst_head = NULL;

+   state->inst_tail = NULL;

+

+   for (sym = state->sym; sym != NULL; sym = temp) {

+      temp = sym->next;

+

+      free((void *) sym->name);

+      free(sym);

+   }

+   state->sym = NULL;

+

+   _mesa_symbol_table_dtor(state->st);

+   state->st = NULL;

+

+   return result;

+}

diff --git a/mesalib/src/mesa/program/programopt.c b/mesalib/src/mesa/program/programopt.c
index 5ad9571f7..de311fd16 100644
--- a/mesalib/src/mesa/program/programopt.c
+++ b/mesalib/src/mesa/program/programopt.c
@@ -1,670 +1,670 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-/**
- * \file  programopt.c 
- * Vertex/Fragment program optimizations and transformations for program
- * options, etc.
- *
- * \author Brian Paul
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "prog_parameter.h"
-#include "prog_statevars.h"
-#include "program.h"
-#include "programopt.h"
-#include "prog_instruction.h"
-
-
-/**
- * This function inserts instructions for coordinate modelview * projection
- * into a vertex program.
- * May be used to implement the position_invariant option.
- */
-static void
-_mesa_insert_mvp_dp4_code(struct gl_context *ctx, struct gl_vertex_program *vprog)
-{
-   struct prog_instruction *newInst;
-   const GLuint origLen = vprog->Base.NumInstructions;
-   const GLuint newLen = origLen + 4;
-   GLuint i;
-
-   /*
-    * Setup state references for the modelview/projection matrix.
-    * XXX we should check if these state vars are already declared.
-    */
-   static const gl_state_index mvpState[4][STATE_LENGTH] = {
-      { STATE_MVP_MATRIX, 0, 0, 0, 0 },  /* state.matrix.mvp.row[0] */
-      { STATE_MVP_MATRIX, 0, 1, 1, 0 },  /* state.matrix.mvp.row[1] */
-      { STATE_MVP_MATRIX, 0, 2, 2, 0 },  /* state.matrix.mvp.row[2] */
-      { STATE_MVP_MATRIX, 0, 3, 3, 0 },  /* state.matrix.mvp.row[3] */
-   };
-   GLint mvpRef[4];
-
-   for (i = 0; i < 4; i++) {
-      mvpRef[i] = _mesa_add_state_reference(vprog->Base.Parameters,
-                                            mvpState[i]);
-   }
-
-   /* Alloc storage for new instructions */
-   newInst = _mesa_alloc_instructions(newLen);
-   if (!newInst) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                  "glProgramString(inserting position_invariant code)");
-      return;
-   }
-
-   /*
-    * Generated instructions:
-    * newInst[0] = DP4 result.position.x, mvp.row[0], vertex.position;
-    * newInst[1] = DP4 result.position.y, mvp.row[1], vertex.position;
-    * newInst[2] = DP4 result.position.z, mvp.row[2], vertex.position;
-    * newInst[3] = DP4 result.position.w, mvp.row[3], vertex.position;
-    */
-   _mesa_init_instructions(newInst, 4);
-   for (i = 0; i < 4; i++) {
-      newInst[i].Opcode = OPCODE_DP4;
-      newInst[i].DstReg.File = PROGRAM_OUTPUT;
-      newInst[i].DstReg.Index = VERT_RESULT_HPOS;
-      newInst[i].DstReg.WriteMask = (WRITEMASK_X << i);
-      newInst[i].SrcReg[0].File = PROGRAM_STATE_VAR;
-      newInst[i].SrcReg[0].Index = mvpRef[i];
-      newInst[i].SrcReg[0].Swizzle = SWIZZLE_NOOP;
-      newInst[i].SrcReg[1].File = PROGRAM_INPUT;
-      newInst[i].SrcReg[1].Index = VERT_ATTRIB_POS;
-      newInst[i].SrcReg[1].Swizzle = SWIZZLE_NOOP;
-   }
-
-   /* Append original instructions after new instructions */
-   _mesa_copy_instructions (newInst + 4, vprog->Base.Instructions, origLen);
-
-   /* free old instructions */
-   _mesa_free_instructions(vprog->Base.Instructions, origLen);
-
-   /* install new instructions */
-   vprog->Base.Instructions = newInst;
-   vprog->Base.NumInstructions = newLen;
-   vprog->Base.InputsRead |= VERT_BIT_POS;
-   vprog->Base.OutputsWritten |= BITFIELD64_BIT(VERT_RESULT_HPOS);
-}
-
-
-static void
-_mesa_insert_mvp_mad_code(struct gl_context *ctx, struct gl_vertex_program *vprog)
-{
-   struct prog_instruction *newInst;
-   const GLuint origLen = vprog->Base.NumInstructions;
-   const GLuint newLen = origLen + 4;
-   GLuint hposTemp;
-   GLuint i;
-
-   /*
-    * Setup state references for the modelview/projection matrix.
-    * XXX we should check if these state vars are already declared.
-    */
-   static const gl_state_index mvpState[4][STATE_LENGTH] = {
-      { STATE_MVP_MATRIX, 0, 0, 0, STATE_MATRIX_TRANSPOSE },
-      { STATE_MVP_MATRIX, 0, 1, 1, STATE_MATRIX_TRANSPOSE },
-      { STATE_MVP_MATRIX, 0, 2, 2, STATE_MATRIX_TRANSPOSE },
-      { STATE_MVP_MATRIX, 0, 3, 3, STATE_MATRIX_TRANSPOSE },
-   };
-   GLint mvpRef[4];
-
-   for (i = 0; i < 4; i++) {
-      mvpRef[i] = _mesa_add_state_reference(vprog->Base.Parameters,
-                                            mvpState[i]);
-   }
-
-   /* Alloc storage for new instructions */
-   newInst = _mesa_alloc_instructions(newLen);
-   if (!newInst) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                  "glProgramString(inserting position_invariant code)");
-      return;
-   }
-
-   /* TEMP hposTemp; */
-   hposTemp = vprog->Base.NumTemporaries++;
-
-   /*
-    * Generated instructions:
-    *    emit_op2(p, OPCODE_MUL, tmp, 0, swizzle1(src,X), mat[0]);
-    *    emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Y), mat[1], tmp);
-    *    emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Z), mat[2], tmp);
-    *    emit_op3(p, OPCODE_MAD, dest, 0, swizzle1(src,W), mat[3], tmp);
-    */
-   _mesa_init_instructions(newInst, 4);
-
-   newInst[0].Opcode = OPCODE_MUL;
-   newInst[0].DstReg.File = PROGRAM_TEMPORARY;
-   newInst[0].DstReg.Index = hposTemp;
-   newInst[0].DstReg.WriteMask = WRITEMASK_XYZW;
-   newInst[0].SrcReg[0].File = PROGRAM_INPUT;
-   newInst[0].SrcReg[0].Index = VERT_ATTRIB_POS;
-   newInst[0].SrcReg[0].Swizzle = SWIZZLE_XXXX;
-   newInst[0].SrcReg[1].File = PROGRAM_STATE_VAR;
-   newInst[0].SrcReg[1].Index = mvpRef[0];
-   newInst[0].SrcReg[1].Swizzle = SWIZZLE_NOOP;
-
-   for (i = 1; i <= 2; i++) {
-      newInst[i].Opcode = OPCODE_MAD;
-      newInst[i].DstReg.File = PROGRAM_TEMPORARY;
-      newInst[i].DstReg.Index = hposTemp;
-      newInst[i].DstReg.WriteMask = WRITEMASK_XYZW;
-      newInst[i].SrcReg[0].File = PROGRAM_INPUT;
-      newInst[i].SrcReg[0].Index = VERT_ATTRIB_POS;
-      newInst[i].SrcReg[0].Swizzle = MAKE_SWIZZLE4(i,i,i,i);
-      newInst[i].SrcReg[1].File = PROGRAM_STATE_VAR;
-      newInst[i].SrcReg[1].Index = mvpRef[i];
-      newInst[i].SrcReg[1].Swizzle = SWIZZLE_NOOP;
-      newInst[i].SrcReg[2].File = PROGRAM_TEMPORARY;
-      newInst[i].SrcReg[2].Index = hposTemp;
-      newInst[1].SrcReg[2].Swizzle = SWIZZLE_NOOP;
-   }
-
-   newInst[3].Opcode = OPCODE_MAD;
-   newInst[3].DstReg.File = PROGRAM_OUTPUT;
-   newInst[3].DstReg.Index = VERT_RESULT_HPOS;
-   newInst[3].DstReg.WriteMask = WRITEMASK_XYZW;
-   newInst[3].SrcReg[0].File = PROGRAM_INPUT;
-   newInst[3].SrcReg[0].Index = VERT_ATTRIB_POS;
-   newInst[3].SrcReg[0].Swizzle = SWIZZLE_WWWW;
-   newInst[3].SrcReg[1].File = PROGRAM_STATE_VAR;
-   newInst[3].SrcReg[1].Index = mvpRef[3];
-   newInst[3].SrcReg[1].Swizzle = SWIZZLE_NOOP;
-   newInst[3].SrcReg[2].File = PROGRAM_TEMPORARY;
-   newInst[3].SrcReg[2].Index = hposTemp;
-   newInst[3].SrcReg[2].Swizzle = SWIZZLE_NOOP;
-
-
-   /* Append original instructions after new instructions */
-   _mesa_copy_instructions (newInst + 4, vprog->Base.Instructions, origLen);
-
-   /* free old instructions */
-   _mesa_free_instructions(vprog->Base.Instructions, origLen);
-
-   /* install new instructions */
-   vprog->Base.Instructions = newInst;
-   vprog->Base.NumInstructions = newLen;
-   vprog->Base.InputsRead |= VERT_BIT_POS;
-   vprog->Base.OutputsWritten |= BITFIELD64_BIT(VERT_RESULT_HPOS);
-}
-
-
-void
-_mesa_insert_mvp_code(struct gl_context *ctx, struct gl_vertex_program *vprog)
-{
-   if (ctx->mvp_with_dp4) 
-      _mesa_insert_mvp_dp4_code( ctx, vprog );
-   else
-      _mesa_insert_mvp_mad_code( ctx, vprog );
-}
-      
-
-
-
-
-
-/**
- * Append extra instructions onto the given fragment program to implement
- * the fog mode specified by fprog->FogOption.
- * The fragment.fogcoord input is used to compute the fog blend factor.
- *
- * XXX with a little work, this function could be adapted to add fog code
- * to vertex programs too.
- */
-void
-_mesa_append_fog_code(struct gl_context *ctx, struct gl_fragment_program *fprog, GLboolean saturate)
-{
-   static const gl_state_index fogPStateOpt[STATE_LENGTH]
-      = { STATE_INTERNAL, STATE_FOG_PARAMS_OPTIMIZED, 0, 0, 0 };
-   static const gl_state_index fogColorState[STATE_LENGTH]
-      = { STATE_FOG_COLOR, 0, 0, 0, 0};
-   struct prog_instruction *newInst, *inst;
-   const GLuint origLen = fprog->Base.NumInstructions;
-   const GLuint newLen = origLen + 5;
-   GLuint i;
-   GLint fogPRefOpt, fogColorRef; /* state references */
-   GLuint colorTemp, fogFactorTemp; /* temporary registerss */
-
-   if (fprog->FogOption == GL_NONE) {
-      _mesa_problem(ctx, "_mesa_append_fog_code() called for fragment program"
-                    " with FogOption == GL_NONE");
-      return;
-   }
-
-   /* Alloc storage for new instructions */
-   newInst = _mesa_alloc_instructions(newLen);
-   if (!newInst) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                  "glProgramString(inserting fog_option code)");
-      return;
-   }
-
-   /* Copy orig instructions into new instruction buffer */
-   _mesa_copy_instructions(newInst, fprog->Base.Instructions, origLen);
-
-   /* PARAM fogParamsRefOpt = internal optimized fog params; */
-   fogPRefOpt
-      = _mesa_add_state_reference(fprog->Base.Parameters, fogPStateOpt);
-   /* PARAM fogColorRef = state.fog.color; */
-   fogColorRef
-      = _mesa_add_state_reference(fprog->Base.Parameters, fogColorState);
-
-   /* TEMP colorTemp; */
-   colorTemp = fprog->Base.NumTemporaries++;
-   /* TEMP fogFactorTemp; */
-   fogFactorTemp = fprog->Base.NumTemporaries++;
-
-   /* Scan program to find where result.color is written */
-   inst = newInst;
-   for (i = 0; i < fprog->Base.NumInstructions; i++) {
-      if (inst->Opcode == OPCODE_END)
-         break;
-      if (inst->DstReg.File == PROGRAM_OUTPUT &&
-          inst->DstReg.Index == FRAG_RESULT_COLOR) {
-         /* change the instruction to write to colorTemp w/ clamping */
-         inst->DstReg.File = PROGRAM_TEMPORARY;
-         inst->DstReg.Index = colorTemp;
-         inst->SaturateMode = saturate;
-         /* don't break (may be several writes to result.color) */
-      }
-      inst++;
-   }
-   assert(inst->Opcode == OPCODE_END); /* we'll overwrite this inst */
-
-   _mesa_init_instructions(inst, 5);
-
-   /* emit instructions to compute fog blending factor */
-   /* this is always clamped to [0, 1] regardless of fragment clamping */
-   if (fprog->FogOption == GL_LINEAR) {
-      /* MAD fogFactorTemp.x, fragment.fogcoord.x, fogPRefOpt.x, fogPRefOpt.y; */
-      inst->Opcode = OPCODE_MAD;
-      inst->DstReg.File = PROGRAM_TEMPORARY;
-      inst->DstReg.Index = fogFactorTemp;
-      inst->DstReg.WriteMask = WRITEMASK_X;
-      inst->SrcReg[0].File = PROGRAM_INPUT;
-      inst->SrcReg[0].Index = FRAG_ATTRIB_FOGC;
-      inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;
-      inst->SrcReg[1].File = PROGRAM_STATE_VAR;
-      inst->SrcReg[1].Index = fogPRefOpt;
-      inst->SrcReg[1].Swizzle = SWIZZLE_XXXX;
-      inst->SrcReg[2].File = PROGRAM_STATE_VAR;
-      inst->SrcReg[2].Index = fogPRefOpt;
-      inst->SrcReg[2].Swizzle = SWIZZLE_YYYY;
-      inst->SaturateMode = SATURATE_ZERO_ONE;
-      inst++;
-   }
-   else {
-      ASSERT(fprog->FogOption == GL_EXP || fprog->FogOption == GL_EXP2);
-      /* fogPRefOpt.z = d/ln(2), fogPRefOpt.w = d/sqrt(ln(2) */
-      /* EXP: MUL fogFactorTemp.x, fogPRefOpt.z, fragment.fogcoord.x; */
-      /* EXP2: MUL fogFactorTemp.x, fogPRefOpt.w, fragment.fogcoord.x; */
-      inst->Opcode = OPCODE_MUL;
-      inst->DstReg.File = PROGRAM_TEMPORARY;
-      inst->DstReg.Index = fogFactorTemp;
-      inst->DstReg.WriteMask = WRITEMASK_X;
-      inst->SrcReg[0].File = PROGRAM_STATE_VAR;
-      inst->SrcReg[0].Index = fogPRefOpt;
-      inst->SrcReg[0].Swizzle
-         = (fprog->FogOption == GL_EXP) ? SWIZZLE_ZZZZ : SWIZZLE_WWWW;
-      inst->SrcReg[1].File = PROGRAM_INPUT;
-      inst->SrcReg[1].Index = FRAG_ATTRIB_FOGC;
-      inst->SrcReg[1].Swizzle = SWIZZLE_XXXX;
-      inst++;
-      if (fprog->FogOption == GL_EXP2) {
-         /* MUL fogFactorTemp.x, fogFactorTemp.x, fogFactorTemp.x; */
-         inst->Opcode = OPCODE_MUL;
-         inst->DstReg.File = PROGRAM_TEMPORARY;
-         inst->DstReg.Index = fogFactorTemp;
-         inst->DstReg.WriteMask = WRITEMASK_X;
-         inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-         inst->SrcReg[0].Index = fogFactorTemp;
-         inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;
-         inst->SrcReg[1].File = PROGRAM_TEMPORARY;
-         inst->SrcReg[1].Index = fogFactorTemp;
-         inst->SrcReg[1].Swizzle = SWIZZLE_XXXX;
-         inst++;
-      }
-      /* EX2_SAT fogFactorTemp.x, -fogFactorTemp.x; */
-      inst->Opcode = OPCODE_EX2;
-      inst->DstReg.File = PROGRAM_TEMPORARY;
-      inst->DstReg.Index = fogFactorTemp;
-      inst->DstReg.WriteMask = WRITEMASK_X;
-      inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-      inst->SrcReg[0].Index = fogFactorTemp;
-      inst->SrcReg[0].Negate = NEGATE_XYZW;
-      inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;
-      inst->SaturateMode = SATURATE_ZERO_ONE;
-      inst++;
-   }
-   /* LRP result.color.xyz, fogFactorTemp.xxxx, colorTemp, fogColorRef; */
-   inst->Opcode = OPCODE_LRP;
-   inst->DstReg.File = PROGRAM_OUTPUT;
-   inst->DstReg.Index = FRAG_RESULT_COLOR;
-   inst->DstReg.WriteMask = WRITEMASK_XYZ;
-   inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-   inst->SrcReg[0].Index = fogFactorTemp;
-   inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;
-   inst->SrcReg[1].File = PROGRAM_TEMPORARY;
-   inst->SrcReg[1].Index = colorTemp;
-   inst->SrcReg[1].Swizzle = SWIZZLE_NOOP;
-   inst->SrcReg[2].File = PROGRAM_STATE_VAR;
-   inst->SrcReg[2].Index = fogColorRef;
-   inst->SrcReg[2].Swizzle = SWIZZLE_NOOP;
-   inst++;
-   /* MOV result.color.w, colorTemp.x;  # copy alpha */
-   inst->Opcode = OPCODE_MOV;
-   inst->DstReg.File = PROGRAM_OUTPUT;
-   inst->DstReg.Index = FRAG_RESULT_COLOR;
-   inst->DstReg.WriteMask = WRITEMASK_W;
-   inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-   inst->SrcReg[0].Index = colorTemp;
-   inst->SrcReg[0].Swizzle = SWIZZLE_NOOP;
-   inst++;
-   /* END; */
-   inst->Opcode = OPCODE_END;
-   inst++;
-
-   /* free old instructions */
-   _mesa_free_instructions(fprog->Base.Instructions, origLen);
-
-   /* install new instructions */
-   fprog->Base.Instructions = newInst;
-   fprog->Base.NumInstructions = inst - newInst;
-   fprog->Base.InputsRead |= FRAG_BIT_FOGC;
-   /* XXX do this?  fprog->FogOption = GL_NONE; */
-}
-
-
-
-static GLboolean
-is_texture_instruction(const struct prog_instruction *inst)
-{
-   switch (inst->Opcode) {
-   case OPCODE_TEX:
-   case OPCODE_TXB:
-   case OPCODE_TXD:
-   case OPCODE_TXL:
-   case OPCODE_TXP:
-   case OPCODE_TXP_NV:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-      
-
-/**
- * Count the number of texure indirections in the given program.
- * The program's NumTexIndirections field will be updated.
- * See the GL_ARB_fragment_program spec (issue 24) for details.
- * XXX we count texture indirections in texenvprogram.c (maybe use this code
- * instead and elsewhere).
- */
-void
-_mesa_count_texture_indirections(struct gl_program *prog)
-{
-   GLuint indirections = 1;
-   GLbitfield tempsOutput = 0x0;
-   GLbitfield aluTemps = 0x0;
-   GLuint i;
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-
-      if (is_texture_instruction(inst)) {
-         if (((inst->SrcReg[0].File == PROGRAM_TEMPORARY) && 
-              (tempsOutput & (1 << inst->SrcReg[0].Index))) ||
-             ((inst->Opcode != OPCODE_KIL) &&
-              (inst->DstReg.File == PROGRAM_TEMPORARY) && 
-              (aluTemps & (1 << inst->DstReg.Index)))) 
-            {
-               indirections++;
-               tempsOutput = 0x0;
-               aluTemps = 0x0;
-            }
-      }
-      else {
-         GLuint j;
-         for (j = 0; j < 3; j++) {
-            if (inst->SrcReg[j].File == PROGRAM_TEMPORARY)
-               aluTemps |= (1 << inst->SrcReg[j].Index);
-         }
-         if (inst->DstReg.File == PROGRAM_TEMPORARY)
-            aluTemps |= (1 << inst->DstReg.Index);
-      }
-
-      if ((inst->Opcode != OPCODE_KIL) && (inst->DstReg.File == PROGRAM_TEMPORARY))
-         tempsOutput |= (1 << inst->DstReg.Index);
-   }
-
-   prog->NumTexIndirections = indirections;
-}
-
-
-/**
- * Count number of texture instructions in given program and update the
- * program's NumTexInstructions field.
- */
-void
-_mesa_count_texture_instructions(struct gl_program *prog)
-{
-   GLuint i;
-   prog->NumTexInstructions = 0;
-   for (i = 0; i < prog->NumInstructions; i++) {
-      prog->NumTexInstructions += is_texture_instruction(prog->Instructions + i);
-   }
-}
-
-
-/**
- * Scan/rewrite program to remove reads of custom (output) registers.
- * The passed type has to be either PROGRAM_OUTPUT or PROGRAM_VARYING
- * (for vertex shaders).
- * In GLSL shaders, varying vars can be read and written.
- * On some hardware, trying to read an output register causes trouble.
- * So, rewrite the program to use a temporary register in this case.
- */
-void
-_mesa_remove_output_reads(struct gl_program *prog, gl_register_file type)
-{
-   GLuint i;
-   GLint outputMap[VERT_RESULT_MAX];
-   GLuint numVaryingReads = 0;
-   GLboolean usedTemps[MAX_PROGRAM_TEMPS];
-   GLuint firstTemp = 0;
-
-   _mesa_find_used_registers(prog, PROGRAM_TEMPORARY,
-                             usedTemps, MAX_PROGRAM_TEMPS);
-
-   assert(type == PROGRAM_VARYING || type == PROGRAM_OUTPUT);
-   assert(prog->Target == GL_VERTEX_PROGRAM_ARB || type != PROGRAM_VARYING);
-
-   for (i = 0; i < VERT_RESULT_MAX; i++)
-      outputMap[i] = -1;
-
-   /* look for instructions which read from varying vars */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
-      GLuint j;
-      for (j = 0; j < numSrc; j++) {
-         if (inst->SrcReg[j].File == type) {
-            /* replace the read with a temp reg */
-            const GLuint var = inst->SrcReg[j].Index;
-            if (outputMap[var] == -1) {
-               numVaryingReads++;
-               outputMap[var] = _mesa_find_free_register(usedTemps,
-                                                         MAX_PROGRAM_TEMPS,
-                                                         firstTemp);
-               firstTemp = outputMap[var] + 1;
-            }
-            inst->SrcReg[j].File = PROGRAM_TEMPORARY;
-            inst->SrcReg[j].Index = outputMap[var];
-         }
-      }
-   }
-
-   if (numVaryingReads == 0)
-      return; /* nothing to be done */
-
-   /* look for instructions which write to the varying vars identified above */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      if (inst->DstReg.File == type &&
-          outputMap[inst->DstReg.Index] >= 0) {
-         /* change inst to write to the temp reg, instead of the varying */
-         inst->DstReg.File = PROGRAM_TEMPORARY;
-         inst->DstReg.Index = outputMap[inst->DstReg.Index];
-      }
-   }
-
-   /* insert new instructions to copy the temp vars to the varying vars */
-   {
-      struct prog_instruction *inst;
-      GLint endPos, var;
-
-      /* Look for END instruction and insert the new varying writes */
-      endPos = -1;
-      for (i = 0; i < prog->NumInstructions; i++) {
-         struct prog_instruction *inst = prog->Instructions + i;
-         if (inst->Opcode == OPCODE_END) {
-            endPos = i;
-            _mesa_insert_instructions(prog, i, numVaryingReads);
-            break;
-         }
-      }
-
-      assert(endPos >= 0);
-
-      /* insert new MOV instructions here */
-      inst = prog->Instructions + endPos;
-      for (var = 0; var < VERT_RESULT_MAX; var++) {
-         if (outputMap[var] >= 0) {
-            /* MOV VAR[var], TEMP[tmp]; */
-            inst->Opcode = OPCODE_MOV;
-            inst->DstReg.File = type;
-            inst->DstReg.Index = var;
-            inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-            inst->SrcReg[0].Index = outputMap[var];
-            inst++;
-         }
-      }
-   }
-}
-
-
-/**
- * Make the given fragment program into a "no-op" shader.
- * Actually, just copy the incoming fragment color (or texcoord)
- * to the output color.
- * This is for debug/test purposes.
- */
-void
-_mesa_nop_fragment_program(struct gl_context *ctx, struct gl_fragment_program *prog)
-{
-   struct prog_instruction *inst;
-   GLuint inputAttr;
-
-   inst = _mesa_alloc_instructions(2);
-   if (!inst) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "_mesa_nop_fragment_program");
-      return;
-   }
-
-   _mesa_init_instructions(inst, 2);
-
-   inst[0].Opcode = OPCODE_MOV;
-   inst[0].DstReg.File = PROGRAM_OUTPUT;
-   inst[0].DstReg.Index = FRAG_RESULT_COLOR;
-   inst[0].SrcReg[0].File = PROGRAM_INPUT;
-   if (prog->Base.InputsRead & FRAG_BIT_COL0)
-      inputAttr = FRAG_ATTRIB_COL0;
-   else
-      inputAttr = FRAG_ATTRIB_TEX0;
-   inst[0].SrcReg[0].Index = inputAttr;
-
-   inst[1].Opcode = OPCODE_END;
-
-   _mesa_free_instructions(prog->Base.Instructions,
-                           prog->Base.NumInstructions);
-
-   prog->Base.Instructions = inst;
-   prog->Base.NumInstructions = 2;
-   prog->Base.InputsRead = 1 << inputAttr;
-   prog->Base.OutputsWritten = BITFIELD64_BIT(FRAG_RESULT_COLOR);
-}
-
-
-/**
- * \sa _mesa_nop_fragment_program
- * Replace the given vertex program with a "no-op" program that just
- * transforms vertex position and emits color.
- */
-void
-_mesa_nop_vertex_program(struct gl_context *ctx, struct gl_vertex_program *prog)
-{
-   struct prog_instruction *inst;
-   GLuint inputAttr;
-
-   /*
-    * Start with a simple vertex program that emits color.
-    */
-   inst = _mesa_alloc_instructions(2);
-   if (!inst) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "_mesa_nop_vertex_program");
-      return;
-   }
-
-   _mesa_init_instructions(inst, 2);
-
-   inst[0].Opcode = OPCODE_MOV;
-   inst[0].DstReg.File = PROGRAM_OUTPUT;
-   inst[0].DstReg.Index = VERT_RESULT_COL0;
-   inst[0].SrcReg[0].File = PROGRAM_INPUT;
-   if (prog->Base.InputsRead & VERT_BIT_COLOR0)
-      inputAttr = VERT_ATTRIB_COLOR0;
-   else
-      inputAttr = VERT_ATTRIB_TEX0;
-   inst[0].SrcReg[0].Index = inputAttr;
-
-   inst[1].Opcode = OPCODE_END;
-
-   _mesa_free_instructions(prog->Base.Instructions,
-                           prog->Base.NumInstructions);
-
-   prog->Base.Instructions = inst;
-   prog->Base.NumInstructions = 2;
-   prog->Base.InputsRead = 1 << inputAttr;
-   prog->Base.OutputsWritten = BITFIELD64_BIT(VERT_RESULT_COL0);
-
-   /*
-    * Now insert code to do standard modelview/projection transformation.
-    */
-   _mesa_insert_mvp_code(ctx, prog);
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.3

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+/**

+ * \file  programopt.c 

+ * Vertex/Fragment program optimizations and transformations for program

+ * options, etc.

+ *

+ * \author Brian Paul

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "prog_parameter.h"

+#include "prog_statevars.h"

+#include "program.h"

+#include "programopt.h"

+#include "prog_instruction.h"

+

+

+/**

+ * This function inserts instructions for coordinate modelview * projection

+ * into a vertex program.

+ * May be used to implement the position_invariant option.

+ */

+static void

+_mesa_insert_mvp_dp4_code(struct gl_context *ctx, struct gl_vertex_program *vprog)

+{

+   struct prog_instruction *newInst;

+   const GLuint origLen = vprog->Base.NumInstructions;

+   const GLuint newLen = origLen + 4;

+   GLuint i;

+

+   /*

+    * Setup state references for the modelview/projection matrix.

+    * XXX we should check if these state vars are already declared.

+    */

+   static const gl_state_index mvpState[4][STATE_LENGTH] = {

+      { STATE_MVP_MATRIX, 0, 0, 0, 0 },  /* state.matrix.mvp.row[0] */

+      { STATE_MVP_MATRIX, 0, 1, 1, 0 },  /* state.matrix.mvp.row[1] */

+      { STATE_MVP_MATRIX, 0, 2, 2, 0 },  /* state.matrix.mvp.row[2] */

+      { STATE_MVP_MATRIX, 0, 3, 3, 0 },  /* state.matrix.mvp.row[3] */

+   };

+   GLint mvpRef[4];

+

+   for (i = 0; i < 4; i++) {

+      mvpRef[i] = _mesa_add_state_reference(vprog->Base.Parameters,

+                                            mvpState[i]);

+   }

+

+   /* Alloc storage for new instructions */

+   newInst = _mesa_alloc_instructions(newLen);

+   if (!newInst) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY,

+                  "glProgramString(inserting position_invariant code)");

+      return;

+   }

+

+   /*

+    * Generated instructions:

+    * newInst[0] = DP4 result.position.x, mvp.row[0], vertex.position;

+    * newInst[1] = DP4 result.position.y, mvp.row[1], vertex.position;

+    * newInst[2] = DP4 result.position.z, mvp.row[2], vertex.position;

+    * newInst[3] = DP4 result.position.w, mvp.row[3], vertex.position;

+    */

+   _mesa_init_instructions(newInst, 4);

+   for (i = 0; i < 4; i++) {

+      newInst[i].Opcode = OPCODE_DP4;

+      newInst[i].DstReg.File = PROGRAM_OUTPUT;

+      newInst[i].DstReg.Index = VERT_RESULT_HPOS;

+      newInst[i].DstReg.WriteMask = (WRITEMASK_X << i);

+      newInst[i].SrcReg[0].File = PROGRAM_STATE_VAR;

+      newInst[i].SrcReg[0].Index = mvpRef[i];

+      newInst[i].SrcReg[0].Swizzle = SWIZZLE_NOOP;

+      newInst[i].SrcReg[1].File = PROGRAM_INPUT;

+      newInst[i].SrcReg[1].Index = VERT_ATTRIB_POS;

+      newInst[i].SrcReg[1].Swizzle = SWIZZLE_NOOP;

+   }

+

+   /* Append original instructions after new instructions */

+   _mesa_copy_instructions (newInst + 4, vprog->Base.Instructions, origLen);

+

+   /* free old instructions */

+   _mesa_free_instructions(vprog->Base.Instructions, origLen);

+

+   /* install new instructions */

+   vprog->Base.Instructions = newInst;

+   vprog->Base.NumInstructions = newLen;

+   vprog->Base.InputsRead |= VERT_BIT_POS;

+   vprog->Base.OutputsWritten |= BITFIELD64_BIT(VERT_RESULT_HPOS);

+}

+

+

+static void

+_mesa_insert_mvp_mad_code(struct gl_context *ctx, struct gl_vertex_program *vprog)

+{

+   struct prog_instruction *newInst;

+   const GLuint origLen = vprog->Base.NumInstructions;

+   const GLuint newLen = origLen + 4;

+   GLuint hposTemp;

+   GLuint i;

+

+   /*

+    * Setup state references for the modelview/projection matrix.

+    * XXX we should check if these state vars are already declared.

+    */

+   static const gl_state_index mvpState[4][STATE_LENGTH] = {

+      { STATE_MVP_MATRIX, 0, 0, 0, STATE_MATRIX_TRANSPOSE },

+      { STATE_MVP_MATRIX, 0, 1, 1, STATE_MATRIX_TRANSPOSE },

+      { STATE_MVP_MATRIX, 0, 2, 2, STATE_MATRIX_TRANSPOSE },

+      { STATE_MVP_MATRIX, 0, 3, 3, STATE_MATRIX_TRANSPOSE },

+   };

+   GLint mvpRef[4];

+

+   for (i = 0; i < 4; i++) {

+      mvpRef[i] = _mesa_add_state_reference(vprog->Base.Parameters,

+                                            mvpState[i]);

+   }

+

+   /* Alloc storage for new instructions */

+   newInst = _mesa_alloc_instructions(newLen);

+   if (!newInst) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY,

+                  "glProgramString(inserting position_invariant code)");

+      return;

+   }

+

+   /* TEMP hposTemp; */

+   hposTemp = vprog->Base.NumTemporaries++;

+

+   /*

+    * Generated instructions:

+    *    emit_op2(p, OPCODE_MUL, tmp, 0, swizzle1(src,X), mat[0]);

+    *    emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Y), mat[1], tmp);

+    *    emit_op3(p, OPCODE_MAD, tmp, 0, swizzle1(src,Z), mat[2], tmp);

+    *    emit_op3(p, OPCODE_MAD, dest, 0, swizzle1(src,W), mat[3], tmp);

+    */

+   _mesa_init_instructions(newInst, 4);

+

+   newInst[0].Opcode = OPCODE_MUL;

+   newInst[0].DstReg.File = PROGRAM_TEMPORARY;

+   newInst[0].DstReg.Index = hposTemp;

+   newInst[0].DstReg.WriteMask = WRITEMASK_XYZW;

+   newInst[0].SrcReg[0].File = PROGRAM_INPUT;

+   newInst[0].SrcReg[0].Index = VERT_ATTRIB_POS;

+   newInst[0].SrcReg[0].Swizzle = SWIZZLE_XXXX;

+   newInst[0].SrcReg[1].File = PROGRAM_STATE_VAR;

+   newInst[0].SrcReg[1].Index = mvpRef[0];

+   newInst[0].SrcReg[1].Swizzle = SWIZZLE_NOOP;

+

+   for (i = 1; i <= 2; i++) {

+      newInst[i].Opcode = OPCODE_MAD;

+      newInst[i].DstReg.File = PROGRAM_TEMPORARY;

+      newInst[i].DstReg.Index = hposTemp;

+      newInst[i].DstReg.WriteMask = WRITEMASK_XYZW;

+      newInst[i].SrcReg[0].File = PROGRAM_INPUT;

+      newInst[i].SrcReg[0].Index = VERT_ATTRIB_POS;

+      newInst[i].SrcReg[0].Swizzle = MAKE_SWIZZLE4(i,i,i,i);

+      newInst[i].SrcReg[1].File = PROGRAM_STATE_VAR;

+      newInst[i].SrcReg[1].Index = mvpRef[i];

+      newInst[i].SrcReg[1].Swizzle = SWIZZLE_NOOP;

+      newInst[i].SrcReg[2].File = PROGRAM_TEMPORARY;

+      newInst[i].SrcReg[2].Index = hposTemp;

+      newInst[1].SrcReg[2].Swizzle = SWIZZLE_NOOP;

+   }

+

+   newInst[3].Opcode = OPCODE_MAD;

+   newInst[3].DstReg.File = PROGRAM_OUTPUT;

+   newInst[3].DstReg.Index = VERT_RESULT_HPOS;

+   newInst[3].DstReg.WriteMask = WRITEMASK_XYZW;

+   newInst[3].SrcReg[0].File = PROGRAM_INPUT;

+   newInst[3].SrcReg[0].Index = VERT_ATTRIB_POS;

+   newInst[3].SrcReg[0].Swizzle = SWIZZLE_WWWW;

+   newInst[3].SrcReg[1].File = PROGRAM_STATE_VAR;

+   newInst[3].SrcReg[1].Index = mvpRef[3];

+   newInst[3].SrcReg[1].Swizzle = SWIZZLE_NOOP;

+   newInst[3].SrcReg[2].File = PROGRAM_TEMPORARY;

+   newInst[3].SrcReg[2].Index = hposTemp;

+   newInst[3].SrcReg[2].Swizzle = SWIZZLE_NOOP;

+

+

+   /* Append original instructions after new instructions */

+   _mesa_copy_instructions (newInst + 4, vprog->Base.Instructions, origLen);

+

+   /* free old instructions */

+   _mesa_free_instructions(vprog->Base.Instructions, origLen);

+

+   /* install new instructions */

+   vprog->Base.Instructions = newInst;

+   vprog->Base.NumInstructions = newLen;

+   vprog->Base.InputsRead |= VERT_BIT_POS;

+   vprog->Base.OutputsWritten |= BITFIELD64_BIT(VERT_RESULT_HPOS);

+}

+

+

+void

+_mesa_insert_mvp_code(struct gl_context *ctx, struct gl_vertex_program *vprog)

+{

+   if (ctx->mvp_with_dp4) 

+      _mesa_insert_mvp_dp4_code( ctx, vprog );

+   else

+      _mesa_insert_mvp_mad_code( ctx, vprog );

+}

+      

+

+

+

+

+

+/**

+ * Append extra instructions onto the given fragment program to implement

+ * the fog mode specified by fprog->FogOption.

+ * The fragment.fogcoord input is used to compute the fog blend factor.

+ *

+ * XXX with a little work, this function could be adapted to add fog code

+ * to vertex programs too.

+ */

+void

+_mesa_append_fog_code(struct gl_context *ctx, struct gl_fragment_program *fprog, GLboolean saturate)

+{

+   static const gl_state_index fogPStateOpt[STATE_LENGTH]

+      = { STATE_INTERNAL, STATE_FOG_PARAMS_OPTIMIZED, 0, 0, 0 };

+   static const gl_state_index fogColorState[STATE_LENGTH]

+      = { STATE_FOG_COLOR, 0, 0, 0, 0};

+   struct prog_instruction *newInst, *inst;

+   const GLuint origLen = fprog->Base.NumInstructions;

+   const GLuint newLen = origLen + 5;

+   GLuint i;

+   GLint fogPRefOpt, fogColorRef; /* state references */

+   GLuint colorTemp, fogFactorTemp; /* temporary registerss */

+

+   if (fprog->FogOption == GL_NONE) {

+      _mesa_problem(ctx, "_mesa_append_fog_code() called for fragment program"

+                    " with FogOption == GL_NONE");

+      return;

+   }

+

+   /* Alloc storage for new instructions */

+   newInst = _mesa_alloc_instructions(newLen);

+   if (!newInst) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY,

+                  "glProgramString(inserting fog_option code)");

+      return;

+   }

+

+   /* Copy orig instructions into new instruction buffer */

+   _mesa_copy_instructions(newInst, fprog->Base.Instructions, origLen);

+

+   /* PARAM fogParamsRefOpt = internal optimized fog params; */

+   fogPRefOpt

+      = _mesa_add_state_reference(fprog->Base.Parameters, fogPStateOpt);

+   /* PARAM fogColorRef = state.fog.color; */

+   fogColorRef

+      = _mesa_add_state_reference(fprog->Base.Parameters, fogColorState);

+

+   /* TEMP colorTemp; */

+   colorTemp = fprog->Base.NumTemporaries++;

+   /* TEMP fogFactorTemp; */

+   fogFactorTemp = fprog->Base.NumTemporaries++;

+

+   /* Scan program to find where result.color is written */

+   inst = newInst;

+   for (i = 0; i < fprog->Base.NumInstructions; i++) {

+      if (inst->Opcode == OPCODE_END)

+         break;

+      if (inst->DstReg.File == PROGRAM_OUTPUT &&

+          inst->DstReg.Index == FRAG_RESULT_COLOR) {

+         /* change the instruction to write to colorTemp w/ clamping */

+         inst->DstReg.File = PROGRAM_TEMPORARY;

+         inst->DstReg.Index = colorTemp;

+         inst->SaturateMode = saturate;

+         /* don't break (may be several writes to result.color) */

+      }

+      inst++;

+   }

+   assert(inst->Opcode == OPCODE_END); /* we'll overwrite this inst */

+

+   _mesa_init_instructions(inst, 5);

+

+   /* emit instructions to compute fog blending factor */

+   /* this is always clamped to [0, 1] regardless of fragment clamping */

+   if (fprog->FogOption == GL_LINEAR) {

+      /* MAD fogFactorTemp.x, fragment.fogcoord.x, fogPRefOpt.x, fogPRefOpt.y; */

+      inst->Opcode = OPCODE_MAD;

+      inst->DstReg.File = PROGRAM_TEMPORARY;

+      inst->DstReg.Index = fogFactorTemp;

+      inst->DstReg.WriteMask = WRITEMASK_X;

+      inst->SrcReg[0].File = PROGRAM_INPUT;

+      inst->SrcReg[0].Index = FRAG_ATTRIB_FOGC;

+      inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;

+      inst->SrcReg[1].File = PROGRAM_STATE_VAR;

+      inst->SrcReg[1].Index = fogPRefOpt;

+      inst->SrcReg[1].Swizzle = SWIZZLE_XXXX;

+      inst->SrcReg[2].File = PROGRAM_STATE_VAR;

+      inst->SrcReg[2].Index = fogPRefOpt;

+      inst->SrcReg[2].Swizzle = SWIZZLE_YYYY;

+      inst->SaturateMode = SATURATE_ZERO_ONE;

+      inst++;

+   }

+   else {

+      ASSERT(fprog->FogOption == GL_EXP || fprog->FogOption == GL_EXP2);

+      /* fogPRefOpt.z = d/ln(2), fogPRefOpt.w = d/sqrt(ln(2) */

+      /* EXP: MUL fogFactorTemp.x, fogPRefOpt.z, fragment.fogcoord.x; */

+      /* EXP2: MUL fogFactorTemp.x, fogPRefOpt.w, fragment.fogcoord.x; */

+      inst->Opcode = OPCODE_MUL;

+      inst->DstReg.File = PROGRAM_TEMPORARY;

+      inst->DstReg.Index = fogFactorTemp;

+      inst->DstReg.WriteMask = WRITEMASK_X;

+      inst->SrcReg[0].File = PROGRAM_STATE_VAR;

+      inst->SrcReg[0].Index = fogPRefOpt;

+      inst->SrcReg[0].Swizzle

+         = (fprog->FogOption == GL_EXP) ? SWIZZLE_ZZZZ : SWIZZLE_WWWW;

+      inst->SrcReg[1].File = PROGRAM_INPUT;

+      inst->SrcReg[1].Index = FRAG_ATTRIB_FOGC;

+      inst->SrcReg[1].Swizzle = SWIZZLE_XXXX;

+      inst++;

+      if (fprog->FogOption == GL_EXP2) {

+         /* MUL fogFactorTemp.x, fogFactorTemp.x, fogFactorTemp.x; */

+         inst->Opcode = OPCODE_MUL;

+         inst->DstReg.File = PROGRAM_TEMPORARY;

+         inst->DstReg.Index = fogFactorTemp;

+         inst->DstReg.WriteMask = WRITEMASK_X;

+         inst->SrcReg[0].File = PROGRAM_TEMPORARY;

+         inst->SrcReg[0].Index = fogFactorTemp;

+         inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;

+         inst->SrcReg[1].File = PROGRAM_TEMPORARY;

+         inst->SrcReg[1].Index = fogFactorTemp;

+         inst->SrcReg[1].Swizzle = SWIZZLE_XXXX;

+         inst++;

+      }

+      /* EX2_SAT fogFactorTemp.x, -fogFactorTemp.x; */

+      inst->Opcode = OPCODE_EX2;

+      inst->DstReg.File = PROGRAM_TEMPORARY;

+      inst->DstReg.Index = fogFactorTemp;

+      inst->DstReg.WriteMask = WRITEMASK_X;

+      inst->SrcReg[0].File = PROGRAM_TEMPORARY;

+      inst->SrcReg[0].Index = fogFactorTemp;

+      inst->SrcReg[0].Negate = NEGATE_XYZW;

+      inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;

+      inst->SaturateMode = SATURATE_ZERO_ONE;

+      inst++;

+   }

+   /* LRP result.color.xyz, fogFactorTemp.xxxx, colorTemp, fogColorRef; */

+   inst->Opcode = OPCODE_LRP;

+   inst->DstReg.File = PROGRAM_OUTPUT;

+   inst->DstReg.Index = FRAG_RESULT_COLOR;

+   inst->DstReg.WriteMask = WRITEMASK_XYZ;

+   inst->SrcReg[0].File = PROGRAM_TEMPORARY;

+   inst->SrcReg[0].Index = fogFactorTemp;

+   inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;

+   inst->SrcReg[1].File = PROGRAM_TEMPORARY;

+   inst->SrcReg[1].Index = colorTemp;

+   inst->SrcReg[1].Swizzle = SWIZZLE_NOOP;

+   inst->SrcReg[2].File = PROGRAM_STATE_VAR;

+   inst->SrcReg[2].Index = fogColorRef;

+   inst->SrcReg[2].Swizzle = SWIZZLE_NOOP;

+   inst++;

+   /* MOV result.color.w, colorTemp.x;  # copy alpha */

+   inst->Opcode = OPCODE_MOV;

+   inst->DstReg.File = PROGRAM_OUTPUT;

+   inst->DstReg.Index = FRAG_RESULT_COLOR;

+   inst->DstReg.WriteMask = WRITEMASK_W;

+   inst->SrcReg[0].File = PROGRAM_TEMPORARY;

+   inst->SrcReg[0].Index = colorTemp;

+   inst->SrcReg[0].Swizzle = SWIZZLE_NOOP;

+   inst++;

+   /* END; */

+   inst->Opcode = OPCODE_END;

+   inst++;

+

+   /* free old instructions */

+   _mesa_free_instructions(fprog->Base.Instructions, origLen);

+

+   /* install new instructions */

+   fprog->Base.Instructions = newInst;

+   fprog->Base.NumInstructions = inst - newInst;

+   fprog->Base.InputsRead |= FRAG_BIT_FOGC;

+   /* XXX do this?  fprog->FogOption = GL_NONE; */

+}

+

+

+

+static GLboolean

+is_texture_instruction(const struct prog_instruction *inst)

+{

+   switch (inst->Opcode) {

+   case OPCODE_TEX:

+   case OPCODE_TXB:

+   case OPCODE_TXD:

+   case OPCODE_TXL:

+   case OPCODE_TXP:

+   case OPCODE_TXP_NV:

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+      

+

+/**

+ * Count the number of texure indirections in the given program.

+ * The program's NumTexIndirections field will be updated.

+ * See the GL_ARB_fragment_program spec (issue 24) for details.

+ * XXX we count texture indirections in texenvprogram.c (maybe use this code

+ * instead and elsewhere).

+ */

+void

+_mesa_count_texture_indirections(struct gl_program *prog)

+{

+   GLuint indirections = 1;

+   GLbitfield tempsOutput = 0x0;

+   GLbitfield aluTemps = 0x0;

+   GLuint i;

+

+   for (i = 0; i < prog->NumInstructions; i++) {

+      const struct prog_instruction *inst = prog->Instructions + i;

+

+      if (is_texture_instruction(inst)) {

+         if (((inst->SrcReg[0].File == PROGRAM_TEMPORARY) && 

+              (tempsOutput & (1 << inst->SrcReg[0].Index))) ||

+             ((inst->Opcode != OPCODE_KIL) &&

+              (inst->DstReg.File == PROGRAM_TEMPORARY) && 

+              (aluTemps & (1 << inst->DstReg.Index)))) 

+            {

+               indirections++;

+               tempsOutput = 0x0;

+               aluTemps = 0x0;

+            }

+      }

+      else {

+         GLuint j;

+         for (j = 0; j < 3; j++) {

+            if (inst->SrcReg[j].File == PROGRAM_TEMPORARY)

+               aluTemps |= (1 << inst->SrcReg[j].Index);

+         }

+         if (inst->DstReg.File == PROGRAM_TEMPORARY)

+            aluTemps |= (1 << inst->DstReg.Index);

+      }

+

+      if ((inst->Opcode != OPCODE_KIL) && (inst->DstReg.File == PROGRAM_TEMPORARY))

+         tempsOutput |= (1 << inst->DstReg.Index);

+   }

+

+   prog->NumTexIndirections = indirections;

+}

+

+

+/**

+ * Count number of texture instructions in given program and update the

+ * program's NumTexInstructions field.

+ */

+void

+_mesa_count_texture_instructions(struct gl_program *prog)

+{

+   GLuint i;

+   prog->NumTexInstructions = 0;

+   for (i = 0; i < prog->NumInstructions; i++) {

+      prog->NumTexInstructions += is_texture_instruction(prog->Instructions + i);

+   }

+}

+

+

+/**

+ * Scan/rewrite program to remove reads of custom (output) registers.

+ * The passed type has to be either PROGRAM_OUTPUT or PROGRAM_VARYING

+ * (for vertex shaders).

+ * In GLSL shaders, varying vars can be read and written.

+ * On some hardware, trying to read an output register causes trouble.

+ * So, rewrite the program to use a temporary register in this case.

+ */

+void

+_mesa_remove_output_reads(struct gl_program *prog, gl_register_file type)

+{

+   GLuint i;

+   GLint outputMap[VERT_RESULT_MAX];

+   GLuint numVaryingReads = 0;

+   GLboolean usedTemps[MAX_PROGRAM_TEMPS];

+   GLuint firstTemp = 0;

+

+   _mesa_find_used_registers(prog, PROGRAM_TEMPORARY,

+                             usedTemps, MAX_PROGRAM_TEMPS);

+

+   assert(type == PROGRAM_VARYING || type == PROGRAM_OUTPUT);

+   assert(prog->Target == GL_VERTEX_PROGRAM_ARB || type != PROGRAM_VARYING);

+

+   for (i = 0; i < VERT_RESULT_MAX; i++)

+      outputMap[i] = -1;

+

+   /* look for instructions which read from varying vars */

+   for (i = 0; i < prog->NumInstructions; i++) {

+      struct prog_instruction *inst = prog->Instructions + i;

+      const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);

+      GLuint j;

+      for (j = 0; j < numSrc; j++) {

+         if (inst->SrcReg[j].File == type) {

+            /* replace the read with a temp reg */

+            const GLuint var = inst->SrcReg[j].Index;

+            if (outputMap[var] == -1) {

+               numVaryingReads++;

+               outputMap[var] = _mesa_find_free_register(usedTemps,

+                                                         MAX_PROGRAM_TEMPS,

+                                                         firstTemp);

+               firstTemp = outputMap[var] + 1;

+            }

+            inst->SrcReg[j].File = PROGRAM_TEMPORARY;

+            inst->SrcReg[j].Index = outputMap[var];

+         }

+      }

+   }

+

+   if (numVaryingReads == 0)

+      return; /* nothing to be done */

+

+   /* look for instructions which write to the varying vars identified above */

+   for (i = 0; i < prog->NumInstructions; i++) {

+      struct prog_instruction *inst = prog->Instructions + i;

+      if (inst->DstReg.File == type &&

+          outputMap[inst->DstReg.Index] >= 0) {

+         /* change inst to write to the temp reg, instead of the varying */

+         inst->DstReg.File = PROGRAM_TEMPORARY;

+         inst->DstReg.Index = outputMap[inst->DstReg.Index];

+      }

+   }

+

+   /* insert new instructions to copy the temp vars to the varying vars */

+   {

+      struct prog_instruction *inst;

+      GLint endPos, var;

+

+      /* Look for END instruction and insert the new varying writes */

+      endPos = -1;

+      for (i = 0; i < prog->NumInstructions; i++) {

+         struct prog_instruction *inst = prog->Instructions + i;

+         if (inst->Opcode == OPCODE_END) {

+            endPos = i;

+            _mesa_insert_instructions(prog, i, numVaryingReads);

+            break;

+         }

+      }

+

+      assert(endPos >= 0);

+

+      /* insert new MOV instructions here */

+      inst = prog->Instructions + endPos;

+      for (var = 0; var < VERT_RESULT_MAX; var++) {

+         if (outputMap[var] >= 0) {

+            /* MOV VAR[var], TEMP[tmp]; */

+            inst->Opcode = OPCODE_MOV;

+            inst->DstReg.File = type;

+            inst->DstReg.Index = var;

+            inst->SrcReg[0].File = PROGRAM_TEMPORARY;

+            inst->SrcReg[0].Index = outputMap[var];

+            inst++;

+         }

+      }

+   }

+}

+

+

+/**

+ * Make the given fragment program into a "no-op" shader.

+ * Actually, just copy the incoming fragment color (or texcoord)

+ * to the output color.

+ * This is for debug/test purposes.

+ */

+void

+_mesa_nop_fragment_program(struct gl_context *ctx, struct gl_fragment_program *prog)

+{

+   struct prog_instruction *inst;

+   GLuint inputAttr;

+

+   inst = _mesa_alloc_instructions(2);

+   if (!inst) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "_mesa_nop_fragment_program");

+      return;

+   }

+

+   _mesa_init_instructions(inst, 2);

+

+   inst[0].Opcode = OPCODE_MOV;

+   inst[0].DstReg.File = PROGRAM_OUTPUT;

+   inst[0].DstReg.Index = FRAG_RESULT_COLOR;

+   inst[0].SrcReg[0].File = PROGRAM_INPUT;

+   if (prog->Base.InputsRead & FRAG_BIT_COL0)

+      inputAttr = FRAG_ATTRIB_COL0;

+   else

+      inputAttr = FRAG_ATTRIB_TEX0;

+   inst[0].SrcReg[0].Index = inputAttr;

+

+   inst[1].Opcode = OPCODE_END;

+

+   _mesa_free_instructions(prog->Base.Instructions,

+                           prog->Base.NumInstructions);

+

+   prog->Base.Instructions = inst;

+   prog->Base.NumInstructions = 2;

+   prog->Base.InputsRead = 1 << inputAttr;

+   prog->Base.OutputsWritten = BITFIELD64_BIT(FRAG_RESULT_COLOR);

+}

+

+

+/**

+ * \sa _mesa_nop_fragment_program

+ * Replace the given vertex program with a "no-op" program that just

+ * transforms vertex position and emits color.

+ */

+void

+_mesa_nop_vertex_program(struct gl_context *ctx, struct gl_vertex_program *prog)

+{

+   struct prog_instruction *inst;

+   GLuint inputAttr;

+

+   /*

+    * Start with a simple vertex program that emits color.

+    */

+   inst = _mesa_alloc_instructions(2);

+   if (!inst) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "_mesa_nop_vertex_program");

+      return;

+   }

+

+   _mesa_init_instructions(inst, 2);

+

+   inst[0].Opcode = OPCODE_MOV;

+   inst[0].DstReg.File = PROGRAM_OUTPUT;

+   inst[0].DstReg.Index = VERT_RESULT_COL0;

+   inst[0].SrcReg[0].File = PROGRAM_INPUT;

+   if (prog->Base.InputsRead & VERT_BIT_COLOR0)

+      inputAttr = VERT_ATTRIB_COLOR0;

+   else

+      inputAttr = VERT_ATTRIB_TEX0;

+   inst[0].SrcReg[0].Index = inputAttr;

+

+   inst[1].Opcode = OPCODE_END;

+

+   _mesa_free_instructions(prog->Base.Instructions,

+                           prog->Base.NumInstructions);

+

+   prog->Base.Instructions = inst;

+   prog->Base.NumInstructions = 2;

+   prog->Base.InputsRead = 1 << inputAttr;

+   prog->Base.OutputsWritten = BITFIELD64_BIT(VERT_RESULT_COL0);

+

+   /*

+    * Now insert code to do standard modelview/projection transformation.

+    */

+   _mesa_insert_mvp_code(ctx, prog);

+}

diff --git a/mesalib/src/mesa/program/programopt.h b/mesalib/src/mesa/program/programopt.h
index 79631aa58..90fa5fc51 100644
--- a/mesalib/src/mesa/program/programopt.h
+++ b/mesalib/src/mesa/program/programopt.h
@@ -1,53 +1,53 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#ifndef PROGRAMOPT_H
-#define PROGRAMOPT_H 1
-
-#include "main/mtypes.h"
-
-extern void
-_mesa_insert_mvp_code(struct gl_context *ctx, struct gl_vertex_program *vprog);
-
-extern void
-_mesa_append_fog_code(struct gl_context *ctx, struct gl_fragment_program *fprog, GLboolean saturate);
-
-extern void
-_mesa_count_texture_indirections(struct gl_program *prog);
-
-extern void
-_mesa_count_texture_instructions(struct gl_program *prog);
-
-extern void
-_mesa_remove_output_reads(struct gl_program *prog, gl_register_file type);
-
-extern void
-_mesa_nop_fragment_program(struct gl_context *ctx, struct gl_fragment_program *prog);
-
-extern void
-_mesa_nop_vertex_program(struct gl_context *ctx, struct gl_vertex_program *prog);
-
-
-#endif /* PROGRAMOPT_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.3

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#ifndef PROGRAMOPT_H

+#define PROGRAMOPT_H 1

+

+#include "main/mtypes.h"

+

+extern void

+_mesa_insert_mvp_code(struct gl_context *ctx, struct gl_vertex_program *vprog);

+

+extern void

+_mesa_append_fog_code(struct gl_context *ctx, struct gl_fragment_program *fprog, GLboolean saturate);

+

+extern void

+_mesa_count_texture_indirections(struct gl_program *prog);

+

+extern void

+_mesa_count_texture_instructions(struct gl_program *prog);

+

+extern void

+_mesa_remove_output_reads(struct gl_program *prog, gl_register_file type);

+

+extern void

+_mesa_nop_fragment_program(struct gl_context *ctx, struct gl_fragment_program *prog);

+

+extern void

+_mesa_nop_vertex_program(struct gl_context *ctx, struct gl_vertex_program *prog);

+

+

+#endif /* PROGRAMOPT_H */

diff --git a/mesalib/src/mesa/program/sampler.cpp b/mesalib/src/mesa/program/sampler.cpp
index 1457d1199..b219d7016 100644
--- a/mesalib/src/mesa/program/sampler.cpp
+++ b/mesalib/src/mesa/program/sampler.cpp
@@ -1,137 +1,137 @@
-/*
- * Copyright (C) 2005-2007  Brian Paul   All Rights Reserved.
- * Copyright (C) 2008  VMware, Inc.   All Rights Reserved.
- * Copyright © 2010 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- */
-
-#include "ir.h"
-#include "glsl_types.h"
-#include "ir_visitor.h"
-
-extern "C" {
-#include "main/compiler.h"
-#include "main/mtypes.h"
-#include "program/prog_parameter.h"
-}
-
-static void fail_link(struct gl_shader_program *prog, const char *fmt, ...) PRINTFLIKE(2, 3);
-
-static void fail_link(struct gl_shader_program *prog, const char *fmt, ...)
-{
-   va_list args;
-   va_start(args, fmt);
-   ralloc_vasprintf_append(&prog->InfoLog, fmt, args);
-   va_end(args);
-
-   prog->LinkStatus = GL_FALSE;
-}
-
-class get_sampler_name : public ir_hierarchical_visitor
-{
-public:
-   get_sampler_name(ir_dereference *last,
-		    struct gl_shader_program *shader_program)
-   {
-      this->mem_ctx = ralloc_context(NULL);
-      this->shader_program = shader_program;
-      this->name = NULL;
-      this->offset = 0;
-      this->last = last;
-   }
-
-   ~get_sampler_name()
-   {
-      ralloc_free(this->mem_ctx);
-   }
-
-   virtual ir_visitor_status visit(ir_dereference_variable *ir)
-   {
-      this->name = ir->var->name;
-      return visit_continue;
-   }
-
-   virtual ir_visitor_status visit_leave(ir_dereference_record *ir)
-   {
-      this->name = ralloc_asprintf(mem_ctx, "%s.%s", name, ir->field);
-      return visit_continue;
-   }
-
-   virtual ir_visitor_status visit_leave(ir_dereference_array *ir)
-   {
-      ir_constant *index = ir->array_index->as_constant();
-      int i;
-
-      if (index) {
-	 i = index->value.i[0];
-      } else {
-	 /* GLSL 1.10 and 1.20 allowed variable sampler array indices,
-	  * while GLSL 1.30 requires that the array indices be
-	  * constant integer expressions.  We don't expect any driver
-	  * to actually work with a really variable array index, so
-	  * all that would work would be an unrolled loop counter that ends
-	  * up being constant above.
-	  */
-	 ralloc_strcat(&shader_program->InfoLog,
-		       "warning: Variable sampler array index unsupported.\n"
-		       "This feature of the language was removed in GLSL 1.20 "
-		       "and is unlikely to be supported for 1.10 in Mesa.\n");
-	 i = 0;
-      }
-      if (ir != last) {
-	 this->name = ralloc_asprintf(mem_ctx, "%s[%d]", name, i);
-      } else {
-	 offset = i;
-      }
-      return visit_continue;
-   }
-
-   struct gl_shader_program *shader_program;
-   const char *name;
-   void *mem_ctx;
-   int offset;
-   ir_dereference *last;
-};
-
-extern "C" {
-int
-_mesa_get_sampler_uniform_value(class ir_dereference *sampler,
-				struct gl_shader_program *shader_program,
-				const struct gl_program *prog)
-{
-   get_sampler_name getname(sampler, shader_program);
-
-   sampler->accept(&getname);
-
-   GLint index = _mesa_lookup_parameter_index(prog->Parameters, -1,
-					      getname.name);
-
-   if (index < 0) {
-      fail_link(shader_program,
-		"failed to find sampler named %s.\n", getname.name);
-      return 0;
-   }
-
-   index += getname.offset;
-
-   return prog->Parameters->ParameterValues[index][0];
-}
-}
+/*

+ * Copyright (C) 2005-2007  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2008  VMware, Inc.   All Rights Reserved.

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (including the next

+ * paragraph) 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.

+ */

+

+#include "ir.h"

+#include "glsl_types.h"

+#include "ir_visitor.h"

+

+extern "C" {

+#include "main/compiler.h"

+#include "main/mtypes.h"

+#include "program/prog_parameter.h"

+}

+

+static void fail_link(struct gl_shader_program *prog, const char *fmt, ...) PRINTFLIKE(2, 3);

+

+static void fail_link(struct gl_shader_program *prog, const char *fmt, ...)

+{

+   va_list args;

+   va_start(args, fmt);

+   ralloc_vasprintf_append(&prog->InfoLog, fmt, args);

+   va_end(args);

+

+   prog->LinkStatus = GL_FALSE;

+}

+

+class get_sampler_name : public ir_hierarchical_visitor

+{

+public:

+   get_sampler_name(ir_dereference *last,

+		    struct gl_shader_program *shader_program)

+   {

+      this->mem_ctx = ralloc_context(NULL);

+      this->shader_program = shader_program;

+      this->name = NULL;

+      this->offset = 0;

+      this->last = last;

+   }

+

+   ~get_sampler_name()

+   {

+      ralloc_free(this->mem_ctx);

+   }

+

+   virtual ir_visitor_status visit(ir_dereference_variable *ir)

+   {

+      this->name = ir->var->name;

+      return visit_continue;

+   }

+

+   virtual ir_visitor_status visit_leave(ir_dereference_record *ir)

+   {

+      this->name = ralloc_asprintf(mem_ctx, "%s.%s", name, ir->field);

+      return visit_continue;

+   }

+

+   virtual ir_visitor_status visit_leave(ir_dereference_array *ir)

+   {

+      ir_constant *index = ir->array_index->as_constant();

+      int i;

+

+      if (index) {

+	 i = index->value.i[0];

+      } else {

+	 /* GLSL 1.10 and 1.20 allowed variable sampler array indices,

+	  * while GLSL 1.30 requires that the array indices be

+	  * constant integer expressions.  We don't expect any driver

+	  * to actually work with a really variable array index, so

+	  * all that would work would be an unrolled loop counter that ends

+	  * up being constant above.

+	  */

+	 ralloc_strcat(&shader_program->InfoLog,

+		       "warning: Variable sampler array index unsupported.\n"

+		       "This feature of the language was removed in GLSL 1.20 "

+		       "and is unlikely to be supported for 1.10 in Mesa.\n");

+	 i = 0;

+      }

+      if (ir != last) {

+	 this->name = ralloc_asprintf(mem_ctx, "%s[%d]", name, i);

+      } else {

+	 offset = i;

+      }

+      return visit_continue;

+   }

+

+   struct gl_shader_program *shader_program;

+   const char *name;

+   void *mem_ctx;

+   int offset;

+   ir_dereference *last;

+};

+

+extern "C" {

+int

+_mesa_get_sampler_uniform_value(class ir_dereference *sampler,

+				struct gl_shader_program *shader_program,

+				const struct gl_program *prog)

+{

+   get_sampler_name getname(sampler, shader_program);

+

+   sampler->accept(&getname);

+

+   GLint index = _mesa_lookup_parameter_index(prog->Parameters, -1,

+					      getname.name);

+

+   if (index < 0) {

+      fail_link(shader_program,

+		"failed to find sampler named %s.\n", getname.name);

+      return 0;

+   }

+

+   index += getname.offset;

+

+   return prog->Parameters->ParameterValues[index][0];

+}

+}

diff --git a/mesalib/src/mesa/state_tracker/st_atom_blend.c b/mesalib/src/mesa/state_tracker/st_atom_blend.c
index d1844e106..c22d4c42e 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_blend.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_blend.c
@@ -1,302 +1,302 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  *   Brian Paul
-  */
- 
-
-#include "st_context.h"
-#include "st_atom.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "cso_cache/cso_context.h"
-
-#include "main/macros.h"
-
-/**
- * Convert GLenum blend tokens to pipe tokens.
- * Both blend factors and blend funcs are accepted.
- */
-static GLuint
-translate_blend(GLenum blend)
-{
-   switch (blend) {
-   /* blend functions */
-   case GL_FUNC_ADD:
-      return PIPE_BLEND_ADD;
-   case GL_FUNC_SUBTRACT:
-      return PIPE_BLEND_SUBTRACT;
-   case GL_FUNC_REVERSE_SUBTRACT:
-      return PIPE_BLEND_REVERSE_SUBTRACT;
-   case GL_MIN:
-      return PIPE_BLEND_MIN;
-   case GL_MAX:
-      return PIPE_BLEND_MAX;
-
-   /* blend factors */
-   case GL_ONE:
-      return PIPE_BLENDFACTOR_ONE;
-   case GL_SRC_COLOR:
-      return PIPE_BLENDFACTOR_SRC_COLOR;
-   case GL_SRC_ALPHA:
-      return PIPE_BLENDFACTOR_SRC_ALPHA;
-   case GL_DST_ALPHA:
-      return PIPE_BLENDFACTOR_DST_ALPHA;
-   case GL_DST_COLOR:
-      return PIPE_BLENDFACTOR_DST_COLOR;
-   case GL_SRC_ALPHA_SATURATE:
-      return PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE;
-   case GL_CONSTANT_COLOR:
-      return PIPE_BLENDFACTOR_CONST_COLOR;
-   case GL_CONSTANT_ALPHA:
-      return PIPE_BLENDFACTOR_CONST_ALPHA;
-      /*
-      return PIPE_BLENDFACTOR_SRC1_COLOR;
-      return PIPE_BLENDFACTOR_SRC1_ALPHA;
-      */
-   case GL_ZERO:
-      return PIPE_BLENDFACTOR_ZERO;
-   case GL_ONE_MINUS_SRC_COLOR:
-      return PIPE_BLENDFACTOR_INV_SRC_COLOR;
-   case GL_ONE_MINUS_SRC_ALPHA:
-      return PIPE_BLENDFACTOR_INV_SRC_ALPHA;
-   case GL_ONE_MINUS_DST_COLOR:
-      return PIPE_BLENDFACTOR_INV_DST_COLOR;
-   case GL_ONE_MINUS_DST_ALPHA:
-      return PIPE_BLENDFACTOR_INV_DST_ALPHA;
-   case GL_ONE_MINUS_CONSTANT_COLOR:
-      return PIPE_BLENDFACTOR_INV_CONST_COLOR;
-   case GL_ONE_MINUS_CONSTANT_ALPHA:
-      return PIPE_BLENDFACTOR_INV_CONST_ALPHA;
-      /*
-      return PIPE_BLENDFACTOR_INV_SRC1_COLOR;
-      return PIPE_BLENDFACTOR_INV_SRC1_ALPHA;
-      */
-   default:
-      assert("invalid GL token in translate_blend()" == NULL);
-      return 0;
-   }
-}
-
-
-/**
- * Convert GLenum logicop tokens to pipe tokens.
- */
-static GLuint
-translate_logicop(GLenum logicop)
-{
-   switch (logicop) {
-   case GL_CLEAR:
-      return PIPE_LOGICOP_CLEAR;
-   case GL_NOR:
-      return PIPE_LOGICOP_NOR;
-   case GL_AND_INVERTED:
-      return PIPE_LOGICOP_AND_INVERTED;
-   case GL_COPY_INVERTED:
-      return PIPE_LOGICOP_COPY_INVERTED;
-   case GL_AND_REVERSE:
-      return PIPE_LOGICOP_AND_REVERSE;
-   case GL_INVERT:
-      return PIPE_LOGICOP_INVERT;
-   case GL_XOR:
-      return PIPE_LOGICOP_XOR;
-   case GL_NAND:
-      return PIPE_LOGICOP_NAND;
-   case GL_AND:
-      return PIPE_LOGICOP_AND;
-   case GL_EQUIV:
-      return PIPE_LOGICOP_EQUIV;
-   case GL_NOOP:
-      return PIPE_LOGICOP_NOOP;
-   case GL_OR_INVERTED:
-      return PIPE_LOGICOP_OR_INVERTED;
-   case GL_COPY:
-      return PIPE_LOGICOP_COPY;
-   case GL_OR_REVERSE:
-      return PIPE_LOGICOP_OR_REVERSE;
-   case GL_OR:
-      return PIPE_LOGICOP_OR;
-   case GL_SET:
-      return PIPE_LOGICOP_SET;
-   default:
-      assert("invalid GL token in translate_logicop()" == NULL);
-      return 0;
-   }
-}
-
-/**
- * Figure out if colormasks are different per rt.
- */
-static GLboolean
-colormask_per_rt(struct gl_context *ctx)
-{
-   /* a bit suboptimal have to compare lots of values */
-   unsigned i;
-   for (i = 1; i < ctx->Const.MaxDrawBuffers; i++) {
-      if (memcmp(ctx->Color.ColorMask[0], ctx->Color.ColorMask[i], 4)) {
-         return GL_TRUE;
-      }
-   }
-   return GL_FALSE;
-}
-
-/**
- * Figure out if blend enables/state are different per rt.
- */
-static GLboolean
-blend_per_rt(struct gl_context *ctx)
-{
-   if (ctx->Color.BlendEnabled &&
-      (ctx->Color.BlendEnabled != ((1 << ctx->Const.MaxDrawBuffers) - 1))) {
-      /* This can only happen if GL_EXT_draw_buffers2 is enabled */
-      return GL_TRUE;
-   }
-   if (ctx->Color._BlendFuncPerBuffer || ctx->Color._BlendEquationPerBuffer) {
-      /* this can only happen if GL_ARB_draw_buffers_blend is enabled */
-      return GL_TRUE;
-   }
-   return GL_FALSE;
-}
-
-static void 
-update_blend( struct st_context *st )
-{
-   struct pipe_blend_state *blend = &st->state.blend;
-   unsigned num_state = 1;
-   unsigned i, j;
-
-   memset(blend, 0, sizeof(*blend));
-
-   if (blend_per_rt(st->ctx) || colormask_per_rt(st->ctx)) {
-      num_state = st->ctx->Const.MaxDrawBuffers;
-      blend->independent_blend_enable = 1;
-   }
-   /* Note it is impossible to correctly deal with EXT_blend_logic_op and
-      EXT_draw_buffers2/EXT_blend_equation_separate at the same time.
-      These combinations would require support for per-rt logicop enables
-      and separate alpha/rgb logicop/blend support respectively. Neither
-      possible in gallium nor most hardware. Assume these combinations
-      don't happen. */
-   if (st->ctx->Color.ColorLogicOpEnabled ||
-       (st->ctx->Color.BlendEnabled &&
-        st->ctx->Color.Blend[0].EquationRGB == GL_LOGIC_OP)) {
-      /* logicop enabled */
-      blend->logicop_enable = 1;
-      blend->logicop_func = translate_logicop(st->ctx->Color.LogicOp);
-   }
-   else if (st->ctx->Color.BlendEnabled) {
-      /* blending enabled */
-      for (i = 0, j = 0; i < num_state; i++) {
-
-         blend->rt[i].blend_enable = (st->ctx->Color.BlendEnabled >> i) & 0x1;
-
-         if (st->ctx->Extensions.ARB_draw_buffers_blend)
-            j = i;
-
-         blend->rt[i].rgb_func =
-            translate_blend(st->ctx->Color.Blend[j].EquationRGB);
-
-         if (st->ctx->Color.Blend[i].EquationRGB == GL_MIN ||
-             st->ctx->Color.Blend[i].EquationRGB == GL_MAX) {
-            /* Min/max are special */
-            blend->rt[i].rgb_src_factor = PIPE_BLENDFACTOR_ONE;
-            blend->rt[i].rgb_dst_factor = PIPE_BLENDFACTOR_ONE;
-         }
-         else {
-            blend->rt[i].rgb_src_factor =
-               translate_blend(st->ctx->Color.Blend[j].SrcRGB);
-            blend->rt[i].rgb_dst_factor =
-               translate_blend(st->ctx->Color.Blend[j].DstRGB);
-         }
-
-         blend->rt[i].alpha_func =
-            translate_blend(st->ctx->Color.Blend[j].EquationA);
-
-         if (st->ctx->Color.Blend[i].EquationA == GL_MIN ||
-             st->ctx->Color.Blend[i].EquationA == GL_MAX) {
-            /* Min/max are special */
-            blend->rt[i].alpha_src_factor = PIPE_BLENDFACTOR_ONE;
-            blend->rt[i].alpha_dst_factor = PIPE_BLENDFACTOR_ONE;
-         }
-         else {
-            blend->rt[i].alpha_src_factor =
-               translate_blend(st->ctx->Color.Blend[j].SrcA);
-            blend->rt[i].alpha_dst_factor =
-               translate_blend(st->ctx->Color.Blend[j].DstA);
-         }
-      }
-   }
-   else {
-      /* no blending / logicop */
-   }
-
-   /* Colormask - maybe reverse these bits? */
-   for (i = 0; i < num_state; i++) {
-      if (st->ctx->Color.ColorMask[i][0])
-         blend->rt[i].colormask |= PIPE_MASK_R;
-      if (st->ctx->Color.ColorMask[i][1])
-         blend->rt[i].colormask |= PIPE_MASK_G;
-      if (st->ctx->Color.ColorMask[i][2])
-         blend->rt[i].colormask |= PIPE_MASK_B;
-      if (st->ctx->Color.ColorMask[i][3])
-         blend->rt[i].colormask |= PIPE_MASK_A;
-   }
-
-   if (st->ctx->Color.DitherFlag)
-      blend->dither = 1;
-
-   if (st->ctx->Multisample.Enabled) {
-      /* unlike in gallium/d3d10 these operations are only performed
-         if msaa is enabled */
-      if (st->ctx->Multisample.SampleAlphaToCoverage)
-         blend->alpha_to_coverage = 1;
-      if (st->ctx->Multisample.SampleAlphaToOne)
-         blend->alpha_to_one = 1;
-   }
-
-   cso_set_blend(st->cso_context, blend);
-
-   {
-      struct pipe_blend_color bc;
-      COPY_4FV(bc.color, st->ctx->Color.BlendColorUnclamped);
-      cso_set_blend_color(st->cso_context, &bc);
-   }
-}
-
-
-const struct st_tracked_state st_update_blend = {
-   "st_update_blend",					/* name */
-   {							/* dirty */
-      (_NEW_COLOR | _NEW_MULTISAMPLE),  /* XXX _NEW_BLEND someday? */	/* mesa */
-      0,						/* st */
-   },
-   update_blend,					/* update */
-};
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+ /*

+  * Authors:

+  *   Keith Whitwell <keith@tungstengraphics.com>

+  *   Brian Paul

+  */

+ 

+

+#include "st_context.h"

+#include "st_atom.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "cso_cache/cso_context.h"

+

+#include "main/macros.h"

+

+/**

+ * Convert GLenum blend tokens to pipe tokens.

+ * Both blend factors and blend funcs are accepted.

+ */

+static GLuint

+translate_blend(GLenum blend)

+{

+   switch (blend) {

+   /* blend functions */

+   case GL_FUNC_ADD:

+      return PIPE_BLEND_ADD;

+   case GL_FUNC_SUBTRACT:

+      return PIPE_BLEND_SUBTRACT;

+   case GL_FUNC_REVERSE_SUBTRACT:

+      return PIPE_BLEND_REVERSE_SUBTRACT;

+   case GL_MIN:

+      return PIPE_BLEND_MIN;

+   case GL_MAX:

+      return PIPE_BLEND_MAX;

+

+   /* blend factors */

+   case GL_ONE:

+      return PIPE_BLENDFACTOR_ONE;

+   case GL_SRC_COLOR:

+      return PIPE_BLENDFACTOR_SRC_COLOR;

+   case GL_SRC_ALPHA:

+      return PIPE_BLENDFACTOR_SRC_ALPHA;

+   case GL_DST_ALPHA:

+      return PIPE_BLENDFACTOR_DST_ALPHA;

+   case GL_DST_COLOR:

+      return PIPE_BLENDFACTOR_DST_COLOR;

+   case GL_SRC_ALPHA_SATURATE:

+      return PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE;

+   case GL_CONSTANT_COLOR:

+      return PIPE_BLENDFACTOR_CONST_COLOR;

+   case GL_CONSTANT_ALPHA:

+      return PIPE_BLENDFACTOR_CONST_ALPHA;

+      /*

+      return PIPE_BLENDFACTOR_SRC1_COLOR;

+      return PIPE_BLENDFACTOR_SRC1_ALPHA;

+      */

+   case GL_ZERO:

+      return PIPE_BLENDFACTOR_ZERO;

+   case GL_ONE_MINUS_SRC_COLOR:

+      return PIPE_BLENDFACTOR_INV_SRC_COLOR;

+   case GL_ONE_MINUS_SRC_ALPHA:

+      return PIPE_BLENDFACTOR_INV_SRC_ALPHA;

+   case GL_ONE_MINUS_DST_COLOR:

+      return PIPE_BLENDFACTOR_INV_DST_COLOR;

+   case GL_ONE_MINUS_DST_ALPHA:

+      return PIPE_BLENDFACTOR_INV_DST_ALPHA;

+   case GL_ONE_MINUS_CONSTANT_COLOR:

+      return PIPE_BLENDFACTOR_INV_CONST_COLOR;

+   case GL_ONE_MINUS_CONSTANT_ALPHA:

+      return PIPE_BLENDFACTOR_INV_CONST_ALPHA;

+      /*

+      return PIPE_BLENDFACTOR_INV_SRC1_COLOR;

+      return PIPE_BLENDFACTOR_INV_SRC1_ALPHA;

+      */

+   default:

+      assert("invalid GL token in translate_blend()" == NULL);

+      return 0;

+   }

+}

+

+

+/**

+ * Convert GLenum logicop tokens to pipe tokens.

+ */

+static GLuint

+translate_logicop(GLenum logicop)

+{

+   switch (logicop) {

+   case GL_CLEAR:

+      return PIPE_LOGICOP_CLEAR;

+   case GL_NOR:

+      return PIPE_LOGICOP_NOR;

+   case GL_AND_INVERTED:

+      return PIPE_LOGICOP_AND_INVERTED;

+   case GL_COPY_INVERTED:

+      return PIPE_LOGICOP_COPY_INVERTED;

+   case GL_AND_REVERSE:

+      return PIPE_LOGICOP_AND_REVERSE;

+   case GL_INVERT:

+      return PIPE_LOGICOP_INVERT;

+   case GL_XOR:

+      return PIPE_LOGICOP_XOR;

+   case GL_NAND:

+      return PIPE_LOGICOP_NAND;

+   case GL_AND:

+      return PIPE_LOGICOP_AND;

+   case GL_EQUIV:

+      return PIPE_LOGICOP_EQUIV;

+   case GL_NOOP:

+      return PIPE_LOGICOP_NOOP;

+   case GL_OR_INVERTED:

+      return PIPE_LOGICOP_OR_INVERTED;

+   case GL_COPY:

+      return PIPE_LOGICOP_COPY;

+   case GL_OR_REVERSE:

+      return PIPE_LOGICOP_OR_REVERSE;

+   case GL_OR:

+      return PIPE_LOGICOP_OR;

+   case GL_SET:

+      return PIPE_LOGICOP_SET;

+   default:

+      assert("invalid GL token in translate_logicop()" == NULL);

+      return 0;

+   }

+}

+

+/**

+ * Figure out if colormasks are different per rt.

+ */

+static GLboolean

+colormask_per_rt(struct gl_context *ctx)

+{

+   /* a bit suboptimal have to compare lots of values */

+   unsigned i;

+   for (i = 1; i < ctx->Const.MaxDrawBuffers; i++) {

+      if (memcmp(ctx->Color.ColorMask[0], ctx->Color.ColorMask[i], 4)) {

+         return GL_TRUE;

+      }

+   }

+   return GL_FALSE;

+}

+

+/**

+ * Figure out if blend enables/state are different per rt.

+ */

+static GLboolean

+blend_per_rt(struct gl_context *ctx)

+{

+   if (ctx->Color.BlendEnabled &&

+      (ctx->Color.BlendEnabled != ((1 << ctx->Const.MaxDrawBuffers) - 1))) {

+      /* This can only happen if GL_EXT_draw_buffers2 is enabled */

+      return GL_TRUE;

+   }

+   if (ctx->Color._BlendFuncPerBuffer || ctx->Color._BlendEquationPerBuffer) {

+      /* this can only happen if GL_ARB_draw_buffers_blend is enabled */

+      return GL_TRUE;

+   }

+   return GL_FALSE;

+}

+

+static void 

+update_blend( struct st_context *st )

+{

+   struct pipe_blend_state *blend = &st->state.blend;

+   unsigned num_state = 1;

+   unsigned i, j;

+

+   memset(blend, 0, sizeof(*blend));

+

+   if (blend_per_rt(st->ctx) || colormask_per_rt(st->ctx)) {

+      num_state = st->ctx->Const.MaxDrawBuffers;

+      blend->independent_blend_enable = 1;

+   }

+   /* Note it is impossible to correctly deal with EXT_blend_logic_op and

+      EXT_draw_buffers2/EXT_blend_equation_separate at the same time.

+      These combinations would require support for per-rt logicop enables

+      and separate alpha/rgb logicop/blend support respectively. Neither

+      possible in gallium nor most hardware. Assume these combinations

+      don't happen. */

+   if (st->ctx->Color.ColorLogicOpEnabled ||

+       (st->ctx->Color.BlendEnabled &&

+        st->ctx->Color.Blend[0].EquationRGB == GL_LOGIC_OP)) {

+      /* logicop enabled */

+      blend->logicop_enable = 1;

+      blend->logicop_func = translate_logicop(st->ctx->Color.LogicOp);

+   }

+   else if (st->ctx->Color.BlendEnabled) {

+      /* blending enabled */

+      for (i = 0, j = 0; i < num_state; i++) {

+

+         blend->rt[i].blend_enable = (st->ctx->Color.BlendEnabled >> i) & 0x1;

+

+         if (st->ctx->Extensions.ARB_draw_buffers_blend)

+            j = i;

+

+         blend->rt[i].rgb_func =

+            translate_blend(st->ctx->Color.Blend[j].EquationRGB);

+

+         if (st->ctx->Color.Blend[i].EquationRGB == GL_MIN ||

+             st->ctx->Color.Blend[i].EquationRGB == GL_MAX) {

+            /* Min/max are special */

+            blend->rt[i].rgb_src_factor = PIPE_BLENDFACTOR_ONE;

+            blend->rt[i].rgb_dst_factor = PIPE_BLENDFACTOR_ONE;

+         }

+         else {

+            blend->rt[i].rgb_src_factor =

+               translate_blend(st->ctx->Color.Blend[j].SrcRGB);

+            blend->rt[i].rgb_dst_factor =

+               translate_blend(st->ctx->Color.Blend[j].DstRGB);

+         }

+

+         blend->rt[i].alpha_func =

+            translate_blend(st->ctx->Color.Blend[j].EquationA);

+

+         if (st->ctx->Color.Blend[i].EquationA == GL_MIN ||

+             st->ctx->Color.Blend[i].EquationA == GL_MAX) {

+            /* Min/max are special */

+            blend->rt[i].alpha_src_factor = PIPE_BLENDFACTOR_ONE;

+            blend->rt[i].alpha_dst_factor = PIPE_BLENDFACTOR_ONE;

+         }

+         else {

+            blend->rt[i].alpha_src_factor =

+               translate_blend(st->ctx->Color.Blend[j].SrcA);

+            blend->rt[i].alpha_dst_factor =

+               translate_blend(st->ctx->Color.Blend[j].DstA);

+         }

+      }

+   }

+   else {

+      /* no blending / logicop */

+   }

+

+   /* Colormask - maybe reverse these bits? */

+   for (i = 0; i < num_state; i++) {

+      if (st->ctx->Color.ColorMask[i][0])

+         blend->rt[i].colormask |= PIPE_MASK_R;

+      if (st->ctx->Color.ColorMask[i][1])

+         blend->rt[i].colormask |= PIPE_MASK_G;

+      if (st->ctx->Color.ColorMask[i][2])

+         blend->rt[i].colormask |= PIPE_MASK_B;

+      if (st->ctx->Color.ColorMask[i][3])

+         blend->rt[i].colormask |= PIPE_MASK_A;

+   }

+

+   if (st->ctx->Color.DitherFlag)

+      blend->dither = 1;

+

+   if (st->ctx->Multisample.Enabled) {

+      /* unlike in gallium/d3d10 these operations are only performed

+         if msaa is enabled */

+      if (st->ctx->Multisample.SampleAlphaToCoverage)

+         blend->alpha_to_coverage = 1;

+      if (st->ctx->Multisample.SampleAlphaToOne)

+         blend->alpha_to_one = 1;

+   }

+

+   cso_set_blend(st->cso_context, blend);

+

+   {

+      struct pipe_blend_color bc;

+      COPY_4FV(bc.color, st->ctx->Color.BlendColorUnclamped);

+      cso_set_blend_color(st->cso_context, &bc);

+   }

+}

+

+

+const struct st_tracked_state st_update_blend = {

+   "st_update_blend",					/* name */

+   {							/* dirty */

+      (_NEW_COLOR | _NEW_MULTISAMPLE),  /* XXX _NEW_BLEND someday? */	/* mesa */

+      0,						/* st */

+   },

+   update_blend,					/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_depth.c b/mesalib/src/mesa/state_tracker/st_atom_depth.c
index 6c51b1ac1..524f8986f 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_depth.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_depth.c
@@ -1,160 +1,160 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  *   Brian Paul
-  *   Zack  Rusin
-  */
- 
-
-#include <assert.h>
-
-#include "st_context.h"
-#include "st_atom.h"
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "cso_cache/cso_context.h"
-
-
-/**
- * Convert an OpenGL compare mode to a pipe tokens.
- */
-GLuint
-st_compare_func_to_pipe(GLenum func)
-{
-   /* Same values, just biased */
-   assert(PIPE_FUNC_NEVER == GL_NEVER - GL_NEVER);
-   assert(PIPE_FUNC_LESS == GL_LESS - GL_NEVER);
-   assert(PIPE_FUNC_EQUAL == GL_EQUAL - GL_NEVER);
-   assert(PIPE_FUNC_LEQUAL == GL_LEQUAL - GL_NEVER);
-   assert(PIPE_FUNC_GREATER == GL_GREATER - GL_NEVER);
-   assert(PIPE_FUNC_NOTEQUAL == GL_NOTEQUAL - GL_NEVER);
-   assert(PIPE_FUNC_GEQUAL == GL_GEQUAL - GL_NEVER);
-   assert(PIPE_FUNC_ALWAYS == GL_ALWAYS - GL_NEVER);
-   assert(func >= GL_NEVER);
-   assert(func <= GL_ALWAYS);
-   return func - GL_NEVER;
-}
-
-
-/**
- * Convert GLenum stencil op tokens to pipe tokens.
- */
-static GLuint
-gl_stencil_op_to_pipe(GLenum func)
-{
-   switch (func) {
-   case GL_KEEP:
-      return PIPE_STENCIL_OP_KEEP;
-   case GL_ZERO:
-      return PIPE_STENCIL_OP_ZERO;
-   case GL_REPLACE:
-      return PIPE_STENCIL_OP_REPLACE;
-   case GL_INCR:
-      return PIPE_STENCIL_OP_INCR;
-   case GL_DECR:
-      return PIPE_STENCIL_OP_DECR;
-   case GL_INCR_WRAP:
-      return PIPE_STENCIL_OP_INCR_WRAP;
-   case GL_DECR_WRAP:
-      return PIPE_STENCIL_OP_DECR_WRAP;
-   case GL_INVERT:
-      return PIPE_STENCIL_OP_INVERT;
-   default:
-      assert("invalid GL token in gl_stencil_op_to_pipe()" == NULL);
-      return 0;
-   }
-}
-
-static void
-update_depth_stencil_alpha(struct st_context *st)
-{
-   struct pipe_depth_stencil_alpha_state *dsa = &st->state.depth_stencil;
-   struct pipe_stencil_ref sr;
-   struct gl_context *ctx = st->ctx;
-
-   memset(dsa, 0, sizeof(*dsa));
-   memset(&sr, 0, sizeof(sr));
-
-   if (ctx->Depth.Test && ctx->DrawBuffer->Visual.depthBits > 0) {
-      dsa->depth.enabled = 1;
-      dsa->depth.writemask = ctx->Depth.Mask;
-      dsa->depth.func = st_compare_func_to_pipe(ctx->Depth.Func);
-   }
-
-   if (ctx->Stencil.Enabled && ctx->DrawBuffer->Visual.stencilBits > 0) {
-      dsa->stencil[0].enabled = 1;
-      dsa->stencil[0].func = st_compare_func_to_pipe(ctx->Stencil.Function[0]);
-      dsa->stencil[0].fail_op = gl_stencil_op_to_pipe(ctx->Stencil.FailFunc[0]);
-      dsa->stencil[0].zfail_op = gl_stencil_op_to_pipe(ctx->Stencil.ZFailFunc[0]);
-      dsa->stencil[0].zpass_op = gl_stencil_op_to_pipe(ctx->Stencil.ZPassFunc[0]);
-      dsa->stencil[0].valuemask = ctx->Stencil.ValueMask[0] & 0xff;
-      dsa->stencil[0].writemask = ctx->Stencil.WriteMask[0] & 0xff;
-      sr.ref_value[0] = ctx->Stencil.Ref[0] & 0xff;
-
-      if (ctx->Stencil._TestTwoSide) {
-         const GLuint back = ctx->Stencil._BackFace;
-         dsa->stencil[1].enabled = 1;
-         dsa->stencil[1].func = st_compare_func_to_pipe(ctx->Stencil.Function[back]);
-         dsa->stencil[1].fail_op = gl_stencil_op_to_pipe(ctx->Stencil.FailFunc[back]);
-         dsa->stencil[1].zfail_op = gl_stencil_op_to_pipe(ctx->Stencil.ZFailFunc[back]);
-         dsa->stencil[1].zpass_op = gl_stencil_op_to_pipe(ctx->Stencil.ZPassFunc[back]);
-         dsa->stencil[1].valuemask = ctx->Stencil.ValueMask[back] & 0xff;
-         dsa->stencil[1].writemask = ctx->Stencil.WriteMask[back] & 0xff;
-         sr.ref_value[1] = ctx->Stencil.Ref[back] & 0xff;
-      }
-      else {
-         /* This should be unnecessary. Drivers must not expect this to
-          * contain valid data, except the enabled bit
-          */
-         dsa->stencil[1] = dsa->stencil[0];
-         dsa->stencil[1].enabled = 0;
-         sr.ref_value[1] = sr.ref_value[0];
-      }
-   }
-
-   if (ctx->Color.AlphaEnabled) {
-      dsa->alpha.enabled = 1;
-      dsa->alpha.func = st_compare_func_to_pipe(ctx->Color.AlphaFunc);
-      dsa->alpha.ref_value = ctx->Color.AlphaRefUnclamped;
-   }
-
-   cso_set_depth_stencil_alpha(st->cso_context, dsa);
-   cso_set_stencil_ref(st->cso_context, &sr);
-}
-
-
-const struct st_tracked_state st_update_depth_stencil_alpha = {
-   "st_update_depth_stencil",				/* name */
-   {							/* dirty */
-      (_NEW_DEPTH|_NEW_STENCIL|_NEW_COLOR),		/* mesa */
-      0,						/* st */
-   },
-   update_depth_stencil_alpha				/* update */
-};
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+ /*

+  * Authors:

+  *   Keith Whitwell <keith@tungstengraphics.com>

+  *   Brian Paul

+  *   Zack  Rusin

+  */

+ 

+

+#include <assert.h>

+

+#include "st_context.h"

+#include "st_atom.h"

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "cso_cache/cso_context.h"

+

+

+/**

+ * Convert an OpenGL compare mode to a pipe tokens.

+ */

+GLuint

+st_compare_func_to_pipe(GLenum func)

+{

+   /* Same values, just biased */

+   assert(PIPE_FUNC_NEVER == GL_NEVER - GL_NEVER);

+   assert(PIPE_FUNC_LESS == GL_LESS - GL_NEVER);

+   assert(PIPE_FUNC_EQUAL == GL_EQUAL - GL_NEVER);

+   assert(PIPE_FUNC_LEQUAL == GL_LEQUAL - GL_NEVER);

+   assert(PIPE_FUNC_GREATER == GL_GREATER - GL_NEVER);

+   assert(PIPE_FUNC_NOTEQUAL == GL_NOTEQUAL - GL_NEVER);

+   assert(PIPE_FUNC_GEQUAL == GL_GEQUAL - GL_NEVER);

+   assert(PIPE_FUNC_ALWAYS == GL_ALWAYS - GL_NEVER);

+   assert(func >= GL_NEVER);

+   assert(func <= GL_ALWAYS);

+   return func - GL_NEVER;

+}

+

+

+/**

+ * Convert GLenum stencil op tokens to pipe tokens.

+ */

+static GLuint

+gl_stencil_op_to_pipe(GLenum func)

+{

+   switch (func) {

+   case GL_KEEP:

+      return PIPE_STENCIL_OP_KEEP;

+   case GL_ZERO:

+      return PIPE_STENCIL_OP_ZERO;

+   case GL_REPLACE:

+      return PIPE_STENCIL_OP_REPLACE;

+   case GL_INCR:

+      return PIPE_STENCIL_OP_INCR;

+   case GL_DECR:

+      return PIPE_STENCIL_OP_DECR;

+   case GL_INCR_WRAP:

+      return PIPE_STENCIL_OP_INCR_WRAP;

+   case GL_DECR_WRAP:

+      return PIPE_STENCIL_OP_DECR_WRAP;

+   case GL_INVERT:

+      return PIPE_STENCIL_OP_INVERT;

+   default:

+      assert("invalid GL token in gl_stencil_op_to_pipe()" == NULL);

+      return 0;

+   }

+}

+

+static void

+update_depth_stencil_alpha(struct st_context *st)

+{

+   struct pipe_depth_stencil_alpha_state *dsa = &st->state.depth_stencil;

+   struct pipe_stencil_ref sr;

+   struct gl_context *ctx = st->ctx;

+

+   memset(dsa, 0, sizeof(*dsa));

+   memset(&sr, 0, sizeof(sr));

+

+   if (ctx->Depth.Test && ctx->DrawBuffer->Visual.depthBits > 0) {

+      dsa->depth.enabled = 1;

+      dsa->depth.writemask = ctx->Depth.Mask;

+      dsa->depth.func = st_compare_func_to_pipe(ctx->Depth.Func);

+   }

+

+   if (ctx->Stencil.Enabled && ctx->DrawBuffer->Visual.stencilBits > 0) {

+      dsa->stencil[0].enabled = 1;

+      dsa->stencil[0].func = st_compare_func_to_pipe(ctx->Stencil.Function[0]);

+      dsa->stencil[0].fail_op = gl_stencil_op_to_pipe(ctx->Stencil.FailFunc[0]);

+      dsa->stencil[0].zfail_op = gl_stencil_op_to_pipe(ctx->Stencil.ZFailFunc[0]);

+      dsa->stencil[0].zpass_op = gl_stencil_op_to_pipe(ctx->Stencil.ZPassFunc[0]);

+      dsa->stencil[0].valuemask = ctx->Stencil.ValueMask[0] & 0xff;

+      dsa->stencil[0].writemask = ctx->Stencil.WriteMask[0] & 0xff;

+      sr.ref_value[0] = ctx->Stencil.Ref[0] & 0xff;

+

+      if (ctx->Stencil._TestTwoSide) {

+         const GLuint back = ctx->Stencil._BackFace;

+         dsa->stencil[1].enabled = 1;

+         dsa->stencil[1].func = st_compare_func_to_pipe(ctx->Stencil.Function[back]);

+         dsa->stencil[1].fail_op = gl_stencil_op_to_pipe(ctx->Stencil.FailFunc[back]);

+         dsa->stencil[1].zfail_op = gl_stencil_op_to_pipe(ctx->Stencil.ZFailFunc[back]);

+         dsa->stencil[1].zpass_op = gl_stencil_op_to_pipe(ctx->Stencil.ZPassFunc[back]);

+         dsa->stencil[1].valuemask = ctx->Stencil.ValueMask[back] & 0xff;

+         dsa->stencil[1].writemask = ctx->Stencil.WriteMask[back] & 0xff;

+         sr.ref_value[1] = ctx->Stencil.Ref[back] & 0xff;

+      }

+      else {

+         /* This should be unnecessary. Drivers must not expect this to

+          * contain valid data, except the enabled bit

+          */

+         dsa->stencil[1] = dsa->stencil[0];

+         dsa->stencil[1].enabled = 0;

+         sr.ref_value[1] = sr.ref_value[0];

+      }

+   }

+

+   if (ctx->Color.AlphaEnabled) {

+      dsa->alpha.enabled = 1;

+      dsa->alpha.func = st_compare_func_to_pipe(ctx->Color.AlphaFunc);

+      dsa->alpha.ref_value = ctx->Color.AlphaRefUnclamped;

+   }

+

+   cso_set_depth_stencil_alpha(st->cso_context, dsa);

+   cso_set_stencil_ref(st->cso_context, &sr);

+}

+

+

+const struct st_tracked_state st_update_depth_stencil_alpha = {

+   "st_update_depth_stencil",				/* name */

+   {							/* dirty */

+      (_NEW_DEPTH|_NEW_STENCIL|_NEW_COLOR),		/* mesa */

+      0,						/* st */

+   },

+   update_depth_stencil_alpha				/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_framebuffer.c b/mesalib/src/mesa/state_tracker/st_atom_framebuffer.c
index 76386fe01..678a270c7 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -1,182 +1,182 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  *   Brian Paul
-  */
- 
-#include "st_context.h"
-#include "st_atom.h"
-#include "st_cb_fbo.h"
-#include "st_texture.h"
-#include "pipe/p_context.h"
-#include "cso_cache/cso_context.h"
-#include "util/u_math.h"
-#include "util/u_inlines.h"
-#include "util/u_format.h"
-
-
-/**
- * When doing GL render to texture, we have to be sure that finalize_texture()
- * didn't yank out the pipe_resource that we earlier created a surface for.
- * Check for that here and create a new surface if needed.
- */
-static void
-update_renderbuffer_surface(struct st_context *st,
-                            struct st_renderbuffer *strb)
-{
-   struct pipe_context *pipe = st->pipe;
-   struct pipe_resource *resource = strb->rtt->pt;
-   int rtt_width = strb->Base.Width;
-   int rtt_height = strb->Base.Height;
-   enum pipe_format format = st->ctx->Color.sRGBEnabled ? resource->format : util_format_linear(resource->format);
-
-   if (!strb->surface ||
-       strb->surface->format != format ||
-       strb->surface->texture != resource ||
-       strb->surface->width != rtt_width ||
-       strb->surface->height != rtt_height) {
-      GLuint level;
-      /* find matching mipmap level size */
-      for (level = 0; level <= resource->last_level; level++) {
-         if (u_minify(resource->width0, level) == rtt_width &&
-             u_minify(resource->height0, level) == rtt_height) {
-            struct pipe_surface surf_tmpl;
-            memset(&surf_tmpl, 0, sizeof(surf_tmpl));
-            surf_tmpl.format = format;
-            surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
-            surf_tmpl.u.tex.level = level;
-            surf_tmpl.u.tex.first_layer = strb->rtt_face + strb->rtt_slice;
-            surf_tmpl.u.tex.last_layer = strb->rtt_face + strb->rtt_slice;
-
-            pipe_surface_reference(&strb->surface, NULL);
-
-            strb->surface = pipe->create_surface(pipe,
-                                                 resource,
-                                                 &surf_tmpl);
-#if 0
-            printf("-- alloc new surface %d x %d into tex %p\n",
-                   strb->surface->width, strb->surface->height,
-                   texture);
-#endif
-            break;
-         }
-      }
-   }
-}
-
-
-/**
- * Update framebuffer state (color, depth, stencil, etc. buffers)
- */
-static void
-update_framebuffer_state( struct st_context *st )
-{
-   struct pipe_framebuffer_state *framebuffer = &st->state.framebuffer;
-   struct gl_framebuffer *fb = st->ctx->DrawBuffer;
-   struct st_renderbuffer *strb;
-   GLuint i;
-
-   framebuffer->width = fb->Width;
-   framebuffer->height = fb->Height;
-
-   /*printf("------ fb size %d x %d\n", fb->Width, fb->Height);*/
-
-   /* Examine Mesa's ctx->DrawBuffer->_ColorDrawBuffers state
-    * to determine which surfaces to draw to
-    */
-   framebuffer->nr_cbufs = 0;
-   for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
-      strb = st_renderbuffer(fb->_ColorDrawBuffers[i]);
-
-      if (strb) {
-         /*printf("--------- framebuffer surface rtt %p\n", strb->rtt);*/
-         if (strb->rtt) {
-            /* rendering to a GL texture, may have to update surface */
-            update_renderbuffer_surface(st, strb);
-         }
-
-         if (strb->surface) {
-            pipe_surface_reference(&framebuffer->cbufs[framebuffer->nr_cbufs],
-                                   strb->surface);
-            framebuffer->nr_cbufs++;
-         }
-         strb->defined = GL_TRUE; /* we'll be drawing something */
-      }
-   }
-   for (i = framebuffer->nr_cbufs; i < PIPE_MAX_COLOR_BUFS; i++) {
-      pipe_surface_reference(&framebuffer->cbufs[i], NULL);
-   }
-
-   /*
-    * Depth/Stencil renderbuffer/surface.
-    */
-   strb = st_renderbuffer(fb->Attachment[BUFFER_DEPTH].Renderbuffer);
-   if (strb) {
-      strb = st_renderbuffer(strb->Base.Wrapped);
-      if (strb->rtt) {
-         /* rendering to a GL texture, may have to update surface */
-         update_renderbuffer_surface(st, strb);
-      }
-      pipe_surface_reference(&framebuffer->zsbuf, strb->surface);
-   }
-   else {
-      strb = st_renderbuffer(fb->Attachment[BUFFER_STENCIL].Renderbuffer);
-      if (strb) {
-         strb = st_renderbuffer(strb->Base.Wrapped);
-         assert(strb->surface);
-         pipe_surface_reference(&framebuffer->zsbuf, strb->surface);
-      }
-      else
-         pipe_surface_reference(&framebuffer->zsbuf, NULL);
-   }
-
-#ifdef DEBUG
-   /* Make sure the resource binding flags were set properly */
-   for (i = 0; i < framebuffer->nr_cbufs; i++) {
-      assert(framebuffer->cbufs[i]->texture->bind & PIPE_BIND_RENDER_TARGET);
-   }
-   if (framebuffer->zsbuf) {
-      assert(framebuffer->zsbuf->texture->bind & PIPE_BIND_DEPTH_STENCIL);
-   }
-#endif
-
-   cso_set_framebuffer(st->cso_context, framebuffer);
-}
-
-
-const struct st_tracked_state st_update_framebuffer = {
-   "st_update_framebuffer",				/* name */
-   {							/* dirty */
-      _NEW_BUFFERS,					/* mesa */
-      ST_NEW_FRAMEBUFFER,				/* st */
-   },
-   update_framebuffer_state				/* update */
-};
-
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+ /*

+  * Authors:

+  *   Keith Whitwell <keith@tungstengraphics.com>

+  *   Brian Paul

+  */

+ 

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_cb_fbo.h"

+#include "st_texture.h"

+#include "pipe/p_context.h"

+#include "cso_cache/cso_context.h"

+#include "util/u_math.h"

+#include "util/u_inlines.h"

+#include "util/u_format.h"

+

+

+/**

+ * When doing GL render to texture, we have to be sure that finalize_texture()

+ * didn't yank out the pipe_resource that we earlier created a surface for.

+ * Check for that here and create a new surface if needed.

+ */

+static void

+update_renderbuffer_surface(struct st_context *st,

+                            struct st_renderbuffer *strb)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_resource *resource = strb->rtt->pt;

+   int rtt_width = strb->Base.Width;

+   int rtt_height = strb->Base.Height;

+   enum pipe_format format = st->ctx->Color.sRGBEnabled ? resource->format : util_format_linear(resource->format);

+

+   if (!strb->surface ||

+       strb->surface->format != format ||

+       strb->surface->texture != resource ||

+       strb->surface->width != rtt_width ||

+       strb->surface->height != rtt_height) {

+      GLuint level;

+      /* find matching mipmap level size */

+      for (level = 0; level <= resource->last_level; level++) {

+         if (u_minify(resource->width0, level) == rtt_width &&

+             u_minify(resource->height0, level) == rtt_height) {

+            struct pipe_surface surf_tmpl;

+            memset(&surf_tmpl, 0, sizeof(surf_tmpl));

+            surf_tmpl.format = format;

+            surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;

+            surf_tmpl.u.tex.level = level;

+            surf_tmpl.u.tex.first_layer = strb->rtt_face + strb->rtt_slice;

+            surf_tmpl.u.tex.last_layer = strb->rtt_face + strb->rtt_slice;

+

+            pipe_surface_reference(&strb->surface, NULL);

+

+            strb->surface = pipe->create_surface(pipe,

+                                                 resource,

+                                                 &surf_tmpl);

+#if 0

+            printf("-- alloc new surface %d x %d into tex %p\n",

+                   strb->surface->width, strb->surface->height,

+                   texture);

+#endif

+            break;

+         }

+      }

+   }

+}

+

+

+/**

+ * Update framebuffer state (color, depth, stencil, etc. buffers)

+ */

+static void

+update_framebuffer_state( struct st_context *st )

+{

+   struct pipe_framebuffer_state *framebuffer = &st->state.framebuffer;

+   struct gl_framebuffer *fb = st->ctx->DrawBuffer;

+   struct st_renderbuffer *strb;

+   GLuint i;

+

+   framebuffer->width = fb->Width;

+   framebuffer->height = fb->Height;

+

+   /*printf("------ fb size %d x %d\n", fb->Width, fb->Height);*/

+

+   /* Examine Mesa's ctx->DrawBuffer->_ColorDrawBuffers state

+    * to determine which surfaces to draw to

+    */

+   framebuffer->nr_cbufs = 0;

+   for (i = 0; i < fb->_NumColorDrawBuffers; i++) {

+      strb = st_renderbuffer(fb->_ColorDrawBuffers[i]);

+

+      if (strb) {

+         /*printf("--------- framebuffer surface rtt %p\n", strb->rtt);*/

+         if (strb->rtt) {

+            /* rendering to a GL texture, may have to update surface */

+            update_renderbuffer_surface(st, strb);

+         }

+

+         if (strb->surface) {

+            pipe_surface_reference(&framebuffer->cbufs[framebuffer->nr_cbufs],

+                                   strb->surface);

+            framebuffer->nr_cbufs++;

+         }

+         strb->defined = GL_TRUE; /* we'll be drawing something */

+      }

+   }

+   for (i = framebuffer->nr_cbufs; i < PIPE_MAX_COLOR_BUFS; i++) {

+      pipe_surface_reference(&framebuffer->cbufs[i], NULL);

+   }

+

+   /*

+    * Depth/Stencil renderbuffer/surface.

+    */

+   strb = st_renderbuffer(fb->Attachment[BUFFER_DEPTH].Renderbuffer);

+   if (strb) {

+      strb = st_renderbuffer(strb->Base.Wrapped);

+      if (strb->rtt) {

+         /* rendering to a GL texture, may have to update surface */

+         update_renderbuffer_surface(st, strb);

+      }

+      pipe_surface_reference(&framebuffer->zsbuf, strb->surface);

+   }

+   else {

+      strb = st_renderbuffer(fb->Attachment[BUFFER_STENCIL].Renderbuffer);

+      if (strb) {

+         strb = st_renderbuffer(strb->Base.Wrapped);

+         assert(strb->surface);

+         pipe_surface_reference(&framebuffer->zsbuf, strb->surface);

+      }

+      else

+         pipe_surface_reference(&framebuffer->zsbuf, NULL);

+   }

+

+#ifdef DEBUG

+   /* Make sure the resource binding flags were set properly */

+   for (i = 0; i < framebuffer->nr_cbufs; i++) {

+      assert(framebuffer->cbufs[i]->texture->bind & PIPE_BIND_RENDER_TARGET);

+   }

+   if (framebuffer->zsbuf) {

+      assert(framebuffer->zsbuf->texture->bind & PIPE_BIND_DEPTH_STENCIL);

+   }

+#endif

+

+   cso_set_framebuffer(st->cso_context, framebuffer);

+}

+

+

+const struct st_tracked_state st_update_framebuffer = {

+   "st_update_framebuffer",				/* name */

+   {							/* dirty */

+      _NEW_BUFFERS,					/* mesa */

+      ST_NEW_FRAMEBUFFER,				/* st */

+   },

+   update_framebuffer_state				/* update */

+};

+

diff --git a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
index 9557adc2d..e0a1cba2b 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
@@ -1,354 +1,354 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
-/*
- * Generate fragment programs to implement pixel transfer ops, such as
- * scale/bias, colortable, convolution...
- *
- * Authors:
- *   Brian Paul
- */
-
-#include "main/imports.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "program/program.h"
-#include "program/prog_cache.h"
-#include "program/prog_instruction.h"
-#include "program/prog_parameter.h"
-#include "program/prog_print.h"
-
-#include "st_context.h"
-#include "st_format.h"
-#include "st_texture.h"
-
-#include "pipe/p_screen.h"
-#include "pipe/p_context.h"
-#include "util/u_inlines.h"
-#include "util/u_pack_color.h"
-
-
-struct state_key
-{
-   GLuint scaleAndBias:1;
-   GLuint pixelMaps:1;
-
-#if 0
-   GLfloat Maps[3][256][4];
-   int NumMaps;
-   GLint NumStages;
-   pipeline_stage Stages[STAGE_MAX];
-   GLboolean StagesUsed[STAGE_MAX];
-   GLfloat Scale1[4], Bias1[4];
-   GLfloat Scale2[4], Bias2[4];
-#endif
-};
-
-static void
-make_state_key(struct gl_context *ctx,  struct state_key *key)
-{
-   memset(key, 0, sizeof(*key));
-
-   if (ctx->Pixel.RedBias != 0.0 || ctx->Pixel.RedScale != 1.0 ||
-       ctx->Pixel.GreenBias != 0.0 || ctx->Pixel.GreenScale != 1.0 ||
-       ctx->Pixel.BlueBias != 0.0 || ctx->Pixel.BlueScale != 1.0 ||
-       ctx->Pixel.AlphaBias != 0.0 || ctx->Pixel.AlphaScale != 1.0) {
-      key->scaleAndBias = 1;
-   }
-
-   key->pixelMaps = ctx->Pixel.MapColorFlag;
-}
-
-
-static struct pipe_resource *
-create_color_map_texture(struct gl_context *ctx)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   struct pipe_resource *pt;
-   enum pipe_format format;
-   const uint texSize = 256; /* simple, and usually perfect */
-
-   /* find an RGBA texture format */
-   format = st_choose_format(pipe->screen, GL_RGBA,
-                             PIPE_TEXTURE_2D, 0, PIPE_BIND_SAMPLER_VIEW);
-
-   /* create texture for color map/table */
-   pt = st_texture_create(st, PIPE_TEXTURE_2D, format, 0,
-                          texSize, texSize, 1, 1, PIPE_BIND_SAMPLER_VIEW);
-   return pt;
-}
-
-
-/**
- * Update the pixelmap texture with the contents of the R/G/B/A pixel maps.
- */
-static void
-load_color_map_texture(struct gl_context *ctx, struct pipe_resource *pt)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   struct pipe_transfer *transfer;
-   const GLuint rSize = ctx->PixelMaps.RtoR.Size;
-   const GLuint gSize = ctx->PixelMaps.GtoG.Size;
-   const GLuint bSize = ctx->PixelMaps.BtoB.Size;
-   const GLuint aSize = ctx->PixelMaps.AtoA.Size;
-   const uint texSize = pt->width0;
-   uint *dest;
-   uint i, j;
-
-   transfer = pipe_get_transfer(st_context(ctx)->pipe,
-                                pt, 0, 0, PIPE_TRANSFER_WRITE,
-                                0, 0, texSize, texSize);
-   dest = (uint *) pipe_transfer_map(pipe, transfer);
-
-   /* Pack four 1D maps into a 2D texture:
-    * R map is placed horizontally, indexed by S, in channel 0
-    * G map is placed vertically, indexed by T, in channel 1
-    * B map is placed horizontally, indexed by S, in channel 2
-    * A map is placed vertically, indexed by T, in channel 3
-    */
-   for (i = 0; i < texSize; i++) {
-      for (j = 0; j < texSize; j++) {
-         union util_color uc;
-         int k = (i * texSize + j);
-         ubyte r = ctx->PixelMaps.RtoR.Map8[j * rSize / texSize];
-         ubyte g = ctx->PixelMaps.GtoG.Map8[i * gSize / texSize];
-         ubyte b = ctx->PixelMaps.BtoB.Map8[j * bSize / texSize];
-         ubyte a = ctx->PixelMaps.AtoA.Map8[i * aSize / texSize];
-         util_pack_color_ub(r, g, b, a, pt->format, &uc);
-         *(dest + k) = uc.ui;
-      }
-   }
-
-   pipe_transfer_unmap(pipe, transfer);
-   pipe->transfer_destroy(pipe, transfer);
-}
-
-
-
-#define MAX_INST 100
-
-/**
- * Returns a fragment program which implements the current pixel transfer ops.
- */
-static struct gl_fragment_program *
-get_pixel_transfer_program(struct gl_context *ctx, const struct state_key *key)
-{
-   struct st_context *st = st_context(ctx);
-   struct prog_instruction inst[MAX_INST];
-   struct gl_program_parameter_list *params;
-   struct gl_fragment_program *fp;
-   GLuint ic = 0;
-   const GLuint colorTemp = 0;
-
-   fp = (struct gl_fragment_program *)
-      ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
-   if (!fp)
-      return NULL;
-
-   params = _mesa_new_parameter_list();
-
-   /*
-    * Get initial pixel color from the texture.
-    * TEX colorTemp, fragment.texcoord[0], texture[0], 2D;
-    */
-   _mesa_init_instructions(inst + ic, 1);
-   inst[ic].Opcode = OPCODE_TEX;
-   inst[ic].DstReg.File = PROGRAM_TEMPORARY;
-   inst[ic].DstReg.Index = colorTemp;
-   inst[ic].SrcReg[0].File = PROGRAM_INPUT;
-   inst[ic].SrcReg[0].Index = FRAG_ATTRIB_TEX0;
-   inst[ic].TexSrcUnit = 0;
-   inst[ic].TexSrcTarget = TEXTURE_2D_INDEX;
-   ic++;
-   fp->Base.InputsRead = (1 << FRAG_ATTRIB_TEX0);
-   fp->Base.OutputsWritten = BITFIELD64_BIT(FRAG_RESULT_COLOR);
-   fp->Base.SamplersUsed = 0x1;  /* sampler 0 (bit 0) is used */
-
-   if (key->scaleAndBias) {
-      static const gl_state_index scale_state[STATE_LENGTH] =
-         { STATE_INTERNAL, STATE_PT_SCALE, 0, 0, 0 };
-      static const gl_state_index bias_state[STATE_LENGTH] =
-         { STATE_INTERNAL, STATE_PT_BIAS, 0, 0, 0 };
-      GLfloat scale[4], bias[4];
-      GLint scale_p, bias_p;
-
-      scale[0] = ctx->Pixel.RedScale;
-      scale[1] = ctx->Pixel.GreenScale;
-      scale[2] = ctx->Pixel.BlueScale;
-      scale[3] = ctx->Pixel.AlphaScale;
-      bias[0] = ctx->Pixel.RedBias;
-      bias[1] = ctx->Pixel.GreenBias;
-      bias[2] = ctx->Pixel.BlueBias;
-      bias[3] = ctx->Pixel.AlphaBias;
-
-      scale_p = _mesa_add_state_reference(params, scale_state);
-      bias_p = _mesa_add_state_reference(params, bias_state);
-
-      /* MAD colorTemp, colorTemp, scale, bias; */
-      _mesa_init_instructions(inst + ic, 1);
-      inst[ic].Opcode = OPCODE_MAD;
-      inst[ic].DstReg.File = PROGRAM_TEMPORARY;
-      inst[ic].DstReg.Index = colorTemp;
-      inst[ic].SrcReg[0].File = PROGRAM_TEMPORARY;
-      inst[ic].SrcReg[0].Index = colorTemp;
-      inst[ic].SrcReg[1].File = PROGRAM_STATE_VAR;
-      inst[ic].SrcReg[1].Index = scale_p;
-      inst[ic].SrcReg[2].File = PROGRAM_STATE_VAR;
-      inst[ic].SrcReg[2].Index = bias_p;
-      ic++;
-   }
-
-   if (key->pixelMaps) {
-      const GLuint temp = 1;
-
-      /* create the colormap/texture now if not already done */
-      if (!st->pixel_xfer.pixelmap_texture) {
-         st->pixel_xfer.pixelmap_texture = create_color_map_texture(ctx);
-         st->pixel_xfer.pixelmap_sampler_view =
-            st_create_texture_sampler_view(st->pipe,
-                                           st->pixel_xfer.pixelmap_texture);
-      }
-
-      /* with a little effort, we can do four pixel map look-ups with
-       * two TEX instructions:
-       */
-
-      /* TEX temp.rg, colorTemp.rgba, texture[1], 2D; */
-      _mesa_init_instructions(inst + ic, 1);
-      inst[ic].Opcode = OPCODE_TEX;
-      inst[ic].DstReg.File = PROGRAM_TEMPORARY;
-      inst[ic].DstReg.Index = temp;
-      inst[ic].DstReg.WriteMask = WRITEMASK_XY; /* write R,G */
-      inst[ic].SrcReg[0].File = PROGRAM_TEMPORARY;
-      inst[ic].SrcReg[0].Index = colorTemp;
-      inst[ic].TexSrcUnit = 1;
-      inst[ic].TexSrcTarget = TEXTURE_2D_INDEX;
-      ic++;
-
-      /* TEX temp.ba, colorTemp.baba, texture[1], 2D; */
-      _mesa_init_instructions(inst + ic, 1);
-      inst[ic].Opcode = OPCODE_TEX;
-      inst[ic].DstReg.File = PROGRAM_TEMPORARY;
-      inst[ic].DstReg.Index = temp;
-      inst[ic].DstReg.WriteMask = WRITEMASK_ZW; /* write B,A */
-      inst[ic].SrcReg[0].File = PROGRAM_TEMPORARY;
-      inst[ic].SrcReg[0].Index = colorTemp;
-      inst[ic].SrcReg[0].Swizzle = MAKE_SWIZZLE4(SWIZZLE_Z, SWIZZLE_W,
-                                                 SWIZZLE_Z, SWIZZLE_W);
-      inst[ic].TexSrcUnit = 1;
-      inst[ic].TexSrcTarget = TEXTURE_2D_INDEX;
-      ic++;
-
-      /* MOV colorTemp, temp; */
-      _mesa_init_instructions(inst + ic, 1);
-      inst[ic].Opcode = OPCODE_MOV;
-      inst[ic].DstReg.File = PROGRAM_TEMPORARY;
-      inst[ic].DstReg.Index = colorTemp;
-      inst[ic].SrcReg[0].File = PROGRAM_TEMPORARY;
-      inst[ic].SrcReg[0].Index = temp;
-      ic++;
-
-      fp->Base.SamplersUsed |= (1 << 1);  /* sampler 1 is used */
-   }
-
-   /* Modify last instruction's dst reg to write to result.color */
-   {
-      struct prog_instruction *last = &inst[ic - 1];
-      last->DstReg.File = PROGRAM_OUTPUT;
-      last->DstReg.Index = FRAG_RESULT_COLOR;
-   }
-
-   /* END; */
-   _mesa_init_instructions(inst + ic, 1);
-   inst[ic].Opcode = OPCODE_END;
-   ic++;
-
-   assert(ic <= MAX_INST);
-
-
-   fp->Base.Instructions = _mesa_alloc_instructions(ic);
-   if (!fp->Base.Instructions) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                  "generating pixel transfer program");
-      return NULL;
-   }
-
-   _mesa_copy_instructions(fp->Base.Instructions, inst, ic);
-   fp->Base.NumInstructions = ic;
-   fp->Base.Parameters = params;
-
-#if 0
-   printf("========= pixel transfer prog\n");
-   _mesa_print_program(&fp->Base);
-   _mesa_print_parameter_list(fp->Base.Parameters);
-#endif
-
-   return fp;
-}
-
-
-
-/**
- * Update st->pixel_xfer.program in response to new pixel-transfer state.
- */
-static void
-update_pixel_transfer(struct st_context *st)
-{
-   struct gl_context *ctx = st->ctx;
-   struct state_key key;
-   struct gl_fragment_program *fp;
-
-   make_state_key(st->ctx, &key);
-
-   fp = (struct gl_fragment_program *)
-      _mesa_search_program_cache(st->pixel_xfer.cache, &key, sizeof(key));
-   if (!fp) {
-      fp = get_pixel_transfer_program(st->ctx, &key);
-      _mesa_program_cache_insert(st->ctx, st->pixel_xfer.cache,
-                                 &key, sizeof(key), &fp->Base);
-   }
-
-   if (ctx->Pixel.MapColorFlag) {
-      load_color_map_texture(ctx, st->pixel_xfer.pixelmap_texture);
-   }
-   st->pixel_xfer.pixelmap_enabled = ctx->Pixel.MapColorFlag;
-
-   st->pixel_xfer.program = (struct st_fragment_program *) fp;
-}
-
-
-
-const struct st_tracked_state st_update_pixel_transfer = {
-   "st_update_pixel_transfer",				/* name */
-   {							/* dirty */
-      _NEW_PIXEL,					/* mesa */
-      0,						/* st */
-   },
-   update_pixel_transfer				/* update */
-};
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+/*

+ * Generate fragment programs to implement pixel transfer ops, such as

+ * scale/bias, colortable, convolution...

+ *

+ * Authors:

+ *   Brian Paul

+ */

+

+#include "main/imports.h"

+#include "main/image.h"

+#include "main/macros.h"

+#include "program/program.h"

+#include "program/prog_cache.h"

+#include "program/prog_instruction.h"

+#include "program/prog_parameter.h"

+#include "program/prog_print.h"

+

+#include "st_context.h"

+#include "st_format.h"

+#include "st_texture.h"

+

+#include "pipe/p_screen.h"

+#include "pipe/p_context.h"

+#include "util/u_inlines.h"

+#include "util/u_pack_color.h"

+

+

+struct state_key

+{

+   GLuint scaleAndBias:1;

+   GLuint pixelMaps:1;

+

+#if 0

+   GLfloat Maps[3][256][4];

+   int NumMaps;

+   GLint NumStages;

+   pipeline_stage Stages[STAGE_MAX];

+   GLboolean StagesUsed[STAGE_MAX];

+   GLfloat Scale1[4], Bias1[4];

+   GLfloat Scale2[4], Bias2[4];

+#endif

+};

+

+static void

+make_state_key(struct gl_context *ctx,  struct state_key *key)

+{

+   memset(key, 0, sizeof(*key));

+

+   if (ctx->Pixel.RedBias != 0.0 || ctx->Pixel.RedScale != 1.0 ||

+       ctx->Pixel.GreenBias != 0.0 || ctx->Pixel.GreenScale != 1.0 ||

+       ctx->Pixel.BlueBias != 0.0 || ctx->Pixel.BlueScale != 1.0 ||

+       ctx->Pixel.AlphaBias != 0.0 || ctx->Pixel.AlphaScale != 1.0) {

+      key->scaleAndBias = 1;

+   }

+

+   key->pixelMaps = ctx->Pixel.MapColorFlag;

+}

+

+

+static struct pipe_resource *

+create_color_map_texture(struct gl_context *ctx)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_resource *pt;

+   enum pipe_format format;

+   const uint texSize = 256; /* simple, and usually perfect */

+

+   /* find an RGBA texture format */

+   format = st_choose_format(pipe->screen, GL_RGBA,

+                             PIPE_TEXTURE_2D, 0, PIPE_BIND_SAMPLER_VIEW);

+

+   /* create texture for color map/table */

+   pt = st_texture_create(st, PIPE_TEXTURE_2D, format, 0,

+                          texSize, texSize, 1, 1, PIPE_BIND_SAMPLER_VIEW);

+   return pt;

+}

+

+

+/**

+ * Update the pixelmap texture with the contents of the R/G/B/A pixel maps.

+ */

+static void

+load_color_map_texture(struct gl_context *ctx, struct pipe_resource *pt)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_transfer *transfer;

+   const GLuint rSize = ctx->PixelMaps.RtoR.Size;

+   const GLuint gSize = ctx->PixelMaps.GtoG.Size;

+   const GLuint bSize = ctx->PixelMaps.BtoB.Size;

+   const GLuint aSize = ctx->PixelMaps.AtoA.Size;

+   const uint texSize = pt->width0;

+   uint *dest;

+   uint i, j;

+

+   transfer = pipe_get_transfer(st_context(ctx)->pipe,

+                                pt, 0, 0, PIPE_TRANSFER_WRITE,

+                                0, 0, texSize, texSize);

+   dest = (uint *) pipe_transfer_map(pipe, transfer);

+

+   /* Pack four 1D maps into a 2D texture:

+    * R map is placed horizontally, indexed by S, in channel 0

+    * G map is placed vertically, indexed by T, in channel 1

+    * B map is placed horizontally, indexed by S, in channel 2

+    * A map is placed vertically, indexed by T, in channel 3

+    */

+   for (i = 0; i < texSize; i++) {

+      for (j = 0; j < texSize; j++) {

+         union util_color uc;

+         int k = (i * texSize + j);

+         ubyte r = ctx->PixelMaps.RtoR.Map8[j * rSize / texSize];

+         ubyte g = ctx->PixelMaps.GtoG.Map8[i * gSize / texSize];

+         ubyte b = ctx->PixelMaps.BtoB.Map8[j * bSize / texSize];

+         ubyte a = ctx->PixelMaps.AtoA.Map8[i * aSize / texSize];

+         util_pack_color_ub(r, g, b, a, pt->format, &uc);

+         *(dest + k) = uc.ui;

+      }

+   }

+

+   pipe_transfer_unmap(pipe, transfer);

+   pipe->transfer_destroy(pipe, transfer);

+}

+

+

+

+#define MAX_INST 100

+

+/**

+ * Returns a fragment program which implements the current pixel transfer ops.

+ */

+static struct gl_fragment_program *

+get_pixel_transfer_program(struct gl_context *ctx, const struct state_key *key)

+{

+   struct st_context *st = st_context(ctx);

+   struct prog_instruction inst[MAX_INST];

+   struct gl_program_parameter_list *params;

+   struct gl_fragment_program *fp;

+   GLuint ic = 0;

+   const GLuint colorTemp = 0;

+

+   fp = (struct gl_fragment_program *)

+      ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);

+   if (!fp)

+      return NULL;

+

+   params = _mesa_new_parameter_list();

+

+   /*

+    * Get initial pixel color from the texture.

+    * TEX colorTemp, fragment.texcoord[0], texture[0], 2D;

+    */

+   _mesa_init_instructions(inst + ic, 1);

+   inst[ic].Opcode = OPCODE_TEX;

+   inst[ic].DstReg.File = PROGRAM_TEMPORARY;

+   inst[ic].DstReg.Index = colorTemp;

+   inst[ic].SrcReg[0].File = PROGRAM_INPUT;

+   inst[ic].SrcReg[0].Index = FRAG_ATTRIB_TEX0;

+   inst[ic].TexSrcUnit = 0;

+   inst[ic].TexSrcTarget = TEXTURE_2D_INDEX;

+   ic++;

+   fp->Base.InputsRead = (1 << FRAG_ATTRIB_TEX0);

+   fp->Base.OutputsWritten = BITFIELD64_BIT(FRAG_RESULT_COLOR);

+   fp->Base.SamplersUsed = 0x1;  /* sampler 0 (bit 0) is used */

+

+   if (key->scaleAndBias) {

+      static const gl_state_index scale_state[STATE_LENGTH] =

+         { STATE_INTERNAL, STATE_PT_SCALE, 0, 0, 0 };

+      static const gl_state_index bias_state[STATE_LENGTH] =

+         { STATE_INTERNAL, STATE_PT_BIAS, 0, 0, 0 };

+      GLfloat scale[4], bias[4];

+      GLint scale_p, bias_p;

+

+      scale[0] = ctx->Pixel.RedScale;

+      scale[1] = ctx->Pixel.GreenScale;

+      scale[2] = ctx->Pixel.BlueScale;

+      scale[3] = ctx->Pixel.AlphaScale;

+      bias[0] = ctx->Pixel.RedBias;

+      bias[1] = ctx->Pixel.GreenBias;

+      bias[2] = ctx->Pixel.BlueBias;

+      bias[3] = ctx->Pixel.AlphaBias;

+

+      scale_p = _mesa_add_state_reference(params, scale_state);

+      bias_p = _mesa_add_state_reference(params, bias_state);

+

+      /* MAD colorTemp, colorTemp, scale, bias; */

+      _mesa_init_instructions(inst + ic, 1);

+      inst[ic].Opcode = OPCODE_MAD;

+      inst[ic].DstReg.File = PROGRAM_TEMPORARY;

+      inst[ic].DstReg.Index = colorTemp;

+      inst[ic].SrcReg[0].File = PROGRAM_TEMPORARY;

+      inst[ic].SrcReg[0].Index = colorTemp;

+      inst[ic].SrcReg[1].File = PROGRAM_STATE_VAR;

+      inst[ic].SrcReg[1].Index = scale_p;

+      inst[ic].SrcReg[2].File = PROGRAM_STATE_VAR;

+      inst[ic].SrcReg[2].Index = bias_p;

+      ic++;

+   }

+

+   if (key->pixelMaps) {

+      const GLuint temp = 1;

+

+      /* create the colormap/texture now if not already done */

+      if (!st->pixel_xfer.pixelmap_texture) {

+         st->pixel_xfer.pixelmap_texture = create_color_map_texture(ctx);

+         st->pixel_xfer.pixelmap_sampler_view =

+            st_create_texture_sampler_view(st->pipe,

+                                           st->pixel_xfer.pixelmap_texture);

+      }

+

+      /* with a little effort, we can do four pixel map look-ups with

+       * two TEX instructions:

+       */

+

+      /* TEX temp.rg, colorTemp.rgba, texture[1], 2D; */

+      _mesa_init_instructions(inst + ic, 1);

+      inst[ic].Opcode = OPCODE_TEX;

+      inst[ic].DstReg.File = PROGRAM_TEMPORARY;

+      inst[ic].DstReg.Index = temp;

+      inst[ic].DstReg.WriteMask = WRITEMASK_XY; /* write R,G */

+      inst[ic].SrcReg[0].File = PROGRAM_TEMPORARY;

+      inst[ic].SrcReg[0].Index = colorTemp;

+      inst[ic].TexSrcUnit = 1;

+      inst[ic].TexSrcTarget = TEXTURE_2D_INDEX;

+      ic++;

+

+      /* TEX temp.ba, colorTemp.baba, texture[1], 2D; */

+      _mesa_init_instructions(inst + ic, 1);

+      inst[ic].Opcode = OPCODE_TEX;

+      inst[ic].DstReg.File = PROGRAM_TEMPORARY;

+      inst[ic].DstReg.Index = temp;

+      inst[ic].DstReg.WriteMask = WRITEMASK_ZW; /* write B,A */

+      inst[ic].SrcReg[0].File = PROGRAM_TEMPORARY;

+      inst[ic].SrcReg[0].Index = colorTemp;

+      inst[ic].SrcReg[0].Swizzle = MAKE_SWIZZLE4(SWIZZLE_Z, SWIZZLE_W,

+                                                 SWIZZLE_Z, SWIZZLE_W);

+      inst[ic].TexSrcUnit = 1;

+      inst[ic].TexSrcTarget = TEXTURE_2D_INDEX;

+      ic++;

+

+      /* MOV colorTemp, temp; */

+      _mesa_init_instructions(inst + ic, 1);

+      inst[ic].Opcode = OPCODE_MOV;

+      inst[ic].DstReg.File = PROGRAM_TEMPORARY;

+      inst[ic].DstReg.Index = colorTemp;

+      inst[ic].SrcReg[0].File = PROGRAM_TEMPORARY;

+      inst[ic].SrcReg[0].Index = temp;

+      ic++;

+

+      fp->Base.SamplersUsed |= (1 << 1);  /* sampler 1 is used */

+   }

+

+   /* Modify last instruction's dst reg to write to result.color */

+   {

+      struct prog_instruction *last = &inst[ic - 1];

+      last->DstReg.File = PROGRAM_OUTPUT;

+      last->DstReg.Index = FRAG_RESULT_COLOR;

+   }

+

+   /* END; */

+   _mesa_init_instructions(inst + ic, 1);

+   inst[ic].Opcode = OPCODE_END;

+   ic++;

+

+   assert(ic <= MAX_INST);

+

+

+   fp->Base.Instructions = _mesa_alloc_instructions(ic);

+   if (!fp->Base.Instructions) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY,

+                  "generating pixel transfer program");

+      return NULL;

+   }

+

+   _mesa_copy_instructions(fp->Base.Instructions, inst, ic);

+   fp->Base.NumInstructions = ic;

+   fp->Base.Parameters = params;

+

+#if 0

+   printf("========= pixel transfer prog\n");

+   _mesa_print_program(&fp->Base);

+   _mesa_print_parameter_list(fp->Base.Parameters);

+#endif

+

+   return fp;

+}

+

+

+

+/**

+ * Update st->pixel_xfer.program in response to new pixel-transfer state.

+ */

+static void

+update_pixel_transfer(struct st_context *st)

+{

+   struct gl_context *ctx = st->ctx;

+   struct state_key key;

+   struct gl_fragment_program *fp;

+

+   make_state_key(st->ctx, &key);

+

+   fp = (struct gl_fragment_program *)

+      _mesa_search_program_cache(st->pixel_xfer.cache, &key, sizeof(key));

+   if (!fp) {

+      fp = get_pixel_transfer_program(st->ctx, &key);

+      _mesa_program_cache_insert(st->ctx, st->pixel_xfer.cache,

+                                 &key, sizeof(key), &fp->Base);

+   }

+

+   if (ctx->Pixel.MapColorFlag) {

+      load_color_map_texture(ctx, st->pixel_xfer.pixelmap_texture);

+   }

+   st->pixel_xfer.pixelmap_enabled = ctx->Pixel.MapColorFlag;

+

+   st->pixel_xfer.program = (struct st_fragment_program *) fp;

+}

+

+

+

+const struct st_tracked_state st_update_pixel_transfer = {

+   "st_update_pixel_transfer",				/* name */

+   {							/* dirty */

+      _NEW_PIXEL,					/* mesa */

+      0,						/* st */

+   },

+   update_pixel_transfer				/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
index 250cbb226..89ee4ebca 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -1,280 +1,280 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  */
- 
-#include "main/macros.h"
-#include "st_context.h"
-#include "st_atom.h"
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "cso_cache/cso_context.h"
-
-
-static GLuint translate_fill( GLenum mode )
-{
-   switch (mode) {
-   case GL_POINT:
-      return PIPE_POLYGON_MODE_POINT;
-   case GL_LINE:
-      return PIPE_POLYGON_MODE_LINE;
-   case GL_FILL:
-      return PIPE_POLYGON_MODE_FILL;
-   default:
-      assert(0);
-      return 0;
-   }
-}
-
-
-
-static void update_raster_state( struct st_context *st )
-{
-   struct gl_context *ctx = st->ctx;
-   struct pipe_rasterizer_state *raster = &st->state.rasterizer;
-   const struct gl_vertex_program *vertProg = ctx->VertexProgram._Current;
-   const struct gl_fragment_program *fragProg = ctx->FragmentProgram._Current;
-   uint i;
-
-   memset(raster, 0, sizeof(*raster));
-
-   /* _NEW_POLYGON, _NEW_BUFFERS
-    */
-   {
-      raster->front_ccw = (ctx->Polygon.FrontFace == GL_CCW);
-
-      /*
-       * Gallium's surfaces are Y=0=TOP orientation.  OpenGL is the
-       * opposite.  Window system surfaces are Y=0=TOP.  Mesa's FBOs
-       * must match OpenGL conventions so FBOs use Y=0=BOTTOM.  In that
-       * case, we must invert Y and flip the notion of front vs. back.
-       */
-      if (st_fb_orientation(ctx->DrawBuffer) == Y_0_BOTTOM) {
-         /* Drawing to an FBO.  The viewport will be inverted. */
-         raster->front_ccw ^= 1;
-      }
-   }
-
-   /* _NEW_LIGHT
-    */
-   if (ctx->Light.ShadeModel == GL_FLAT)
-      raster->flatshade = 1;
-
-   if (ctx->Light.ProvokingVertex == GL_FIRST_VERTEX_CONVENTION_EXT)
-      raster->flatshade_first = 1;
-
-   /* _NEW_LIGHT | _NEW_PROGRAM
-    *
-    * Back-face colors can come from traditional lighting (when
-    * GL_LIGHT_MODEL_TWO_SIDE is set) or from vertex programs/shaders (when
-    * GL_VERTEX_PROGRAM_TWO_SIDE is set).  Note the logic here.
-    */
-   if (ctx->VertexProgram._Current) {
-      if (ctx->VertexProgram._Enabled ||
-          (ctx->Shader.CurrentVertexProgram &&
-           ctx->Shader.CurrentVertexProgram->LinkStatus)) {
-         /* user-defined vertex program or shader */
-         raster->light_twoside = ctx->VertexProgram.TwoSideEnabled;
-      }
-      else {
-         /* TNL-generated program */
-         raster->light_twoside = ctx->Light.Enabled && ctx->Light.Model.TwoSide;
-      }
-   }
-   else if (ctx->Light.Enabled && ctx->Light.Model.TwoSide) {
-      raster->light_twoside = 1;
-   }
-
-   raster->clamp_vertex_color = ctx->Light._ClampVertexColor;
-
-   /* _NEW_POLYGON
-    */
-   if (ctx->Polygon.CullFlag) {
-      switch (ctx->Polygon.CullFaceMode) {
-      case GL_FRONT:
-	 raster->cull_face = PIPE_FACE_FRONT;
-         break;
-      case GL_BACK:
-	 raster->cull_face = PIPE_FACE_BACK;
-         break;
-      case GL_FRONT_AND_BACK:
-	 raster->cull_face = PIPE_FACE_FRONT_AND_BACK;
-         break;
-      }
-   }
-   else {
-      raster->cull_face = PIPE_FACE_NONE;
-   }
-
-   /* _NEW_POLYGON
-    */
-   {
-      raster->fill_front = translate_fill( ctx->Polygon.FrontMode );
-      raster->fill_back = translate_fill( ctx->Polygon.BackMode );
-
-      /* Simplify when culling is active:
-       */
-      if (raster->cull_face & PIPE_FACE_FRONT) {
-	 raster->fill_front = raster->fill_back;
-      }
-      
-      if (raster->cull_face & PIPE_FACE_BACK) {
-	 raster->fill_back = raster->fill_front;
-      }
-   }
-
-   /* _NEW_POLYGON 
-    */
-   if (ctx->Polygon.OffsetUnits != 0.0 ||
-       ctx->Polygon.OffsetFactor != 0.0) {
-      raster->offset_point = ctx->Polygon.OffsetPoint;
-      raster->offset_line = ctx->Polygon.OffsetLine;
-      raster->offset_tri = ctx->Polygon.OffsetFill;
-   }
-
-   if (ctx->Polygon.OffsetPoint ||
-       ctx->Polygon.OffsetLine ||
-       ctx->Polygon.OffsetFill) {
-      raster->offset_units = ctx->Polygon.OffsetUnits;
-      raster->offset_scale = ctx->Polygon.OffsetFactor;
-   }
-
-   if (ctx->Polygon.SmoothFlag)
-      raster->poly_smooth = 1;
-
-   if (ctx->Polygon.StippleFlag)
-      raster->poly_stipple_enable = 1;
-
-   /* _NEW_POINT
-    */
-   raster->point_size = ctx->Point.Size;
-
-   if (!ctx->Point.PointSprite && ctx->Point.SmoothFlag)
-      raster->point_smooth = 1;
-
-   /* _NEW_POINT | _NEW_PROGRAM
-    */
-   if (ctx->Point.PointSprite) {
-      /* origin */
-      if ((ctx->Point.SpriteOrigin == GL_UPPER_LEFT) ^
-          (st_fb_orientation(ctx->DrawBuffer) == Y_0_BOTTOM))
-         raster->sprite_coord_mode = PIPE_SPRITE_COORD_UPPER_LEFT;
-      else 
-         raster->sprite_coord_mode = PIPE_SPRITE_COORD_LOWER_LEFT;
-
-      /* Coord replacement flags.  If bit 'k' is set that means
-       * that we need to replace GENERIC[k] attrib with an automatically
-       * computed texture coord.
-       */
-      for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
-         if (ctx->Point.CoordReplace[i]) {
-            raster->sprite_coord_enable |= 1 << i;
-         }
-      }
-      if (fragProg->Base.InputsRead & FRAG_BIT_PNTC) {
-         raster->sprite_coord_enable |=
-            1 << (FRAG_ATTRIB_PNTC - FRAG_ATTRIB_TEX0);
-      }
-
-      raster->point_quad_rasterization = 1;
-   }
-
-   /* ST_NEW_VERTEX_PROGRAM
-    */
-   if (vertProg) {
-      if (vertProg->Base.Id == 0) {
-         if (vertProg->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_PSIZ)) {
-            /* generated program which emits point size */
-            raster->point_size_per_vertex = TRUE;
-         }
-      }
-      else if (ctx->VertexProgram.PointSizeEnabled) {
-         /* user-defined program and GL_VERTEX_PROGRAM_POINT_SIZE set */
-         raster->point_size_per_vertex = ctx->VertexProgram.PointSizeEnabled;
-      }
-   }
-   if (!raster->point_size_per_vertex) {
-      /* clamp size now */
-      raster->point_size = CLAMP(ctx->Point.Size,
-                                 ctx->Point.MinSize,
-                                 ctx->Point.MaxSize);
-   }
-
-   /* _NEW_LINE
-    */
-   raster->line_smooth = ctx->Line.SmoothFlag;
-   if (ctx->Line.SmoothFlag) {
-      raster->line_width = CLAMP(ctx->Line.Width,
-                                ctx->Const.MinLineWidthAA,
-                                ctx->Const.MaxLineWidthAA);
-   }
-   else {
-      raster->line_width = CLAMP(ctx->Line.Width,
-                                ctx->Const.MinLineWidth,
-                                ctx->Const.MaxLineWidth);
-   }
-
-   raster->line_stipple_enable = ctx->Line.StippleFlag;
-   raster->line_stipple_pattern = ctx->Line.StipplePattern;
-   /* GL stipple factor is in [1,256], remap to [0, 255] here */
-   raster->line_stipple_factor = ctx->Line.StippleFactor - 1;
-
-   /* _NEW_MULTISAMPLE */
-   if (ctx->Multisample._Enabled || st->force_msaa)
-      raster->multisample = 1;
-
-   /* _NEW_SCISSOR */
-   if (ctx->Scissor.Enabled)
-      raster->scissor = 1;
-
-   /* _NEW_FRAG_CLAMP */
-   raster->clamp_fragment_color = ctx->Color._ClampFragmentColor;
-
-   raster->gl_rasterization_rules = 1;
-
-   cso_set_rasterizer(st->cso_context, raster);
-}
-
-const struct st_tracked_state st_update_rasterizer = {
-   "st_update_rasterizer",    /* name */
-   {
-      (_NEW_BUFFERS |
-       _NEW_LIGHT |
-       _NEW_LINE |
-       _NEW_MULTISAMPLE |
-       _NEW_POINT |
-       _NEW_POLYGON |
-       _NEW_PROGRAM |
-       _NEW_SCISSOR |
-       _NEW_FRAG_CLAMP),      /* mesa state dependencies*/
-      ST_NEW_VERTEX_PROGRAM,  /* state tracker dependencies */
-   },
-   update_raster_state     /* update function */
-};
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+ /*

+  * Authors:

+  *   Keith Whitwell <keith@tungstengraphics.com>

+  */

+ 

+#include "main/macros.h"

+#include "st_context.h"

+#include "st_atom.h"

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "cso_cache/cso_context.h"

+

+

+static GLuint translate_fill( GLenum mode )

+{

+   switch (mode) {

+   case GL_POINT:

+      return PIPE_POLYGON_MODE_POINT;

+   case GL_LINE:

+      return PIPE_POLYGON_MODE_LINE;

+   case GL_FILL:

+      return PIPE_POLYGON_MODE_FILL;

+   default:

+      assert(0);

+      return 0;

+   }

+}

+

+

+

+static void update_raster_state( struct st_context *st )

+{

+   struct gl_context *ctx = st->ctx;

+   struct pipe_rasterizer_state *raster = &st->state.rasterizer;

+   const struct gl_vertex_program *vertProg = ctx->VertexProgram._Current;

+   const struct gl_fragment_program *fragProg = ctx->FragmentProgram._Current;

+   uint i;

+

+   memset(raster, 0, sizeof(*raster));

+

+   /* _NEW_POLYGON, _NEW_BUFFERS

+    */

+   {

+      raster->front_ccw = (ctx->Polygon.FrontFace == GL_CCW);

+

+      /*

+       * Gallium's surfaces are Y=0=TOP orientation.  OpenGL is the

+       * opposite.  Window system surfaces are Y=0=TOP.  Mesa's FBOs

+       * must match OpenGL conventions so FBOs use Y=0=BOTTOM.  In that

+       * case, we must invert Y and flip the notion of front vs. back.

+       */

+      if (st_fb_orientation(ctx->DrawBuffer) == Y_0_BOTTOM) {

+         /* Drawing to an FBO.  The viewport will be inverted. */

+         raster->front_ccw ^= 1;

+      }

+   }

+

+   /* _NEW_LIGHT

+    */

+   if (ctx->Light.ShadeModel == GL_FLAT)

+      raster->flatshade = 1;

+

+   if (ctx->Light.ProvokingVertex == GL_FIRST_VERTEX_CONVENTION_EXT)

+      raster->flatshade_first = 1;

+

+   /* _NEW_LIGHT | _NEW_PROGRAM

+    *

+    * Back-face colors can come from traditional lighting (when

+    * GL_LIGHT_MODEL_TWO_SIDE is set) or from vertex programs/shaders (when

+    * GL_VERTEX_PROGRAM_TWO_SIDE is set).  Note the logic here.

+    */

+   if (ctx->VertexProgram._Current) {

+      if (ctx->VertexProgram._Enabled ||

+          (ctx->Shader.CurrentVertexProgram &&

+           ctx->Shader.CurrentVertexProgram->LinkStatus)) {

+         /* user-defined vertex program or shader */

+         raster->light_twoside = ctx->VertexProgram.TwoSideEnabled;

+      }

+      else {

+         /* TNL-generated program */

+         raster->light_twoside = ctx->Light.Enabled && ctx->Light.Model.TwoSide;

+      }

+   }

+   else if (ctx->Light.Enabled && ctx->Light.Model.TwoSide) {

+      raster->light_twoside = 1;

+   }

+

+   raster->clamp_vertex_color = ctx->Light._ClampVertexColor;

+

+   /* _NEW_POLYGON

+    */

+   if (ctx->Polygon.CullFlag) {

+      switch (ctx->Polygon.CullFaceMode) {

+      case GL_FRONT:

+	 raster->cull_face = PIPE_FACE_FRONT;

+         break;

+      case GL_BACK:

+	 raster->cull_face = PIPE_FACE_BACK;

+         break;

+      case GL_FRONT_AND_BACK:

+	 raster->cull_face = PIPE_FACE_FRONT_AND_BACK;

+         break;

+      }

+   }

+   else {

+      raster->cull_face = PIPE_FACE_NONE;

+   }

+

+   /* _NEW_POLYGON

+    */

+   {

+      raster->fill_front = translate_fill( ctx->Polygon.FrontMode );

+      raster->fill_back = translate_fill( ctx->Polygon.BackMode );

+

+      /* Simplify when culling is active:

+       */

+      if (raster->cull_face & PIPE_FACE_FRONT) {

+	 raster->fill_front = raster->fill_back;

+      }

+      

+      if (raster->cull_face & PIPE_FACE_BACK) {

+	 raster->fill_back = raster->fill_front;

+      }

+   }

+

+   /* _NEW_POLYGON 

+    */

+   if (ctx->Polygon.OffsetUnits != 0.0 ||

+       ctx->Polygon.OffsetFactor != 0.0) {

+      raster->offset_point = ctx->Polygon.OffsetPoint;

+      raster->offset_line = ctx->Polygon.OffsetLine;

+      raster->offset_tri = ctx->Polygon.OffsetFill;

+   }

+

+   if (ctx->Polygon.OffsetPoint ||

+       ctx->Polygon.OffsetLine ||

+       ctx->Polygon.OffsetFill) {

+      raster->offset_units = ctx->Polygon.OffsetUnits;

+      raster->offset_scale = ctx->Polygon.OffsetFactor;

+   }

+

+   if (ctx->Polygon.SmoothFlag)

+      raster->poly_smooth = 1;

+

+   if (ctx->Polygon.StippleFlag)

+      raster->poly_stipple_enable = 1;

+

+   /* _NEW_POINT

+    */

+   raster->point_size = ctx->Point.Size;

+

+   if (!ctx->Point.PointSprite && ctx->Point.SmoothFlag)

+      raster->point_smooth = 1;

+

+   /* _NEW_POINT | _NEW_PROGRAM

+    */

+   if (ctx->Point.PointSprite) {

+      /* origin */

+      if ((ctx->Point.SpriteOrigin == GL_UPPER_LEFT) ^

+          (st_fb_orientation(ctx->DrawBuffer) == Y_0_BOTTOM))

+         raster->sprite_coord_mode = PIPE_SPRITE_COORD_UPPER_LEFT;

+      else 

+         raster->sprite_coord_mode = PIPE_SPRITE_COORD_LOWER_LEFT;

+

+      /* Coord replacement flags.  If bit 'k' is set that means

+       * that we need to replace GENERIC[k] attrib with an automatically

+       * computed texture coord.

+       */

+      for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {

+         if (ctx->Point.CoordReplace[i]) {

+            raster->sprite_coord_enable |= 1 << i;

+         }

+      }

+      if (fragProg->Base.InputsRead & FRAG_BIT_PNTC) {

+         raster->sprite_coord_enable |=

+            1 << (FRAG_ATTRIB_PNTC - FRAG_ATTRIB_TEX0);

+      }

+

+      raster->point_quad_rasterization = 1;

+   }

+

+   /* ST_NEW_VERTEX_PROGRAM

+    */

+   if (vertProg) {

+      if (vertProg->Base.Id == 0) {

+         if (vertProg->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_PSIZ)) {

+            /* generated program which emits point size */

+            raster->point_size_per_vertex = TRUE;

+         }

+      }

+      else if (ctx->VertexProgram.PointSizeEnabled) {

+         /* user-defined program and GL_VERTEX_PROGRAM_POINT_SIZE set */

+         raster->point_size_per_vertex = ctx->VertexProgram.PointSizeEnabled;

+      }

+   }

+   if (!raster->point_size_per_vertex) {

+      /* clamp size now */

+      raster->point_size = CLAMP(ctx->Point.Size,

+                                 ctx->Point.MinSize,

+                                 ctx->Point.MaxSize);

+   }

+

+   /* _NEW_LINE

+    */

+   raster->line_smooth = ctx->Line.SmoothFlag;

+   if (ctx->Line.SmoothFlag) {

+      raster->line_width = CLAMP(ctx->Line.Width,

+                                ctx->Const.MinLineWidthAA,

+                                ctx->Const.MaxLineWidthAA);

+   }

+   else {

+      raster->line_width = CLAMP(ctx->Line.Width,

+                                ctx->Const.MinLineWidth,

+                                ctx->Const.MaxLineWidth);

+   }

+

+   raster->line_stipple_enable = ctx->Line.StippleFlag;

+   raster->line_stipple_pattern = ctx->Line.StipplePattern;

+   /* GL stipple factor is in [1,256], remap to [0, 255] here */

+   raster->line_stipple_factor = ctx->Line.StippleFactor - 1;

+

+   /* _NEW_MULTISAMPLE */

+   if (ctx->Multisample._Enabled || st->force_msaa)

+      raster->multisample = 1;

+

+   /* _NEW_SCISSOR */

+   if (ctx->Scissor.Enabled)

+      raster->scissor = 1;

+

+   /* _NEW_FRAG_CLAMP */

+   raster->clamp_fragment_color = ctx->Color._ClampFragmentColor;

+

+   raster->gl_rasterization_rules = 1;

+

+   cso_set_rasterizer(st->cso_context, raster);

+}

+

+const struct st_tracked_state st_update_rasterizer = {

+   "st_update_rasterizer",    /* name */

+   {

+      (_NEW_BUFFERS |

+       _NEW_LIGHT |

+       _NEW_LINE |

+       _NEW_MULTISAMPLE |

+       _NEW_POINT |

+       _NEW_POLYGON |

+       _NEW_PROGRAM |

+       _NEW_SCISSOR |

+       _NEW_FRAG_CLAMP),      /* mesa state dependencies*/

+      ST_NEW_VERTEX_PROGRAM,  /* state tracker dependencies */

+   },

+   update_raster_state     /* update function */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_cb_blit.c b/mesalib/src/mesa/state_tracker/st_cb_blit.c
index 25c95c7b9..4c3d561a4 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_blit.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_blit.c
@@ -1,211 +1,211 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
- /*
-  * Authors:
-  *   Brian Paul
-  */
-
-#include "main/imports.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-
-#include "st_context.h"
-#include "st_texture.h"
-#include "st_cb_blit.h"
-#include "st_cb_fbo.h"
-#include "st_atom.h"
-
-#include "util/u_blit.h"
-
-
-void
-st_init_blit(struct st_context *st)
-{
-   st->blit = util_create_blit(st->pipe, st->cso_context);
-}
-
-
-void
-st_destroy_blit(struct st_context *st)
-{
-   util_destroy_blit(st->blit);
-   st->blit = NULL;
-}
-
-
-#if FEATURE_EXT_framebuffer_blit
-
-static void
-st_BlitFramebuffer(struct gl_context *ctx,
-                   GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                   GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                   GLbitfield mask, GLenum filter)
-{
-   const GLbitfield depthStencil = (GL_DEPTH_BUFFER_BIT |
-                                    GL_STENCIL_BUFFER_BIT);
-   struct st_context *st = st_context(ctx);
-   const uint pFilter = ((filter == GL_NEAREST)
-                         ? PIPE_TEX_MIPFILTER_NEAREST
-                         : PIPE_TEX_MIPFILTER_LINEAR);
-   struct gl_framebuffer *readFB = ctx->ReadBuffer;
-   struct gl_framebuffer *drawFB = ctx->DrawBuffer;
-
-   st_validate_state(st);
-
-   if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,
-                        &dstX0, &dstY0, &dstX1, &dstY1)) {
-      return; /* nothing to draw/blit */
-   }
-
-   if (st_fb_orientation(drawFB) == Y_0_TOP) {
-      /* invert Y for dest */
-      dstY0 = drawFB->Height - dstY0;
-      dstY1 = drawFB->Height - dstY1;
-   }
-
-   if (st_fb_orientation(readFB) == Y_0_TOP) {
-      /* invert Y for src */
-      srcY0 = readFB->Height - srcY0;
-      srcY1 = readFB->Height - srcY1;
-   }
-
-   if (srcY0 > srcY1 && dstY0 > dstY1) {
-      /* Both src and dst are upside down.  Swap Y to make it
-       * right-side up to increase odds of using a fast path.
-       * Recall that all Gallium raster coords have Y=0=top.
-       */
-      GLint tmp;
-      tmp = srcY0;
-      srcY0 = srcY1;
-      srcY1 = tmp;
-      tmp = dstY0;
-      dstY0 = dstY1;
-      dstY1 = tmp;
-   }
-
-   if (mask & GL_COLOR_BUFFER_BIT) {
-      struct gl_renderbuffer_attachment *srcAtt =
-         &readFB->Attachment[readFB->_ColorReadBufferIndex];
-
-      if(srcAtt->Type == GL_TEXTURE) {
-         struct st_texture_object *srcObj =
-            st_texture_object(srcAtt->Texture);
-         struct st_renderbuffer *dstRb =
-            st_renderbuffer(drawFB->_ColorDrawBuffers[0]);
-         struct pipe_surface *dstSurf = dstRb->surface;
-
-         if (!srcObj->pt)
-            return;
-
-         util_blit_pixels(st->blit, srcObj->pt, srcAtt->TextureLevel,
-                          srcX0, srcY0, srcX1, srcY1,
-                          srcAtt->Zoffset + srcAtt->CubeMapFace,
-                          dstSurf, dstX0, dstY0, dstX1, dstY1,
-                          0.0, pFilter);
-      }
-      else {
-         struct st_renderbuffer *srcRb =
-            st_renderbuffer(readFB->_ColorReadBuffer);
-         struct st_renderbuffer *dstRb =
-            st_renderbuffer(drawFB->_ColorDrawBuffers[0]);
-         struct pipe_surface *srcSurf = srcRb->surface;
-         struct pipe_surface *dstSurf = dstRb->surface;
-
-         util_blit_pixels(st->blit,
-                          srcRb->texture, srcSurf->u.tex.level,
-                          srcX0, srcY0, srcX1, srcY1,
-                          srcSurf->u.tex.first_layer,
-                          dstSurf, dstX0, dstY0, dstX1, dstY1,
-                          0.0, pFilter);
-      }
-   }
-
-   if (mask & depthStencil) {
-      /* depth and/or stencil blit */
-
-      /* get src/dst depth surfaces */
-      struct gl_renderbuffer_attachment *srcDepth =
-         &readFB->Attachment[BUFFER_DEPTH];
-      struct gl_renderbuffer_attachment *dstDepth =
-         &drawFB->Attachment[BUFFER_DEPTH];
-      struct gl_renderbuffer_attachment *srcStencil =
-         &readFB->Attachment[BUFFER_STENCIL];
-      struct gl_renderbuffer_attachment *dstStencil =
-         &drawFB->Attachment[BUFFER_STENCIL];
-
-      struct st_renderbuffer *srcDepthRb =
-         st_renderbuffer(readFB->Attachment[BUFFER_DEPTH].Renderbuffer);
-      struct st_renderbuffer *dstDepthRb = 
-         st_renderbuffer(drawFB->Attachment[BUFFER_DEPTH].Renderbuffer);
-      struct pipe_surface *dstDepthSurf =
-         dstDepthRb ? dstDepthRb->surface : NULL;
-
-      if ((mask & depthStencil) == depthStencil &&
-          st_is_depth_stencil_combined(srcDepth, srcStencil) &&
-          st_is_depth_stencil_combined(dstDepth, dstStencil)) {
-
-         /* Blitting depth and stencil values between combined
-          * depth/stencil buffers.  This is the ideal case for such buffers.
-          */
-         util_blit_pixels(st->blit,
-                          srcDepthRb->texture,
-                          srcDepthRb->surface->u.tex.level,
-                          srcX0, srcY0, srcX1, srcY1,
-                          srcDepthRb->surface->u.tex.first_layer,
-                          dstDepthSurf, dstX0, dstY0, dstX1, dstY1,
-                          0.0, pFilter);
-      }
-      else {
-         /* blitting depth and stencil separately */
-
-         if (mask & GL_DEPTH_BUFFER_BIT) {
-            util_blit_pixels(st->blit, srcDepthRb->texture,
-                             srcDepthRb->surface->u.tex.level,
-                             srcX0, srcY0, srcX1, srcY1,
-                             srcDepthRb->surface->u.tex.first_layer,
-                             dstDepthSurf, dstX0, dstY0, dstX1, dstY1,
-                             0.0, pFilter);
-         }
-
-         if (mask & GL_STENCIL_BUFFER_BIT) {
-            /* blit stencil only */
-            _mesa_problem(ctx, "st_BlitFramebuffer(STENCIL) not completed");
-         }
-      }
-   }
-}
-
-
-void
-st_init_blit_functions(struct dd_function_table *functions)
-{
-   functions->BlitFramebuffer = st_BlitFramebuffer;
-}
-
-#endif /* FEATURE_EXT_framebuffer_blit */
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+ /*

+  * Authors:

+  *   Brian Paul

+  */

+

+#include "main/imports.h"

+#include "main/image.h"

+#include "main/macros.h"

+#include "main/mfeatures.h"

+

+#include "st_context.h"

+#include "st_texture.h"

+#include "st_cb_blit.h"

+#include "st_cb_fbo.h"

+#include "st_atom.h"

+

+#include "util/u_blit.h"

+

+

+void

+st_init_blit(struct st_context *st)

+{

+   st->blit = util_create_blit(st->pipe, st->cso_context);

+}

+

+

+void

+st_destroy_blit(struct st_context *st)

+{

+   util_destroy_blit(st->blit);

+   st->blit = NULL;

+}

+

+

+#if FEATURE_EXT_framebuffer_blit

+

+static void

+st_BlitFramebuffer(struct gl_context *ctx,

+                   GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

+                   GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

+                   GLbitfield mask, GLenum filter)

+{

+   const GLbitfield depthStencil = (GL_DEPTH_BUFFER_BIT |

+                                    GL_STENCIL_BUFFER_BIT);

+   struct st_context *st = st_context(ctx);

+   const uint pFilter = ((filter == GL_NEAREST)

+                         ? PIPE_TEX_MIPFILTER_NEAREST

+                         : PIPE_TEX_MIPFILTER_LINEAR);

+   struct gl_framebuffer *readFB = ctx->ReadBuffer;

+   struct gl_framebuffer *drawFB = ctx->DrawBuffer;

+

+   st_validate_state(st);

+

+   if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,

+                        &dstX0, &dstY0, &dstX1, &dstY1)) {

+      return; /* nothing to draw/blit */

+   }

+

+   if (st_fb_orientation(drawFB) == Y_0_TOP) {

+      /* invert Y for dest */

+      dstY0 = drawFB->Height - dstY0;

+      dstY1 = drawFB->Height - dstY1;

+   }

+

+   if (st_fb_orientation(readFB) == Y_0_TOP) {

+      /* invert Y for src */

+      srcY0 = readFB->Height - srcY0;

+      srcY1 = readFB->Height - srcY1;

+   }

+

+   if (srcY0 > srcY1 && dstY0 > dstY1) {

+      /* Both src and dst are upside down.  Swap Y to make it

+       * right-side up to increase odds of using a fast path.

+       * Recall that all Gallium raster coords have Y=0=top.

+       */

+      GLint tmp;

+      tmp = srcY0;

+      srcY0 = srcY1;

+      srcY1 = tmp;

+      tmp = dstY0;

+      dstY0 = dstY1;

+      dstY1 = tmp;

+   }

+

+   if (mask & GL_COLOR_BUFFER_BIT) {

+      struct gl_renderbuffer_attachment *srcAtt =

+         &readFB->Attachment[readFB->_ColorReadBufferIndex];

+

+      if(srcAtt->Type == GL_TEXTURE) {

+         struct st_texture_object *srcObj =

+            st_texture_object(srcAtt->Texture);

+         struct st_renderbuffer *dstRb =

+            st_renderbuffer(drawFB->_ColorDrawBuffers[0]);

+         struct pipe_surface *dstSurf = dstRb->surface;

+

+         if (!srcObj->pt)

+            return;

+

+         util_blit_pixels(st->blit, srcObj->pt, srcAtt->TextureLevel,

+                          srcX0, srcY0, srcX1, srcY1,

+                          srcAtt->Zoffset + srcAtt->CubeMapFace,

+                          dstSurf, dstX0, dstY0, dstX1, dstY1,

+                          0.0, pFilter);

+      }

+      else {

+         struct st_renderbuffer *srcRb =

+            st_renderbuffer(readFB->_ColorReadBuffer);

+         struct st_renderbuffer *dstRb =

+            st_renderbuffer(drawFB->_ColorDrawBuffers[0]);

+         struct pipe_surface *srcSurf = srcRb->surface;

+         struct pipe_surface *dstSurf = dstRb->surface;

+

+         util_blit_pixels(st->blit,

+                          srcRb->texture, srcSurf->u.tex.level,

+                          srcX0, srcY0, srcX1, srcY1,

+                          srcSurf->u.tex.first_layer,

+                          dstSurf, dstX0, dstY0, dstX1, dstY1,

+                          0.0, pFilter);

+      }

+   }

+

+   if (mask & depthStencil) {

+      /* depth and/or stencil blit */

+

+      /* get src/dst depth surfaces */

+      struct gl_renderbuffer_attachment *srcDepth =

+         &readFB->Attachment[BUFFER_DEPTH];

+      struct gl_renderbuffer_attachment *dstDepth =

+         &drawFB->Attachment[BUFFER_DEPTH];

+      struct gl_renderbuffer_attachment *srcStencil =

+         &readFB->Attachment[BUFFER_STENCIL];

+      struct gl_renderbuffer_attachment *dstStencil =

+         &drawFB->Attachment[BUFFER_STENCIL];

+

+      struct st_renderbuffer *srcDepthRb =

+         st_renderbuffer(readFB->Attachment[BUFFER_DEPTH].Renderbuffer);

+      struct st_renderbuffer *dstDepthRb = 

+         st_renderbuffer(drawFB->Attachment[BUFFER_DEPTH].Renderbuffer);

+      struct pipe_surface *dstDepthSurf =

+         dstDepthRb ? dstDepthRb->surface : NULL;

+

+      if ((mask & depthStencil) == depthStencil &&

+          st_is_depth_stencil_combined(srcDepth, srcStencil) &&

+          st_is_depth_stencil_combined(dstDepth, dstStencil)) {

+

+         /* Blitting depth and stencil values between combined

+          * depth/stencil buffers.  This is the ideal case for such buffers.

+          */

+         util_blit_pixels(st->blit,

+                          srcDepthRb->texture,

+                          srcDepthRb->surface->u.tex.level,

+                          srcX0, srcY0, srcX1, srcY1,

+                          srcDepthRb->surface->u.tex.first_layer,

+                          dstDepthSurf, dstX0, dstY0, dstX1, dstY1,

+                          0.0, pFilter);

+      }

+      else {

+         /* blitting depth and stencil separately */

+

+         if (mask & GL_DEPTH_BUFFER_BIT) {

+            util_blit_pixels(st->blit, srcDepthRb->texture,

+                             srcDepthRb->surface->u.tex.level,

+                             srcX0, srcY0, srcX1, srcY1,

+                             srcDepthRb->surface->u.tex.first_layer,

+                             dstDepthSurf, dstX0, dstY0, dstX1, dstY1,

+                             0.0, pFilter);

+         }

+

+         if (mask & GL_STENCIL_BUFFER_BIT) {

+            /* blit stencil only */

+            _mesa_problem(ctx, "st_BlitFramebuffer(STENCIL) not completed");

+         }

+      }

+   }

+}

+

+

+void

+st_init_blit_functions(struct dd_function_table *functions)

+{

+   functions->BlitFramebuffer = st_BlitFramebuffer;

+}

+

+#endif /* FEATURE_EXT_framebuffer_blit */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_clear.c b/mesalib/src/mesa/state_tracker/st_cb_clear.c
index 181fedd2b..31dcaf681 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_clear.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_clear.c
@@ -1,601 +1,601 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * Copyright 2009 VMware, Inc.  All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  *   Brian Paul
-  *   Michel Dänzer
-  */
-
-#include "main/glheader.h"
-#include "main/formats.h"
-#include "main/macros.h"
-#include "program/prog_instruction.h"
-#include "st_context.h"
-#include "st_atom.h"
-#include "st_cb_accum.h"
-#include "st_cb_clear.h"
-#include "st_cb_fbo.h"
-#include "st_format.h"
-#include "st_program.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_shader_tokens.h"
-#include "pipe/p_state.h"
-#include "pipe/p_defines.h"
-#include "util/u_format.h"
-#include "util/u_inlines.h"
-#include "util/u_simple_shaders.h"
-#include "util/u_draw_quad.h"
-
-#include "cso_cache/cso_context.h"
-
-
-/**
- * Do per-context initialization for glClear.
- */
-void
-st_init_clear(struct st_context *st)
-{
-   struct pipe_screen *pscreen = st->pipe->screen;
-
-   memset(&st->clear, 0, sizeof(st->clear));
-
-   st->clear.raster.gl_rasterization_rules = 1;
-   st->clear.enable_ds_separate = pscreen->get_param(pscreen, PIPE_CAP_DEPTHSTENCIL_CLEAR_SEPARATE);
-}
-
-
-/**
- * Free per-context state for glClear.
- */
-void
-st_destroy_clear(struct st_context *st)
-{
-   if (st->clear.fs) {
-      cso_delete_fragment_shader(st->cso_context, st->clear.fs);
-      st->clear.fs = NULL;
-   }
-   if (st->clear.vs) {
-      cso_delete_vertex_shader(st->cso_context, st->clear.vs);
-      st->clear.vs = NULL;
-   }
-   if (st->clear.vbuf) {
-      pipe_resource_reference(&st->clear.vbuf, NULL);
-      st->clear.vbuf = NULL;
-   }
-}
-
-
-/**
- * Helper function to set the fragment shaders.
- */
-static INLINE void
-set_fragment_shader(struct st_context *st)
-{
-   if (!st->clear.fs)
-      st->clear.fs = util_make_fragment_passthrough_shader(st->pipe);
-
-   cso_set_fragment_shader_handle(st->cso_context, st->clear.fs);
-}
-
-
-/**
- * Helper function to set the vertex shader.
- */
-static INLINE void
-set_vertex_shader(struct st_context *st)
-{
-   /* vertex shader - still required to provide the linkage between
-    * fragment shader input semantics and vertex_element/buffers.
-    */
-   if (!st->clear.vs)
-   {
-      const uint semantic_names[] = { TGSI_SEMANTIC_POSITION,
-                                      TGSI_SEMANTIC_COLOR };
-      const uint semantic_indexes[] = { 0, 0 };
-      st->clear.vs = util_make_vertex_passthrough_shader(st->pipe, 2,
-                                                         semantic_names,
-                                                         semantic_indexes);
-   }
-
-   cso_set_vertex_shader_handle(st->cso_context, st->clear.vs);
-}
-
-
-/**
- * Draw a screen-aligned quadrilateral.
- * Coords are clip coords with y=0=bottom.
- */
-static void
-draw_quad(struct st_context *st,
-          float x0, float y0, float x1, float y1, GLfloat z,
-          const GLfloat color[4])
-{
-   struct pipe_context *pipe = st->pipe;
-
-   /* XXX: Need to improve buffer_write to allow NO_WAIT (as well as
-    * no_flush) updates to buffers where we know there is no conflict
-    * with previous data.  Currently using max_slots > 1 will cause
-    * synchronous rendering if the driver flushes its command buffers
-    * between one bitmap and the next.  Our flush hook below isn't
-    * sufficient to catch this as the driver doesn't tell us when it
-    * flushes its own command buffers.  Until this gets fixed, pay the
-    * price of allocating a new buffer for each bitmap cache-flush to
-    * avoid synchronous rendering.
-    */
-   const GLuint max_slots = 1; /* 1024 / sizeof(st->clear.vertices); */
-   GLuint i;
-
-   if (st->clear.vbuf_slot >= max_slots) {
-      pipe_resource_reference(&st->clear.vbuf, NULL);
-      st->clear.vbuf_slot = 0;
-   }
-
-   if (!st->clear.vbuf) {
-      st->clear.vbuf = pipe_buffer_create(pipe->screen,
-                                          PIPE_BIND_VERTEX_BUFFER,
-                                          PIPE_USAGE_STREAM,
-                                          max_slots * sizeof(st->clear.vertices));
-   }
-
-   /* positions */
-   st->clear.vertices[0][0][0] = x0;
-   st->clear.vertices[0][0][1] = y0;
-
-   st->clear.vertices[1][0][0] = x1;
-   st->clear.vertices[1][0][1] = y0;
-
-   st->clear.vertices[2][0][0] = x1;
-   st->clear.vertices[2][0][1] = y1;
-
-   st->clear.vertices[3][0][0] = x0;
-   st->clear.vertices[3][0][1] = y1;
-
-   /* same for all verts: */
-   for (i = 0; i < 4; i++) {
-      st->clear.vertices[i][0][2] = z;
-      st->clear.vertices[i][0][3] = 1.0;
-      st->clear.vertices[i][1][0] = color[0];
-      st->clear.vertices[i][1][1] = color[1];
-      st->clear.vertices[i][1][2] = color[2];
-      st->clear.vertices[i][1][3] = color[3];
-   }
-
-   /* put vertex data into vbuf */
-   pipe_buffer_write_nooverlap(st->pipe, st->clear.vbuf,
-                                           st->clear.vbuf_slot
-                                             * sizeof(st->clear.vertices),
-                                           sizeof(st->clear.vertices),
-                                           st->clear.vertices);
-
-   /* draw */
-   util_draw_vertex_buffer(pipe,
-                           st->cso_context,
-                           st->clear.vbuf, 
-                           st->clear.vbuf_slot * sizeof(st->clear.vertices),
-                           PIPE_PRIM_TRIANGLE_FAN,
-                           4,  /* verts */
-                           2); /* attribs/vert */
-
-   /* Increment slot */
-   st->clear.vbuf_slot++;
-}
-
-
-
-/**
- * Do glClear by drawing a quadrilateral.
- * The vertices of the quad will be computed from the
- * ctx->DrawBuffer->_X/Ymin/max fields.
- */
-static void
-clear_with_quad(struct gl_context *ctx,
-                GLboolean color, GLboolean depth, GLboolean stencil)
-{
-   struct st_context *st = st_context(ctx);
-   const struct gl_framebuffer *fb = ctx->DrawBuffer;
-   const GLfloat fb_width = (GLfloat) fb->Width;
-   const GLfloat fb_height = (GLfloat) fb->Height;
-   const GLfloat x0 = (GLfloat) ctx->DrawBuffer->_Xmin / fb_width * 2.0f - 1.0f;
-   const GLfloat x1 = (GLfloat) ctx->DrawBuffer->_Xmax / fb_width * 2.0f - 1.0f;
-   const GLfloat y0 = (GLfloat) ctx->DrawBuffer->_Ymin / fb_height * 2.0f - 1.0f;
-   const GLfloat y1 = (GLfloat) ctx->DrawBuffer->_Ymax / fb_height * 2.0f - 1.0f;
-   float clearColor[4];
-
-   /*
-   printf("%s %s%s%s %f,%f %f,%f\n", __FUNCTION__, 
-	  color ? "color, " : "",
-	  depth ? "depth, " : "",
-	  stencil ? "stencil" : "",
-	  x0, y0,
-	  x1, y1);
-   */
-
-   cso_save_blend(st->cso_context);
-   cso_save_stencil_ref(st->cso_context);
-   cso_save_depth_stencil_alpha(st->cso_context);
-   cso_save_rasterizer(st->cso_context);
-   cso_save_viewport(st->cso_context);
-   cso_save_clip(st->cso_context);
-   cso_save_fragment_shader(st->cso_context);
-   cso_save_vertex_shader(st->cso_context);
-   cso_save_vertex_elements(st->cso_context);
-   cso_save_vertex_buffers(st->cso_context);
-
-   /* blend state: RGBA masking */
-   {
-      struct pipe_blend_state blend;
-      memset(&blend, 0, sizeof(blend));
-      blend.rt[0].rgb_src_factor = PIPE_BLENDFACTOR_ONE;
-      blend.rt[0].alpha_src_factor = PIPE_BLENDFACTOR_ONE;
-      blend.rt[0].rgb_dst_factor = PIPE_BLENDFACTOR_ZERO;
-      blend.rt[0].alpha_dst_factor = PIPE_BLENDFACTOR_ZERO;
-      if (color) {
-         if (ctx->Color.ColorMask[0][0])
-            blend.rt[0].colormask |= PIPE_MASK_R;
-         if (ctx->Color.ColorMask[0][1])
-            blend.rt[0].colormask |= PIPE_MASK_G;
-         if (ctx->Color.ColorMask[0][2])
-            blend.rt[0].colormask |= PIPE_MASK_B;
-         if (ctx->Color.ColorMask[0][3])
-            blend.rt[0].colormask |= PIPE_MASK_A;
-         if (st->ctx->Color.DitherFlag)
-            blend.dither = 1;
-      }
-      cso_set_blend(st->cso_context, &blend);
-   }
-
-   /* depth_stencil state: always pass/set to ref value */
-   {
-      struct pipe_depth_stencil_alpha_state depth_stencil;
-      memset(&depth_stencil, 0, sizeof(depth_stencil));
-      if (depth) {
-         depth_stencil.depth.enabled = 1;
-         depth_stencil.depth.writemask = 1;
-         depth_stencil.depth.func = PIPE_FUNC_ALWAYS;
-      }
-
-      if (stencil) {
-         struct pipe_stencil_ref stencil_ref;
-         memset(&stencil_ref, 0, sizeof(stencil_ref));
-         depth_stencil.stencil[0].enabled = 1;
-         depth_stencil.stencil[0].func = PIPE_FUNC_ALWAYS;
-         depth_stencil.stencil[0].fail_op = PIPE_STENCIL_OP_REPLACE;
-         depth_stencil.stencil[0].zpass_op = PIPE_STENCIL_OP_REPLACE;
-         depth_stencil.stencil[0].zfail_op = PIPE_STENCIL_OP_REPLACE;
-         depth_stencil.stencil[0].valuemask = 0xff;
-         depth_stencil.stencil[0].writemask = ctx->Stencil.WriteMask[0] & 0xff;
-         stencil_ref.ref_value[0] = ctx->Stencil.Clear;
-         cso_set_stencil_ref(st->cso_context, &stencil_ref);
-      }
-
-      cso_set_depth_stencil_alpha(st->cso_context, &depth_stencil);
-   }
-
-   cso_set_vertex_elements(st->cso_context, 2, st->velems_util_draw);
-
-   cso_set_rasterizer(st->cso_context, &st->clear.raster);
-
-   /* viewport state: viewport matching window dims */
-   {
-      const GLboolean invert = (st_fb_orientation(fb) == Y_0_TOP);
-      struct pipe_viewport_state vp;
-      vp.scale[0] = 0.5f * fb_width;
-      vp.scale[1] = fb_height * (invert ? -0.5f : 0.5f);
-      vp.scale[2] = 1.0f;
-      vp.scale[3] = 1.0f;
-      vp.translate[0] = 0.5f * fb_width;
-      vp.translate[1] = 0.5f * fb_height;
-      vp.translate[2] = 0.0f;
-      vp.translate[3] = 0.0f;
-      cso_set_viewport(st->cso_context, &vp);
-   }
-
-   cso_set_clip(st->cso_context, &st->clear.clip);
-   set_fragment_shader(st);
-   set_vertex_shader(st);
-
-   if (ctx->DrawBuffer->_ColorDrawBuffers[0]) {
-      st_translate_color(ctx->Color.ClearColorUnclamped,
-                         ctx->DrawBuffer->_ColorDrawBuffers[0]->_BaseFormat,
-                         clearColor);
-   }
-
-   /* draw quad matching scissor rect */
-   draw_quad(st, x0, y0, x1, y1, (GLfloat) ctx->Depth.Clear, clearColor);
-
-   /* Restore pipe state */
-   cso_restore_blend(st->cso_context);
-   cso_restore_stencil_ref(st->cso_context);
-   cso_restore_depth_stencil_alpha(st->cso_context);
-   cso_restore_rasterizer(st->cso_context);
-   cso_restore_viewport(st->cso_context);
-   cso_restore_clip(st->cso_context);
-   cso_restore_fragment_shader(st->cso_context);
-   cso_restore_vertex_shader(st->cso_context);
-   cso_restore_vertex_elements(st->cso_context);
-   cso_restore_vertex_buffers(st->cso_context);
-}
-
-
-/**
- * Determine if we need to clear the depth buffer by drawing a quad.
- */
-static INLINE GLboolean
-check_clear_color_with_quad(struct gl_context *ctx, struct gl_renderbuffer *rb)
-{
-   if (ctx->Scissor.Enabled &&
-       (ctx->Scissor.X != 0 ||
-        ctx->Scissor.Y != 0 ||
-        ctx->Scissor.Width < rb->Width ||
-        ctx->Scissor.Height < rb->Height))
-      return GL_TRUE;
-
-   if (!ctx->Color.ColorMask[0][0] ||
-       !ctx->Color.ColorMask[0][1] ||
-       !ctx->Color.ColorMask[0][2] ||
-       !ctx->Color.ColorMask[0][3])
-      return GL_TRUE;
-
-   return GL_FALSE;
-}
-
-
-/**
- * Determine if we need to clear the combiend depth/stencil buffer by
- * drawing a quad.
- */
-static INLINE GLboolean
-check_clear_depth_stencil_with_quad(struct gl_context *ctx, struct gl_renderbuffer *rb)
-{
-   const GLuint stencilMax = 0xff;
-   GLboolean maskStencil
-      = (ctx->Stencil.WriteMask[0] & stencilMax) != stencilMax;
-
-   assert(rb->Format == MESA_FORMAT_S8 ||
-          rb->Format == MESA_FORMAT_Z24_S8 ||
-          rb->Format == MESA_FORMAT_S8_Z24);
-
-   if (ctx->Scissor.Enabled &&
-       (ctx->Scissor.X != 0 ||
-        ctx->Scissor.Y != 0 ||
-        ctx->Scissor.Width < rb->Width ||
-        ctx->Scissor.Height < rb->Height))
-      return GL_TRUE;
-
-   if (maskStencil)
-      return GL_TRUE;
-
-   return GL_FALSE;
-}
-
-
-/**
- * Determine if we need to clear the depth buffer by drawing a quad.
- */
-static INLINE GLboolean
-check_clear_depth_with_quad(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                            boolean ds_separate)
-{
-   const struct st_renderbuffer *strb = st_renderbuffer(rb);
-   const GLboolean isDS = util_format_is_depth_and_stencil(strb->surface->format);
-
-   if (ctx->Scissor.Enabled &&
-       (ctx->Scissor.X != 0 ||
-        ctx->Scissor.Y != 0 ||
-        ctx->Scissor.Width < rb->Width ||
-        ctx->Scissor.Height < rb->Height))
-      return GL_TRUE;
-
-   if (!ds_separate && isDS && ctx->DrawBuffer->Visual.stencilBits > 0)
-      return GL_TRUE;
-
-   return GL_FALSE;
-}
-
-
-/**
- * Determine if we need to clear the stencil buffer by drawing a quad.
- */
-static INLINE GLboolean
-check_clear_stencil_with_quad(struct gl_context *ctx, struct gl_renderbuffer *rb,
-                              boolean ds_separate)
-{
-   const struct st_renderbuffer *strb = st_renderbuffer(rb);
-   const GLboolean isDS = util_format_is_depth_and_stencil(strb->surface->format);
-   const GLuint stencilMax = 0xff;
-   const GLboolean maskStencil
-      = (ctx->Stencil.WriteMask[0] & stencilMax) != stencilMax;
-
-   assert(rb->Format == MESA_FORMAT_S8 ||
-          rb->Format == MESA_FORMAT_Z24_S8 ||
-          rb->Format == MESA_FORMAT_S8_Z24);
-
-   if (maskStencil) 
-      return GL_TRUE;
-
-   if (ctx->Scissor.Enabled &&
-       (ctx->Scissor.X != 0 ||
-        ctx->Scissor.Y != 0 ||
-        ctx->Scissor.Width < rb->Width ||
-        ctx->Scissor.Height < rb->Height))
-      return GL_TRUE;
-
-   /* This is correct, but it is necessary to look at the depth clear
-    * value held in the surface when it comes time to issue the clear,
-    * rather than taking depth and stencil clear values from the
-    * current state.
-    */
-   if (!ds_separate && isDS && ctx->DrawBuffer->Visual.depthBits > 0)
-      return GL_TRUE;
-
-   return GL_FALSE;
-}
-
-
-
-/**
- * Called when we need to flush.
- */
-void
-st_flush_clear(struct st_context *st)
-{
-   /* Release vertex buffer to avoid synchronous rendering if we were
-    * to map it in the next frame.
-    */
-   pipe_resource_reference(&st->clear.vbuf, NULL);
-   st->clear.vbuf_slot = 0;
-}
- 
-
-
-/**
- * Called via ctx->Driver.Clear()
- */
-static void
-st_Clear(struct gl_context *ctx, GLbitfield mask)
-{
-   static const GLbitfield BUFFER_BITS_DS
-      = (BUFFER_BIT_DEPTH | BUFFER_BIT_STENCIL);
-   struct st_context *st = st_context(ctx);
-   struct gl_renderbuffer *depthRb
-      = ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;
-   struct gl_renderbuffer *stencilRb
-      = ctx->DrawBuffer->Attachment[BUFFER_STENCIL].Renderbuffer;
-   GLbitfield quad_buffers = 0x0;
-   GLbitfield clear_buffers = 0x0;
-   GLuint i;
-
-   /* This makes sure the pipe has the latest scissor, etc values */
-   st_validate_state( st );
-
-   if (mask & BUFFER_BITS_COLOR) {
-      for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
-         GLuint b = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];
-
-         if (mask & (1 << b)) {
-            struct gl_renderbuffer *rb
-               = ctx->DrawBuffer->Attachment[b].Renderbuffer;
-            struct st_renderbuffer *strb = st_renderbuffer(rb);
-
-            if (!strb || !strb->surface)
-               continue;
-
-            if (check_clear_color_with_quad( ctx, rb ))
-               quad_buffers |= PIPE_CLEAR_COLOR;
-            else
-               clear_buffers |= PIPE_CLEAR_COLOR;
-         }
-      }
-   }
-
-   if ((mask & BUFFER_BITS_DS) == BUFFER_BITS_DS && depthRb == stencilRb) {
-      /* clearing combined depth + stencil */
-      struct st_renderbuffer *strb = st_renderbuffer(depthRb);
-
-      if (strb->surface) {
-         if (check_clear_depth_stencil_with_quad(ctx, depthRb))
-            quad_buffers |= PIPE_CLEAR_DEPTHSTENCIL;
-         else
-            clear_buffers |= PIPE_CLEAR_DEPTHSTENCIL;
-      }
-   }
-   else {
-      /* separate depth/stencil clears */
-      /* I don't think truly separate buffers are actually possible in gallium or hw? */
-      if (mask & BUFFER_BIT_DEPTH) {
-         struct st_renderbuffer *strb = st_renderbuffer(depthRb);
-
-         if (strb->surface) {
-            if (check_clear_depth_with_quad(ctx, depthRb,
-                                            st->clear.enable_ds_separate))
-               quad_buffers |= PIPE_CLEAR_DEPTH;
-            else
-               clear_buffers |= PIPE_CLEAR_DEPTH;
-         }
-      }
-      if (mask & BUFFER_BIT_STENCIL) {
-         struct st_renderbuffer *strb = st_renderbuffer(stencilRb);
-
-         if (strb->surface) {
-            if (check_clear_stencil_with_quad(ctx, stencilRb,
-                                              st->clear.enable_ds_separate))
-               quad_buffers |= PIPE_CLEAR_STENCIL;
-            else
-               clear_buffers |= PIPE_CLEAR_STENCIL;
-         }
-      }
-   }
-
-   /*
-    * If we're going to use clear_with_quad() for any reason, use it for
-    * everything possible.
-    */
-   if (quad_buffers) {
-      quad_buffers |= clear_buffers;
-      clear_with_quad(ctx,
-                      quad_buffers & PIPE_CLEAR_COLOR,
-                      quad_buffers & PIPE_CLEAR_DEPTH,
-                      quad_buffers & PIPE_CLEAR_STENCIL);
-   } else if (clear_buffers) {
-      /* driver cannot know it can clear everything if the buffer
-       * is a combined depth/stencil buffer but this wasn't actually
-       * required from the visual. Hence fix this up to avoid potential
-       * read-modify-write in the driver.
-       */
-      float clearColor[4];
-
-      if ((clear_buffers & PIPE_CLEAR_DEPTHSTENCIL) &&
-          ((clear_buffers & PIPE_CLEAR_DEPTHSTENCIL) != PIPE_CLEAR_DEPTHSTENCIL) &&
-          (depthRb == stencilRb) &&
-          (ctx->DrawBuffer->Visual.depthBits == 0 ||
-           ctx->DrawBuffer->Visual.stencilBits == 0))
-         clear_buffers |= PIPE_CLEAR_DEPTHSTENCIL;
-
-      if (ctx->DrawBuffer->_ColorDrawBuffers[0]) {
-         st_translate_color(ctx->Color.ClearColor,
-                            ctx->DrawBuffer->_ColorDrawBuffers[0]->_BaseFormat,
-                            clearColor);
-      }
-
-      st->pipe->clear(st->pipe, clear_buffers, ctx->Color.ClearColorUnclamped,
-                      ctx->Depth.Clear, ctx->Stencil.Clear);
-   }
-   if (mask & BUFFER_BIT_ACCUM)
-      st_clear_accum_buffer(ctx,
-                            ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer);
-}
-
-
-void
-st_init_clear_functions(struct dd_function_table *functions)
-{
-   functions->Clear = st_Clear;
-}
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * Copyright 2009 VMware, Inc.  All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+ /*

+  * Authors:

+  *   Keith Whitwell <keith@tungstengraphics.com>

+  *   Brian Paul

+  *   Michel Dänzer

+  */

+

+#include "main/glheader.h"

+#include "main/formats.h"

+#include "main/macros.h"

+#include "program/prog_instruction.h"

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_cb_accum.h"

+#include "st_cb_clear.h"

+#include "st_cb_fbo.h"

+#include "st_format.h"

+#include "st_program.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_shader_tokens.h"

+#include "pipe/p_state.h"

+#include "pipe/p_defines.h"

+#include "util/u_format.h"

+#include "util/u_inlines.h"

+#include "util/u_simple_shaders.h"

+#include "util/u_draw_quad.h"

+

+#include "cso_cache/cso_context.h"

+

+

+/**

+ * Do per-context initialization for glClear.

+ */

+void

+st_init_clear(struct st_context *st)

+{

+   struct pipe_screen *pscreen = st->pipe->screen;

+

+   memset(&st->clear, 0, sizeof(st->clear));

+

+   st->clear.raster.gl_rasterization_rules = 1;

+   st->clear.enable_ds_separate = pscreen->get_param(pscreen, PIPE_CAP_DEPTHSTENCIL_CLEAR_SEPARATE);

+}

+

+

+/**

+ * Free per-context state for glClear.

+ */

+void

+st_destroy_clear(struct st_context *st)

+{

+   if (st->clear.fs) {

+      cso_delete_fragment_shader(st->cso_context, st->clear.fs);

+      st->clear.fs = NULL;

+   }

+   if (st->clear.vs) {

+      cso_delete_vertex_shader(st->cso_context, st->clear.vs);

+      st->clear.vs = NULL;

+   }

+   if (st->clear.vbuf) {

+      pipe_resource_reference(&st->clear.vbuf, NULL);

+      st->clear.vbuf = NULL;

+   }

+}

+

+

+/**

+ * Helper function to set the fragment shaders.

+ */

+static INLINE void

+set_fragment_shader(struct st_context *st)

+{

+   if (!st->clear.fs)

+      st->clear.fs = util_make_fragment_passthrough_shader(st->pipe);

+

+   cso_set_fragment_shader_handle(st->cso_context, st->clear.fs);

+}

+

+

+/**

+ * Helper function to set the vertex shader.

+ */

+static INLINE void

+set_vertex_shader(struct st_context *st)

+{

+   /* vertex shader - still required to provide the linkage between

+    * fragment shader input semantics and vertex_element/buffers.

+    */

+   if (!st->clear.vs)

+   {

+      const uint semantic_names[] = { TGSI_SEMANTIC_POSITION,

+                                      TGSI_SEMANTIC_COLOR };

+      const uint semantic_indexes[] = { 0, 0 };

+      st->clear.vs = util_make_vertex_passthrough_shader(st->pipe, 2,

+                                                         semantic_names,

+                                                         semantic_indexes);

+   }

+

+   cso_set_vertex_shader_handle(st->cso_context, st->clear.vs);

+}

+

+

+/**

+ * Draw a screen-aligned quadrilateral.

+ * Coords are clip coords with y=0=bottom.

+ */

+static void

+draw_quad(struct st_context *st,

+          float x0, float y0, float x1, float y1, GLfloat z,

+          const GLfloat color[4])

+{

+   struct pipe_context *pipe = st->pipe;

+

+   /* XXX: Need to improve buffer_write to allow NO_WAIT (as well as

+    * no_flush) updates to buffers where we know there is no conflict

+    * with previous data.  Currently using max_slots > 1 will cause

+    * synchronous rendering if the driver flushes its command buffers

+    * between one bitmap and the next.  Our flush hook below isn't

+    * sufficient to catch this as the driver doesn't tell us when it

+    * flushes its own command buffers.  Until this gets fixed, pay the

+    * price of allocating a new buffer for each bitmap cache-flush to

+    * avoid synchronous rendering.

+    */

+   const GLuint max_slots = 1; /* 1024 / sizeof(st->clear.vertices); */

+   GLuint i;

+

+   if (st->clear.vbuf_slot >= max_slots) {

+      pipe_resource_reference(&st->clear.vbuf, NULL);

+      st->clear.vbuf_slot = 0;

+   }

+

+   if (!st->clear.vbuf) {

+      st->clear.vbuf = pipe_buffer_create(pipe->screen,

+                                          PIPE_BIND_VERTEX_BUFFER,

+                                          PIPE_USAGE_STREAM,

+                                          max_slots * sizeof(st->clear.vertices));

+   }

+

+   /* positions */

+   st->clear.vertices[0][0][0] = x0;

+   st->clear.vertices[0][0][1] = y0;

+

+   st->clear.vertices[1][0][0] = x1;

+   st->clear.vertices[1][0][1] = y0;

+

+   st->clear.vertices[2][0][0] = x1;

+   st->clear.vertices[2][0][1] = y1;

+

+   st->clear.vertices[3][0][0] = x0;

+   st->clear.vertices[3][0][1] = y1;

+

+   /* same for all verts: */

+   for (i = 0; i < 4; i++) {

+      st->clear.vertices[i][0][2] = z;

+      st->clear.vertices[i][0][3] = 1.0;

+      st->clear.vertices[i][1][0] = color[0];

+      st->clear.vertices[i][1][1] = color[1];

+      st->clear.vertices[i][1][2] = color[2];

+      st->clear.vertices[i][1][3] = color[3];

+   }

+

+   /* put vertex data into vbuf */

+   pipe_buffer_write_nooverlap(st->pipe, st->clear.vbuf,

+                                           st->clear.vbuf_slot

+                                             * sizeof(st->clear.vertices),

+                                           sizeof(st->clear.vertices),

+                                           st->clear.vertices);

+

+   /* draw */

+   util_draw_vertex_buffer(pipe,

+                           st->cso_context,

+                           st->clear.vbuf, 

+                           st->clear.vbuf_slot * sizeof(st->clear.vertices),

+                           PIPE_PRIM_TRIANGLE_FAN,

+                           4,  /* verts */

+                           2); /* attribs/vert */

+

+   /* Increment slot */

+   st->clear.vbuf_slot++;

+}

+

+

+

+/**

+ * Do glClear by drawing a quadrilateral.

+ * The vertices of the quad will be computed from the

+ * ctx->DrawBuffer->_X/Ymin/max fields.

+ */

+static void

+clear_with_quad(struct gl_context *ctx,

+                GLboolean color, GLboolean depth, GLboolean stencil)

+{

+   struct st_context *st = st_context(ctx);

+   const struct gl_framebuffer *fb = ctx->DrawBuffer;

+   const GLfloat fb_width = (GLfloat) fb->Width;

+   const GLfloat fb_height = (GLfloat) fb->Height;

+   const GLfloat x0 = (GLfloat) ctx->DrawBuffer->_Xmin / fb_width * 2.0f - 1.0f;

+   const GLfloat x1 = (GLfloat) ctx->DrawBuffer->_Xmax / fb_width * 2.0f - 1.0f;

+   const GLfloat y0 = (GLfloat) ctx->DrawBuffer->_Ymin / fb_height * 2.0f - 1.0f;

+   const GLfloat y1 = (GLfloat) ctx->DrawBuffer->_Ymax / fb_height * 2.0f - 1.0f;

+   float clearColor[4];

+

+   /*

+   printf("%s %s%s%s %f,%f %f,%f\n", __FUNCTION__, 

+	  color ? "color, " : "",

+	  depth ? "depth, " : "",

+	  stencil ? "stencil" : "",

+	  x0, y0,

+	  x1, y1);

+   */

+

+   cso_save_blend(st->cso_context);

+   cso_save_stencil_ref(st->cso_context);

+   cso_save_depth_stencil_alpha(st->cso_context);

+   cso_save_rasterizer(st->cso_context);

+   cso_save_viewport(st->cso_context);

+   cso_save_clip(st->cso_context);

+   cso_save_fragment_shader(st->cso_context);

+   cso_save_vertex_shader(st->cso_context);

+   cso_save_vertex_elements(st->cso_context);

+   cso_save_vertex_buffers(st->cso_context);

+

+   /* blend state: RGBA masking */

+   {

+      struct pipe_blend_state blend;

+      memset(&blend, 0, sizeof(blend));

+      blend.rt[0].rgb_src_factor = PIPE_BLENDFACTOR_ONE;

+      blend.rt[0].alpha_src_factor = PIPE_BLENDFACTOR_ONE;

+      blend.rt[0].rgb_dst_factor = PIPE_BLENDFACTOR_ZERO;

+      blend.rt[0].alpha_dst_factor = PIPE_BLENDFACTOR_ZERO;

+      if (color) {

+         if (ctx->Color.ColorMask[0][0])

+            blend.rt[0].colormask |= PIPE_MASK_R;

+         if (ctx->Color.ColorMask[0][1])

+            blend.rt[0].colormask |= PIPE_MASK_G;

+         if (ctx->Color.ColorMask[0][2])

+            blend.rt[0].colormask |= PIPE_MASK_B;

+         if (ctx->Color.ColorMask[0][3])

+            blend.rt[0].colormask |= PIPE_MASK_A;

+         if (st->ctx->Color.DitherFlag)

+            blend.dither = 1;

+      }

+      cso_set_blend(st->cso_context, &blend);

+   }

+

+   /* depth_stencil state: always pass/set to ref value */

+   {

+      struct pipe_depth_stencil_alpha_state depth_stencil;

+      memset(&depth_stencil, 0, sizeof(depth_stencil));

+      if (depth) {

+         depth_stencil.depth.enabled = 1;

+         depth_stencil.depth.writemask = 1;

+         depth_stencil.depth.func = PIPE_FUNC_ALWAYS;

+      }

+

+      if (stencil) {

+         struct pipe_stencil_ref stencil_ref;

+         memset(&stencil_ref, 0, sizeof(stencil_ref));

+         depth_stencil.stencil[0].enabled = 1;

+         depth_stencil.stencil[0].func = PIPE_FUNC_ALWAYS;

+         depth_stencil.stencil[0].fail_op = PIPE_STENCIL_OP_REPLACE;

+         depth_stencil.stencil[0].zpass_op = PIPE_STENCIL_OP_REPLACE;

+         depth_stencil.stencil[0].zfail_op = PIPE_STENCIL_OP_REPLACE;

+         depth_stencil.stencil[0].valuemask = 0xff;

+         depth_stencil.stencil[0].writemask = ctx->Stencil.WriteMask[0] & 0xff;

+         stencil_ref.ref_value[0] = ctx->Stencil.Clear;

+         cso_set_stencil_ref(st->cso_context, &stencil_ref);

+      }

+

+      cso_set_depth_stencil_alpha(st->cso_context, &depth_stencil);

+   }

+

+   cso_set_vertex_elements(st->cso_context, 2, st->velems_util_draw);

+

+   cso_set_rasterizer(st->cso_context, &st->clear.raster);

+

+   /* viewport state: viewport matching window dims */

+   {

+      const GLboolean invert = (st_fb_orientation(fb) == Y_0_TOP);

+      struct pipe_viewport_state vp;

+      vp.scale[0] = 0.5f * fb_width;

+      vp.scale[1] = fb_height * (invert ? -0.5f : 0.5f);

+      vp.scale[2] = 1.0f;

+      vp.scale[3] = 1.0f;

+      vp.translate[0] = 0.5f * fb_width;

+      vp.translate[1] = 0.5f * fb_height;

+      vp.translate[2] = 0.0f;

+      vp.translate[3] = 0.0f;

+      cso_set_viewport(st->cso_context, &vp);

+   }

+

+   cso_set_clip(st->cso_context, &st->clear.clip);

+   set_fragment_shader(st);

+   set_vertex_shader(st);

+

+   if (ctx->DrawBuffer->_ColorDrawBuffers[0]) {

+      st_translate_color(ctx->Color.ClearColorUnclamped,

+                         ctx->DrawBuffer->_ColorDrawBuffers[0]->_BaseFormat,

+                         clearColor);

+   }

+

+   /* draw quad matching scissor rect */

+   draw_quad(st, x0, y0, x1, y1, (GLfloat) ctx->Depth.Clear, clearColor);

+

+   /* Restore pipe state */

+   cso_restore_blend(st->cso_context);

+   cso_restore_stencil_ref(st->cso_context);

+   cso_restore_depth_stencil_alpha(st->cso_context);

+   cso_restore_rasterizer(st->cso_context);

+   cso_restore_viewport(st->cso_context);

+   cso_restore_clip(st->cso_context);

+   cso_restore_fragment_shader(st->cso_context);

+   cso_restore_vertex_shader(st->cso_context);

+   cso_restore_vertex_elements(st->cso_context);

+   cso_restore_vertex_buffers(st->cso_context);

+}

+

+

+/**

+ * Determine if we need to clear the depth buffer by drawing a quad.

+ */

+static INLINE GLboolean

+check_clear_color_with_quad(struct gl_context *ctx, struct gl_renderbuffer *rb)

+{

+   if (ctx->Scissor.Enabled &&

+       (ctx->Scissor.X != 0 ||

+        ctx->Scissor.Y != 0 ||

+        ctx->Scissor.Width < rb->Width ||

+        ctx->Scissor.Height < rb->Height))

+      return GL_TRUE;

+

+   if (!ctx->Color.ColorMask[0][0] ||

+       !ctx->Color.ColorMask[0][1] ||

+       !ctx->Color.ColorMask[0][2] ||

+       !ctx->Color.ColorMask[0][3])

+      return GL_TRUE;

+

+   return GL_FALSE;

+}

+

+

+/**

+ * Determine if we need to clear the combiend depth/stencil buffer by

+ * drawing a quad.

+ */

+static INLINE GLboolean

+check_clear_depth_stencil_with_quad(struct gl_context *ctx, struct gl_renderbuffer *rb)

+{

+   const GLuint stencilMax = 0xff;

+   GLboolean maskStencil

+      = (ctx->Stencil.WriteMask[0] & stencilMax) != stencilMax;

+

+   assert(rb->Format == MESA_FORMAT_S8 ||

+          rb->Format == MESA_FORMAT_Z24_S8 ||

+          rb->Format == MESA_FORMAT_S8_Z24);

+

+   if (ctx->Scissor.Enabled &&

+       (ctx->Scissor.X != 0 ||

+        ctx->Scissor.Y != 0 ||

+        ctx->Scissor.Width < rb->Width ||

+        ctx->Scissor.Height < rb->Height))

+      return GL_TRUE;

+

+   if (maskStencil)

+      return GL_TRUE;

+

+   return GL_FALSE;

+}

+

+

+/**

+ * Determine if we need to clear the depth buffer by drawing a quad.

+ */

+static INLINE GLboolean

+check_clear_depth_with_quad(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                            boolean ds_separate)

+{

+   const struct st_renderbuffer *strb = st_renderbuffer(rb);

+   const GLboolean isDS = util_format_is_depth_and_stencil(strb->surface->format);

+

+   if (ctx->Scissor.Enabled &&

+       (ctx->Scissor.X != 0 ||

+        ctx->Scissor.Y != 0 ||

+        ctx->Scissor.Width < rb->Width ||

+        ctx->Scissor.Height < rb->Height))

+      return GL_TRUE;

+

+   if (!ds_separate && isDS && ctx->DrawBuffer->Visual.stencilBits > 0)

+      return GL_TRUE;

+

+   return GL_FALSE;

+}

+

+

+/**

+ * Determine if we need to clear the stencil buffer by drawing a quad.

+ */

+static INLINE GLboolean

+check_clear_stencil_with_quad(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                              boolean ds_separate)

+{

+   const struct st_renderbuffer *strb = st_renderbuffer(rb);

+   const GLboolean isDS = util_format_is_depth_and_stencil(strb->surface->format);

+   const GLuint stencilMax = 0xff;

+   const GLboolean maskStencil

+      = (ctx->Stencil.WriteMask[0] & stencilMax) != stencilMax;

+

+   assert(rb->Format == MESA_FORMAT_S8 ||

+          rb->Format == MESA_FORMAT_Z24_S8 ||

+          rb->Format == MESA_FORMAT_S8_Z24);

+

+   if (maskStencil) 

+      return GL_TRUE;

+

+   if (ctx->Scissor.Enabled &&

+       (ctx->Scissor.X != 0 ||

+        ctx->Scissor.Y != 0 ||

+        ctx->Scissor.Width < rb->Width ||

+        ctx->Scissor.Height < rb->Height))

+      return GL_TRUE;

+

+   /* This is correct, but it is necessary to look at the depth clear

+    * value held in the surface when it comes time to issue the clear,

+    * rather than taking depth and stencil clear values from the

+    * current state.

+    */

+   if (!ds_separate && isDS && ctx->DrawBuffer->Visual.depthBits > 0)

+      return GL_TRUE;

+

+   return GL_FALSE;

+}

+

+

+

+/**

+ * Called when we need to flush.

+ */

+void

+st_flush_clear(struct st_context *st)

+{

+   /* Release vertex buffer to avoid synchronous rendering if we were

+    * to map it in the next frame.

+    */

+   pipe_resource_reference(&st->clear.vbuf, NULL);

+   st->clear.vbuf_slot = 0;

+}

+ 

+

+

+/**

+ * Called via ctx->Driver.Clear()

+ */

+static void

+st_Clear(struct gl_context *ctx, GLbitfield mask)

+{

+   static const GLbitfield BUFFER_BITS_DS

+      = (BUFFER_BIT_DEPTH | BUFFER_BIT_STENCIL);

+   struct st_context *st = st_context(ctx);

+   struct gl_renderbuffer *depthRb

+      = ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;

+   struct gl_renderbuffer *stencilRb

+      = ctx->DrawBuffer->Attachment[BUFFER_STENCIL].Renderbuffer;

+   GLbitfield quad_buffers = 0x0;

+   GLbitfield clear_buffers = 0x0;

+   GLuint i;

+

+   /* This makes sure the pipe has the latest scissor, etc values */

+   st_validate_state( st );

+

+   if (mask & BUFFER_BITS_COLOR) {

+      for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {

+         GLuint b = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];

+

+         if (mask & (1 << b)) {

+            struct gl_renderbuffer *rb

+               = ctx->DrawBuffer->Attachment[b].Renderbuffer;

+            struct st_renderbuffer *strb = st_renderbuffer(rb);

+

+            if (!strb || !strb->surface)

+               continue;

+

+            if (check_clear_color_with_quad( ctx, rb ))

+               quad_buffers |= PIPE_CLEAR_COLOR;

+            else

+               clear_buffers |= PIPE_CLEAR_COLOR;

+         }

+      }

+   }

+

+   if ((mask & BUFFER_BITS_DS) == BUFFER_BITS_DS && depthRb == stencilRb) {

+      /* clearing combined depth + stencil */

+      struct st_renderbuffer *strb = st_renderbuffer(depthRb);

+

+      if (strb->surface) {

+         if (check_clear_depth_stencil_with_quad(ctx, depthRb))

+            quad_buffers |= PIPE_CLEAR_DEPTHSTENCIL;

+         else

+            clear_buffers |= PIPE_CLEAR_DEPTHSTENCIL;

+      }

+   }

+   else {

+      /* separate depth/stencil clears */

+      /* I don't think truly separate buffers are actually possible in gallium or hw? */

+      if (mask & BUFFER_BIT_DEPTH) {

+         struct st_renderbuffer *strb = st_renderbuffer(depthRb);

+

+         if (strb->surface) {

+            if (check_clear_depth_with_quad(ctx, depthRb,

+                                            st->clear.enable_ds_separate))

+               quad_buffers |= PIPE_CLEAR_DEPTH;

+            else

+               clear_buffers |= PIPE_CLEAR_DEPTH;

+         }

+      }

+      if (mask & BUFFER_BIT_STENCIL) {

+         struct st_renderbuffer *strb = st_renderbuffer(stencilRb);

+

+         if (strb->surface) {

+            if (check_clear_stencil_with_quad(ctx, stencilRb,

+                                              st->clear.enable_ds_separate))

+               quad_buffers |= PIPE_CLEAR_STENCIL;

+            else

+               clear_buffers |= PIPE_CLEAR_STENCIL;

+         }

+      }

+   }

+

+   /*

+    * If we're going to use clear_with_quad() for any reason, use it for

+    * everything possible.

+    */

+   if (quad_buffers) {

+      quad_buffers |= clear_buffers;

+      clear_with_quad(ctx,

+                      quad_buffers & PIPE_CLEAR_COLOR,

+                      quad_buffers & PIPE_CLEAR_DEPTH,

+                      quad_buffers & PIPE_CLEAR_STENCIL);

+   } else if (clear_buffers) {

+      /* driver cannot know it can clear everything if the buffer

+       * is a combined depth/stencil buffer but this wasn't actually

+       * required from the visual. Hence fix this up to avoid potential

+       * read-modify-write in the driver.

+       */

+      float clearColor[4];

+

+      if ((clear_buffers & PIPE_CLEAR_DEPTHSTENCIL) &&

+          ((clear_buffers & PIPE_CLEAR_DEPTHSTENCIL) != PIPE_CLEAR_DEPTHSTENCIL) &&

+          (depthRb == stencilRb) &&

+          (ctx->DrawBuffer->Visual.depthBits == 0 ||

+           ctx->DrawBuffer->Visual.stencilBits == 0))

+         clear_buffers |= PIPE_CLEAR_DEPTHSTENCIL;

+

+      if (ctx->DrawBuffer->_ColorDrawBuffers[0]) {

+         st_translate_color(ctx->Color.ClearColor,

+                            ctx->DrawBuffer->_ColorDrawBuffers[0]->_BaseFormat,

+                            clearColor);

+      }

+

+      st->pipe->clear(st->pipe, clear_buffers, ctx->Color.ClearColorUnclamped,

+                      ctx->Depth.Clear, ctx->Stencil.Clear);

+   }

+   if (mask & BUFFER_BIT_ACCUM)

+      st_clear_accum_buffer(ctx,

+                            ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer);

+}

+

+

+void

+st_init_clear_functions(struct dd_function_table *functions)

+{

+   functions->Clear = st_Clear;

+}

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
index 1707f827c..f159ed2db 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1,1535 +1,1535 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
- /*
-  * Authors:
-  *   Brian Paul
-  */
-
-#include "main/imports.h"
-#include "main/image.h"
-#include "main/bufferobj.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-#include "main/mtypes.h"
-#include "main/pack.h"
-#include "main/pbo.h"
-#include "main/texformat.h"
-#include "main/texstore.h"
-#include "program/program.h"
-#include "program/prog_print.h"
-#include "program/prog_instruction.h"
-
-#include "st_atom.h"
-#include "st_atom_constbuf.h"
-#include "st_cb_drawpixels.h"
-#include "st_cb_readpixels.h"
-#include "st_cb_fbo.h"
-#include "st_context.h"
-#include "st_debug.h"
-#include "st_format.h"
-#include "st_program.h"
-#include "st_texture.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "tgsi/tgsi_ureg.h"
-#include "util/u_draw_quad.h"
-#include "util/u_format.h"
-#include "util/u_inlines.h"
-#include "util/u_math.h"
-#include "util/u_tile.h"
-#include "cso_cache/cso_context.h"
-
-
-#if FEATURE_drawpix
-
-/**
- * Check if the given program is:
- * 0: MOVE result.color, fragment.color;
- * 1: END;
- */
-static GLboolean
-is_passthrough_program(const struct gl_fragment_program *prog)
-{
-   if (prog->Base.NumInstructions == 2) {
-      const struct prog_instruction *inst = prog->Base.Instructions;
-      if (inst[0].Opcode == OPCODE_MOV &&
-          inst[1].Opcode == OPCODE_END &&
-          inst[0].DstReg.File == PROGRAM_OUTPUT &&
-          inst[0].DstReg.Index == FRAG_RESULT_COLOR &&
-          inst[0].DstReg.WriteMask == WRITEMASK_XYZW &&
-          inst[0].SrcReg[0].File == PROGRAM_INPUT &&
-          inst[0].SrcReg[0].Index == FRAG_ATTRIB_COL0 &&
-          inst[0].SrcReg[0].Swizzle == SWIZZLE_XYZW) {
-         return GL_TRUE;
-      }
-   }
-   return GL_FALSE;
-}
-
-
-
-/**
- * Make fragment shader for glDraw/CopyPixels.  This shader is made
- * by combining the pixel transfer shader with the user-defined shader.
- * \param fpIn  the current/incoming fragment program
- * \param fpOut  returns the combined fragment program
- */
-void
-st_make_drawpix_fragment_program(struct st_context *st,
-                                 struct gl_fragment_program *fpIn,
-                                 struct gl_fragment_program **fpOut)
-{
-   struct gl_program *newProg;
-
-   if (is_passthrough_program(fpIn)) {
-      newProg = (struct gl_program *) _mesa_clone_fragment_program(st->ctx,
-                                             &st->pixel_xfer.program->Base);
-   }
-   else {
-#if 0
-      /* debug */
-      printf("Base program:\n");
-      _mesa_print_program(&fpIn->Base);
-      printf("DrawPix program:\n");
-      _mesa_print_program(&st->pixel_xfer.program->Base.Base);
-#endif
-      newProg = _mesa_combine_programs(st->ctx,
-                                       &st->pixel_xfer.program->Base.Base,
-                                       &fpIn->Base);
-   }
-
-#if 0
-   /* debug */
-   printf("Combined DrawPixels program:\n");
-   _mesa_print_program(newProg);
-   printf("InputsRead: 0x%x\n", newProg->InputsRead);
-   printf("OutputsWritten: 0x%x\n", newProg->OutputsWritten);
-   _mesa_print_parameter_list(newProg->Parameters);
-#endif
-
-   *fpOut = (struct gl_fragment_program *) newProg;
-}
-
-
-/**
- * Create fragment program that does a TEX() instruction to get a Z and/or
- * stencil value value, then writes to FRAG_RESULT_DEPTH/FRAG_RESULT_STENCIL.
- * Used for glDrawPixels(GL_DEPTH_COMPONENT / GL_STENCIL_INDEX).
- * Pass fragment color through as-is.
- * \return pointer to the gl_fragment program
- */
-struct gl_fragment_program *
-st_make_drawpix_z_stencil_program(struct st_context *st,
-                                  GLboolean write_depth,
-                                  GLboolean write_stencil)
-{
-   struct gl_context *ctx = st->ctx;
-   struct gl_program *p;
-   struct gl_fragment_program *fp;
-   GLuint ic = 0;
-   const GLuint shaderIndex = write_depth * 2 + write_stencil;
-
-   assert(shaderIndex < Elements(st->drawpix.shaders));
-
-   if (st->drawpix.shaders[shaderIndex]) {
-      /* already have the proper shader */
-      return st->drawpix.shaders[shaderIndex];
-   }
-
-   /*
-    * Create shader now
-    */
-   p = ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
-   if (!p)
-      return NULL;
-
-   p->NumInstructions = write_depth ? 2 : 1;
-   p->NumInstructions += write_stencil ? 1 : 0;
-
-   p->Instructions = _mesa_alloc_instructions(p->NumInstructions);
-   if (!p->Instructions) {
-      ctx->Driver.DeleteProgram(ctx, p);
-      return NULL;
-   }
-   _mesa_init_instructions(p->Instructions, p->NumInstructions);
-
-   if (write_depth) {
-      /* TEX result.depth, fragment.texcoord[0], texture[0], 2D; */
-      p->Instructions[ic].Opcode = OPCODE_TEX;
-      p->Instructions[ic].DstReg.File = PROGRAM_OUTPUT;
-      p->Instructions[ic].DstReg.Index = FRAG_RESULT_DEPTH;
-      p->Instructions[ic].DstReg.WriteMask = WRITEMASK_Z;
-      p->Instructions[ic].SrcReg[0].File = PROGRAM_INPUT;
-      p->Instructions[ic].SrcReg[0].Index = FRAG_ATTRIB_TEX0;
-      p->Instructions[ic].TexSrcUnit = 0;
-      p->Instructions[ic].TexSrcTarget = TEXTURE_2D_INDEX;
-      ic++;
-   }
-
-   if (write_stencil) {
-      /* TEX result.stencil, fragment.texcoord[0], texture[0], 2D; */
-      p->Instructions[ic].Opcode = OPCODE_TEX;
-      p->Instructions[ic].DstReg.File = PROGRAM_OUTPUT;
-      p->Instructions[ic].DstReg.Index = FRAG_RESULT_STENCIL;
-      p->Instructions[ic].DstReg.WriteMask = WRITEMASK_Y;
-      p->Instructions[ic].SrcReg[0].File = PROGRAM_INPUT;
-      p->Instructions[ic].SrcReg[0].Index = FRAG_ATTRIB_TEX0;
-      p->Instructions[ic].TexSrcUnit = 1;
-      p->Instructions[ic].TexSrcTarget = TEXTURE_2D_INDEX;
-      ic++;
-   }
-
-   /* END; */
-   p->Instructions[ic++].Opcode = OPCODE_END;
-
-   assert(ic == p->NumInstructions);
-
-   p->InputsRead = FRAG_BIT_TEX0 | FRAG_BIT_COL0;
-   p->OutputsWritten = 0;
-   if (write_depth)
-      p->OutputsWritten |= BITFIELD64_BIT(FRAG_RESULT_DEPTH);
-   if (write_stencil)
-      p->OutputsWritten |= BITFIELD64_BIT(FRAG_RESULT_STENCIL);
-
-   p->SamplersUsed =  0x1;  /* sampler 0 (bit 0) is used */
-   if (write_stencil)
-      p->SamplersUsed |= 1 << 1;
-
-   fp = (struct gl_fragment_program *) p;
-
-   /* save the new shader */
-   st->drawpix.shaders[shaderIndex] = fp;
-
-   return fp;
-}
-
-
-/**
- * Create a simple vertex shader that just passes through the
- * vertex position and texcoord (and optionally, color).
- */
-static void *
-make_passthrough_vertex_shader(struct st_context *st, 
-                               GLboolean passColor)
-{
-   if (!st->drawpix.vert_shaders[passColor]) {
-      struct ureg_program *ureg = ureg_create( TGSI_PROCESSOR_VERTEX );
-
-      if (ureg == NULL)
-         return NULL;
-
-      /* MOV result.pos, vertex.pos; */
-      ureg_MOV(ureg, 
-               ureg_DECL_output( ureg, TGSI_SEMANTIC_POSITION, 0 ),
-               ureg_DECL_vs_input( ureg, 0 ));
-      
-      /* MOV result.texcoord0, vertex.attr[1]; */
-      ureg_MOV(ureg, 
-               ureg_DECL_output( ureg, TGSI_SEMANTIC_GENERIC, 0 ),
-               ureg_DECL_vs_input( ureg, 1 ));
-      
-      if (passColor) {
-         /* MOV result.color0, vertex.attr[2]; */
-         ureg_MOV(ureg, 
-                  ureg_DECL_output( ureg, TGSI_SEMANTIC_COLOR, 0 ),
-                  ureg_DECL_vs_input( ureg, 2 ));
-      }
-
-      ureg_END( ureg );
-      
-      st->drawpix.vert_shaders[passColor] = 
-         ureg_create_shader_and_destroy( ureg, st->pipe );
-   }
-
-   return st->drawpix.vert_shaders[passColor];
-}
-
-
-/**
- * Return a texture base format for drawing/copying an image
- * of the given format.
- */
-static GLenum
-base_format(GLenum format)
-{
-   switch (format) {
-   case GL_DEPTH_COMPONENT:
-      return GL_DEPTH_COMPONENT;
-   case GL_DEPTH_STENCIL:
-      return GL_DEPTH_STENCIL;
-   case GL_STENCIL_INDEX:
-      return GL_STENCIL_INDEX;
-   default:
-      return GL_RGBA;
-   }
-}
-
-
-/**
- * Return a texture internalFormat for drawing/copying an image
- * of the given format and type.
- */
-static GLenum
-internal_format(struct gl_context *ctx, GLenum format, GLenum type)
-{
-   switch (format) {
-   case GL_DEPTH_COMPONENT:
-      return GL_DEPTH_COMPONENT;
-   case GL_DEPTH_STENCIL:
-      return GL_DEPTH_STENCIL;
-   case GL_STENCIL_INDEX:
-      return GL_STENCIL_INDEX;
-   default:
-      if (_mesa_is_integer_format(format)) {
-         switch (type) {
-         case GL_BYTE:
-            return GL_RGBA8I;
-         case GL_UNSIGNED_BYTE:
-            return GL_RGBA8UI;
-         case GL_SHORT:
-            return GL_RGBA16I;
-         case GL_UNSIGNED_SHORT:
-            return GL_RGBA16UI;
-         case GL_INT:
-            return GL_RGBA32I;
-         case GL_UNSIGNED_INT:
-            return GL_RGBA32UI;
-         default:
-            assert(0 && "Unexpected type in internal_format()");
-            return GL_RGBA_INTEGER;
-         }
-      }
-      else {
-         switch (type) {
-         case GL_UNSIGNED_BYTE:
-         case GL_UNSIGNED_INT_8_8_8_8:
-         case GL_UNSIGNED_INT_8_8_8_8_REV:
-         default:
-            return GL_RGBA8;
-
-         case GL_UNSIGNED_BYTE_3_3_2:
-         case GL_UNSIGNED_BYTE_2_3_3_REV:
-         case GL_UNSIGNED_SHORT_4_4_4_4:
-         case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-            return GL_RGBA4;
-
-         case GL_UNSIGNED_SHORT_5_6_5:
-         case GL_UNSIGNED_SHORT_5_6_5_REV:
-         case GL_UNSIGNED_SHORT_5_5_5_1:
-         case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-            return GL_RGB5_A1;
-
-         case GL_UNSIGNED_INT_10_10_10_2:
-         case GL_UNSIGNED_INT_2_10_10_10_REV:
-            return GL_RGB10_A2;
-
-         case GL_UNSIGNED_SHORT:
-         case GL_UNSIGNED_INT:
-            return GL_RGBA16;
-
-         case GL_BYTE:
-            return
-               ctx->Extensions.EXT_texture_snorm ? GL_RGBA8_SNORM : GL_RGBA8;
-
-         case GL_SHORT:
-         case GL_INT:
-            return
-               ctx->Extensions.EXT_texture_snorm ? GL_RGBA16_SNORM : GL_RGBA16;
-
-         case GL_HALF_FLOAT_ARB:
-            return
-               ctx->Extensions.ARB_texture_float ? GL_RGBA16F :
-               ctx->Extensions.EXT_texture_snorm ? GL_RGBA16_SNORM : GL_RGBA16;
-
-         case GL_FLOAT:
-         case GL_DOUBLE:
-            return
-               ctx->Extensions.ARB_texture_float ? GL_RGBA32F :
-               ctx->Extensions.EXT_texture_snorm ? GL_RGBA16_SNORM : GL_RGBA16;
-         }
-      }
-   }
-}
-
-
-/**
- * Create a temporary texture to hold an image of the given size.
- * If width, height are not POT and the driver only handles POT textures,
- * allocate the next larger size of texture that is POT.
- */
-static struct pipe_resource *
-alloc_texture(struct st_context *st, GLsizei width, GLsizei height,
-              enum pipe_format texFormat)
-{
-   struct pipe_resource *pt;
-
-   pt = st_texture_create(st, st->internal_target, texFormat, 0,
-                          width, height, 1, 1, PIPE_BIND_SAMPLER_VIEW);
-
-   return pt;
-}
-
-
-/**
- * Make texture containing an image for glDrawPixels image.
- * If 'pixels' is NULL, leave the texture image data undefined.
- */
-static struct pipe_resource *
-make_texture(struct st_context *st,
-	     GLsizei width, GLsizei height, GLenum format, GLenum type,
-	     const struct gl_pixelstore_attrib *unpack,
-	     const GLvoid *pixels)
-{
-   struct gl_context *ctx = st->ctx;
-   struct pipe_context *pipe = st->pipe;
-   gl_format mformat;
-   struct pipe_resource *pt;
-   enum pipe_format pipeFormat;
-   GLuint cpp;
-   GLenum baseFormat, intFormat;
-
-   baseFormat = base_format(format);
-   intFormat = internal_format(ctx, format, type);
-
-   mformat = st_ChooseTextureFormat_renderable(ctx, intFormat,
-                                               format, type, GL_FALSE);
-   assert(mformat);
-
-   pipeFormat = st_mesa_format_to_pipe_format(mformat);
-   assert(pipeFormat);
-   cpp = util_format_get_blocksize(pipeFormat);
-
-   pixels = _mesa_map_pbo_source(ctx, unpack, pixels);
-   if (!pixels)
-      return NULL;
-
-   /* alloc temporary texture */
-   pt = alloc_texture(st, width, height, pipeFormat);
-   if (!pt) {
-      _mesa_unmap_pbo_source(ctx, unpack);
-      return NULL;
-   }
-
-   {
-      struct pipe_transfer *transfer;
-      static const GLuint dstImageOffsets = 0;
-      GLboolean success;
-      GLubyte *dest;
-      const GLbitfield imageTransferStateSave = ctx->_ImageTransferState;
-
-      /* we'll do pixel transfer in a fragment shader */
-      ctx->_ImageTransferState = 0x0;
-
-      transfer = pipe_get_transfer(st->pipe, pt, 0, 0,
-                                   PIPE_TRANSFER_WRITE, 0, 0,
-                                   width, height);
-
-      /* map texture transfer */
-      dest = pipe_transfer_map(pipe, transfer);
-
-
-      /* Put image into texture transfer.
-       * Note that the image is actually going to be upside down in
-       * the texture.  We deal with that with texcoords.
-       */
-      success = _mesa_texstore(ctx, 2,           /* dims */
-                               baseFormat,       /* baseInternalFormat */
-                               mformat,          /* gl_format */
-                               dest,             /* dest */
-                               0, 0, 0,          /* dstX/Y/Zoffset */
-                               transfer->stride, /* dstRowStride, bytes */
-                               &dstImageOffsets, /* dstImageOffsets */
-                               width, height, 1, /* size */
-                               format, type,     /* src format/type */
-                               pixels,           /* data source */
-                               unpack);
-
-      /* unmap */
-      pipe_transfer_unmap(pipe, transfer);
-      pipe->transfer_destroy(pipe, transfer);
-
-      assert(success);
-
-      /* restore */
-      ctx->_ImageTransferState = imageTransferStateSave;
-   }
-
-   _mesa_unmap_pbo_source(ctx, unpack);
-
-   return pt;
-}
-
-
-/**
- * Draw quad with texcoords and optional color.
- * Coords are gallium window coords with y=0=top.
- * \param color  may be null
- * \param invertTex  if true, flip texcoords vertically
- */
-static void
-draw_quad(struct gl_context *ctx, GLfloat x0, GLfloat y0, GLfloat z,
-          GLfloat x1, GLfloat y1, const GLfloat *color,
-          GLboolean invertTex, GLfloat maxXcoord, GLfloat maxYcoord)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   GLfloat verts[4][3][4]; /* four verts, three attribs, XYZW */
-
-   /* setup vertex data */
-   {
-      const struct gl_framebuffer *fb = st->ctx->DrawBuffer;
-      const GLfloat fb_width = (GLfloat) fb->Width;
-      const GLfloat fb_height = (GLfloat) fb->Height;
-      const GLfloat clip_x0 = x0 / fb_width * 2.0f - 1.0f;
-      const GLfloat clip_y0 = y0 / fb_height * 2.0f - 1.0f;
-      const GLfloat clip_x1 = x1 / fb_width * 2.0f - 1.0f;
-      const GLfloat clip_y1 = y1 / fb_height * 2.0f - 1.0f;
-      const GLfloat sLeft = 0.0f, sRight = maxXcoord;
-      const GLfloat tTop = invertTex ? maxYcoord : 0.0f;
-      const GLfloat tBot = invertTex ? 0.0f : maxYcoord;
-      GLuint i;
-
-      /* upper-left */
-      verts[0][0][0] = clip_x0;    /* v[0].attr[0].x */
-      verts[0][0][1] = clip_y0;    /* v[0].attr[0].y */
-
-      /* upper-right */
-      verts[1][0][0] = clip_x1;
-      verts[1][0][1] = clip_y0;
-
-      /* lower-right */
-      verts[2][0][0] = clip_x1;
-      verts[2][0][1] = clip_y1;
-
-      /* lower-left */
-      verts[3][0][0] = clip_x0;
-      verts[3][0][1] = clip_y1;
-
-      verts[0][1][0] = sLeft; /* v[0].attr[1].S */
-      verts[0][1][1] = tTop;  /* v[0].attr[1].T */
-      verts[1][1][0] = sRight;
-      verts[1][1][1] = tTop;
-      verts[2][1][0] = sRight;
-      verts[2][1][1] = tBot;
-      verts[3][1][0] = sLeft;
-      verts[3][1][1] = tBot;
-
-      /* same for all verts: */
-      if (color) {
-         for (i = 0; i < 4; i++) {
-            verts[i][0][2] = z;         /* v[i].attr[0].z */
-            verts[i][0][3] = 1.0f;      /* v[i].attr[0].w */
-            verts[i][2][0] = color[0];  /* v[i].attr[2].r */
-            verts[i][2][1] = color[1];  /* v[i].attr[2].g */
-            verts[i][2][2] = color[2];  /* v[i].attr[2].b */
-            verts[i][2][3] = color[3];  /* v[i].attr[2].a */
-            verts[i][1][2] = 0.0f;      /* v[i].attr[1].R */
-            verts[i][1][3] = 1.0f;      /* v[i].attr[1].Q */
-         }
-      }
-      else {
-         for (i = 0; i < 4; i++) {
-            verts[i][0][2] = z;    /*Z*/
-            verts[i][0][3] = 1.0f; /*W*/
-            verts[i][1][2] = 0.0f; /*R*/
-            verts[i][1][3] = 1.0f; /*Q*/
-         }
-      }
-   }
-
-   {
-      struct pipe_resource *buf;
-
-      /* allocate/load buffer object with vertex data */
-      buf = pipe_buffer_create(pipe->screen,
-			       PIPE_BIND_VERTEX_BUFFER,
-			       PIPE_USAGE_STATIC,
-                               sizeof(verts));
-      pipe_buffer_write(st->pipe, buf, 0, sizeof(verts), verts);
-
-      util_draw_vertex_buffer(pipe, st->cso_context, buf, 0,
-                              PIPE_PRIM_QUADS,
-                              4,  /* verts */
-                              3); /* attribs/vert */
-      pipe_resource_reference(&buf, NULL);
-   }
-}
-
-
-
-static void
-draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,
-                   GLsizei width, GLsizei height,
-                   GLfloat zoomX, GLfloat zoomY,
-                   struct pipe_sampler_view **sv,
-                   int num_sampler_view,
-                   void *driver_vp,
-                   void *driver_fp,
-                   const GLfloat *color,
-                   GLboolean invertTex,
-                   GLboolean write_depth, GLboolean write_stencil)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   struct cso_context *cso = st->cso_context;
-   GLfloat x0, y0, x1, y1;
-   GLsizei maxSize;
-   boolean normalized = sv[0]->texture->target != PIPE_TEXTURE_RECT;
-
-   /* limit checks */
-   /* XXX if DrawPixels image is larger than max texture size, break
-    * it up into chunks.
-    */
-   maxSize = 1 << (pipe->screen->get_param(pipe->screen,
-                                        PIPE_CAP_MAX_TEXTURE_2D_LEVELS) - 1);
-   assert(width <= maxSize);
-   assert(height <= maxSize);
-
-   cso_save_rasterizer(cso);
-   cso_save_viewport(cso);
-   cso_save_samplers(cso);
-   cso_save_fragment_sampler_views(cso);
-   cso_save_fragment_shader(cso);
-   cso_save_vertex_shader(cso);
-   cso_save_vertex_elements(cso);
-   cso_save_vertex_buffers(cso);
-   if (write_stencil) {
-      cso_save_depth_stencil_alpha(cso);
-      cso_save_blend(cso);
-   }
-
-   /* rasterizer state: just scissor */
-   {
-      struct pipe_rasterizer_state rasterizer;
-      memset(&rasterizer, 0, sizeof(rasterizer));
-      rasterizer.clamp_fragment_color = ctx->Color._ClampFragmentColor;
-      rasterizer.gl_rasterization_rules = 1;
-      rasterizer.scissor = ctx->Scissor.Enabled;
-      cso_set_rasterizer(cso, &rasterizer);
-   }
-
-   if (write_stencil) {
-      /* Stencil writing bypasses the normal fragment pipeline to
-       * disable color writing and set stencil test to always pass.
-       */
-      struct pipe_depth_stencil_alpha_state dsa;
-      struct pipe_blend_state blend;
-
-      /* depth/stencil */
-      memset(&dsa, 0, sizeof(dsa));
-      dsa.stencil[0].enabled = 1;
-      dsa.stencil[0].func = PIPE_FUNC_ALWAYS;
-      dsa.stencil[0].writemask = ctx->Stencil.WriteMask[0] & 0xff;
-      dsa.stencil[0].zpass_op = PIPE_STENCIL_OP_REPLACE;
-      if (write_depth) {
-         /* writing depth+stencil: depth test always passes */
-         dsa.depth.enabled = 1;
-         dsa.depth.writemask = ctx->Depth.Mask;
-         dsa.depth.func = PIPE_FUNC_ALWAYS;
-      }
-      cso_set_depth_stencil_alpha(cso, &dsa);
-
-      /* blend (colormask) */
-      memset(&blend, 0, sizeof(blend));
-      cso_set_blend(cso, &blend);
-   }
-
-   /* fragment shader state: TEX lookup program */
-   cso_set_fragment_shader_handle(cso, driver_fp);
-
-   /* vertex shader state: position + texcoord pass-through */
-   cso_set_vertex_shader_handle(cso, driver_vp);
-
-
-   /* texture sampling state: */
-   {
-      struct pipe_sampler_state sampler;
-      memset(&sampler, 0, sizeof(sampler));
-      sampler.wrap_s = PIPE_TEX_WRAP_CLAMP;
-      sampler.wrap_t = PIPE_TEX_WRAP_CLAMP;
-      sampler.wrap_r = PIPE_TEX_WRAP_CLAMP;
-      sampler.min_img_filter = PIPE_TEX_FILTER_NEAREST;
-      sampler.min_mip_filter = PIPE_TEX_MIPFILTER_NONE;
-      sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST;
-      sampler.normalized_coords = normalized;
-
-      cso_single_sampler(cso, 0, &sampler);
-      if (num_sampler_view > 1) {
-         cso_single_sampler(cso, 1, &sampler);
-      }
-      cso_single_sampler_done(cso);
-   }
-
-   /* viewport state: viewport matching window dims */
-   {
-      const float w = (float) ctx->DrawBuffer->Width;
-      const float h = (float) ctx->DrawBuffer->Height;
-      struct pipe_viewport_state vp;
-      vp.scale[0] =  0.5f * w;
-      vp.scale[1] = -0.5f * h;
-      vp.scale[2] = 0.5f;
-      vp.scale[3] = 1.0f;
-      vp.translate[0] = 0.5f * w;
-      vp.translate[1] = 0.5f * h;
-      vp.translate[2] = 0.5f;
-      vp.translate[3] = 0.0f;
-      cso_set_viewport(cso, &vp);
-   }
-
-   cso_set_vertex_elements(cso, 3, st->velems_util_draw);
-
-   /* texture state: */
-   cso_set_fragment_sampler_views(cso, num_sampler_view, sv);
-
-   /* Compute Gallium window coords (y=0=top) with pixel zoom.
-    * Recall that these coords are transformed by the current
-    * vertex shader and viewport transformation.
-    */
-   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_BOTTOM) {
-      y = ctx->DrawBuffer->Height - (int) (y + height * ctx->Pixel.ZoomY);
-      invertTex = !invertTex;
-   }
-
-   x0 = (GLfloat) x;
-   x1 = x + width * ctx->Pixel.ZoomX;
-   y0 = (GLfloat) y;
-   y1 = y + height * ctx->Pixel.ZoomY;
-
-   /* convert Z from [0,1] to [-1,-1] to match viewport Z scale/bias */
-   z = z * 2.0 - 1.0;
-
-   draw_quad(ctx, x0, y0, z, x1, y1, color, invertTex,
-             normalized ? ((GLfloat) width / sv[0]->texture->width0) : (GLfloat)width,
-             normalized ? ((GLfloat) height / sv[0]->texture->height0) : (GLfloat)height);
-
-   /* restore state */
-   cso_restore_rasterizer(cso);
-   cso_restore_viewport(cso);
-   cso_restore_samplers(cso);
-   cso_restore_fragment_sampler_views(cso);
-   cso_restore_fragment_shader(cso);
-   cso_restore_vertex_shader(cso);
-   cso_restore_vertex_elements(cso);
-   cso_restore_vertex_buffers(cso);
-   if (write_stencil) {
-      cso_restore_depth_stencil_alpha(cso);
-      cso_restore_blend(cso);
-   }
-}
-
-
-/**
- * Software fallback to do glDrawPixels(GL_STENCIL_INDEX) when we
- * can't use a fragment shader to write stencil values.
- */
-static void
-draw_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
-                    GLsizei width, GLsizei height, GLenum format, GLenum type,
-                    const struct gl_pixelstore_attrib *unpack,
-                    const GLvoid *pixels)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   struct st_renderbuffer *strb;
-   enum pipe_transfer_usage usage;
-   struct pipe_transfer *pt;
-   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;
-   GLint skipPixels;
-   ubyte *stmap;
-   struct gl_pixelstore_attrib clippedUnpack = *unpack;
-
-   if (!zoom) {
-      if (!_mesa_clip_drawpixels(ctx, &x, &y, &width, &height,
-                                 &clippedUnpack)) {
-         /* totally clipped */
-         return;
-      }
-   }
-
-   strb = st_renderbuffer(ctx->DrawBuffer->
-                          Attachment[BUFFER_STENCIL].Renderbuffer);
-
-   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {
-      y = ctx->DrawBuffer->Height - y - height;
-   }
-
-   if(format != GL_DEPTH_STENCIL && 
-      util_format_get_component_bits(strb->format,
-                                     UTIL_FORMAT_COLORSPACE_ZS, 0) != 0)
-      usage = PIPE_TRANSFER_READ_WRITE;
-   else
-      usage = PIPE_TRANSFER_WRITE;
-
-   pt = pipe_get_transfer(st_context(ctx)->pipe, strb->texture, 0, 0,
-                                     usage, x, y,
-                                     width, height);
-
-   stmap = pipe_transfer_map(pipe, pt);
-
-   pixels = _mesa_map_pbo_source(ctx, &clippedUnpack, pixels);
-   assert(pixels);
-
-   /* if width > MAX_WIDTH, have to process image in chunks */
-   skipPixels = 0;
-   while (skipPixels < width) {
-      const GLint spanX = skipPixels;
-      const GLint spanWidth = MIN2(width - skipPixels, MAX_WIDTH);
-      GLint row;
-      for (row = 0; row < height; row++) {
-         GLubyte sValues[MAX_WIDTH];
-         GLuint zValues[MAX_WIDTH];
-         GLenum destType = GL_UNSIGNED_BYTE;
-         const GLvoid *source = _mesa_image_address2d(&clippedUnpack, pixels,
-                                                      width, height,
-                                                      format, type,
-                                                      row, skipPixels);
-         _mesa_unpack_stencil_span(ctx, spanWidth, destType, sValues,
-                                   type, source, &clippedUnpack,
-                                   ctx->_ImageTransferState);
-
-         if (format == GL_DEPTH_STENCIL) {
-            _mesa_unpack_depth_span(ctx, spanWidth, GL_UNSIGNED_INT, zValues,
-                                    (1 << 24) - 1, type, source,
-                                    &clippedUnpack);
-         }
-
-         if (zoom) {
-            _mesa_problem(ctx, "Gallium glDrawPixels(GL_STENCIL) with "
-                          "zoom not complete");
-         }
-
-         {
-            GLint spanY;
-
-            if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {
-               spanY = height - row - 1;
-            }
-            else {
-               spanY = row;
-            }
-
-            /* now pack the stencil (and Z) values in the dest format */
-            switch (pt->resource->format) {
-            case PIPE_FORMAT_S8_USCALED:
-               {
-                  ubyte *dest = stmap + spanY * pt->stride + spanX;
-                  assert(usage == PIPE_TRANSFER_WRITE);
-                  memcpy(dest, sValues, spanWidth);
-               }
-               break;
-            case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
-               if (format == GL_DEPTH_STENCIL) {
-                  uint *dest = (uint *) (stmap + spanY * pt->stride + spanX*4);
-                  GLint k;
-                  assert(usage == PIPE_TRANSFER_WRITE);
-                  for (k = 0; k < spanWidth; k++) {
-                     dest[k] = zValues[k] | (sValues[k] << 24);
-                  }
-               }
-               else {
-                  uint *dest = (uint *) (stmap + spanY * pt->stride + spanX*4);
-                  GLint k;
-                  assert(usage == PIPE_TRANSFER_READ_WRITE);
-                  for (k = 0; k < spanWidth; k++) {
-                     dest[k] = (dest[k] & 0xffffff) | (sValues[k] << 24);
-                  }
-               }
-               break;
-            case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
-               if (format == GL_DEPTH_STENCIL) {
-                  uint *dest = (uint *) (stmap + spanY * pt->stride + spanX*4);
-                  GLint k;
-                  assert(usage == PIPE_TRANSFER_WRITE);
-                  for (k = 0; k < spanWidth; k++) {
-                     dest[k] = (zValues[k] << 8) | (sValues[k] & 0xff);
-                  }
-               }
-               else {
-                  uint *dest = (uint *) (stmap + spanY * pt->stride + spanX*4);
-                  GLint k;
-                  assert(usage == PIPE_TRANSFER_READ_WRITE);
-                  for (k = 0; k < spanWidth; k++) {
-                     dest[k] = (dest[k] & 0xffffff00) | (sValues[k] & 0xff);
-                  }
-               }
-               break;
-            default:
-               assert(0);
-            }
-         }
-      }
-      skipPixels += spanWidth;
-   }
-
-   _mesa_unmap_pbo_source(ctx, &clippedUnpack);
-
-   /* unmap the stencil buffer */
-   pipe_transfer_unmap(pipe, pt);
-   pipe->transfer_destroy(pipe, pt);
-}
-
-
-/**
- * Get fragment program variant for a glDrawPixels or glCopyPixels
- * command for RGBA data.
- */
-static struct st_fp_variant *
-get_color_fp_variant(struct st_context *st)
-{
-   struct gl_context *ctx = st->ctx;
-   struct st_fp_variant_key key;
-   struct st_fp_variant *fpv;
-
-   memset(&key, 0, sizeof(key));
-
-   key.st = st;
-   key.drawpixels = 1;
-   key.scaleAndBias = (ctx->Pixel.RedBias != 0.0 ||
-                       ctx->Pixel.RedScale != 1.0 ||
-                       ctx->Pixel.GreenBias != 0.0 ||
-                       ctx->Pixel.GreenScale != 1.0 ||
-                       ctx->Pixel.BlueBias != 0.0 ||
-                       ctx->Pixel.BlueScale != 1.0 ||
-                       ctx->Pixel.AlphaBias != 0.0 ||
-                       ctx->Pixel.AlphaScale != 1.0);
-   key.pixelMaps = ctx->Pixel.MapColorFlag;
-
-   fpv = st_get_fp_variant(st, st->fp, &key);
-
-   return fpv;
-}
-
-
-/**
- * Get fragment program variant for a glDrawPixels or glCopyPixels
- * command for depth/stencil data.
- */
-static struct st_fp_variant *
-get_depth_stencil_fp_variant(struct st_context *st, GLboolean write_depth,
-                             GLboolean write_stencil)
-{
-   struct st_fp_variant_key key;
-   struct st_fp_variant *fpv;
-
-   memset(&key, 0, sizeof(key));
-
-   key.st = st;
-   key.drawpixels = 1;
-   key.drawpixels_z = write_depth;
-   key.drawpixels_stencil = write_stencil;
-
-   fpv = st_get_fp_variant(st, st->fp, &key);
-
-   return fpv;
-}
-
-
-/**
- * Called via ctx->Driver.DrawPixels()
- */
-static void
-st_DrawPixels(struct gl_context *ctx, GLint x, GLint y,
-              GLsizei width, GLsizei height,
-              GLenum format, GLenum type,
-              const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels)
-{
-   void *driver_vp, *driver_fp;
-   struct st_context *st = st_context(ctx);
-   const GLfloat *color;
-   struct pipe_context *pipe = st->pipe;
-   GLboolean write_stencil = GL_FALSE, write_depth = GL_FALSE;
-   struct pipe_sampler_view *sv[2];
-   int num_sampler_view = 1;
-   enum pipe_format stencil_format = PIPE_FORMAT_NONE;
-   struct st_fp_variant *fpv;
-
-   if (format == GL_DEPTH_STENCIL)
-      write_stencil = write_depth = GL_TRUE;
-   else if (format == GL_STENCIL_INDEX)
-      write_stencil = GL_TRUE;
-   else if (format == GL_DEPTH_COMPONENT)
-      write_depth = GL_TRUE;
-
-   if (write_stencil) {
-      enum pipe_format tex_format;
-      /* can we write to stencil if not fallback */
-      if (!pipe->screen->get_param(pipe->screen, PIPE_CAP_SHADER_STENCIL_EXPORT))
-	 goto stencil_fallback;
-      
-      tex_format = st_choose_format(st->pipe->screen, base_format(format),
-                                    PIPE_TEXTURE_2D,
-				    0, PIPE_BIND_SAMPLER_VIEW);
-      if (tex_format == PIPE_FORMAT_Z24_UNORM_S8_USCALED)
-	 stencil_format = PIPE_FORMAT_X24S8_USCALED;
-      else if (tex_format == PIPE_FORMAT_S8_USCALED_Z24_UNORM)
-	 stencil_format = PIPE_FORMAT_S8X24_USCALED;
-      else
-	 stencil_format = PIPE_FORMAT_S8_USCALED;
-      if (stencil_format == PIPE_FORMAT_NONE)
-	 goto stencil_fallback;
-   }
-
-   /* Mesa state should be up to date by now */
-   assert(ctx->NewState == 0x0);
-
-   st_validate_state(st);
-
-   /*
-    * Get vertex/fragment shaders
-    */
-   if (write_depth || write_stencil) {
-      fpv = get_depth_stencil_fp_variant(st, write_depth, write_stencil);
-
-      driver_fp = fpv->driver_shader;
-
-      driver_vp = make_passthrough_vertex_shader(st, GL_TRUE);
-
-      color = ctx->Current.RasterColor;
-   }
-   else {
-      fpv = get_color_fp_variant(st);
-
-      driver_fp = fpv->driver_shader;
-
-      driver_vp = make_passthrough_vertex_shader(st, GL_FALSE);
-
-      color = NULL;
-      if (st->pixel_xfer.pixelmap_enabled) {
-	  sv[1] = st->pixel_xfer.pixelmap_sampler_view;
-	  num_sampler_view++;
-      }
-   }
-
-   /* update fragment program constants */
-   st_upload_constants(st, fpv->parameters, PIPE_SHADER_FRAGMENT);
-
-   /* draw with textured quad */
-   {
-      struct pipe_resource *pt
-         = make_texture(st, width, height, format, type, unpack, pixels);
-      if (pt) {
-         sv[0] = st_create_texture_sampler_view(st->pipe, pt);
-
-         if (sv[0]) {
-	    if (write_stencil) {
-	       sv[1] = st_create_texture_sampler_view_format(st->pipe, pt,
-                                                             stencil_format);
-	       num_sampler_view++;
-	    }
-
-            draw_textured_quad(ctx, x, y, ctx->Current.RasterPos[2],
-                               width, height,
-                               ctx->Pixel.ZoomX, ctx->Pixel.ZoomY,
-                               sv,
-                               num_sampler_view,
-                               driver_vp,
-                               driver_fp,
-                               color, GL_FALSE, write_depth, write_stencil);
-            pipe_sampler_view_reference(&sv[0], NULL);
-            if (num_sampler_view > 1)
-               pipe_sampler_view_reference(&sv[1], NULL);
-         }
-         pipe_resource_reference(&pt, NULL);
-      }
-   }
-   return;
-
-stencil_fallback:
-   draw_stencil_pixels(ctx, x, y, width, height, format, type,
-		       unpack, pixels);
-}
-
-
-
-/**
- * Software fallback for glCopyPixels(GL_STENCIL).
- */
-static void
-copy_stencil_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,
-                    GLsizei width, GLsizei height,
-                    GLint dstx, GLint dsty)
-{
-   struct st_renderbuffer *rbDraw;
-   struct pipe_context *pipe = st_context(ctx)->pipe;
-   enum pipe_transfer_usage usage;
-   struct pipe_transfer *ptDraw;
-   ubyte *drawMap;
-   ubyte *buffer;
-   int i;
-
-   buffer = malloc(width * height * sizeof(ubyte));
-   if (!buffer) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels(stencil)");
-      return;
-   }
-
-   /* Get the dest renderbuffer.  If there's a wrapper, use the
-    * underlying renderbuffer.
-    */
-   rbDraw = st_renderbuffer(ctx->DrawBuffer->_StencilBuffer);
-   if (rbDraw->Base.Wrapped)
-      rbDraw = st_renderbuffer(rbDraw->Base.Wrapped);
-
-   /* this will do stencil pixel transfer ops */
-   st_read_stencil_pixels(ctx, srcx, srcy, width, height,
-                          GL_STENCIL_INDEX, GL_UNSIGNED_BYTE,
-                          &ctx->DefaultPacking, buffer);
-
-   if (0) {
-      /* debug code: dump stencil values */
-      GLint row, col;
-      for (row = 0; row < height; row++) {
-         printf("%3d: ", row);
-         for (col = 0; col < width; col++) {
-            printf("%02x ", buffer[col + row * width]);
-         }
-         printf("\n");
-      }
-   }
-
-   if (util_format_get_component_bits(rbDraw->format,
-                                     UTIL_FORMAT_COLORSPACE_ZS, 0) != 0)
-      usage = PIPE_TRANSFER_READ_WRITE;
-   else
-      usage = PIPE_TRANSFER_WRITE;
-
-   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {
-      dsty = rbDraw->Base.Height - dsty - height;
-   }
-
-   ptDraw = pipe_get_transfer(st_context(ctx)->pipe,
-                              rbDraw->texture, 0, 0,
-                              usage, dstx, dsty,
-                              width, height);
-
-   assert(util_format_get_blockwidth(ptDraw->resource->format) == 1);
-   assert(util_format_get_blockheight(ptDraw->resource->format) == 1);
-
-   /* map the stencil buffer */
-   drawMap = pipe_transfer_map(pipe, ptDraw);
-
-   /* draw */
-   /* XXX PixelZoom not handled yet */
-   for (i = 0; i < height; i++) {
-      ubyte *dst;
-      const ubyte *src;
-      int y;
-
-      y = i;
-
-      if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {
-         y = height - y - 1;
-      }
-
-      dst = drawMap + y * ptDraw->stride;
-      src = buffer + i * width;
-
-      switch (ptDraw->resource->format) {
-      case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
-         {
-            uint *dst4 = (uint *) dst;
-            int j;
-            assert(usage == PIPE_TRANSFER_READ_WRITE);
-            for (j = 0; j < width; j++) {
-               *dst4 = (*dst4 & 0xffffff) | (src[j] << 24);
-               dst4++;
-            }
-         }
-         break;
-      case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
-         {
-            uint *dst4 = (uint *) dst;
-            int j;
-            assert(usage == PIPE_TRANSFER_READ_WRITE);
-            for (j = 0; j < width; j++) {
-               *dst4 = (*dst4 & 0xffffff00) | (src[j] & 0xff);
-               dst4++;
-            }
-         }
-         break;
-      case PIPE_FORMAT_S8_USCALED:
-         assert(usage == PIPE_TRANSFER_WRITE);
-         memcpy(dst, src, width);
-         break;
-      default:
-         assert(0);
-      }
-   }
-
-   free(buffer);
-
-   /* unmap the stencil buffer */
-   pipe_transfer_unmap(pipe, ptDraw);
-   pipe->transfer_destroy(pipe, ptDraw);
-}
-
-
-/** Do the src/dest regions overlap? */
-static GLboolean
-regions_overlap(GLint srcX, GLint srcY, GLint dstX, GLint dstY,
-                GLsizei width, GLsizei height)
-{
-   if (srcX + width <= dstX ||
-       dstX + width <= srcX ||
-       srcY + height <= dstY ||
-       dstY + height <= srcY)
-      return GL_FALSE;
-   else
-      return GL_TRUE;
-}
-
-
-/**
- * Try to do a glCopyPixels for simple cases with a blit by calling
- * pipe->resource_copy_region().
- *
- * We can do this when we're copying color pixels (depth/stencil
- * eventually) with no pixel zoom, no pixel transfer ops, no
- * per-fragment ops, the src/dest regions don't overlap and the
- * src/dest pixel formats are the same.
- */
-static GLboolean
-blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,
-                 GLsizei width, GLsizei height,
-                 GLint dstx, GLint dsty, GLenum type)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   struct gl_pixelstore_attrib pack, unpack;
-   GLint readX, readY, readW, readH;
-
-   if (type == GL_COLOR &&
-       ctx->Pixel.ZoomX == 1.0 &&
-       ctx->Pixel.ZoomY == 1.0 &&
-       ctx->_ImageTransferState == 0x0 &&
-       !ctx->Color.BlendEnabled &&
-       !ctx->Color.AlphaEnabled &&
-       !ctx->Depth.Test &&
-       !ctx->Fog.Enabled &&
-       !ctx->Stencil.Enabled &&
-       !ctx->FragmentProgram.Enabled &&
-       !ctx->VertexProgram.Enabled &&
-       !ctx->Shader.CurrentFragmentProgram &&
-       st_fb_orientation(ctx->ReadBuffer) == st_fb_orientation(ctx->DrawBuffer) &&
-       ctx->DrawBuffer->_NumColorDrawBuffers == 1) {
-      struct st_renderbuffer *rbRead, *rbDraw;
-      GLint drawX, drawY;
-
-      /*
-       * Clip the read region against the src buffer bounds.
-       * We'll still allocate a temporary buffer/texture for the original
-       * src region size but we'll only read the region which is on-screen.
-       * This may mean that we draw garbage pixels into the dest region, but
-       * that's expected.
-       */
-      readX = srcx;
-      readY = srcy;
-      readW = width;
-      readH = height;
-      pack = ctx->DefaultPacking;
-      if (!_mesa_clip_readpixels(ctx, &readX, &readY, &readW, &readH, &pack))
-         return GL_TRUE; /* all done */
-
-      /* clip against dest buffer bounds and scissor box */
-      drawX = dstx + pack.SkipPixels;
-      drawY = dsty + pack.SkipRows;
-      unpack = pack;
-      if (!_mesa_clip_drawpixels(ctx, &drawX, &drawY, &readW, &readH, &unpack))
-         return GL_TRUE; /* all done */
-
-      readX = readX - pack.SkipPixels + unpack.SkipPixels;
-      readY = readY - pack.SkipRows + unpack.SkipRows;
-
-      rbRead = st_get_color_read_renderbuffer(ctx);
-      rbDraw = st_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]);
-
-      if ((rbRead != rbDraw ||
-           !regions_overlap(readX, readY, drawX, drawY, readW, readH)) &&
-          rbRead->Base.Format == rbDraw->Base.Format) {
-         struct pipe_box srcBox;
-
-         /* flip src/dst position if needed */
-         if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {
-            /* both buffers will have the same orientation */
-            readY = ctx->ReadBuffer->Height - readY - readH;
-            drawY = ctx->DrawBuffer->Height - drawY - readH;
-         }
-
-         u_box_2d(readX, readY, readW, readH, &srcBox);
-
-         pipe->resource_copy_region(pipe,
-                                    rbDraw->texture, 0, drawX, drawY, 0,
-                                    rbRead->texture, 0, &srcBox);
-         return GL_TRUE;
-      }
-   }
-
-   return GL_FALSE;
-}
-
-
-static void
-st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,
-              GLsizei width, GLsizei height,
-              GLint dstx, GLint dsty, GLenum type)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   struct pipe_screen *screen = pipe->screen;
-   struct st_renderbuffer *rbRead;
-   void *driver_vp, *driver_fp;
-   struct pipe_resource *pt;
-   struct pipe_sampler_view *sv[2];
-   int num_sampler_view = 1;
-   GLfloat *color;
-   enum pipe_format srcFormat, texFormat;
-   GLboolean invertTex = GL_FALSE;
-   GLint readX, readY, readW, readH;
-   GLuint sample_count;
-   struct gl_pixelstore_attrib pack = ctx->DefaultPacking;
-   struct st_fp_variant *fpv;
-
-   st_validate_state(st);
-
-   if (type == GL_STENCIL) {
-      /* can't use texturing to do stencil */
-      copy_stencil_pixels(ctx, srcx, srcy, width, height, dstx, dsty);
-      return;
-   }
-
-   if (blit_copy_pixels(ctx, srcx, srcy, width, height, dstx, dsty, type))
-      return;
-
-   /*
-    * The subsequent code implements glCopyPixels by copying the source
-    * pixels into a temporary texture that's then applied to a textured quad.
-    * When we draw the textured quad, all the usual per-fragment operations
-    * are handled.
-    */
-
-
-   /*
-    * Get vertex/fragment shaders
-    */
-   if (type == GL_COLOR) {
-      rbRead = st_get_color_read_renderbuffer(ctx);
-      color = NULL;
-
-      fpv = get_color_fp_variant(st);
-      driver_fp = fpv->driver_shader;
-
-      driver_vp = make_passthrough_vertex_shader(st, GL_FALSE);
-
-      if (st->pixel_xfer.pixelmap_enabled) {
-	  sv[1] = st->pixel_xfer.pixelmap_sampler_view;
-	  num_sampler_view++;
-      }
-   }
-   else {
-      assert(type == GL_DEPTH);
-      rbRead = st_renderbuffer(ctx->ReadBuffer->_DepthBuffer);
-      color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
-
-      fpv = get_depth_stencil_fp_variant(st, GL_TRUE, GL_FALSE);
-      driver_fp = fpv->driver_shader;
-
-      driver_vp = make_passthrough_vertex_shader(st, GL_TRUE);
-   }
-
-   /* update fragment program constants */
-   st_upload_constants(st, fpv->parameters, PIPE_SHADER_FRAGMENT);
-
-
-   if (rbRead->Base.Wrapped)
-      rbRead = st_renderbuffer(rbRead->Base.Wrapped);
-
-   sample_count = rbRead->texture->nr_samples;
-   /* I believe this would be legal, presumably would need to do a resolve
-      for color, and for depth/stencil spec says to just use one of the
-      depth/stencil samples per pixel? Need some transfer clarifications. */
-   assert(sample_count < 2);
-
-   srcFormat = rbRead->texture->format;
-
-   if (screen->is_format_supported(screen, srcFormat, st->internal_target,
-                                   sample_count,
-                                   PIPE_BIND_SAMPLER_VIEW)) {
-      texFormat = srcFormat;
-   }
-   else {
-      /* srcFormat can't be used as a texture format */
-      if (type == GL_DEPTH) {
-         texFormat = st_choose_format(screen, GL_DEPTH_COMPONENT,
-                                      st->internal_target, sample_count,
-                                      PIPE_BIND_DEPTH_STENCIL);
-         assert(texFormat != PIPE_FORMAT_NONE);
-      }
-      else {
-         /* default color format */
-         texFormat = st_choose_format(screen, GL_RGBA, st->internal_target,
-                                      sample_count, PIPE_BIND_SAMPLER_VIEW);
-         assert(texFormat != PIPE_FORMAT_NONE);
-      }
-   }
-
-   /* Invert src region if needed */
-   if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {
-      srcy = ctx->ReadBuffer->Height - srcy - height;
-      invertTex = !invertTex;
-   }
-
-   /* Clip the read region against the src buffer bounds.
-    * We'll still allocate a temporary buffer/texture for the original
-    * src region size but we'll only read the region which is on-screen.
-    * This may mean that we draw garbage pixels into the dest region, but
-    * that's expected.
-    */
-   readX = srcx;
-   readY = srcy;
-   readW = width;
-   readH = height;
-   _mesa_clip_readpixels(ctx, &readX, &readY, &readW, &readH, &pack);
-   readW = MAX2(0, readW);
-   readH = MAX2(0, readH);
-
-   /* alloc temporary texture */
-   pt = alloc_texture(st, width, height, texFormat);
-   if (!pt)
-      return;
-
-   sv[0] = st_create_texture_sampler_view(st->pipe, pt);
-   if (!sv[0]) {
-      pipe_resource_reference(&pt, NULL);
-      return;
-   }
-
-   /* Make temporary texture which is a copy of the src region.
-    */
-   if (srcFormat == texFormat) {
-      struct pipe_box src_box;
-      u_box_2d(readX, readY, readW, readH, &src_box);
-      /* copy source framebuffer surface into mipmap/texture */
-      pipe->resource_copy_region(pipe,
-                                 pt,                                /* dest tex */
-                                 0,
-                                 pack.SkipPixels, pack.SkipRows, 0, /* dest pos */
-                                 rbRead->texture,                   /* src tex */
-                                 0,
-                                 &src_box);
-
-   }
-   else {
-      /* CPU-based fallback/conversion */
-      struct pipe_transfer *ptRead =
-         pipe_get_transfer(st->pipe, rbRead->texture,
-                           0, 0, /* level, layer */
-                           PIPE_TRANSFER_READ,
-                           readX, readY, readW, readH);
-      struct pipe_transfer *ptTex;
-      enum pipe_transfer_usage transfer_usage;
-
-      if (ST_DEBUG & DEBUG_FALLBACK)
-         debug_printf("%s: fallback processing\n", __FUNCTION__);
-
-      if (type == GL_DEPTH && util_format_is_depth_and_stencil(pt->format))
-         transfer_usage = PIPE_TRANSFER_READ_WRITE;
-      else
-         transfer_usage = PIPE_TRANSFER_WRITE;
-
-      ptTex = pipe_get_transfer(st->pipe, pt, 0, 0, transfer_usage,
-                                0, 0, width, height);
-
-      /* copy image from ptRead surface to ptTex surface */
-      if (type == GL_COLOR) {
-         /* alternate path using get/put_tile() */
-         GLfloat *buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
-         enum pipe_format readFormat, drawFormat;
-         readFormat = util_format_linear(rbRead->texture->format);
-         drawFormat = util_format_linear(pt->format);
-         pipe_get_tile_rgba_format(pipe, ptRead, 0, 0, readW, readH,
-                                   readFormat, buf);
-         pipe_put_tile_rgba_format(pipe, ptTex, pack.SkipPixels, pack.SkipRows,
-                                   readW, readH, drawFormat, buf);
-         free(buf);
-      }
-      else {
-         /* GL_DEPTH */
-         GLuint *buf = (GLuint *) malloc(width * height * sizeof(GLuint));
-         pipe_get_tile_z(pipe, ptRead, 0, 0, readW, readH, buf);
-         pipe_put_tile_z(pipe, ptTex, pack.SkipPixels, pack.SkipRows,
-                         readW, readH, buf);
-         free(buf);
-      }
-
-      pipe->transfer_destroy(pipe, ptRead);
-      pipe->transfer_destroy(pipe, ptTex);
-   }
-
-   /* OK, the texture 'pt' contains the src image/pixels.  Now draw a
-    * textured quad with that texture.
-    */
-   draw_textured_quad(ctx, dstx, dsty, ctx->Current.RasterPos[2],
-                      width, height, ctx->Pixel.ZoomX, ctx->Pixel.ZoomY,
-                      sv,
-                      num_sampler_view,
-                      driver_vp, 
-                      driver_fp,
-                      color, invertTex, GL_FALSE, GL_FALSE);
-
-   pipe_resource_reference(&pt, NULL);
-   pipe_sampler_view_reference(&sv[0], NULL);
-}
-
-
-
-void st_init_drawpixels_functions(struct dd_function_table *functions)
-{
-   functions->DrawPixels = st_DrawPixels;
-   functions->CopyPixels = st_CopyPixels;
-}
-
-
-void
-st_destroy_drawpix(struct st_context *st)
-{
-   GLuint i;
-
-   for (i = 0; i < Elements(st->drawpix.shaders); i++) {
-      if (st->drawpix.shaders[i])
-         _mesa_reference_fragprog(st->ctx, &st->drawpix.shaders[i], NULL);
-   }
-
-   st_reference_fragprog(st, &st->pixel_xfer.combined_prog, NULL);
-   if (st->drawpix.vert_shaders[0])
-      ureg_free_tokens(st->drawpix.vert_shaders[0]);
-   if (st->drawpix.vert_shaders[1])
-      ureg_free_tokens(st->drawpix.vert_shaders[1]);
-}
-
-#endif /* FEATURE_drawpix */
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+ /*

+  * Authors:

+  *   Brian Paul

+  */

+

+#include "main/imports.h"

+#include "main/image.h"

+#include "main/bufferobj.h"

+#include "main/macros.h"

+#include "main/mfeatures.h"

+#include "main/mtypes.h"

+#include "main/pack.h"

+#include "main/pbo.h"

+#include "main/texformat.h"

+#include "main/texstore.h"

+#include "program/program.h"

+#include "program/prog_print.h"

+#include "program/prog_instruction.h"

+

+#include "st_atom.h"

+#include "st_atom_constbuf.h"

+#include "st_cb_drawpixels.h"

+#include "st_cb_readpixels.h"

+#include "st_cb_fbo.h"

+#include "st_context.h"

+#include "st_debug.h"

+#include "st_format.h"

+#include "st_program.h"

+#include "st_texture.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "tgsi/tgsi_ureg.h"

+#include "util/u_draw_quad.h"

+#include "util/u_format.h"

+#include "util/u_inlines.h"

+#include "util/u_math.h"

+#include "util/u_tile.h"

+#include "cso_cache/cso_context.h"

+

+

+#if FEATURE_drawpix

+

+/**

+ * Check if the given program is:

+ * 0: MOVE result.color, fragment.color;

+ * 1: END;

+ */

+static GLboolean

+is_passthrough_program(const struct gl_fragment_program *prog)

+{

+   if (prog->Base.NumInstructions == 2) {

+      const struct prog_instruction *inst = prog->Base.Instructions;

+      if (inst[0].Opcode == OPCODE_MOV &&

+          inst[1].Opcode == OPCODE_END &&

+          inst[0].DstReg.File == PROGRAM_OUTPUT &&

+          inst[0].DstReg.Index == FRAG_RESULT_COLOR &&

+          inst[0].DstReg.WriteMask == WRITEMASK_XYZW &&

+          inst[0].SrcReg[0].File == PROGRAM_INPUT &&

+          inst[0].SrcReg[0].Index == FRAG_ATTRIB_COL0 &&

+          inst[0].SrcReg[0].Swizzle == SWIZZLE_XYZW) {

+         return GL_TRUE;

+      }

+   }

+   return GL_FALSE;

+}

+

+

+

+/**

+ * Make fragment shader for glDraw/CopyPixels.  This shader is made

+ * by combining the pixel transfer shader with the user-defined shader.

+ * \param fpIn  the current/incoming fragment program

+ * \param fpOut  returns the combined fragment program

+ */

+void

+st_make_drawpix_fragment_program(struct st_context *st,

+                                 struct gl_fragment_program *fpIn,

+                                 struct gl_fragment_program **fpOut)

+{

+   struct gl_program *newProg;

+

+   if (is_passthrough_program(fpIn)) {

+      newProg = (struct gl_program *) _mesa_clone_fragment_program(st->ctx,

+                                             &st->pixel_xfer.program->Base);

+   }

+   else {

+#if 0

+      /* debug */

+      printf("Base program:\n");

+      _mesa_print_program(&fpIn->Base);

+      printf("DrawPix program:\n");

+      _mesa_print_program(&st->pixel_xfer.program->Base.Base);

+#endif

+      newProg = _mesa_combine_programs(st->ctx,

+                                       &st->pixel_xfer.program->Base.Base,

+                                       &fpIn->Base);

+   }

+

+#if 0

+   /* debug */

+   printf("Combined DrawPixels program:\n");

+   _mesa_print_program(newProg);

+   printf("InputsRead: 0x%x\n", newProg->InputsRead);

+   printf("OutputsWritten: 0x%x\n", newProg->OutputsWritten);

+   _mesa_print_parameter_list(newProg->Parameters);

+#endif

+

+   *fpOut = (struct gl_fragment_program *) newProg;

+}

+

+

+/**

+ * Create fragment program that does a TEX() instruction to get a Z and/or

+ * stencil value value, then writes to FRAG_RESULT_DEPTH/FRAG_RESULT_STENCIL.

+ * Used for glDrawPixels(GL_DEPTH_COMPONENT / GL_STENCIL_INDEX).

+ * Pass fragment color through as-is.

+ * \return pointer to the gl_fragment program

+ */

+struct gl_fragment_program *

+st_make_drawpix_z_stencil_program(struct st_context *st,

+                                  GLboolean write_depth,

+                                  GLboolean write_stencil)

+{

+   struct gl_context *ctx = st->ctx;

+   struct gl_program *p;

+   struct gl_fragment_program *fp;

+   GLuint ic = 0;

+   const GLuint shaderIndex = write_depth * 2 + write_stencil;

+

+   assert(shaderIndex < Elements(st->drawpix.shaders));

+

+   if (st->drawpix.shaders[shaderIndex]) {

+      /* already have the proper shader */

+      return st->drawpix.shaders[shaderIndex];

+   }

+

+   /*

+    * Create shader now

+    */

+   p = ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);

+   if (!p)

+      return NULL;

+

+   p->NumInstructions = write_depth ? 2 : 1;

+   p->NumInstructions += write_stencil ? 1 : 0;

+

+   p->Instructions = _mesa_alloc_instructions(p->NumInstructions);

+   if (!p->Instructions) {

+      ctx->Driver.DeleteProgram(ctx, p);

+      return NULL;

+   }

+   _mesa_init_instructions(p->Instructions, p->NumInstructions);

+

+   if (write_depth) {

+      /* TEX result.depth, fragment.texcoord[0], texture[0], 2D; */

+      p->Instructions[ic].Opcode = OPCODE_TEX;

+      p->Instructions[ic].DstReg.File = PROGRAM_OUTPUT;

+      p->Instructions[ic].DstReg.Index = FRAG_RESULT_DEPTH;

+      p->Instructions[ic].DstReg.WriteMask = WRITEMASK_Z;

+      p->Instructions[ic].SrcReg[0].File = PROGRAM_INPUT;

+      p->Instructions[ic].SrcReg[0].Index = FRAG_ATTRIB_TEX0;

+      p->Instructions[ic].TexSrcUnit = 0;

+      p->Instructions[ic].TexSrcTarget = TEXTURE_2D_INDEX;

+      ic++;

+   }

+

+   if (write_stencil) {

+      /* TEX result.stencil, fragment.texcoord[0], texture[0], 2D; */

+      p->Instructions[ic].Opcode = OPCODE_TEX;

+      p->Instructions[ic].DstReg.File = PROGRAM_OUTPUT;

+      p->Instructions[ic].DstReg.Index = FRAG_RESULT_STENCIL;

+      p->Instructions[ic].DstReg.WriteMask = WRITEMASK_Y;

+      p->Instructions[ic].SrcReg[0].File = PROGRAM_INPUT;

+      p->Instructions[ic].SrcReg[0].Index = FRAG_ATTRIB_TEX0;

+      p->Instructions[ic].TexSrcUnit = 1;

+      p->Instructions[ic].TexSrcTarget = TEXTURE_2D_INDEX;

+      ic++;

+   }

+

+   /* END; */

+   p->Instructions[ic++].Opcode = OPCODE_END;

+

+   assert(ic == p->NumInstructions);

+

+   p->InputsRead = FRAG_BIT_TEX0 | FRAG_BIT_COL0;

+   p->OutputsWritten = 0;

+   if (write_depth)

+      p->OutputsWritten |= BITFIELD64_BIT(FRAG_RESULT_DEPTH);

+   if (write_stencil)

+      p->OutputsWritten |= BITFIELD64_BIT(FRAG_RESULT_STENCIL);

+

+   p->SamplersUsed =  0x1;  /* sampler 0 (bit 0) is used */

+   if (write_stencil)

+      p->SamplersUsed |= 1 << 1;

+

+   fp = (struct gl_fragment_program *) p;

+

+   /* save the new shader */

+   st->drawpix.shaders[shaderIndex] = fp;

+

+   return fp;

+}

+

+

+/**

+ * Create a simple vertex shader that just passes through the

+ * vertex position and texcoord (and optionally, color).

+ */

+static void *

+make_passthrough_vertex_shader(struct st_context *st, 

+                               GLboolean passColor)

+{

+   if (!st->drawpix.vert_shaders[passColor]) {

+      struct ureg_program *ureg = ureg_create( TGSI_PROCESSOR_VERTEX );

+

+      if (ureg == NULL)

+         return NULL;

+

+      /* MOV result.pos, vertex.pos; */

+      ureg_MOV(ureg, 

+               ureg_DECL_output( ureg, TGSI_SEMANTIC_POSITION, 0 ),

+               ureg_DECL_vs_input( ureg, 0 ));

+      

+      /* MOV result.texcoord0, vertex.attr[1]; */

+      ureg_MOV(ureg, 

+               ureg_DECL_output( ureg, TGSI_SEMANTIC_GENERIC, 0 ),

+               ureg_DECL_vs_input( ureg, 1 ));

+      

+      if (passColor) {

+         /* MOV result.color0, vertex.attr[2]; */

+         ureg_MOV(ureg, 

+                  ureg_DECL_output( ureg, TGSI_SEMANTIC_COLOR, 0 ),

+                  ureg_DECL_vs_input( ureg, 2 ));

+      }

+

+      ureg_END( ureg );

+      

+      st->drawpix.vert_shaders[passColor] = 

+         ureg_create_shader_and_destroy( ureg, st->pipe );

+   }

+

+   return st->drawpix.vert_shaders[passColor];

+}

+

+

+/**

+ * Return a texture base format for drawing/copying an image

+ * of the given format.

+ */

+static GLenum

+base_format(GLenum format)

+{

+   switch (format) {

+   case GL_DEPTH_COMPONENT:

+      return GL_DEPTH_COMPONENT;

+   case GL_DEPTH_STENCIL:

+      return GL_DEPTH_STENCIL;

+   case GL_STENCIL_INDEX:

+      return GL_STENCIL_INDEX;

+   default:

+      return GL_RGBA;

+   }

+}

+

+

+/**

+ * Return a texture internalFormat for drawing/copying an image

+ * of the given format and type.

+ */

+static GLenum

+internal_format(struct gl_context *ctx, GLenum format, GLenum type)

+{

+   switch (format) {

+   case GL_DEPTH_COMPONENT:

+      return GL_DEPTH_COMPONENT;

+   case GL_DEPTH_STENCIL:

+      return GL_DEPTH_STENCIL;

+   case GL_STENCIL_INDEX:

+      return GL_STENCIL_INDEX;

+   default:

+      if (_mesa_is_integer_format(format)) {

+         switch (type) {

+         case GL_BYTE:

+            return GL_RGBA8I;

+         case GL_UNSIGNED_BYTE:

+            return GL_RGBA8UI;

+         case GL_SHORT:

+            return GL_RGBA16I;

+         case GL_UNSIGNED_SHORT:

+            return GL_RGBA16UI;

+         case GL_INT:

+            return GL_RGBA32I;

+         case GL_UNSIGNED_INT:

+            return GL_RGBA32UI;

+         default:

+            assert(0 && "Unexpected type in internal_format()");

+            return GL_RGBA_INTEGER;

+         }

+      }

+      else {

+         switch (type) {

+         case GL_UNSIGNED_BYTE:

+         case GL_UNSIGNED_INT_8_8_8_8:

+         case GL_UNSIGNED_INT_8_8_8_8_REV:

+         default:

+            return GL_RGBA8;

+

+         case GL_UNSIGNED_BYTE_3_3_2:

+         case GL_UNSIGNED_BYTE_2_3_3_REV:

+         case GL_UNSIGNED_SHORT_4_4_4_4:

+         case GL_UNSIGNED_SHORT_4_4_4_4_REV:

+            return GL_RGBA4;

+

+         case GL_UNSIGNED_SHORT_5_6_5:

+         case GL_UNSIGNED_SHORT_5_6_5_REV:

+         case GL_UNSIGNED_SHORT_5_5_5_1:

+         case GL_UNSIGNED_SHORT_1_5_5_5_REV:

+            return GL_RGB5_A1;

+

+         case GL_UNSIGNED_INT_10_10_10_2:

+         case GL_UNSIGNED_INT_2_10_10_10_REV:

+            return GL_RGB10_A2;

+

+         case GL_UNSIGNED_SHORT:

+         case GL_UNSIGNED_INT:

+            return GL_RGBA16;

+

+         case GL_BYTE:

+            return

+               ctx->Extensions.EXT_texture_snorm ? GL_RGBA8_SNORM : GL_RGBA8;

+

+         case GL_SHORT:

+         case GL_INT:

+            return

+               ctx->Extensions.EXT_texture_snorm ? GL_RGBA16_SNORM : GL_RGBA16;

+

+         case GL_HALF_FLOAT_ARB:

+            return

+               ctx->Extensions.ARB_texture_float ? GL_RGBA16F :

+               ctx->Extensions.EXT_texture_snorm ? GL_RGBA16_SNORM : GL_RGBA16;

+

+         case GL_FLOAT:

+         case GL_DOUBLE:

+            return

+               ctx->Extensions.ARB_texture_float ? GL_RGBA32F :

+               ctx->Extensions.EXT_texture_snorm ? GL_RGBA16_SNORM : GL_RGBA16;

+         }

+      }

+   }

+}

+

+

+/**

+ * Create a temporary texture to hold an image of the given size.

+ * If width, height are not POT and the driver only handles POT textures,

+ * allocate the next larger size of texture that is POT.

+ */

+static struct pipe_resource *

+alloc_texture(struct st_context *st, GLsizei width, GLsizei height,

+              enum pipe_format texFormat)

+{

+   struct pipe_resource *pt;

+

+   pt = st_texture_create(st, st->internal_target, texFormat, 0,

+                          width, height, 1, 1, PIPE_BIND_SAMPLER_VIEW);

+

+   return pt;

+}

+

+

+/**

+ * Make texture containing an image for glDrawPixels image.

+ * If 'pixels' is NULL, leave the texture image data undefined.

+ */

+static struct pipe_resource *

+make_texture(struct st_context *st,

+	     GLsizei width, GLsizei height, GLenum format, GLenum type,

+	     const struct gl_pixelstore_attrib *unpack,

+	     const GLvoid *pixels)

+{

+   struct gl_context *ctx = st->ctx;

+   struct pipe_context *pipe = st->pipe;

+   gl_format mformat;

+   struct pipe_resource *pt;

+   enum pipe_format pipeFormat;

+   GLuint cpp;

+   GLenum baseFormat, intFormat;

+

+   baseFormat = base_format(format);

+   intFormat = internal_format(ctx, format, type);

+

+   mformat = st_ChooseTextureFormat_renderable(ctx, intFormat,

+                                               format, type, GL_FALSE);

+   assert(mformat);

+

+   pipeFormat = st_mesa_format_to_pipe_format(mformat);

+   assert(pipeFormat);

+   cpp = util_format_get_blocksize(pipeFormat);

+

+   pixels = _mesa_map_pbo_source(ctx, unpack, pixels);

+   if (!pixels)

+      return NULL;

+

+   /* alloc temporary texture */

+   pt = alloc_texture(st, width, height, pipeFormat);

+   if (!pt) {

+      _mesa_unmap_pbo_source(ctx, unpack);

+      return NULL;

+   }

+

+   {

+      struct pipe_transfer *transfer;

+      static const GLuint dstImageOffsets = 0;

+      GLboolean success;

+      GLubyte *dest;

+      const GLbitfield imageTransferStateSave = ctx->_ImageTransferState;

+

+      /* we'll do pixel transfer in a fragment shader */

+      ctx->_ImageTransferState = 0x0;

+

+      transfer = pipe_get_transfer(st->pipe, pt, 0, 0,

+                                   PIPE_TRANSFER_WRITE, 0, 0,

+                                   width, height);

+

+      /* map texture transfer */

+      dest = pipe_transfer_map(pipe, transfer);

+

+

+      /* Put image into texture transfer.

+       * Note that the image is actually going to be upside down in

+       * the texture.  We deal with that with texcoords.

+       */

+      success = _mesa_texstore(ctx, 2,           /* dims */

+                               baseFormat,       /* baseInternalFormat */

+                               mformat,          /* gl_format */

+                               dest,             /* dest */

+                               0, 0, 0,          /* dstX/Y/Zoffset */

+                               transfer->stride, /* dstRowStride, bytes */

+                               &dstImageOffsets, /* dstImageOffsets */

+                               width, height, 1, /* size */

+                               format, type,     /* src format/type */

+                               pixels,           /* data source */

+                               unpack);

+

+      /* unmap */

+      pipe_transfer_unmap(pipe, transfer);

+      pipe->transfer_destroy(pipe, transfer);

+

+      assert(success);

+

+      /* restore */

+      ctx->_ImageTransferState = imageTransferStateSave;

+   }

+

+   _mesa_unmap_pbo_source(ctx, unpack);

+

+   return pt;

+}

+

+

+/**

+ * Draw quad with texcoords and optional color.

+ * Coords are gallium window coords with y=0=top.

+ * \param color  may be null

+ * \param invertTex  if true, flip texcoords vertically

+ */

+static void

+draw_quad(struct gl_context *ctx, GLfloat x0, GLfloat y0, GLfloat z,

+          GLfloat x1, GLfloat y1, const GLfloat *color,

+          GLboolean invertTex, GLfloat maxXcoord, GLfloat maxYcoord)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   GLfloat verts[4][3][4]; /* four verts, three attribs, XYZW */

+

+   /* setup vertex data */

+   {

+      const struct gl_framebuffer *fb = st->ctx->DrawBuffer;

+      const GLfloat fb_width = (GLfloat) fb->Width;

+      const GLfloat fb_height = (GLfloat) fb->Height;

+      const GLfloat clip_x0 = x0 / fb_width * 2.0f - 1.0f;

+      const GLfloat clip_y0 = y0 / fb_height * 2.0f - 1.0f;

+      const GLfloat clip_x1 = x1 / fb_width * 2.0f - 1.0f;

+      const GLfloat clip_y1 = y1 / fb_height * 2.0f - 1.0f;

+      const GLfloat sLeft = 0.0f, sRight = maxXcoord;

+      const GLfloat tTop = invertTex ? maxYcoord : 0.0f;

+      const GLfloat tBot = invertTex ? 0.0f : maxYcoord;

+      GLuint i;

+

+      /* upper-left */

+      verts[0][0][0] = clip_x0;    /* v[0].attr[0].x */

+      verts[0][0][1] = clip_y0;    /* v[0].attr[0].y */

+

+      /* upper-right */

+      verts[1][0][0] = clip_x1;

+      verts[1][0][1] = clip_y0;

+

+      /* lower-right */

+      verts[2][0][0] = clip_x1;

+      verts[2][0][1] = clip_y1;

+

+      /* lower-left */

+      verts[3][0][0] = clip_x0;

+      verts[3][0][1] = clip_y1;

+

+      verts[0][1][0] = sLeft; /* v[0].attr[1].S */

+      verts[0][1][1] = tTop;  /* v[0].attr[1].T */

+      verts[1][1][0] = sRight;

+      verts[1][1][1] = tTop;

+      verts[2][1][0] = sRight;

+      verts[2][1][1] = tBot;

+      verts[3][1][0] = sLeft;

+      verts[3][1][1] = tBot;

+

+      /* same for all verts: */

+      if (color) {

+         for (i = 0; i < 4; i++) {

+            verts[i][0][2] = z;         /* v[i].attr[0].z */

+            verts[i][0][3] = 1.0f;      /* v[i].attr[0].w */

+            verts[i][2][0] = color[0];  /* v[i].attr[2].r */

+            verts[i][2][1] = color[1];  /* v[i].attr[2].g */

+            verts[i][2][2] = color[2];  /* v[i].attr[2].b */

+            verts[i][2][3] = color[3];  /* v[i].attr[2].a */

+            verts[i][1][2] = 0.0f;      /* v[i].attr[1].R */

+            verts[i][1][3] = 1.0f;      /* v[i].attr[1].Q */

+         }

+      }

+      else {

+         for (i = 0; i < 4; i++) {

+            verts[i][0][2] = z;    /*Z*/

+            verts[i][0][3] = 1.0f; /*W*/

+            verts[i][1][2] = 0.0f; /*R*/

+            verts[i][1][3] = 1.0f; /*Q*/

+         }

+      }

+   }

+

+   {

+      struct pipe_resource *buf;

+

+      /* allocate/load buffer object with vertex data */

+      buf = pipe_buffer_create(pipe->screen,

+			       PIPE_BIND_VERTEX_BUFFER,

+			       PIPE_USAGE_STATIC,

+                               sizeof(verts));

+      pipe_buffer_write(st->pipe, buf, 0, sizeof(verts), verts);

+

+      util_draw_vertex_buffer(pipe, st->cso_context, buf, 0,

+                              PIPE_PRIM_QUADS,

+                              4,  /* verts */

+                              3); /* attribs/vert */

+      pipe_resource_reference(&buf, NULL);

+   }

+}

+

+

+

+static void

+draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,

+                   GLsizei width, GLsizei height,

+                   GLfloat zoomX, GLfloat zoomY,

+                   struct pipe_sampler_view **sv,

+                   int num_sampler_view,

+                   void *driver_vp,

+                   void *driver_fp,

+                   const GLfloat *color,

+                   GLboolean invertTex,

+                   GLboolean write_depth, GLboolean write_stencil)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct cso_context *cso = st->cso_context;

+   GLfloat x0, y0, x1, y1;

+   GLsizei maxSize;

+   boolean normalized = sv[0]->texture->target != PIPE_TEXTURE_RECT;

+

+   /* limit checks */

+   /* XXX if DrawPixels image is larger than max texture size, break

+    * it up into chunks.

+    */

+   maxSize = 1 << (pipe->screen->get_param(pipe->screen,

+                                        PIPE_CAP_MAX_TEXTURE_2D_LEVELS) - 1);

+   assert(width <= maxSize);

+   assert(height <= maxSize);

+

+   cso_save_rasterizer(cso);

+   cso_save_viewport(cso);

+   cso_save_samplers(cso);

+   cso_save_fragment_sampler_views(cso);

+   cso_save_fragment_shader(cso);

+   cso_save_vertex_shader(cso);

+   cso_save_vertex_elements(cso);

+   cso_save_vertex_buffers(cso);

+   if (write_stencil) {

+      cso_save_depth_stencil_alpha(cso);

+      cso_save_blend(cso);

+   }

+

+   /* rasterizer state: just scissor */

+   {

+      struct pipe_rasterizer_state rasterizer;

+      memset(&rasterizer, 0, sizeof(rasterizer));

+      rasterizer.clamp_fragment_color = ctx->Color._ClampFragmentColor;

+      rasterizer.gl_rasterization_rules = 1;

+      rasterizer.scissor = ctx->Scissor.Enabled;

+      cso_set_rasterizer(cso, &rasterizer);

+   }

+

+   if (write_stencil) {

+      /* Stencil writing bypasses the normal fragment pipeline to

+       * disable color writing and set stencil test to always pass.

+       */

+      struct pipe_depth_stencil_alpha_state dsa;

+      struct pipe_blend_state blend;

+

+      /* depth/stencil */

+      memset(&dsa, 0, sizeof(dsa));

+      dsa.stencil[0].enabled = 1;

+      dsa.stencil[0].func = PIPE_FUNC_ALWAYS;

+      dsa.stencil[0].writemask = ctx->Stencil.WriteMask[0] & 0xff;

+      dsa.stencil[0].zpass_op = PIPE_STENCIL_OP_REPLACE;

+      if (write_depth) {

+         /* writing depth+stencil: depth test always passes */

+         dsa.depth.enabled = 1;

+         dsa.depth.writemask = ctx->Depth.Mask;

+         dsa.depth.func = PIPE_FUNC_ALWAYS;

+      }

+      cso_set_depth_stencil_alpha(cso, &dsa);

+

+      /* blend (colormask) */

+      memset(&blend, 0, sizeof(blend));

+      cso_set_blend(cso, &blend);

+   }

+

+   /* fragment shader state: TEX lookup program */

+   cso_set_fragment_shader_handle(cso, driver_fp);

+

+   /* vertex shader state: position + texcoord pass-through */

+   cso_set_vertex_shader_handle(cso, driver_vp);

+

+

+   /* texture sampling state: */

+   {

+      struct pipe_sampler_state sampler;

+      memset(&sampler, 0, sizeof(sampler));

+      sampler.wrap_s = PIPE_TEX_WRAP_CLAMP;

+      sampler.wrap_t = PIPE_TEX_WRAP_CLAMP;

+      sampler.wrap_r = PIPE_TEX_WRAP_CLAMP;

+      sampler.min_img_filter = PIPE_TEX_FILTER_NEAREST;

+      sampler.min_mip_filter = PIPE_TEX_MIPFILTER_NONE;

+      sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST;

+      sampler.normalized_coords = normalized;

+

+      cso_single_sampler(cso, 0, &sampler);

+      if (num_sampler_view > 1) {

+         cso_single_sampler(cso, 1, &sampler);

+      }

+      cso_single_sampler_done(cso);

+   }

+

+   /* viewport state: viewport matching window dims */

+   {

+      const float w = (float) ctx->DrawBuffer->Width;

+      const float h = (float) ctx->DrawBuffer->Height;

+      struct pipe_viewport_state vp;

+      vp.scale[0] =  0.5f * w;

+      vp.scale[1] = -0.5f * h;

+      vp.scale[2] = 0.5f;

+      vp.scale[3] = 1.0f;

+      vp.translate[0] = 0.5f * w;

+      vp.translate[1] = 0.5f * h;

+      vp.translate[2] = 0.5f;

+      vp.translate[3] = 0.0f;

+      cso_set_viewport(cso, &vp);

+   }

+

+   cso_set_vertex_elements(cso, 3, st->velems_util_draw);

+

+   /* texture state: */

+   cso_set_fragment_sampler_views(cso, num_sampler_view, sv);

+

+   /* Compute Gallium window coords (y=0=top) with pixel zoom.

+    * Recall that these coords are transformed by the current

+    * vertex shader and viewport transformation.

+    */

+   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_BOTTOM) {

+      y = ctx->DrawBuffer->Height - (int) (y + height * ctx->Pixel.ZoomY);

+      invertTex = !invertTex;

+   }

+

+   x0 = (GLfloat) x;

+   x1 = x + width * ctx->Pixel.ZoomX;

+   y0 = (GLfloat) y;

+   y1 = y + height * ctx->Pixel.ZoomY;

+

+   /* convert Z from [0,1] to [-1,-1] to match viewport Z scale/bias */

+   z = z * 2.0 - 1.0;

+

+   draw_quad(ctx, x0, y0, z, x1, y1, color, invertTex,

+             normalized ? ((GLfloat) width / sv[0]->texture->width0) : (GLfloat)width,

+             normalized ? ((GLfloat) height / sv[0]->texture->height0) : (GLfloat)height);

+

+   /* restore state */

+   cso_restore_rasterizer(cso);

+   cso_restore_viewport(cso);

+   cso_restore_samplers(cso);

+   cso_restore_fragment_sampler_views(cso);

+   cso_restore_fragment_shader(cso);

+   cso_restore_vertex_shader(cso);

+   cso_restore_vertex_elements(cso);

+   cso_restore_vertex_buffers(cso);

+   if (write_stencil) {

+      cso_restore_depth_stencil_alpha(cso);

+      cso_restore_blend(cso);

+   }

+}

+

+

+/**

+ * Software fallback to do glDrawPixels(GL_STENCIL_INDEX) when we

+ * can't use a fragment shader to write stencil values.

+ */

+static void

+draw_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,

+                    GLsizei width, GLsizei height, GLenum format, GLenum type,

+                    const struct gl_pixelstore_attrib *unpack,

+                    const GLvoid *pixels)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct st_renderbuffer *strb;

+   enum pipe_transfer_usage usage;

+   struct pipe_transfer *pt;

+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;

+   GLint skipPixels;

+   ubyte *stmap;

+   struct gl_pixelstore_attrib clippedUnpack = *unpack;

+

+   if (!zoom) {

+      if (!_mesa_clip_drawpixels(ctx, &x, &y, &width, &height,

+                                 &clippedUnpack)) {

+         /* totally clipped */

+         return;

+      }

+   }

+

+   strb = st_renderbuffer(ctx->DrawBuffer->

+                          Attachment[BUFFER_STENCIL].Renderbuffer);

+

+   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {

+      y = ctx->DrawBuffer->Height - y - height;

+   }

+

+   if(format != GL_DEPTH_STENCIL && 

+      util_format_get_component_bits(strb->format,

+                                     UTIL_FORMAT_COLORSPACE_ZS, 0) != 0)

+      usage = PIPE_TRANSFER_READ_WRITE;

+   else

+      usage = PIPE_TRANSFER_WRITE;

+

+   pt = pipe_get_transfer(st_context(ctx)->pipe, strb->texture, 0, 0,

+                                     usage, x, y,

+                                     width, height);

+

+   stmap = pipe_transfer_map(pipe, pt);

+

+   pixels = _mesa_map_pbo_source(ctx, &clippedUnpack, pixels);

+   assert(pixels);

+

+   /* if width > MAX_WIDTH, have to process image in chunks */

+   skipPixels = 0;

+   while (skipPixels < width) {

+      const GLint spanX = skipPixels;

+      const GLint spanWidth = MIN2(width - skipPixels, MAX_WIDTH);

+      GLint row;

+      for (row = 0; row < height; row++) {

+         GLubyte sValues[MAX_WIDTH];

+         GLuint zValues[MAX_WIDTH];

+         GLenum destType = GL_UNSIGNED_BYTE;

+         const GLvoid *source = _mesa_image_address2d(&clippedUnpack, pixels,

+                                                      width, height,

+                                                      format, type,

+                                                      row, skipPixels);

+         _mesa_unpack_stencil_span(ctx, spanWidth, destType, sValues,

+                                   type, source, &clippedUnpack,

+                                   ctx->_ImageTransferState);

+

+         if (format == GL_DEPTH_STENCIL) {

+            _mesa_unpack_depth_span(ctx, spanWidth, GL_UNSIGNED_INT, zValues,

+                                    (1 << 24) - 1, type, source,

+                                    &clippedUnpack);

+         }

+

+         if (zoom) {

+            _mesa_problem(ctx, "Gallium glDrawPixels(GL_STENCIL) with "

+                          "zoom not complete");

+         }

+

+         {

+            GLint spanY;

+

+            if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {

+               spanY = height - row - 1;

+            }

+            else {

+               spanY = row;

+            }

+

+            /* now pack the stencil (and Z) values in the dest format */

+            switch (pt->resource->format) {

+            case PIPE_FORMAT_S8_USCALED:

+               {

+                  ubyte *dest = stmap + spanY * pt->stride + spanX;

+                  assert(usage == PIPE_TRANSFER_WRITE);

+                  memcpy(dest, sValues, spanWidth);

+               }

+               break;

+            case PIPE_FORMAT_Z24_UNORM_S8_USCALED:

+               if (format == GL_DEPTH_STENCIL) {

+                  uint *dest = (uint *) (stmap + spanY * pt->stride + spanX*4);

+                  GLint k;

+                  assert(usage == PIPE_TRANSFER_WRITE);

+                  for (k = 0; k < spanWidth; k++) {

+                     dest[k] = zValues[k] | (sValues[k] << 24);

+                  }

+               }

+               else {

+                  uint *dest = (uint *) (stmap + spanY * pt->stride + spanX*4);

+                  GLint k;

+                  assert(usage == PIPE_TRANSFER_READ_WRITE);

+                  for (k = 0; k < spanWidth; k++) {

+                     dest[k] = (dest[k] & 0xffffff) | (sValues[k] << 24);

+                  }

+               }

+               break;

+            case PIPE_FORMAT_S8_USCALED_Z24_UNORM:

+               if (format == GL_DEPTH_STENCIL) {

+                  uint *dest = (uint *) (stmap + spanY * pt->stride + spanX*4);

+                  GLint k;

+                  assert(usage == PIPE_TRANSFER_WRITE);

+                  for (k = 0; k < spanWidth; k++) {

+                     dest[k] = (zValues[k] << 8) | (sValues[k] & 0xff);

+                  }

+               }

+               else {

+                  uint *dest = (uint *) (stmap + spanY * pt->stride + spanX*4);

+                  GLint k;

+                  assert(usage == PIPE_TRANSFER_READ_WRITE);

+                  for (k = 0; k < spanWidth; k++) {

+                     dest[k] = (dest[k] & 0xffffff00) | (sValues[k] & 0xff);

+                  }

+               }

+               break;

+            default:

+               assert(0);

+            }

+         }

+      }

+      skipPixels += spanWidth;

+   }

+

+   _mesa_unmap_pbo_source(ctx, &clippedUnpack);

+

+   /* unmap the stencil buffer */

+   pipe_transfer_unmap(pipe, pt);

+   pipe->transfer_destroy(pipe, pt);

+}

+

+

+/**

+ * Get fragment program variant for a glDrawPixels or glCopyPixels

+ * command for RGBA data.

+ */

+static struct st_fp_variant *

+get_color_fp_variant(struct st_context *st)

+{

+   struct gl_context *ctx = st->ctx;

+   struct st_fp_variant_key key;

+   struct st_fp_variant *fpv;

+

+   memset(&key, 0, sizeof(key));

+

+   key.st = st;

+   key.drawpixels = 1;

+   key.scaleAndBias = (ctx->Pixel.RedBias != 0.0 ||

+                       ctx->Pixel.RedScale != 1.0 ||

+                       ctx->Pixel.GreenBias != 0.0 ||

+                       ctx->Pixel.GreenScale != 1.0 ||

+                       ctx->Pixel.BlueBias != 0.0 ||

+                       ctx->Pixel.BlueScale != 1.0 ||

+                       ctx->Pixel.AlphaBias != 0.0 ||

+                       ctx->Pixel.AlphaScale != 1.0);

+   key.pixelMaps = ctx->Pixel.MapColorFlag;

+

+   fpv = st_get_fp_variant(st, st->fp, &key);

+

+   return fpv;

+}

+

+

+/**

+ * Get fragment program variant for a glDrawPixels or glCopyPixels

+ * command for depth/stencil data.

+ */

+static struct st_fp_variant *

+get_depth_stencil_fp_variant(struct st_context *st, GLboolean write_depth,

+                             GLboolean write_stencil)

+{

+   struct st_fp_variant_key key;

+   struct st_fp_variant *fpv;

+

+   memset(&key, 0, sizeof(key));

+

+   key.st = st;

+   key.drawpixels = 1;

+   key.drawpixels_z = write_depth;

+   key.drawpixels_stencil = write_stencil;

+

+   fpv = st_get_fp_variant(st, st->fp, &key);

+

+   return fpv;

+}

+

+

+/**

+ * Called via ctx->Driver.DrawPixels()

+ */

+static void

+st_DrawPixels(struct gl_context *ctx, GLint x, GLint y,

+              GLsizei width, GLsizei height,

+              GLenum format, GLenum type,

+              const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels)

+{

+   void *driver_vp, *driver_fp;

+   struct st_context *st = st_context(ctx);

+   const GLfloat *color;

+   struct pipe_context *pipe = st->pipe;

+   GLboolean write_stencil = GL_FALSE, write_depth = GL_FALSE;

+   struct pipe_sampler_view *sv[2];

+   int num_sampler_view = 1;

+   enum pipe_format stencil_format = PIPE_FORMAT_NONE;

+   struct st_fp_variant *fpv;

+

+   if (format == GL_DEPTH_STENCIL)

+      write_stencil = write_depth = GL_TRUE;

+   else if (format == GL_STENCIL_INDEX)

+      write_stencil = GL_TRUE;

+   else if (format == GL_DEPTH_COMPONENT)

+      write_depth = GL_TRUE;

+

+   if (write_stencil) {

+      enum pipe_format tex_format;

+      /* can we write to stencil if not fallback */

+      if (!pipe->screen->get_param(pipe->screen, PIPE_CAP_SHADER_STENCIL_EXPORT))

+	 goto stencil_fallback;

+      

+      tex_format = st_choose_format(st->pipe->screen, base_format(format),

+                                    PIPE_TEXTURE_2D,

+				    0, PIPE_BIND_SAMPLER_VIEW);

+      if (tex_format == PIPE_FORMAT_Z24_UNORM_S8_USCALED)

+	 stencil_format = PIPE_FORMAT_X24S8_USCALED;

+      else if (tex_format == PIPE_FORMAT_S8_USCALED_Z24_UNORM)

+	 stencil_format = PIPE_FORMAT_S8X24_USCALED;

+      else

+	 stencil_format = PIPE_FORMAT_S8_USCALED;

+      if (stencil_format == PIPE_FORMAT_NONE)

+	 goto stencil_fallback;

+   }

+

+   /* Mesa state should be up to date by now */

+   assert(ctx->NewState == 0x0);

+

+   st_validate_state(st);

+

+   /*

+    * Get vertex/fragment shaders

+    */

+   if (write_depth || write_stencil) {

+      fpv = get_depth_stencil_fp_variant(st, write_depth, write_stencil);

+

+      driver_fp = fpv->driver_shader;

+

+      driver_vp = make_passthrough_vertex_shader(st, GL_TRUE);

+

+      color = ctx->Current.RasterColor;

+   }

+   else {

+      fpv = get_color_fp_variant(st);

+

+      driver_fp = fpv->driver_shader;

+

+      driver_vp = make_passthrough_vertex_shader(st, GL_FALSE);

+

+      color = NULL;

+      if (st->pixel_xfer.pixelmap_enabled) {

+	  sv[1] = st->pixel_xfer.pixelmap_sampler_view;

+	  num_sampler_view++;

+      }

+   }

+

+   /* update fragment program constants */

+   st_upload_constants(st, fpv->parameters, PIPE_SHADER_FRAGMENT);

+

+   /* draw with textured quad */

+   {

+      struct pipe_resource *pt

+         = make_texture(st, width, height, format, type, unpack, pixels);

+      if (pt) {

+         sv[0] = st_create_texture_sampler_view(st->pipe, pt);

+

+         if (sv[0]) {

+	    if (write_stencil) {

+	       sv[1] = st_create_texture_sampler_view_format(st->pipe, pt,

+                                                             stencil_format);

+	       num_sampler_view++;

+	    }

+

+            draw_textured_quad(ctx, x, y, ctx->Current.RasterPos[2],

+                               width, height,

+                               ctx->Pixel.ZoomX, ctx->Pixel.ZoomY,

+                               sv,

+                               num_sampler_view,

+                               driver_vp,

+                               driver_fp,

+                               color, GL_FALSE, write_depth, write_stencil);

+            pipe_sampler_view_reference(&sv[0], NULL);

+            if (num_sampler_view > 1)

+               pipe_sampler_view_reference(&sv[1], NULL);

+         }

+         pipe_resource_reference(&pt, NULL);

+      }

+   }

+   return;

+

+stencil_fallback:

+   draw_stencil_pixels(ctx, x, y, width, height, format, type,

+		       unpack, pixels);

+}

+

+

+

+/**

+ * Software fallback for glCopyPixels(GL_STENCIL).

+ */

+static void

+copy_stencil_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,

+                    GLsizei width, GLsizei height,

+                    GLint dstx, GLint dsty)

+{

+   struct st_renderbuffer *rbDraw;

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   enum pipe_transfer_usage usage;

+   struct pipe_transfer *ptDraw;

+   ubyte *drawMap;

+   ubyte *buffer;

+   int i;

+

+   buffer = malloc(width * height * sizeof(ubyte));

+   if (!buffer) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels(stencil)");

+      return;

+   }

+

+   /* Get the dest renderbuffer.  If there's a wrapper, use the

+    * underlying renderbuffer.

+    */

+   rbDraw = st_renderbuffer(ctx->DrawBuffer->_StencilBuffer);

+   if (rbDraw->Base.Wrapped)

+      rbDraw = st_renderbuffer(rbDraw->Base.Wrapped);

+

+   /* this will do stencil pixel transfer ops */

+   st_read_stencil_pixels(ctx, srcx, srcy, width, height,

+                          GL_STENCIL_INDEX, GL_UNSIGNED_BYTE,

+                          &ctx->DefaultPacking, buffer);

+

+   if (0) {

+      /* debug code: dump stencil values */

+      GLint row, col;

+      for (row = 0; row < height; row++) {

+         printf("%3d: ", row);

+         for (col = 0; col < width; col++) {

+            printf("%02x ", buffer[col + row * width]);

+         }

+         printf("\n");

+      }

+   }

+

+   if (util_format_get_component_bits(rbDraw->format,

+                                     UTIL_FORMAT_COLORSPACE_ZS, 0) != 0)

+      usage = PIPE_TRANSFER_READ_WRITE;

+   else

+      usage = PIPE_TRANSFER_WRITE;

+

+   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {

+      dsty = rbDraw->Base.Height - dsty - height;

+   }

+

+   ptDraw = pipe_get_transfer(st_context(ctx)->pipe,

+                              rbDraw->texture, 0, 0,

+                              usage, dstx, dsty,

+                              width, height);

+

+   assert(util_format_get_blockwidth(ptDraw->resource->format) == 1);

+   assert(util_format_get_blockheight(ptDraw->resource->format) == 1);

+

+   /* map the stencil buffer */

+   drawMap = pipe_transfer_map(pipe, ptDraw);

+

+   /* draw */

+   /* XXX PixelZoom not handled yet */

+   for (i = 0; i < height; i++) {

+      ubyte *dst;

+      const ubyte *src;

+      int y;

+

+      y = i;

+

+      if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {

+         y = height - y - 1;

+      }

+

+      dst = drawMap + y * ptDraw->stride;

+      src = buffer + i * width;

+

+      switch (ptDraw->resource->format) {

+      case PIPE_FORMAT_Z24_UNORM_S8_USCALED:

+         {

+            uint *dst4 = (uint *) dst;

+            int j;

+            assert(usage == PIPE_TRANSFER_READ_WRITE);

+            for (j = 0; j < width; j++) {

+               *dst4 = (*dst4 & 0xffffff) | (src[j] << 24);

+               dst4++;

+            }

+         }

+         break;

+      case PIPE_FORMAT_S8_USCALED_Z24_UNORM:

+         {

+            uint *dst4 = (uint *) dst;

+            int j;

+            assert(usage == PIPE_TRANSFER_READ_WRITE);

+            for (j = 0; j < width; j++) {

+               *dst4 = (*dst4 & 0xffffff00) | (src[j] & 0xff);

+               dst4++;

+            }

+         }

+         break;

+      case PIPE_FORMAT_S8_USCALED:

+         assert(usage == PIPE_TRANSFER_WRITE);

+         memcpy(dst, src, width);

+         break;

+      default:

+         assert(0);

+      }

+   }

+

+   free(buffer);

+

+   /* unmap the stencil buffer */

+   pipe_transfer_unmap(pipe, ptDraw);

+   pipe->transfer_destroy(pipe, ptDraw);

+}

+

+

+/** Do the src/dest regions overlap? */

+static GLboolean

+regions_overlap(GLint srcX, GLint srcY, GLint dstX, GLint dstY,

+                GLsizei width, GLsizei height)

+{

+   if (srcX + width <= dstX ||

+       dstX + width <= srcX ||

+       srcY + height <= dstY ||

+       dstY + height <= srcY)

+      return GL_FALSE;

+   else

+      return GL_TRUE;

+}

+

+

+/**

+ * Try to do a glCopyPixels for simple cases with a blit by calling

+ * pipe->resource_copy_region().

+ *

+ * We can do this when we're copying color pixels (depth/stencil

+ * eventually) with no pixel zoom, no pixel transfer ops, no

+ * per-fragment ops, the src/dest regions don't overlap and the

+ * src/dest pixel formats are the same.

+ */

+static GLboolean

+blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,

+                 GLsizei width, GLsizei height,

+                 GLint dstx, GLint dsty, GLenum type)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct gl_pixelstore_attrib pack, unpack;

+   GLint readX, readY, readW, readH;

+

+   if (type == GL_COLOR &&

+       ctx->Pixel.ZoomX == 1.0 &&

+       ctx->Pixel.ZoomY == 1.0 &&

+       ctx->_ImageTransferState == 0x0 &&

+       !ctx->Color.BlendEnabled &&

+       !ctx->Color.AlphaEnabled &&

+       !ctx->Depth.Test &&

+       !ctx->Fog.Enabled &&

+       !ctx->Stencil.Enabled &&

+       !ctx->FragmentProgram.Enabled &&

+       !ctx->VertexProgram.Enabled &&

+       !ctx->Shader.CurrentFragmentProgram &&

+       st_fb_orientation(ctx->ReadBuffer) == st_fb_orientation(ctx->DrawBuffer) &&

+       ctx->DrawBuffer->_NumColorDrawBuffers == 1) {

+      struct st_renderbuffer *rbRead, *rbDraw;

+      GLint drawX, drawY;

+

+      /*

+       * Clip the read region against the src buffer bounds.

+       * We'll still allocate a temporary buffer/texture for the original

+       * src region size but we'll only read the region which is on-screen.

+       * This may mean that we draw garbage pixels into the dest region, but

+       * that's expected.

+       */

+      readX = srcx;

+      readY = srcy;

+      readW = width;

+      readH = height;

+      pack = ctx->DefaultPacking;

+      if (!_mesa_clip_readpixels(ctx, &readX, &readY, &readW, &readH, &pack))

+         return GL_TRUE; /* all done */

+

+      /* clip against dest buffer bounds and scissor box */

+      drawX = dstx + pack.SkipPixels;

+      drawY = dsty + pack.SkipRows;

+      unpack = pack;

+      if (!_mesa_clip_drawpixels(ctx, &drawX, &drawY, &readW, &readH, &unpack))

+         return GL_TRUE; /* all done */

+

+      readX = readX - pack.SkipPixels + unpack.SkipPixels;

+      readY = readY - pack.SkipRows + unpack.SkipRows;

+

+      rbRead = st_get_color_read_renderbuffer(ctx);

+      rbDraw = st_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]);

+

+      if ((rbRead != rbDraw ||

+           !regions_overlap(readX, readY, drawX, drawY, readW, readH)) &&

+          rbRead->Base.Format == rbDraw->Base.Format) {

+         struct pipe_box srcBox;

+

+         /* flip src/dst position if needed */

+         if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+            /* both buffers will have the same orientation */

+            readY = ctx->ReadBuffer->Height - readY - readH;

+            drawY = ctx->DrawBuffer->Height - drawY - readH;

+         }

+

+         u_box_2d(readX, readY, readW, readH, &srcBox);

+

+         pipe->resource_copy_region(pipe,

+                                    rbDraw->texture, 0, drawX, drawY, 0,

+                                    rbRead->texture, 0, &srcBox);

+         return GL_TRUE;

+      }

+   }

+

+   return GL_FALSE;

+}

+

+

+static void

+st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,

+              GLsizei width, GLsizei height,

+              GLint dstx, GLint dsty, GLenum type)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_screen *screen = pipe->screen;

+   struct st_renderbuffer *rbRead;

+   void *driver_vp, *driver_fp;

+   struct pipe_resource *pt;

+   struct pipe_sampler_view *sv[2];

+   int num_sampler_view = 1;

+   GLfloat *color;

+   enum pipe_format srcFormat, texFormat;

+   GLboolean invertTex = GL_FALSE;

+   GLint readX, readY, readW, readH;

+   GLuint sample_count;

+   struct gl_pixelstore_attrib pack = ctx->DefaultPacking;

+   struct st_fp_variant *fpv;

+

+   st_validate_state(st);

+

+   if (type == GL_STENCIL) {

+      /* can't use texturing to do stencil */

+      copy_stencil_pixels(ctx, srcx, srcy, width, height, dstx, dsty);

+      return;

+   }

+

+   if (blit_copy_pixels(ctx, srcx, srcy, width, height, dstx, dsty, type))

+      return;

+

+   /*

+    * The subsequent code implements glCopyPixels by copying the source

+    * pixels into a temporary texture that's then applied to a textured quad.

+    * When we draw the textured quad, all the usual per-fragment operations

+    * are handled.

+    */

+

+

+   /*

+    * Get vertex/fragment shaders

+    */

+   if (type == GL_COLOR) {

+      rbRead = st_get_color_read_renderbuffer(ctx);

+      color = NULL;

+

+      fpv = get_color_fp_variant(st);

+      driver_fp = fpv->driver_shader;

+

+      driver_vp = make_passthrough_vertex_shader(st, GL_FALSE);

+

+      if (st->pixel_xfer.pixelmap_enabled) {

+	  sv[1] = st->pixel_xfer.pixelmap_sampler_view;

+	  num_sampler_view++;

+      }

+   }

+   else {

+      assert(type == GL_DEPTH);

+      rbRead = st_renderbuffer(ctx->ReadBuffer->_DepthBuffer);

+      color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];

+

+      fpv = get_depth_stencil_fp_variant(st, GL_TRUE, GL_FALSE);

+      driver_fp = fpv->driver_shader;

+

+      driver_vp = make_passthrough_vertex_shader(st, GL_TRUE);

+   }

+

+   /* update fragment program constants */

+   st_upload_constants(st, fpv->parameters, PIPE_SHADER_FRAGMENT);

+

+

+   if (rbRead->Base.Wrapped)

+      rbRead = st_renderbuffer(rbRead->Base.Wrapped);

+

+   sample_count = rbRead->texture->nr_samples;

+   /* I believe this would be legal, presumably would need to do a resolve

+      for color, and for depth/stencil spec says to just use one of the

+      depth/stencil samples per pixel? Need some transfer clarifications. */

+   assert(sample_count < 2);

+

+   srcFormat = rbRead->texture->format;

+

+   if (screen->is_format_supported(screen, srcFormat, st->internal_target,

+                                   sample_count,

+                                   PIPE_BIND_SAMPLER_VIEW)) {

+      texFormat = srcFormat;

+   }

+   else {

+      /* srcFormat can't be used as a texture format */

+      if (type == GL_DEPTH) {

+         texFormat = st_choose_format(screen, GL_DEPTH_COMPONENT,

+                                      st->internal_target, sample_count,

+                                      PIPE_BIND_DEPTH_STENCIL);

+         assert(texFormat != PIPE_FORMAT_NONE);

+      }

+      else {

+         /* default color format */

+         texFormat = st_choose_format(screen, GL_RGBA, st->internal_target,

+                                      sample_count, PIPE_BIND_SAMPLER_VIEW);

+         assert(texFormat != PIPE_FORMAT_NONE);

+      }

+   }

+

+   /* Invert src region if needed */

+   if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+      srcy = ctx->ReadBuffer->Height - srcy - height;

+      invertTex = !invertTex;

+   }

+

+   /* Clip the read region against the src buffer bounds.

+    * We'll still allocate a temporary buffer/texture for the original

+    * src region size but we'll only read the region which is on-screen.

+    * This may mean that we draw garbage pixels into the dest region, but

+    * that's expected.

+    */

+   readX = srcx;

+   readY = srcy;

+   readW = width;

+   readH = height;

+   _mesa_clip_readpixels(ctx, &readX, &readY, &readW, &readH, &pack);

+   readW = MAX2(0, readW);

+   readH = MAX2(0, readH);

+

+   /* alloc temporary texture */

+   pt = alloc_texture(st, width, height, texFormat);

+   if (!pt)

+      return;

+

+   sv[0] = st_create_texture_sampler_view(st->pipe, pt);

+   if (!sv[0]) {

+      pipe_resource_reference(&pt, NULL);

+      return;

+   }

+

+   /* Make temporary texture which is a copy of the src region.

+    */

+   if (srcFormat == texFormat) {

+      struct pipe_box src_box;

+      u_box_2d(readX, readY, readW, readH, &src_box);

+      /* copy source framebuffer surface into mipmap/texture */

+      pipe->resource_copy_region(pipe,

+                                 pt,                                /* dest tex */

+                                 0,

+                                 pack.SkipPixels, pack.SkipRows, 0, /* dest pos */

+                                 rbRead->texture,                   /* src tex */

+                                 0,

+                                 &src_box);

+

+   }

+   else {

+      /* CPU-based fallback/conversion */

+      struct pipe_transfer *ptRead =

+         pipe_get_transfer(st->pipe, rbRead->texture,

+                           0, 0, /* level, layer */

+                           PIPE_TRANSFER_READ,

+                           readX, readY, readW, readH);

+      struct pipe_transfer *ptTex;

+      enum pipe_transfer_usage transfer_usage;

+

+      if (ST_DEBUG & DEBUG_FALLBACK)

+         debug_printf("%s: fallback processing\n", __FUNCTION__);

+

+      if (type == GL_DEPTH && util_format_is_depth_and_stencil(pt->format))

+         transfer_usage = PIPE_TRANSFER_READ_WRITE;

+      else

+         transfer_usage = PIPE_TRANSFER_WRITE;

+

+      ptTex = pipe_get_transfer(st->pipe, pt, 0, 0, transfer_usage,

+                                0, 0, width, height);

+

+      /* copy image from ptRead surface to ptTex surface */

+      if (type == GL_COLOR) {

+         /* alternate path using get/put_tile() */

+         GLfloat *buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));

+         enum pipe_format readFormat, drawFormat;

+         readFormat = util_format_linear(rbRead->texture->format);

+         drawFormat = util_format_linear(pt->format);

+         pipe_get_tile_rgba_format(pipe, ptRead, 0, 0, readW, readH,

+                                   readFormat, buf);

+         pipe_put_tile_rgba_format(pipe, ptTex, pack.SkipPixels, pack.SkipRows,

+                                   readW, readH, drawFormat, buf);

+         free(buf);

+      }

+      else {

+         /* GL_DEPTH */

+         GLuint *buf = (GLuint *) malloc(width * height * sizeof(GLuint));

+         pipe_get_tile_z(pipe, ptRead, 0, 0, readW, readH, buf);

+         pipe_put_tile_z(pipe, ptTex, pack.SkipPixels, pack.SkipRows,

+                         readW, readH, buf);

+         free(buf);

+      }

+

+      pipe->transfer_destroy(pipe, ptRead);

+      pipe->transfer_destroy(pipe, ptTex);

+   }

+

+   /* OK, the texture 'pt' contains the src image/pixels.  Now draw a

+    * textured quad with that texture.

+    */

+   draw_textured_quad(ctx, dstx, dsty, ctx->Current.RasterPos[2],

+                      width, height, ctx->Pixel.ZoomX, ctx->Pixel.ZoomY,

+                      sv,

+                      num_sampler_view,

+                      driver_vp, 

+                      driver_fp,

+                      color, invertTex, GL_FALSE, GL_FALSE);

+

+   pipe_resource_reference(&pt, NULL);

+   pipe_sampler_view_reference(&sv[0], NULL);

+}

+

+

+

+void st_init_drawpixels_functions(struct dd_function_table *functions)

+{

+   functions->DrawPixels = st_DrawPixels;

+   functions->CopyPixels = st_CopyPixels;

+}

+

+

+void

+st_destroy_drawpix(struct st_context *st)

+{

+   GLuint i;

+

+   for (i = 0; i < Elements(st->drawpix.shaders); i++) {

+      if (st->drawpix.shaders[i])

+         _mesa_reference_fragprog(st->ctx, &st->drawpix.shaders[i], NULL);

+   }

+

+   st_reference_fragprog(st, &st->pixel_xfer.combined_prog, NULL);

+   if (st->drawpix.vert_shaders[0])

+      ureg_free_tokens(st->drawpix.vert_shaders[0]);

+   if (st->drawpix.vert_shaders[1])

+      ureg_free_tokens(st->drawpix.vert_shaders[1]);

+}

+

+#endif /* FEATURE_drawpix */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawtex.c b/mesalib/src/mesa/state_tracker/st_cb_drawtex.c
index 86ceb9d78..db299eb8d 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawtex.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawtex.c
@@ -1,307 +1,307 @@
-/**************************************************************************
- * 
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- **************************************************************************/
-
-
-/**
- * Implementation of glDrawTex() for GL_OES_draw_tex
- */
-
-
-
-#include "main/imports.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-#include "program/program.h"
-#include "program/prog_print.h"
-
-#include "st_context.h"
-#include "st_atom.h"
-#include "st_cb_drawtex.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "util/u_inlines.h"
-#include "pipe/p_shader_tokens.h"
-#include "util/u_draw_quad.h"
-#include "util/u_simple_shaders.h"
-
-#include "cso_cache/cso_context.h"
-
-
-#if FEATURE_OES_draw_texture
-
-
-struct cached_shader
-{
-   void *handle;
-
-   uint num_attribs;
-   uint semantic_names[2 + MAX_TEXTURE_UNITS];
-   uint semantic_indexes[2 + MAX_TEXTURE_UNITS];
-};
-
-#define MAX_SHADERS (2 * MAX_TEXTURE_UNITS)
-
-/**
- * Simple linear list cache.
- * Most of the time there'll only be one cached shader.
- */
-static struct cached_shader CachedShaders[MAX_SHADERS];
-static GLuint NumCachedShaders = 0;
-
-
-static void *
-lookup_shader(struct pipe_context *pipe,
-              uint num_attribs,
-              const uint *semantic_names,
-              const uint *semantic_indexes)
-{
-   GLuint i, j;
-
-   /* look for existing shader with same attributes */
-   for (i = 0; i < NumCachedShaders; i++) {
-      if (CachedShaders[i].num_attribs == num_attribs) {
-         GLboolean match = GL_TRUE;
-         for (j = 0; j < num_attribs; j++) {
-            if (semantic_names[j] != CachedShaders[i].semantic_names[j] ||
-                semantic_indexes[j] != CachedShaders[i].semantic_indexes[j]) {
-               match = GL_FALSE;
-               break;
-            }
-         }
-         if (match)
-            return CachedShaders[i].handle;
-      }
-   }
-
-   /* not found - create new one now */
-   if (NumCachedShaders >= MAX_SHADERS) {
-      return NULL;
-   }
-
-   CachedShaders[i].num_attribs = num_attribs;
-   for (j = 0; j < num_attribs; j++) {
-      CachedShaders[i].semantic_names[j] = semantic_names[j];
-      CachedShaders[i].semantic_indexes[j] = semantic_indexes[j];
-   }
-
-   CachedShaders[i].handle =
-      util_make_vertex_passthrough_shader(pipe,
-                                          num_attribs,
-                                          semantic_names,
-                                          semantic_indexes);
-   NumCachedShaders++;
-
-   return CachedShaders[i].handle;
-}
-
-static void
-st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
-           GLfloat width, GLfloat height)
-{
-   struct st_context *st = ctx->st;
-   struct pipe_context *pipe = st->pipe;
-   struct cso_context *cso = ctx->st->cso_context;
-   struct pipe_resource *vbuffer;
-   struct pipe_transfer *vbuffer_transfer;
-   GLuint i, numTexCoords, numAttribs;
-   GLboolean emitColor;
-   uint semantic_names[2 + MAX_TEXTURE_UNITS];
-   uint semantic_indexes[2 + MAX_TEXTURE_UNITS];
-   struct pipe_vertex_element velements[2 + MAX_TEXTURE_UNITS];
-   GLbitfield inputs = VERT_BIT_POS;
-
-   st_validate_state(st);
-
-   /* determine if we need vertex color */
-   if (ctx->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_COL0)
-      emitColor = GL_TRUE;
-   else
-      emitColor = GL_FALSE;
-
-   /* determine how many enabled sets of texcoords */
-   numTexCoords = 0;
-   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
-      if (ctx->Texture.Unit[i]._ReallyEnabled & TEXTURE_2D_BIT) {
-         inputs |= VERT_BIT_TEX(i);
-         numTexCoords++;
-      }
-   }
-
-   /* total number of attributes per vertex */
-   numAttribs = 1 + emitColor + numTexCoords;
-
-
-   /* create the vertex buffer */
-   vbuffer = pipe_buffer_create(pipe->screen, PIPE_BIND_VERTEX_BUFFER,
-                                PIPE_USAGE_STREAM,
-                                numAttribs * 4 * 4 * sizeof(GLfloat));
-
-   /* load vertex buffer */
-   {
-#define SET_ATTRIB(VERT, ATTR, X, Y, Z, W)                              \
-      do {                                                              \
-         GLuint k = (((VERT) * numAttribs + (ATTR)) * 4);               \
-         assert(k < 4 * 4 * numAttribs);                                \
-         vbuf[k + 0] = X;                                               \
-         vbuf[k + 1] = Y;                                               \
-         vbuf[k + 2] = Z;                                               \
-         vbuf[k + 3] = W;                                               \
-      } while (0)
-
-      const GLfloat x0 = x, y0 = y, x1 = x + width, y1 = y + height;
-      GLfloat *vbuf = (GLfloat *) pipe_buffer_map(pipe, vbuffer,
-                                                  PIPE_TRANSFER_WRITE,
-                                                  &vbuffer_transfer);
-      GLuint attr;
-      
-      z = CLAMP(z, 0.0f, 1.0f);
-
-      /* positions (in clip coords) */
-      {
-         const struct gl_framebuffer *fb = st->ctx->DrawBuffer;
-         const GLfloat fb_width = (GLfloat)fb->Width;
-         const GLfloat fb_height = (GLfloat)fb->Height;
-
-         const GLfloat clip_x0 = (GLfloat)(x0 / fb_width * 2.0 - 1.0);
-         const GLfloat clip_y0 = (GLfloat)(y0 / fb_height * 2.0 - 1.0);
-         const GLfloat clip_x1 = (GLfloat)(x1 / fb_width * 2.0 - 1.0);
-         const GLfloat clip_y1 = (GLfloat)(y1 / fb_height * 2.0 - 1.0);
-
-         SET_ATTRIB(0, 0, clip_x0, clip_y0, z, 1.0f);   /* lower left */
-         SET_ATTRIB(1, 0, clip_x1, clip_y0, z, 1.0f);   /* lower right */
-         SET_ATTRIB(2, 0, clip_x1, clip_y1, z, 1.0f);   /* upper right */
-         SET_ATTRIB(3, 0, clip_x0, clip_y1, z, 1.0f);   /* upper left */
-
-         semantic_names[0] = TGSI_SEMANTIC_POSITION;
-         semantic_indexes[0] = 0;
-      }
-
-      /* colors */
-      if (emitColor) {
-         const GLfloat *c = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
-         SET_ATTRIB(0, 1, c[0], c[1], c[2], c[3]);
-         SET_ATTRIB(1, 1, c[0], c[1], c[2], c[3]);
-         SET_ATTRIB(2, 1, c[0], c[1], c[2], c[3]);
-         SET_ATTRIB(3, 1, c[0], c[1], c[2], c[3]);
-         semantic_names[1] = TGSI_SEMANTIC_COLOR;
-         semantic_indexes[1] = 0;
-         attr = 2;
-      }
-      else {
-         attr = 1;
-      }
-
-      /* texcoords */
-      for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
-         if (ctx->Texture.Unit[i]._ReallyEnabled & TEXTURE_2D_BIT) {
-            struct gl_texture_object *obj = ctx->Texture.Unit[i]._Current;
-            struct gl_texture_image *img = obj->Image[0][obj->BaseLevel];
-            const GLfloat wt = (GLfloat) img->Width;
-            const GLfloat ht = (GLfloat) img->Height;
-            const GLfloat s0 = obj->CropRect[0] / wt;
-            const GLfloat t0 = obj->CropRect[1] / ht;
-            const GLfloat s1 = (obj->CropRect[0] + obj->CropRect[2]) / wt;
-            const GLfloat t1 = (obj->CropRect[1] + obj->CropRect[3]) / ht;
-
-            /*printf("crop texcoords: %g, %g .. %g, %g\n", s0, t0, s1, t1);*/
-            SET_ATTRIB(0, attr, s0, t0, 0.0f, 1.0f);  /* lower left */
-            SET_ATTRIB(1, attr, s1, t0, 0.0f, 1.0f);  /* lower right */
-            SET_ATTRIB(2, attr, s1, t1, 0.0f, 1.0f);  /* upper right */
-            SET_ATTRIB(3, attr, s0, t1, 0.0f, 1.0f);  /* upper left */
-
-            semantic_names[attr] = TGSI_SEMANTIC_GENERIC;
-            semantic_indexes[attr] = 0;
-
-            attr++;
-         }
-      }
-
-      pipe_buffer_unmap(pipe, vbuffer_transfer);
-
-#undef SET_ATTRIB
-   }
-
-
-   cso_save_viewport(cso);
-   cso_save_vertex_shader(cso);
-   cso_save_vertex_elements(cso);
-   cso_save_vertex_buffers(cso);
-
-   {
-      void *vs = lookup_shader(pipe, numAttribs,
-                               semantic_names, semantic_indexes);
-      cso_set_vertex_shader_handle(cso, vs);
-   }
-
-   for (i = 0; i < numAttribs; i++) {
-      velements[i].src_offset = i * 4 * sizeof(float);
-      velements[i].instance_divisor = 0;
-      velements[i].vertex_buffer_index = 0;
-      velements[i].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
-   }
-   cso_set_vertex_elements(cso, numAttribs, velements);
-
-   /* viewport state: viewport matching window dims */
-   {
-      const struct gl_framebuffer *fb = st->ctx->DrawBuffer;
-      const GLboolean invert = (st_fb_orientation(fb) == Y_0_TOP);
-      const GLfloat width = (GLfloat)fb->Width;
-      const GLfloat height = (GLfloat)fb->Height;
-      struct pipe_viewport_state vp;
-      vp.scale[0] =  0.5f * width;
-      vp.scale[1] = height * (invert ? -0.5f : 0.5f);
-      vp.scale[2] = 1.0f;
-      vp.scale[3] = 1.0f;
-      vp.translate[0] = 0.5f * width;
-      vp.translate[1] = 0.5f * height;
-      vp.translate[2] = 0.0f;
-      vp.translate[3] = 0.0f;
-      cso_set_viewport(cso, &vp);
-   }
-
-
-   util_draw_vertex_buffer(pipe, cso, vbuffer,
-                           0,  /* offset */
-                           PIPE_PRIM_TRIANGLE_FAN,
-                           4,  /* verts */
-                           numAttribs); /* attribs/vert */
-
-
-   pipe_resource_reference(&vbuffer, NULL);
-
-   /* restore state */
-   cso_restore_viewport(cso);
-   cso_restore_vertex_shader(cso);
-   cso_restore_vertex_elements(cso);
-   cso_restore_vertex_buffers(cso);
-}
-
-
-void
-st_init_drawtex_functions(struct dd_function_table *functions)
-{
-   functions->DrawTex = st_DrawTex;
-}
-
-
-/**
- * Free any cached shaders
- */
-void
-st_destroy_drawtex(struct st_context *st)
-{
-   GLuint i;
-   for (i = 0; i < NumCachedShaders; i++) {
-      cso_delete_vertex_shader(st->cso_context, CachedShaders[i].handle);
-   }
-   NumCachedShaders = 0;
-}
-
-
-#endif /* FEATURE_OES_draw_texture */
+/**************************************************************************

+ * 

+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ *

+ **************************************************************************/

+

+

+/**

+ * Implementation of glDrawTex() for GL_OES_draw_tex

+ */

+

+

+

+#include "main/imports.h"

+#include "main/image.h"

+#include "main/macros.h"

+#include "main/mfeatures.h"

+#include "program/program.h"

+#include "program/prog_print.h"

+

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_cb_drawtex.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "util/u_inlines.h"

+#include "pipe/p_shader_tokens.h"

+#include "util/u_draw_quad.h"

+#include "util/u_simple_shaders.h"

+

+#include "cso_cache/cso_context.h"

+

+

+#if FEATURE_OES_draw_texture

+

+

+struct cached_shader

+{

+   void *handle;

+

+   uint num_attribs;

+   uint semantic_names[2 + MAX_TEXTURE_UNITS];

+   uint semantic_indexes[2 + MAX_TEXTURE_UNITS];

+};

+

+#define MAX_SHADERS (2 * MAX_TEXTURE_UNITS)

+

+/**

+ * Simple linear list cache.

+ * Most of the time there'll only be one cached shader.

+ */

+static struct cached_shader CachedShaders[MAX_SHADERS];

+static GLuint NumCachedShaders = 0;

+

+

+static void *

+lookup_shader(struct pipe_context *pipe,

+              uint num_attribs,

+              const uint *semantic_names,

+              const uint *semantic_indexes)

+{

+   GLuint i, j;

+

+   /* look for existing shader with same attributes */

+   for (i = 0; i < NumCachedShaders; i++) {

+      if (CachedShaders[i].num_attribs == num_attribs) {

+         GLboolean match = GL_TRUE;

+         for (j = 0; j < num_attribs; j++) {

+            if (semantic_names[j] != CachedShaders[i].semantic_names[j] ||

+                semantic_indexes[j] != CachedShaders[i].semantic_indexes[j]) {

+               match = GL_FALSE;

+               break;

+            }

+         }

+         if (match)

+            return CachedShaders[i].handle;

+      }

+   }

+

+   /* not found - create new one now */

+   if (NumCachedShaders >= MAX_SHADERS) {

+      return NULL;

+   }

+

+   CachedShaders[i].num_attribs = num_attribs;

+   for (j = 0; j < num_attribs; j++) {

+      CachedShaders[i].semantic_names[j] = semantic_names[j];

+      CachedShaders[i].semantic_indexes[j] = semantic_indexes[j];

+   }

+

+   CachedShaders[i].handle =

+      util_make_vertex_passthrough_shader(pipe,

+                                          num_attribs,

+                                          semantic_names,

+                                          semantic_indexes);

+   NumCachedShaders++;

+

+   return CachedShaders[i].handle;

+}

+

+static void

+st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,

+           GLfloat width, GLfloat height)

+{

+   struct st_context *st = ctx->st;

+   struct pipe_context *pipe = st->pipe;

+   struct cso_context *cso = ctx->st->cso_context;

+   struct pipe_resource *vbuffer;

+   struct pipe_transfer *vbuffer_transfer;

+   GLuint i, numTexCoords, numAttribs;

+   GLboolean emitColor;

+   uint semantic_names[2 + MAX_TEXTURE_UNITS];

+   uint semantic_indexes[2 + MAX_TEXTURE_UNITS];

+   struct pipe_vertex_element velements[2 + MAX_TEXTURE_UNITS];

+   GLbitfield inputs = VERT_BIT_POS;

+

+   st_validate_state(st);

+

+   /* determine if we need vertex color */

+   if (ctx->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_COL0)

+      emitColor = GL_TRUE;

+   else

+      emitColor = GL_FALSE;

+

+   /* determine how many enabled sets of texcoords */

+   numTexCoords = 0;

+   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {

+      if (ctx->Texture.Unit[i]._ReallyEnabled & TEXTURE_2D_BIT) {

+         inputs |= VERT_BIT_TEX(i);

+         numTexCoords++;

+      }

+   }

+

+   /* total number of attributes per vertex */

+   numAttribs = 1 + emitColor + numTexCoords;

+

+

+   /* create the vertex buffer */

+   vbuffer = pipe_buffer_create(pipe->screen, PIPE_BIND_VERTEX_BUFFER,

+                                PIPE_USAGE_STREAM,

+                                numAttribs * 4 * 4 * sizeof(GLfloat));

+

+   /* load vertex buffer */

+   {

+#define SET_ATTRIB(VERT, ATTR, X, Y, Z, W)                              \

+      do {                                                              \

+         GLuint k = (((VERT) * numAttribs + (ATTR)) * 4);               \

+         assert(k < 4 * 4 * numAttribs);                                \

+         vbuf[k + 0] = X;                                               \

+         vbuf[k + 1] = Y;                                               \

+         vbuf[k + 2] = Z;                                               \

+         vbuf[k + 3] = W;                                               \

+      } while (0)

+

+      const GLfloat x0 = x, y0 = y, x1 = x + width, y1 = y + height;

+      GLfloat *vbuf = (GLfloat *) pipe_buffer_map(pipe, vbuffer,

+                                                  PIPE_TRANSFER_WRITE,

+                                                  &vbuffer_transfer);

+      GLuint attr;

+      

+      z = CLAMP(z, 0.0f, 1.0f);

+

+      /* positions (in clip coords) */

+      {

+         const struct gl_framebuffer *fb = st->ctx->DrawBuffer;

+         const GLfloat fb_width = (GLfloat)fb->Width;

+         const GLfloat fb_height = (GLfloat)fb->Height;

+

+         const GLfloat clip_x0 = (GLfloat)(x0 / fb_width * 2.0 - 1.0);

+         const GLfloat clip_y0 = (GLfloat)(y0 / fb_height * 2.0 - 1.0);

+         const GLfloat clip_x1 = (GLfloat)(x1 / fb_width * 2.0 - 1.0);

+         const GLfloat clip_y1 = (GLfloat)(y1 / fb_height * 2.0 - 1.0);

+

+         SET_ATTRIB(0, 0, clip_x0, clip_y0, z, 1.0f);   /* lower left */

+         SET_ATTRIB(1, 0, clip_x1, clip_y0, z, 1.0f);   /* lower right */

+         SET_ATTRIB(2, 0, clip_x1, clip_y1, z, 1.0f);   /* upper right */

+         SET_ATTRIB(3, 0, clip_x0, clip_y1, z, 1.0f);   /* upper left */

+

+         semantic_names[0] = TGSI_SEMANTIC_POSITION;

+         semantic_indexes[0] = 0;

+      }

+

+      /* colors */

+      if (emitColor) {

+         const GLfloat *c = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];

+         SET_ATTRIB(0, 1, c[0], c[1], c[2], c[3]);

+         SET_ATTRIB(1, 1, c[0], c[1], c[2], c[3]);

+         SET_ATTRIB(2, 1, c[0], c[1], c[2], c[3]);

+         SET_ATTRIB(3, 1, c[0], c[1], c[2], c[3]);

+         semantic_names[1] = TGSI_SEMANTIC_COLOR;

+         semantic_indexes[1] = 0;

+         attr = 2;

+      }

+      else {

+         attr = 1;

+      }

+

+      /* texcoords */

+      for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {

+         if (ctx->Texture.Unit[i]._ReallyEnabled & TEXTURE_2D_BIT) {

+            struct gl_texture_object *obj = ctx->Texture.Unit[i]._Current;

+            struct gl_texture_image *img = obj->Image[0][obj->BaseLevel];

+            const GLfloat wt = (GLfloat) img->Width;

+            const GLfloat ht = (GLfloat) img->Height;

+            const GLfloat s0 = obj->CropRect[0] / wt;

+            const GLfloat t0 = obj->CropRect[1] / ht;

+            const GLfloat s1 = (obj->CropRect[0] + obj->CropRect[2]) / wt;

+            const GLfloat t1 = (obj->CropRect[1] + obj->CropRect[3]) / ht;

+

+            /*printf("crop texcoords: %g, %g .. %g, %g\n", s0, t0, s1, t1);*/

+            SET_ATTRIB(0, attr, s0, t0, 0.0f, 1.0f);  /* lower left */

+            SET_ATTRIB(1, attr, s1, t0, 0.0f, 1.0f);  /* lower right */

+            SET_ATTRIB(2, attr, s1, t1, 0.0f, 1.0f);  /* upper right */

+            SET_ATTRIB(3, attr, s0, t1, 0.0f, 1.0f);  /* upper left */

+

+            semantic_names[attr] = TGSI_SEMANTIC_GENERIC;

+            semantic_indexes[attr] = 0;

+

+            attr++;

+         }

+      }

+

+      pipe_buffer_unmap(pipe, vbuffer_transfer);

+

+#undef SET_ATTRIB

+   }

+

+

+   cso_save_viewport(cso);

+   cso_save_vertex_shader(cso);

+   cso_save_vertex_elements(cso);

+   cso_save_vertex_buffers(cso);

+

+   {

+      void *vs = lookup_shader(pipe, numAttribs,

+                               semantic_names, semantic_indexes);

+      cso_set_vertex_shader_handle(cso, vs);

+   }

+

+   for (i = 0; i < numAttribs; i++) {

+      velements[i].src_offset = i * 4 * sizeof(float);

+      velements[i].instance_divisor = 0;

+      velements[i].vertex_buffer_index = 0;

+      velements[i].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;

+   }

+   cso_set_vertex_elements(cso, numAttribs, velements);

+

+   /* viewport state: viewport matching window dims */

+   {

+      const struct gl_framebuffer *fb = st->ctx->DrawBuffer;

+      const GLboolean invert = (st_fb_orientation(fb) == Y_0_TOP);

+      const GLfloat width = (GLfloat)fb->Width;

+      const GLfloat height = (GLfloat)fb->Height;

+      struct pipe_viewport_state vp;

+      vp.scale[0] =  0.5f * width;

+      vp.scale[1] = height * (invert ? -0.5f : 0.5f);

+      vp.scale[2] = 1.0f;

+      vp.scale[3] = 1.0f;

+      vp.translate[0] = 0.5f * width;

+      vp.translate[1] = 0.5f * height;

+      vp.translate[2] = 0.0f;

+      vp.translate[3] = 0.0f;

+      cso_set_viewport(cso, &vp);

+   }

+

+

+   util_draw_vertex_buffer(pipe, cso, vbuffer,

+                           0,  /* offset */

+                           PIPE_PRIM_TRIANGLE_FAN,

+                           4,  /* verts */

+                           numAttribs); /* attribs/vert */

+

+

+   pipe_resource_reference(&vbuffer, NULL);

+

+   /* restore state */

+   cso_restore_viewport(cso);

+   cso_restore_vertex_shader(cso);

+   cso_restore_vertex_elements(cso);

+   cso_restore_vertex_buffers(cso);

+}

+

+

+void

+st_init_drawtex_functions(struct dd_function_table *functions)

+{

+   functions->DrawTex = st_DrawTex;

+}

+

+

+/**

+ * Free any cached shaders

+ */

+void

+st_destroy_drawtex(struct st_context *st)

+{

+   GLuint i;

+   for (i = 0; i < NumCachedShaders; i++) {

+      cso_delete_vertex_shader(st->cso_context, CachedShaders[i].handle);

+   }

+   NumCachedShaders = 0;

+}

+

+

+#endif /* FEATURE_OES_draw_texture */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_readpixels.c b/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
index 03f58bf0f..425019dca 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
@@ -1,564 +1,564 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
-
-/**
- * glReadPixels interface to pipe
- *
- * \author Brian Paul
- */
-
-
-#include "main/imports.h"
-#include "main/bufferobj.h"
-#include "main/context.h"
-#include "main/image.h"
-#include "main/pack.h"
-#include "main/pbo.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "util/u_format.h"
-#include "util/u_inlines.h"
-#include "util/u_tile.h"
-
-#include "st_debug.h"
-#include "st_context.h"
-#include "st_atom.h"
-#include "st_cb_bitmap.h"
-#include "st_cb_readpixels.h"
-#include "st_cb_fbo.h"
-
-/**
- * Special case for reading stencil buffer.
- * For color/depth we use get_tile().  For stencil, map the stencil buffer.
- */
-void
-st_read_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
-                       GLsizei width, GLsizei height,
-                       GLenum format, GLenum type,
-                       const struct gl_pixelstore_attrib *packing,
-                       GLvoid *pixels)
-{
-   struct gl_framebuffer *fb = ctx->ReadBuffer;
-   struct pipe_context *pipe = st_context(ctx)->pipe;
-   struct st_renderbuffer *strb = st_renderbuffer(fb->_StencilBuffer);
-   struct pipe_transfer *pt;
-   ubyte *stmap;
-   GLint j;
-
-   if (strb->Base.Wrapped) {
-      strb = st_renderbuffer(strb->Base.Wrapped);
-   }
-
-   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {
-      y = ctx->DrawBuffer->Height - y - height;
-   }
-
-   /* Create a read transfer from the renderbuffer's texture */
-
-   pt = pipe_get_transfer(pipe, strb->texture,
-                          0, 0,
-                          PIPE_TRANSFER_READ,
-                          x, y, width, height);
-
-   /* map the stencil buffer */
-   stmap = pipe_transfer_map(pipe, pt);
-
-   /* width should never be > MAX_WIDTH since we did clipping earlier */
-   ASSERT(width <= MAX_WIDTH);
-
-   /* process image row by row */
-   for (j = 0; j < height; j++) {
-      GLvoid *dest;
-      GLstencil sValues[MAX_WIDTH];
-      GLfloat zValues[MAX_WIDTH];
-      GLint srcY;
-
-      if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {
-         srcY = height - j - 1;
-      }
-      else {
-         srcY = j;
-      }
-
-      /* get stencil (and Z) values */
-      switch (pt->resource->format) {
-      case PIPE_FORMAT_S8_USCALED:
-         {
-            const ubyte *src = stmap + srcY * pt->stride;
-            memcpy(sValues, src, width);
-         }
-         break;
-      case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
-         if (format == GL_DEPTH_STENCIL) {
-            const uint *src = (uint *) (stmap + srcY * pt->stride);
-            const GLfloat scale = 1.0f / (0xffffff);
-            GLint k;
-            for (k = 0; k < width; k++) {
-               sValues[k] = src[k] >> 24;
-               zValues[k] = (src[k] & 0xffffff) * scale;
-            }
-         }
-         else {
-            const uint *src = (uint *) (stmap + srcY * pt->stride);
-            GLint k;
-            for (k = 0; k < width; k++) {
-               sValues[k] = src[k] >> 24;
-            }
-         }
-         break;
-      case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
-         if (format == GL_DEPTH_STENCIL) {
-            const uint *src = (uint *) (stmap + srcY * pt->stride);
-            const GLfloat scale = 1.0f / (0xffffff);
-            GLint k;
-            for (k = 0; k < width; k++) {
-               sValues[k] = src[k] & 0xff;
-               zValues[k] = (src[k] >> 8) * scale;
-            }
-         }
-         else {
-            const uint *src = (uint *) (stmap + srcY * pt->stride);
-            GLint k;
-            for (k = 0; k < width; k++) {
-               sValues[k] = src[k] & 0xff;
-            }
-         }
-         break;
-      default:
-         assert(0);
-      }
-
-      /* store */
-      dest = _mesa_image_address2d(packing, pixels, width, height,
-                                   format, type, j, 0);
-      if (format == GL_DEPTH_STENCIL) {
-         _mesa_pack_depth_stencil_span(ctx, width, dest,
-                                       zValues, sValues, packing);
-      }
-      else {
-         _mesa_pack_stencil_span(ctx, width, type, dest, sValues, packing);
-      }
-   }
-
-   /* unmap the stencil buffer */
-   pipe_transfer_unmap(pipe, pt);
-   pipe->transfer_destroy(pipe, pt);
-}
-
-
-/**
- * Return renderbuffer to use for reading color pixels for glRead/CopyPixel
- * commands.
- */
-struct st_renderbuffer *
-st_get_color_read_renderbuffer(struct gl_context *ctx)
-{
-   struct gl_framebuffer *fb = ctx->ReadBuffer;
-   struct st_renderbuffer *strb =
-      st_renderbuffer(fb->_ColorReadBuffer);
-
-   return strb;
-}
-
-
-/**
- * Try to do glReadPixels in a fast manner for common cases.
- * \return GL_TRUE for success, GL_FALSE for failure
- */
-static GLboolean
-st_fast_readpixels(struct gl_context *ctx, struct st_renderbuffer *strb,
-                   GLint x, GLint y, GLsizei width, GLsizei height,
-                   GLenum format, GLenum type,
-                   const struct gl_pixelstore_attrib *pack,
-                   GLvoid *dest)
-{
-   enum combination {
-      A8R8G8B8_UNORM_TO_RGBA_UBYTE,
-      A8R8G8B8_UNORM_TO_RGB_UBYTE,
-      A8R8G8B8_UNORM_TO_BGRA_UINT
-   } combo;
-
-   if (ctx->_ImageTransferState)
-      return GL_FALSE;
-
-   if (strb->format == PIPE_FORMAT_B8G8R8A8_UNORM &&
-       format == GL_RGBA && type == GL_UNSIGNED_BYTE) {
-      combo = A8R8G8B8_UNORM_TO_RGBA_UBYTE;
-   }
-   else if (strb->format == PIPE_FORMAT_B8G8R8A8_UNORM &&
-            format == GL_RGB && type == GL_UNSIGNED_BYTE) {
-      combo = A8R8G8B8_UNORM_TO_RGB_UBYTE;
-   }
-   else if (strb->format == PIPE_FORMAT_B8G8R8A8_UNORM &&
-            format == GL_BGRA && type == GL_UNSIGNED_INT_8_8_8_8_REV) {
-      combo = A8R8G8B8_UNORM_TO_BGRA_UINT;
-   }
-   else {
-      return GL_FALSE;
-   }
-
-   /*printf("st_fast_readpixels combo %d\n", (GLint) combo);*/
-
-   {
-      struct pipe_context *pipe = st_context(ctx)->pipe;
-      struct pipe_transfer *trans;
-      const GLubyte *map;
-      GLubyte *dst;
-      GLint row, col, dy, dstStride;
-
-      if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {
-         /* convert GL Y to Gallium Y */
-         y = strb->texture->height0 - y - height;
-      }
-
-      trans = pipe_get_transfer(pipe, strb->texture,
-                                0, 0,
-                                PIPE_TRANSFER_READ,
-                                x, y, width, height);
-      if (!trans) {
-         return GL_FALSE;
-      }
-
-      map = pipe_transfer_map(pipe, trans);
-      if (!map) {
-         pipe->transfer_destroy(pipe, trans);
-         return GL_FALSE;
-      }
-
-      /* We always write to the user/dest buffer from low addr to high addr
-       * but the read order depends on renderbuffer orientation
-       */
-      if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {
-         /* read source rows from bottom to top */
-         y = height - 1;
-         dy = -1;
-      }
-      else {
-         /* read source rows from top to bottom */
-         y = 0;
-         dy = 1;
-      }
-
-      dst = _mesa_image_address2d(pack, dest, width, height,
-                                  format, type, 0, 0);
-      dstStride = _mesa_image_row_stride(pack, width, format, type);
-
-      switch (combo) {
-      case A8R8G8B8_UNORM_TO_RGBA_UBYTE:
-         for (row = 0; row < height; row++) {
-            const GLubyte *src = map + y * trans->stride;
-            for (col = 0; col < width; col++) {
-               GLuint pixel = ((GLuint *) src)[col];
-               dst[col*4+0] = (pixel >> 16) & 0xff;
-               dst[col*4+1] = (pixel >>  8) & 0xff;
-               dst[col*4+2] = (pixel >>  0) & 0xff;
-               dst[col*4+3] = (pixel >> 24) & 0xff;
-            }
-            dst += dstStride;
-            y += dy;
-         }
-         break;
-      case A8R8G8B8_UNORM_TO_RGB_UBYTE:
-         for (row = 0; row < height; row++) {
-            const GLubyte *src = map + y * trans->stride;
-            for (col = 0; col < width; col++) {
-               GLuint pixel = ((GLuint *) src)[col];
-               dst[col*3+0] = (pixel >> 16) & 0xff;
-               dst[col*3+1] = (pixel >>  8) & 0xff;
-               dst[col*3+2] = (pixel >>  0) & 0xff;
-            }
-            dst += dstStride;
-            y += dy;
-         }
-         break;
-      case A8R8G8B8_UNORM_TO_BGRA_UINT:
-         for (row = 0; row < height; row++) {
-            const GLubyte *src = map + y * trans->stride;
-            memcpy(dst, src, 4 * width);
-            dst += dstStride;
-            y += dy;
-         }
-         break;
-      default:
-         ; /* nothing */
-      }
-
-      pipe_transfer_unmap(pipe, trans);
-      pipe->transfer_destroy(pipe, trans);
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Do glReadPixels by getting rows from the framebuffer transfer with
- * get_tile().  Convert to requested format/type with Mesa image routines.
- * Image transfer ops are done in software too.
- */
-static void
-st_readpixels(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
-              GLenum format, GLenum type,
-              const struct gl_pixelstore_attrib *pack,
-              GLvoid *dest)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   GLfloat (*temp)[4];
-   GLbitfield transferOps = ctx->_ImageTransferState;
-   GLsizei i, j;
-   GLint yStep, dfStride;
-   GLfloat *df;
-   struct st_renderbuffer *strb;
-   struct gl_pixelstore_attrib clippedPacking = *pack;
-   struct pipe_transfer *trans;
-   enum pipe_format pformat;
-
-   assert(ctx->ReadBuffer->Width > 0);
-
-   st_validate_state(st);
-
-   /* Do all needed clipping here, so that we can forget about it later */
-   if (!_mesa_clip_readpixels(ctx, &x, &y, &width, &height, &clippedPacking)) {
-      /* The ReadPixels transfer is totally outside the window bounds */
-      return;
-   }
-
-   st_flush_bitmap_cache(st);
-
-   dest = _mesa_map_pbo_dest(ctx, &clippedPacking, dest);
-   if (!dest)
-      return;
-
-   if (format == GL_STENCIL_INDEX ||
-       format == GL_DEPTH_STENCIL) {
-      st_read_stencil_pixels(ctx, x, y, width, height,
-                             format, type, pack, dest);
-      return;
-   }
-   else if (format == GL_DEPTH_COMPONENT) {
-      strb = st_renderbuffer(ctx->ReadBuffer->_DepthBuffer);
-      if (strb->Base.Wrapped) {
-         strb = st_renderbuffer(strb->Base.Wrapped);
-      }
-   }
-   else {
-      /* Read color buffer */
-      strb = st_get_color_read_renderbuffer(ctx);
-   }
-
-   if (!strb)
-      return;
-
-   /* try a fast-path readpixels before anything else */
-   if (st_fast_readpixels(ctx, strb, x, y, width, height,
-                          format, type, pack, dest)) {
-      /* success! */
-      _mesa_unmap_pbo_dest(ctx, &clippedPacking);
-      return;
-   }
-
-   /* allocate temp pixel row buffer */
-   temp = (GLfloat (*)[4]) malloc(4 * width * sizeof(GLfloat));
-   if (!temp) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glReadPixels");
-      return;
-   }
-
-   if(ctx->Color._ClampReadColor)
-      transferOps |= IMAGE_CLAMP_BIT;
-
-   if (format == GL_RGBA && type == GL_FLOAT && !transferOps) {
-      /* write tile(row) directly into user's buffer */
-      df = (GLfloat *) _mesa_image_address2d(&clippedPacking, dest, width,
-                                             height, format, type, 0, 0);
-      dfStride = width * 4;
-   }
-   else {
-      /* write tile(row) into temp row buffer */
-      df = (GLfloat *) temp;
-      dfStride = 0;
-   }
-
-   if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {
-      /* convert GL Y to Gallium Y */
-      y = strb->Base.Height - y - height;
-   }
-
-   /* Create a read transfer from the renderbuffer's texture */
-   trans = pipe_get_transfer(pipe, strb->texture,
-                             0, 0,
-                             PIPE_TRANSFER_READ,
-                             x, y, width, height);
-
-   /* determine bottom-to-top vs. top-to-bottom order */
-   if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {
-      y = height - 1;
-      yStep = -1;
-   }
-   else {
-      y = 0;
-      yStep = 1;
-   }
-
-   /* possibly convert sRGB format to linear RGB format */
-   pformat = util_format_linear(trans->resource->format);
-
-   if (ST_DEBUG & DEBUG_FALLBACK)
-      debug_printf("%s: fallback processing\n", __FUNCTION__);
-
-   /*
-    * Copy pixels from pipe_transfer to user memory
-    */
-   {
-      /* dest of first pixel in client memory */
-      GLubyte *dst = _mesa_image_address2d(&clippedPacking, dest, width,
-                                           height, format, type, 0, 0);
-      /* dest row stride */
-      const GLint dstStride = _mesa_image_row_stride(&clippedPacking, width,
-                                                     format, type);
-
-      if (pformat == PIPE_FORMAT_Z24_UNORM_S8_USCALED ||
-          pformat == PIPE_FORMAT_Z24X8_UNORM) {
-         if (format == GL_DEPTH_COMPONENT) {
-            for (i = 0; i < height; i++) {
-               GLuint ztemp[MAX_WIDTH];
-               GLfloat zfloat[MAX_WIDTH];
-               const double scale = 1.0 / ((1 << 24) - 1);
-               pipe_get_tile_raw(pipe, trans, 0, y, width, 1, ztemp, 0);
-               y += yStep;
-               for (j = 0; j < width; j++) {
-                  zfloat[j] = (float) (scale * (ztemp[j] & 0xffffff));
-               }
-               _mesa_pack_depth_span(ctx, width, dst, type,
-                                     zfloat, &clippedPacking);
-               dst += dstStride;
-            }
-         }
-         else {
-            /* XXX: unreachable code -- should be before st_read_stencil_pixels */
-            assert(format == GL_DEPTH_STENCIL_EXT);
-            for (i = 0; i < height; i++) {
-               GLuint *zshort = (GLuint *)dst;
-               pipe_get_tile_raw(pipe, trans, 0, y, width, 1, dst, 0);
-               y += yStep;
-               /* Reverse into 24/8 */
-               for (j = 0; j < width; j++) {
-                  zshort[j] = (zshort[j] << 8) | (zshort[j] >> 24);
-               }
-               dst += dstStride;
-            }
-         }
-      }
-      else if (pformat == PIPE_FORMAT_S8_USCALED_Z24_UNORM ||
-               pformat == PIPE_FORMAT_X8Z24_UNORM) {
-         if (format == GL_DEPTH_COMPONENT) {
-            for (i = 0; i < height; i++) {
-               GLuint ztemp[MAX_WIDTH];
-               GLfloat zfloat[MAX_WIDTH];
-               const double scale = 1.0 / ((1 << 24) - 1);
-               pipe_get_tile_raw(pipe, trans, 0, y, width, 1, ztemp, 0);
-               y += yStep;
-               for (j = 0; j < width; j++) {
-                  zfloat[j] = (float) (scale * ((ztemp[j] >> 8) & 0xffffff));
-               }
-               _mesa_pack_depth_span(ctx, width, dst, type,
-                                     zfloat, &clippedPacking);
-               dst += dstStride;
-            }
-         }
-         else {
-            /* XXX: unreachable code -- should be before st_read_stencil_pixels */
-            assert(format == GL_DEPTH_STENCIL_EXT);
-            for (i = 0; i < height; i++) {
-               pipe_get_tile_raw(pipe, trans, 0, y, width, 1, dst, 0);
-               y += yStep;
-               dst += dstStride;
-            }
-         }
-      }
-      else if (pformat == PIPE_FORMAT_Z16_UNORM) {
-         for (i = 0; i < height; i++) {
-            GLushort ztemp[MAX_WIDTH];
-            GLfloat zfloat[MAX_WIDTH];
-            const double scale = 1.0 / 0xffff;
-            pipe_get_tile_raw(pipe, trans, 0, y, width, 1, ztemp, 0);
-            y += yStep;
-            for (j = 0; j < width; j++) {
-               zfloat[j] = (float) (scale * ztemp[j]);
-            }
-            _mesa_pack_depth_span(ctx, width, dst, type,
-                                  zfloat, &clippedPacking);
-            dst += dstStride;
-         }
-      }
-      else if (pformat == PIPE_FORMAT_Z32_UNORM) {
-         for (i = 0; i < height; i++) {
-            GLuint ztemp[MAX_WIDTH];
-            GLfloat zfloat[MAX_WIDTH];
-            const double scale = 1.0 / 0xffffffff;
-            pipe_get_tile_raw(pipe, trans, 0, y, width, 1, ztemp, 0);
-            y += yStep;
-            for (j = 0; j < width; j++) {
-               zfloat[j] = (float) (scale * ztemp[j]);
-            }
-            _mesa_pack_depth_span(ctx, width, dst, type,
-                                  zfloat, &clippedPacking);
-            dst += dstStride;
-         }
-      }
-      else {
-         /* RGBA format */
-         /* Do a row at a time to flip image data vertically */
-         for (i = 0; i < height; i++) {
-            pipe_get_tile_rgba_format(pipe, trans, 0, y, width, 1,
-                                      pformat, df);
-            y += yStep;
-            df += dfStride;
-            if (!dfStride) {
-               _mesa_pack_rgba_span_float(ctx, width, temp, format, type, dst,
-                                          &clippedPacking, transferOps);
-               dst += dstStride;
-            }
-         }
-      }
-   }
-
-   free(temp);
-
-   pipe->transfer_destroy(pipe, trans);
-
-   _mesa_unmap_pbo_dest(ctx, &clippedPacking);
-}
-
-
-void st_init_readpixels_functions(struct dd_function_table *functions)
-{
-   functions->ReadPixels = st_readpixels;
-}
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+

+/**

+ * glReadPixels interface to pipe

+ *

+ * \author Brian Paul

+ */

+

+

+#include "main/imports.h"

+#include "main/bufferobj.h"

+#include "main/context.h"

+#include "main/image.h"

+#include "main/pack.h"

+#include "main/pbo.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "util/u_format.h"

+#include "util/u_inlines.h"

+#include "util/u_tile.h"

+

+#include "st_debug.h"

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_cb_bitmap.h"

+#include "st_cb_readpixels.h"

+#include "st_cb_fbo.h"

+

+/**

+ * Special case for reading stencil buffer.

+ * For color/depth we use get_tile().  For stencil, map the stencil buffer.

+ */

+void

+st_read_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,

+                       GLsizei width, GLsizei height,

+                       GLenum format, GLenum type,

+                       const struct gl_pixelstore_attrib *packing,

+                       GLvoid *pixels)

+{

+   struct gl_framebuffer *fb = ctx->ReadBuffer;

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   struct st_renderbuffer *strb = st_renderbuffer(fb->_StencilBuffer);

+   struct pipe_transfer *pt;

+   ubyte *stmap;

+   GLint j;

+

+   if (strb->Base.Wrapped) {

+      strb = st_renderbuffer(strb->Base.Wrapped);

+   }

+

+   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {

+      y = ctx->DrawBuffer->Height - y - height;

+   }

+

+   /* Create a read transfer from the renderbuffer's texture */

+

+   pt = pipe_get_transfer(pipe, strb->texture,

+                          0, 0,

+                          PIPE_TRANSFER_READ,

+                          x, y, width, height);

+

+   /* map the stencil buffer */

+   stmap = pipe_transfer_map(pipe, pt);

+

+   /* width should never be > MAX_WIDTH since we did clipping earlier */

+   ASSERT(width <= MAX_WIDTH);

+

+   /* process image row by row */

+   for (j = 0; j < height; j++) {

+      GLvoid *dest;

+      GLstencil sValues[MAX_WIDTH];

+      GLfloat zValues[MAX_WIDTH];

+      GLint srcY;

+

+      if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {

+         srcY = height - j - 1;

+      }

+      else {

+         srcY = j;

+      }

+

+      /* get stencil (and Z) values */

+      switch (pt->resource->format) {

+      case PIPE_FORMAT_S8_USCALED:

+         {

+            const ubyte *src = stmap + srcY * pt->stride;

+            memcpy(sValues, src, width);

+         }

+         break;

+      case PIPE_FORMAT_Z24_UNORM_S8_USCALED:

+         if (format == GL_DEPTH_STENCIL) {

+            const uint *src = (uint *) (stmap + srcY * pt->stride);

+            const GLfloat scale = 1.0f / (0xffffff);

+            GLint k;

+            for (k = 0; k < width; k++) {

+               sValues[k] = src[k] >> 24;

+               zValues[k] = (src[k] & 0xffffff) * scale;

+            }

+         }

+         else {

+            const uint *src = (uint *) (stmap + srcY * pt->stride);

+            GLint k;

+            for (k = 0; k < width; k++) {

+               sValues[k] = src[k] >> 24;

+            }

+         }

+         break;

+      case PIPE_FORMAT_S8_USCALED_Z24_UNORM:

+         if (format == GL_DEPTH_STENCIL) {

+            const uint *src = (uint *) (stmap + srcY * pt->stride);

+            const GLfloat scale = 1.0f / (0xffffff);

+            GLint k;

+            for (k = 0; k < width; k++) {

+               sValues[k] = src[k] & 0xff;

+               zValues[k] = (src[k] >> 8) * scale;

+            }

+         }

+         else {

+            const uint *src = (uint *) (stmap + srcY * pt->stride);

+            GLint k;

+            for (k = 0; k < width; k++) {

+               sValues[k] = src[k] & 0xff;

+            }

+         }

+         break;

+      default:

+         assert(0);

+      }

+

+      /* store */

+      dest = _mesa_image_address2d(packing, pixels, width, height,

+                                   format, type, j, 0);

+      if (format == GL_DEPTH_STENCIL) {

+         _mesa_pack_depth_stencil_span(ctx, width, dest,

+                                       zValues, sValues, packing);

+      }

+      else {

+         _mesa_pack_stencil_span(ctx, width, type, dest, sValues, packing);

+      }

+   }

+

+   /* unmap the stencil buffer */

+   pipe_transfer_unmap(pipe, pt);

+   pipe->transfer_destroy(pipe, pt);

+}

+

+

+/**

+ * Return renderbuffer to use for reading color pixels for glRead/CopyPixel

+ * commands.

+ */

+struct st_renderbuffer *

+st_get_color_read_renderbuffer(struct gl_context *ctx)

+{

+   struct gl_framebuffer *fb = ctx->ReadBuffer;

+   struct st_renderbuffer *strb =

+      st_renderbuffer(fb->_ColorReadBuffer);

+

+   return strb;

+}

+

+

+/**

+ * Try to do glReadPixels in a fast manner for common cases.

+ * \return GL_TRUE for success, GL_FALSE for failure

+ */

+static GLboolean

+st_fast_readpixels(struct gl_context *ctx, struct st_renderbuffer *strb,

+                   GLint x, GLint y, GLsizei width, GLsizei height,

+                   GLenum format, GLenum type,

+                   const struct gl_pixelstore_attrib *pack,

+                   GLvoid *dest)

+{

+   enum combination {

+      A8R8G8B8_UNORM_TO_RGBA_UBYTE,

+      A8R8G8B8_UNORM_TO_RGB_UBYTE,

+      A8R8G8B8_UNORM_TO_BGRA_UINT

+   } combo;

+

+   if (ctx->_ImageTransferState)

+      return GL_FALSE;

+

+   if (strb->format == PIPE_FORMAT_B8G8R8A8_UNORM &&

+       format == GL_RGBA && type == GL_UNSIGNED_BYTE) {

+      combo = A8R8G8B8_UNORM_TO_RGBA_UBYTE;

+   }

+   else if (strb->format == PIPE_FORMAT_B8G8R8A8_UNORM &&

+            format == GL_RGB && type == GL_UNSIGNED_BYTE) {

+      combo = A8R8G8B8_UNORM_TO_RGB_UBYTE;

+   }

+   else if (strb->format == PIPE_FORMAT_B8G8R8A8_UNORM &&

+            format == GL_BGRA && type == GL_UNSIGNED_INT_8_8_8_8_REV) {

+      combo = A8R8G8B8_UNORM_TO_BGRA_UINT;

+   }

+   else {

+      return GL_FALSE;

+   }

+

+   /*printf("st_fast_readpixels combo %d\n", (GLint) combo);*/

+

+   {

+      struct pipe_context *pipe = st_context(ctx)->pipe;

+      struct pipe_transfer *trans;

+      const GLubyte *map;

+      GLubyte *dst;

+      GLint row, col, dy, dstStride;

+

+      if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+         /* convert GL Y to Gallium Y */

+         y = strb->texture->height0 - y - height;

+      }

+

+      trans = pipe_get_transfer(pipe, strb->texture,

+                                0, 0,

+                                PIPE_TRANSFER_READ,

+                                x, y, width, height);

+      if (!trans) {

+         return GL_FALSE;

+      }

+

+      map = pipe_transfer_map(pipe, trans);

+      if (!map) {

+         pipe->transfer_destroy(pipe, trans);

+         return GL_FALSE;

+      }

+

+      /* We always write to the user/dest buffer from low addr to high addr

+       * but the read order depends on renderbuffer orientation

+       */

+      if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+         /* read source rows from bottom to top */

+         y = height - 1;

+         dy = -1;

+      }

+      else {

+         /* read source rows from top to bottom */

+         y = 0;

+         dy = 1;

+      }

+

+      dst = _mesa_image_address2d(pack, dest, width, height,

+                                  format, type, 0, 0);

+      dstStride = _mesa_image_row_stride(pack, width, format, type);

+

+      switch (combo) {

+      case A8R8G8B8_UNORM_TO_RGBA_UBYTE:

+         for (row = 0; row < height; row++) {

+            const GLubyte *src = map + y * trans->stride;

+            for (col = 0; col < width; col++) {

+               GLuint pixel = ((GLuint *) src)[col];

+               dst[col*4+0] = (pixel >> 16) & 0xff;

+               dst[col*4+1] = (pixel >>  8) & 0xff;

+               dst[col*4+2] = (pixel >>  0) & 0xff;

+               dst[col*4+3] = (pixel >> 24) & 0xff;

+            }

+            dst += dstStride;

+            y += dy;

+         }

+         break;

+      case A8R8G8B8_UNORM_TO_RGB_UBYTE:

+         for (row = 0; row < height; row++) {

+            const GLubyte *src = map + y * trans->stride;

+            for (col = 0; col < width; col++) {

+               GLuint pixel = ((GLuint *) src)[col];

+               dst[col*3+0] = (pixel >> 16) & 0xff;

+               dst[col*3+1] = (pixel >>  8) & 0xff;

+               dst[col*3+2] = (pixel >>  0) & 0xff;

+            }

+            dst += dstStride;

+            y += dy;

+         }

+         break;

+      case A8R8G8B8_UNORM_TO_BGRA_UINT:

+         for (row = 0; row < height; row++) {

+            const GLubyte *src = map + y * trans->stride;

+            memcpy(dst, src, 4 * width);

+            dst += dstStride;

+            y += dy;

+         }

+         break;

+      default:

+         ; /* nothing */

+      }

+

+      pipe_transfer_unmap(pipe, trans);

+      pipe->transfer_destroy(pipe, trans);

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Do glReadPixels by getting rows from the framebuffer transfer with

+ * get_tile().  Convert to requested format/type with Mesa image routines.

+ * Image transfer ops are done in software too.

+ */

+static void

+st_readpixels(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height,

+              GLenum format, GLenum type,

+              const struct gl_pixelstore_attrib *pack,

+              GLvoid *dest)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   GLfloat (*temp)[4];

+   GLbitfield transferOps = ctx->_ImageTransferState;

+   GLsizei i, j;

+   GLint yStep, dfStride;

+   GLfloat *df;

+   struct st_renderbuffer *strb;

+   struct gl_pixelstore_attrib clippedPacking = *pack;

+   struct pipe_transfer *trans;

+   enum pipe_format pformat;

+

+   assert(ctx->ReadBuffer->Width > 0);

+

+   st_validate_state(st);

+

+   /* Do all needed clipping here, so that we can forget about it later */

+   if (!_mesa_clip_readpixels(ctx, &x, &y, &width, &height, &clippedPacking)) {

+      /* The ReadPixels transfer is totally outside the window bounds */

+      return;

+   }

+

+   st_flush_bitmap_cache(st);

+

+   dest = _mesa_map_pbo_dest(ctx, &clippedPacking, dest);

+   if (!dest)

+      return;

+

+   if (format == GL_STENCIL_INDEX ||

+       format == GL_DEPTH_STENCIL) {

+      st_read_stencil_pixels(ctx, x, y, width, height,

+                             format, type, pack, dest);

+      return;

+   }

+   else if (format == GL_DEPTH_COMPONENT) {

+      strb = st_renderbuffer(ctx->ReadBuffer->_DepthBuffer);

+      if (strb->Base.Wrapped) {

+         strb = st_renderbuffer(strb->Base.Wrapped);

+      }

+   }

+   else {

+      /* Read color buffer */

+      strb = st_get_color_read_renderbuffer(ctx);

+   }

+

+   if (!strb)

+      return;

+

+   /* try a fast-path readpixels before anything else */

+   if (st_fast_readpixels(ctx, strb, x, y, width, height,

+                          format, type, pack, dest)) {

+      /* success! */

+      _mesa_unmap_pbo_dest(ctx, &clippedPacking);

+      return;

+   }

+

+   /* allocate temp pixel row buffer */

+   temp = (GLfloat (*)[4]) malloc(4 * width * sizeof(GLfloat));

+   if (!temp) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glReadPixels");

+      return;

+   }

+

+   if(ctx->Color._ClampReadColor)

+      transferOps |= IMAGE_CLAMP_BIT;

+

+   if (format == GL_RGBA && type == GL_FLOAT && !transferOps) {

+      /* write tile(row) directly into user's buffer */

+      df = (GLfloat *) _mesa_image_address2d(&clippedPacking, dest, width,

+                                             height, format, type, 0, 0);

+      dfStride = width * 4;

+   }

+   else {

+      /* write tile(row) into temp row buffer */

+      df = (GLfloat *) temp;

+      dfStride = 0;

+   }

+

+   if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+      /* convert GL Y to Gallium Y */

+      y = strb->Base.Height - y - height;

+   }

+

+   /* Create a read transfer from the renderbuffer's texture */

+   trans = pipe_get_transfer(pipe, strb->texture,

+                             0, 0,

+                             PIPE_TRANSFER_READ,

+                             x, y, width, height);

+

+   /* determine bottom-to-top vs. top-to-bottom order */

+   if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+      y = height - 1;

+      yStep = -1;

+   }

+   else {

+      y = 0;

+      yStep = 1;

+   }

+

+   /* possibly convert sRGB format to linear RGB format */

+   pformat = util_format_linear(trans->resource->format);

+

+   if (ST_DEBUG & DEBUG_FALLBACK)

+      debug_printf("%s: fallback processing\n", __FUNCTION__);

+

+   /*

+    * Copy pixels from pipe_transfer to user memory

+    */

+   {

+      /* dest of first pixel in client memory */

+      GLubyte *dst = _mesa_image_address2d(&clippedPacking, dest, width,

+                                           height, format, type, 0, 0);

+      /* dest row stride */

+      const GLint dstStride = _mesa_image_row_stride(&clippedPacking, width,

+                                                     format, type);

+

+      if (pformat == PIPE_FORMAT_Z24_UNORM_S8_USCALED ||

+          pformat == PIPE_FORMAT_Z24X8_UNORM) {

+         if (format == GL_DEPTH_COMPONENT) {

+            for (i = 0; i < height; i++) {

+               GLuint ztemp[MAX_WIDTH];

+               GLfloat zfloat[MAX_WIDTH];

+               const double scale = 1.0 / ((1 << 24) - 1);

+               pipe_get_tile_raw(pipe, trans, 0, y, width, 1, ztemp, 0);

+               y += yStep;

+               for (j = 0; j < width; j++) {

+                  zfloat[j] = (float) (scale * (ztemp[j] & 0xffffff));

+               }

+               _mesa_pack_depth_span(ctx, width, dst, type,

+                                     zfloat, &clippedPacking);

+               dst += dstStride;

+            }

+         }

+         else {

+            /* XXX: unreachable code -- should be before st_read_stencil_pixels */

+            assert(format == GL_DEPTH_STENCIL_EXT);

+            for (i = 0; i < height; i++) {

+               GLuint *zshort = (GLuint *)dst;

+               pipe_get_tile_raw(pipe, trans, 0, y, width, 1, dst, 0);

+               y += yStep;

+               /* Reverse into 24/8 */

+               for (j = 0; j < width; j++) {

+                  zshort[j] = (zshort[j] << 8) | (zshort[j] >> 24);

+               }

+               dst += dstStride;

+            }

+         }

+      }

+      else if (pformat == PIPE_FORMAT_S8_USCALED_Z24_UNORM ||

+               pformat == PIPE_FORMAT_X8Z24_UNORM) {

+         if (format == GL_DEPTH_COMPONENT) {

+            for (i = 0; i < height; i++) {

+               GLuint ztemp[MAX_WIDTH];

+               GLfloat zfloat[MAX_WIDTH];

+               const double scale = 1.0 / ((1 << 24) - 1);

+               pipe_get_tile_raw(pipe, trans, 0, y, width, 1, ztemp, 0);

+               y += yStep;

+               for (j = 0; j < width; j++) {

+                  zfloat[j] = (float) (scale * ((ztemp[j] >> 8) & 0xffffff));

+               }

+               _mesa_pack_depth_span(ctx, width, dst, type,

+                                     zfloat, &clippedPacking);

+               dst += dstStride;

+            }

+         }

+         else {

+            /* XXX: unreachable code -- should be before st_read_stencil_pixels */

+            assert(format == GL_DEPTH_STENCIL_EXT);

+            for (i = 0; i < height; i++) {

+               pipe_get_tile_raw(pipe, trans, 0, y, width, 1, dst, 0);

+               y += yStep;

+               dst += dstStride;

+            }

+         }

+      }

+      else if (pformat == PIPE_FORMAT_Z16_UNORM) {

+         for (i = 0; i < height; i++) {

+            GLushort ztemp[MAX_WIDTH];

+            GLfloat zfloat[MAX_WIDTH];

+            const double scale = 1.0 / 0xffff;

+            pipe_get_tile_raw(pipe, trans, 0, y, width, 1, ztemp, 0);

+            y += yStep;

+            for (j = 0; j < width; j++) {

+               zfloat[j] = (float) (scale * ztemp[j]);

+            }

+            _mesa_pack_depth_span(ctx, width, dst, type,

+                                  zfloat, &clippedPacking);

+            dst += dstStride;

+         }

+      }

+      else if (pformat == PIPE_FORMAT_Z32_UNORM) {

+         for (i = 0; i < height; i++) {

+            GLuint ztemp[MAX_WIDTH];

+            GLfloat zfloat[MAX_WIDTH];

+            const double scale = 1.0 / 0xffffffff;

+            pipe_get_tile_raw(pipe, trans, 0, y, width, 1, ztemp, 0);

+            y += yStep;

+            for (j = 0; j < width; j++) {

+               zfloat[j] = (float) (scale * ztemp[j]);

+            }

+            _mesa_pack_depth_span(ctx, width, dst, type,

+                                  zfloat, &clippedPacking);

+            dst += dstStride;

+         }

+      }

+      else {

+         /* RGBA format */

+         /* Do a row at a time to flip image data vertically */

+         for (i = 0; i < height; i++) {

+            pipe_get_tile_rgba_format(pipe, trans, 0, y, width, 1,

+                                      pformat, df);

+            y += yStep;

+            df += dfStride;

+            if (!dfStride) {

+               _mesa_pack_rgba_span_float(ctx, width, temp, format, type, dst,

+                                          &clippedPacking, transferOps);

+               dst += dstStride;

+            }

+         }

+      }

+   }

+

+   free(temp);

+

+   pipe->transfer_destroy(pipe, trans);

+

+   _mesa_unmap_pbo_dest(ctx, &clippedPacking);

+}

+

+

+void st_init_readpixels_functions(struct dd_function_table *functions)

+{

+   functions->ReadPixels = st_readpixels;

+}

diff --git a/mesalib/src/mesa/state_tracker/st_context.h b/mesalib/src/mesa/state_tracker/st_context.h
index 77765f023..ef54fd7cd 100644
--- a/mesalib/src/mesa/state_tracker/st_context.h
+++ b/mesalib/src/mesa/state_tracker/st_context.h
@@ -1,270 +1,270 @@
-/**************************************************************************
- * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
-#ifndef ST_CONTEXT_H
-#define ST_CONTEXT_H
-
-#include "main/mtypes.h"
-#include "pipe/p_state.h"
-#include "state_tracker/st_api.h"
-
-struct bitmap_cache;
-struct blit_state;
-struct dd_function_table;
-struct draw_context;
-struct draw_stage;
-struct gen_mipmap_state;
-struct st_context;
-struct st_fragment_program;
-
-
-#define ST_NEW_MESA                    0x1 /* Mesa state has changed */
-#define ST_NEW_FRAGMENT_PROGRAM        0x2
-#define ST_NEW_VERTEX_PROGRAM          0x4
-#define ST_NEW_FRAMEBUFFER             0x8
-#define ST_NEW_EDGEFLAGS_DATA          0x10
-#define ST_NEW_GEOMETRY_PROGRAM        0x20
-
-
-struct st_state_flags {
-   GLuint mesa;
-   GLuint st;
-};
-
-struct st_tracked_state {
-   const char *name;
-   struct st_state_flags dirty;
-   void (*update)( struct st_context *st );
-};
-
-
-
-struct st_context
-{
-   struct st_context_iface iface;
-
-   struct gl_context *ctx;
-
-   struct pipe_context *pipe;
-
-   struct draw_context *draw;  /**< For selection/feedback/rastpos only */
-   struct draw_stage *feedback_stage;  /**< For GL_FEEDBACK rendermode */
-   struct draw_stage *selection_stage;  /**< For GL_SELECT rendermode */
-   struct draw_stage *rastpos_stage;  /**< For glRasterPos */
-
-
-   /* On old libGL's for linux we need to invalidate the drawables
-    * on glViewpport calls, this is set via a option.
-    */
-   boolean invalidate_on_gl_viewport;
-
-   /* Some state is contained in constant objects.
-    * Other state is just parameter values.
-    */
-   struct {
-      struct pipe_blend_state               blend;
-      struct pipe_depth_stencil_alpha_state depth_stencil;
-      struct pipe_rasterizer_state          rasterizer;
-      struct pipe_sampler_state             samplers[PIPE_MAX_SAMPLERS];
-      struct pipe_sampler_state             *sampler_list[PIPE_MAX_SAMPLERS];
-      struct pipe_clip_state clip;
-      struct {
-         void *ptr;
-         unsigned size;
-      } constants[PIPE_SHADER_TYPES];
-      struct pipe_framebuffer_state framebuffer;
-      struct pipe_sampler_view *sampler_views[PIPE_MAX_SAMPLERS];
-      struct pipe_scissor_state scissor;
-      struct pipe_viewport_state viewport;
-      unsigned sample_mask;
-
-      GLuint num_samplers;
-      GLuint num_textures;
-
-      GLuint poly_stipple[32];  /**< In OpenGL's bottom-to-top order */
-   } state;
-
-   char vendor[100];
-   char renderer[100];
-
-   struct st_state_flags dirty;
-
-   GLboolean missing_textures;
-   GLboolean vertdata_edgeflags;
-
-   /** Mapping from VERT_RESULT_x to post-transformed vertex slot */
-   const GLuint *vertex_result_to_slot;
-
-   struct st_vertex_program *vp;    /**< Currently bound vertex program */
-   struct st_fragment_program *fp;  /**< Currently bound fragment program */
-   struct st_geometry_program *gp;  /**< Currently bound geometry program */
-
-   struct st_vp_variant *vp_variant;
-   struct st_fp_variant *fp_variant;
-   struct st_gp_variant *gp_variant;
-
-   struct gl_texture_object *default_texture;
-
-   struct {
-      struct gl_program_cache *cache;
-      struct st_fragment_program *program;  /**< cur pixel transfer prog */
-      GLuint xfer_prog_sn;  /**< pixel xfer program serial no. */
-      GLuint user_prog_sn;  /**< user fragment program serial no. */
-      struct st_fragment_program *combined_prog;
-      GLuint combined_prog_sn;
-      struct pipe_resource *pixelmap_texture;
-      struct pipe_sampler_view *pixelmap_sampler_view;
-      boolean pixelmap_enabled;  /**< use the pixelmap texture? */
-   } pixel_xfer;
-
-   /** for glBitmap */
-   struct {
-      struct pipe_rasterizer_state rasterizer;
-      struct pipe_sampler_state samplers[2];
-      enum pipe_format tex_format;
-      void *vs;
-      float vertices[4][3][4];  /**< vertex pos + color + texcoord */
-      struct pipe_resource *vbuf;
-      unsigned vbuf_slot;       /* next free slot in vbuf */
-      struct bitmap_cache *cache;
-   } bitmap;
-
-   /** for glDraw/CopyPixels */
-   struct {
-      struct gl_fragment_program *shaders[4];
-      void *vert_shaders[2];   /**< ureg shaders */
-   } drawpix;
-
-   /** for glClear */
-   struct {
-      struct pipe_rasterizer_state raster;
-      struct pipe_viewport_state viewport;
-      struct pipe_clip_state clip;
-      void *vs;
-      void *fs;
-      float vertices[4][2][4];  /**< vertex pos + color */
-      struct pipe_resource *vbuf;
-      unsigned vbuf_slot;
-      boolean enable_ds_separate;
-   } clear;
-
-   /** used for anything using util_draw_vertex_buffer */
-   struct pipe_vertex_element velems_util_draw[3];
-
-   void *passthrough_fs;  /**< simple pass-through frag shader */
-
-   enum pipe_texture_target internal_target;
-   struct gen_mipmap_state *gen_mipmap;
-   struct blit_state *blit;
-
-   struct cso_context *cso_context;
-
-   int force_msaa;
-   void *winsys_drawable_handle;
-
-   /* User vertex buffers. */
-   struct pipe_resource *user_vb[PIPE_MAX_ATTRIBS];
-   unsigned user_vb_stride[PIPE_MAX_ATTRIBS];
-   unsigned num_user_vbs;
-};
-
-
-/* Need this so that we can implement Mesa callbacks in this module.
- */
-static INLINE struct st_context *st_context(struct gl_context *ctx)
-{
-   return ctx->st;
-}
-
-
-/**
- * Wrapper for struct gl_framebuffer.
- * This is an opaque type to the outside world.
- */
-struct st_framebuffer
-{
-   struct gl_framebuffer Base;
-   void *Private;
-
-   struct st_framebuffer_iface *iface;
-   enum st_attachment_type statts[ST_ATTACHMENT_COUNT];
-   unsigned num_statts;
-   int32_t revalidate;
-};
-
-
-extern void st_init_driver_functions(struct dd_function_table *functions);
-
-void st_invalidate_state(struct gl_context * ctx, GLuint new_state);
-
-
-
-#define Y_0_TOP 1
-#define Y_0_BOTTOM 2
-
-static INLINE GLuint
-st_fb_orientation(const struct gl_framebuffer *fb)
-{
-   if (fb && fb->Name == 0) {
-      /* Drawing into a window (on-screen buffer).
-       *
-       * Negate Y scale to flip image vertically.
-       * The NDC Y coords prior to viewport transformation are in the range
-       * [y=-1=bottom, y=1=top]
-       * Hardware window coords are in the range [y=0=top, y=H-1=bottom] where
-       * H is the window height.
-       * Use the viewport transformation to invert Y.
-       */
-      return Y_0_TOP;
-   }
-   else {
-      /* Drawing into user-created FBO (very likely a texture).
-       *
-       * For textures, T=0=Bottom, so by extension Y=0=Bottom for rendering.
-       */
-      return Y_0_BOTTOM;
-   }
-}
-
-
-/** clear-alloc a struct-sized object, with casting */
-#define ST_CALLOC_STRUCT(T)   (struct T *) calloc(1, sizeof(struct T))
-
-
-extern int
-st_get_msaa(void);
-
-extern struct st_context *
-st_create_context(gl_api api, struct pipe_context *pipe,
-                  const struct gl_config *visual,
-                  struct st_context *share);
-
-extern void
-st_destroy_context(struct st_context *st);
-
-
-#endif
+/**************************************************************************

+ * 

+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+#ifndef ST_CONTEXT_H

+#define ST_CONTEXT_H

+

+#include "main/mtypes.h"

+#include "pipe/p_state.h"

+#include "state_tracker/st_api.h"

+

+struct bitmap_cache;

+struct blit_state;

+struct dd_function_table;

+struct draw_context;

+struct draw_stage;

+struct gen_mipmap_state;

+struct st_context;

+struct st_fragment_program;

+

+

+#define ST_NEW_MESA                    0x1 /* Mesa state has changed */

+#define ST_NEW_FRAGMENT_PROGRAM        0x2

+#define ST_NEW_VERTEX_PROGRAM          0x4

+#define ST_NEW_FRAMEBUFFER             0x8

+#define ST_NEW_EDGEFLAGS_DATA          0x10

+#define ST_NEW_GEOMETRY_PROGRAM        0x20

+

+

+struct st_state_flags {

+   GLuint mesa;

+   GLuint st;

+};

+

+struct st_tracked_state {

+   const char *name;

+   struct st_state_flags dirty;

+   void (*update)( struct st_context *st );

+};

+

+

+

+struct st_context

+{

+   struct st_context_iface iface;

+

+   struct gl_context *ctx;

+

+   struct pipe_context *pipe;

+

+   struct draw_context *draw;  /**< For selection/feedback/rastpos only */

+   struct draw_stage *feedback_stage;  /**< For GL_FEEDBACK rendermode */

+   struct draw_stage *selection_stage;  /**< For GL_SELECT rendermode */

+   struct draw_stage *rastpos_stage;  /**< For glRasterPos */

+

+

+   /* On old libGL's for linux we need to invalidate the drawables

+    * on glViewpport calls, this is set via a option.

+    */

+   boolean invalidate_on_gl_viewport;

+

+   /* Some state is contained in constant objects.

+    * Other state is just parameter values.

+    */

+   struct {

+      struct pipe_blend_state               blend;

+      struct pipe_depth_stencil_alpha_state depth_stencil;

+      struct pipe_rasterizer_state          rasterizer;

+      struct pipe_sampler_state             samplers[PIPE_MAX_SAMPLERS];

+      struct pipe_sampler_state             *sampler_list[PIPE_MAX_SAMPLERS];

+      struct pipe_clip_state clip;

+      struct {

+         void *ptr;

+         unsigned size;

+      } constants[PIPE_SHADER_TYPES];

+      struct pipe_framebuffer_state framebuffer;

+      struct pipe_sampler_view *sampler_views[PIPE_MAX_SAMPLERS];

+      struct pipe_scissor_state scissor;

+      struct pipe_viewport_state viewport;

+      unsigned sample_mask;

+

+      GLuint num_samplers;

+      GLuint num_textures;

+

+      GLuint poly_stipple[32];  /**< In OpenGL's bottom-to-top order */

+   } state;

+

+   char vendor[100];

+   char renderer[100];

+

+   struct st_state_flags dirty;

+

+   GLboolean missing_textures;

+   GLboolean vertdata_edgeflags;

+

+   /** Mapping from VERT_RESULT_x to post-transformed vertex slot */

+   const GLuint *vertex_result_to_slot;

+

+   struct st_vertex_program *vp;    /**< Currently bound vertex program */

+   struct st_fragment_program *fp;  /**< Currently bound fragment program */

+   struct st_geometry_program *gp;  /**< Currently bound geometry program */

+

+   struct st_vp_variant *vp_variant;

+   struct st_fp_variant *fp_variant;

+   struct st_gp_variant *gp_variant;

+

+   struct gl_texture_object *default_texture;

+

+   struct {

+      struct gl_program_cache *cache;

+      struct st_fragment_program *program;  /**< cur pixel transfer prog */

+      GLuint xfer_prog_sn;  /**< pixel xfer program serial no. */

+      GLuint user_prog_sn;  /**< user fragment program serial no. */

+      struct st_fragment_program *combined_prog;

+      GLuint combined_prog_sn;

+      struct pipe_resource *pixelmap_texture;

+      struct pipe_sampler_view *pixelmap_sampler_view;

+      boolean pixelmap_enabled;  /**< use the pixelmap texture? */

+   } pixel_xfer;

+

+   /** for glBitmap */

+   struct {

+      struct pipe_rasterizer_state rasterizer;

+      struct pipe_sampler_state samplers[2];

+      enum pipe_format tex_format;

+      void *vs;

+      float vertices[4][3][4];  /**< vertex pos + color + texcoord */

+      struct pipe_resource *vbuf;

+      unsigned vbuf_slot;       /* next free slot in vbuf */

+      struct bitmap_cache *cache;

+   } bitmap;

+

+   /** for glDraw/CopyPixels */

+   struct {

+      struct gl_fragment_program *shaders[4];

+      void *vert_shaders[2];   /**< ureg shaders */

+   } drawpix;

+

+   /** for glClear */

+   struct {

+      struct pipe_rasterizer_state raster;

+      struct pipe_viewport_state viewport;

+      struct pipe_clip_state clip;

+      void *vs;

+      void *fs;

+      float vertices[4][2][4];  /**< vertex pos + color */

+      struct pipe_resource *vbuf;

+      unsigned vbuf_slot;

+      boolean enable_ds_separate;

+   } clear;

+

+   /** used for anything using util_draw_vertex_buffer */

+   struct pipe_vertex_element velems_util_draw[3];

+

+   void *passthrough_fs;  /**< simple pass-through frag shader */

+

+   enum pipe_texture_target internal_target;

+   struct gen_mipmap_state *gen_mipmap;

+   struct blit_state *blit;

+

+   struct cso_context *cso_context;

+

+   int force_msaa;

+   void *winsys_drawable_handle;

+

+   /* User vertex buffers. */

+   struct pipe_resource *user_vb[PIPE_MAX_ATTRIBS];

+   unsigned user_vb_stride[PIPE_MAX_ATTRIBS];

+   unsigned num_user_vbs;

+};

+

+

+/* Need this so that we can implement Mesa callbacks in this module.

+ */

+static INLINE struct st_context *st_context(struct gl_context *ctx)

+{

+   return ctx->st;

+}

+

+

+/**

+ * Wrapper for struct gl_framebuffer.

+ * This is an opaque type to the outside world.

+ */

+struct st_framebuffer

+{

+   struct gl_framebuffer Base;

+   void *Private;

+

+   struct st_framebuffer_iface *iface;

+   enum st_attachment_type statts[ST_ATTACHMENT_COUNT];

+   unsigned num_statts;

+   int32_t revalidate;

+};

+

+

+extern void st_init_driver_functions(struct dd_function_table *functions);

+

+void st_invalidate_state(struct gl_context * ctx, GLuint new_state);

+

+

+

+#define Y_0_TOP 1

+#define Y_0_BOTTOM 2

+

+static INLINE GLuint

+st_fb_orientation(const struct gl_framebuffer *fb)

+{

+   if (fb && fb->Name == 0) {

+      /* Drawing into a window (on-screen buffer).

+       *

+       * Negate Y scale to flip image vertically.

+       * The NDC Y coords prior to viewport transformation are in the range

+       * [y=-1=bottom, y=1=top]

+       * Hardware window coords are in the range [y=0=top, y=H-1=bottom] where

+       * H is the window height.

+       * Use the viewport transformation to invert Y.

+       */

+      return Y_0_TOP;

+   }

+   else {

+      /* Drawing into user-created FBO (very likely a texture).

+       *

+       * For textures, T=0=Bottom, so by extension Y=0=Bottom for rendering.

+       */

+      return Y_0_BOTTOM;

+   }

+}

+

+

+/** clear-alloc a struct-sized object, with casting */

+#define ST_CALLOC_STRUCT(T)   (struct T *) calloc(1, sizeof(struct T))

+

+

+extern int

+st_get_msaa(void);

+

+extern struct st_context *

+st_create_context(gl_api api, struct pipe_context *pipe,

+                  const struct gl_config *visual,

+                  struct st_context *share);

+

+extern void

+st_destroy_context(struct st_context *st);

+

+

+#endif

diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
index 487f3f19c..52e46d628 100644
--- a/mesalib/src/mesa/state_tracker/st_draw.c
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -1,784 +1,784 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
-/*
- * This file implements the st_draw_vbo() function which is called from
- * Mesa's VBO module.  All point/line/triangle rendering is done through
- * this function whether the user called glBegin/End, glDrawArrays,
- * glDrawElements, glEvalMesh, or glCalList, etc.
- *
- * We basically convert the VBO's vertex attribute/array information into
- * Gallium vertex state, bind the vertex buffer objects and call
- * pipe->draw_elements(), pipe->draw_range_elements() or pipe->draw_arrays().
- *
- * Authors:
- *   Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-#include "main/imports.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-#include "program/prog_uniform.h"
-
-#include "vbo/vbo.h"
-
-#include "st_context.h"
-#include "st_atom.h"
-#include "st_cb_bufferobjects.h"
-#include "st_draw.h"
-#include "st_program.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "util/u_inlines.h"
-#include "util/u_format.h"
-#include "util/u_prim.h"
-#include "util/u_draw_quad.h"
-#include "draw/draw_context.h"
-#include "cso_cache/cso_context.h"
-
-
-static GLuint double_types[4] = {
-   PIPE_FORMAT_R64_FLOAT,
-   PIPE_FORMAT_R64G64_FLOAT,
-   PIPE_FORMAT_R64G64B64_FLOAT,
-   PIPE_FORMAT_R64G64B64A64_FLOAT
-};
-
-static GLuint float_types[4] = {
-   PIPE_FORMAT_R32_FLOAT,
-   PIPE_FORMAT_R32G32_FLOAT,
-   PIPE_FORMAT_R32G32B32_FLOAT,
-   PIPE_FORMAT_R32G32B32A32_FLOAT
-};
-
-static GLuint half_float_types[4] = {
-   PIPE_FORMAT_R16_FLOAT,
-   PIPE_FORMAT_R16G16_FLOAT,
-   PIPE_FORMAT_R16G16B16_FLOAT,
-   PIPE_FORMAT_R16G16B16A16_FLOAT
-};
-
-static GLuint uint_types_norm[4] = {
-   PIPE_FORMAT_R32_UNORM,
-   PIPE_FORMAT_R32G32_UNORM,
-   PIPE_FORMAT_R32G32B32_UNORM,
-   PIPE_FORMAT_R32G32B32A32_UNORM
-};
-
-static GLuint uint_types_scale[4] = {
-   PIPE_FORMAT_R32_USCALED,
-   PIPE_FORMAT_R32G32_USCALED,
-   PIPE_FORMAT_R32G32B32_USCALED,
-   PIPE_FORMAT_R32G32B32A32_USCALED
-};
-
-static GLuint int_types_norm[4] = {
-   PIPE_FORMAT_R32_SNORM,
-   PIPE_FORMAT_R32G32_SNORM,
-   PIPE_FORMAT_R32G32B32_SNORM,
-   PIPE_FORMAT_R32G32B32A32_SNORM
-};
-
-static GLuint int_types_scale[4] = {
-   PIPE_FORMAT_R32_SSCALED,
-   PIPE_FORMAT_R32G32_SSCALED,
-   PIPE_FORMAT_R32G32B32_SSCALED,
-   PIPE_FORMAT_R32G32B32A32_SSCALED
-};
-
-static GLuint ushort_types_norm[4] = {
-   PIPE_FORMAT_R16_UNORM,
-   PIPE_FORMAT_R16G16_UNORM,
-   PIPE_FORMAT_R16G16B16_UNORM,
-   PIPE_FORMAT_R16G16B16A16_UNORM
-};
-
-static GLuint ushort_types_scale[4] = {
-   PIPE_FORMAT_R16_USCALED,
-   PIPE_FORMAT_R16G16_USCALED,
-   PIPE_FORMAT_R16G16B16_USCALED,
-   PIPE_FORMAT_R16G16B16A16_USCALED
-};
-
-static GLuint short_types_norm[4] = {
-   PIPE_FORMAT_R16_SNORM,
-   PIPE_FORMAT_R16G16_SNORM,
-   PIPE_FORMAT_R16G16B16_SNORM,
-   PIPE_FORMAT_R16G16B16A16_SNORM
-};
-
-static GLuint short_types_scale[4] = {
-   PIPE_FORMAT_R16_SSCALED,
-   PIPE_FORMAT_R16G16_SSCALED,
-   PIPE_FORMAT_R16G16B16_SSCALED,
-   PIPE_FORMAT_R16G16B16A16_SSCALED
-};
-
-static GLuint ubyte_types_norm[4] = {
-   PIPE_FORMAT_R8_UNORM,
-   PIPE_FORMAT_R8G8_UNORM,
-   PIPE_FORMAT_R8G8B8_UNORM,
-   PIPE_FORMAT_R8G8B8A8_UNORM
-};
-
-static GLuint ubyte_types_scale[4] = {
-   PIPE_FORMAT_R8_USCALED,
-   PIPE_FORMAT_R8G8_USCALED,
-   PIPE_FORMAT_R8G8B8_USCALED,
-   PIPE_FORMAT_R8G8B8A8_USCALED
-};
-
-static GLuint byte_types_norm[4] = {
-   PIPE_FORMAT_R8_SNORM,
-   PIPE_FORMAT_R8G8_SNORM,
-   PIPE_FORMAT_R8G8B8_SNORM,
-   PIPE_FORMAT_R8G8B8A8_SNORM
-};
-
-static GLuint byte_types_scale[4] = {
-   PIPE_FORMAT_R8_SSCALED,
-   PIPE_FORMAT_R8G8_SSCALED,
-   PIPE_FORMAT_R8G8B8_SSCALED,
-   PIPE_FORMAT_R8G8B8A8_SSCALED
-};
-
-static GLuint fixed_types[4] = {
-   PIPE_FORMAT_R32_FIXED,
-   PIPE_FORMAT_R32G32_FIXED,
-   PIPE_FORMAT_R32G32B32_FIXED,
-   PIPE_FORMAT_R32G32B32A32_FIXED
-};
-
-
-
-/**
- * Return a PIPE_FORMAT_x for the given GL datatype and size.
- */
-enum pipe_format
-st_pipe_vertex_format(GLenum type, GLuint size, GLenum format,
-                      GLboolean normalized)
-{
-   assert((type >= GL_BYTE && type <= GL_DOUBLE) ||
-          type == GL_FIXED || type == GL_HALF_FLOAT);
-   assert(size >= 1);
-   assert(size <= 4);
-   assert(format == GL_RGBA || format == GL_BGRA);
-
-   if (format == GL_BGRA) {
-      /* this is an odd-ball case */
-      assert(type == GL_UNSIGNED_BYTE);
-      assert(normalized);
-      return PIPE_FORMAT_B8G8R8A8_UNORM;
-   }
-
-   if (normalized) {
-      switch (type) {
-      case GL_DOUBLE: return double_types[size-1];
-      case GL_FLOAT: return float_types[size-1];
-      case GL_HALF_FLOAT: return half_float_types[size-1];
-      case GL_INT: return int_types_norm[size-1];
-      case GL_SHORT: return short_types_norm[size-1];
-      case GL_BYTE: return byte_types_norm[size-1];
-      case GL_UNSIGNED_INT: return uint_types_norm[size-1];
-      case GL_UNSIGNED_SHORT: return ushort_types_norm[size-1];
-      case GL_UNSIGNED_BYTE: return ubyte_types_norm[size-1];
-      case GL_FIXED: return fixed_types[size-1];
-      default: assert(0); return 0;
-      }
-   }
-   else {
-      switch (type) {
-      case GL_DOUBLE: return double_types[size-1];
-      case GL_FLOAT: return float_types[size-1];
-      case GL_HALF_FLOAT: return half_float_types[size-1];
-      case GL_INT: return int_types_scale[size-1];
-      case GL_SHORT: return short_types_scale[size-1];
-      case GL_BYTE: return byte_types_scale[size-1];
-      case GL_UNSIGNED_INT: return uint_types_scale[size-1];
-      case GL_UNSIGNED_SHORT: return ushort_types_scale[size-1];
-      case GL_UNSIGNED_BYTE: return ubyte_types_scale[size-1];
-      case GL_FIXED: return fixed_types[size-1];
-      default: assert(0); return 0;
-      }
-   }
-   return PIPE_FORMAT_NONE; /* silence compiler warning */
-}
-
-
-
-/**
- * Examine the active arrays to determine if we have interleaved
- * vertex arrays all living in one VBO, or all living in user space.
- * \param userSpace  returns whether the arrays are in user space.
- */
-static GLboolean
-is_interleaved_arrays(const struct st_vertex_program *vp,
-                      const struct st_vp_variant *vpv,
-                      const struct gl_client_array **arrays)
-{
-   GLuint attr;
-   const struct gl_buffer_object *firstBufObj = NULL;
-   GLint firstStride = -1;
-   const GLubyte *client_addr = NULL;
-   GLboolean user_memory;
-
-   for (attr = 0; attr < vpv->num_inputs; attr++) {
-      const GLuint mesaAttr = vp->index_to_input[attr];
-      const struct gl_client_array *array = arrays[mesaAttr];
-      const struct gl_buffer_object *bufObj = array->BufferObj;
-      const GLsizei stride = array->StrideB; /* in bytes */
-
-      if (firstStride < 0) {
-         firstStride = stride;
-         user_memory = !bufObj || !bufObj->Name;
-      }
-      else if (firstStride != stride) {
-         return GL_FALSE;
-      }
-
-      if (!bufObj || !bufObj->Name) {
-         /* Try to detect if the client-space arrays are
-          * "close" to each other.
-          */
-         if (!user_memory) {
-            return GL_FALSE;
-         }
-         if (!client_addr) {
-            client_addr = array->Ptr;
-         }
-         else if (abs(array->Ptr - client_addr) > firstStride) {
-            /* arrays start too far apart */
-            return GL_FALSE;
-         }
-      }
-      else if (!firstBufObj) {
-         if (user_memory) {
-            return GL_FALSE;
-         }
-         firstBufObj = bufObj;
-      }
-      else if (bufObj != firstBufObj) {
-         return GL_FALSE;
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Set up for drawing interleaved arrays that all live in one VBO
- * or all live in user space.
- * \param vbuffer  returns vertex buffer info
- * \param velements  returns vertex element info
- */
-static void
-setup_interleaved_attribs(struct gl_context *ctx,
-                          const struct st_vertex_program *vp,
-                          const struct st_vp_variant *vpv,
-                          const struct gl_client_array **arrays,
-                          struct pipe_vertex_buffer *vbuffer,
-                          struct pipe_vertex_element velements[],
-                          unsigned max_index,
-                          unsigned num_instances)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   GLuint attr;
-   const GLubyte *low_addr = NULL;
-
-   /* Find the lowest address of the arrays we're drawing */
-   if (vpv->num_inputs) {
-      low_addr = arrays[vp->index_to_input[0]]->Ptr;
-
-      for (attr = 1; attr < vpv->num_inputs; attr++) {
-         const GLubyte *start = arrays[vp->index_to_input[attr]]->Ptr;
-         low_addr = MIN2(low_addr, start);
-      }
-   }
-
-   for (attr = 0; attr < vpv->num_inputs; attr++) {
-      const GLuint mesaAttr = vp->index_to_input[attr];
-      const struct gl_client_array *array = arrays[mesaAttr];
-      struct gl_buffer_object *bufobj = array->BufferObj;
-      struct st_buffer_object *stobj = st_buffer_object(bufobj);
-      GLsizei stride = array->StrideB;
-
-      if (attr == 0) {
-         if (bufobj && bufobj->Name) {
-            vbuffer->buffer = NULL;
-            pipe_resource_reference(&vbuffer->buffer, stobj->buffer);
-            vbuffer->buffer_offset = pointer_to_offset(low_addr);
-         }
-         else {
-            uint divisor = array->InstanceDivisor;
-            uint length = (divisor ? num_instances / divisor : max_index) + 1;
-            vbuffer->buffer = pipe_user_buffer_create(pipe->screen,
-                                                      (void*) low_addr,
-                                                      stride * length,
-                                                      PIPE_BIND_VERTEX_BUFFER);
-            vbuffer->buffer_offset = 0;
-
-            /* Track user vertex buffers. */
-            pipe_resource_reference(&st->user_vb[0], vbuffer->buffer);
-            st->user_vb_stride[0] = stride;
-            st->num_user_vbs = 1;
-         }
-         vbuffer->stride = stride; /* in bytes */
-      }
-
-      velements[attr].src_offset = (unsigned) (array->Ptr - low_addr);
-      velements[attr].instance_divisor = array->InstanceDivisor;
-      velements[attr].vertex_buffer_index = 0;
-      velements[attr].src_format = st_pipe_vertex_format(array->Type,
-                                                         array->Size,
-                                                         array->Format,
-                                                         array->Normalized);
-      assert(velements[attr].src_format);
-   }
-}
-
-
-/**
- * Set up a separate pipe_vertex_buffer and pipe_vertex_element for each
- * vertex attribute.
- * \param vbuffer  returns vertex buffer info
- * \param velements  returns vertex element info
- */
-static void
-setup_non_interleaved_attribs(struct gl_context *ctx,
-                              const struct st_vertex_program *vp,
-                              const struct st_vp_variant *vpv,
-                              const struct gl_client_array **arrays,
-                              struct pipe_vertex_buffer vbuffer[],
-                              struct pipe_vertex_element velements[],
-                              unsigned max_index,
-                              unsigned num_instances)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   GLuint attr;
-
-   for (attr = 0; attr < vpv->num_inputs; attr++) {
-      const GLuint mesaAttr = vp->index_to_input[attr];
-      const struct gl_client_array *array = arrays[mesaAttr];
-      struct gl_buffer_object *bufobj = array->BufferObj;
-      GLsizei stride = array->StrideB;
-
-      if (bufobj && bufobj->Name) {
-         /* Attribute data is in a VBO.
-          * Recall that for VBOs, the gl_client_array->Ptr field is
-          * really an offset from the start of the VBO, not a pointer.
-          */
-         struct st_buffer_object *stobj = st_buffer_object(bufobj);
-         assert(stobj->buffer);
-
-         vbuffer[attr].buffer = NULL;
-         pipe_resource_reference(&vbuffer[attr].buffer, stobj->buffer);
-         vbuffer[attr].buffer_offset = pointer_to_offset(array->Ptr);
-      }
-      else {
-         /* wrap user data */
-         uint bytes;
-         void *ptr;
-
-         if (array->Ptr) {
-            if (stride == 0) {
-               bytes = _mesa_sizeof_type(array->Type) * array->Size;
-            }
-            else {
-               uint divisor = array->InstanceDivisor;
-               uint length = (divisor ? num_instances / divisor : max_index) + 1;
-               bytes = stride * length;
-            }
-
-            ptr = (void *) array->Ptr;
-         }
-         else {
-            /* no array, use ctx->Current.Attrib[] value */
-            bytes = sizeof(ctx->Current.Attrib[0]);
-            ptr = (void *) ctx->Current.Attrib[mesaAttr];
-            stride = 0;
-         }
-
-         assert(ptr);
-         assert(bytes);
-
-         vbuffer[attr].buffer =
-            pipe_user_buffer_create(pipe->screen, ptr, bytes,
-                                    PIPE_BIND_VERTEX_BUFFER);
-
-         vbuffer[attr].buffer_offset = 0;
-
-         /* Track user vertex buffers. */
-         pipe_resource_reference(&st->user_vb[attr], vbuffer[attr].buffer);
-         st->user_vb_stride[attr] = stride;
-         st->num_user_vbs = MAX2(st->num_user_vbs, attr+1);
-      }
-
-      /* common-case setup */
-      vbuffer[attr].stride = stride; /* in bytes */
-
-      velements[attr].src_offset = 0;
-      velements[attr].instance_divisor = array->InstanceDivisor;
-      velements[attr].vertex_buffer_index = attr;
-      velements[attr].src_format = st_pipe_vertex_format(array->Type,
-                                                         array->Size,
-                                                         array->Format,
-                                                         array->Normalized);
-      assert(velements[attr].src_format);
-   }
-}
-
-
-static void
-setup_index_buffer(struct gl_context *ctx,
-                   const struct _mesa_index_buffer *ib,
-                   struct pipe_index_buffer *ibuffer)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-
-   memset(ibuffer, 0, sizeof(*ibuffer));
-   if (ib) {
-      struct gl_buffer_object *bufobj = ib->obj;
-
-      switch (ib->type) {
-      case GL_UNSIGNED_INT:
-         ibuffer->index_size = 4;
-         break;
-      case GL_UNSIGNED_SHORT:
-         ibuffer->index_size = 2;
-         break;
-      case GL_UNSIGNED_BYTE:
-         ibuffer->index_size = 1;
-         break;
-      default:
-         assert(0);
-	 return;
-      }
-
-      /* get/create the index buffer object */
-      if (bufobj && bufobj->Name) {
-         /* elements/indexes are in a real VBO */
-         struct st_buffer_object *stobj = st_buffer_object(bufobj);
-         pipe_resource_reference(&ibuffer->buffer, stobj->buffer);
-         ibuffer->offset = pointer_to_offset(ib->ptr);
-      }
-      else {
-         /* element/indicies are in user space memory */
-         ibuffer->buffer =
-            pipe_user_buffer_create(pipe->screen, (void *) ib->ptr,
-                                    ib->count * ibuffer->index_size,
-                                    PIPE_BIND_INDEX_BUFFER);
-      }
-   }
-}
-
-/**
- * Prior to drawing, check that any uniforms referenced by the
- * current shader have been set.  If a uniform has not been set,
- * issue a warning.
- */
-static void
-check_uniforms(struct gl_context *ctx)
-{
-   struct gl_shader_program *shProg[3] = {
-      ctx->Shader.CurrentVertexProgram,
-      ctx->Shader.CurrentGeometryProgram,
-      ctx->Shader.CurrentFragmentProgram,
-   };
-   unsigned j;
-
-   for (j = 0; j < 3; j++) {
-      unsigned i;
-
-      if (shProg[j] == NULL || !shProg[j]->LinkStatus)
-	 continue;
-
-      for (i = 0; i < shProg[j]->Uniforms->NumUniforms; i++) {
-         const struct gl_uniform *u = &shProg[j]->Uniforms->Uniforms[i];
-         if (!u->Initialized) {
-            _mesa_warning(ctx,
-                          "Using shader with uninitialized uniform: %s",
-                          u->Name);
-         }
-      }
-   }
-}
-
-
-/**
- * Translate OpenGL primtive type (GL_POINTS, GL_TRIANGLE_STRIP, etc) to
- * the corresponding Gallium type.
- */
-static unsigned
-translate_prim(const struct gl_context *ctx, unsigned prim)
-{
-   /* GL prims should match Gallium prims, spot-check a few */
-   assert(GL_POINTS == PIPE_PRIM_POINTS);
-   assert(GL_QUADS == PIPE_PRIM_QUADS);
-   assert(GL_TRIANGLE_STRIP_ADJACENCY == PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY);
-
-   /* Avoid quadstrips if it's easy to do so:
-    * Note: it's imporant to do the correct trimming if we change the prim type!
-    * We do that wherever this function is called.
-    */
-   if (prim == GL_QUAD_STRIP &&
-       ctx->Light.ShadeModel != GL_FLAT &&
-       ctx->Polygon.FrontMode == GL_FILL &&
-       ctx->Polygon.BackMode == GL_FILL)
-      prim = GL_TRIANGLE_STRIP;
-
-   return prim;
-}
-
-
-static void
-st_validate_varrays(struct gl_context *ctx,
-                    const struct gl_client_array **arrays,
-                    unsigned max_index,
-                    unsigned num_instances)
-{
-   struct st_context *st = st_context(ctx);
-   const struct st_vertex_program *vp;
-   const struct st_vp_variant *vpv;
-   struct pipe_vertex_buffer vbuffer[PIPE_MAX_SHADER_INPUTS];
-   struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];
-   unsigned num_vbuffers, num_velements;
-   GLuint attr;
-   unsigned i;
-
-   /* must get these after state validation! */
-   vp = st->vp;
-   vpv = st->vp_variant;
-
-   memset(velements, 0, sizeof(struct pipe_vertex_element) * vpv->num_inputs);
-
-   /* Unreference any user vertex buffers. */
-   for (i = 0; i < st->num_user_vbs; i++) {
-      pipe_resource_reference(&st->user_vb[i], NULL);
-   }
-   st->num_user_vbs = 0;
-
-   /*
-    * Setup the vbuffer[] and velements[] arrays.
-    */
-   if (is_interleaved_arrays(vp, vpv, arrays)) {
-      setup_interleaved_attribs(ctx, vp, vpv, arrays, vbuffer, velements,
-                                max_index, num_instances);
-
-      num_vbuffers = 1;
-      num_velements = vpv->num_inputs;
-      if (num_velements == 0)
-         num_vbuffers = 0;
-   }
-   else {
-      setup_non_interleaved_attribs(ctx, vp, vpv, arrays,
-                                    vbuffer, velements, max_index,
-                                    num_instances);
-      num_vbuffers = vpv->num_inputs;
-      num_velements = vpv->num_inputs;
-   }
-
-   cso_set_vertex_buffers(st->cso_context, num_vbuffers, vbuffer);
-   cso_set_vertex_elements(st->cso_context, num_velements, velements);
-
-   /* unreference buffers (frees wrapped user-space buffer objects)
-    * This is OK, because the pipe driver should reference buffers by itself
-    * in set_vertex_buffers. */
-   for (attr = 0; attr < num_vbuffers; attr++) {
-      pipe_resource_reference(&vbuffer[attr].buffer, NULL);
-      assert(!vbuffer[attr].buffer);
-   }
-}
-
-
-/**
- * This function gets plugged into the VBO module and is called when
- * we have something to render.
- * Basically, translate the information into the format expected by gallium.
- */
-void
-st_draw_vbo(struct gl_context *ctx,
-            const struct gl_client_array **arrays,
-            const struct _mesa_prim *prims,
-            GLuint nr_prims,
-            const struct _mesa_index_buffer *ib,
-	    GLboolean index_bounds_valid,
-            GLuint min_index,
-            GLuint max_index)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   struct pipe_index_buffer ibuffer;
-   struct pipe_draw_info info;
-   unsigned i, num_instances = 1;
-   GLboolean new_array =
-         st->dirty.st && (st->dirty.mesa & (_NEW_ARRAY | _NEW_PROGRAM)) != 0;
-
-   /* Mesa core state should have been validated already */
-   assert(ctx->NewState == 0x0);
-
-   if (ib) {
-      /* Gallium probably doesn't want this in some cases. */
-      if (!index_bounds_valid)
-         if (!vbo_all_varyings_in_vbos(arrays))
-            vbo_get_minmax_index(ctx, prims, ib, &min_index, &max_index);
-
-      for (i = 0; i < nr_prims; i++) {
-         num_instances = MAX2(num_instances, prims[i].num_instances);
-      }
-   }
-   else {
-      /* Get min/max index for non-indexed drawing. */
-      min_index = ~0;
-      max_index = 0;
-
-      for (i = 0; i < nr_prims; i++) {
-         min_index = MIN2(min_index, prims[i].start);
-         max_index = MAX2(max_index, prims[i].start + prims[i].count - 1);
-         num_instances = MAX2(num_instances, prims[i].num_instances);
-      }
-   }
-
-   /* Validate state. */
-   if (st->dirty.st) {
-      GLboolean vertDataEdgeFlags;
-
-      /* sanity check for pointer arithmetic below */
-      assert(sizeof(arrays[0]->Ptr[0]) == 1);
-
-      vertDataEdgeFlags = arrays[VERT_ATTRIB_EDGEFLAG]->BufferObj &&
-                          arrays[VERT_ATTRIB_EDGEFLAG]->BufferObj->Name;
-      if (vertDataEdgeFlags != st->vertdata_edgeflags) {
-         st->vertdata_edgeflags = vertDataEdgeFlags;
-         st->dirty.st |= ST_NEW_EDGEFLAGS_DATA;
-      }
-
-      st_validate_state(st);
-
-      if (new_array) {
-         st_validate_varrays(ctx, arrays, max_index, num_instances);
-      }
-
-#if 0
-      if (MESA_VERBOSE & VERBOSE_GLSL) {
-         check_uniforms(ctx);
-      }
-#else
-      (void) check_uniforms;
-#endif
-   }
-
-   /* Notify the driver that the content of user buffers may have been
-    * changed. */
-   if (!new_array && st->num_user_vbs) {
-      for (i = 0; i < st->num_user_vbs; i++) {
-         if (st->user_vb[i]) {
-            unsigned stride = st->user_vb_stride[i];
-
-            if (stride) {
-               pipe->redefine_user_buffer(pipe, st->user_vb[i],
-                                          min_index * stride,
-                                          (max_index + 1 - min_index) * stride);
-            }
-            else {
-               /* stride == 0 */
-               pipe->redefine_user_buffer(pipe, st->user_vb[i],
-                                          0, st->user_vb[i]->width0);
-            }
-         }
-      }
-   }
-
-   setup_index_buffer(ctx, ib, &ibuffer);
-   pipe->set_index_buffer(pipe, &ibuffer);
-
-   util_draw_init_info(&info);
-   if (ib) {
-      info.indexed = TRUE;
-      if (min_index != ~0 && max_index != ~0) {
-         info.min_index = min_index;
-         info.max_index = max_index;
-      }
-   }
-
-   info.primitive_restart = st->ctx->Array.PrimitiveRestart;
-   info.restart_index = st->ctx->Array.RestartIndex;
-
-   /* do actual drawing */
-   for (i = 0; i < nr_prims; i++) {
-      info.mode = translate_prim( ctx, prims[i].mode );
-      info.start = prims[i].start;
-      info.count = prims[i].count;
-      info.instance_count = prims[i].num_instances;
-      info.index_bias = prims[i].basevertex;
-      if (!ib) {
-         info.min_index = info.start;
-         info.max_index = info.start + info.count - 1;
-      }
-
-      if (u_trim_pipe_prim(info.mode, &info.count))
-         pipe->draw_vbo(pipe, &info);
-   }
-
-   pipe_resource_reference(&ibuffer.buffer, NULL);
-}
-
-
-void
-st_init_draw(struct st_context *st)
-{
-   struct gl_context *ctx = st->ctx;
-
-   vbo_set_draw_func(ctx, st_draw_vbo);
-
-#if FEATURE_feedback || FEATURE_rastpos
-   st->draw = draw_create(st->pipe); /* for selection/feedback */
-
-   /* Disable draw options that might convert points/lines to tris, etc.
-    * as that would foul-up feedback/selection mode.
-    */
-   draw_wide_line_threshold(st->draw, 1000.0f);
-   draw_wide_point_threshold(st->draw, 1000.0f);
-   draw_enable_line_stipple(st->draw, FALSE);
-   draw_enable_point_sprites(st->draw, FALSE);
-#endif
-}
-
-
-void
-st_destroy_draw(struct st_context *st)
-{
-#if FEATURE_feedback || FEATURE_rastpos
-   draw_destroy(st->draw);
-#endif
-}
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+/*

+ * This file implements the st_draw_vbo() function which is called from

+ * Mesa's VBO module.  All point/line/triangle rendering is done through

+ * this function whether the user called glBegin/End, glDrawArrays,

+ * glDrawElements, glEvalMesh, or glCalList, etc.

+ *

+ * We basically convert the VBO's vertex attribute/array information into

+ * Gallium vertex state, bind the vertex buffer objects and call

+ * pipe->draw_elements(), pipe->draw_range_elements() or pipe->draw_arrays().

+ *

+ * Authors:

+ *   Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+#include "main/imports.h"

+#include "main/image.h"

+#include "main/macros.h"

+#include "main/mfeatures.h"

+#include "program/prog_uniform.h"

+

+#include "vbo/vbo.h"

+

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_cb_bufferobjects.h"

+#include "st_draw.h"

+#include "st_program.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "util/u_inlines.h"

+#include "util/u_format.h"

+#include "util/u_prim.h"

+#include "util/u_draw_quad.h"

+#include "draw/draw_context.h"

+#include "cso_cache/cso_context.h"

+

+

+static GLuint double_types[4] = {

+   PIPE_FORMAT_R64_FLOAT,

+   PIPE_FORMAT_R64G64_FLOAT,

+   PIPE_FORMAT_R64G64B64_FLOAT,

+   PIPE_FORMAT_R64G64B64A64_FLOAT

+};

+

+static GLuint float_types[4] = {

+   PIPE_FORMAT_R32_FLOAT,

+   PIPE_FORMAT_R32G32_FLOAT,

+   PIPE_FORMAT_R32G32B32_FLOAT,

+   PIPE_FORMAT_R32G32B32A32_FLOAT

+};

+

+static GLuint half_float_types[4] = {

+   PIPE_FORMAT_R16_FLOAT,

+   PIPE_FORMAT_R16G16_FLOAT,

+   PIPE_FORMAT_R16G16B16_FLOAT,

+   PIPE_FORMAT_R16G16B16A16_FLOAT

+};

+

+static GLuint uint_types_norm[4] = {

+   PIPE_FORMAT_R32_UNORM,

+   PIPE_FORMAT_R32G32_UNORM,

+   PIPE_FORMAT_R32G32B32_UNORM,

+   PIPE_FORMAT_R32G32B32A32_UNORM

+};

+

+static GLuint uint_types_scale[4] = {

+   PIPE_FORMAT_R32_USCALED,

+   PIPE_FORMAT_R32G32_USCALED,

+   PIPE_FORMAT_R32G32B32_USCALED,

+   PIPE_FORMAT_R32G32B32A32_USCALED

+};

+

+static GLuint int_types_norm[4] = {

+   PIPE_FORMAT_R32_SNORM,

+   PIPE_FORMAT_R32G32_SNORM,

+   PIPE_FORMAT_R32G32B32_SNORM,

+   PIPE_FORMAT_R32G32B32A32_SNORM

+};

+

+static GLuint int_types_scale[4] = {

+   PIPE_FORMAT_R32_SSCALED,

+   PIPE_FORMAT_R32G32_SSCALED,

+   PIPE_FORMAT_R32G32B32_SSCALED,

+   PIPE_FORMAT_R32G32B32A32_SSCALED

+};

+

+static GLuint ushort_types_norm[4] = {

+   PIPE_FORMAT_R16_UNORM,

+   PIPE_FORMAT_R16G16_UNORM,

+   PIPE_FORMAT_R16G16B16_UNORM,

+   PIPE_FORMAT_R16G16B16A16_UNORM

+};

+

+static GLuint ushort_types_scale[4] = {

+   PIPE_FORMAT_R16_USCALED,

+   PIPE_FORMAT_R16G16_USCALED,

+   PIPE_FORMAT_R16G16B16_USCALED,

+   PIPE_FORMAT_R16G16B16A16_USCALED

+};

+

+static GLuint short_types_norm[4] = {

+   PIPE_FORMAT_R16_SNORM,

+   PIPE_FORMAT_R16G16_SNORM,

+   PIPE_FORMAT_R16G16B16_SNORM,

+   PIPE_FORMAT_R16G16B16A16_SNORM

+};

+

+static GLuint short_types_scale[4] = {

+   PIPE_FORMAT_R16_SSCALED,

+   PIPE_FORMAT_R16G16_SSCALED,

+   PIPE_FORMAT_R16G16B16_SSCALED,

+   PIPE_FORMAT_R16G16B16A16_SSCALED

+};

+

+static GLuint ubyte_types_norm[4] = {

+   PIPE_FORMAT_R8_UNORM,

+   PIPE_FORMAT_R8G8_UNORM,

+   PIPE_FORMAT_R8G8B8_UNORM,

+   PIPE_FORMAT_R8G8B8A8_UNORM

+};

+

+static GLuint ubyte_types_scale[4] = {

+   PIPE_FORMAT_R8_USCALED,

+   PIPE_FORMAT_R8G8_USCALED,

+   PIPE_FORMAT_R8G8B8_USCALED,

+   PIPE_FORMAT_R8G8B8A8_USCALED

+};

+

+static GLuint byte_types_norm[4] = {

+   PIPE_FORMAT_R8_SNORM,

+   PIPE_FORMAT_R8G8_SNORM,

+   PIPE_FORMAT_R8G8B8_SNORM,

+   PIPE_FORMAT_R8G8B8A8_SNORM

+};

+

+static GLuint byte_types_scale[4] = {

+   PIPE_FORMAT_R8_SSCALED,

+   PIPE_FORMAT_R8G8_SSCALED,

+   PIPE_FORMAT_R8G8B8_SSCALED,

+   PIPE_FORMAT_R8G8B8A8_SSCALED

+};

+

+static GLuint fixed_types[4] = {

+   PIPE_FORMAT_R32_FIXED,

+   PIPE_FORMAT_R32G32_FIXED,

+   PIPE_FORMAT_R32G32B32_FIXED,

+   PIPE_FORMAT_R32G32B32A32_FIXED

+};

+

+

+

+/**

+ * Return a PIPE_FORMAT_x for the given GL datatype and size.

+ */

+enum pipe_format

+st_pipe_vertex_format(GLenum type, GLuint size, GLenum format,

+                      GLboolean normalized)

+{

+   assert((type >= GL_BYTE && type <= GL_DOUBLE) ||

+          type == GL_FIXED || type == GL_HALF_FLOAT);

+   assert(size >= 1);

+   assert(size <= 4);

+   assert(format == GL_RGBA || format == GL_BGRA);

+

+   if (format == GL_BGRA) {

+      /* this is an odd-ball case */

+      assert(type == GL_UNSIGNED_BYTE);

+      assert(normalized);

+      return PIPE_FORMAT_B8G8R8A8_UNORM;

+   }

+

+   if (normalized) {

+      switch (type) {

+      case GL_DOUBLE: return double_types[size-1];

+      case GL_FLOAT: return float_types[size-1];

+      case GL_HALF_FLOAT: return half_float_types[size-1];

+      case GL_INT: return int_types_norm[size-1];

+      case GL_SHORT: return short_types_norm[size-1];

+      case GL_BYTE: return byte_types_norm[size-1];

+      case GL_UNSIGNED_INT: return uint_types_norm[size-1];

+      case GL_UNSIGNED_SHORT: return ushort_types_norm[size-1];

+      case GL_UNSIGNED_BYTE: return ubyte_types_norm[size-1];

+      case GL_FIXED: return fixed_types[size-1];

+      default: assert(0); return 0;

+      }

+   }

+   else {

+      switch (type) {

+      case GL_DOUBLE: return double_types[size-1];

+      case GL_FLOAT: return float_types[size-1];

+      case GL_HALF_FLOAT: return half_float_types[size-1];

+      case GL_INT: return int_types_scale[size-1];

+      case GL_SHORT: return short_types_scale[size-1];

+      case GL_BYTE: return byte_types_scale[size-1];

+      case GL_UNSIGNED_INT: return uint_types_scale[size-1];

+      case GL_UNSIGNED_SHORT: return ushort_types_scale[size-1];

+      case GL_UNSIGNED_BYTE: return ubyte_types_scale[size-1];

+      case GL_FIXED: return fixed_types[size-1];

+      default: assert(0); return 0;

+      }

+   }

+   return PIPE_FORMAT_NONE; /* silence compiler warning */

+}

+

+

+

+/**

+ * Examine the active arrays to determine if we have interleaved

+ * vertex arrays all living in one VBO, or all living in user space.

+ * \param userSpace  returns whether the arrays are in user space.

+ */

+static GLboolean

+is_interleaved_arrays(const struct st_vertex_program *vp,

+                      const struct st_vp_variant *vpv,

+                      const struct gl_client_array **arrays)

+{

+   GLuint attr;

+   const struct gl_buffer_object *firstBufObj = NULL;

+   GLint firstStride = -1;

+   const GLubyte *client_addr = NULL;

+   GLboolean user_memory;

+

+   for (attr = 0; attr < vpv->num_inputs; attr++) {

+      const GLuint mesaAttr = vp->index_to_input[attr];

+      const struct gl_client_array *array = arrays[mesaAttr];

+      const struct gl_buffer_object *bufObj = array->BufferObj;

+      const GLsizei stride = array->StrideB; /* in bytes */

+

+      if (firstStride < 0) {

+         firstStride = stride;

+         user_memory = !bufObj || !bufObj->Name;

+      }

+      else if (firstStride != stride) {

+         return GL_FALSE;

+      }

+

+      if (!bufObj || !bufObj->Name) {

+         /* Try to detect if the client-space arrays are

+          * "close" to each other.

+          */

+         if (!user_memory) {

+            return GL_FALSE;

+         }

+         if (!client_addr) {

+            client_addr = array->Ptr;

+         }

+         else if (abs(array->Ptr - client_addr) > firstStride) {

+            /* arrays start too far apart */

+            return GL_FALSE;

+         }

+      }

+      else if (!firstBufObj) {

+         if (user_memory) {

+            return GL_FALSE;

+         }

+         firstBufObj = bufObj;

+      }

+      else if (bufObj != firstBufObj) {

+         return GL_FALSE;

+      }

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Set up for drawing interleaved arrays that all live in one VBO

+ * or all live in user space.

+ * \param vbuffer  returns vertex buffer info

+ * \param velements  returns vertex element info

+ */

+static void

+setup_interleaved_attribs(struct gl_context *ctx,

+                          const struct st_vertex_program *vp,

+                          const struct st_vp_variant *vpv,

+                          const struct gl_client_array **arrays,

+                          struct pipe_vertex_buffer *vbuffer,

+                          struct pipe_vertex_element velements[],

+                          unsigned max_index,

+                          unsigned num_instances)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   GLuint attr;

+   const GLubyte *low_addr = NULL;

+

+   /* Find the lowest address of the arrays we're drawing */

+   if (vpv->num_inputs) {

+      low_addr = arrays[vp->index_to_input[0]]->Ptr;

+

+      for (attr = 1; attr < vpv->num_inputs; attr++) {

+         const GLubyte *start = arrays[vp->index_to_input[attr]]->Ptr;

+         low_addr = MIN2(low_addr, start);

+      }

+   }

+

+   for (attr = 0; attr < vpv->num_inputs; attr++) {

+      const GLuint mesaAttr = vp->index_to_input[attr];

+      const struct gl_client_array *array = arrays[mesaAttr];

+      struct gl_buffer_object *bufobj = array->BufferObj;

+      struct st_buffer_object *stobj = st_buffer_object(bufobj);

+      GLsizei stride = array->StrideB;

+

+      if (attr == 0) {

+         if (bufobj && bufobj->Name) {

+            vbuffer->buffer = NULL;

+            pipe_resource_reference(&vbuffer->buffer, stobj->buffer);

+            vbuffer->buffer_offset = pointer_to_offset(low_addr);

+         }

+         else {

+            uint divisor = array->InstanceDivisor;

+            uint length = (divisor ? num_instances / divisor : max_index) + 1;

+            vbuffer->buffer = pipe_user_buffer_create(pipe->screen,

+                                                      (void*) low_addr,

+                                                      stride * length,

+                                                      PIPE_BIND_VERTEX_BUFFER);

+            vbuffer->buffer_offset = 0;

+

+            /* Track user vertex buffers. */

+            pipe_resource_reference(&st->user_vb[0], vbuffer->buffer);

+            st->user_vb_stride[0] = stride;

+            st->num_user_vbs = 1;

+         }

+         vbuffer->stride = stride; /* in bytes */

+      }

+

+      velements[attr].src_offset = (unsigned) (array->Ptr - low_addr);

+      velements[attr].instance_divisor = array->InstanceDivisor;

+      velements[attr].vertex_buffer_index = 0;

+      velements[attr].src_format = st_pipe_vertex_format(array->Type,

+                                                         array->Size,

+                                                         array->Format,

+                                                         array->Normalized);

+      assert(velements[attr].src_format);

+   }

+}

+

+

+/**

+ * Set up a separate pipe_vertex_buffer and pipe_vertex_element for each

+ * vertex attribute.

+ * \param vbuffer  returns vertex buffer info

+ * \param velements  returns vertex element info

+ */

+static void

+setup_non_interleaved_attribs(struct gl_context *ctx,

+                              const struct st_vertex_program *vp,

+                              const struct st_vp_variant *vpv,

+                              const struct gl_client_array **arrays,

+                              struct pipe_vertex_buffer vbuffer[],

+                              struct pipe_vertex_element velements[],

+                              unsigned max_index,

+                              unsigned num_instances)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   GLuint attr;

+

+   for (attr = 0; attr < vpv->num_inputs; attr++) {

+      const GLuint mesaAttr = vp->index_to_input[attr];

+      const struct gl_client_array *array = arrays[mesaAttr];

+      struct gl_buffer_object *bufobj = array->BufferObj;

+      GLsizei stride = array->StrideB;

+

+      if (bufobj && bufobj->Name) {

+         /* Attribute data is in a VBO.

+          * Recall that for VBOs, the gl_client_array->Ptr field is

+          * really an offset from the start of the VBO, not a pointer.

+          */

+         struct st_buffer_object *stobj = st_buffer_object(bufobj);

+         assert(stobj->buffer);

+

+         vbuffer[attr].buffer = NULL;

+         pipe_resource_reference(&vbuffer[attr].buffer, stobj->buffer);

+         vbuffer[attr].buffer_offset = pointer_to_offset(array->Ptr);

+      }

+      else {

+         /* wrap user data */

+         uint bytes;

+         void *ptr;

+

+         if (array->Ptr) {

+            if (stride == 0) {

+               bytes = _mesa_sizeof_type(array->Type) * array->Size;

+            }

+            else {

+               uint divisor = array->InstanceDivisor;

+               uint length = (divisor ? num_instances / divisor : max_index) + 1;

+               bytes = stride * length;

+            }

+

+            ptr = (void *) array->Ptr;

+         }

+         else {

+            /* no array, use ctx->Current.Attrib[] value */

+            bytes = sizeof(ctx->Current.Attrib[0]);

+            ptr = (void *) ctx->Current.Attrib[mesaAttr];

+            stride = 0;

+         }

+

+         assert(ptr);

+         assert(bytes);

+

+         vbuffer[attr].buffer =

+            pipe_user_buffer_create(pipe->screen, ptr, bytes,

+                                    PIPE_BIND_VERTEX_BUFFER);

+

+         vbuffer[attr].buffer_offset = 0;

+

+         /* Track user vertex buffers. */

+         pipe_resource_reference(&st->user_vb[attr], vbuffer[attr].buffer);

+         st->user_vb_stride[attr] = stride;

+         st->num_user_vbs = MAX2(st->num_user_vbs, attr+1);

+      }

+

+      /* common-case setup */

+      vbuffer[attr].stride = stride; /* in bytes */

+

+      velements[attr].src_offset = 0;

+      velements[attr].instance_divisor = array->InstanceDivisor;

+      velements[attr].vertex_buffer_index = attr;

+      velements[attr].src_format = st_pipe_vertex_format(array->Type,

+                                                         array->Size,

+                                                         array->Format,

+                                                         array->Normalized);

+      assert(velements[attr].src_format);

+   }

+}

+

+

+static void

+setup_index_buffer(struct gl_context *ctx,

+                   const struct _mesa_index_buffer *ib,

+                   struct pipe_index_buffer *ibuffer)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+

+   memset(ibuffer, 0, sizeof(*ibuffer));

+   if (ib) {

+      struct gl_buffer_object *bufobj = ib->obj;

+

+      switch (ib->type) {

+      case GL_UNSIGNED_INT:

+         ibuffer->index_size = 4;

+         break;

+      case GL_UNSIGNED_SHORT:

+         ibuffer->index_size = 2;

+         break;

+      case GL_UNSIGNED_BYTE:

+         ibuffer->index_size = 1;

+         break;

+      default:

+         assert(0);

+	 return;

+      }

+

+      /* get/create the index buffer object */

+      if (bufobj && bufobj->Name) {

+         /* elements/indexes are in a real VBO */

+         struct st_buffer_object *stobj = st_buffer_object(bufobj);

+         pipe_resource_reference(&ibuffer->buffer, stobj->buffer);

+         ibuffer->offset = pointer_to_offset(ib->ptr);

+      }

+      else {

+         /* element/indicies are in user space memory */

+         ibuffer->buffer =

+            pipe_user_buffer_create(pipe->screen, (void *) ib->ptr,

+                                    ib->count * ibuffer->index_size,

+                                    PIPE_BIND_INDEX_BUFFER);

+      }

+   }

+}

+

+/**

+ * Prior to drawing, check that any uniforms referenced by the

+ * current shader have been set.  If a uniform has not been set,

+ * issue a warning.

+ */

+static void

+check_uniforms(struct gl_context *ctx)

+{

+   struct gl_shader_program *shProg[3] = {

+      ctx->Shader.CurrentVertexProgram,

+      ctx->Shader.CurrentGeometryProgram,

+      ctx->Shader.CurrentFragmentProgram,

+   };

+   unsigned j;

+

+   for (j = 0; j < 3; j++) {

+      unsigned i;

+

+      if (shProg[j] == NULL || !shProg[j]->LinkStatus)

+	 continue;

+

+      for (i = 0; i < shProg[j]->Uniforms->NumUniforms; i++) {

+         const struct gl_uniform *u = &shProg[j]->Uniforms->Uniforms[i];

+         if (!u->Initialized) {

+            _mesa_warning(ctx,

+                          "Using shader with uninitialized uniform: %s",

+                          u->Name);

+         }

+      }

+   }

+}

+

+

+/**

+ * Translate OpenGL primtive type (GL_POINTS, GL_TRIANGLE_STRIP, etc) to

+ * the corresponding Gallium type.

+ */

+static unsigned

+translate_prim(const struct gl_context *ctx, unsigned prim)

+{

+   /* GL prims should match Gallium prims, spot-check a few */

+   assert(GL_POINTS == PIPE_PRIM_POINTS);

+   assert(GL_QUADS == PIPE_PRIM_QUADS);

+   assert(GL_TRIANGLE_STRIP_ADJACENCY == PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY);

+

+   /* Avoid quadstrips if it's easy to do so:

+    * Note: it's imporant to do the correct trimming if we change the prim type!

+    * We do that wherever this function is called.

+    */

+   if (prim == GL_QUAD_STRIP &&

+       ctx->Light.ShadeModel != GL_FLAT &&

+       ctx->Polygon.FrontMode == GL_FILL &&

+       ctx->Polygon.BackMode == GL_FILL)

+      prim = GL_TRIANGLE_STRIP;

+

+   return prim;

+}

+

+

+static void

+st_validate_varrays(struct gl_context *ctx,

+                    const struct gl_client_array **arrays,

+                    unsigned max_index,

+                    unsigned num_instances)

+{

+   struct st_context *st = st_context(ctx);

+   const struct st_vertex_program *vp;

+   const struct st_vp_variant *vpv;

+   struct pipe_vertex_buffer vbuffer[PIPE_MAX_SHADER_INPUTS];

+   struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];

+   unsigned num_vbuffers, num_velements;

+   GLuint attr;

+   unsigned i;

+

+   /* must get these after state validation! */

+   vp = st->vp;

+   vpv = st->vp_variant;

+

+   memset(velements, 0, sizeof(struct pipe_vertex_element) * vpv->num_inputs);

+

+   /* Unreference any user vertex buffers. */

+   for (i = 0; i < st->num_user_vbs; i++) {

+      pipe_resource_reference(&st->user_vb[i], NULL);

+   }

+   st->num_user_vbs = 0;

+

+   /*

+    * Setup the vbuffer[] and velements[] arrays.

+    */

+   if (is_interleaved_arrays(vp, vpv, arrays)) {

+      setup_interleaved_attribs(ctx, vp, vpv, arrays, vbuffer, velements,

+                                max_index, num_instances);

+

+      num_vbuffers = 1;

+      num_velements = vpv->num_inputs;

+      if (num_velements == 0)

+         num_vbuffers = 0;

+   }

+   else {

+      setup_non_interleaved_attribs(ctx, vp, vpv, arrays,

+                                    vbuffer, velements, max_index,

+                                    num_instances);

+      num_vbuffers = vpv->num_inputs;

+      num_velements = vpv->num_inputs;

+   }

+

+   cso_set_vertex_buffers(st->cso_context, num_vbuffers, vbuffer);

+   cso_set_vertex_elements(st->cso_context, num_velements, velements);

+

+   /* unreference buffers (frees wrapped user-space buffer objects)

+    * This is OK, because the pipe driver should reference buffers by itself

+    * in set_vertex_buffers. */

+   for (attr = 0; attr < num_vbuffers; attr++) {

+      pipe_resource_reference(&vbuffer[attr].buffer, NULL);

+      assert(!vbuffer[attr].buffer);

+   }

+}

+

+

+/**

+ * This function gets plugged into the VBO module and is called when

+ * we have something to render.

+ * Basically, translate the information into the format expected by gallium.

+ */

+void

+st_draw_vbo(struct gl_context *ctx,

+            const struct gl_client_array **arrays,

+            const struct _mesa_prim *prims,

+            GLuint nr_prims,

+            const struct _mesa_index_buffer *ib,

+	    GLboolean index_bounds_valid,

+            GLuint min_index,

+            GLuint max_index)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_index_buffer ibuffer;

+   struct pipe_draw_info info;

+   unsigned i, num_instances = 1;

+   GLboolean new_array =

+         st->dirty.st && (st->dirty.mesa & (_NEW_ARRAY | _NEW_PROGRAM)) != 0;

+

+   /* Mesa core state should have been validated already */

+   assert(ctx->NewState == 0x0);

+

+   if (ib) {

+      /* Gallium probably doesn't want this in some cases. */

+      if (!index_bounds_valid)

+         if (!vbo_all_varyings_in_vbos(arrays))

+            vbo_get_minmax_index(ctx, prims, ib, &min_index, &max_index);

+

+      for (i = 0; i < nr_prims; i++) {

+         num_instances = MAX2(num_instances, prims[i].num_instances);

+      }

+   }

+   else {

+      /* Get min/max index for non-indexed drawing. */

+      min_index = ~0;

+      max_index = 0;

+

+      for (i = 0; i < nr_prims; i++) {

+         min_index = MIN2(min_index, prims[i].start);

+         max_index = MAX2(max_index, prims[i].start + prims[i].count - 1);

+         num_instances = MAX2(num_instances, prims[i].num_instances);

+      }

+   }

+

+   /* Validate state. */

+   if (st->dirty.st) {

+      GLboolean vertDataEdgeFlags;

+

+      /* sanity check for pointer arithmetic below */

+      assert(sizeof(arrays[0]->Ptr[0]) == 1);

+

+      vertDataEdgeFlags = arrays[VERT_ATTRIB_EDGEFLAG]->BufferObj &&

+                          arrays[VERT_ATTRIB_EDGEFLAG]->BufferObj->Name;

+      if (vertDataEdgeFlags != st->vertdata_edgeflags) {

+         st->vertdata_edgeflags = vertDataEdgeFlags;

+         st->dirty.st |= ST_NEW_EDGEFLAGS_DATA;

+      }

+

+      st_validate_state(st);

+

+      if (new_array) {

+         st_validate_varrays(ctx, arrays, max_index, num_instances);

+      }

+

+#if 0

+      if (MESA_VERBOSE & VERBOSE_GLSL) {

+         check_uniforms(ctx);

+      }

+#else

+      (void) check_uniforms;

+#endif

+   }

+

+   /* Notify the driver that the content of user buffers may have been

+    * changed. */

+   if (!new_array && st->num_user_vbs) {

+      for (i = 0; i < st->num_user_vbs; i++) {

+         if (st->user_vb[i]) {

+            unsigned stride = st->user_vb_stride[i];

+

+            if (stride) {

+               pipe->redefine_user_buffer(pipe, st->user_vb[i],

+                                          min_index * stride,

+                                          (max_index + 1 - min_index) * stride);

+            }

+            else {

+               /* stride == 0 */

+               pipe->redefine_user_buffer(pipe, st->user_vb[i],

+                                          0, st->user_vb[i]->width0);

+            }

+         }

+      }

+   }

+

+   setup_index_buffer(ctx, ib, &ibuffer);

+   pipe->set_index_buffer(pipe, &ibuffer);

+

+   util_draw_init_info(&info);

+   if (ib) {

+      info.indexed = TRUE;

+      if (min_index != ~0 && max_index != ~0) {

+         info.min_index = min_index;

+         info.max_index = max_index;

+      }

+   }

+

+   info.primitive_restart = st->ctx->Array.PrimitiveRestart;

+   info.restart_index = st->ctx->Array.RestartIndex;

+

+   /* do actual drawing */

+   for (i = 0; i < nr_prims; i++) {

+      info.mode = translate_prim( ctx, prims[i].mode );

+      info.start = prims[i].start;

+      info.count = prims[i].count;

+      info.instance_count = prims[i].num_instances;

+      info.index_bias = prims[i].basevertex;

+      if (!ib) {

+         info.min_index = info.start;

+         info.max_index = info.start + info.count - 1;

+      }

+

+      if (u_trim_pipe_prim(info.mode, &info.count))

+         pipe->draw_vbo(pipe, &info);

+   }

+

+   pipe_resource_reference(&ibuffer.buffer, NULL);

+}

+

+

+void

+st_init_draw(struct st_context *st)

+{

+   struct gl_context *ctx = st->ctx;

+

+   vbo_set_draw_func(ctx, st_draw_vbo);

+

+#if FEATURE_feedback || FEATURE_rastpos

+   st->draw = draw_create(st->pipe); /* for selection/feedback */

+

+   /* Disable draw options that might convert points/lines to tris, etc.

+    * as that would foul-up feedback/selection mode.

+    */

+   draw_wide_line_threshold(st->draw, 1000.0f);

+   draw_wide_point_threshold(st->draw, 1000.0f);

+   draw_enable_line_stipple(st->draw, FALSE);

+   draw_enable_point_sprites(st->draw, FALSE);

+#endif

+}

+

+

+void

+st_destroy_draw(struct st_context *st)

+{

+#if FEATURE_feedback || FEATURE_rastpos

+   draw_destroy(st->draw);

+#endif

+}

diff --git a/mesalib/src/mesa/state_tracker/st_draw_feedback.c b/mesalib/src/mesa/state_tracker/st_draw_feedback.c
index 1e1220bfe..f0734eae0 100644
--- a/mesalib/src/mesa/state_tracker/st_draw_feedback.c
+++ b/mesalib/src/mesa/state_tracker/st_draw_feedback.c
@@ -1,277 +1,277 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
-#include "main/imports.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-
-#include "vbo/vbo.h"
-
-#include "st_context.h"
-#include "st_atom.h"
-#include "st_cb_bufferobjects.h"
-#include "st_draw.h"
-#include "st_program.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "util/u_inlines.h"
-
-#include "draw/draw_private.h"
-#include "draw/draw_context.h"
-
-
-#if FEATURE_feedback || FEATURE_rastpos
-
-/**
- * Set the (private) draw module's post-transformed vertex format when in
- * GL_SELECT or GL_FEEDBACK mode or for glRasterPos.
- */
-static void
-set_feedback_vertex_format(struct gl_context *ctx)
-{
-#if 0
-   struct st_context *st = st_context(ctx);
-   struct vertex_info vinfo;
-   GLuint i;
-
-   memset(&vinfo, 0, sizeof(vinfo));
-
-   if (ctx->RenderMode == GL_SELECT) {
-      assert(ctx->RenderMode == GL_SELECT);
-      vinfo.num_attribs = 1;
-      vinfo.format[0] = FORMAT_4F;
-      vinfo.interp_mode[0] = INTERP_LINEAR;
-   }
-   else {
-      /* GL_FEEDBACK, or glRasterPos */
-      /* emit all attribs (pos, color, texcoord) as GLfloat[4] */
-      vinfo.num_attribs = st->state.vs->cso->state.num_outputs;
-      for (i = 0; i < vinfo.num_attribs; i++) {
-         vinfo.format[i] = FORMAT_4F;
-         vinfo.interp_mode[i] = INTERP_LINEAR;
-      }
-   }
-
-   draw_set_vertex_info(st->draw, &vinfo);
-#endif
-}
-
-
-/**
- * Called by VBO to draw arrays when in selection or feedback mode and
- * to implement glRasterPos.
- * This is very much like the normal draw_vbo() function above.
- * Look at code refactoring some day.
- * Might move this into the failover module some day.
- */
-void
-st_feedback_draw_vbo(struct gl_context *ctx,
-                     const struct gl_client_array **arrays,
-                     const struct _mesa_prim *prims,
-                     GLuint nr_prims,
-                     const struct _mesa_index_buffer *ib,
-		     GLboolean index_bounds_valid,
-                     GLuint min_index,
-                     GLuint max_index)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   struct draw_context *draw = st->draw;
-   const struct st_vertex_program *vp;
-   const struct pipe_shader_state *vs;
-   struct pipe_vertex_buffer vbuffers[PIPE_MAX_SHADER_INPUTS];
-   struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];
-   struct pipe_index_buffer ibuffer;
-   struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS];
-   struct pipe_transfer *ib_transfer = NULL;
-   GLuint attr, i;
-   const void *mapped_indices = NULL;
-
-   assert(draw);
-
-   st_validate_state(st);
-
-   if (!index_bounds_valid)
-      vbo_get_minmax_index(ctx, prims, ib, &min_index, &max_index);
-
-   /* must get these after state validation! */
-   vp = st->vp;
-   vs = &st->vp_variant->tgsi;
-
-   if (!st->vp_variant->draw_shader) {
-      st->vp_variant->draw_shader = draw_create_vertex_shader(draw, vs);
-   }
-
-   /*
-    * Set up the draw module's state.
-    *
-    * We'd like to do this less frequently, but the normal state-update
-    * code sends state updates to the pipe, not to our private draw module.
-    */
-   assert(draw);
-   draw_set_viewport_state(draw, &st->state.viewport);
-   draw_set_clip_state(draw, &st->state.clip);
-   draw_set_rasterizer_state(draw, &st->state.rasterizer, NULL);
-   draw_bind_vertex_shader(draw, st->vp_variant->draw_shader);
-   set_feedback_vertex_format(ctx);
-
-   /* loop over TGSI shader inputs to determine vertex buffer
-    * and attribute info
-    */
-   for (attr = 0; attr < vp->num_inputs; attr++) {
-      const GLuint mesaAttr = vp->index_to_input[attr];
-      struct gl_buffer_object *bufobj = arrays[mesaAttr]->BufferObj;
-      void *map;
-
-      if (bufobj && bufobj->Name) {
-         /* Attribute data is in a VBO.
-          * Recall that for VBOs, the gl_client_array->Ptr field is
-          * really an offset from the start of the VBO, not a pointer.
-          */
-         struct st_buffer_object *stobj = st_buffer_object(bufobj);
-         assert(stobj->buffer);
-
-         vbuffers[attr].buffer = NULL;
-         pipe_resource_reference(&vbuffers[attr].buffer, stobj->buffer);
-         vbuffers[attr].buffer_offset = pointer_to_offset(arrays[0]->Ptr);
-         velements[attr].src_offset = arrays[mesaAttr]->Ptr - arrays[0]->Ptr;
-      }
-      else {
-         /* attribute data is in user-space memory, not a VBO */
-         uint bytes = (arrays[mesaAttr]->Size
-                       * _mesa_sizeof_type(arrays[mesaAttr]->Type)
-                       * (max_index + 1));
-
-         /* wrap user data */
-         vbuffers[attr].buffer
-            = pipe_user_buffer_create(pipe->screen, (void *) arrays[mesaAttr]->Ptr,
-                                      bytes,
-				      PIPE_BIND_VERTEX_BUFFER);
-         vbuffers[attr].buffer_offset = 0;
-         velements[attr].src_offset = 0;
-      }
-
-      /* common-case setup */
-      vbuffers[attr].stride = arrays[mesaAttr]->StrideB; /* in bytes */
-      velements[attr].instance_divisor = 0;
-      velements[attr].vertex_buffer_index = attr;
-      velements[attr].src_format = 
-         st_pipe_vertex_format(arrays[mesaAttr]->Type,
-                               arrays[mesaAttr]->Size,
-                               arrays[mesaAttr]->Format,
-                               arrays[mesaAttr]->Normalized);
-      assert(velements[attr].src_format);
-
-      /* tell draw about this attribute */
-#if 0
-      draw_set_vertex_buffer(draw, attr, &vbuffer[attr]);
-#endif
-
-      /* map the attrib buffer */
-      map = pipe_buffer_map(pipe, vbuffers[attr].buffer,
-                            PIPE_TRANSFER_READ,
-			    &vb_transfer[attr]);
-      draw_set_mapped_vertex_buffer(draw, attr, map);
-   }
-
-   draw_set_vertex_buffers(draw, vp->num_inputs, vbuffers);
-   draw_set_vertex_elements(draw, vp->num_inputs, velements);
-
-   memset(&ibuffer, 0, sizeof(ibuffer));
-   if (ib) {
-      struct gl_buffer_object *bufobj = ib->obj;
-
-      switch (ib->type) {
-      case GL_UNSIGNED_INT:
-         ibuffer.index_size = 4;
-         break;
-      case GL_UNSIGNED_SHORT:
-         ibuffer.index_size = 2;
-         break;
-      case GL_UNSIGNED_BYTE:
-         ibuffer.index_size = 1;
-         break;
-      default:
-         assert(0);
-	 goto out_unref_vertex;
-      }
-
-      if (bufobj && bufobj->Name) {
-         struct st_buffer_object *stobj = st_buffer_object(bufobj);
-
-         pipe_resource_reference(&ibuffer.buffer, stobj->buffer);
-         ibuffer.offset = pointer_to_offset(ib->ptr);
-
-         mapped_indices = pipe_buffer_map(pipe, stobj->buffer,
-                                          PIPE_TRANSFER_READ, &ib_transfer);
-      }
-      else {
-         /* skip setting ibuffer.buffer as the draw module does not use it */
-         mapped_indices = ib->ptr;
-      }
-
-      draw_set_index_buffer(draw, &ibuffer);
-      draw_set_mapped_index_buffer(draw, mapped_indices);
-   }
-
-   /* set the constant buffer */
-   draw_set_mapped_constant_buffer(st->draw, PIPE_SHADER_VERTEX, 0,
-                                   st->state.constants[PIPE_SHADER_VERTEX].ptr,
-                                   st->state.constants[PIPE_SHADER_VERTEX].size);
-
-
-   /* draw here */
-   for (i = 0; i < nr_prims; i++) {
-      draw_arrays(draw, prims[i].mode, prims[i].start, prims[i].count);
-   }
-
-
-   /*
-    * unmap vertex/index buffers
-    */
-   if (ib) {
-      draw_set_mapped_index_buffer(draw, NULL);
-      draw_set_index_buffer(draw, NULL);
-
-      if (ib_transfer)
-         pipe_buffer_unmap(pipe, ib_transfer);
-      pipe_resource_reference(&ibuffer.buffer, NULL);
-   }
-
- out_unref_vertex:
-   for (attr = 0; attr < vp->num_inputs; attr++) {
-      pipe_buffer_unmap(pipe, vb_transfer[attr]);
-      draw_set_mapped_vertex_buffer(draw, attr, NULL);
-      pipe_resource_reference(&vbuffers[attr].buffer, NULL);
-   }
-   draw_set_vertex_buffers(draw, 0, NULL);
-}
-
-#endif /* FEATURE_feedback || FEATURE_rastpos */
-
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+#include "main/imports.h"

+#include "main/image.h"

+#include "main/macros.h"

+#include "main/mfeatures.h"

+

+#include "vbo/vbo.h"

+

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_cb_bufferobjects.h"

+#include "st_draw.h"

+#include "st_program.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "util/u_inlines.h"

+

+#include "draw/draw_private.h"

+#include "draw/draw_context.h"

+

+

+#if FEATURE_feedback || FEATURE_rastpos

+

+/**

+ * Set the (private) draw module's post-transformed vertex format when in

+ * GL_SELECT or GL_FEEDBACK mode or for glRasterPos.

+ */

+static void

+set_feedback_vertex_format(struct gl_context *ctx)

+{

+#if 0

+   struct st_context *st = st_context(ctx);

+   struct vertex_info vinfo;

+   GLuint i;

+

+   memset(&vinfo, 0, sizeof(vinfo));

+

+   if (ctx->RenderMode == GL_SELECT) {

+      assert(ctx->RenderMode == GL_SELECT);

+      vinfo.num_attribs = 1;

+      vinfo.format[0] = FORMAT_4F;

+      vinfo.interp_mode[0] = INTERP_LINEAR;

+   }

+   else {

+      /* GL_FEEDBACK, or glRasterPos */

+      /* emit all attribs (pos, color, texcoord) as GLfloat[4] */

+      vinfo.num_attribs = st->state.vs->cso->state.num_outputs;

+      for (i = 0; i < vinfo.num_attribs; i++) {

+         vinfo.format[i] = FORMAT_4F;

+         vinfo.interp_mode[i] = INTERP_LINEAR;

+      }

+   }

+

+   draw_set_vertex_info(st->draw, &vinfo);

+#endif

+}

+

+

+/**

+ * Called by VBO to draw arrays when in selection or feedback mode and

+ * to implement glRasterPos.

+ * This is very much like the normal draw_vbo() function above.

+ * Look at code refactoring some day.

+ * Might move this into the failover module some day.

+ */

+void

+st_feedback_draw_vbo(struct gl_context *ctx,

+                     const struct gl_client_array **arrays,

+                     const struct _mesa_prim *prims,

+                     GLuint nr_prims,

+                     const struct _mesa_index_buffer *ib,

+		     GLboolean index_bounds_valid,

+                     GLuint min_index,

+                     GLuint max_index)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct draw_context *draw = st->draw;

+   const struct st_vertex_program *vp;

+   const struct pipe_shader_state *vs;

+   struct pipe_vertex_buffer vbuffers[PIPE_MAX_SHADER_INPUTS];

+   struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];

+   struct pipe_index_buffer ibuffer;

+   struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS];

+   struct pipe_transfer *ib_transfer = NULL;

+   GLuint attr, i;

+   const void *mapped_indices = NULL;

+

+   assert(draw);

+

+   st_validate_state(st);

+

+   if (!index_bounds_valid)

+      vbo_get_minmax_index(ctx, prims, ib, &min_index, &max_index);

+

+   /* must get these after state validation! */

+   vp = st->vp;

+   vs = &st->vp_variant->tgsi;

+

+   if (!st->vp_variant->draw_shader) {

+      st->vp_variant->draw_shader = draw_create_vertex_shader(draw, vs);

+   }

+

+   /*

+    * Set up the draw module's state.

+    *

+    * We'd like to do this less frequently, but the normal state-update

+    * code sends state updates to the pipe, not to our private draw module.

+    */

+   assert(draw);

+   draw_set_viewport_state(draw, &st->state.viewport);

+   draw_set_clip_state(draw, &st->state.clip);

+   draw_set_rasterizer_state(draw, &st->state.rasterizer, NULL);

+   draw_bind_vertex_shader(draw, st->vp_variant->draw_shader);

+   set_feedback_vertex_format(ctx);

+

+   /* loop over TGSI shader inputs to determine vertex buffer

+    * and attribute info

+    */

+   for (attr = 0; attr < vp->num_inputs; attr++) {

+      const GLuint mesaAttr = vp->index_to_input[attr];

+      struct gl_buffer_object *bufobj = arrays[mesaAttr]->BufferObj;

+      void *map;

+

+      if (bufobj && bufobj->Name) {

+         /* Attribute data is in a VBO.

+          * Recall that for VBOs, the gl_client_array->Ptr field is

+          * really an offset from the start of the VBO, not a pointer.

+          */

+         struct st_buffer_object *stobj = st_buffer_object(bufobj);

+         assert(stobj->buffer);

+

+         vbuffers[attr].buffer = NULL;

+         pipe_resource_reference(&vbuffers[attr].buffer, stobj->buffer);

+         vbuffers[attr].buffer_offset = pointer_to_offset(arrays[0]->Ptr);

+         velements[attr].src_offset = arrays[mesaAttr]->Ptr - arrays[0]->Ptr;

+      }

+      else {

+         /* attribute data is in user-space memory, not a VBO */

+         uint bytes = (arrays[mesaAttr]->Size

+                       * _mesa_sizeof_type(arrays[mesaAttr]->Type)

+                       * (max_index + 1));

+

+         /* wrap user data */

+         vbuffers[attr].buffer

+            = pipe_user_buffer_create(pipe->screen, (void *) arrays[mesaAttr]->Ptr,

+                                      bytes,

+				      PIPE_BIND_VERTEX_BUFFER);

+         vbuffers[attr].buffer_offset = 0;

+         velements[attr].src_offset = 0;

+      }

+

+      /* common-case setup */

+      vbuffers[attr].stride = arrays[mesaAttr]->StrideB; /* in bytes */

+      velements[attr].instance_divisor = 0;

+      velements[attr].vertex_buffer_index = attr;

+      velements[attr].src_format = 

+         st_pipe_vertex_format(arrays[mesaAttr]->Type,

+                               arrays[mesaAttr]->Size,

+                               arrays[mesaAttr]->Format,

+                               arrays[mesaAttr]->Normalized);

+      assert(velements[attr].src_format);

+

+      /* tell draw about this attribute */

+#if 0

+      draw_set_vertex_buffer(draw, attr, &vbuffer[attr]);

+#endif

+

+      /* map the attrib buffer */

+      map = pipe_buffer_map(pipe, vbuffers[attr].buffer,

+                            PIPE_TRANSFER_READ,

+			    &vb_transfer[attr]);

+      draw_set_mapped_vertex_buffer(draw, attr, map);

+   }

+

+   draw_set_vertex_buffers(draw, vp->num_inputs, vbuffers);

+   draw_set_vertex_elements(draw, vp->num_inputs, velements);

+

+   memset(&ibuffer, 0, sizeof(ibuffer));

+   if (ib) {

+      struct gl_buffer_object *bufobj = ib->obj;

+

+      switch (ib->type) {

+      case GL_UNSIGNED_INT:

+         ibuffer.index_size = 4;

+         break;

+      case GL_UNSIGNED_SHORT:

+         ibuffer.index_size = 2;

+         break;

+      case GL_UNSIGNED_BYTE:

+         ibuffer.index_size = 1;

+         break;

+      default:

+         assert(0);

+	 goto out_unref_vertex;

+      }

+

+      if (bufobj && bufobj->Name) {

+         struct st_buffer_object *stobj = st_buffer_object(bufobj);

+

+         pipe_resource_reference(&ibuffer.buffer, stobj->buffer);

+         ibuffer.offset = pointer_to_offset(ib->ptr);

+

+         mapped_indices = pipe_buffer_map(pipe, stobj->buffer,

+                                          PIPE_TRANSFER_READ, &ib_transfer);

+      }

+      else {

+         /* skip setting ibuffer.buffer as the draw module does not use it */

+         mapped_indices = ib->ptr;

+      }

+

+      draw_set_index_buffer(draw, &ibuffer);

+      draw_set_mapped_index_buffer(draw, mapped_indices);

+   }

+

+   /* set the constant buffer */

+   draw_set_mapped_constant_buffer(st->draw, PIPE_SHADER_VERTEX, 0,

+                                   st->state.constants[PIPE_SHADER_VERTEX].ptr,

+                                   st->state.constants[PIPE_SHADER_VERTEX].size);

+

+

+   /* draw here */

+   for (i = 0; i < nr_prims; i++) {

+      draw_arrays(draw, prims[i].mode, prims[i].start, prims[i].count);

+   }

+

+

+   /*

+    * unmap vertex/index buffers

+    */

+   if (ib) {

+      draw_set_mapped_index_buffer(draw, NULL);

+      draw_set_index_buffer(draw, NULL);

+

+      if (ib_transfer)

+         pipe_buffer_unmap(pipe, ib_transfer);

+      pipe_resource_reference(&ibuffer.buffer, NULL);

+   }

+

+ out_unref_vertex:

+   for (attr = 0; attr < vp->num_inputs; attr++) {

+      pipe_buffer_unmap(pipe, vb_transfer[attr]);

+      draw_set_mapped_vertex_buffer(draw, attr, NULL);

+      pipe_resource_reference(&vbuffers[attr].buffer, NULL);

+   }

+   draw_set_vertex_buffers(draw, 0, NULL);

+}

+

+#endif /* FEATURE_feedback || FEATURE_rastpos */

+

diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index e32779044..bb4099a95 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -1,564 +1,564 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * Copyright (c) 2008 VMware, Inc.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
-#include "main/imports.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_screen.h"
-
-#include "st_context.h"
-#include "st_extensions.h"
-
-
-static int _min(int a, int b)
-{
-   return (a < b) ? a : b;
-}
-
-static float _maxf(float a, float b)
-{
-   return (a > b) ? a : b;
-}
-
-static int _clamp(int a, int min, int max)
-{
-   if (a < min)
-      return min;
-   else if (a > max)
-      return max;
-   else
-      return a;
-}
-
-
-/**
- * Query driver to get implementation limits.
- * Note that we have to limit/clamp against Mesa's internal limits too.
- */
-void st_init_limits(struct st_context *st)
-{
-   struct pipe_screen *screen = st->pipe->screen;
-   struct gl_constants *c = &st->ctx->Const;
-   gl_shader_type sh;
-
-   c->MaxTextureLevels
-      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS),
-            MAX_TEXTURE_LEVELS);
-
-   c->Max3DTextureLevels
-      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_3D_LEVELS),
-            MAX_3D_TEXTURE_LEVELS);
-
-   c->MaxCubeTextureLevels
-      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS),
-            MAX_CUBE_TEXTURE_LEVELS);
-
-   c->MaxTextureRectSize
-      = _min(1 << (c->MaxTextureLevels - 1), MAX_TEXTURE_RECT_SIZE);
-
-   c->MaxTextureImageUnits
-      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS),
-            MAX_TEXTURE_IMAGE_UNITS);
-
-   c->MaxVertexTextureImageUnits
-      = _min(screen->get_param(screen, PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS),
-             MAX_VERTEX_TEXTURE_IMAGE_UNITS);
-
-   c->MaxCombinedTextureImageUnits
-      = _min(screen->get_param(screen, PIPE_CAP_MAX_COMBINED_SAMPLERS),
-             MAX_COMBINED_TEXTURE_IMAGE_UNITS);
-
-   c->MaxTextureCoordUnits
-      = _min(c->MaxTextureImageUnits, MAX_TEXTURE_COORD_UNITS);
-
-   c->MaxTextureUnits = _min(c->MaxTextureImageUnits, c->MaxTextureCoordUnits);
-
-   c->MaxDrawBuffers
-      = _clamp(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),
-              1, MAX_DRAW_BUFFERS);
-
-   c->MaxLineWidth
-      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH));
-   c->MaxLineWidthAA
-      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH_AA));
-
-   c->MaxPointSize
-      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH));
-   c->MaxPointSizeAA
-      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH_AA));
-   /* called after _mesa_create_context/_mesa_init_point, fix default user
-    * settable max point size up
-    */
-   st->ctx->Point.MaxSize = MAX2(c->MaxPointSize, c->MaxPointSizeAA);
-   /* these are not queryable. Note that GL basically mandates a 1.0 minimum
-    * for non-aa sizes, but we can go down to 0.0 for aa points.
-    */
-   c->MinPointSize = 1.0f;
-   c->MinPointSizeAA = 0.0f;
-
-   c->MaxTextureMaxAnisotropy
-      = _maxf(2.0f, screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_ANISOTROPY));
-
-   c->MaxTextureLodBias
-      = screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_LOD_BIAS);
-
-   c->MaxDrawBuffers
-      = CLAMP(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),
-              1, MAX_DRAW_BUFFERS);
-
-   /* Quads always follow GL provoking rules. */
-   c->QuadsFollowProvokingVertexConvention = GL_FALSE;
-
-   for (sh = 0; sh < MESA_SHADER_TYPES; ++sh) {
-      struct gl_shader_compiler_options *options =
-         &st->ctx->ShaderCompilerOptions[sh];
-      struct gl_program_constants *pc;
-
-      switch (sh) {
-      case PIPE_SHADER_FRAGMENT:
-         pc = &c->FragmentProgram;
-         break;
-      case PIPE_SHADER_VERTEX:
-         pc = &c->VertexProgram;
-         break;
-      case PIPE_SHADER_GEOMETRY:
-         pc = &c->GeometryProgram;
-         break;
-      default:
-         assert(0);
-         continue;
-      }
-
-      pc->MaxNativeInstructions    = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INSTRUCTIONS);
-      pc->MaxNativeAluInstructions = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS);
-      pc->MaxNativeTexInstructions = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEX_INSTRUCTIONS);
-      pc->MaxNativeTexIndirections = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS);
-      pc->MaxNativeAttribs         = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INPUTS);
-      pc->MaxNativeTemps           = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEMPS);
-      pc->MaxNativeAddressRegs     = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_ADDRS);
-      pc->MaxNativeParameters      = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONSTS);
-      pc->MaxUniformComponents     = 4 * MIN2(pc->MaxNativeParameters, MAX_UNIFORMS);
-
-      options->EmitNoNoise = TRUE;
-
-      /* TODO: make these more fine-grained if anyone needs it */
-      options->EmitNoIfs = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);
-      options->EmitNoLoops = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);
-      options->EmitNoFunctions = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_SUBROUTINES);
-      options->EmitNoMainReturn = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_SUBROUTINES);
-
-      options->EmitNoCont = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED);
-
-      options->EmitNoIndirectInput = !screen->get_shader_param(screen, sh,
-                                        PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR);
-      options->EmitNoIndirectOutput = !screen->get_shader_param(screen, sh,
-                                        PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR);
-      options->EmitNoIndirectTemp = !screen->get_shader_param(screen, sh,
-                                        PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR);
-      options->EmitNoIndirectUniform = !screen->get_shader_param(screen, sh,
-                                        PIPE_SHADER_CAP_INDIRECT_CONST_ADDR);
-
-      if(options->EmitNoLoops)
-         options->MaxUnrollIterations = MIN2(screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INSTRUCTIONS), 65536);
-   }
-
-   /* PIPE_CAP_MAX_FS_INPUTS specifies the number of COLORn + GENERICn inputs
-    * and is set in MaxNativeAttribs. It's always 2 colors + N generic
-    * attributes. The GLSL compiler never uses COLORn for varyings, so we
-    * subtract the 2 colors to get the maximum number of varyings (generic
-    * attributes) supported by a driver. */
-   c->MaxVarying = screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_MAX_INPUTS) - 2;
-   c->MaxVarying = MIN2(c->MaxVarying, MAX_VARYING);
-
-   /* XXX we'll need a better query here someday */
-   if (screen->get_param(screen, PIPE_CAP_GLSL)) {
-      c->GLSLVersion = 120;
-   }
-}
-
-
-/**
- * Use pipe_screen::get_param() to query PIPE_CAP_ values to determine
- * which GL extensions are supported.
- * Quite a few extensions are always supported because they are standard
- * features or can be built on top of other gallium features.
- * Some fine tuning may still be needed.
- */
-void st_init_extensions(struct st_context *st)
-{
-   struct pipe_screen *screen = st->pipe->screen;
-   struct gl_context *ctx = st->ctx;
-
-   /*
-    * Extensions that are supported by all Gallium drivers:
-    */
-   ctx->Extensions.ARB_copy_buffer = GL_TRUE;
-   ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;
-   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;
-   ctx->Extensions.ARB_fragment_program = GL_TRUE;
-   ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
-   ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
-   ctx->Extensions.ARB_multisample = GL_TRUE;
-   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE; /* XXX temp */
-   ctx->Extensions.ARB_texture_compression = GL_TRUE;
-   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
-   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
-   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
-   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
-   ctx->Extensions.ARB_vertex_array_object = GL_TRUE;
-   ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;
-   ctx->Extensions.ARB_vertex_program = GL_TRUE;
-   ctx->Extensions.ARB_window_pos = GL_TRUE;
-
-   ctx->Extensions.EXT_blend_color = GL_TRUE;
-   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
-   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
-   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
-   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
-   ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;
-   ctx->Extensions.EXT_framebuffer_object = GL_TRUE;
-   ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
-   ctx->Extensions.EXT_fog_coord = GL_TRUE;
-   ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
-   ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;
-   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
-   ctx->Extensions.EXT_point_parameters = GL_TRUE;
-   ctx->Extensions.EXT_provoking_vertex = GL_TRUE;
-   ctx->Extensions.EXT_secondary_color = GL_TRUE;
-   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
-   ctx->Extensions.EXT_texture_env_add = GL_TRUE;
-   ctx->Extensions.EXT_texture_env_combine = GL_TRUE;
-   ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;
-   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
-   ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;
-   if (ctx->API == API_OPENGLES || ctx->API == API_OPENGLES2)
-	   ctx->Extensions.EXT_texture_format_BGRA8888 = GL_TRUE;
-
-   ctx->Extensions.APPLE_vertex_array_object = GL_TRUE;
-
-   ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;
-
-   ctx->Extensions.MESA_pack_invert = GL_TRUE;
-
-   ctx->Extensions.NV_blend_square = GL_TRUE;
-   ctx->Extensions.NV_texgen_reflection = GL_TRUE;
-   ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;
-   ctx->Extensions.NV_texture_rectangle = GL_TRUE;
-#if 0
-   /* possibly could support the following two */
-   ctx->Extensions.NV_vertex_program = GL_TRUE;
-   ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;
-#endif
-
-#if FEATURE_OES_EGL_image
-   ctx->Extensions.OES_EGL_image = GL_TRUE;
-#endif
-#if FEATURE_OES_draw_texture
-   ctx->Extensions.OES_draw_texture = GL_TRUE;
-#endif
-
-   ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;
-
-   /*
-    * Extensions that depend on the driver/hardware:
-    */
-   if (screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS) > 0) {
-      ctx->Extensions.ARB_draw_buffers = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_TEXTURE_SWIZZLE) > 0) {
-      ctx->Extensions.EXT_texture_swizzle = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_GLSL)) {
-      ctx->Extensions.ARB_fragment_shader = GL_TRUE;
-      ctx->Extensions.ARB_vertex_shader = GL_TRUE;
-      ctx->Extensions.ARB_shader_objects = GL_TRUE;
-      ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
-      ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE;
-      ctx->Extensions.EXT_separate_shader_objects = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_TEXTURE_MIRROR_REPEAT) > 0) {
-      ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_BLEND_EQUATION_SEPARATE)) {
-      ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_TEXTURE_MIRROR_CLAMP) > 0) {
-      ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;
-      ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_NPOT_TEXTURES)) {
-      ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS) > 1) {
-      ctx->Extensions.ARB_multitexture = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_TWO_SIDED_STENCIL)) {
-      ctx->Extensions.ATI_separate_stencil = GL_TRUE;
-      ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_ANISOTROPIC_FILTER)) {
-      ctx->Extensions.EXT_texture_filter_anisotropic = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_POINT_SPRITE)) {
-      ctx->Extensions.ARB_point_sprite = GL_TRUE;
-      /* GL_NV_point_sprite is not supported by gallium because we don't
-       * support the GL_POINT_SPRITE_R_MODE_NV option.
-       */
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_OCCLUSION_QUERY)) {
-      ctx->Extensions.ARB_occlusion_query = GL_TRUE;
-      ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;
-   }
-   if (screen->get_param(screen, PIPE_CAP_TIMER_QUERY)) {
-     ctx->Extensions.EXT_timer_query = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_TEXTURE_SHADOW_MAP)) {
-      ctx->Extensions.ARB_depth_texture = GL_TRUE;
-      ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;
-      ctx->Extensions.ARB_shadow = GL_TRUE;
-      ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
-      /*ctx->Extensions.ARB_shadow_ambient = GL_TRUE;*/
-   }
-
-   /* GL_EXT_packed_depth_stencil requires both the ability to render to
-    * a depth/stencil buffer and texture from depth/stencil source.
-    */
-   if (screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_DEPTH_STENCIL) &&
-       screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW)) {
-      ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
-   }
-   else if (screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,
-                                        PIPE_TEXTURE_2D, 0,
-                                        PIPE_BIND_DEPTH_STENCIL) &&
-            screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,
-                                        PIPE_TEXTURE_2D, 0,
-                                        PIPE_BIND_SAMPLER_VIEW)) {
-      ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
-   }
-
-   /* sRGB support */
-   if (screen->is_format_supported(screen, PIPE_FORMAT_A8B8G8R8_SRGB,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW) ||
-      screen->is_format_supported(screen, PIPE_FORMAT_B8G8R8A8_SRGB,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW)) {
-      ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
-      ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE;
-      if (screen->is_format_supported(screen, PIPE_FORMAT_A8B8G8R8_SRGB,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_RENDER_TARGET) ||
-          screen->is_format_supported(screen, PIPE_FORMAT_B8G8R8A8_SRGB,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_RENDER_TARGET)) {
-         ctx->Extensions.EXT_framebuffer_sRGB = GL_TRUE;
-         ctx->Const.sRGBCapable = GL_TRUE;
-      }
-   }
-
-   if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW)) {
-      ctx->Extensions.ARB_texture_rg = GL_TRUE;
-   }
-
-   /* s3tc support */
-   if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW) &&
-       ctx->Mesa_DXTn) {
-      ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;
-      ctx->Extensions.S3_s3tc = GL_TRUE;
-   }
-
-   if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_UNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW) &&
-       screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_SNORM,
-				   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW) &&
-       screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_UNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW) &&
-       screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_SNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW)
-       ) {
-     ctx->Extensions.ARB_texture_compression_rgtc = GL_TRUE;
-   }
-
-   if (screen->is_format_supported(screen, PIPE_FORMAT_LATC1_UNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW) &&
-       screen->is_format_supported(screen, PIPE_FORMAT_LATC1_SNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW) &&
-       screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW) &&
-       screen->is_format_supported(screen, PIPE_FORMAT_LATC2_SNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW)) {
-      ctx->Extensions.EXT_texture_compression_latc = GL_TRUE;
-   }
-
-   if (screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW)) {
-      ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;
-   }
-
-   if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW)) {
-      ctx->Extensions.EXT_texture_snorm = GL_TRUE;
-   }
-
-   /* ycbcr support */
-   if (screen->is_format_supported(screen, PIPE_FORMAT_UYVY, 
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW) ||
-       screen->is_format_supported(screen, PIPE_FORMAT_YUYV, 
-                                   PIPE_TEXTURE_2D, 0,
-                                   PIPE_BIND_SAMPLER_VIEW)) {
-      ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;
-   }
-
-   /* GL_EXT_texture_array */
-   if (screen->get_param(screen, PIPE_CAP_ARRAY_TEXTURES)) {
-      ctx->Extensions.EXT_texture_array = GL_TRUE;
-      ctx->Extensions.MESA_texture_array = GL_TRUE;
-   }
-
-   /* GL_ARB_framebuffer_object */
-   if (ctx->Extensions.EXT_packed_depth_stencil) {
-      /* we support always support GL_EXT_framebuffer_blit */
-      ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
-   }
-
-   if (st->pipe->render_condition) {
-      ctx->Extensions.NV_conditional_render = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_INDEP_BLEND_ENABLE)) {
-      ctx->Extensions.EXT_draw_buffers2 = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_INDEP_BLEND_FUNC)) {
-      ctx->Extensions.ARB_draw_buffers_blend = GL_TRUE;
-   }
-
-   /* GL_ARB_half_float_vertex */
-   if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,
-                                   PIPE_BUFFER, 0,
-                                   PIPE_BIND_VERTEX_BUFFER)) {
-      ctx->Extensions.ARB_half_float_vertex = GL_TRUE;
-   }
-
-   if (screen->get_shader_param(screen, PIPE_SHADER_GEOMETRY, PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) {
-#if 0 /* XXX re-enable when GLSL compiler again supports geometry shaders */
-      ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;
-#endif
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_PRIMITIVE_RESTART)) {
-      ctx->Extensions.NV_primitive_restart = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_DEPTH_CLAMP)) {
-      ctx->Extensions.ARB_depth_clamp = GL_TRUE;
-   }
-
-   /* This extension does not actually require support of floating point
-    * render targets, just clamping controls.
-    * Advertise this extension if either fragment color clamping is supported
-    * or no render targets having color values outside of the range [0, 1]
-    * are supported, in which case the fragment color clamping has no effect
-    * on rendering.
-    */
-   if (screen->get_param(screen, PIPE_CAP_FRAGMENT_COLOR_CLAMP_CONTROL) ||
-       (!screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,
-                                     PIPE_TEXTURE_2D, 0,
-                                     PIPE_BIND_RENDER_TARGET) &&
-        !screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_SNORM,
-                                             PIPE_TEXTURE_2D, 0,
-                                             PIPE_BIND_RENDER_TARGET) &&
-        !screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,
-                                     PIPE_TEXTURE_2D, 0,
-                                     PIPE_BIND_RENDER_TARGET) &&
-        !screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_FLOAT,
-                                     PIPE_TEXTURE_2D, 0,
-                                     PIPE_BIND_RENDER_TARGET) &&
-        !screen->is_format_supported(screen, PIPE_FORMAT_R11G11B10_FLOAT,
-                                     PIPE_TEXTURE_2D, 0,
-                                     PIPE_BIND_RENDER_TARGET) &&
-        !screen->is_format_supported(screen, PIPE_FORMAT_R9G9B9E5_FLOAT,
-                                     PIPE_TEXTURE_2D, 0,
-                                     PIPE_BIND_RENDER_TARGET))) {
-      ctx->Extensions.ARB_color_buffer_float = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_SHADER_STENCIL_EXPORT)) {
-      ctx->Extensions.ARB_shader_stencil_export = GL_TRUE;
-   }
-
-   if (screen->get_param(screen, PIPE_CAP_TGSI_INSTANCEID)) {
-      ctx->Extensions.ARB_draw_instanced = GL_TRUE;
-   }
-   if (screen->get_param(screen, PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR)) {
-      ctx->Extensions.ARB_instanced_arrays = GL_TRUE;
-   }
-
-   if (screen->fence_finish) {
-      ctx->Extensions.ARB_sync = GL_TRUE;
-   }
-
-   if (st->pipe->texture_barrier) {
-      ctx->Extensions.NV_texture_barrier = GL_TRUE;
-   }
-}
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * Copyright (c) 2008 VMware, Inc.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+#include "main/imports.h"

+#include "main/context.h"

+#include "main/macros.h"

+#include "main/mfeatures.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "pipe/p_screen.h"

+

+#include "st_context.h"

+#include "st_extensions.h"

+

+

+static int _min(int a, int b)

+{

+   return (a < b) ? a : b;

+}

+

+static float _maxf(float a, float b)

+{

+   return (a > b) ? a : b;

+}

+

+static int _clamp(int a, int min, int max)

+{

+   if (a < min)

+      return min;

+   else if (a > max)

+      return max;

+   else

+      return a;

+}

+

+

+/**

+ * Query driver to get implementation limits.

+ * Note that we have to limit/clamp against Mesa's internal limits too.

+ */

+void st_init_limits(struct st_context *st)

+{

+   struct pipe_screen *screen = st->pipe->screen;

+   struct gl_constants *c = &st->ctx->Const;

+   gl_shader_type sh;

+

+   c->MaxTextureLevels

+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS),

+            MAX_TEXTURE_LEVELS);

+

+   c->Max3DTextureLevels

+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_3D_LEVELS),

+            MAX_3D_TEXTURE_LEVELS);

+

+   c->MaxCubeTextureLevels

+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS),

+            MAX_CUBE_TEXTURE_LEVELS);

+

+   c->MaxTextureRectSize

+      = _min(1 << (c->MaxTextureLevels - 1), MAX_TEXTURE_RECT_SIZE);

+

+   c->MaxTextureImageUnits

+      = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS),

+            MAX_TEXTURE_IMAGE_UNITS);

+

+   c->MaxVertexTextureImageUnits

+      = _min(screen->get_param(screen, PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS),

+             MAX_VERTEX_TEXTURE_IMAGE_UNITS);

+

+   c->MaxCombinedTextureImageUnits

+      = _min(screen->get_param(screen, PIPE_CAP_MAX_COMBINED_SAMPLERS),

+             MAX_COMBINED_TEXTURE_IMAGE_UNITS);

+

+   c->MaxTextureCoordUnits

+      = _min(c->MaxTextureImageUnits, MAX_TEXTURE_COORD_UNITS);

+

+   c->MaxTextureUnits = _min(c->MaxTextureImageUnits, c->MaxTextureCoordUnits);

+

+   c->MaxDrawBuffers

+      = _clamp(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),

+              1, MAX_DRAW_BUFFERS);

+

+   c->MaxLineWidth

+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH));

+   c->MaxLineWidthAA

+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_LINE_WIDTH_AA));

+

+   c->MaxPointSize

+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH));

+   c->MaxPointSizeAA

+      = _maxf(1.0f, screen->get_paramf(screen, PIPE_CAP_MAX_POINT_WIDTH_AA));

+   /* called after _mesa_create_context/_mesa_init_point, fix default user

+    * settable max point size up

+    */

+   st->ctx->Point.MaxSize = MAX2(c->MaxPointSize, c->MaxPointSizeAA);

+   /* these are not queryable. Note that GL basically mandates a 1.0 minimum

+    * for non-aa sizes, but we can go down to 0.0 for aa points.

+    */

+   c->MinPointSize = 1.0f;

+   c->MinPointSizeAA = 0.0f;

+

+   c->MaxTextureMaxAnisotropy

+      = _maxf(2.0f, screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_ANISOTROPY));

+

+   c->MaxTextureLodBias

+      = screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_LOD_BIAS);

+

+   c->MaxDrawBuffers

+      = CLAMP(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),

+              1, MAX_DRAW_BUFFERS);

+

+   /* Quads always follow GL provoking rules. */

+   c->QuadsFollowProvokingVertexConvention = GL_FALSE;

+

+   for (sh = 0; sh < MESA_SHADER_TYPES; ++sh) {

+      struct gl_shader_compiler_options *options =

+         &st->ctx->ShaderCompilerOptions[sh];

+      struct gl_program_constants *pc;

+

+      switch (sh) {

+      case PIPE_SHADER_FRAGMENT:

+         pc = &c->FragmentProgram;

+         break;

+      case PIPE_SHADER_VERTEX:

+         pc = &c->VertexProgram;

+         break;

+      case PIPE_SHADER_GEOMETRY:

+         pc = &c->GeometryProgram;

+         break;

+      default:

+         assert(0);

+         continue;

+      }

+

+      pc->MaxNativeInstructions    = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INSTRUCTIONS);

+      pc->MaxNativeAluInstructions = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS);

+      pc->MaxNativeTexInstructions = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEX_INSTRUCTIONS);

+      pc->MaxNativeTexIndirections = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS);

+      pc->MaxNativeAttribs         = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INPUTS);

+      pc->MaxNativeTemps           = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEMPS);

+      pc->MaxNativeAddressRegs     = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_ADDRS);

+      pc->MaxNativeParameters      = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONSTS);

+      pc->MaxUniformComponents     = 4 * MIN2(pc->MaxNativeParameters, MAX_UNIFORMS);

+

+      options->EmitNoNoise = TRUE;

+

+      /* TODO: make these more fine-grained if anyone needs it */

+      options->EmitNoIfs = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);

+      options->EmitNoLoops = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH);

+      options->EmitNoFunctions = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_SUBROUTINES);

+      options->EmitNoMainReturn = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_SUBROUTINES);

+

+      options->EmitNoCont = !screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED);

+

+      options->EmitNoIndirectInput = !screen->get_shader_param(screen, sh,

+                                        PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR);

+      options->EmitNoIndirectOutput = !screen->get_shader_param(screen, sh,

+                                        PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR);

+      options->EmitNoIndirectTemp = !screen->get_shader_param(screen, sh,

+                                        PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR);

+      options->EmitNoIndirectUniform = !screen->get_shader_param(screen, sh,

+                                        PIPE_SHADER_CAP_INDIRECT_CONST_ADDR);

+

+      if(options->EmitNoLoops)

+         options->MaxUnrollIterations = MIN2(screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INSTRUCTIONS), 65536);

+   }

+

+   /* PIPE_CAP_MAX_FS_INPUTS specifies the number of COLORn + GENERICn inputs

+    * and is set in MaxNativeAttribs. It's always 2 colors + N generic

+    * attributes. The GLSL compiler never uses COLORn for varyings, so we

+    * subtract the 2 colors to get the maximum number of varyings (generic

+    * attributes) supported by a driver. */

+   c->MaxVarying = screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_MAX_INPUTS) - 2;

+   c->MaxVarying = MIN2(c->MaxVarying, MAX_VARYING);

+

+   /* XXX we'll need a better query here someday */

+   if (screen->get_param(screen, PIPE_CAP_GLSL)) {

+      c->GLSLVersion = 120;

+   }

+}

+

+

+/**

+ * Use pipe_screen::get_param() to query PIPE_CAP_ values to determine

+ * which GL extensions are supported.

+ * Quite a few extensions are always supported because they are standard

+ * features or can be built on top of other gallium features.

+ * Some fine tuning may still be needed.

+ */

+void st_init_extensions(struct st_context *st)

+{

+   struct pipe_screen *screen = st->pipe->screen;

+   struct gl_context *ctx = st->ctx;

+

+   /*

+    * Extensions that are supported by all Gallium drivers:

+    */

+   ctx->Extensions.ARB_copy_buffer = GL_TRUE;

+   ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;

+   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;

+   ctx->Extensions.ARB_fragment_program = GL_TRUE;

+   ctx->Extensions.ARB_half_float_pixel = GL_TRUE;

+   ctx->Extensions.ARB_map_buffer_range = GL_TRUE;

+   ctx->Extensions.ARB_multisample = GL_TRUE;

+   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE; /* XXX temp */

+   ctx->Extensions.ARB_texture_compression = GL_TRUE;

+   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;

+   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;

+   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;

+   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;

+   ctx->Extensions.ARB_vertex_array_object = GL_TRUE;

+   ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;

+   ctx->Extensions.ARB_vertex_program = GL_TRUE;

+   ctx->Extensions.ARB_window_pos = GL_TRUE;

+

+   ctx->Extensions.EXT_blend_color = GL_TRUE;

+   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;

+   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;

+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;

+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;

+   ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;

+   ctx->Extensions.EXT_framebuffer_object = GL_TRUE;

+   ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;

+   ctx->Extensions.EXT_fog_coord = GL_TRUE;

+   ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;

+   ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;

+   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;

+   ctx->Extensions.EXT_point_parameters = GL_TRUE;

+   ctx->Extensions.EXT_provoking_vertex = GL_TRUE;

+   ctx->Extensions.EXT_secondary_color = GL_TRUE;

+   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;

+   ctx->Extensions.EXT_texture_env_add = GL_TRUE;

+   ctx->Extensions.EXT_texture_env_combine = GL_TRUE;

+   ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;

+   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;

+   ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;

+   if (ctx->API == API_OPENGLES || ctx->API == API_OPENGLES2)

+	   ctx->Extensions.EXT_texture_format_BGRA8888 = GL_TRUE;

+

+   ctx->Extensions.APPLE_vertex_array_object = GL_TRUE;

+

+   ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;

+

+   ctx->Extensions.MESA_pack_invert = GL_TRUE;

+

+   ctx->Extensions.NV_blend_square = GL_TRUE;

+   ctx->Extensions.NV_texgen_reflection = GL_TRUE;

+   ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;

+   ctx->Extensions.NV_texture_rectangle = GL_TRUE;

+#if 0

+   /* possibly could support the following two */

+   ctx->Extensions.NV_vertex_program = GL_TRUE;

+   ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;

+#endif

+

+#if FEATURE_OES_EGL_image

+   ctx->Extensions.OES_EGL_image = GL_TRUE;

+#endif

+#if FEATURE_OES_draw_texture

+   ctx->Extensions.OES_draw_texture = GL_TRUE;

+#endif

+

+   ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;

+

+   /*

+    * Extensions that depend on the driver/hardware:

+    */

+   if (screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS) > 0) {

+      ctx->Extensions.ARB_draw_buffers = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_TEXTURE_SWIZZLE) > 0) {

+      ctx->Extensions.EXT_texture_swizzle = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_GLSL)) {

+      ctx->Extensions.ARB_fragment_shader = GL_TRUE;

+      ctx->Extensions.ARB_vertex_shader = GL_TRUE;

+      ctx->Extensions.ARB_shader_objects = GL_TRUE;

+      ctx->Extensions.ARB_shading_language_100 = GL_TRUE;

+      ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE;

+      ctx->Extensions.EXT_separate_shader_objects = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_TEXTURE_MIRROR_REPEAT) > 0) {

+      ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_BLEND_EQUATION_SEPARATE)) {

+      ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_TEXTURE_MIRROR_CLAMP) > 0) {

+      ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;

+      ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_NPOT_TEXTURES)) {

+      ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS) > 1) {

+      ctx->Extensions.ARB_multitexture = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_TWO_SIDED_STENCIL)) {

+      ctx->Extensions.ATI_separate_stencil = GL_TRUE;

+      ctx->Extensions.EXT_stencil_two_side = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_ANISOTROPIC_FILTER)) {

+      ctx->Extensions.EXT_texture_filter_anisotropic = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_POINT_SPRITE)) {

+      ctx->Extensions.ARB_point_sprite = GL_TRUE;

+      /* GL_NV_point_sprite is not supported by gallium because we don't

+       * support the GL_POINT_SPRITE_R_MODE_NV option.

+       */

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_OCCLUSION_QUERY)) {

+      ctx->Extensions.ARB_occlusion_query = GL_TRUE;

+      ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;

+   }

+   if (screen->get_param(screen, PIPE_CAP_TIMER_QUERY)) {

+     ctx->Extensions.EXT_timer_query = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_TEXTURE_SHADOW_MAP)) {

+      ctx->Extensions.ARB_depth_texture = GL_TRUE;

+      ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;

+      ctx->Extensions.ARB_shadow = GL_TRUE;

+      ctx->Extensions.EXT_shadow_funcs = GL_TRUE;

+      /*ctx->Extensions.ARB_shadow_ambient = GL_TRUE;*/

+   }

+

+   /* GL_EXT_packed_depth_stencil requires both the ability to render to

+    * a depth/stencil buffer and texture from depth/stencil source.

+    */

+   if (screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_DEPTH_STENCIL) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW)) {

+      ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;

+   }

+   else if (screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,

+                                        PIPE_TEXTURE_2D, 0,

+                                        PIPE_BIND_DEPTH_STENCIL) &&

+            screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,

+                                        PIPE_TEXTURE_2D, 0,

+                                        PIPE_BIND_SAMPLER_VIEW)) {

+      ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;

+   }

+

+   /* sRGB support */

+   if (screen->is_format_supported(screen, PIPE_FORMAT_A8B8G8R8_SRGB,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW) ||

+      screen->is_format_supported(screen, PIPE_FORMAT_B8G8R8A8_SRGB,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW)) {

+      ctx->Extensions.EXT_texture_sRGB = GL_TRUE;

+      ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE;

+      if (screen->is_format_supported(screen, PIPE_FORMAT_A8B8G8R8_SRGB,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_RENDER_TARGET) ||

+          screen->is_format_supported(screen, PIPE_FORMAT_B8G8R8A8_SRGB,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_RENDER_TARGET)) {

+         ctx->Extensions.EXT_framebuffer_sRGB = GL_TRUE;

+         ctx->Const.sRGBCapable = GL_TRUE;

+      }

+   }

+

+   if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW)) {

+      ctx->Extensions.ARB_texture_rg = GL_TRUE;

+   }

+

+   /* s3tc support */

+   if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW) &&

+       ctx->Mesa_DXTn) {

+      ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;

+      ctx->Extensions.S3_s3tc = GL_TRUE;

+   }

+

+   if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_SNORM,

+				   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_SNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW)

+       ) {

+     ctx->Extensions.ARB_texture_compression_rgtc = GL_TRUE;

+   }

+

+   if (screen->is_format_supported(screen, PIPE_FORMAT_LATC1_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_LATC1_SNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_LATC2_SNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW)) {

+      ctx->Extensions.EXT_texture_compression_latc = GL_TRUE;

+   }

+

+   if (screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW)) {

+      ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;

+   }

+

+   if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW)) {

+      ctx->Extensions.EXT_texture_snorm = GL_TRUE;

+   }

+

+   /* ycbcr support */

+   if (screen->is_format_supported(screen, PIPE_FORMAT_UYVY, 

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW) ||

+       screen->is_format_supported(screen, PIPE_FORMAT_YUYV, 

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW)) {

+      ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;

+   }

+

+   /* GL_EXT_texture_array */

+   if (screen->get_param(screen, PIPE_CAP_ARRAY_TEXTURES)) {

+      ctx->Extensions.EXT_texture_array = GL_TRUE;

+      ctx->Extensions.MESA_texture_array = GL_TRUE;

+   }

+

+   /* GL_ARB_framebuffer_object */

+   if (ctx->Extensions.EXT_packed_depth_stencil) {

+      /* we support always support GL_EXT_framebuffer_blit */

+      ctx->Extensions.ARB_framebuffer_object = GL_TRUE;

+   }

+

+   if (st->pipe->render_condition) {

+      ctx->Extensions.NV_conditional_render = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_INDEP_BLEND_ENABLE)) {

+      ctx->Extensions.EXT_draw_buffers2 = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_INDEP_BLEND_FUNC)) {

+      ctx->Extensions.ARB_draw_buffers_blend = GL_TRUE;

+   }

+

+   /* GL_ARB_half_float_vertex */

+   if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,

+                                   PIPE_BUFFER, 0,

+                                   PIPE_BIND_VERTEX_BUFFER)) {

+      ctx->Extensions.ARB_half_float_vertex = GL_TRUE;

+   }

+

+   if (screen->get_shader_param(screen, PIPE_SHADER_GEOMETRY, PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) {

+#if 0 /* XXX re-enable when GLSL compiler again supports geometry shaders */

+      ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;

+#endif

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_PRIMITIVE_RESTART)) {

+      ctx->Extensions.NV_primitive_restart = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_DEPTH_CLAMP)) {

+      ctx->Extensions.ARB_depth_clamp = GL_TRUE;

+   }

+

+   /* This extension does not actually require support of floating point

+    * render targets, just clamping controls.

+    * Advertise this extension if either fragment color clamping is supported

+    * or no render targets having color values outside of the range [0, 1]

+    * are supported, in which case the fragment color clamping has no effect

+    * on rendering.

+    */

+   if (screen->get_param(screen, PIPE_CAP_FRAGMENT_COLOR_CLAMP_CONTROL) ||

+       (!screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,

+                                     PIPE_TEXTURE_2D, 0,

+                                     PIPE_BIND_RENDER_TARGET) &&

+        !screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_SNORM,

+                                             PIPE_TEXTURE_2D, 0,

+                                             PIPE_BIND_RENDER_TARGET) &&

+        !screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,

+                                     PIPE_TEXTURE_2D, 0,

+                                     PIPE_BIND_RENDER_TARGET) &&

+        !screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_FLOAT,

+                                     PIPE_TEXTURE_2D, 0,

+                                     PIPE_BIND_RENDER_TARGET) &&

+        !screen->is_format_supported(screen, PIPE_FORMAT_R11G11B10_FLOAT,

+                                     PIPE_TEXTURE_2D, 0,

+                                     PIPE_BIND_RENDER_TARGET) &&

+        !screen->is_format_supported(screen, PIPE_FORMAT_R9G9B9E5_FLOAT,

+                                     PIPE_TEXTURE_2D, 0,

+                                     PIPE_BIND_RENDER_TARGET))) {

+      ctx->Extensions.ARB_color_buffer_float = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_SHADER_STENCIL_EXPORT)) {

+      ctx->Extensions.ARB_shader_stencil_export = GL_TRUE;

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_TGSI_INSTANCEID)) {

+      ctx->Extensions.ARB_draw_instanced = GL_TRUE;

+   }

+   if (screen->get_param(screen, PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR)) {

+      ctx->Extensions.ARB_instanced_arrays = GL_TRUE;

+   }

+

+   if (screen->fence_finish) {

+      ctx->Extensions.ARB_sync = GL_TRUE;

+   }

+

+   if (st->pipe->texture_barrier) {

+      ctx->Extensions.NV_texture_barrier = GL_TRUE;

+   }

+}

diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index 957a06c08..e057958e6 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -1,1412 +1,1412 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * Copyright (c) 2008-2010 VMware, Inc.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
-
-/**
- * Mesa / Gallium format conversion and format selection code.
- * \author Brian Paul
- */
-
-#include "main/imports.h"
-#include "main/context.h"
-#include "main/texstore.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_screen.h"
-#include "util/u_format.h"
-#include "st_context.h"
-#include "st_format.h"
-
-
-static GLuint
-format_max_bits(enum pipe_format format)
-{
-   GLuint size = util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 0);
-
-   size = MAX2(size, util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 1));
-   size = MAX2(size, util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 2));
-   size = MAX2(size, util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 3));
-   size = MAX2(size, util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_ZS, 0));
-   size = MAX2(size, util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_ZS, 1));
-   return size;
-}
-
-
-/**
- * Return basic GL datatype for the given gallium format.
- */
-GLenum
-st_format_datatype(enum pipe_format format)
-{
-   const struct util_format_description *desc;
-
-   desc = util_format_description(format);
-   assert(desc);
-
-   if (desc->layout == UTIL_FORMAT_LAYOUT_PLAIN) {
-      if (format == PIPE_FORMAT_B5G5R5A1_UNORM ||
-          format == PIPE_FORMAT_B5G6R5_UNORM) {
-         return GL_UNSIGNED_SHORT;
-      }
-      else if (format == PIPE_FORMAT_Z24_UNORM_S8_USCALED ||
-               format == PIPE_FORMAT_S8_USCALED_Z24_UNORM ||
-               format == PIPE_FORMAT_Z24X8_UNORM ||
-               format == PIPE_FORMAT_X8Z24_UNORM) {
-         return GL_UNSIGNED_INT_24_8;
-      }
-      else {
-         const GLuint size = format_max_bits(format);
-         if (size == 8) {
-            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)
-               return GL_UNSIGNED_BYTE;
-            else
-               return GL_BYTE;
-         }
-         else if (size == 16) {
-            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)
-               return GL_UNSIGNED_SHORT;
-            else
-               return GL_SHORT;
-         }
-         else {
-            assert( size <= 32 );
-            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)
-               return GL_UNSIGNED_INT;
-            else
-               return GL_INT;
-         }
-      }
-   }
-   else if (format == PIPE_FORMAT_UYVY) {
-      return GL_UNSIGNED_SHORT;
-   }
-   else if (format == PIPE_FORMAT_YUYV) {
-      return GL_UNSIGNED_SHORT;
-   }
-   else {
-      /* probably a compressed format, unsupported anyway */
-      return GL_NONE;
-   }
-}
-
-
-/**
- * Translate Mesa format to Gallium format.
- */
-enum pipe_format
-st_mesa_format_to_pipe_format(gl_format mesaFormat)
-{
-   switch (mesaFormat) {
-   case MESA_FORMAT_RGBA8888:
-      return PIPE_FORMAT_A8B8G8R8_UNORM;
-   case MESA_FORMAT_RGBA8888_REV:
-      return PIPE_FORMAT_R8G8B8A8_UNORM;
-   case MESA_FORMAT_ARGB8888:
-      return PIPE_FORMAT_B8G8R8A8_UNORM;
-   case MESA_FORMAT_ARGB8888_REV:
-      return PIPE_FORMAT_A8R8G8B8_UNORM;
-   case MESA_FORMAT_XRGB8888:
-      return PIPE_FORMAT_B8G8R8X8_UNORM;
-   case MESA_FORMAT_XRGB8888_REV:
-      return PIPE_FORMAT_X8R8G8B8_UNORM;
-   case MESA_FORMAT_ARGB1555:
-      return PIPE_FORMAT_B5G5R5A1_UNORM;
-   case MESA_FORMAT_ARGB4444:
-      return PIPE_FORMAT_B4G4R4A4_UNORM;
-   case MESA_FORMAT_RGB565:
-      return PIPE_FORMAT_B5G6R5_UNORM;
-   case MESA_FORMAT_RGB332:
-      return PIPE_FORMAT_B2G3R3_UNORM;
-   case MESA_FORMAT_ARGB2101010:
-      return PIPE_FORMAT_B10G10R10A2_UNORM;
-   case MESA_FORMAT_AL44:
-      return PIPE_FORMAT_L4A4_UNORM;
-   case MESA_FORMAT_AL88:
-      return PIPE_FORMAT_L8A8_UNORM;
-   case MESA_FORMAT_AL1616:
-      return PIPE_FORMAT_L16A16_UNORM;
-   case MESA_FORMAT_A8:
-      return PIPE_FORMAT_A8_UNORM;
-   case MESA_FORMAT_A16:
-      return PIPE_FORMAT_A16_UNORM;
-   case MESA_FORMAT_L8:
-      return PIPE_FORMAT_L8_UNORM;
-   case MESA_FORMAT_L16:
-      return PIPE_FORMAT_L16_UNORM;
-   case MESA_FORMAT_I8:
-      return PIPE_FORMAT_I8_UNORM;
-   case MESA_FORMAT_I16:
-      return PIPE_FORMAT_I16_UNORM;
-   case MESA_FORMAT_Z16:
-      return PIPE_FORMAT_Z16_UNORM;
-   case MESA_FORMAT_Z32:
-      return PIPE_FORMAT_Z32_UNORM;
-   case MESA_FORMAT_Z24_S8:
-      return PIPE_FORMAT_S8_USCALED_Z24_UNORM;
-   case MESA_FORMAT_S8_Z24:
-      return PIPE_FORMAT_Z24_UNORM_S8_USCALED;
-   case MESA_FORMAT_Z24_X8:
-      return PIPE_FORMAT_X8Z24_UNORM;
-   case MESA_FORMAT_X8_Z24:
-      return PIPE_FORMAT_Z24X8_UNORM;
-   case MESA_FORMAT_S8:
-      return PIPE_FORMAT_S8_USCALED;
-   case MESA_FORMAT_YCBCR:
-      return PIPE_FORMAT_UYVY;
-#if FEATURE_texture_s3tc
-   case MESA_FORMAT_RGB_DXT1:
-      return PIPE_FORMAT_DXT1_RGB;
-   case MESA_FORMAT_RGBA_DXT1:
-      return PIPE_FORMAT_DXT1_RGBA;
-   case MESA_FORMAT_RGBA_DXT3:
-      return PIPE_FORMAT_DXT3_RGBA;
-   case MESA_FORMAT_RGBA_DXT5:
-      return PIPE_FORMAT_DXT5_RGBA;
-#if FEATURE_EXT_texture_sRGB
-   case MESA_FORMAT_SRGB_DXT1:
-      return PIPE_FORMAT_DXT1_SRGB;
-   case MESA_FORMAT_SRGBA_DXT1:
-      return PIPE_FORMAT_DXT1_SRGBA;
-   case MESA_FORMAT_SRGBA_DXT3:
-      return PIPE_FORMAT_DXT3_SRGBA;
-   case MESA_FORMAT_SRGBA_DXT5:
-      return PIPE_FORMAT_DXT5_SRGBA;
-#endif
-#endif
-#if FEATURE_EXT_texture_sRGB
-   case MESA_FORMAT_SLA8:
-      return PIPE_FORMAT_L8A8_SRGB;
-   case MESA_FORMAT_SL8:
-      return PIPE_FORMAT_L8_SRGB;
-   case MESA_FORMAT_SRGB8:
-      return PIPE_FORMAT_R8G8B8_SRGB;
-   case MESA_FORMAT_SRGBA8:
-      return PIPE_FORMAT_A8B8G8R8_SRGB;
-   case MESA_FORMAT_SARGB8:
-      return PIPE_FORMAT_B8G8R8A8_SRGB;
-#endif
-   case MESA_FORMAT_R8:
-      return PIPE_FORMAT_R8_UNORM;
-   case MESA_FORMAT_R16:
-      return PIPE_FORMAT_R16_UNORM;
-   case MESA_FORMAT_RG88:
-      return PIPE_FORMAT_R8G8_UNORM;
-   case MESA_FORMAT_RG1616:
-      return PIPE_FORMAT_R16G16_UNORM;
-   case MESA_FORMAT_RGBA_16:
-      return PIPE_FORMAT_R16G16B16A16_UNORM;
-
-   /* signed int formats */
-   case MESA_FORMAT_RGBA_INT8:
-      return PIPE_FORMAT_R8G8B8A8_SSCALED;
-   case MESA_FORMAT_RGBA_INT16:
-      return PIPE_FORMAT_R16G16B16A16_SSCALED;
-   case MESA_FORMAT_RGBA_INT32:
-      return PIPE_FORMAT_R32G32B32A32_SSCALED;
-
-   /* unsigned int formats */
-   case MESA_FORMAT_RGBA_UINT8:
-      return PIPE_FORMAT_R8G8B8A8_USCALED;
-   case MESA_FORMAT_RGBA_UINT16:
-      return PIPE_FORMAT_R16G16B16A16_USCALED;
-   case MESA_FORMAT_RGBA_UINT32:
-      return PIPE_FORMAT_R32G32B32A32_USCALED;
-
-   case MESA_FORMAT_RED_RGTC1:
-      return PIPE_FORMAT_RGTC1_UNORM;
-   case MESA_FORMAT_SIGNED_RED_RGTC1:
-      return PIPE_FORMAT_RGTC1_SNORM;
-   case MESA_FORMAT_RG_RGTC2:
-      return PIPE_FORMAT_RGTC2_UNORM;
-   case MESA_FORMAT_SIGNED_RG_RGTC2:
-      return PIPE_FORMAT_RGTC2_SNORM;
-
-   case MESA_FORMAT_L_LATC1:
-      return PIPE_FORMAT_LATC1_UNORM;
-   case MESA_FORMAT_SIGNED_L_LATC1:
-      return PIPE_FORMAT_LATC1_SNORM;
-   case MESA_FORMAT_LA_LATC2:
-      return PIPE_FORMAT_LATC2_UNORM;
-   case MESA_FORMAT_SIGNED_LA_LATC2:
-      return PIPE_FORMAT_LATC2_SNORM;
-
-   /* signed normalized formats */
-   case MESA_FORMAT_SIGNED_R8:
-      return PIPE_FORMAT_R8_SNORM;
-   case MESA_FORMAT_SIGNED_RG88_REV:
-      return PIPE_FORMAT_R8G8_SNORM;
-   case MESA_FORMAT_SIGNED_RGBA8888_REV:
-      return PIPE_FORMAT_R8G8B8A8_SNORM;
-
-   case MESA_FORMAT_SIGNED_A8:
-      return PIPE_FORMAT_A8_SNORM;
-   case MESA_FORMAT_SIGNED_L8:
-      return PIPE_FORMAT_L8_SNORM;
-   case MESA_FORMAT_SIGNED_AL88:
-      return PIPE_FORMAT_L8A8_SNORM;
-   case MESA_FORMAT_SIGNED_I8:
-      return PIPE_FORMAT_I8_SNORM;
-
-   case MESA_FORMAT_SIGNED_R16:
-      return PIPE_FORMAT_R16_SNORM;
-   case MESA_FORMAT_SIGNED_GR1616:
-      return PIPE_FORMAT_R16G16_SNORM;
-   case MESA_FORMAT_SIGNED_RGBA_16:
-      return PIPE_FORMAT_R16G16B16A16_SNORM;
-
-   case MESA_FORMAT_SIGNED_A16:
-      return PIPE_FORMAT_A16_SNORM;
-   case MESA_FORMAT_SIGNED_L16:
-      return PIPE_FORMAT_L16_SNORM;
-   case MESA_FORMAT_SIGNED_AL1616:
-      return PIPE_FORMAT_L16A16_SNORM;
-   case MESA_FORMAT_SIGNED_I16:
-      return PIPE_FORMAT_I16_SNORM;
-
-   default:
-      assert(0);
-      return PIPE_FORMAT_NONE;
-   }
-}
-
-
-/**
- * Translate Gallium format to Mesa format.
- */
-gl_format
-st_pipe_format_to_mesa_format(enum pipe_format format)
-{
-   switch (format) {
-   case PIPE_FORMAT_A8B8G8R8_UNORM:
-      return MESA_FORMAT_RGBA8888;
-   case PIPE_FORMAT_R8G8B8A8_UNORM:
-      return MESA_FORMAT_RGBA8888_REV;
-   case PIPE_FORMAT_B8G8R8A8_UNORM:
-      return MESA_FORMAT_ARGB8888;
-   case PIPE_FORMAT_A8R8G8B8_UNORM:
-      return MESA_FORMAT_ARGB8888_REV;
-   case PIPE_FORMAT_B8G8R8X8_UNORM:
-      return MESA_FORMAT_XRGB8888;
-   case PIPE_FORMAT_X8R8G8B8_UNORM:
-      return MESA_FORMAT_XRGB8888_REV;
-   case PIPE_FORMAT_B5G5R5A1_UNORM:
-      return MESA_FORMAT_ARGB1555;
-   case PIPE_FORMAT_B4G4R4A4_UNORM:
-      return MESA_FORMAT_ARGB4444;
-   case PIPE_FORMAT_B5G6R5_UNORM:
-      return MESA_FORMAT_RGB565;
-   case PIPE_FORMAT_B2G3R3_UNORM:
-      return MESA_FORMAT_RGB332;
-   case PIPE_FORMAT_B10G10R10A2_UNORM:
-      return MESA_FORMAT_ARGB2101010;
-   case PIPE_FORMAT_L4A4_UNORM:
-      return MESA_FORMAT_AL44;
-   case PIPE_FORMAT_L8A8_UNORM:
-      return MESA_FORMAT_AL88;
-   case PIPE_FORMAT_L16A16_UNORM:
-      return MESA_FORMAT_AL1616;
-   case PIPE_FORMAT_A8_UNORM:
-      return MESA_FORMAT_A8;
-   case PIPE_FORMAT_A16_UNORM:
-      return MESA_FORMAT_A16;
-   case PIPE_FORMAT_L8_UNORM:
-      return MESA_FORMAT_L8;
-   case PIPE_FORMAT_L16_UNORM:
-      return MESA_FORMAT_L16;
-   case PIPE_FORMAT_I8_UNORM:
-      return MESA_FORMAT_I8;
-   case PIPE_FORMAT_I16_UNORM:
-      return MESA_FORMAT_I16;
-   case PIPE_FORMAT_S8_USCALED:
-      return MESA_FORMAT_S8;
-
-   case PIPE_FORMAT_R16G16B16A16_UNORM:
-      return MESA_FORMAT_RGBA_16;
-
-   case PIPE_FORMAT_Z16_UNORM:
-      return MESA_FORMAT_Z16;
-   case PIPE_FORMAT_Z32_UNORM:
-      return MESA_FORMAT_Z32;
-   case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
-      return MESA_FORMAT_Z24_S8;
-   case PIPE_FORMAT_X8Z24_UNORM:
-      return MESA_FORMAT_Z24_X8;
-   case PIPE_FORMAT_Z24X8_UNORM:
-      return MESA_FORMAT_X8_Z24;
-   case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
-      return MESA_FORMAT_S8_Z24;
-
-   case PIPE_FORMAT_UYVY:
-      return MESA_FORMAT_YCBCR;
-   case PIPE_FORMAT_YUYV:
-      return MESA_FORMAT_YCBCR_REV;
-
-#if FEATURE_texture_s3tc
-   case PIPE_FORMAT_DXT1_RGB:
-      return MESA_FORMAT_RGB_DXT1;
-   case PIPE_FORMAT_DXT1_RGBA:
-      return MESA_FORMAT_RGBA_DXT1;
-   case PIPE_FORMAT_DXT3_RGBA:
-      return MESA_FORMAT_RGBA_DXT3;
-   case PIPE_FORMAT_DXT5_RGBA:
-      return MESA_FORMAT_RGBA_DXT5;
-#if FEATURE_EXT_texture_sRGB
-   case PIPE_FORMAT_DXT1_SRGB:
-      return MESA_FORMAT_SRGB_DXT1;
-   case PIPE_FORMAT_DXT1_SRGBA:
-      return MESA_FORMAT_SRGBA_DXT1;
-   case PIPE_FORMAT_DXT3_SRGBA:
-      return MESA_FORMAT_SRGBA_DXT3;
-   case PIPE_FORMAT_DXT5_SRGBA:
-      return MESA_FORMAT_SRGBA_DXT5;
-#endif
-#endif
-
-#if FEATURE_EXT_texture_sRGB
-   case PIPE_FORMAT_L8A8_SRGB:
-      return MESA_FORMAT_SLA8;
-   case PIPE_FORMAT_L8_SRGB:
-      return MESA_FORMAT_SL8;
-   case PIPE_FORMAT_R8G8B8_SRGB:
-      return MESA_FORMAT_SRGB8;
-   case PIPE_FORMAT_A8B8G8R8_SRGB:
-      return MESA_FORMAT_SRGBA8;
-   case PIPE_FORMAT_B8G8R8A8_SRGB:
-      return MESA_FORMAT_SARGB8;
-#endif
-
-   case PIPE_FORMAT_R8_UNORM:
-      return MESA_FORMAT_R8;
-   case PIPE_FORMAT_R16_UNORM:
-      return MESA_FORMAT_R16;
-   case PIPE_FORMAT_R8G8_UNORM:
-      return MESA_FORMAT_RG88;
-   case PIPE_FORMAT_R16G16_UNORM:
-      return MESA_FORMAT_RG1616;
-
-   /* signed int formats */
-   case PIPE_FORMAT_R8G8B8A8_SSCALED:
-      return MESA_FORMAT_RGBA_INT8;
-   case PIPE_FORMAT_R16G16B16A16_SSCALED:
-      return MESA_FORMAT_RGBA_INT16;
-   case PIPE_FORMAT_R32G32B32A32_SSCALED:
-      return MESA_FORMAT_RGBA_INT32;
-
-   /* unsigned int formats */
-   case PIPE_FORMAT_R8G8B8A8_USCALED:
-      return MESA_FORMAT_RGBA_UINT8;
-   case PIPE_FORMAT_R16G16B16A16_USCALED:
-      return MESA_FORMAT_RGBA_UINT16;
-   case PIPE_FORMAT_R32G32B32A32_USCALED:
-      return MESA_FORMAT_RGBA_UINT32;
-
-   case PIPE_FORMAT_RGTC1_UNORM:
-      return MESA_FORMAT_RED_RGTC1;
-   case PIPE_FORMAT_RGTC1_SNORM:
-      return MESA_FORMAT_SIGNED_RED_RGTC1;
-   case PIPE_FORMAT_RGTC2_UNORM:
-      return MESA_FORMAT_RG_RGTC2;
-   case PIPE_FORMAT_RGTC2_SNORM:
-      return MESA_FORMAT_SIGNED_RG_RGTC2;
-
-   case PIPE_FORMAT_LATC1_UNORM:
-      return MESA_FORMAT_L_LATC1;
-   case PIPE_FORMAT_LATC1_SNORM:
-      return MESA_FORMAT_SIGNED_L_LATC1;
-   case PIPE_FORMAT_LATC2_UNORM:
-      return MESA_FORMAT_LA_LATC2;
-   case PIPE_FORMAT_LATC2_SNORM:
-      return MESA_FORMAT_SIGNED_LA_LATC2;
-
-   /* signed normalized formats */
-   case PIPE_FORMAT_R8_SNORM:
-      return MESA_FORMAT_SIGNED_R8;
-   case PIPE_FORMAT_R8G8_SNORM:
-      return MESA_FORMAT_SIGNED_RG88_REV;
-   case PIPE_FORMAT_R8G8B8A8_SNORM:
-      return MESA_FORMAT_SIGNED_RGBA8888_REV;
-
-   case PIPE_FORMAT_A8_SNORM:
-      return MESA_FORMAT_SIGNED_A8;
-   case PIPE_FORMAT_L8_SNORM:
-      return MESA_FORMAT_SIGNED_L8;
-   case PIPE_FORMAT_L8A8_SNORM:
-      return MESA_FORMAT_SIGNED_AL88;
-   case PIPE_FORMAT_I8_SNORM:
-      return MESA_FORMAT_SIGNED_I8;
-
-   case PIPE_FORMAT_R16_SNORM:
-      return MESA_FORMAT_SIGNED_R16;
-   case PIPE_FORMAT_R16G16_SNORM:
-      return MESA_FORMAT_SIGNED_GR1616;
-   case PIPE_FORMAT_R16G16B16A16_SNORM:
-      return MESA_FORMAT_SIGNED_RGBA_16;
-
-   case PIPE_FORMAT_A16_SNORM:
-      return MESA_FORMAT_SIGNED_A16;
-   case PIPE_FORMAT_L16_SNORM:
-      return MESA_FORMAT_SIGNED_L16;
-   case PIPE_FORMAT_L16A16_SNORM:
-      return MESA_FORMAT_SIGNED_AL1616;
-   case PIPE_FORMAT_I16_SNORM:
-      return MESA_FORMAT_SIGNED_I16;
-
-   default:
-      assert(0);
-      return MESA_FORMAT_NONE;
-   }
-}
-
-
-/**
- * Return first supported format from the given list.
- */
-static enum pipe_format
-find_supported_format(struct pipe_screen *screen, 
-                      const enum pipe_format formats[],
-                      uint num_formats,
-                      enum pipe_texture_target target,
-                      unsigned sample_count,
-                      unsigned tex_usage)
-{
-   uint i;
-   for (i = 0; i < num_formats; i++) {
-      if (screen->is_format_supported(screen, formats[i], target,
-                                      sample_count, tex_usage)) {
-         return formats[i];
-      }
-   }
-   return PIPE_FORMAT_NONE;
-}
-
-
-/**
- * Find an RGBA format supported by the context/winsys.
- */
-static enum pipe_format
-default_rgba_format(struct pipe_screen *screen, 
-                    enum pipe_texture_target target,
-                    unsigned sample_count,
-                    unsigned tex_usage)
-{
-   static const enum pipe_format colorFormats[] = {
-      PIPE_FORMAT_B8G8R8A8_UNORM,
-      PIPE_FORMAT_A8R8G8B8_UNORM,
-      PIPE_FORMAT_A8B8G8R8_UNORM,
-      PIPE_FORMAT_B5G6R5_UNORM
-   };
-   return find_supported_format(screen, colorFormats, Elements(colorFormats),
-                                target, sample_count, tex_usage);
-}
-
-
-/**
- * Find an RGB format supported by the context/winsys.
- */
-static enum pipe_format
-default_rgb_format(struct pipe_screen *screen, 
-                   enum pipe_texture_target target,
-                   unsigned sample_count,
-                   unsigned tex_usage)
-{
-   static const enum pipe_format colorFormats[] = {
-      PIPE_FORMAT_B8G8R8X8_UNORM,
-      PIPE_FORMAT_X8R8G8B8_UNORM,
-      PIPE_FORMAT_X8B8G8R8_UNORM,
-      PIPE_FORMAT_B8G8R8A8_UNORM,
-      PIPE_FORMAT_A8R8G8B8_UNORM,
-      PIPE_FORMAT_A8B8G8R8_UNORM,
-      PIPE_FORMAT_B5G6R5_UNORM
-   };
-   return find_supported_format(screen, colorFormats, Elements(colorFormats),
-                                target, sample_count, tex_usage);
-}
-
-/**
- * Find an sRGBA format supported by the context/winsys.
- */
-static enum pipe_format
-default_srgba_format(struct pipe_screen *screen, 
-                    enum pipe_texture_target target,
-                    unsigned sample_count,
-                    unsigned tex_usage)
-{
-   static const enum pipe_format colorFormats[] = {
-      PIPE_FORMAT_B8G8R8A8_SRGB,
-      PIPE_FORMAT_A8R8G8B8_SRGB,
-      PIPE_FORMAT_A8B8G8R8_SRGB,
-   };
-   return find_supported_format(screen, colorFormats, Elements(colorFormats),
-                                target, sample_count, tex_usage);
-}
-
-
-/**
- * Given an OpenGL internalFormat value for a texture or surface, return
- * the best matching PIPE_FORMAT_x, or PIPE_FORMAT_NONE if there's no match.
- * This is called during glTexImage2D, for example.
- *
- * The bindings parameter typically has PIPE_BIND_SAMPLER_VIEW set, plus
- * either PIPE_BINDING_RENDER_TARGET or PIPE_BINDING_DEPTH_STENCIL if
- * we want render-to-texture ability.
- *
- * \param internalFormat  the user value passed to glTexImage2D
- * \param target  one of PIPE_TEXTURE_x
- * \param bindings  bitmask of PIPE_BIND_x flags.
- */
-enum pipe_format
-st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
-                 enum pipe_texture_target target, unsigned sample_count,
-                 unsigned bindings)
-{
-
-   switch (internalFormat) {
-   case GL_RGB10:
-   case GL_RGB10_A2:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_B10G10R10A2_UNORM,
-                                       target, sample_count, bindings))
-         return PIPE_FORMAT_B10G10R10A2_UNORM;
-      /* Pass through. */
-   case 4:
-   case GL_RGBA:
-   case GL_RGBA8:
-      return default_rgba_format( screen, target, sample_count, bindings);
-
-   case GL_BGRA:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_B8G8R8A8_UNORM,
-                                       target, sample_count, bindings))
-         return PIPE_FORMAT_B8G8R8A8_UNORM;
-      return default_rgba_format( screen, target, sample_count, bindings);
-
-   case 3:
-   case GL_RGB:
-   case GL_RGB8:
-      return default_rgb_format( screen, target, sample_count, bindings);
-
-   case GL_RGB12:
-   case GL_RGB16:
-   case GL_RGBA12:
-   case GL_RGBA16:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_R16G16B16A16_UNORM,
-                                             target, sample_count, bindings))
-         return PIPE_FORMAT_R16G16B16A16_UNORM;
-      return default_rgba_format( screen, target, sample_count, bindings);
-
-   case GL_RGBA4:
-   case GL_RGBA2:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_B4G4R4A4_UNORM,
-                                       target, sample_count, bindings))
-         return PIPE_FORMAT_B4G4R4A4_UNORM;
-      return default_rgba_format( screen, target, sample_count, bindings);
-
-   case GL_RGB5_A1:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_B5G5R5A1_UNORM,
-                                       target, sample_count, bindings))
-         return PIPE_FORMAT_B5G5R5A1_UNORM;
-      return default_rgba_format( screen, target, sample_count, bindings);
-
-   case GL_R3_G3_B2:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_B2G3R3_UNORM,
-                                       target, sample_count, bindings))
-         return PIPE_FORMAT_B2G3R3_UNORM;
-      /* Pass through. */
-   case GL_RGB5:
-   case GL_RGB4:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_B5G6R5_UNORM,
-                                       target, sample_count, bindings))
-         return PIPE_FORMAT_B5G6R5_UNORM;
-      if (screen->is_format_supported( screen, PIPE_FORMAT_B5G5R5A1_UNORM,
-                                       target, sample_count, bindings))
-         return PIPE_FORMAT_B5G5R5A1_UNORM;
-      return default_rgba_format( screen, target, sample_count, bindings);
-
-   case GL_ALPHA12:
-   case GL_ALPHA16:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_A16_UNORM, target,
-                                       sample_count, bindings))
-         return PIPE_FORMAT_A16_UNORM;
-      /* Pass through. */
-   case GL_ALPHA:
-   case GL_ALPHA4:
-   case GL_ALPHA8:
-   case GL_COMPRESSED_ALPHA:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_A8_UNORM, target,
-                                       sample_count, bindings))
-         return PIPE_FORMAT_A8_UNORM;
-      return default_rgba_format( screen, target, sample_count, bindings);
-
-   case GL_LUMINANCE12:
-   case GL_LUMINANCE16:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_L16_UNORM, target,
-                                       sample_count, bindings))
-         return PIPE_FORMAT_L16_UNORM;
-      /* Pass through. */
-   case 1:
-   case GL_LUMINANCE:
-   case GL_LUMINANCE4:
-   case GL_LUMINANCE8:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_L8_UNORM, target,
-                                       sample_count, bindings))
-         return PIPE_FORMAT_L8_UNORM;
-      return default_rgba_format( screen, target, sample_count, bindings);
-
-   case GL_LUMINANCE12_ALPHA4:
-   case GL_LUMINANCE12_ALPHA12:
-   case GL_LUMINANCE16_ALPHA16:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_L16A16_UNORM, target,
-                                       sample_count, bindings))
-         return PIPE_FORMAT_L16A16_UNORM;
-      /* Pass through. */
-   case 2:
-   case GL_LUMINANCE_ALPHA:
-   case GL_LUMINANCE6_ALPHA2:
-   case GL_LUMINANCE8_ALPHA8:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_L8A8_UNORM, target,
-                                       sample_count, bindings))
-         return PIPE_FORMAT_L8A8_UNORM;
-      return default_rgba_format( screen, target, sample_count, bindings);
-
-   case GL_LUMINANCE4_ALPHA4:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_L4A4_UNORM, target,
-                                       sample_count, bindings))
-         return PIPE_FORMAT_L4A4_UNORM;
-      if (screen->is_format_supported( screen, PIPE_FORMAT_L8A8_UNORM, target,
-                                       sample_count, bindings))
-         return PIPE_FORMAT_L8A8_UNORM;
-      return default_rgba_format( screen, target, sample_count, bindings);
-
-   case GL_INTENSITY12:
-   case GL_INTENSITY16:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_I16_UNORM, target,
-                                       sample_count, bindings))
-         return PIPE_FORMAT_I16_UNORM;
-      /* Pass through. */
-   case GL_INTENSITY:
-   case GL_INTENSITY4:
-   case GL_INTENSITY8:
-   case GL_COMPRESSED_INTENSITY:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_I8_UNORM, target,
-                                       sample_count, bindings))
-         return PIPE_FORMAT_I8_UNORM;
-      return default_rgba_format( screen, target, sample_count, bindings);
-
-   case GL_YCBCR_MESA:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_UYVY, target,
-                                      sample_count, bindings)) {
-         return PIPE_FORMAT_UYVY;
-      }
-      if (screen->is_format_supported(screen, PIPE_FORMAT_YUYV, target,
-                                      sample_count, bindings)) {
-         return PIPE_FORMAT_YUYV;
-      }
-      return PIPE_FORMAT_NONE;
-
-   case GL_COMPRESSED_RGB:
-      /* can only sample from compressed formats */
-      if (bindings & ~PIPE_BIND_SAMPLER_VIEW)
-         return PIPE_FORMAT_NONE;
-      else if (screen->is_format_supported(screen, PIPE_FORMAT_DXT1_RGB,
-                                           target, sample_count, bindings))
-         return PIPE_FORMAT_DXT1_RGB;
-      else
-         return default_rgb_format(screen, target, sample_count, bindings);
-
-   case GL_COMPRESSED_RGBA:
-      /* can only sample from compressed formats */
-      if (bindings & ~PIPE_BIND_SAMPLER_VIEW)
-         return PIPE_FORMAT_NONE;
-      else if (screen->is_format_supported(screen, PIPE_FORMAT_DXT3_RGBA,
-                                           target, sample_count, bindings))
-         return PIPE_FORMAT_DXT3_RGBA;
-      else
-         return default_rgba_format(screen, target, sample_count, bindings);
-
-   case GL_RGB_S3TC:
-   case GL_RGB4_S3TC:
-   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT1_RGB,
-                                      target, sample_count, bindings))
-         return PIPE_FORMAT_DXT1_RGB;
-      else
-         return PIPE_FORMAT_NONE;
-
-   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT1_RGBA,
-                                      target, sample_count, bindings))
-         return PIPE_FORMAT_DXT1_RGBA;
-      else
-         return PIPE_FORMAT_NONE;
-
-   case GL_RGBA_S3TC:
-   case GL_RGBA4_S3TC:
-   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT3_RGBA,
-                                      target, sample_count, bindings))
-         return PIPE_FORMAT_DXT3_RGBA;
-      else
-         return PIPE_FORMAT_NONE;
-
-   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
-                                      target, sample_count, bindings))
-         return PIPE_FORMAT_DXT5_RGBA;
-      else
-         return PIPE_FORMAT_NONE;
-
-#if 0
-   case GL_COMPRESSED_RGB_FXT1_3DFX:
-      return PIPE_FORMAT_RGB_FXT1;
-   case GL_COMPRESSED_RGBA_FXT1_3DFX:
-      return PIPE_FORMAT_RGB_FXT1;
-#endif
-
-   case GL_DEPTH_COMPONENT16:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_Z16_UNORM, target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_Z16_UNORM;
-      /* fall-through */
-   case GL_DEPTH_COMPONENT24:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,
-                                      target, sample_count, bindings))
-         return PIPE_FORMAT_Z24_UNORM_S8_USCALED;
-      if (screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,
-                                      target, sample_count, bindings))
-         return PIPE_FORMAT_S8_USCALED_Z24_UNORM;
-      /* fall-through */
-   case GL_DEPTH_COMPONENT32:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_Z32_UNORM, target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_Z32_UNORM;
-      /* fall-through */
-   case GL_DEPTH_COMPONENT:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_Z32_UNORM,
-            PIPE_FORMAT_Z24_UNORM_S8_USCALED,
-            PIPE_FORMAT_S8_USCALED_Z24_UNORM,
-            PIPE_FORMAT_Z16_UNORM
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-                                      target, sample_count, bindings);
-      }
-
-   case GL_STENCIL_INDEX:
-   case GL_STENCIL_INDEX1_EXT:
-   case GL_STENCIL_INDEX4_EXT:
-   case GL_STENCIL_INDEX8_EXT:
-   case GL_STENCIL_INDEX16_EXT:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_S8_USCALED,
-            PIPE_FORMAT_Z24_UNORM_S8_USCALED,
-            PIPE_FORMAT_S8_USCALED_Z24_UNORM
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-                                      target, sample_count, bindings);
-      }
-
-   case GL_DEPTH_STENCIL_EXT:
-   case GL_DEPTH24_STENCIL8_EXT:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_Z24_UNORM_S8_USCALED,
-            PIPE_FORMAT_S8_USCALED_Z24_UNORM
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-                                      target, sample_count, bindings);
-      }
-
-   case GL_SRGB_EXT:
-   case GL_SRGB8_EXT:
-   case GL_SRGB_ALPHA_EXT:
-   case GL_SRGB8_ALPHA8_EXT:
-      return default_srgba_format( screen, target, sample_count, bindings);
-
-   case GL_COMPRESSED_SRGB_EXT:
-   case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT1_SRGB, target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_DXT1_SRGB;
-      return default_srgba_format( screen, target, sample_count, bindings);
-
-   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-      return PIPE_FORMAT_DXT1_SRGBA;
-
-   case GL_COMPRESSED_SRGB_ALPHA_EXT:
-   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT3_SRGBA, target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_DXT3_SRGBA;
-      return default_srgba_format( screen, target, sample_count, bindings);
-
-   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-      return PIPE_FORMAT_DXT5_SRGBA;
-
-   case GL_SLUMINANCE_ALPHA_EXT:
-   case GL_SLUMINANCE8_ALPHA8_EXT:
-   case GL_COMPRESSED_SLUMINANCE_EXT:
-   case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_L8A8_SRGB, target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_L8A8_SRGB;
-      return default_srgba_format( screen, target, sample_count, bindings);
-
-   case GL_SLUMINANCE_EXT:
-   case GL_SLUMINANCE8_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_L8_SRGB, target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_L8_SRGB;
-      return default_srgba_format( screen, target, sample_count, bindings);
-
-   case GL_RED:
-   case GL_R8:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R8_UNORM, target,
-                                      sample_count, bindings))
-	      return PIPE_FORMAT_R8_UNORM;
-      return PIPE_FORMAT_NONE;
-   case GL_RG:
-   case GL_RG8:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM, target,
-                                      sample_count, bindings))
-	      return PIPE_FORMAT_R8G8_UNORM;
-      return PIPE_FORMAT_NONE;
-
-   case GL_R16:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R16_UNORM, target,
-                                      sample_count, bindings))
-	      return PIPE_FORMAT_R16_UNORM;
-      return PIPE_FORMAT_NONE;
-
-   case GL_RG16:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16_UNORM, target,
-                                      sample_count, bindings))
-	      return PIPE_FORMAT_R16G16_UNORM;
-      return PIPE_FORMAT_NONE;
-
-   case GL_COMPRESSED_RED:
-   case GL_COMPRESSED_RED_RGTC1:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_UNORM, target,
-                                      sample_count, bindings))
-	      return PIPE_FORMAT_RGTC1_UNORM;
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R8_UNORM, target,
-                                      sample_count, bindings))
-	      return PIPE_FORMAT_R8_UNORM;
-      return PIPE_FORMAT_NONE;
-
-   case GL_COMPRESSED_SIGNED_RED_RGTC1:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_SNORM, target,
-                                      sample_count, bindings))
-	      return PIPE_FORMAT_RGTC1_SNORM;
-      return PIPE_FORMAT_NONE;
-
-   case GL_COMPRESSED_RG:
-   case GL_COMPRESSED_RG_RGTC2:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_UNORM, target,
-                                      sample_count, bindings))
-	      return PIPE_FORMAT_RGTC2_UNORM;
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM, target,
-                                      sample_count, bindings))
-	      return PIPE_FORMAT_R8G8_UNORM;
-      return PIPE_FORMAT_NONE;
-
-   case GL_COMPRESSED_SIGNED_RG_RGTC2:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_SNORM, target,
-                                      sample_count, bindings))
-	      return PIPE_FORMAT_RGTC2_SNORM;
-      return PIPE_FORMAT_NONE;
-
-   case GL_COMPRESSED_LUMINANCE:
-   case GL_COMPRESSED_LUMINANCE_LATC1_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_LATC1_UNORM, target,
-                                      sample_count, bindings))
-              return PIPE_FORMAT_LATC1_UNORM;
-      if (screen->is_format_supported(screen, PIPE_FORMAT_L8_UNORM, target,
-                                      sample_count, bindings))
-              return PIPE_FORMAT_L8_UNORM;
-      return PIPE_FORMAT_NONE;
-
-   case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_LATC1_SNORM, target,
-                                      sample_count, bindings))
-              return PIPE_FORMAT_LATC1_SNORM;
-      return PIPE_FORMAT_NONE;
-
-   case GL_COMPRESSED_LUMINANCE_ALPHA:
-   case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
-   case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM, target,
-                                      sample_count, bindings))
-              return PIPE_FORMAT_LATC2_UNORM;
-      if (screen->is_format_supported(screen, PIPE_FORMAT_L8A8_UNORM, target,
-                                      sample_count, bindings))
-              return PIPE_FORMAT_L8A8_UNORM;
-      return PIPE_FORMAT_NONE;
-
-   case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_LATC2_SNORM, target,
-                                      sample_count, bindings))
-              return PIPE_FORMAT_LATC2_SNORM;
-      return PIPE_FORMAT_NONE;
-
-   /* signed/unsigned integer formats.
-    * XXX Mesa only has formats for RGBA signed/unsigned integer formats.
-    * If/when new formats are added this code should be updated.
-    */
-   case GL_RED_INTEGER_EXT:
-   case GL_GREEN_INTEGER_EXT:
-   case GL_BLUE_INTEGER_EXT:
-   case GL_ALPHA_INTEGER_EXT:
-   case GL_RGB_INTEGER_EXT:
-   case GL_RGBA_INTEGER_EXT:
-   case GL_BGR_INTEGER_EXT:
-   case GL_BGRA_INTEGER_EXT:
-   case GL_LUMINANCE_INTEGER_EXT:
-   case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-      /* fall-through */
-   case GL_RGBA8I_EXT:
-   case GL_RGB8I_EXT:
-   case GL_ALPHA8I_EXT:
-   case GL_INTENSITY8I_EXT:
-   case GL_LUMINANCE8I_EXT:
-   case GL_LUMINANCE_ALPHA8I_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SSCALED,
-                                      target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_R8G8B8A8_SSCALED;
-      return PIPE_FORMAT_NONE;
-   case GL_RGBA16I_EXT:
-   case GL_RGB16I_EXT:
-   case GL_ALPHA16I_EXT:
-   case GL_INTENSITY16I_EXT:
-   case GL_LUMINANCE16I_EXT:
-   case GL_LUMINANCE_ALPHA16I_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_SSCALED,
-                                      target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_R16G16B16A16_SSCALED;
-      return PIPE_FORMAT_NONE;
-   case GL_RGBA32I_EXT:
-   case GL_RGB32I_EXT:
-   case GL_ALPHA32I_EXT:
-   case GL_INTENSITY32I_EXT:
-   case GL_LUMINANCE32I_EXT:
-   case GL_LUMINANCE_ALPHA32I_EXT:
-      /* xxx */
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_SSCALED,
-                                      target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_R32G32B32A32_SSCALED;
-      return PIPE_FORMAT_NONE;
-
-   case GL_RGBA8UI_EXT:
-   case GL_RGB8UI_EXT:
-   case GL_ALPHA8UI_EXT:
-   case GL_INTENSITY8UI_EXT:
-   case GL_LUMINANCE8UI_EXT:
-   case GL_LUMINANCE_ALPHA8UI_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_USCALED,
-                                      target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_R8G8B8A8_USCALED;
-      return PIPE_FORMAT_NONE;
-
-   case GL_RGBA16UI_EXT:
-   case GL_RGB16UI_EXT:
-   case GL_ALPHA16UI_EXT:
-   case GL_INTENSITY16UI_EXT:
-   case GL_LUMINANCE16UI_EXT:
-   case GL_LUMINANCE_ALPHA16UI_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_USCALED,
-                                      target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_R16G16B16A16_USCALED;
-      return PIPE_FORMAT_NONE;
-
-   case GL_RGBA32UI_EXT:
-   case GL_RGB32UI_EXT:
-   case GL_ALPHA32UI_EXT:
-   case GL_INTENSITY32UI_EXT:
-   case GL_LUMINANCE32UI_EXT:
-   case GL_LUMINANCE_ALPHA32UI_EXT:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_USCALED,
-                                      target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_R32G32B32A32_USCALED;
-      return PIPE_FORMAT_NONE;
-
-   /* signed normalized formats */
-   case GL_RED_SNORM:
-   case GL_R8_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_R8_SNORM,
-            PIPE_FORMAT_R8G8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   case GL_R16_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_R16_SNORM,
-            PIPE_FORMAT_R16G16_SNORM,
-            PIPE_FORMAT_R16G16B16A16_SNORM,
-            PIPE_FORMAT_R8_SNORM,
-            PIPE_FORMAT_R8G8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   case GL_RG_SNORM:
-   case GL_RG8_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_R8G8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   case GL_RG16_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_R16G16_SNORM,
-            PIPE_FORMAT_R16G16B16A16_SNORM,
-            PIPE_FORMAT_R8G8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   case GL_RGB_SNORM:
-   case GL_RGB8_SNORM:
-   case GL_RGBA_SNORM:
-   case GL_RGBA8_SNORM:
-      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,
-                                      target,
-                                      sample_count, bindings))
-         return PIPE_FORMAT_R8G8B8A8_SNORM;
-      return PIPE_FORMAT_NONE;
-
-   case GL_RGB16_SNORM:
-   case GL_RGBA16_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_R16G16B16A16_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-
-   case GL_ALPHA_SNORM:
-   case GL_ALPHA8_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_A8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   case GL_ALPHA16_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_A16_SNORM,
-            PIPE_FORMAT_R16G16B16A16_SNORM,
-            PIPE_FORMAT_A8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   case GL_LUMINANCE_SNORM:
-   case GL_LUMINANCE8_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_L8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   case GL_LUMINANCE16_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_L16_SNORM,
-            PIPE_FORMAT_R16G16B16A16_SNORM,
-            PIPE_FORMAT_L8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   case GL_LUMINANCE_ALPHA_SNORM:
-   case GL_LUMINANCE8_ALPHA8_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_L8A8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   case GL_LUMINANCE16_ALPHA16_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_L16A16_SNORM,
-            PIPE_FORMAT_R16G16B16A16_SNORM,
-            PIPE_FORMAT_L8A8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   case GL_INTENSITY_SNORM:
-   case GL_INTENSITY8_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_I8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   case GL_INTENSITY16_SNORM:
-      {
-         static const enum pipe_format formats[] = {
-            PIPE_FORMAT_I16_SNORM,
-            PIPE_FORMAT_R16G16B16A16_SNORM,
-            PIPE_FORMAT_I8_SNORM,
-            PIPE_FORMAT_R8G8B8A8_SNORM,
-         };
-         return find_supported_format(screen, formats, Elements(formats),
-               target, sample_count, bindings);
-      }
-
-   default:
-      return PIPE_FORMAT_NONE;
-   }
-}
-
-
-/**
- * Called by FBO code to choose a PIPE_FORMAT_ for drawing surfaces.
- */
-enum pipe_format
-st_choose_renderbuffer_format(struct pipe_screen *screen,
-                              GLenum internalFormat, unsigned sample_count)
-{
-   uint usage;
-   if (_mesa_is_depth_or_stencil_format(internalFormat))
-      usage = PIPE_BIND_DEPTH_STENCIL;
-   else
-      usage = PIPE_BIND_RENDER_TARGET;
-   return st_choose_format(screen, internalFormat, PIPE_TEXTURE_2D,
-                           sample_count, usage);
-}
-
-
-/**
- * Called via ctx->Driver.chooseTextureFormat().
- */
-gl_format
-st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat,
-				  GLenum format, GLenum type, GLboolean renderable)
-{
-   struct pipe_screen *screen = st_context(ctx)->pipe->screen;
-   enum pipe_format pFormat;
-   uint bindings;
-
-   (void) format;
-   (void) type;
-
-   /* GL textures may wind up being render targets, but we don't know
-    * that in advance.  Specify potential render target flags now.
-    */
-   bindings = PIPE_BIND_SAMPLER_VIEW;
-   if (renderable == GL_TRUE) {
-      if (_mesa_is_depth_format(internalFormat) ||
-	  _mesa_is_depth_or_stencil_format(internalFormat))
-	 bindings |= PIPE_BIND_DEPTH_STENCIL;
-      else 
-	 bindings |= PIPE_BIND_RENDER_TARGET;
-   }
-
-   pFormat = st_choose_format(screen, internalFormat,
-                              PIPE_TEXTURE_2D, 0, bindings);
-
-   if (pFormat == PIPE_FORMAT_NONE) {
-      /* try choosing format again, this time without render target bindings */
-      pFormat = st_choose_format(screen, internalFormat,
-                                 PIPE_TEXTURE_2D, 0, PIPE_BIND_SAMPLER_VIEW);
-   }
-
-   if (pFormat == PIPE_FORMAT_NONE) {
-      /* no luck at all */
-      return MESA_FORMAT_NONE;
-   }
-
-   return st_pipe_format_to_mesa_format(pFormat);
-}
-
-gl_format
-st_ChooseTextureFormat(struct gl_context *ctx, GLint internalFormat,
-                       GLenum format, GLenum type)
-{
-   boolean want_renderable =
-      internalFormat == 3 || internalFormat == 4 ||
-      internalFormat == GL_RGB || internalFormat == GL_RGBA ||
-      internalFormat == GL_RGB8 || internalFormat == GL_RGBA8 ||
-      internalFormat == GL_BGRA;
-
-   return st_ChooseTextureFormat_renderable(ctx, internalFormat,
-					    format, type, want_renderable);
-}
-
-/**
- * Test if a gallium format is equivalent to a GL format/type.
- */
-GLboolean
-st_equal_formats(enum pipe_format pFormat, GLenum format, GLenum type)
-{
-   switch (pFormat) {
-   case PIPE_FORMAT_A8B8G8R8_UNORM:
-      return format == GL_RGBA && type == GL_UNSIGNED_BYTE;
-   case PIPE_FORMAT_A8R8G8B8_UNORM:
-      return format == GL_BGRA && type == GL_UNSIGNED_BYTE;
-   case PIPE_FORMAT_B5G6R5_UNORM:
-      return format == GL_RGB && type == GL_UNSIGNED_SHORT_5_6_5;
-   /* XXX more combos... */
-   default:
-      return GL_FALSE;
-   }
-}
-
-GLboolean
-st_sampler_compat_formats(enum pipe_format format1, enum pipe_format format2)
-{
-   if (format1 == format2)
-      return GL_TRUE;
-
-   if (format1 == PIPE_FORMAT_B8G8R8A8_UNORM &&
-       format2 == PIPE_FORMAT_B8G8R8X8_UNORM)
-      return GL_TRUE;
-
-   if (format1 == PIPE_FORMAT_B8G8R8X8_UNORM &&
-       format2 == PIPE_FORMAT_B8G8R8A8_UNORM)
-      return GL_TRUE;
-
-   if (format1 == PIPE_FORMAT_A8B8G8R8_UNORM &&
-       format2 == PIPE_FORMAT_X8B8G8R8_UNORM)
-      return GL_TRUE;
-
-   if (format1 == PIPE_FORMAT_X8B8G8R8_UNORM &&
-       format2 == PIPE_FORMAT_A8B8G8R8_UNORM)
-      return GL_TRUE;
-
-   if (format1 == PIPE_FORMAT_A8R8G8B8_UNORM &&
-       format2 == PIPE_FORMAT_X8R8G8B8_UNORM)
-      return GL_TRUE;
-
-   if (format1 == PIPE_FORMAT_X8R8G8B8_UNORM &&
-       format2 == PIPE_FORMAT_A8R8G8B8_UNORM)
-      return GL_TRUE;
-
-   return GL_FALSE;
-}
-
-
-
-/**
- * This is used for translating texture border color and the clear
- * color.  For example, the clear color is interpreted according to
- * the renderbuffer's base format.  For example, if clearing a
- * GL_LUMINANCE buffer, ClearColor[0] = luminance and ClearColor[1] =
- * alpha.  Similarly for texture border colors.
- */
-void
-st_translate_color(const GLfloat colorIn[4], GLenum baseFormat,
-                   GLfloat colorOut[4])
-{
-   switch (baseFormat) {
-   case GL_RED:
-      colorOut[0] = colorIn[0];
-      colorOut[1] = 0.0F;
-      colorOut[2] = 0.0F;
-      colorOut[3] = 1.0F;
-      break;
-   case GL_RG:
-      colorOut[0] = colorIn[0];
-      colorOut[1] = colorIn[1];
-      colorOut[2] = 0.0F;
-      colorOut[3] = 1.0F;
-      break;
-   case GL_RGB:
-      colorOut[0] = colorIn[0];
-      colorOut[1] = colorIn[1];
-      colorOut[2] = colorIn[2];
-      colorOut[3] = 1.0F;
-      break;
-   case GL_ALPHA:
-      colorOut[0] = colorOut[1] = colorOut[2] = 0.0;
-      colorOut[3] = colorIn[3];
-      break;
-   case GL_LUMINANCE:
-      colorOut[0] = colorOut[1] = colorOut[2] = colorIn[0];
-      colorOut[3] = 1.0;
-      break;
-   case GL_LUMINANCE_ALPHA:
-      colorOut[0] = colorOut[1] = colorOut[2] = colorIn[0];
-      colorOut[3] = colorIn[3];
-      break;
-   case GL_INTENSITY:
-      colorOut[0] = colorOut[1] = colorOut[2] = colorOut[3] = colorIn[0];
-      break;
-   default:
-      COPY_4V(colorOut, colorIn);
-   }
-}
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * Copyright (c) 2008-2010 VMware, Inc.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+

+/**

+ * Mesa / Gallium format conversion and format selection code.

+ * \author Brian Paul

+ */

+

+#include "main/imports.h"

+#include "main/context.h"

+#include "main/texstore.h"

+#include "main/image.h"

+#include "main/macros.h"

+#include "main/mfeatures.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "pipe/p_screen.h"

+#include "util/u_format.h"

+#include "st_context.h"

+#include "st_format.h"

+

+

+static GLuint

+format_max_bits(enum pipe_format format)

+{

+   GLuint size = util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 0);

+

+   size = MAX2(size, util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 1));

+   size = MAX2(size, util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 2));

+   size = MAX2(size, util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 3));

+   size = MAX2(size, util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_ZS, 0));

+   size = MAX2(size, util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_ZS, 1));

+   return size;

+}

+

+

+/**

+ * Return basic GL datatype for the given gallium format.

+ */

+GLenum

+st_format_datatype(enum pipe_format format)

+{

+   const struct util_format_description *desc;

+

+   desc = util_format_description(format);

+   assert(desc);

+

+   if (desc->layout == UTIL_FORMAT_LAYOUT_PLAIN) {

+      if (format == PIPE_FORMAT_B5G5R5A1_UNORM ||

+          format == PIPE_FORMAT_B5G6R5_UNORM) {

+         return GL_UNSIGNED_SHORT;

+      }

+      else if (format == PIPE_FORMAT_Z24_UNORM_S8_USCALED ||

+               format == PIPE_FORMAT_S8_USCALED_Z24_UNORM ||

+               format == PIPE_FORMAT_Z24X8_UNORM ||

+               format == PIPE_FORMAT_X8Z24_UNORM) {

+         return GL_UNSIGNED_INT_24_8;

+      }

+      else {

+         const GLuint size = format_max_bits(format);

+         if (size == 8) {

+            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)

+               return GL_UNSIGNED_BYTE;

+            else

+               return GL_BYTE;

+         }

+         else if (size == 16) {

+            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)

+               return GL_UNSIGNED_SHORT;

+            else

+               return GL_SHORT;

+         }

+         else {

+            assert( size <= 32 );

+            if (desc->channel[0].type == UTIL_FORMAT_TYPE_UNSIGNED)

+               return GL_UNSIGNED_INT;

+            else

+               return GL_INT;

+         }

+      }

+   }

+   else if (format == PIPE_FORMAT_UYVY) {

+      return GL_UNSIGNED_SHORT;

+   }

+   else if (format == PIPE_FORMAT_YUYV) {

+      return GL_UNSIGNED_SHORT;

+   }

+   else {

+      /* probably a compressed format, unsupported anyway */

+      return GL_NONE;

+   }

+}

+

+

+/**

+ * Translate Mesa format to Gallium format.

+ */

+enum pipe_format

+st_mesa_format_to_pipe_format(gl_format mesaFormat)

+{

+   switch (mesaFormat) {

+   case MESA_FORMAT_RGBA8888:

+      return PIPE_FORMAT_A8B8G8R8_UNORM;

+   case MESA_FORMAT_RGBA8888_REV:

+      return PIPE_FORMAT_R8G8B8A8_UNORM;

+   case MESA_FORMAT_ARGB8888:

+      return PIPE_FORMAT_B8G8R8A8_UNORM;

+   case MESA_FORMAT_ARGB8888_REV:

+      return PIPE_FORMAT_A8R8G8B8_UNORM;

+   case MESA_FORMAT_XRGB8888:

+      return PIPE_FORMAT_B8G8R8X8_UNORM;

+   case MESA_FORMAT_XRGB8888_REV:

+      return PIPE_FORMAT_X8R8G8B8_UNORM;

+   case MESA_FORMAT_ARGB1555:

+      return PIPE_FORMAT_B5G5R5A1_UNORM;

+   case MESA_FORMAT_ARGB4444:

+      return PIPE_FORMAT_B4G4R4A4_UNORM;

+   case MESA_FORMAT_RGB565:

+      return PIPE_FORMAT_B5G6R5_UNORM;

+   case MESA_FORMAT_RGB332:

+      return PIPE_FORMAT_B2G3R3_UNORM;

+   case MESA_FORMAT_ARGB2101010:

+      return PIPE_FORMAT_B10G10R10A2_UNORM;

+   case MESA_FORMAT_AL44:

+      return PIPE_FORMAT_L4A4_UNORM;

+   case MESA_FORMAT_AL88:

+      return PIPE_FORMAT_L8A8_UNORM;

+   case MESA_FORMAT_AL1616:

+      return PIPE_FORMAT_L16A16_UNORM;

+   case MESA_FORMAT_A8:

+      return PIPE_FORMAT_A8_UNORM;

+   case MESA_FORMAT_A16:

+      return PIPE_FORMAT_A16_UNORM;

+   case MESA_FORMAT_L8:

+      return PIPE_FORMAT_L8_UNORM;

+   case MESA_FORMAT_L16:

+      return PIPE_FORMAT_L16_UNORM;

+   case MESA_FORMAT_I8:

+      return PIPE_FORMAT_I8_UNORM;

+   case MESA_FORMAT_I16:

+      return PIPE_FORMAT_I16_UNORM;

+   case MESA_FORMAT_Z16:

+      return PIPE_FORMAT_Z16_UNORM;

+   case MESA_FORMAT_Z32:

+      return PIPE_FORMAT_Z32_UNORM;

+   case MESA_FORMAT_Z24_S8:

+      return PIPE_FORMAT_S8_USCALED_Z24_UNORM;

+   case MESA_FORMAT_S8_Z24:

+      return PIPE_FORMAT_Z24_UNORM_S8_USCALED;

+   case MESA_FORMAT_Z24_X8:

+      return PIPE_FORMAT_X8Z24_UNORM;

+   case MESA_FORMAT_X8_Z24:

+      return PIPE_FORMAT_Z24X8_UNORM;

+   case MESA_FORMAT_S8:

+      return PIPE_FORMAT_S8_USCALED;

+   case MESA_FORMAT_YCBCR:

+      return PIPE_FORMAT_UYVY;

+#if FEATURE_texture_s3tc

+   case MESA_FORMAT_RGB_DXT1:

+      return PIPE_FORMAT_DXT1_RGB;

+   case MESA_FORMAT_RGBA_DXT1:

+      return PIPE_FORMAT_DXT1_RGBA;

+   case MESA_FORMAT_RGBA_DXT3:

+      return PIPE_FORMAT_DXT3_RGBA;

+   case MESA_FORMAT_RGBA_DXT5:

+      return PIPE_FORMAT_DXT5_RGBA;

+#if FEATURE_EXT_texture_sRGB

+   case MESA_FORMAT_SRGB_DXT1:

+      return PIPE_FORMAT_DXT1_SRGB;

+   case MESA_FORMAT_SRGBA_DXT1:

+      return PIPE_FORMAT_DXT1_SRGBA;

+   case MESA_FORMAT_SRGBA_DXT3:

+      return PIPE_FORMAT_DXT3_SRGBA;

+   case MESA_FORMAT_SRGBA_DXT5:

+      return PIPE_FORMAT_DXT5_SRGBA;

+#endif

+#endif

+#if FEATURE_EXT_texture_sRGB

+   case MESA_FORMAT_SLA8:

+      return PIPE_FORMAT_L8A8_SRGB;

+   case MESA_FORMAT_SL8:

+      return PIPE_FORMAT_L8_SRGB;

+   case MESA_FORMAT_SRGB8:

+      return PIPE_FORMAT_R8G8B8_SRGB;

+   case MESA_FORMAT_SRGBA8:

+      return PIPE_FORMAT_A8B8G8R8_SRGB;

+   case MESA_FORMAT_SARGB8:

+      return PIPE_FORMAT_B8G8R8A8_SRGB;

+#endif

+   case MESA_FORMAT_R8:

+      return PIPE_FORMAT_R8_UNORM;

+   case MESA_FORMAT_R16:

+      return PIPE_FORMAT_R16_UNORM;

+   case MESA_FORMAT_RG88:

+      return PIPE_FORMAT_R8G8_UNORM;

+   case MESA_FORMAT_RG1616:

+      return PIPE_FORMAT_R16G16_UNORM;

+   case MESA_FORMAT_RGBA_16:

+      return PIPE_FORMAT_R16G16B16A16_UNORM;

+

+   /* signed int formats */

+   case MESA_FORMAT_RGBA_INT8:

+      return PIPE_FORMAT_R8G8B8A8_SSCALED;

+   case MESA_FORMAT_RGBA_INT16:

+      return PIPE_FORMAT_R16G16B16A16_SSCALED;

+   case MESA_FORMAT_RGBA_INT32:

+      return PIPE_FORMAT_R32G32B32A32_SSCALED;

+

+   /* unsigned int formats */

+   case MESA_FORMAT_RGBA_UINT8:

+      return PIPE_FORMAT_R8G8B8A8_USCALED;

+   case MESA_FORMAT_RGBA_UINT16:

+      return PIPE_FORMAT_R16G16B16A16_USCALED;

+   case MESA_FORMAT_RGBA_UINT32:

+      return PIPE_FORMAT_R32G32B32A32_USCALED;

+

+   case MESA_FORMAT_RED_RGTC1:

+      return PIPE_FORMAT_RGTC1_UNORM;

+   case MESA_FORMAT_SIGNED_RED_RGTC1:

+      return PIPE_FORMAT_RGTC1_SNORM;

+   case MESA_FORMAT_RG_RGTC2:

+      return PIPE_FORMAT_RGTC2_UNORM;

+   case MESA_FORMAT_SIGNED_RG_RGTC2:

+      return PIPE_FORMAT_RGTC2_SNORM;

+

+   case MESA_FORMAT_L_LATC1:

+      return PIPE_FORMAT_LATC1_UNORM;

+   case MESA_FORMAT_SIGNED_L_LATC1:

+      return PIPE_FORMAT_LATC1_SNORM;

+   case MESA_FORMAT_LA_LATC2:

+      return PIPE_FORMAT_LATC2_UNORM;

+   case MESA_FORMAT_SIGNED_LA_LATC2:

+      return PIPE_FORMAT_LATC2_SNORM;

+

+   /* signed normalized formats */

+   case MESA_FORMAT_SIGNED_R8:

+      return PIPE_FORMAT_R8_SNORM;

+   case MESA_FORMAT_SIGNED_RG88_REV:

+      return PIPE_FORMAT_R8G8_SNORM;

+   case MESA_FORMAT_SIGNED_RGBA8888_REV:

+      return PIPE_FORMAT_R8G8B8A8_SNORM;

+

+   case MESA_FORMAT_SIGNED_A8:

+      return PIPE_FORMAT_A8_SNORM;

+   case MESA_FORMAT_SIGNED_L8:

+      return PIPE_FORMAT_L8_SNORM;

+   case MESA_FORMAT_SIGNED_AL88:

+      return PIPE_FORMAT_L8A8_SNORM;

+   case MESA_FORMAT_SIGNED_I8:

+      return PIPE_FORMAT_I8_SNORM;

+

+   case MESA_FORMAT_SIGNED_R16:

+      return PIPE_FORMAT_R16_SNORM;

+   case MESA_FORMAT_SIGNED_GR1616:

+      return PIPE_FORMAT_R16G16_SNORM;

+   case MESA_FORMAT_SIGNED_RGBA_16:

+      return PIPE_FORMAT_R16G16B16A16_SNORM;

+

+   case MESA_FORMAT_SIGNED_A16:

+      return PIPE_FORMAT_A16_SNORM;

+   case MESA_FORMAT_SIGNED_L16:

+      return PIPE_FORMAT_L16_SNORM;

+   case MESA_FORMAT_SIGNED_AL1616:

+      return PIPE_FORMAT_L16A16_SNORM;

+   case MESA_FORMAT_SIGNED_I16:

+      return PIPE_FORMAT_I16_SNORM;

+

+   default:

+      assert(0);

+      return PIPE_FORMAT_NONE;

+   }

+}

+

+

+/**

+ * Translate Gallium format to Mesa format.

+ */

+gl_format

+st_pipe_format_to_mesa_format(enum pipe_format format)

+{

+   switch (format) {

+   case PIPE_FORMAT_A8B8G8R8_UNORM:

+      return MESA_FORMAT_RGBA8888;

+   case PIPE_FORMAT_R8G8B8A8_UNORM:

+      return MESA_FORMAT_RGBA8888_REV;

+   case PIPE_FORMAT_B8G8R8A8_UNORM:

+      return MESA_FORMAT_ARGB8888;

+   case PIPE_FORMAT_A8R8G8B8_UNORM:

+      return MESA_FORMAT_ARGB8888_REV;

+   case PIPE_FORMAT_B8G8R8X8_UNORM:

+      return MESA_FORMAT_XRGB8888;

+   case PIPE_FORMAT_X8R8G8B8_UNORM:

+      return MESA_FORMAT_XRGB8888_REV;

+   case PIPE_FORMAT_B5G5R5A1_UNORM:

+      return MESA_FORMAT_ARGB1555;

+   case PIPE_FORMAT_B4G4R4A4_UNORM:

+      return MESA_FORMAT_ARGB4444;

+   case PIPE_FORMAT_B5G6R5_UNORM:

+      return MESA_FORMAT_RGB565;

+   case PIPE_FORMAT_B2G3R3_UNORM:

+      return MESA_FORMAT_RGB332;

+   case PIPE_FORMAT_B10G10R10A2_UNORM:

+      return MESA_FORMAT_ARGB2101010;

+   case PIPE_FORMAT_L4A4_UNORM:

+      return MESA_FORMAT_AL44;

+   case PIPE_FORMAT_L8A8_UNORM:

+      return MESA_FORMAT_AL88;

+   case PIPE_FORMAT_L16A16_UNORM:

+      return MESA_FORMAT_AL1616;

+   case PIPE_FORMAT_A8_UNORM:

+      return MESA_FORMAT_A8;

+   case PIPE_FORMAT_A16_UNORM:

+      return MESA_FORMAT_A16;

+   case PIPE_FORMAT_L8_UNORM:

+      return MESA_FORMAT_L8;

+   case PIPE_FORMAT_L16_UNORM:

+      return MESA_FORMAT_L16;

+   case PIPE_FORMAT_I8_UNORM:

+      return MESA_FORMAT_I8;

+   case PIPE_FORMAT_I16_UNORM:

+      return MESA_FORMAT_I16;

+   case PIPE_FORMAT_S8_USCALED:

+      return MESA_FORMAT_S8;

+

+   case PIPE_FORMAT_R16G16B16A16_UNORM:

+      return MESA_FORMAT_RGBA_16;

+

+   case PIPE_FORMAT_Z16_UNORM:

+      return MESA_FORMAT_Z16;

+   case PIPE_FORMAT_Z32_UNORM:

+      return MESA_FORMAT_Z32;

+   case PIPE_FORMAT_S8_USCALED_Z24_UNORM:

+      return MESA_FORMAT_Z24_S8;

+   case PIPE_FORMAT_X8Z24_UNORM:

+      return MESA_FORMAT_Z24_X8;

+   case PIPE_FORMAT_Z24X8_UNORM:

+      return MESA_FORMAT_X8_Z24;

+   case PIPE_FORMAT_Z24_UNORM_S8_USCALED:

+      return MESA_FORMAT_S8_Z24;

+

+   case PIPE_FORMAT_UYVY:

+      return MESA_FORMAT_YCBCR;

+   case PIPE_FORMAT_YUYV:

+      return MESA_FORMAT_YCBCR_REV;

+

+#if FEATURE_texture_s3tc

+   case PIPE_FORMAT_DXT1_RGB:

+      return MESA_FORMAT_RGB_DXT1;

+   case PIPE_FORMAT_DXT1_RGBA:

+      return MESA_FORMAT_RGBA_DXT1;

+   case PIPE_FORMAT_DXT3_RGBA:

+      return MESA_FORMAT_RGBA_DXT3;

+   case PIPE_FORMAT_DXT5_RGBA:

+      return MESA_FORMAT_RGBA_DXT5;

+#if FEATURE_EXT_texture_sRGB

+   case PIPE_FORMAT_DXT1_SRGB:

+      return MESA_FORMAT_SRGB_DXT1;

+   case PIPE_FORMAT_DXT1_SRGBA:

+      return MESA_FORMAT_SRGBA_DXT1;

+   case PIPE_FORMAT_DXT3_SRGBA:

+      return MESA_FORMAT_SRGBA_DXT3;

+   case PIPE_FORMAT_DXT5_SRGBA:

+      return MESA_FORMAT_SRGBA_DXT5;

+#endif

+#endif

+

+#if FEATURE_EXT_texture_sRGB

+   case PIPE_FORMAT_L8A8_SRGB:

+      return MESA_FORMAT_SLA8;

+   case PIPE_FORMAT_L8_SRGB:

+      return MESA_FORMAT_SL8;

+   case PIPE_FORMAT_R8G8B8_SRGB:

+      return MESA_FORMAT_SRGB8;

+   case PIPE_FORMAT_A8B8G8R8_SRGB:

+      return MESA_FORMAT_SRGBA8;

+   case PIPE_FORMAT_B8G8R8A8_SRGB:

+      return MESA_FORMAT_SARGB8;

+#endif

+

+   case PIPE_FORMAT_R8_UNORM:

+      return MESA_FORMAT_R8;

+   case PIPE_FORMAT_R16_UNORM:

+      return MESA_FORMAT_R16;

+   case PIPE_FORMAT_R8G8_UNORM:

+      return MESA_FORMAT_RG88;

+   case PIPE_FORMAT_R16G16_UNORM:

+      return MESA_FORMAT_RG1616;

+

+   /* signed int formats */

+   case PIPE_FORMAT_R8G8B8A8_SSCALED:

+      return MESA_FORMAT_RGBA_INT8;

+   case PIPE_FORMAT_R16G16B16A16_SSCALED:

+      return MESA_FORMAT_RGBA_INT16;

+   case PIPE_FORMAT_R32G32B32A32_SSCALED:

+      return MESA_FORMAT_RGBA_INT32;

+

+   /* unsigned int formats */

+   case PIPE_FORMAT_R8G8B8A8_USCALED:

+      return MESA_FORMAT_RGBA_UINT8;

+   case PIPE_FORMAT_R16G16B16A16_USCALED:

+      return MESA_FORMAT_RGBA_UINT16;

+   case PIPE_FORMAT_R32G32B32A32_USCALED:

+      return MESA_FORMAT_RGBA_UINT32;

+

+   case PIPE_FORMAT_RGTC1_UNORM:

+      return MESA_FORMAT_RED_RGTC1;

+   case PIPE_FORMAT_RGTC1_SNORM:

+      return MESA_FORMAT_SIGNED_RED_RGTC1;

+   case PIPE_FORMAT_RGTC2_UNORM:

+      return MESA_FORMAT_RG_RGTC2;

+   case PIPE_FORMAT_RGTC2_SNORM:

+      return MESA_FORMAT_SIGNED_RG_RGTC2;

+

+   case PIPE_FORMAT_LATC1_UNORM:

+      return MESA_FORMAT_L_LATC1;

+   case PIPE_FORMAT_LATC1_SNORM:

+      return MESA_FORMAT_SIGNED_L_LATC1;

+   case PIPE_FORMAT_LATC2_UNORM:

+      return MESA_FORMAT_LA_LATC2;

+   case PIPE_FORMAT_LATC2_SNORM:

+      return MESA_FORMAT_SIGNED_LA_LATC2;

+

+   /* signed normalized formats */

+   case PIPE_FORMAT_R8_SNORM:

+      return MESA_FORMAT_SIGNED_R8;

+   case PIPE_FORMAT_R8G8_SNORM:

+      return MESA_FORMAT_SIGNED_RG88_REV;

+   case PIPE_FORMAT_R8G8B8A8_SNORM:

+      return MESA_FORMAT_SIGNED_RGBA8888_REV;

+

+   case PIPE_FORMAT_A8_SNORM:

+      return MESA_FORMAT_SIGNED_A8;

+   case PIPE_FORMAT_L8_SNORM:

+      return MESA_FORMAT_SIGNED_L8;

+   case PIPE_FORMAT_L8A8_SNORM:

+      return MESA_FORMAT_SIGNED_AL88;

+   case PIPE_FORMAT_I8_SNORM:

+      return MESA_FORMAT_SIGNED_I8;

+

+   case PIPE_FORMAT_R16_SNORM:

+      return MESA_FORMAT_SIGNED_R16;

+   case PIPE_FORMAT_R16G16_SNORM:

+      return MESA_FORMAT_SIGNED_GR1616;

+   case PIPE_FORMAT_R16G16B16A16_SNORM:

+      return MESA_FORMAT_SIGNED_RGBA_16;

+

+   case PIPE_FORMAT_A16_SNORM:

+      return MESA_FORMAT_SIGNED_A16;

+   case PIPE_FORMAT_L16_SNORM:

+      return MESA_FORMAT_SIGNED_L16;

+   case PIPE_FORMAT_L16A16_SNORM:

+      return MESA_FORMAT_SIGNED_AL1616;

+   case PIPE_FORMAT_I16_SNORM:

+      return MESA_FORMAT_SIGNED_I16;

+

+   default:

+      assert(0);

+      return MESA_FORMAT_NONE;

+   }

+}

+

+

+/**

+ * Return first supported format from the given list.

+ */

+static enum pipe_format

+find_supported_format(struct pipe_screen *screen, 

+                      const enum pipe_format formats[],

+                      uint num_formats,

+                      enum pipe_texture_target target,

+                      unsigned sample_count,

+                      unsigned tex_usage)

+{

+   uint i;

+   for (i = 0; i < num_formats; i++) {

+      if (screen->is_format_supported(screen, formats[i], target,

+                                      sample_count, tex_usage)) {

+         return formats[i];

+      }

+   }

+   return PIPE_FORMAT_NONE;

+}

+

+

+/**

+ * Find an RGBA format supported by the context/winsys.

+ */

+static enum pipe_format

+default_rgba_format(struct pipe_screen *screen, 

+                    enum pipe_texture_target target,

+                    unsigned sample_count,

+                    unsigned tex_usage)

+{

+   static const enum pipe_format colorFormats[] = {

+      PIPE_FORMAT_B8G8R8A8_UNORM,

+      PIPE_FORMAT_A8R8G8B8_UNORM,

+      PIPE_FORMAT_A8B8G8R8_UNORM,

+      PIPE_FORMAT_B5G6R5_UNORM

+   };

+   return find_supported_format(screen, colorFormats, Elements(colorFormats),

+                                target, sample_count, tex_usage);

+}

+

+

+/**

+ * Find an RGB format supported by the context/winsys.

+ */

+static enum pipe_format

+default_rgb_format(struct pipe_screen *screen, 

+                   enum pipe_texture_target target,

+                   unsigned sample_count,

+                   unsigned tex_usage)

+{

+   static const enum pipe_format colorFormats[] = {

+      PIPE_FORMAT_B8G8R8X8_UNORM,

+      PIPE_FORMAT_X8R8G8B8_UNORM,

+      PIPE_FORMAT_X8B8G8R8_UNORM,

+      PIPE_FORMAT_B8G8R8A8_UNORM,

+      PIPE_FORMAT_A8R8G8B8_UNORM,

+      PIPE_FORMAT_A8B8G8R8_UNORM,

+      PIPE_FORMAT_B5G6R5_UNORM

+   };

+   return find_supported_format(screen, colorFormats, Elements(colorFormats),

+                                target, sample_count, tex_usage);

+}

+

+/**

+ * Find an sRGBA format supported by the context/winsys.

+ */

+static enum pipe_format

+default_srgba_format(struct pipe_screen *screen, 

+                    enum pipe_texture_target target,

+                    unsigned sample_count,

+                    unsigned tex_usage)

+{

+   static const enum pipe_format colorFormats[] = {

+      PIPE_FORMAT_B8G8R8A8_SRGB,

+      PIPE_FORMAT_A8R8G8B8_SRGB,

+      PIPE_FORMAT_A8B8G8R8_SRGB,

+   };

+   return find_supported_format(screen, colorFormats, Elements(colorFormats),

+                                target, sample_count, tex_usage);

+}

+

+

+/**

+ * Given an OpenGL internalFormat value for a texture or surface, return

+ * the best matching PIPE_FORMAT_x, or PIPE_FORMAT_NONE if there's no match.

+ * This is called during glTexImage2D, for example.

+ *

+ * The bindings parameter typically has PIPE_BIND_SAMPLER_VIEW set, plus

+ * either PIPE_BINDING_RENDER_TARGET or PIPE_BINDING_DEPTH_STENCIL if

+ * we want render-to-texture ability.

+ *

+ * \param internalFormat  the user value passed to glTexImage2D

+ * \param target  one of PIPE_TEXTURE_x

+ * \param bindings  bitmask of PIPE_BIND_x flags.

+ */

+enum pipe_format

+st_choose_format(struct pipe_screen *screen, GLenum internalFormat,

+                 enum pipe_texture_target target, unsigned sample_count,

+                 unsigned bindings)

+{

+

+   switch (internalFormat) {

+   case GL_RGB10:

+   case GL_RGB10_A2:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B10G10R10A2_UNORM,

+                                       target, sample_count, bindings))

+         return PIPE_FORMAT_B10G10R10A2_UNORM;

+      /* Pass through. */

+   case 4:

+   case GL_RGBA:

+   case GL_RGBA8:

+      return default_rgba_format( screen, target, sample_count, bindings);

+

+   case GL_BGRA:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B8G8R8A8_UNORM,

+                                       target, sample_count, bindings))

+         return PIPE_FORMAT_B8G8R8A8_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings);

+

+   case 3:

+   case GL_RGB:

+   case GL_RGB8:

+      return default_rgb_format( screen, target, sample_count, bindings);

+

+   case GL_RGB12:

+   case GL_RGB16:

+   case GL_RGBA12:

+   case GL_RGBA16:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_R16G16B16A16_UNORM,

+                                             target, sample_count, bindings))

+         return PIPE_FORMAT_R16G16B16A16_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings);

+

+   case GL_RGBA4:

+   case GL_RGBA2:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B4G4R4A4_UNORM,

+                                       target, sample_count, bindings))

+         return PIPE_FORMAT_B4G4R4A4_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings);

+

+   case GL_RGB5_A1:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B5G5R5A1_UNORM,

+                                       target, sample_count, bindings))

+         return PIPE_FORMAT_B5G5R5A1_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings);

+

+   case GL_R3_G3_B2:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B2G3R3_UNORM,

+                                       target, sample_count, bindings))

+         return PIPE_FORMAT_B2G3R3_UNORM;

+      /* Pass through. */

+   case GL_RGB5:

+   case GL_RGB4:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B5G6R5_UNORM,

+                                       target, sample_count, bindings))

+         return PIPE_FORMAT_B5G6R5_UNORM;

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B5G5R5A1_UNORM,

+                                       target, sample_count, bindings))

+         return PIPE_FORMAT_B5G5R5A1_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings);

+

+   case GL_ALPHA12:

+   case GL_ALPHA16:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_A16_UNORM, target,

+                                       sample_count, bindings))

+         return PIPE_FORMAT_A16_UNORM;

+      /* Pass through. */

+   case GL_ALPHA:

+   case GL_ALPHA4:

+   case GL_ALPHA8:

+   case GL_COMPRESSED_ALPHA:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_A8_UNORM, target,

+                                       sample_count, bindings))

+         return PIPE_FORMAT_A8_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings);

+

+   case GL_LUMINANCE12:

+   case GL_LUMINANCE16:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_L16_UNORM, target,

+                                       sample_count, bindings))

+         return PIPE_FORMAT_L16_UNORM;

+      /* Pass through. */

+   case 1:

+   case GL_LUMINANCE:

+   case GL_LUMINANCE4:

+   case GL_LUMINANCE8:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_L8_UNORM, target,

+                                       sample_count, bindings))

+         return PIPE_FORMAT_L8_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings);

+

+   case GL_LUMINANCE12_ALPHA4:

+   case GL_LUMINANCE12_ALPHA12:

+   case GL_LUMINANCE16_ALPHA16:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_L16A16_UNORM, target,

+                                       sample_count, bindings))

+         return PIPE_FORMAT_L16A16_UNORM;

+      /* Pass through. */

+   case 2:

+   case GL_LUMINANCE_ALPHA:

+   case GL_LUMINANCE6_ALPHA2:

+   case GL_LUMINANCE8_ALPHA8:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_L8A8_UNORM, target,

+                                       sample_count, bindings))

+         return PIPE_FORMAT_L8A8_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings);

+

+   case GL_LUMINANCE4_ALPHA4:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_L4A4_UNORM, target,

+                                       sample_count, bindings))

+         return PIPE_FORMAT_L4A4_UNORM;

+      if (screen->is_format_supported( screen, PIPE_FORMAT_L8A8_UNORM, target,

+                                       sample_count, bindings))

+         return PIPE_FORMAT_L8A8_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings);

+

+   case GL_INTENSITY12:

+   case GL_INTENSITY16:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_I16_UNORM, target,

+                                       sample_count, bindings))

+         return PIPE_FORMAT_I16_UNORM;

+      /* Pass through. */

+   case GL_INTENSITY:

+   case GL_INTENSITY4:

+   case GL_INTENSITY8:

+   case GL_COMPRESSED_INTENSITY:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_I8_UNORM, target,

+                                       sample_count, bindings))

+         return PIPE_FORMAT_I8_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings);

+

+   case GL_YCBCR_MESA:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_UYVY, target,

+                                      sample_count, bindings)) {

+         return PIPE_FORMAT_UYVY;

+      }

+      if (screen->is_format_supported(screen, PIPE_FORMAT_YUYV, target,

+                                      sample_count, bindings)) {

+         return PIPE_FORMAT_YUYV;

+      }

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_RGB:

+      /* can only sample from compressed formats */

+      if (bindings & ~PIPE_BIND_SAMPLER_VIEW)

+         return PIPE_FORMAT_NONE;

+      else if (screen->is_format_supported(screen, PIPE_FORMAT_DXT1_RGB,

+                                           target, sample_count, bindings))

+         return PIPE_FORMAT_DXT1_RGB;

+      else

+         return default_rgb_format(screen, target, sample_count, bindings);

+

+   case GL_COMPRESSED_RGBA:

+      /* can only sample from compressed formats */

+      if (bindings & ~PIPE_BIND_SAMPLER_VIEW)

+         return PIPE_FORMAT_NONE;

+      else if (screen->is_format_supported(screen, PIPE_FORMAT_DXT3_RGBA,

+                                           target, sample_count, bindings))

+         return PIPE_FORMAT_DXT3_RGBA;

+      else

+         return default_rgba_format(screen, target, sample_count, bindings);

+

+   case GL_RGB_S3TC:

+   case GL_RGB4_S3TC:

+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT1_RGB,

+                                      target, sample_count, bindings))

+         return PIPE_FORMAT_DXT1_RGB;

+      else

+         return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT1_RGBA,

+                                      target, sample_count, bindings))

+         return PIPE_FORMAT_DXT1_RGBA;

+      else

+         return PIPE_FORMAT_NONE;

+

+   case GL_RGBA_S3TC:

+   case GL_RGBA4_S3TC:

+   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT3_RGBA,

+                                      target, sample_count, bindings))

+         return PIPE_FORMAT_DXT3_RGBA;

+      else

+         return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,

+                                      target, sample_count, bindings))

+         return PIPE_FORMAT_DXT5_RGBA;

+      else

+         return PIPE_FORMAT_NONE;

+

+#if 0

+   case GL_COMPRESSED_RGB_FXT1_3DFX:

+      return PIPE_FORMAT_RGB_FXT1;

+   case GL_COMPRESSED_RGBA_FXT1_3DFX:

+      return PIPE_FORMAT_RGB_FXT1;

+#endif

+

+   case GL_DEPTH_COMPONENT16:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_Z16_UNORM, target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_Z16_UNORM;

+      /* fall-through */

+   case GL_DEPTH_COMPONENT24:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,

+                                      target, sample_count, bindings))

+         return PIPE_FORMAT_Z24_UNORM_S8_USCALED;

+      if (screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,

+                                      target, sample_count, bindings))

+         return PIPE_FORMAT_S8_USCALED_Z24_UNORM;

+      /* fall-through */

+   case GL_DEPTH_COMPONENT32:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_Z32_UNORM, target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_Z32_UNORM;

+      /* fall-through */

+   case GL_DEPTH_COMPONENT:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_Z32_UNORM,

+            PIPE_FORMAT_Z24_UNORM_S8_USCALED,

+            PIPE_FORMAT_S8_USCALED_Z24_UNORM,

+            PIPE_FORMAT_Z16_UNORM

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+                                      target, sample_count, bindings);

+      }

+

+   case GL_STENCIL_INDEX:

+   case GL_STENCIL_INDEX1_EXT:

+   case GL_STENCIL_INDEX4_EXT:

+   case GL_STENCIL_INDEX8_EXT:

+   case GL_STENCIL_INDEX16_EXT:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_S8_USCALED,

+            PIPE_FORMAT_Z24_UNORM_S8_USCALED,

+            PIPE_FORMAT_S8_USCALED_Z24_UNORM

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+                                      target, sample_count, bindings);

+      }

+

+   case GL_DEPTH_STENCIL_EXT:

+   case GL_DEPTH24_STENCIL8_EXT:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_Z24_UNORM_S8_USCALED,

+            PIPE_FORMAT_S8_USCALED_Z24_UNORM

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+                                      target, sample_count, bindings);

+      }

+

+   case GL_SRGB_EXT:

+   case GL_SRGB8_EXT:

+   case GL_SRGB_ALPHA_EXT:

+   case GL_SRGB8_ALPHA8_EXT:

+      return default_srgba_format( screen, target, sample_count, bindings);

+

+   case GL_COMPRESSED_SRGB_EXT:

+   case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT1_SRGB, target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_DXT1_SRGB;

+      return default_srgba_format( screen, target, sample_count, bindings);

+

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:

+      return PIPE_FORMAT_DXT1_SRGBA;

+

+   case GL_COMPRESSED_SRGB_ALPHA_EXT:

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_DXT3_SRGBA, target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_DXT3_SRGBA;

+      return default_srgba_format( screen, target, sample_count, bindings);

+

+   case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:

+      return PIPE_FORMAT_DXT5_SRGBA;

+

+   case GL_SLUMINANCE_ALPHA_EXT:

+   case GL_SLUMINANCE8_ALPHA8_EXT:

+   case GL_COMPRESSED_SLUMINANCE_EXT:

+   case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_L8A8_SRGB, target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_L8A8_SRGB;

+      return default_srgba_format( screen, target, sample_count, bindings);

+

+   case GL_SLUMINANCE_EXT:

+   case GL_SLUMINANCE8_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_L8_SRGB, target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_L8_SRGB;

+      return default_srgba_format( screen, target, sample_count, bindings);

+

+   case GL_RED:

+   case GL_R8:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R8_UNORM, target,

+                                      sample_count, bindings))

+	      return PIPE_FORMAT_R8_UNORM;

+      return PIPE_FORMAT_NONE;

+   case GL_RG:

+   case GL_RG8:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM, target,

+                                      sample_count, bindings))

+	      return PIPE_FORMAT_R8G8_UNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_R16:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R16_UNORM, target,

+                                      sample_count, bindings))

+	      return PIPE_FORMAT_R16_UNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_RG16:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16_UNORM, target,

+                                      sample_count, bindings))

+	      return PIPE_FORMAT_R16G16_UNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_RED:

+   case GL_COMPRESSED_RED_RGTC1:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_UNORM, target,

+                                      sample_count, bindings))

+	      return PIPE_FORMAT_RGTC1_UNORM;

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R8_UNORM, target,

+                                      sample_count, bindings))

+	      return PIPE_FORMAT_R8_UNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_SIGNED_RED_RGTC1:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_SNORM, target,

+                                      sample_count, bindings))

+	      return PIPE_FORMAT_RGTC1_SNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_RG:

+   case GL_COMPRESSED_RG_RGTC2:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_UNORM, target,

+                                      sample_count, bindings))

+	      return PIPE_FORMAT_RGTC2_UNORM;

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM, target,

+                                      sample_count, bindings))

+	      return PIPE_FORMAT_R8G8_UNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_SIGNED_RG_RGTC2:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_SNORM, target,

+                                      sample_count, bindings))

+	      return PIPE_FORMAT_RGTC2_SNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_LUMINANCE:

+   case GL_COMPRESSED_LUMINANCE_LATC1_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_LATC1_UNORM, target,

+                                      sample_count, bindings))

+              return PIPE_FORMAT_LATC1_UNORM;

+      if (screen->is_format_supported(screen, PIPE_FORMAT_L8_UNORM, target,

+                                      sample_count, bindings))

+              return PIPE_FORMAT_L8_UNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_LATC1_SNORM, target,

+                                      sample_count, bindings))

+              return PIPE_FORMAT_LATC1_SNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_LUMINANCE_ALPHA:

+   case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:

+   case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_LATC2_UNORM, target,

+                                      sample_count, bindings))

+              return PIPE_FORMAT_LATC2_UNORM;

+      if (screen->is_format_supported(screen, PIPE_FORMAT_L8A8_UNORM, target,

+                                      sample_count, bindings))

+              return PIPE_FORMAT_L8A8_UNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_LATC2_SNORM, target,

+                                      sample_count, bindings))

+              return PIPE_FORMAT_LATC2_SNORM;

+      return PIPE_FORMAT_NONE;

+

+   /* signed/unsigned integer formats.

+    * XXX Mesa only has formats for RGBA signed/unsigned integer formats.

+    * If/when new formats are added this code should be updated.

+    */

+   case GL_RED_INTEGER_EXT:

+   case GL_GREEN_INTEGER_EXT:

+   case GL_BLUE_INTEGER_EXT:

+   case GL_ALPHA_INTEGER_EXT:

+   case GL_RGB_INTEGER_EXT:

+   case GL_RGBA_INTEGER_EXT:

+   case GL_BGR_INTEGER_EXT:

+   case GL_BGRA_INTEGER_EXT:

+   case GL_LUMINANCE_INTEGER_EXT:

+   case GL_LUMINANCE_ALPHA_INTEGER_EXT:

+      /* fall-through */

+   case GL_RGBA8I_EXT:

+   case GL_RGB8I_EXT:

+   case GL_ALPHA8I_EXT:

+   case GL_INTENSITY8I_EXT:

+   case GL_LUMINANCE8I_EXT:

+   case GL_LUMINANCE_ALPHA8I_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SSCALED,

+                                      target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_R8G8B8A8_SSCALED;

+      return PIPE_FORMAT_NONE;

+   case GL_RGBA16I_EXT:

+   case GL_RGB16I_EXT:

+   case GL_ALPHA16I_EXT:

+   case GL_INTENSITY16I_EXT:

+   case GL_LUMINANCE16I_EXT:

+   case GL_LUMINANCE_ALPHA16I_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_SSCALED,

+                                      target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_R16G16B16A16_SSCALED;

+      return PIPE_FORMAT_NONE;

+   case GL_RGBA32I_EXT:

+   case GL_RGB32I_EXT:

+   case GL_ALPHA32I_EXT:

+   case GL_INTENSITY32I_EXT:

+   case GL_LUMINANCE32I_EXT:

+   case GL_LUMINANCE_ALPHA32I_EXT:

+      /* xxx */

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_SSCALED,

+                                      target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_R32G32B32A32_SSCALED;

+      return PIPE_FORMAT_NONE;

+

+   case GL_RGBA8UI_EXT:

+   case GL_RGB8UI_EXT:

+   case GL_ALPHA8UI_EXT:

+   case GL_INTENSITY8UI_EXT:

+   case GL_LUMINANCE8UI_EXT:

+   case GL_LUMINANCE_ALPHA8UI_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_USCALED,

+                                      target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_R8G8B8A8_USCALED;

+      return PIPE_FORMAT_NONE;

+

+   case GL_RGBA16UI_EXT:

+   case GL_RGB16UI_EXT:

+   case GL_ALPHA16UI_EXT:

+   case GL_INTENSITY16UI_EXT:

+   case GL_LUMINANCE16UI_EXT:

+   case GL_LUMINANCE_ALPHA16UI_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_USCALED,

+                                      target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_R16G16B16A16_USCALED;

+      return PIPE_FORMAT_NONE;

+

+   case GL_RGBA32UI_EXT:

+   case GL_RGB32UI_EXT:

+   case GL_ALPHA32UI_EXT:

+   case GL_INTENSITY32UI_EXT:

+   case GL_LUMINANCE32UI_EXT:

+   case GL_LUMINANCE_ALPHA32UI_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R32G32B32A32_USCALED,

+                                      target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_R32G32B32A32_USCALED;

+      return PIPE_FORMAT_NONE;

+

+   /* signed normalized formats */

+   case GL_RED_SNORM:

+   case GL_R8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_R8_SNORM,

+            PIPE_FORMAT_R8G8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_R16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_R16_SNORM,

+            PIPE_FORMAT_R16G16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_R8_SNORM,

+            PIPE_FORMAT_R8G8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_RG_SNORM:

+   case GL_RG8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_R8G8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_RG16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_R16G16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_R8G8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_RGB_SNORM:

+   case GL_RGB8_SNORM:

+   case GL_RGBA_SNORM:

+   case GL_RGBA8_SNORM:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_SNORM,

+                                      target,

+                                      sample_count, bindings))

+         return PIPE_FORMAT_R8G8B8A8_SNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_RGB16_SNORM:

+   case GL_RGBA16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+

+   case GL_ALPHA_SNORM:

+   case GL_ALPHA8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_A8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_ALPHA16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_A16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_A8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_LUMINANCE_SNORM:

+   case GL_LUMINANCE8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_L8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_LUMINANCE16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_L16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_L8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_LUMINANCE_ALPHA_SNORM:

+   case GL_LUMINANCE8_ALPHA8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_L8A8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_LUMINANCE16_ALPHA16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_L16A16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_L8A8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_INTENSITY_SNORM:

+   case GL_INTENSITY8_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_I8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   case GL_INTENSITY16_SNORM:

+      {

+         static const enum pipe_format formats[] = {

+            PIPE_FORMAT_I16_SNORM,

+            PIPE_FORMAT_R16G16B16A16_SNORM,

+            PIPE_FORMAT_I8_SNORM,

+            PIPE_FORMAT_R8G8B8A8_SNORM,

+         };

+         return find_supported_format(screen, formats, Elements(formats),

+               target, sample_count, bindings);

+      }

+

+   default:

+      return PIPE_FORMAT_NONE;

+   }

+}

+

+

+/**

+ * Called by FBO code to choose a PIPE_FORMAT_ for drawing surfaces.

+ */

+enum pipe_format

+st_choose_renderbuffer_format(struct pipe_screen *screen,

+                              GLenum internalFormat, unsigned sample_count)

+{

+   uint usage;

+   if (_mesa_is_depth_or_stencil_format(internalFormat))

+      usage = PIPE_BIND_DEPTH_STENCIL;

+   else

+      usage = PIPE_BIND_RENDER_TARGET;

+   return st_choose_format(screen, internalFormat, PIPE_TEXTURE_2D,

+                           sample_count, usage);

+}

+

+

+/**

+ * Called via ctx->Driver.chooseTextureFormat().

+ */

+gl_format

+st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat,

+				  GLenum format, GLenum type, GLboolean renderable)

+{

+   struct pipe_screen *screen = st_context(ctx)->pipe->screen;

+   enum pipe_format pFormat;

+   uint bindings;

+

+   (void) format;

+   (void) type;

+

+   /* GL textures may wind up being render targets, but we don't know

+    * that in advance.  Specify potential render target flags now.

+    */

+   bindings = PIPE_BIND_SAMPLER_VIEW;

+   if (renderable == GL_TRUE) {

+      if (_mesa_is_depth_format(internalFormat) ||

+	  _mesa_is_depth_or_stencil_format(internalFormat))

+	 bindings |= PIPE_BIND_DEPTH_STENCIL;

+      else 

+	 bindings |= PIPE_BIND_RENDER_TARGET;

+   }

+

+   pFormat = st_choose_format(screen, internalFormat,

+                              PIPE_TEXTURE_2D, 0, bindings);

+

+   if (pFormat == PIPE_FORMAT_NONE) {

+      /* try choosing format again, this time without render target bindings */

+      pFormat = st_choose_format(screen, internalFormat,

+                                 PIPE_TEXTURE_2D, 0, PIPE_BIND_SAMPLER_VIEW);

+   }

+

+   if (pFormat == PIPE_FORMAT_NONE) {

+      /* no luck at all */

+      return MESA_FORMAT_NONE;

+   }

+

+   return st_pipe_format_to_mesa_format(pFormat);

+}

+

+gl_format

+st_ChooseTextureFormat(struct gl_context *ctx, GLint internalFormat,

+                       GLenum format, GLenum type)

+{

+   boolean want_renderable =

+      internalFormat == 3 || internalFormat == 4 ||

+      internalFormat == GL_RGB || internalFormat == GL_RGBA ||

+      internalFormat == GL_RGB8 || internalFormat == GL_RGBA8 ||

+      internalFormat == GL_BGRA;

+

+   return st_ChooseTextureFormat_renderable(ctx, internalFormat,

+					    format, type, want_renderable);

+}

+

+/**

+ * Test if a gallium format is equivalent to a GL format/type.

+ */

+GLboolean

+st_equal_formats(enum pipe_format pFormat, GLenum format, GLenum type)

+{

+   switch (pFormat) {

+   case PIPE_FORMAT_A8B8G8R8_UNORM:

+      return format == GL_RGBA && type == GL_UNSIGNED_BYTE;

+   case PIPE_FORMAT_A8R8G8B8_UNORM:

+      return format == GL_BGRA && type == GL_UNSIGNED_BYTE;

+   case PIPE_FORMAT_B5G6R5_UNORM:

+      return format == GL_RGB && type == GL_UNSIGNED_SHORT_5_6_5;

+   /* XXX more combos... */

+   default:

+      return GL_FALSE;

+   }

+}

+

+GLboolean

+st_sampler_compat_formats(enum pipe_format format1, enum pipe_format format2)

+{

+   if (format1 == format2)

+      return GL_TRUE;

+

+   if (format1 == PIPE_FORMAT_B8G8R8A8_UNORM &&

+       format2 == PIPE_FORMAT_B8G8R8X8_UNORM)

+      return GL_TRUE;

+

+   if (format1 == PIPE_FORMAT_B8G8R8X8_UNORM &&

+       format2 == PIPE_FORMAT_B8G8R8A8_UNORM)

+      return GL_TRUE;

+

+   if (format1 == PIPE_FORMAT_A8B8G8R8_UNORM &&

+       format2 == PIPE_FORMAT_X8B8G8R8_UNORM)

+      return GL_TRUE;

+

+   if (format1 == PIPE_FORMAT_X8B8G8R8_UNORM &&

+       format2 == PIPE_FORMAT_A8B8G8R8_UNORM)

+      return GL_TRUE;

+

+   if (format1 == PIPE_FORMAT_A8R8G8B8_UNORM &&

+       format2 == PIPE_FORMAT_X8R8G8B8_UNORM)

+      return GL_TRUE;

+

+   if (format1 == PIPE_FORMAT_X8R8G8B8_UNORM &&

+       format2 == PIPE_FORMAT_A8R8G8B8_UNORM)

+      return GL_TRUE;

+

+   return GL_FALSE;

+}

+

+

+

+/**

+ * This is used for translating texture border color and the clear

+ * color.  For example, the clear color is interpreted according to

+ * the renderbuffer's base format.  For example, if clearing a

+ * GL_LUMINANCE buffer, ClearColor[0] = luminance and ClearColor[1] =

+ * alpha.  Similarly for texture border colors.

+ */

+void

+st_translate_color(const GLfloat colorIn[4], GLenum baseFormat,

+                   GLfloat colorOut[4])

+{

+   switch (baseFormat) {

+   case GL_RED:

+      colorOut[0] = colorIn[0];

+      colorOut[1] = 0.0F;

+      colorOut[2] = 0.0F;

+      colorOut[3] = 1.0F;

+      break;

+   case GL_RG:

+      colorOut[0] = colorIn[0];

+      colorOut[1] = colorIn[1];

+      colorOut[2] = 0.0F;

+      colorOut[3] = 1.0F;

+      break;

+   case GL_RGB:

+      colorOut[0] = colorIn[0];

+      colorOut[1] = colorIn[1];

+      colorOut[2] = colorIn[2];

+      colorOut[3] = 1.0F;

+      break;

+   case GL_ALPHA:

+      colorOut[0] = colorOut[1] = colorOut[2] = 0.0;

+      colorOut[3] = colorIn[3];

+      break;

+   case GL_LUMINANCE:

+      colorOut[0] = colorOut[1] = colorOut[2] = colorIn[0];

+      colorOut[3] = 1.0;

+      break;

+   case GL_LUMINANCE_ALPHA:

+      colorOut[0] = colorOut[1] = colorOut[2] = colorIn[0];

+      colorOut[3] = colorIn[3];

+      break;

+   case GL_INTENSITY:

+      colorOut[0] = colorOut[1] = colorOut[2] = colorOut[3] = colorIn[0];

+      break;

+   default:

+      COPY_4V(colorOut, colorIn);

+   }

+}

diff --git a/mesalib/src/mesa/state_tracker/st_format.h b/mesalib/src/mesa/state_tracker/st_format.h
index 0fb570f6e..d31e60711 100644
--- a/mesalib/src/mesa/state_tracker/st_format.h
+++ b/mesalib/src/mesa/state_tracker/st_format.h
@@ -1,86 +1,86 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * Copyright (c) 2010 VMware, Inc.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
-
-#ifndef ST_FORMAT_H
-#define ST_FORMAT_H
-
-#include "main/formats.h"
-#include "main/glheader.h"
-
-#include "pipe/p_defines.h"
-#include "pipe/p_format.h"
-
-struct gl_context;
-struct pipe_screen;
-
-extern GLenum
-st_format_datatype(enum pipe_format format);
-
-
-extern enum pipe_format
-st_mesa_format_to_pipe_format(gl_format mesaFormat);
-
-extern gl_format
-st_pipe_format_to_mesa_format(enum pipe_format pipeFormat);
-
-
-extern enum pipe_format
-st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
-                 enum pipe_texture_target target, unsigned sample_count,
-                 unsigned tex_usage);
-
-extern enum pipe_format
-st_choose_renderbuffer_format(struct pipe_screen *screen,
-                              GLenum internalFormat, unsigned sample_count);
-
-
-gl_format
-st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat,
-				  GLenum format, GLenum type, GLboolean renderable);
-
-extern gl_format
-st_ChooseTextureFormat(struct gl_context * ctx, GLint internalFormat,
-                       GLenum format, GLenum type);
-
-
-extern GLboolean
-st_equal_formats(enum pipe_format pFormat, GLenum format, GLenum type);
-
-/* can we use a sampler view to translate these formats
-   only used to make TFP so far */
-extern GLboolean
-st_sampler_compat_formats(enum pipe_format format1, enum pipe_format format2);
-
-
-extern void
-st_translate_color(const GLfloat colorIn[4], GLenum baseFormat,
-                   GLfloat colorOut[4]);
-
-
-#endif /* ST_FORMAT_H */
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * Copyright (c) 2010 VMware, Inc.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_FORMAT_H

+#define ST_FORMAT_H

+

+#include "main/formats.h"

+#include "main/glheader.h"

+

+#include "pipe/p_defines.h"

+#include "pipe/p_format.h"

+

+struct gl_context;

+struct pipe_screen;

+

+extern GLenum

+st_format_datatype(enum pipe_format format);

+

+

+extern enum pipe_format

+st_mesa_format_to_pipe_format(gl_format mesaFormat);

+

+extern gl_format

+st_pipe_format_to_mesa_format(enum pipe_format pipeFormat);

+

+

+extern enum pipe_format

+st_choose_format(struct pipe_screen *screen, GLenum internalFormat,

+                 enum pipe_texture_target target, unsigned sample_count,

+                 unsigned tex_usage);

+

+extern enum pipe_format

+st_choose_renderbuffer_format(struct pipe_screen *screen,

+                              GLenum internalFormat, unsigned sample_count);

+

+

+gl_format

+st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat,

+				  GLenum format, GLenum type, GLboolean renderable);

+

+extern gl_format

+st_ChooseTextureFormat(struct gl_context * ctx, GLint internalFormat,

+                       GLenum format, GLenum type);

+

+

+extern GLboolean

+st_equal_formats(enum pipe_format pFormat, GLenum format, GLenum type);

+

+/* can we use a sampler view to translate these formats

+   only used to make TFP so far */

+extern GLboolean

+st_sampler_compat_formats(enum pipe_format format1, enum pipe_format format2);

+

+

+extern void

+st_translate_color(const GLfloat colorIn[4], GLenum baseFormat,

+                   GLfloat colorOut[4]);

+

+

+#endif /* ST_FORMAT_H */

diff --git a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
index c07739f9d..bf0bfd6df 100644
--- a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -1,1249 +1,1249 @@
-/**************************************************************************
- * 
- * Copyright 2007-2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
-/*
- * \author
- * Michal Krol,
- * Keith Whitwell
- */
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_context.h"
-#include "pipe/p_screen.h"
-#include "pipe/p_shader_tokens.h"
-#include "pipe/p_state.h"
-#include "tgsi/tgsi_ureg.h"
-#include "st_mesa_to_tgsi.h"
-#include "st_context.h"
-#include "program/prog_instruction.h"
-#include "program/prog_parameter.h"
-#include "util/u_debug.h"
-#include "util/u_math.h"
-#include "util/u_memory.h"
-
-
-#define PROGRAM_ANY_CONST ((1 << PROGRAM_LOCAL_PARAM) |  \
-                           (1 << PROGRAM_ENV_PARAM) |    \
-                           (1 << PROGRAM_STATE_VAR) |    \
-                           (1 << PROGRAM_NAMED_PARAM) |  \
-                           (1 << PROGRAM_CONSTANT) |     \
-                           (1 << PROGRAM_UNIFORM))
-
-
-struct label {
-   unsigned branch_target;
-   unsigned token;
-};
-
-
-/**
- * Intermediate state used during shader translation.
- */
-struct st_translate {
-   struct ureg_program *ureg;
-
-   struct ureg_dst temps[MAX_PROGRAM_TEMPS];
-   struct ureg_src *constants;
-   struct ureg_dst outputs[PIPE_MAX_SHADER_OUTPUTS];
-   struct ureg_src inputs[PIPE_MAX_SHADER_INPUTS];
-   struct ureg_dst address[1];
-   struct ureg_src samplers[PIPE_MAX_SAMPLERS];
-   struct ureg_src systemValues[SYSTEM_VALUE_MAX];
-
-   /* Extra info for handling point size clamping in vertex shader */
-   struct ureg_dst pointSizeResult; /**< Actual point size output register */
-   struct ureg_src pointSizeConst;  /**< Point size range constant register */
-   GLint pointSizeOutIndex;         /**< Temp point size output register */
-   GLboolean prevInstWrotePointSize;
-
-   const GLuint *inputMapping;
-   const GLuint *outputMapping;
-
-   /* For every instruction that contains a label (eg CALL), keep
-    * details so that we can go back afterwards and emit the correct
-    * tgsi instruction number for each label.
-    */
-   struct label *labels;
-   unsigned labels_size;
-   unsigned labels_count;
-
-   /* Keep a record of the tgsi instruction number that each mesa
-    * instruction starts at, will be used to fix up labels after
-    * translation.
-    */
-   unsigned *insn;
-   unsigned insn_size;
-   unsigned insn_count;
-
-   unsigned procType;  /**< TGSI_PROCESSOR_VERTEX/FRAGMENT */
-
-   boolean error;
-};
-
-
-/** Map Mesa's SYSTEM_VALUE_x to TGSI_SEMANTIC_x */
-static unsigned mesa_sysval_to_semantic[SYSTEM_VALUE_MAX] = {
-   TGSI_SEMANTIC_FACE,
-   TGSI_SEMANTIC_INSTANCEID
-};
-
-
-/**
- * Make note of a branch to a label in the TGSI code.
- * After we've emitted all instructions, we'll go over the list
- * of labels built here and patch the TGSI code with the actual
- * location of each label.
- */
-static unsigned *get_label( struct st_translate *t,
-                            unsigned branch_target )
-{
-   unsigned i;
-
-   if (t->labels_count + 1 >= t->labels_size) {
-      unsigned old_size = t->labels_size;
-      t->labels_size = 1 << (util_logbase2(t->labels_size) + 1);
-      t->labels = REALLOC( t->labels, 
-                           old_size * sizeof t->labels[0], 
-                           t->labels_size * sizeof t->labels[0] );
-      if (t->labels == NULL) {
-         static unsigned dummy;
-         t->error = TRUE;
-         return &dummy;
-      }
-   }
-
-   i = t->labels_count++;
-   t->labels[i].branch_target = branch_target;
-   return &t->labels[i].token;
-}
-
-
-/**
- * Called prior to emitting the TGSI code for each Mesa instruction.
- * Allocate additional space for instructions if needed.
- * Update the insn[] array so the next Mesa instruction points to
- * the next TGSI instruction.
- */
-static void set_insn_start( struct st_translate *t,
-                            unsigned start )
-{
-   if (t->insn_count + 1 >= t->insn_size) {
-      unsigned old_size = t->insn_size;
-      t->insn_size = 1 << (util_logbase2(t->insn_size) + 1);
-      t->insn = REALLOC( t->insn, 
-                         old_size * sizeof t->insn[0], 
-                         t->insn_size * sizeof t->insn[0] );
-      if (t->insn == NULL) {
-         t->error = TRUE;
-         return;
-      }
-   }
-
-   t->insn[t->insn_count++] = start;
-}
-
-
-/**
- * Map a Mesa dst register to a TGSI ureg_dst register.
- */
-static struct ureg_dst
-dst_register( struct st_translate *t,
-              gl_register_file file,
-              GLuint index )
-{
-   switch( file ) {
-   case PROGRAM_UNDEFINED:
-      return ureg_dst_undef();
-
-   case PROGRAM_TEMPORARY:
-      if (ureg_dst_is_undef(t->temps[index]))
-         t->temps[index] = ureg_DECL_temporary( t->ureg );
-
-      return t->temps[index];
-
-   case PROGRAM_OUTPUT:
-      if (t->procType == TGSI_PROCESSOR_VERTEX && index == VERT_RESULT_PSIZ)
-         t->prevInstWrotePointSize = GL_TRUE;
-
-      if (t->procType == TGSI_PROCESSOR_VERTEX)
-         assert(index < VERT_RESULT_MAX);
-      else if (t->procType == TGSI_PROCESSOR_FRAGMENT)
-         assert(index < FRAG_RESULT_MAX);
-      else
-         assert(index < GEOM_RESULT_MAX);
-
-      assert(t->outputMapping[index] < Elements(t->outputs));
-
-      return t->outputs[t->outputMapping[index]];
-
-   case PROGRAM_ADDRESS:
-      return t->address[index];
-
-   default:
-      debug_assert( 0 );
-      return ureg_dst_undef();
-   }
-}
-
-
-/**
- * Map a Mesa src register to a TGSI ureg_src register.
- */
-static struct ureg_src
-src_register( struct st_translate *t,
-              gl_register_file file,
-              GLint index )
-{
-   switch( file ) {
-   case PROGRAM_UNDEFINED:
-      return ureg_src_undef();
-
-   case PROGRAM_TEMPORARY:
-      assert(index >= 0);
-      assert(index < Elements(t->temps));
-      if (ureg_dst_is_undef(t->temps[index]))
-         t->temps[index] = ureg_DECL_temporary( t->ureg );
-      return ureg_src(t->temps[index]);
-
-   case PROGRAM_NAMED_PARAM:
-   case PROGRAM_ENV_PARAM:
-   case PROGRAM_LOCAL_PARAM:
-   case PROGRAM_UNIFORM:
-      assert(index >= 0);
-      return t->constants[index];
-   case PROGRAM_STATE_VAR:
-   case PROGRAM_CONSTANT:       /* ie, immediate */
-      if (index < 0)
-         return ureg_DECL_constant( t->ureg, 0 );
-      else
-         return t->constants[index];
-
-   case PROGRAM_INPUT:
-      assert(t->inputMapping[index] < Elements(t->inputs));
-      return t->inputs[t->inputMapping[index]];
-
-   case PROGRAM_OUTPUT:
-      assert(t->outputMapping[index] < Elements(t->outputs));
-      return ureg_src(t->outputs[t->outputMapping[index]]); /* not needed? */
-
-   case PROGRAM_ADDRESS:
-      return ureg_src(t->address[index]);
-
-   case PROGRAM_SYSTEM_VALUE:
-      assert(index < Elements(t->systemValues));
-      return t->systemValues[index];
-
-   default:
-      debug_assert( 0 );
-      return ureg_src_undef();
-   }
-}
-
-
-/**
- * Map mesa texture target to TGSI texture target.
- */
-static unsigned
-translate_texture_target( GLuint textarget,
-                          GLboolean shadow )
-{
-   if (shadow) {
-      switch( textarget ) {
-      case TEXTURE_1D_INDEX:   return TGSI_TEXTURE_SHADOW1D;
-      case TEXTURE_2D_INDEX:   return TGSI_TEXTURE_SHADOW2D;
-      case TEXTURE_RECT_INDEX: return TGSI_TEXTURE_SHADOWRECT;
-      default: break;
-      }
-   }
-
-   switch( textarget ) {
-   case TEXTURE_1D_INDEX:   return TGSI_TEXTURE_1D;
-   case TEXTURE_2D_INDEX:   return TGSI_TEXTURE_2D;
-   case TEXTURE_3D_INDEX:   return TGSI_TEXTURE_3D;
-   case TEXTURE_CUBE_INDEX: return TGSI_TEXTURE_CUBE;
-   case TEXTURE_RECT_INDEX: return TGSI_TEXTURE_RECT;
-   case TEXTURE_1D_ARRAY_INDEX:   return TGSI_TEXTURE_1D_ARRAY;
-   case TEXTURE_2D_ARRAY_INDEX:   return TGSI_TEXTURE_2D_ARRAY;
-   default:
-      debug_assert( 0 );
-      return TGSI_TEXTURE_1D;
-   }
-}
-
-
-/**
- * Create a TGSI ureg_dst register from a Mesa dest register.
- */
-static struct ureg_dst
-translate_dst( struct st_translate *t,
-               const struct prog_dst_register *DstReg,
-               boolean saturate )
-{
-   struct ureg_dst dst = dst_register( t, 
-                                       DstReg->File,
-                                       DstReg->Index );
-
-   dst = ureg_writemask( dst, 
-                         DstReg->WriteMask );
-   
-   if (saturate)
-      dst = ureg_saturate( dst );
-
-   if (DstReg->RelAddr)
-      dst = ureg_dst_indirect( dst, ureg_src(t->address[0]) );
-
-   return dst;
-}
-
-
-/**
- * Create a TGSI ureg_src register from a Mesa src register.
- */
-static struct ureg_src
-translate_src( struct st_translate *t,
-               const struct prog_src_register *SrcReg )
-{
-   struct ureg_src src = src_register( t, SrcReg->File, SrcReg->Index );
-
-   if (t->procType == TGSI_PROCESSOR_GEOMETRY && SrcReg->HasIndex2) {
-      src = src_register( t, SrcReg->File, SrcReg->Index2 );
-      if (SrcReg->RelAddr2)
-         src = ureg_src_dimension_indirect( src, ureg_src(t->address[0]),
-                                            SrcReg->Index);
-      else
-         src = ureg_src_dimension( src, SrcReg->Index);
-   }
-
-   src = ureg_swizzle( src,
-                       GET_SWZ( SrcReg->Swizzle, 0 ) & 0x3,
-                       GET_SWZ( SrcReg->Swizzle, 1 ) & 0x3,
-                       GET_SWZ( SrcReg->Swizzle, 2 ) & 0x3,
-                       GET_SWZ( SrcReg->Swizzle, 3 ) & 0x3);
-
-   if (SrcReg->Negate == NEGATE_XYZW)
-      src = ureg_negate(src);
-
-   if (SrcReg->Abs) 
-      src = ureg_abs(src);
-
-   if (SrcReg->RelAddr) {
-      src = ureg_src_indirect( src, ureg_src(t->address[0]));
-      if (SrcReg->File != PROGRAM_INPUT &&
-          SrcReg->File != PROGRAM_OUTPUT) {
-         /* If SrcReg->Index was negative, it was set to zero in
-          * src_register().  Reassign it now.  But don't do this
-          * for input/output regs since they get remapped while
-          * const buffers don't.
-          */
-         src.Index = SrcReg->Index;
-      }
-   }
-
-   return src;
-}
-
-
-static struct ureg_src swizzle_4v( struct ureg_src src,
-                                   const unsigned *swz )
-{
-   return ureg_swizzle( src, swz[0], swz[1], swz[2], swz[3] );
-}
-
-
-/**
- * Translate a SWZ instruction into a MOV, MUL or MAD instruction.  EG:
- *
- *   SWZ dst, src.x-y10 
- * 
- * becomes:
- *
- *   MAD dst {1,-1,0,0}, src.xyxx, {0,0,1,0}
- */
-static void emit_swz( struct st_translate *t,
-                      struct ureg_dst dst,
-                      const struct prog_src_register *SrcReg )
-{
-   struct ureg_program *ureg = t->ureg;
-   struct ureg_src src = src_register( t, SrcReg->File, SrcReg->Index );
-
-   unsigned negate_mask =  SrcReg->Negate;
-
-   unsigned one_mask = ((GET_SWZ(SrcReg->Swizzle, 0) == SWIZZLE_ONE) << 0 |
-                        (GET_SWZ(SrcReg->Swizzle, 1) == SWIZZLE_ONE) << 1 |
-                        (GET_SWZ(SrcReg->Swizzle, 2) == SWIZZLE_ONE) << 2 |
-                        (GET_SWZ(SrcReg->Swizzle, 3) == SWIZZLE_ONE) << 3);
-
-   unsigned zero_mask = ((GET_SWZ(SrcReg->Swizzle, 0) == SWIZZLE_ZERO) << 0 |
-                         (GET_SWZ(SrcReg->Swizzle, 1) == SWIZZLE_ZERO) << 1 |
-                         (GET_SWZ(SrcReg->Swizzle, 2) == SWIZZLE_ZERO) << 2 |
-                         (GET_SWZ(SrcReg->Swizzle, 3) == SWIZZLE_ZERO) << 3);
-
-   unsigned negative_one_mask = one_mask & negate_mask;
-   unsigned positive_one_mask = one_mask & ~negate_mask;
-   
-   struct ureg_src imm;
-   unsigned i;
-   unsigned mul_swizzle[4] = {0,0,0,0};
-   unsigned add_swizzle[4] = {0,0,0,0};
-   unsigned src_swizzle[4] = {0,0,0,0};
-   boolean need_add = FALSE;
-   boolean need_mul = FALSE;
-
-   if (dst.WriteMask == 0)
-      return;
-
-   /* Is this just a MOV?
-    */
-   if (zero_mask == 0 &&
-       one_mask == 0 &&
-       (negate_mask == 0 || negate_mask == TGSI_WRITEMASK_XYZW)) 
-   {
-      ureg_MOV( ureg, dst, translate_src( t, SrcReg ));
-      return;
-   }
-
-#define IMM_ZERO    0
-#define IMM_ONE     1
-#define IMM_NEG_ONE 2
-
-   imm = ureg_imm3f( ureg, 0, 1, -1 );
-
-   for (i = 0; i < 4; i++) {
-      unsigned bit = 1 << i;
-
-      if (dst.WriteMask & bit) {
-         if (positive_one_mask & bit) {
-            mul_swizzle[i] = IMM_ZERO;
-            add_swizzle[i] = IMM_ONE;
-            need_add = TRUE;
-         }
-         else if (negative_one_mask & bit) {
-            mul_swizzle[i] = IMM_ZERO;
-            add_swizzle[i] = IMM_NEG_ONE;
-            need_add = TRUE;
-         }
-         else if (zero_mask & bit) {
-            mul_swizzle[i] = IMM_ZERO;
-            add_swizzle[i] = IMM_ZERO;
-            need_add = TRUE;
-         }
-         else {
-            add_swizzle[i] = IMM_ZERO;
-            src_swizzle[i] = GET_SWZ(SrcReg->Swizzle, i);
-            need_mul = TRUE;
-            if (negate_mask & bit) {
-               mul_swizzle[i] = IMM_NEG_ONE;
-            }
-            else {
-               mul_swizzle[i] = IMM_ONE;
-            }
-         }
-      }
-   }
-
-   if (need_mul && need_add) {
-      ureg_MAD( ureg, 
-                dst,
-                swizzle_4v( src, src_swizzle ),
-                swizzle_4v( imm, mul_swizzle ),
-                swizzle_4v( imm, add_swizzle ) );
-   }
-   else if (need_mul) {
-      ureg_MUL( ureg, 
-                dst,
-                swizzle_4v( src, src_swizzle ),
-                swizzle_4v( imm, mul_swizzle ) );
-   }
-   else if (need_add) {
-      ureg_MOV( ureg, 
-                dst,
-                swizzle_4v( imm, add_swizzle ) );
-   }
-   else {
-      debug_assert(0);
-   }
-
-#undef IMM_ZERO
-#undef IMM_ONE
-#undef IMM_NEG_ONE
-}
-
-
-/**
- * Negate the value of DDY to match GL semantics where (0,0) is the
- * lower-left corner of the window.
- * Note that the GL_ARB_fragment_coord_conventions extension will
- * effect this someday.
- */
-static void emit_ddy( struct st_translate *t,
-                      struct ureg_dst dst,
-                      const struct prog_src_register *SrcReg )
-{
-   struct ureg_program *ureg = t->ureg;
-   struct ureg_src src = translate_src( t, SrcReg );
-   src = ureg_negate( src );
-   ureg_DDY( ureg, dst, src );
-}
-
-
-
-static unsigned
-translate_opcode( unsigned op )
-{
-   switch( op ) {
-   case OPCODE_ARL:
-      return TGSI_OPCODE_ARL;
-   case OPCODE_ABS:
-      return TGSI_OPCODE_ABS;
-   case OPCODE_ADD:
-      return TGSI_OPCODE_ADD;
-   case OPCODE_BGNLOOP:
-      return TGSI_OPCODE_BGNLOOP;
-   case OPCODE_BGNSUB:
-      return TGSI_OPCODE_BGNSUB;
-   case OPCODE_BRA:
-      return TGSI_OPCODE_BRA;
-   case OPCODE_BRK:
-      return TGSI_OPCODE_BRK;
-   case OPCODE_CAL:
-      return TGSI_OPCODE_CAL;
-   case OPCODE_CMP:
-      return TGSI_OPCODE_CMP;
-   case OPCODE_CONT:
-      return TGSI_OPCODE_CONT;
-   case OPCODE_COS:
-      return TGSI_OPCODE_COS;
-   case OPCODE_DDX:
-      return TGSI_OPCODE_DDX;
-   case OPCODE_DDY:
-      return TGSI_OPCODE_DDY;
-   case OPCODE_DP2:
-      return TGSI_OPCODE_DP2;
-   case OPCODE_DP2A:
-      return TGSI_OPCODE_DP2A;
-   case OPCODE_DP3:
-      return TGSI_OPCODE_DP3;
-   case OPCODE_DP4:
-      return TGSI_OPCODE_DP4;
-   case OPCODE_DPH:
-      return TGSI_OPCODE_DPH;
-   case OPCODE_DST:
-      return TGSI_OPCODE_DST;
-   case OPCODE_ELSE:
-      return TGSI_OPCODE_ELSE;
-   case OPCODE_EMIT_VERTEX:
-      return TGSI_OPCODE_EMIT;
-   case OPCODE_END_PRIMITIVE:
-      return TGSI_OPCODE_ENDPRIM;
-   case OPCODE_ENDIF:
-      return TGSI_OPCODE_ENDIF;
-   case OPCODE_ENDLOOP:
-      return TGSI_OPCODE_ENDLOOP;
-   case OPCODE_ENDSUB:
-      return TGSI_OPCODE_ENDSUB;
-   case OPCODE_EX2:
-      return TGSI_OPCODE_EX2;
-   case OPCODE_EXP:
-      return TGSI_OPCODE_EXP;
-   case OPCODE_FLR:
-      return TGSI_OPCODE_FLR;
-   case OPCODE_FRC:
-      return TGSI_OPCODE_FRC;
-   case OPCODE_IF:
-      return TGSI_OPCODE_IF;
-   case OPCODE_TRUNC:
-      return TGSI_OPCODE_TRUNC;
-   case OPCODE_KIL:
-      return TGSI_OPCODE_KIL;
-   case OPCODE_KIL_NV:
-      return TGSI_OPCODE_KILP;
-   case OPCODE_LG2:
-      return TGSI_OPCODE_LG2;
-   case OPCODE_LOG:
-      return TGSI_OPCODE_LOG;
-   case OPCODE_LIT:
-      return TGSI_OPCODE_LIT;
-   case OPCODE_LRP:
-      return TGSI_OPCODE_LRP;
-   case OPCODE_MAD:
-      return TGSI_OPCODE_MAD;
-   case OPCODE_MAX:
-      return TGSI_OPCODE_MAX;
-   case OPCODE_MIN:
-      return TGSI_OPCODE_MIN;
-   case OPCODE_MOV:
-      return TGSI_OPCODE_MOV;
-   case OPCODE_MUL:
-      return TGSI_OPCODE_MUL;
-   case OPCODE_NOP:
-      return TGSI_OPCODE_NOP;
-   case OPCODE_NRM3:
-      return TGSI_OPCODE_NRM;
-   case OPCODE_NRM4:
-      return TGSI_OPCODE_NRM4;
-   case OPCODE_POW:
-      return TGSI_OPCODE_POW;
-   case OPCODE_RCP:
-      return TGSI_OPCODE_RCP;
-   case OPCODE_RET:
-      return TGSI_OPCODE_RET;
-   case OPCODE_RSQ:
-      return TGSI_OPCODE_RSQ;
-   case OPCODE_SCS:
-      return TGSI_OPCODE_SCS;
-   case OPCODE_SEQ:
-      return TGSI_OPCODE_SEQ;
-   case OPCODE_SGE:
-      return TGSI_OPCODE_SGE;
-   case OPCODE_SGT:
-      return TGSI_OPCODE_SGT;
-   case OPCODE_SIN:
-      return TGSI_OPCODE_SIN;
-   case OPCODE_SLE:
-      return TGSI_OPCODE_SLE;
-   case OPCODE_SLT:
-      return TGSI_OPCODE_SLT;
-   case OPCODE_SNE:
-      return TGSI_OPCODE_SNE;
-   case OPCODE_SSG:
-      return TGSI_OPCODE_SSG;
-   case OPCODE_SUB:
-      return TGSI_OPCODE_SUB;
-   case OPCODE_TEX:
-      return TGSI_OPCODE_TEX;
-   case OPCODE_TXB:
-      return TGSI_OPCODE_TXB;
-   case OPCODE_TXD:
-      return TGSI_OPCODE_TXD;
-   case OPCODE_TXL:
-      return TGSI_OPCODE_TXL;
-   case OPCODE_TXP:
-      return TGSI_OPCODE_TXP;
-   case OPCODE_XPD:
-      return TGSI_OPCODE_XPD;
-   case OPCODE_END:
-      return TGSI_OPCODE_END;
-   default:
-      debug_assert( 0 );
-      return TGSI_OPCODE_NOP;
-   }
-}
-
-
-static void
-compile_instruction(
-   struct st_translate *t,
-   const struct prog_instruction *inst )
-{
-   struct ureg_program *ureg = t->ureg;
-   GLuint i;
-   struct ureg_dst dst[1];
-   struct ureg_src src[4];
-   unsigned num_dst;
-   unsigned num_src;
-
-   num_dst = _mesa_num_inst_dst_regs( inst->Opcode );
-   num_src = _mesa_num_inst_src_regs( inst->Opcode );
-
-   if (num_dst) 
-      dst[0] = translate_dst( t, 
-                              &inst->DstReg,
-                              inst->SaturateMode );
-
-   for (i = 0; i < num_src; i++) 
-      src[i] = translate_src( t, &inst->SrcReg[i] );
-
-   switch( inst->Opcode ) {
-   case OPCODE_SWZ:
-      emit_swz( t, dst[0], &inst->SrcReg[0] );
-      return;
-
-   case OPCODE_BGNLOOP:
-   case OPCODE_CAL:
-   case OPCODE_ELSE:
-   case OPCODE_ENDLOOP:
-   case OPCODE_IF:
-      debug_assert(num_dst == 0);
-      ureg_label_insn( ureg,
-                       translate_opcode( inst->Opcode ),
-                       src, num_src,
-                       get_label( t, inst->BranchTarget ));
-      return;
-
-   case OPCODE_TEX:
-   case OPCODE_TXB:
-   case OPCODE_TXD:
-   case OPCODE_TXL:
-   case OPCODE_TXP:
-      src[num_src++] = t->samplers[inst->TexSrcUnit];
-      ureg_tex_insn( ureg,
-                     translate_opcode( inst->Opcode ),
-                     dst, num_dst, 
-                     translate_texture_target( inst->TexSrcTarget,
-                                               inst->TexShadow ),
-                     src, num_src );
-      return;
-
-   case OPCODE_SCS:
-      dst[0] = ureg_writemask(dst[0], TGSI_WRITEMASK_XY );
-      ureg_insn( ureg, 
-                 translate_opcode( inst->Opcode ), 
-                 dst, num_dst, 
-                 src, num_src );
-      break;
-
-   case OPCODE_XPD:
-      dst[0] = ureg_writemask(dst[0], TGSI_WRITEMASK_XYZ );
-      ureg_insn( ureg, 
-                 translate_opcode( inst->Opcode ), 
-                 dst, num_dst, 
-                 src, num_src );
-      break;
-
-   case OPCODE_NOISE1:
-   case OPCODE_NOISE2:
-   case OPCODE_NOISE3:
-   case OPCODE_NOISE4:
-      /* At some point, a motivated person could add a better
-       * implementation of noise.  Currently not even the nvidia
-       * binary drivers do anything more than this.  In any case, the
-       * place to do this is in the GL state tracker, not the poor
-       * driver.
-       */
-      ureg_MOV( ureg, dst[0], ureg_imm1f(ureg, 0.5) );
-      break;
-		 
-   case OPCODE_DDY:
-      emit_ddy( t, dst[0], &inst->SrcReg[0] );
-      break;
-
-   default:
-      ureg_insn( ureg, 
-                 translate_opcode( inst->Opcode ), 
-                 dst, num_dst, 
-                 src, num_src );
-      break;
-   }
-}
-
-
-/**
- * Emit the TGSI instructions to adjust the WPOS pixel center convention
- * Basically, add (adjX, adjY) to the fragment position.
- */
-static void
-emit_adjusted_wpos( struct st_translate *t,
-                    const struct gl_program *program,
-                    GLfloat adjX, GLfloat adjY)
-{
-   struct ureg_program *ureg = t->ureg;
-   struct ureg_dst wpos_temp = ureg_DECL_temporary(ureg);
-   struct ureg_src wpos_input = t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]];
-
-   /* Note that we bias X and Y and pass Z and W through unchanged.
-    * The shader might also use gl_FragCoord.w and .z.
-    */
-   ureg_ADD(ureg, wpos_temp, wpos_input,
-            ureg_imm4f(ureg, adjX, adjY, 0.0f, 0.0f));
-
-   t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]] = ureg_src(wpos_temp);
-}
-
-
-/**
- * Emit the TGSI instructions for inverting the WPOS y coordinate.
- * This code is unavoidable because it also depends on whether
- * a FBO is bound (STATE_FB_WPOS_Y_TRANSFORM).
- */
-static void
-emit_wpos_inversion( struct st_translate *t,
-                     const struct gl_program *program,
-                     boolean invert)
-{
-   struct ureg_program *ureg = t->ureg;
-
-   /* Fragment program uses fragment position input.
-    * Need to replace instances of INPUT[WPOS] with temp T
-    * where T = INPUT[WPOS] by y is inverted.
-    */
-   static const gl_state_index wposTransformState[STATE_LENGTH]
-      = { STATE_INTERNAL, STATE_FB_WPOS_Y_TRANSFORM, 0, 0, 0 };
-   
-   /* XXX: note we are modifying the incoming shader here!  Need to
-    * do this before emitting the constant decls below, or this
-    * will be missed:
-    */
-   unsigned wposTransConst = _mesa_add_state_reference(program->Parameters,
-                                                       wposTransformState);
-
-   struct ureg_src wpostrans = ureg_DECL_constant( ureg, wposTransConst );
-   struct ureg_dst wpos_temp;
-   struct ureg_src wpos_input = t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]];
-
-   /* MOV wpos_temp, input[wpos]
-    */
-   if (wpos_input.File == TGSI_FILE_TEMPORARY)
-      wpos_temp = ureg_dst(wpos_input);
-   else {
-      wpos_temp = ureg_DECL_temporary( ureg );
-      ureg_MOV( ureg, wpos_temp, wpos_input );
-   }
-
-   if (invert) {
-      /* MAD wpos_temp.y, wpos_input, wpostrans.xxxx, wpostrans.yyyy
-       */
-      ureg_MAD( ureg,
-                ureg_writemask(wpos_temp, TGSI_WRITEMASK_Y ),
-                wpos_input,
-                ureg_scalar(wpostrans, 0),
-                ureg_scalar(wpostrans, 1));
-   } else {
-      /* MAD wpos_temp.y, wpos_input, wpostrans.zzzz, wpostrans.wwww
-       */
-      ureg_MAD( ureg,
-                ureg_writemask(wpos_temp, TGSI_WRITEMASK_Y ),
-                wpos_input,
-                ureg_scalar(wpostrans, 2),
-                ureg_scalar(wpostrans, 3));
-   }
-
-   /* Use wpos_temp as position input from here on:
-    */
-   t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]] = ureg_src(wpos_temp);
-}
-
-
-/**
- * Emit fragment position/ooordinate code.
- */
-static void
-emit_wpos(struct st_context *st,
-          struct st_translate *t,
-          const struct gl_program *program,
-          struct ureg_program *ureg)
-{
-   const struct gl_fragment_program *fp =
-      (const struct gl_fragment_program *) program;
-   struct pipe_screen *pscreen = st->pipe->screen;
-   boolean invert = FALSE;
-
-   if (fp->OriginUpperLeft) {
-      /* Fragment shader wants origin in upper-left */
-      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT)) {
-         /* the driver supports upper-left origin */
-      }
-      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT)) {
-         /* the driver supports lower-left origin, need to invert Y */
-         ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT);
-         invert = TRUE;
-      }
-      else
-         assert(0);
-   }
-   else {
-      /* Fragment shader wants origin in lower-left */
-      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT))
-         /* the driver supports lower-left origin */
-         ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT);
-      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT))
-         /* the driver supports upper-left origin, need to invert Y */
-         invert = TRUE;
-      else
-         assert(0);
-   }
-   
-   if (fp->PixelCenterInteger) {
-      /* Fragment shader wants pixel center integer */
-      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER))
-         /* the driver supports pixel center integer */
-         ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER);
-      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER))
-         /* the driver supports pixel center half integer, need to bias X,Y */
-         emit_adjusted_wpos(t, program, 0.5f, invert ? 0.5f : -0.5f);
-      else
-         assert(0);
-   }
-   else {
-      /* Fragment shader wants pixel center half integer */
-      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER)) {
-         /* the driver supports pixel center half integer */
-      }
-      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER)) {
-         /* the driver supports pixel center integer, need to bias X,Y */
-         ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER);
-         emit_adjusted_wpos(t, program, 0.5f, invert ? -0.5f : 0.5f);
-      }
-      else
-         assert(0);
-   }
-
-   /* we invert after adjustment so that we avoid the MOV to temporary,
-    * and reuse the adjustment ADD instead */
-   emit_wpos_inversion(t, program, invert);
-}
-
-
-/**
- * OpenGL's fragment gl_FrontFace input is 1 for front-facing, 0 for back.
- * TGSI uses +1 for front, -1 for back.
- * This function converts the TGSI value to the GL value.  Simply clamping/
- * saturating the value to [0,1] does the job.
- */
-static void
-emit_face_var( struct st_translate *t,
-               const struct gl_program *program )
-{
-   struct ureg_program *ureg = t->ureg;
-   struct ureg_dst face_temp = ureg_DECL_temporary( ureg );
-   struct ureg_src face_input = t->inputs[t->inputMapping[FRAG_ATTRIB_FACE]];
-
-   /* MOV_SAT face_temp, input[face]
-    */
-   face_temp = ureg_saturate( face_temp );
-   ureg_MOV( ureg, face_temp, face_input );
-
-   /* Use face_temp as face input from here on:
-    */
-   t->inputs[t->inputMapping[FRAG_ATTRIB_FACE]] = ureg_src(face_temp);
-}
-
-
-static void
-emit_edgeflags( struct st_translate *t,
-                 const struct gl_program *program )
-{
-   struct ureg_program *ureg = t->ureg;
-   struct ureg_dst edge_dst = t->outputs[t->outputMapping[VERT_RESULT_EDGE]];
-   struct ureg_src edge_src = t->inputs[t->inputMapping[VERT_ATTRIB_EDGEFLAG]];
-
-   ureg_MOV( ureg, edge_dst, edge_src );
-}
-
-
-/**
- * Translate Mesa program to TGSI format.
- * \param program  the program to translate
- * \param numInputs  number of input registers used
- * \param inputMapping  maps Mesa fragment program inputs to TGSI generic
- *                      input indexes
- * \param inputSemanticName  the TGSI_SEMANTIC flag for each input
- * \param inputSemanticIndex  the semantic index (ex: which texcoord) for
- *                            each input
- * \param interpMode  the TGSI_INTERPOLATE_LINEAR/PERSP mode for each input
- * \param numOutputs  number of output registers used
- * \param outputMapping  maps Mesa fragment program outputs to TGSI
- *                       generic outputs
- * \param outputSemanticName  the TGSI_SEMANTIC flag for each output
- * \param outputSemanticIndex  the semantic index (ex: which texcoord) for
- *                             each output
- *
- * \return  PIPE_OK or PIPE_ERROR_OUT_OF_MEMORY
- */
-enum pipe_error
-st_translate_mesa_program(
-   struct gl_context *ctx,
-   uint procType,
-   struct ureg_program *ureg,
-   const struct gl_program *program,
-   GLuint numInputs,
-   const GLuint inputMapping[],
-   const ubyte inputSemanticName[],
-   const ubyte inputSemanticIndex[],
-   const GLuint interpMode[],
-   GLuint numOutputs,
-   const GLuint outputMapping[],
-   const ubyte outputSemanticName[],
-   const ubyte outputSemanticIndex[],
-   boolean passthrough_edgeflags )
-{
-   struct st_translate translate, *t;
-   unsigned i;
-   enum pipe_error ret = PIPE_OK;
-
-   assert(numInputs <= Elements(t->inputs));
-   assert(numOutputs <= Elements(t->outputs));
-
-   t = &translate;
-   memset(t, 0, sizeof *t);
-
-   t->procType = procType;
-   t->inputMapping = inputMapping;
-   t->outputMapping = outputMapping;
-   t->ureg = ureg;
-   t->pointSizeOutIndex = -1;
-   t->prevInstWrotePointSize = GL_FALSE;
-
-   /*_mesa_print_program(program);*/
-
-   /*
-    * Declare input attributes.
-    */
-   if (procType == TGSI_PROCESSOR_FRAGMENT) {
-      for (i = 0; i < numInputs; i++) {
-         if (program->InputFlags[0] & PROG_PARAM_BIT_CYL_WRAP) {
-            t->inputs[i] = ureg_DECL_fs_input_cyl(ureg,
-                                                  inputSemanticName[i],
-                                                  inputSemanticIndex[i],
-                                                  interpMode[i],
-                                                  TGSI_CYLINDRICAL_WRAP_X);
-         }
-         else {
-            t->inputs[i] = ureg_DECL_fs_input(ureg,
-                                              inputSemanticName[i],
-                                              inputSemanticIndex[i],
-                                              interpMode[i]);
-         }
-      }
-
-      if (program->InputsRead & FRAG_BIT_WPOS) {
-         /* Must do this after setting up t->inputs, and before
-          * emitting constant references, below:
-          */
-         emit_wpos(st_context(ctx), t, program, ureg);
-      }
-
-      if (program->InputsRead & FRAG_BIT_FACE) {
-         emit_face_var( t, program );
-      }
-
-      /*
-       * Declare output attributes.
-       */
-      for (i = 0; i < numOutputs; i++) {
-         switch (outputSemanticName[i]) {
-         case TGSI_SEMANTIC_POSITION:
-            t->outputs[i] = ureg_DECL_output( ureg,
-                                              TGSI_SEMANTIC_POSITION, /* Z / Depth */
-                                              outputSemanticIndex[i] );
-
-            t->outputs[i] = ureg_writemask( t->outputs[i],
-                                            TGSI_WRITEMASK_Z );
-            break;
-         case TGSI_SEMANTIC_STENCIL:
-            t->outputs[i] = ureg_DECL_output( ureg,
-                                              TGSI_SEMANTIC_STENCIL, /* Stencil */
-                                              outputSemanticIndex[i] );
-            t->outputs[i] = ureg_writemask( t->outputs[i],
-                                            TGSI_WRITEMASK_Y );
-            break;
-         case TGSI_SEMANTIC_COLOR:
-            t->outputs[i] = ureg_DECL_output( ureg,
-                                              TGSI_SEMANTIC_COLOR,
-                                              outputSemanticIndex[i] );
-            break;
-         default:
-            debug_assert(0);
-            return 0;
-         }
-      }
-   }
-   else if (procType == TGSI_PROCESSOR_GEOMETRY) {
-      for (i = 0; i < numInputs; i++) {
-         t->inputs[i] = ureg_DECL_gs_input(ureg,
-                                           i,
-                                           inputSemanticName[i],
-                                           inputSemanticIndex[i]);
-      }
-
-      for (i = 0; i < numOutputs; i++) {
-         t->outputs[i] = ureg_DECL_output( ureg,
-                                           outputSemanticName[i],
-                                           outputSemanticIndex[i] );
-      }
-   }
-   else {
-      assert(procType == TGSI_PROCESSOR_VERTEX);
-
-      for (i = 0; i < numInputs; i++) {
-         t->inputs[i] = ureg_DECL_vs_input(ureg, i);
-      }
-
-      for (i = 0; i < numOutputs; i++) {
-         t->outputs[i] = ureg_DECL_output( ureg,
-                                           outputSemanticName[i],
-                                           outputSemanticIndex[i] );
-         if ((outputSemanticName[i] == TGSI_SEMANTIC_PSIZE) && program->Id) {
-            /* Writing to the point size result register requires special
-             * handling to implement clamping.
-             */
-            static const gl_state_index pointSizeClampState[STATE_LENGTH]
-               = { STATE_INTERNAL, STATE_POINT_SIZE_IMPL_CLAMP, 0, 0, 0 };
-               /* XXX: note we are modifying the incoming shader here!  Need to
-               * do this before emitting the constant decls below, or this
-               * will be missed:
-               */
-            unsigned pointSizeClampConst =
-               _mesa_add_state_reference(program->Parameters,
-                                         pointSizeClampState);
-            struct ureg_dst psizregtemp = ureg_DECL_temporary( ureg );
-            t->pointSizeConst = ureg_DECL_constant( ureg, pointSizeClampConst );
-            t->pointSizeResult = t->outputs[i];
-            t->pointSizeOutIndex = i;
-            t->outputs[i] = psizregtemp;
-         }
-      }
-      if (passthrough_edgeflags)
-         emit_edgeflags( t, program );
-   }
-
-   /* Declare address register.
-    */
-   if (program->NumAddressRegs > 0) {
-      debug_assert( program->NumAddressRegs == 1 );
-      t->address[0] = ureg_DECL_address( ureg );
-   }
-
-   /* Declare misc input registers
-    */
-   {
-      GLbitfield sysInputs = program->SystemValuesRead;
-      unsigned numSys = 0;
-      for (i = 0; sysInputs; i++) {
-         if (sysInputs & (1 << i)) {
-            unsigned semName = mesa_sysval_to_semantic[i];
-            t->systemValues[i] = ureg_DECL_system_value(ureg, numSys, semName, 0);
-            numSys++;
-            sysInputs &= ~(1 << i);
-         }
-      }
-   }
-
-   if (program->IndirectRegisterFiles & (1 << PROGRAM_TEMPORARY)) {
-      /* If temps are accessed with indirect addressing, declare temporaries
-       * in sequential order.  Else, we declare them on demand elsewhere.
-       */
-      for (i = 0; i < program->NumTemporaries; i++) {
-         /* XXX use TGSI_FILE_TEMPORARY_ARRAY when it's supported by ureg */
-         t->temps[i] = ureg_DECL_temporary( t->ureg );
-      }
-   }
-
-   /* Emit constants and immediates.  Mesa uses a single index space
-    * for these, so we put all the translated regs in t->constants.
-    */
-   if (program->Parameters) {
-      t->constants = CALLOC( program->Parameters->NumParameters,
-                             sizeof t->constants[0] );
-      if (t->constants == NULL) {
-         ret = PIPE_ERROR_OUT_OF_MEMORY;
-         goto out;
-      }
-
-      for (i = 0; i < program->Parameters->NumParameters; i++) {
-         switch (program->Parameters->Parameters[i].Type) {
-         case PROGRAM_ENV_PARAM:
-         case PROGRAM_LOCAL_PARAM:
-         case PROGRAM_STATE_VAR:
-         case PROGRAM_NAMED_PARAM:
-         case PROGRAM_UNIFORM:
-            t->constants[i] = ureg_DECL_constant( ureg, i );
-            break;
-
-            /* Emit immediates only when there's no indirect addressing of
-             * the const buffer.
-             * FIXME: Be smarter and recognize param arrays:
-             * indirect addressing is only valid within the referenced
-             * array.
-             */
-         case PROGRAM_CONSTANT:
-            if (program->IndirectRegisterFiles & PROGRAM_ANY_CONST)
-               t->constants[i] = ureg_DECL_constant( ureg, i );
-            else
-               t->constants[i] = 
-                  ureg_DECL_immediate( ureg,
-                                       program->Parameters->ParameterValues[i],
-                                       4 );
-            break;
-         default:
-            break;
-         }
-      }
-   }
-
-   /* texture samplers */
-   for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
-      if (program->SamplersUsed & (1 << i)) {
-         t->samplers[i] = ureg_DECL_sampler( ureg, i );
-      }
-   }
-
-   /* Emit each instruction in turn:
-    */
-   for (i = 0; i < program->NumInstructions; i++) {
-      set_insn_start( t, ureg_get_instruction_number( ureg ));
-      compile_instruction( t, &program->Instructions[i] );
-
-      if (t->prevInstWrotePointSize && program->Id) {
-         /* The previous instruction wrote to the (fake) vertex point size
-          * result register.  Now we need to clamp that value to the min/max
-          * point size range, putting the result into the real point size
-          * register.
-          * Note that we can't do this easily at the end of program due to
-          * possible early return.
-          */
-         set_insn_start( t, ureg_get_instruction_number( ureg ));
-         ureg_MAX( t->ureg,
-                   ureg_writemask(t->outputs[t->pointSizeOutIndex], WRITEMASK_X),
-                   ureg_src(t->outputs[t->pointSizeOutIndex]),
-                   ureg_swizzle(t->pointSizeConst, 1,1,1,1));
-         ureg_MIN( t->ureg, ureg_writemask(t->pointSizeResult, WRITEMASK_X),
-                   ureg_src(t->outputs[t->pointSizeOutIndex]),
-                   ureg_swizzle(t->pointSizeConst, 2,2,2,2));
-      }
-      t->prevInstWrotePointSize = GL_FALSE;
-   }
-
-   /* Fix up all emitted labels:
-    */
-   for (i = 0; i < t->labels_count; i++) {
-      ureg_fixup_label( ureg,
-                        t->labels[i].token,
-                        t->insn[t->labels[i].branch_target] );
-   }
-
-out:
-   FREE(t->insn);
-   FREE(t->labels);
-   FREE(t->constants);
-
-   if (t->error) {
-      debug_printf("%s: translate error flag set\n", __FUNCTION__);
-   }
-
-   return ret;
-}
-
-
-/**
- * Tokens cannot be free with free otherwise the builtin gallium
- * malloc debugging will get confused.
- */
-void
-st_free_tokens(const struct tgsi_token *tokens)
-{
-   FREE((void *)tokens);
-}
+/**************************************************************************

+ * 

+ * Copyright 2007-2008 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+/*

+ * \author

+ * Michal Krol,

+ * Keith Whitwell

+ */

+

+#include "pipe/p_compiler.h"

+#include "pipe/p_context.h"

+#include "pipe/p_screen.h"

+#include "pipe/p_shader_tokens.h"

+#include "pipe/p_state.h"

+#include "tgsi/tgsi_ureg.h"

+#include "st_mesa_to_tgsi.h"

+#include "st_context.h"

+#include "program/prog_instruction.h"

+#include "program/prog_parameter.h"

+#include "util/u_debug.h"

+#include "util/u_math.h"

+#include "util/u_memory.h"

+

+

+#define PROGRAM_ANY_CONST ((1 << PROGRAM_LOCAL_PARAM) |  \

+                           (1 << PROGRAM_ENV_PARAM) |    \

+                           (1 << PROGRAM_STATE_VAR) |    \

+                           (1 << PROGRAM_NAMED_PARAM) |  \

+                           (1 << PROGRAM_CONSTANT) |     \

+                           (1 << PROGRAM_UNIFORM))

+

+

+struct label {

+   unsigned branch_target;

+   unsigned token;

+};

+

+

+/**

+ * Intermediate state used during shader translation.

+ */

+struct st_translate {

+   struct ureg_program *ureg;

+

+   struct ureg_dst temps[MAX_PROGRAM_TEMPS];

+   struct ureg_src *constants;

+   struct ureg_dst outputs[PIPE_MAX_SHADER_OUTPUTS];

+   struct ureg_src inputs[PIPE_MAX_SHADER_INPUTS];

+   struct ureg_dst address[1];

+   struct ureg_src samplers[PIPE_MAX_SAMPLERS];

+   struct ureg_src systemValues[SYSTEM_VALUE_MAX];

+

+   /* Extra info for handling point size clamping in vertex shader */

+   struct ureg_dst pointSizeResult; /**< Actual point size output register */

+   struct ureg_src pointSizeConst;  /**< Point size range constant register */

+   GLint pointSizeOutIndex;         /**< Temp point size output register */

+   GLboolean prevInstWrotePointSize;

+

+   const GLuint *inputMapping;

+   const GLuint *outputMapping;

+

+   /* For every instruction that contains a label (eg CALL), keep

+    * details so that we can go back afterwards and emit the correct

+    * tgsi instruction number for each label.

+    */

+   struct label *labels;

+   unsigned labels_size;

+   unsigned labels_count;

+

+   /* Keep a record of the tgsi instruction number that each mesa

+    * instruction starts at, will be used to fix up labels after

+    * translation.

+    */

+   unsigned *insn;

+   unsigned insn_size;

+   unsigned insn_count;

+

+   unsigned procType;  /**< TGSI_PROCESSOR_VERTEX/FRAGMENT */

+

+   boolean error;

+};

+

+

+/** Map Mesa's SYSTEM_VALUE_x to TGSI_SEMANTIC_x */

+static unsigned mesa_sysval_to_semantic[SYSTEM_VALUE_MAX] = {

+   TGSI_SEMANTIC_FACE,

+   TGSI_SEMANTIC_INSTANCEID

+};

+

+

+/**

+ * Make note of a branch to a label in the TGSI code.

+ * After we've emitted all instructions, we'll go over the list

+ * of labels built here and patch the TGSI code with the actual

+ * location of each label.

+ */

+static unsigned *get_label( struct st_translate *t,

+                            unsigned branch_target )

+{

+   unsigned i;

+

+   if (t->labels_count + 1 >= t->labels_size) {

+      unsigned old_size = t->labels_size;

+      t->labels_size = 1 << (util_logbase2(t->labels_size) + 1);

+      t->labels = REALLOC( t->labels, 

+                           old_size * sizeof t->labels[0], 

+                           t->labels_size * sizeof t->labels[0] );

+      if (t->labels == NULL) {

+         static unsigned dummy;

+         t->error = TRUE;

+         return &dummy;

+      }

+   }

+

+   i = t->labels_count++;

+   t->labels[i].branch_target = branch_target;

+   return &t->labels[i].token;

+}

+

+

+/**

+ * Called prior to emitting the TGSI code for each Mesa instruction.

+ * Allocate additional space for instructions if needed.

+ * Update the insn[] array so the next Mesa instruction points to

+ * the next TGSI instruction.

+ */

+static void set_insn_start( struct st_translate *t,

+                            unsigned start )

+{

+   if (t->insn_count + 1 >= t->insn_size) {

+      unsigned old_size = t->insn_size;

+      t->insn_size = 1 << (util_logbase2(t->insn_size) + 1);

+      t->insn = REALLOC( t->insn, 

+                         old_size * sizeof t->insn[0], 

+                         t->insn_size * sizeof t->insn[0] );

+      if (t->insn == NULL) {

+         t->error = TRUE;

+         return;

+      }

+   }

+

+   t->insn[t->insn_count++] = start;

+}

+

+

+/**

+ * Map a Mesa dst register to a TGSI ureg_dst register.

+ */

+static struct ureg_dst

+dst_register( struct st_translate *t,

+              gl_register_file file,

+              GLuint index )

+{

+   switch( file ) {

+   case PROGRAM_UNDEFINED:

+      return ureg_dst_undef();

+

+   case PROGRAM_TEMPORARY:

+      if (ureg_dst_is_undef(t->temps[index]))

+         t->temps[index] = ureg_DECL_temporary( t->ureg );

+

+      return t->temps[index];

+

+   case PROGRAM_OUTPUT:

+      if (t->procType == TGSI_PROCESSOR_VERTEX && index == VERT_RESULT_PSIZ)

+         t->prevInstWrotePointSize = GL_TRUE;

+

+      if (t->procType == TGSI_PROCESSOR_VERTEX)

+         assert(index < VERT_RESULT_MAX);

+      else if (t->procType == TGSI_PROCESSOR_FRAGMENT)

+         assert(index < FRAG_RESULT_MAX);

+      else

+         assert(index < GEOM_RESULT_MAX);

+

+      assert(t->outputMapping[index] < Elements(t->outputs));

+

+      return t->outputs[t->outputMapping[index]];

+

+   case PROGRAM_ADDRESS:

+      return t->address[index];

+

+   default:

+      debug_assert( 0 );

+      return ureg_dst_undef();

+   }

+}

+

+

+/**

+ * Map a Mesa src register to a TGSI ureg_src register.

+ */

+static struct ureg_src

+src_register( struct st_translate *t,

+              gl_register_file file,

+              GLint index )

+{

+   switch( file ) {

+   case PROGRAM_UNDEFINED:

+      return ureg_src_undef();

+

+   case PROGRAM_TEMPORARY:

+      assert(index >= 0);

+      assert(index < Elements(t->temps));

+      if (ureg_dst_is_undef(t->temps[index]))

+         t->temps[index] = ureg_DECL_temporary( t->ureg );

+      return ureg_src(t->temps[index]);

+

+   case PROGRAM_NAMED_PARAM:

+   case PROGRAM_ENV_PARAM:

+   case PROGRAM_LOCAL_PARAM:

+   case PROGRAM_UNIFORM:

+      assert(index >= 0);

+      return t->constants[index];

+   case PROGRAM_STATE_VAR:

+   case PROGRAM_CONSTANT:       /* ie, immediate */

+      if (index < 0)

+         return ureg_DECL_constant( t->ureg, 0 );

+      else

+         return t->constants[index];

+

+   case PROGRAM_INPUT:

+      assert(t->inputMapping[index] < Elements(t->inputs));

+      return t->inputs[t->inputMapping[index]];

+

+   case PROGRAM_OUTPUT:

+      assert(t->outputMapping[index] < Elements(t->outputs));

+      return ureg_src(t->outputs[t->outputMapping[index]]); /* not needed? */

+

+   case PROGRAM_ADDRESS:

+      return ureg_src(t->address[index]);

+

+   case PROGRAM_SYSTEM_VALUE:

+      assert(index < Elements(t->systemValues));

+      return t->systemValues[index];

+

+   default:

+      debug_assert( 0 );

+      return ureg_src_undef();

+   }

+}

+

+

+/**

+ * Map mesa texture target to TGSI texture target.

+ */

+static unsigned

+translate_texture_target( GLuint textarget,

+                          GLboolean shadow )

+{

+   if (shadow) {

+      switch( textarget ) {

+      case TEXTURE_1D_INDEX:   return TGSI_TEXTURE_SHADOW1D;

+      case TEXTURE_2D_INDEX:   return TGSI_TEXTURE_SHADOW2D;

+      case TEXTURE_RECT_INDEX: return TGSI_TEXTURE_SHADOWRECT;

+      default: break;

+      }

+   }

+

+   switch( textarget ) {

+   case TEXTURE_1D_INDEX:   return TGSI_TEXTURE_1D;

+   case TEXTURE_2D_INDEX:   return TGSI_TEXTURE_2D;

+   case TEXTURE_3D_INDEX:   return TGSI_TEXTURE_3D;

+   case TEXTURE_CUBE_INDEX: return TGSI_TEXTURE_CUBE;

+   case TEXTURE_RECT_INDEX: return TGSI_TEXTURE_RECT;

+   case TEXTURE_1D_ARRAY_INDEX:   return TGSI_TEXTURE_1D_ARRAY;

+   case TEXTURE_2D_ARRAY_INDEX:   return TGSI_TEXTURE_2D_ARRAY;

+   default:

+      debug_assert( 0 );

+      return TGSI_TEXTURE_1D;

+   }

+}

+

+

+/**

+ * Create a TGSI ureg_dst register from a Mesa dest register.

+ */

+static struct ureg_dst

+translate_dst( struct st_translate *t,

+               const struct prog_dst_register *DstReg,

+               boolean saturate )

+{

+   struct ureg_dst dst = dst_register( t, 

+                                       DstReg->File,

+                                       DstReg->Index );

+

+   dst = ureg_writemask( dst, 

+                         DstReg->WriteMask );

+   

+   if (saturate)

+      dst = ureg_saturate( dst );

+

+   if (DstReg->RelAddr)

+      dst = ureg_dst_indirect( dst, ureg_src(t->address[0]) );

+

+   return dst;

+}

+

+

+/**

+ * Create a TGSI ureg_src register from a Mesa src register.

+ */

+static struct ureg_src

+translate_src( struct st_translate *t,

+               const struct prog_src_register *SrcReg )

+{

+   struct ureg_src src = src_register( t, SrcReg->File, SrcReg->Index );

+

+   if (t->procType == TGSI_PROCESSOR_GEOMETRY && SrcReg->HasIndex2) {

+      src = src_register( t, SrcReg->File, SrcReg->Index2 );

+      if (SrcReg->RelAddr2)

+         src = ureg_src_dimension_indirect( src, ureg_src(t->address[0]),

+                                            SrcReg->Index);

+      else

+         src = ureg_src_dimension( src, SrcReg->Index);

+   }

+

+   src = ureg_swizzle( src,

+                       GET_SWZ( SrcReg->Swizzle, 0 ) & 0x3,

+                       GET_SWZ( SrcReg->Swizzle, 1 ) & 0x3,

+                       GET_SWZ( SrcReg->Swizzle, 2 ) & 0x3,

+                       GET_SWZ( SrcReg->Swizzle, 3 ) & 0x3);

+

+   if (SrcReg->Negate == NEGATE_XYZW)

+      src = ureg_negate(src);

+

+   if (SrcReg->Abs) 

+      src = ureg_abs(src);

+

+   if (SrcReg->RelAddr) {

+      src = ureg_src_indirect( src, ureg_src(t->address[0]));

+      if (SrcReg->File != PROGRAM_INPUT &&

+          SrcReg->File != PROGRAM_OUTPUT) {

+         /* If SrcReg->Index was negative, it was set to zero in

+          * src_register().  Reassign it now.  But don't do this

+          * for input/output regs since they get remapped while

+          * const buffers don't.

+          */

+         src.Index = SrcReg->Index;

+      }

+   }

+

+   return src;

+}

+

+

+static struct ureg_src swizzle_4v( struct ureg_src src,

+                                   const unsigned *swz )

+{

+   return ureg_swizzle( src, swz[0], swz[1], swz[2], swz[3] );

+}

+

+

+/**

+ * Translate a SWZ instruction into a MOV, MUL or MAD instruction.  EG:

+ *

+ *   SWZ dst, src.x-y10 

+ * 

+ * becomes:

+ *

+ *   MAD dst {1,-1,0,0}, src.xyxx, {0,0,1,0}

+ */

+static void emit_swz( struct st_translate *t,

+                      struct ureg_dst dst,

+                      const struct prog_src_register *SrcReg )

+{

+   struct ureg_program *ureg = t->ureg;

+   struct ureg_src src = src_register( t, SrcReg->File, SrcReg->Index );

+

+   unsigned negate_mask =  SrcReg->Negate;

+

+   unsigned one_mask = ((GET_SWZ(SrcReg->Swizzle, 0) == SWIZZLE_ONE) << 0 |

+                        (GET_SWZ(SrcReg->Swizzle, 1) == SWIZZLE_ONE) << 1 |

+                        (GET_SWZ(SrcReg->Swizzle, 2) == SWIZZLE_ONE) << 2 |

+                        (GET_SWZ(SrcReg->Swizzle, 3) == SWIZZLE_ONE) << 3);

+

+   unsigned zero_mask = ((GET_SWZ(SrcReg->Swizzle, 0) == SWIZZLE_ZERO) << 0 |

+                         (GET_SWZ(SrcReg->Swizzle, 1) == SWIZZLE_ZERO) << 1 |

+                         (GET_SWZ(SrcReg->Swizzle, 2) == SWIZZLE_ZERO) << 2 |

+                         (GET_SWZ(SrcReg->Swizzle, 3) == SWIZZLE_ZERO) << 3);

+

+   unsigned negative_one_mask = one_mask & negate_mask;

+   unsigned positive_one_mask = one_mask & ~negate_mask;

+   

+   struct ureg_src imm;

+   unsigned i;

+   unsigned mul_swizzle[4] = {0,0,0,0};

+   unsigned add_swizzle[4] = {0,0,0,0};

+   unsigned src_swizzle[4] = {0,0,0,0};

+   boolean need_add = FALSE;

+   boolean need_mul = FALSE;

+

+   if (dst.WriteMask == 0)

+      return;

+

+   /* Is this just a MOV?

+    */

+   if (zero_mask == 0 &&

+       one_mask == 0 &&

+       (negate_mask == 0 || negate_mask == TGSI_WRITEMASK_XYZW)) 

+   {

+      ureg_MOV( ureg, dst, translate_src( t, SrcReg ));

+      return;

+   }

+

+#define IMM_ZERO    0

+#define IMM_ONE     1

+#define IMM_NEG_ONE 2

+

+   imm = ureg_imm3f( ureg, 0, 1, -1 );

+

+   for (i = 0; i < 4; i++) {

+      unsigned bit = 1 << i;

+

+      if (dst.WriteMask & bit) {

+         if (positive_one_mask & bit) {

+            mul_swizzle[i] = IMM_ZERO;

+            add_swizzle[i] = IMM_ONE;

+            need_add = TRUE;

+         }

+         else if (negative_one_mask & bit) {

+            mul_swizzle[i] = IMM_ZERO;

+            add_swizzle[i] = IMM_NEG_ONE;

+            need_add = TRUE;

+         }

+         else if (zero_mask & bit) {

+            mul_swizzle[i] = IMM_ZERO;

+            add_swizzle[i] = IMM_ZERO;

+            need_add = TRUE;

+         }

+         else {

+            add_swizzle[i] = IMM_ZERO;

+            src_swizzle[i] = GET_SWZ(SrcReg->Swizzle, i);

+            need_mul = TRUE;

+            if (negate_mask & bit) {

+               mul_swizzle[i] = IMM_NEG_ONE;

+            }

+            else {

+               mul_swizzle[i] = IMM_ONE;

+            }

+         }

+      }

+   }

+

+   if (need_mul && need_add) {

+      ureg_MAD( ureg, 

+                dst,

+                swizzle_4v( src, src_swizzle ),

+                swizzle_4v( imm, mul_swizzle ),

+                swizzle_4v( imm, add_swizzle ) );

+   }

+   else if (need_mul) {

+      ureg_MUL( ureg, 

+                dst,

+                swizzle_4v( src, src_swizzle ),

+                swizzle_4v( imm, mul_swizzle ) );

+   }

+   else if (need_add) {

+      ureg_MOV( ureg, 

+                dst,

+                swizzle_4v( imm, add_swizzle ) );

+   }

+   else {

+      debug_assert(0);

+   }

+

+#undef IMM_ZERO

+#undef IMM_ONE

+#undef IMM_NEG_ONE

+}

+

+

+/**

+ * Negate the value of DDY to match GL semantics where (0,0) is the

+ * lower-left corner of the window.

+ * Note that the GL_ARB_fragment_coord_conventions extension will

+ * effect this someday.

+ */

+static void emit_ddy( struct st_translate *t,

+                      struct ureg_dst dst,

+                      const struct prog_src_register *SrcReg )

+{

+   struct ureg_program *ureg = t->ureg;

+   struct ureg_src src = translate_src( t, SrcReg );

+   src = ureg_negate( src );

+   ureg_DDY( ureg, dst, src );

+}

+

+

+

+static unsigned

+translate_opcode( unsigned op )

+{

+   switch( op ) {

+   case OPCODE_ARL:

+      return TGSI_OPCODE_ARL;

+   case OPCODE_ABS:

+      return TGSI_OPCODE_ABS;

+   case OPCODE_ADD:

+      return TGSI_OPCODE_ADD;

+   case OPCODE_BGNLOOP:

+      return TGSI_OPCODE_BGNLOOP;

+   case OPCODE_BGNSUB:

+      return TGSI_OPCODE_BGNSUB;

+   case OPCODE_BRA:

+      return TGSI_OPCODE_BRA;

+   case OPCODE_BRK:

+      return TGSI_OPCODE_BRK;

+   case OPCODE_CAL:

+      return TGSI_OPCODE_CAL;

+   case OPCODE_CMP:

+      return TGSI_OPCODE_CMP;

+   case OPCODE_CONT:

+      return TGSI_OPCODE_CONT;

+   case OPCODE_COS:

+      return TGSI_OPCODE_COS;

+   case OPCODE_DDX:

+      return TGSI_OPCODE_DDX;

+   case OPCODE_DDY:

+      return TGSI_OPCODE_DDY;

+   case OPCODE_DP2:

+      return TGSI_OPCODE_DP2;

+   case OPCODE_DP2A:

+      return TGSI_OPCODE_DP2A;

+   case OPCODE_DP3:

+      return TGSI_OPCODE_DP3;

+   case OPCODE_DP4:

+      return TGSI_OPCODE_DP4;

+   case OPCODE_DPH:

+      return TGSI_OPCODE_DPH;

+   case OPCODE_DST:

+      return TGSI_OPCODE_DST;

+   case OPCODE_ELSE:

+      return TGSI_OPCODE_ELSE;

+   case OPCODE_EMIT_VERTEX:

+      return TGSI_OPCODE_EMIT;

+   case OPCODE_END_PRIMITIVE:

+      return TGSI_OPCODE_ENDPRIM;

+   case OPCODE_ENDIF:

+      return TGSI_OPCODE_ENDIF;

+   case OPCODE_ENDLOOP:

+      return TGSI_OPCODE_ENDLOOP;

+   case OPCODE_ENDSUB:

+      return TGSI_OPCODE_ENDSUB;

+   case OPCODE_EX2:

+      return TGSI_OPCODE_EX2;

+   case OPCODE_EXP:

+      return TGSI_OPCODE_EXP;

+   case OPCODE_FLR:

+      return TGSI_OPCODE_FLR;

+   case OPCODE_FRC:

+      return TGSI_OPCODE_FRC;

+   case OPCODE_IF:

+      return TGSI_OPCODE_IF;

+   case OPCODE_TRUNC:

+      return TGSI_OPCODE_TRUNC;

+   case OPCODE_KIL:

+      return TGSI_OPCODE_KIL;

+   case OPCODE_KIL_NV:

+      return TGSI_OPCODE_KILP;

+   case OPCODE_LG2:

+      return TGSI_OPCODE_LG2;

+   case OPCODE_LOG:

+      return TGSI_OPCODE_LOG;

+   case OPCODE_LIT:

+      return TGSI_OPCODE_LIT;

+   case OPCODE_LRP:

+      return TGSI_OPCODE_LRP;

+   case OPCODE_MAD:

+      return TGSI_OPCODE_MAD;

+   case OPCODE_MAX:

+      return TGSI_OPCODE_MAX;

+   case OPCODE_MIN:

+      return TGSI_OPCODE_MIN;

+   case OPCODE_MOV:

+      return TGSI_OPCODE_MOV;

+   case OPCODE_MUL:

+      return TGSI_OPCODE_MUL;

+   case OPCODE_NOP:

+      return TGSI_OPCODE_NOP;

+   case OPCODE_NRM3:

+      return TGSI_OPCODE_NRM;

+   case OPCODE_NRM4:

+      return TGSI_OPCODE_NRM4;

+   case OPCODE_POW:

+      return TGSI_OPCODE_POW;

+   case OPCODE_RCP:

+      return TGSI_OPCODE_RCP;

+   case OPCODE_RET:

+      return TGSI_OPCODE_RET;

+   case OPCODE_RSQ:

+      return TGSI_OPCODE_RSQ;

+   case OPCODE_SCS:

+      return TGSI_OPCODE_SCS;

+   case OPCODE_SEQ:

+      return TGSI_OPCODE_SEQ;

+   case OPCODE_SGE:

+      return TGSI_OPCODE_SGE;

+   case OPCODE_SGT:

+      return TGSI_OPCODE_SGT;

+   case OPCODE_SIN:

+      return TGSI_OPCODE_SIN;

+   case OPCODE_SLE:

+      return TGSI_OPCODE_SLE;

+   case OPCODE_SLT:

+      return TGSI_OPCODE_SLT;

+   case OPCODE_SNE:

+      return TGSI_OPCODE_SNE;

+   case OPCODE_SSG:

+      return TGSI_OPCODE_SSG;

+   case OPCODE_SUB:

+      return TGSI_OPCODE_SUB;

+   case OPCODE_TEX:

+      return TGSI_OPCODE_TEX;

+   case OPCODE_TXB:

+      return TGSI_OPCODE_TXB;

+   case OPCODE_TXD:

+      return TGSI_OPCODE_TXD;

+   case OPCODE_TXL:

+      return TGSI_OPCODE_TXL;

+   case OPCODE_TXP:

+      return TGSI_OPCODE_TXP;

+   case OPCODE_XPD:

+      return TGSI_OPCODE_XPD;

+   case OPCODE_END:

+      return TGSI_OPCODE_END;

+   default:

+      debug_assert( 0 );

+      return TGSI_OPCODE_NOP;

+   }

+}

+

+

+static void

+compile_instruction(

+   struct st_translate *t,

+   const struct prog_instruction *inst )

+{

+   struct ureg_program *ureg = t->ureg;

+   GLuint i;

+   struct ureg_dst dst[1];

+   struct ureg_src src[4];

+   unsigned num_dst;

+   unsigned num_src;

+

+   num_dst = _mesa_num_inst_dst_regs( inst->Opcode );

+   num_src = _mesa_num_inst_src_regs( inst->Opcode );

+

+   if (num_dst) 

+      dst[0] = translate_dst( t, 

+                              &inst->DstReg,

+                              inst->SaturateMode );

+

+   for (i = 0; i < num_src; i++) 

+      src[i] = translate_src( t, &inst->SrcReg[i] );

+

+   switch( inst->Opcode ) {

+   case OPCODE_SWZ:

+      emit_swz( t, dst[0], &inst->SrcReg[0] );

+      return;

+

+   case OPCODE_BGNLOOP:

+   case OPCODE_CAL:

+   case OPCODE_ELSE:

+   case OPCODE_ENDLOOP:

+   case OPCODE_IF:

+      debug_assert(num_dst == 0);

+      ureg_label_insn( ureg,

+                       translate_opcode( inst->Opcode ),

+                       src, num_src,

+                       get_label( t, inst->BranchTarget ));

+      return;

+

+   case OPCODE_TEX:

+   case OPCODE_TXB:

+   case OPCODE_TXD:

+   case OPCODE_TXL:

+   case OPCODE_TXP:

+      src[num_src++] = t->samplers[inst->TexSrcUnit];

+      ureg_tex_insn( ureg,

+                     translate_opcode( inst->Opcode ),

+                     dst, num_dst, 

+                     translate_texture_target( inst->TexSrcTarget,

+                                               inst->TexShadow ),

+                     src, num_src );

+      return;

+

+   case OPCODE_SCS:

+      dst[0] = ureg_writemask(dst[0], TGSI_WRITEMASK_XY );

+      ureg_insn( ureg, 

+                 translate_opcode( inst->Opcode ), 

+                 dst, num_dst, 

+                 src, num_src );

+      break;

+

+   case OPCODE_XPD:

+      dst[0] = ureg_writemask(dst[0], TGSI_WRITEMASK_XYZ );

+      ureg_insn( ureg, 

+                 translate_opcode( inst->Opcode ), 

+                 dst, num_dst, 

+                 src, num_src );

+      break;

+

+   case OPCODE_NOISE1:

+   case OPCODE_NOISE2:

+   case OPCODE_NOISE3:

+   case OPCODE_NOISE4:

+      /* At some point, a motivated person could add a better

+       * implementation of noise.  Currently not even the nvidia

+       * binary drivers do anything more than this.  In any case, the

+       * place to do this is in the GL state tracker, not the poor

+       * driver.

+       */

+      ureg_MOV( ureg, dst[0], ureg_imm1f(ureg, 0.5) );

+      break;

+		 

+   case OPCODE_DDY:

+      emit_ddy( t, dst[0], &inst->SrcReg[0] );

+      break;

+

+   default:

+      ureg_insn( ureg, 

+                 translate_opcode( inst->Opcode ), 

+                 dst, num_dst, 

+                 src, num_src );

+      break;

+   }

+}

+

+

+/**

+ * Emit the TGSI instructions to adjust the WPOS pixel center convention

+ * Basically, add (adjX, adjY) to the fragment position.

+ */

+static void

+emit_adjusted_wpos( struct st_translate *t,

+                    const struct gl_program *program,

+                    GLfloat adjX, GLfloat adjY)

+{

+   struct ureg_program *ureg = t->ureg;

+   struct ureg_dst wpos_temp = ureg_DECL_temporary(ureg);

+   struct ureg_src wpos_input = t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]];

+

+   /* Note that we bias X and Y and pass Z and W through unchanged.

+    * The shader might also use gl_FragCoord.w and .z.

+    */

+   ureg_ADD(ureg, wpos_temp, wpos_input,

+            ureg_imm4f(ureg, adjX, adjY, 0.0f, 0.0f));

+

+   t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]] = ureg_src(wpos_temp);

+}

+

+

+/**

+ * Emit the TGSI instructions for inverting the WPOS y coordinate.

+ * This code is unavoidable because it also depends on whether

+ * a FBO is bound (STATE_FB_WPOS_Y_TRANSFORM).

+ */

+static void

+emit_wpos_inversion( struct st_translate *t,

+                     const struct gl_program *program,

+                     boolean invert)

+{

+   struct ureg_program *ureg = t->ureg;

+

+   /* Fragment program uses fragment position input.

+    * Need to replace instances of INPUT[WPOS] with temp T

+    * where T = INPUT[WPOS] by y is inverted.

+    */

+   static const gl_state_index wposTransformState[STATE_LENGTH]

+      = { STATE_INTERNAL, STATE_FB_WPOS_Y_TRANSFORM, 0, 0, 0 };

+   

+   /* XXX: note we are modifying the incoming shader here!  Need to

+    * do this before emitting the constant decls below, or this

+    * will be missed:

+    */

+   unsigned wposTransConst = _mesa_add_state_reference(program->Parameters,

+                                                       wposTransformState);

+

+   struct ureg_src wpostrans = ureg_DECL_constant( ureg, wposTransConst );

+   struct ureg_dst wpos_temp;

+   struct ureg_src wpos_input = t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]];

+

+   /* MOV wpos_temp, input[wpos]

+    */

+   if (wpos_input.File == TGSI_FILE_TEMPORARY)

+      wpos_temp = ureg_dst(wpos_input);

+   else {

+      wpos_temp = ureg_DECL_temporary( ureg );

+      ureg_MOV( ureg, wpos_temp, wpos_input );

+   }

+

+   if (invert) {

+      /* MAD wpos_temp.y, wpos_input, wpostrans.xxxx, wpostrans.yyyy

+       */

+      ureg_MAD( ureg,

+                ureg_writemask(wpos_temp, TGSI_WRITEMASK_Y ),

+                wpos_input,

+                ureg_scalar(wpostrans, 0),

+                ureg_scalar(wpostrans, 1));

+   } else {

+      /* MAD wpos_temp.y, wpos_input, wpostrans.zzzz, wpostrans.wwww

+       */

+      ureg_MAD( ureg,

+                ureg_writemask(wpos_temp, TGSI_WRITEMASK_Y ),

+                wpos_input,

+                ureg_scalar(wpostrans, 2),

+                ureg_scalar(wpostrans, 3));

+   }

+

+   /* Use wpos_temp as position input from here on:

+    */

+   t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]] = ureg_src(wpos_temp);

+}

+

+

+/**

+ * Emit fragment position/ooordinate code.

+ */

+static void

+emit_wpos(struct st_context *st,

+          struct st_translate *t,

+          const struct gl_program *program,

+          struct ureg_program *ureg)

+{

+   const struct gl_fragment_program *fp =

+      (const struct gl_fragment_program *) program;

+   struct pipe_screen *pscreen = st->pipe->screen;

+   boolean invert = FALSE;

+

+   if (fp->OriginUpperLeft) {

+      /* Fragment shader wants origin in upper-left */

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT)) {

+         /* the driver supports upper-left origin */

+      }

+      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT)) {

+         /* the driver supports lower-left origin, need to invert Y */

+         ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT);

+         invert = TRUE;

+      }

+      else

+         assert(0);

+   }

+   else {

+      /* Fragment shader wants origin in lower-left */

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT))

+         /* the driver supports lower-left origin */

+         ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT);

+      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT))

+         /* the driver supports upper-left origin, need to invert Y */

+         invert = TRUE;

+      else

+         assert(0);

+   }

+   

+   if (fp->PixelCenterInteger) {

+      /* Fragment shader wants pixel center integer */

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER))

+         /* the driver supports pixel center integer */

+         ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER);

+      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER))

+         /* the driver supports pixel center half integer, need to bias X,Y */

+         emit_adjusted_wpos(t, program, 0.5f, invert ? 0.5f : -0.5f);

+      else

+         assert(0);

+   }

+   else {

+      /* Fragment shader wants pixel center half integer */

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER)) {

+         /* the driver supports pixel center half integer */

+      }

+      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER)) {

+         /* the driver supports pixel center integer, need to bias X,Y */

+         ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER);

+         emit_adjusted_wpos(t, program, 0.5f, invert ? -0.5f : 0.5f);

+      }

+      else

+         assert(0);

+   }

+

+   /* we invert after adjustment so that we avoid the MOV to temporary,

+    * and reuse the adjustment ADD instead */

+   emit_wpos_inversion(t, program, invert);

+}

+

+

+/**

+ * OpenGL's fragment gl_FrontFace input is 1 for front-facing, 0 for back.

+ * TGSI uses +1 for front, -1 for back.

+ * This function converts the TGSI value to the GL value.  Simply clamping/

+ * saturating the value to [0,1] does the job.

+ */

+static void

+emit_face_var( struct st_translate *t,

+               const struct gl_program *program )

+{

+   struct ureg_program *ureg = t->ureg;

+   struct ureg_dst face_temp = ureg_DECL_temporary( ureg );

+   struct ureg_src face_input = t->inputs[t->inputMapping[FRAG_ATTRIB_FACE]];

+

+   /* MOV_SAT face_temp, input[face]

+    */

+   face_temp = ureg_saturate( face_temp );

+   ureg_MOV( ureg, face_temp, face_input );

+

+   /* Use face_temp as face input from here on:

+    */

+   t->inputs[t->inputMapping[FRAG_ATTRIB_FACE]] = ureg_src(face_temp);

+}

+

+

+static void

+emit_edgeflags( struct st_translate *t,

+                 const struct gl_program *program )

+{

+   struct ureg_program *ureg = t->ureg;

+   struct ureg_dst edge_dst = t->outputs[t->outputMapping[VERT_RESULT_EDGE]];

+   struct ureg_src edge_src = t->inputs[t->inputMapping[VERT_ATTRIB_EDGEFLAG]];

+

+   ureg_MOV( ureg, edge_dst, edge_src );

+}

+

+

+/**

+ * Translate Mesa program to TGSI format.

+ * \param program  the program to translate

+ * \param numInputs  number of input registers used

+ * \param inputMapping  maps Mesa fragment program inputs to TGSI generic

+ *                      input indexes

+ * \param inputSemanticName  the TGSI_SEMANTIC flag for each input

+ * \param inputSemanticIndex  the semantic index (ex: which texcoord) for

+ *                            each input

+ * \param interpMode  the TGSI_INTERPOLATE_LINEAR/PERSP mode for each input

+ * \param numOutputs  number of output registers used

+ * \param outputMapping  maps Mesa fragment program outputs to TGSI

+ *                       generic outputs

+ * \param outputSemanticName  the TGSI_SEMANTIC flag for each output

+ * \param outputSemanticIndex  the semantic index (ex: which texcoord) for

+ *                             each output

+ *

+ * \return  PIPE_OK or PIPE_ERROR_OUT_OF_MEMORY

+ */

+enum pipe_error

+st_translate_mesa_program(

+   struct gl_context *ctx,

+   uint procType,

+   struct ureg_program *ureg,

+   const struct gl_program *program,

+   GLuint numInputs,

+   const GLuint inputMapping[],

+   const ubyte inputSemanticName[],

+   const ubyte inputSemanticIndex[],

+   const GLuint interpMode[],

+   GLuint numOutputs,

+   const GLuint outputMapping[],

+   const ubyte outputSemanticName[],

+   const ubyte outputSemanticIndex[],

+   boolean passthrough_edgeflags )

+{

+   struct st_translate translate, *t;

+   unsigned i;

+   enum pipe_error ret = PIPE_OK;

+

+   assert(numInputs <= Elements(t->inputs));

+   assert(numOutputs <= Elements(t->outputs));

+

+   t = &translate;

+   memset(t, 0, sizeof *t);

+

+   t->procType = procType;

+   t->inputMapping = inputMapping;

+   t->outputMapping = outputMapping;

+   t->ureg = ureg;

+   t->pointSizeOutIndex = -1;

+   t->prevInstWrotePointSize = GL_FALSE;

+

+   /*_mesa_print_program(program);*/

+

+   /*

+    * Declare input attributes.

+    */

+   if (procType == TGSI_PROCESSOR_FRAGMENT) {

+      for (i = 0; i < numInputs; i++) {

+         if (program->InputFlags[0] & PROG_PARAM_BIT_CYL_WRAP) {

+            t->inputs[i] = ureg_DECL_fs_input_cyl(ureg,

+                                                  inputSemanticName[i],

+                                                  inputSemanticIndex[i],

+                                                  interpMode[i],

+                                                  TGSI_CYLINDRICAL_WRAP_X);

+         }

+         else {

+            t->inputs[i] = ureg_DECL_fs_input(ureg,

+                                              inputSemanticName[i],

+                                              inputSemanticIndex[i],

+                                              interpMode[i]);

+         }

+      }

+

+      if (program->InputsRead & FRAG_BIT_WPOS) {

+         /* Must do this after setting up t->inputs, and before

+          * emitting constant references, below:

+          */

+         emit_wpos(st_context(ctx), t, program, ureg);

+      }

+

+      if (program->InputsRead & FRAG_BIT_FACE) {

+         emit_face_var( t, program );

+      }

+

+      /*

+       * Declare output attributes.

+       */

+      for (i = 0; i < numOutputs; i++) {

+         switch (outputSemanticName[i]) {

+         case TGSI_SEMANTIC_POSITION:

+            t->outputs[i] = ureg_DECL_output( ureg,

+                                              TGSI_SEMANTIC_POSITION, /* Z / Depth */

+                                              outputSemanticIndex[i] );

+

+            t->outputs[i] = ureg_writemask( t->outputs[i],

+                                            TGSI_WRITEMASK_Z );

+            break;

+         case TGSI_SEMANTIC_STENCIL:

+            t->outputs[i] = ureg_DECL_output( ureg,

+                                              TGSI_SEMANTIC_STENCIL, /* Stencil */

+                                              outputSemanticIndex[i] );

+            t->outputs[i] = ureg_writemask( t->outputs[i],

+                                            TGSI_WRITEMASK_Y );

+            break;

+         case TGSI_SEMANTIC_COLOR:

+            t->outputs[i] = ureg_DECL_output( ureg,

+                                              TGSI_SEMANTIC_COLOR,

+                                              outputSemanticIndex[i] );

+            break;

+         default:

+            debug_assert(0);

+            return 0;

+         }

+      }

+   }

+   else if (procType == TGSI_PROCESSOR_GEOMETRY) {

+      for (i = 0; i < numInputs; i++) {

+         t->inputs[i] = ureg_DECL_gs_input(ureg,

+                                           i,

+                                           inputSemanticName[i],

+                                           inputSemanticIndex[i]);

+      }

+

+      for (i = 0; i < numOutputs; i++) {

+         t->outputs[i] = ureg_DECL_output( ureg,

+                                           outputSemanticName[i],

+                                           outputSemanticIndex[i] );

+      }

+   }

+   else {

+      assert(procType == TGSI_PROCESSOR_VERTEX);

+

+      for (i = 0; i < numInputs; i++) {

+         t->inputs[i] = ureg_DECL_vs_input(ureg, i);

+      }

+

+      for (i = 0; i < numOutputs; i++) {

+         t->outputs[i] = ureg_DECL_output( ureg,

+                                           outputSemanticName[i],

+                                           outputSemanticIndex[i] );

+         if ((outputSemanticName[i] == TGSI_SEMANTIC_PSIZE) && program->Id) {

+            /* Writing to the point size result register requires special

+             * handling to implement clamping.

+             */

+            static const gl_state_index pointSizeClampState[STATE_LENGTH]

+               = { STATE_INTERNAL, STATE_POINT_SIZE_IMPL_CLAMP, 0, 0, 0 };

+               /* XXX: note we are modifying the incoming shader here!  Need to

+               * do this before emitting the constant decls below, or this

+               * will be missed:

+               */

+            unsigned pointSizeClampConst =

+               _mesa_add_state_reference(program->Parameters,

+                                         pointSizeClampState);

+            struct ureg_dst psizregtemp = ureg_DECL_temporary( ureg );

+            t->pointSizeConst = ureg_DECL_constant( ureg, pointSizeClampConst );

+            t->pointSizeResult = t->outputs[i];

+            t->pointSizeOutIndex = i;

+            t->outputs[i] = psizregtemp;

+         }

+      }

+      if (passthrough_edgeflags)

+         emit_edgeflags( t, program );

+   }

+

+   /* Declare address register.

+    */

+   if (program->NumAddressRegs > 0) {

+      debug_assert( program->NumAddressRegs == 1 );

+      t->address[0] = ureg_DECL_address( ureg );

+   }

+

+   /* Declare misc input registers

+    */

+   {

+      GLbitfield sysInputs = program->SystemValuesRead;

+      unsigned numSys = 0;

+      for (i = 0; sysInputs; i++) {

+         if (sysInputs & (1 << i)) {

+            unsigned semName = mesa_sysval_to_semantic[i];

+            t->systemValues[i] = ureg_DECL_system_value(ureg, numSys, semName, 0);

+            numSys++;

+            sysInputs &= ~(1 << i);

+         }

+      }

+   }

+

+   if (program->IndirectRegisterFiles & (1 << PROGRAM_TEMPORARY)) {

+      /* If temps are accessed with indirect addressing, declare temporaries

+       * in sequential order.  Else, we declare them on demand elsewhere.

+       */

+      for (i = 0; i < program->NumTemporaries; i++) {

+         /* XXX use TGSI_FILE_TEMPORARY_ARRAY when it's supported by ureg */

+         t->temps[i] = ureg_DECL_temporary( t->ureg );

+      }

+   }

+

+   /* Emit constants and immediates.  Mesa uses a single index space

+    * for these, so we put all the translated regs in t->constants.

+    */

+   if (program->Parameters) {

+      t->constants = CALLOC( program->Parameters->NumParameters,

+                             sizeof t->constants[0] );

+      if (t->constants == NULL) {

+         ret = PIPE_ERROR_OUT_OF_MEMORY;

+         goto out;

+      }

+

+      for (i = 0; i < program->Parameters->NumParameters; i++) {

+         switch (program->Parameters->Parameters[i].Type) {

+         case PROGRAM_ENV_PARAM:

+         case PROGRAM_LOCAL_PARAM:

+         case PROGRAM_STATE_VAR:

+         case PROGRAM_NAMED_PARAM:

+         case PROGRAM_UNIFORM:

+            t->constants[i] = ureg_DECL_constant( ureg, i );

+            break;

+

+            /* Emit immediates only when there's no indirect addressing of

+             * the const buffer.

+             * FIXME: Be smarter and recognize param arrays:

+             * indirect addressing is only valid within the referenced

+             * array.

+             */

+         case PROGRAM_CONSTANT:

+            if (program->IndirectRegisterFiles & PROGRAM_ANY_CONST)

+               t->constants[i] = ureg_DECL_constant( ureg, i );

+            else

+               t->constants[i] = 

+                  ureg_DECL_immediate( ureg,

+                                       program->Parameters->ParameterValues[i],

+                                       4 );

+            break;

+         default:

+            break;

+         }

+      }

+   }

+

+   /* texture samplers */

+   for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {

+      if (program->SamplersUsed & (1 << i)) {

+         t->samplers[i] = ureg_DECL_sampler( ureg, i );

+      }

+   }

+

+   /* Emit each instruction in turn:

+    */

+   for (i = 0; i < program->NumInstructions; i++) {

+      set_insn_start( t, ureg_get_instruction_number( ureg ));

+      compile_instruction( t, &program->Instructions[i] );

+

+      if (t->prevInstWrotePointSize && program->Id) {

+         /* The previous instruction wrote to the (fake) vertex point size

+          * result register.  Now we need to clamp that value to the min/max

+          * point size range, putting the result into the real point size

+          * register.

+          * Note that we can't do this easily at the end of program due to

+          * possible early return.

+          */

+         set_insn_start( t, ureg_get_instruction_number( ureg ));

+         ureg_MAX( t->ureg,

+                   ureg_writemask(t->outputs[t->pointSizeOutIndex], WRITEMASK_X),

+                   ureg_src(t->outputs[t->pointSizeOutIndex]),

+                   ureg_swizzle(t->pointSizeConst, 1,1,1,1));

+         ureg_MIN( t->ureg, ureg_writemask(t->pointSizeResult, WRITEMASK_X),

+                   ureg_src(t->outputs[t->pointSizeOutIndex]),

+                   ureg_swizzle(t->pointSizeConst, 2,2,2,2));

+      }

+      t->prevInstWrotePointSize = GL_FALSE;

+   }

+

+   /* Fix up all emitted labels:

+    */

+   for (i = 0; i < t->labels_count; i++) {

+      ureg_fixup_label( ureg,

+                        t->labels[i].token,

+                        t->insn[t->labels[i].branch_target] );

+   }

+

+out:

+   FREE(t->insn);

+   FREE(t->labels);

+   FREE(t->constants);

+

+   if (t->error) {

+      debug_printf("%s: translate error flag set\n", __FUNCTION__);

+   }

+

+   return ret;

+}

+

+

+/**

+ * Tokens cannot be free with free otherwise the builtin gallium

+ * malloc debugging will get confused.

+ */

+void

+st_free_tokens(const struct tgsi_token *tokens)

+{

+   FREE((void *)tokens);

+}

diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c
index 0b1ad63af..1efc58799 100644
--- a/mesalib/src/mesa/state_tracker/st_program.c
+++ b/mesalib/src/mesa/state_tracker/st_program.c
@@ -1,1165 +1,1165 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  *   Brian Paul
-  */
-
-
-#include "main/imports.h"
-#include "main/hash.h"
-#include "main/mfeatures.h"
-#include "main/mtypes.h"
-#include "program/prog_parameter.h"
-#include "program/prog_print.h"
-#include "program/programopt.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_shader_tokens.h"
-#include "draw/draw_context.h"
-#include "tgsi/tgsi_dump.h"
-#include "tgsi/tgsi_ureg.h"
-
-#include "st_debug.h"
-#include "st_cb_bitmap.h"
-#include "st_cb_drawpixels.h"
-#include "st_context.h"
-#include "st_program.h"
-#include "st_mesa_to_tgsi.h"
-#include "cso_cache/cso_context.h"
-
-
-
-/**
- * Delete a vertex program variant.  Note the caller must unlink
- * the variant from the linked list.
- */
-static void
-delete_vp_variant(struct st_context *st, struct st_vp_variant *vpv)
-{
-   if (vpv->driver_shader) 
-      cso_delete_vertex_shader(st->cso_context, vpv->driver_shader);
-      
-#if FEATURE_feedback || FEATURE_rastpos
-   if (vpv->draw_shader)
-      draw_delete_vertex_shader( st->draw, vpv->draw_shader );
-#endif
-      
-   if (vpv->tgsi.tokens)
-      st_free_tokens(vpv->tgsi.tokens);
-      
-   FREE( vpv );
-}
-
-
-
-/**
- * Clean out any old compilations:
- */
-void
-st_release_vp_variants( struct st_context *st,
-                        struct st_vertex_program *stvp )
-{
-   struct st_vp_variant *vpv;
-
-   for (vpv = stvp->variants; vpv; ) {
-      struct st_vp_variant *next = vpv->next;
-      delete_vp_variant(st, vpv);
-      vpv = next;
-   }
-
-   stvp->variants = NULL;
-}
-
-
-
-/**
- * Delete a fragment program variant.  Note the caller must unlink
- * the variant from the linked list.
- */
-static void
-delete_fp_variant(struct st_context *st, struct st_fp_variant *fpv)
-{
-   if (fpv->driver_shader) 
-      cso_delete_fragment_shader(st->cso_context, fpv->driver_shader);
-   if (fpv->parameters)
-      _mesa_free_parameter_list(fpv->parameters);
-      
-   FREE(fpv);
-}
-
-
-/**
- * Free all variants of a fragment program.
- */
-void
-st_release_fp_variants(struct st_context *st, struct st_fragment_program *stfp)
-{
-   struct st_fp_variant *fpv;
-
-   for (fpv = stfp->variants; fpv; ) {
-      struct st_fp_variant *next = fpv->next;
-      delete_fp_variant(st, fpv);
-      fpv = next;
-   }
-
-   stfp->variants = NULL;
-}
-
-
-/**
- * Delete a geometry program variant.  Note the caller must unlink
- * the variant from the linked list.
- */
-static void
-delete_gp_variant(struct st_context *st, struct st_gp_variant *gpv)
-{
-   if (gpv->driver_shader) 
-      cso_delete_geometry_shader(st->cso_context, gpv->driver_shader);
-      
-   FREE(gpv);
-}
-
-
-/**
- * Free all variants of a geometry program.
- */
-void
-st_release_gp_variants(struct st_context *st, struct st_geometry_program *stgp)
-{
-   struct st_gp_variant *gpv;
-
-   for (gpv = stgp->variants; gpv; ) {
-      struct st_gp_variant *next = gpv->next;
-      delete_gp_variant(st, gpv);
-      gpv = next;
-   }
-
-   stgp->variants = NULL;
-}
-
-
-
-
-/**
- * Translate a Mesa vertex shader into a TGSI shader.
- * \param outputMapping  to map vertex program output registers (VERT_RESULT_x)
- *       to TGSI output slots
- * \param tokensOut  destination for TGSI tokens
- * \return  pointer to cached pipe_shader object.
- */
-static void
-st_prepare_vertex_program(struct st_context *st,
-                            struct st_vertex_program *stvp)
-{
-   GLuint attr;
-
-   stvp->num_inputs = 0;
-   stvp->num_outputs = 0;
-
-   if (stvp->Base.IsPositionInvariant)
-      _mesa_insert_mvp_code(st->ctx, &stvp->Base);
-
-   assert(stvp->Base.Base.NumInstructions > 1);
-
-   /*
-    * Determine number of inputs, the mappings between VERT_ATTRIB_x
-    * and TGSI generic input indexes, plus input attrib semantic info.
-    */
-   for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {
-      if (stvp->Base.Base.InputsRead & (1 << attr)) {
-         stvp->input_to_index[attr] = stvp->num_inputs;
-         stvp->index_to_input[stvp->num_inputs] = attr;
-         stvp->num_inputs++;
-      }
-   }
-   /* bit of a hack, presetup potentially unused edgeflag input */
-   stvp->input_to_index[VERT_ATTRIB_EDGEFLAG] = stvp->num_inputs;
-   stvp->index_to_input[stvp->num_inputs] = VERT_ATTRIB_EDGEFLAG;
-
-   /* Compute mapping of vertex program outputs to slots.
-    */
-   for (attr = 0; attr < VERT_RESULT_MAX; attr++) {
-      if ((stvp->Base.Base.OutputsWritten & BITFIELD64_BIT(attr)) == 0) {
-         stvp->result_to_output[attr] = ~0;
-      }
-      else {
-         unsigned slot = stvp->num_outputs++;
-
-         stvp->result_to_output[attr] = slot;
-
-         switch (attr) {
-         case VERT_RESULT_HPOS:
-            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_POSITION;
-            stvp->output_semantic_index[slot] = 0;
-            break;
-         case VERT_RESULT_COL0:
-            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
-            stvp->output_semantic_index[slot] = 0;
-            break;
-         case VERT_RESULT_COL1:
-            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
-            stvp->output_semantic_index[slot] = 1;
-            break;
-         case VERT_RESULT_BFC0:
-            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;
-            stvp->output_semantic_index[slot] = 0;
-            break;
-         case VERT_RESULT_BFC1:
-            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;
-            stvp->output_semantic_index[slot] = 1;
-            break;
-         case VERT_RESULT_FOGC:
-            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_FOG;
-            stvp->output_semantic_index[slot] = 0;
-            break;
-         case VERT_RESULT_PSIZ:
-            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_PSIZE;
-            stvp->output_semantic_index[slot] = 0;
-            break;
-         case VERT_RESULT_EDGE:
-            assert(0);
-            break;
-
-         case VERT_RESULT_TEX0:
-         case VERT_RESULT_TEX1:
-         case VERT_RESULT_TEX2:
-         case VERT_RESULT_TEX3:
-         case VERT_RESULT_TEX4:
-         case VERT_RESULT_TEX5:
-         case VERT_RESULT_TEX6:
-         case VERT_RESULT_TEX7:
-            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
-            stvp->output_semantic_index[slot] = attr - VERT_RESULT_TEX0;
-            break;
-
-         case VERT_RESULT_VAR0:
-         default:
-            assert(attr < VERT_RESULT_MAX);
-            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
-            stvp->output_semantic_index[slot] = (FRAG_ATTRIB_VAR0 - 
-                                                FRAG_ATTRIB_TEX0 +
-                                                attr - 
-                                                VERT_RESULT_VAR0);
-            break;
-         }
-      }
-   }
-   /* similar hack to above, presetup potentially unused edgeflag output */
-   stvp->result_to_output[VERT_RESULT_EDGE] = stvp->num_outputs;
-   stvp->output_semantic_name[stvp->num_outputs] = TGSI_SEMANTIC_EDGEFLAG;
-   stvp->output_semantic_index[stvp->num_outputs] = 0;
-}
-
-
-/**
- * Translate a vertex program to create a new variant.
- */
-static struct st_vp_variant *
-st_translate_vertex_program(struct st_context *st,
-                            struct st_vertex_program *stvp,
-                            const struct st_vp_variant_key *key)
-{
-   struct st_vp_variant *vpv = CALLOC_STRUCT(st_vp_variant);
-   struct pipe_context *pipe = st->pipe;
-   struct ureg_program *ureg;
-   enum pipe_error error;
-   unsigned num_outputs;
-
-   st_prepare_vertex_program( st, stvp );
-
-   _mesa_remove_output_reads(&stvp->Base.Base, PROGRAM_OUTPUT);
-   _mesa_remove_output_reads(&stvp->Base.Base, PROGRAM_VARYING);
-
-   ureg = ureg_create( TGSI_PROCESSOR_VERTEX );
-   if (ureg == NULL) {
-      FREE(vpv);
-      return NULL;
-   }
-
-   vpv->key = *key;
-
-   vpv->num_inputs = stvp->num_inputs;
-   num_outputs = stvp->num_outputs;
-   if (key->passthrough_edgeflags) {
-      vpv->num_inputs++;
-      num_outputs++;
-   }
-
-   if (ST_DEBUG & DEBUG_MESA) {
-      _mesa_print_program(&stvp->Base.Base);
-      _mesa_print_program_parameters(st->ctx, &stvp->Base.Base);
-      debug_printf("\n");
-   }
-
-   error = st_translate_mesa_program(st->ctx,
-                                     TGSI_PROCESSOR_VERTEX,
-                                     ureg,
-                                     &stvp->Base.Base,
-                                     /* inputs */
-                                     vpv->num_inputs,
-                                     stvp->input_to_index,
-                                     NULL, /* input semantic name */
-                                     NULL, /* input semantic index */
-                                     NULL,
-                                     /* outputs */
-                                     num_outputs,
-                                     stvp->result_to_output,
-                                     stvp->output_semantic_name,
-                                     stvp->output_semantic_index,
-                                     key->passthrough_edgeflags );
-
-   if (error)
-      goto fail;
-
-   vpv->tgsi.tokens = ureg_get_tokens( ureg, NULL );
-   if (!vpv->tgsi.tokens)
-      goto fail;
-
-   ureg_destroy( ureg );
-
-   vpv->driver_shader = pipe->create_vs_state(pipe, &vpv->tgsi);
-
-   if (ST_DEBUG & DEBUG_TGSI) {
-      tgsi_dump( vpv->tgsi.tokens, 0 );
-      debug_printf("\n");
-   }
-
-   return vpv;
-
-fail:
-   debug_printf("%s: failed to translate Mesa program:\n", __FUNCTION__);
-   _mesa_print_program(&stvp->Base.Base);
-   debug_assert(0);
-
-   ureg_destroy( ureg );
-   return NULL;
-}
-
-
-/**
- * Find/create a vertex program variant.
- */
-struct st_vp_variant *
-st_get_vp_variant(struct st_context *st,
-                  struct st_vertex_program *stvp,
-                  const struct st_vp_variant_key *key)
-{
-   struct st_vp_variant *vpv;
-
-   /* Search for existing variant */
-   for (vpv = stvp->variants; vpv; vpv = vpv->next) {
-      if (memcmp(&vpv->key, key, sizeof(*key)) == 0) {
-         break;
-      }
-   }
-
-   if (!vpv) {
-      /* create now */
-      vpv = st_translate_vertex_program(st, stvp, key);
-      if (vpv) {
-         /* insert into list */
-         vpv->next = stvp->variants;
-         stvp->variants = vpv;
-      }
-   }
-
-   return vpv;
-}
-
-
-/**
- * Translate a Mesa fragment shader into a TGSI shader using extra info in
- * the key.
- * \return  new fragment program variant
- */
-static struct st_fp_variant *
-st_translate_fragment_program(struct st_context *st,
-                              struct st_fragment_program *stfp,
-                              const struct st_fp_variant_key *key)
-{
-   struct pipe_context *pipe = st->pipe;
-   struct st_fp_variant *variant = CALLOC_STRUCT(st_fp_variant);
-   GLboolean deleteFP = GL_FALSE;
-
-   if (!variant)
-      return NULL;
-
-   assert(!(key->bitmap && key->drawpixels));
-
-#if FEATURE_drawpix
-   if (key->bitmap) {
-      /* glBitmap drawing */
-      struct gl_fragment_program *fp; /* we free this temp program below */
-
-      st_make_bitmap_fragment_program(st, &stfp->Base,
-                                      &fp, &variant->bitmap_sampler);
-
-      variant->parameters = _mesa_clone_parameter_list(fp->Base.Parameters);
-      stfp = st_fragment_program(fp);
-      deleteFP = GL_TRUE;
-   }
-   else if (key->drawpixels) {
-      /* glDrawPixels drawing */
-      struct gl_fragment_program *fp; /* we free this temp program below */
-
-      if (key->drawpixels_z || key->drawpixels_stencil) {
-         fp = st_make_drawpix_z_stencil_program(st, key->drawpixels_z,
-                                                key->drawpixels_stencil);
-      }
-      else {
-         /* RGBA */
-         st_make_drawpix_fragment_program(st, &stfp->Base, &fp);
-         variant->parameters = _mesa_clone_parameter_list(fp->Base.Parameters);
-         deleteFP = GL_TRUE;
-      }
-      stfp = st_fragment_program(fp);
-   }
-#endif
-
-   if (!stfp->tgsi.tokens) {
-      /* need to translate Mesa instructions to TGSI now */
-      GLuint outputMapping[FRAG_RESULT_MAX];
-      GLuint inputMapping[FRAG_ATTRIB_MAX];
-      GLuint interpMode[PIPE_MAX_SHADER_INPUTS];  /* XXX size? */
-      GLuint attr;
-      enum pipe_error error;
-      const GLbitfield inputsRead = stfp->Base.Base.InputsRead;
-      struct ureg_program *ureg;
-      GLboolean write_all = GL_FALSE;
-
-      ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS];
-      ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS];
-      uint fs_num_inputs = 0;
-
-      ubyte fs_output_semantic_name[PIPE_MAX_SHADER_OUTPUTS];
-      ubyte fs_output_semantic_index[PIPE_MAX_SHADER_OUTPUTS];
-      uint fs_num_outputs = 0;
-
-
-      _mesa_remove_output_reads(&stfp->Base.Base, PROGRAM_OUTPUT);
-
-      /*
-       * Convert Mesa program inputs to TGSI input register semantics.
-       */
-      for (attr = 0; attr < FRAG_ATTRIB_MAX; attr++) {
-         if (inputsRead & (1 << attr)) {
-            const GLuint slot = fs_num_inputs++;
-
-            inputMapping[attr] = slot;
-
-            switch (attr) {
-            case FRAG_ATTRIB_WPOS:
-               input_semantic_name[slot] = TGSI_SEMANTIC_POSITION;
-               input_semantic_index[slot] = 0;
-               interpMode[slot] = TGSI_INTERPOLATE_LINEAR;
-               break;
-            case FRAG_ATTRIB_COL0:
-               input_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
-               input_semantic_index[slot] = 0;
-               interpMode[slot] = TGSI_INTERPOLATE_LINEAR;
-               break;
-            case FRAG_ATTRIB_COL1:
-               input_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
-               input_semantic_index[slot] = 1;
-               interpMode[slot] = TGSI_INTERPOLATE_LINEAR;
-               break;
-            case FRAG_ATTRIB_FOGC:
-               input_semantic_name[slot] = TGSI_SEMANTIC_FOG;
-               input_semantic_index[slot] = 0;
-               interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;
-               break;
-            case FRAG_ATTRIB_FACE:
-               input_semantic_name[slot] = TGSI_SEMANTIC_FACE;
-               input_semantic_index[slot] = 0;
-               interpMode[slot] = TGSI_INTERPOLATE_CONSTANT;
-               break;
-               /* In most cases, there is nothing special about these
-                * inputs, so adopt a convention to use the generic
-                * semantic name and the mesa FRAG_ATTRIB_ number as the
-                * index. 
-                * 
-                * All that is required is that the vertex shader labels
-                * its own outputs similarly, and that the vertex shader
-                * generates at least every output required by the
-                * fragment shader plus fixed-function hardware (such as
-                * BFC).
-                * 
-                * There is no requirement that semantic indexes start at
-                * zero or be restricted to a particular range -- nobody
-                * should be building tables based on semantic index.
-                */
-            case FRAG_ATTRIB_PNTC:
-            case FRAG_ATTRIB_TEX0:
-            case FRAG_ATTRIB_TEX1:
-            case FRAG_ATTRIB_TEX2:
-            case FRAG_ATTRIB_TEX3:
-            case FRAG_ATTRIB_TEX4:
-            case FRAG_ATTRIB_TEX5:
-            case FRAG_ATTRIB_TEX6:
-            case FRAG_ATTRIB_TEX7:
-            case FRAG_ATTRIB_VAR0:
-            default:
-               /* Actually, let's try and zero-base this just for
-                * readability of the generated TGSI.
-                */
-               assert(attr >= FRAG_ATTRIB_TEX0);
-               input_semantic_index[slot] = (attr - FRAG_ATTRIB_TEX0);
-               input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
-               if (attr == FRAG_ATTRIB_PNTC)
-                  interpMode[slot] = TGSI_INTERPOLATE_LINEAR;
-               else
-                  interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;
-               break;
-            }
-         }
-         else {
-            inputMapping[attr] = -1;
-         }
-      }
-
-      /*
-       * Semantics and mapping for outputs
-       */
-      {
-         uint numColors = 0;
-         GLbitfield64 outputsWritten = stfp->Base.Base.OutputsWritten;
-
-         /* if z is written, emit that first */
-         if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_DEPTH)) {
-            fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_POSITION;
-            fs_output_semantic_index[fs_num_outputs] = 0;
-            outputMapping[FRAG_RESULT_DEPTH] = fs_num_outputs;
-            fs_num_outputs++;
-            outputsWritten &= ~(1 << FRAG_RESULT_DEPTH);
-         }
-
-         if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_STENCIL)) {
-            fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_STENCIL;
-            fs_output_semantic_index[fs_num_outputs] = 0;
-            outputMapping[FRAG_RESULT_STENCIL] = fs_num_outputs;
-            fs_num_outputs++;
-            outputsWritten &= ~(1 << FRAG_RESULT_STENCIL);
-         }
-
-         /* handle remaning outputs (color) */
-         for (attr = 0; attr < FRAG_RESULT_MAX; attr++) {
-            if (outputsWritten & BITFIELD64_BIT(attr)) {
-               switch (attr) {
-               case FRAG_RESULT_DEPTH:
-               case FRAG_RESULT_STENCIL:
-                  /* handled above */
-                  assert(0);
-                  break;
-               case FRAG_RESULT_COLOR:
-                  write_all = GL_TRUE; /* fallthrough */
-               default:
-                  assert(attr == FRAG_RESULT_COLOR ||
-                         (FRAG_RESULT_DATA0 <= attr && attr < FRAG_RESULT_MAX));
-                  fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_COLOR;
-                  fs_output_semantic_index[fs_num_outputs] = numColors;
-                  outputMapping[attr] = fs_num_outputs;
-                  numColors++;
-                  break;
-               }
-
-               fs_num_outputs++;
-            }
-         }
-      }
-
-      ureg = ureg_create( TGSI_PROCESSOR_FRAGMENT );
-      if (ureg == NULL)
-         return NULL;
-
-      if (ST_DEBUG & DEBUG_MESA) {
-         _mesa_print_program(&stfp->Base.Base);
-         _mesa_print_program_parameters(st->ctx, &stfp->Base.Base);
-         debug_printf("\n");
-      }
-      if (write_all == GL_TRUE)
-         ureg_property_fs_color0_writes_all_cbufs(ureg, 1);
-
-      error = st_translate_mesa_program(st->ctx,
-                                        TGSI_PROCESSOR_FRAGMENT,
-                                        ureg,
-                                        &stfp->Base.Base,
-                                        /* inputs */
-                                        fs_num_inputs,
-                                        inputMapping,
-                                        input_semantic_name,
-                                        input_semantic_index,
-                                        interpMode,
-                                        /* outputs */
-                                        fs_num_outputs,
-                                        outputMapping,
-                                        fs_output_semantic_name,
-                                        fs_output_semantic_index, FALSE );
-
-      stfp->tgsi.tokens = ureg_get_tokens( ureg, NULL );
-      ureg_destroy( ureg );
-   }
-
-   /* fill in variant */
-   variant->driver_shader = pipe->create_fs_state(pipe, &stfp->tgsi);
-   variant->key = *key;
-
-   if (ST_DEBUG & DEBUG_TGSI) {
-      tgsi_dump( stfp->tgsi.tokens, 0/*TGSI_DUMP_VERBOSE*/ );
-      debug_printf("\n");
-   }
-
-   if (deleteFP) {
-      /* Free the temporary program made above */
-      struct gl_fragment_program *fp = &stfp->Base;
-      _mesa_reference_fragprog(st->ctx, &fp, NULL);
-   }
-
-   return variant;
-}
-
-
-/**
- * Translate fragment program if needed.
- */
-struct st_fp_variant *
-st_get_fp_variant(struct st_context *st,
-                  struct st_fragment_program *stfp,
-                  const struct st_fp_variant_key *key)
-{
-   struct st_fp_variant *fpv;
-
-   /* Search for existing variant */
-   for (fpv = stfp->variants; fpv; fpv = fpv->next) {
-      if (memcmp(&fpv->key, key, sizeof(*key)) == 0) {
-         break;
-      }
-   }
-
-   if (!fpv) {
-      /* create new */
-      fpv = st_translate_fragment_program(st, stfp, key);
-      if (fpv) {
-         /* insert into list */
-         fpv->next = stfp->variants;
-         stfp->variants = fpv;
-      }
-   }
-
-   return fpv;
-}
-
-
-/**
- * Translate a geometry program to create a new variant.
- */
-static struct st_gp_variant *
-st_translate_geometry_program(struct st_context *st,
-                              struct st_geometry_program *stgp,
-                              const struct st_gp_variant_key *key)
-{
-   GLuint inputMapping[GEOM_ATTRIB_MAX];
-   GLuint outputMapping[GEOM_RESULT_MAX];
-   struct pipe_context *pipe = st->pipe;
-   enum pipe_error error;
-   GLuint attr;
-   const GLbitfield inputsRead = stgp->Base.Base.InputsRead;
-   GLuint vslot = 0;
-   GLuint num_generic = 0;
-
-   uint gs_num_inputs = 0;
-   uint gs_builtin_inputs = 0;
-   uint gs_array_offset = 0;
-
-   ubyte gs_output_semantic_name[PIPE_MAX_SHADER_OUTPUTS];
-   ubyte gs_output_semantic_index[PIPE_MAX_SHADER_OUTPUTS];
-   uint gs_num_outputs = 0;
-
-   GLint i;
-   GLuint maxSlot = 0;
-   struct ureg_program *ureg;
-
-   struct st_gp_variant *gpv;
-
-   gpv = CALLOC_STRUCT(st_gp_variant);
-   if (!gpv)
-      return NULL;
-
-   _mesa_remove_output_reads(&stgp->Base.Base, PROGRAM_OUTPUT);
-   _mesa_remove_output_reads(&stgp->Base.Base, PROGRAM_VARYING);
-
-   ureg = ureg_create( TGSI_PROCESSOR_GEOMETRY );
-   if (ureg == NULL) {
-      FREE(gpv);
-      return NULL;
-   }
-
-   /* which vertex output goes to the first geometry input */
-   vslot = 0;
-
-   memset(inputMapping, 0, sizeof(inputMapping));
-   memset(outputMapping, 0, sizeof(outputMapping));
-
-   /*
-    * Convert Mesa program inputs to TGSI input register semantics.
-    */
-   for (attr = 0; attr < GEOM_ATTRIB_MAX; attr++) {
-      if (inputsRead & (1 << attr)) {
-         const GLuint slot = gs_num_inputs;
-
-         gs_num_inputs++;
-
-         inputMapping[attr] = slot;
-
-         stgp->input_map[slot + gs_array_offset] = vslot - gs_builtin_inputs;
-         stgp->input_to_index[attr] = vslot;
-         stgp->index_to_input[vslot] = attr;
-         ++vslot;
-
-         if (attr != GEOM_ATTRIB_PRIMITIVE_ID) {
-            gs_array_offset += 2;
-         } else
-            ++gs_builtin_inputs;
-
-#if 0
-         debug_printf("input map at %d = %d\n",
-                      slot + gs_array_offset, stgp->input_map[slot + gs_array_offset]);
-#endif
-
-         switch (attr) {
-         case GEOM_ATTRIB_PRIMITIVE_ID:
-            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_PRIMID;
-            stgp->input_semantic_index[slot] = 0;
-            break;
-         case GEOM_ATTRIB_POSITION:
-            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_POSITION;
-            stgp->input_semantic_index[slot] = 0;
-            break;
-         case GEOM_ATTRIB_COLOR0:
-            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
-            stgp->input_semantic_index[slot] = 0;
-            break;
-         case GEOM_ATTRIB_COLOR1:
-            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
-            stgp->input_semantic_index[slot] = 1;
-            break;
-         case GEOM_ATTRIB_FOG_FRAG_COORD:
-            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_FOG;
-            stgp->input_semantic_index[slot] = 0;
-            break;
-         case GEOM_ATTRIB_TEX_COORD:
-            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
-            stgp->input_semantic_index[slot] = num_generic++;
-            break;
-         case GEOM_ATTRIB_VAR0:
-            /* fall-through */
-         default:
-            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
-            stgp->input_semantic_index[slot] = num_generic++;
-         }
-      }
-   }
-
-   /* initialize output semantics to defaults */
-   for (i = 0; i < PIPE_MAX_SHADER_OUTPUTS; i++) {
-      gs_output_semantic_name[i] = TGSI_SEMANTIC_GENERIC;
-      gs_output_semantic_index[i] = 0;
-   }
-
-   num_generic = 0;
-   /*
-    * Determine number of outputs, the (default) output register
-    * mapping and the semantic information for each output.
-    */
-   for (attr = 0; attr < GEOM_RESULT_MAX; attr++) {
-      if (stgp->Base.Base.OutputsWritten & BITFIELD64_BIT(attr)) {
-         GLuint slot;
-
-         slot = gs_num_outputs;
-         gs_num_outputs++;
-         outputMapping[attr] = slot;
-
-         switch (attr) {
-         case GEOM_RESULT_POS:
-            assert(slot == 0);
-            gs_output_semantic_name[slot] = TGSI_SEMANTIC_POSITION;
-            gs_output_semantic_index[slot] = 0;
-            break;
-         case GEOM_RESULT_COL0:
-            gs_output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
-            gs_output_semantic_index[slot] = 0;
-            break;
-         case GEOM_RESULT_COL1:
-            gs_output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
-            gs_output_semantic_index[slot] = 1;
-            break;
-         case GEOM_RESULT_SCOL0:
-            gs_output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;
-            gs_output_semantic_index[slot] = 0;
-            break;
-         case GEOM_RESULT_SCOL1:
-            gs_output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;
-            gs_output_semantic_index[slot] = 1;
-            break;
-         case GEOM_RESULT_FOGC:
-            gs_output_semantic_name[slot] = TGSI_SEMANTIC_FOG;
-            gs_output_semantic_index[slot] = 0;
-            break;
-         case GEOM_RESULT_PSIZ:
-            gs_output_semantic_name[slot] = TGSI_SEMANTIC_PSIZE;
-            gs_output_semantic_index[slot] = 0;
-            break;
-         case GEOM_RESULT_TEX0:
-         case GEOM_RESULT_TEX1:
-         case GEOM_RESULT_TEX2:
-         case GEOM_RESULT_TEX3:
-         case GEOM_RESULT_TEX4:
-         case GEOM_RESULT_TEX5:
-         case GEOM_RESULT_TEX6:
-         case GEOM_RESULT_TEX7:
-            /* fall-through */
-         case GEOM_RESULT_VAR0:
-            /* fall-through */
-         default:
-            assert(slot < Elements(gs_output_semantic_name));
-            /* use default semantic info */
-            gs_output_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
-            gs_output_semantic_index[slot] = num_generic++;
-         }
-      }
-   }
-
-   assert(gs_output_semantic_name[0] == TGSI_SEMANTIC_POSITION);
-
-   /* find max output slot referenced to compute gs_num_outputs */
-   for (attr = 0; attr < GEOM_RESULT_MAX; attr++) {
-      if (outputMapping[attr] != ~0 && outputMapping[attr] > maxSlot)
-         maxSlot = outputMapping[attr];
-   }
-   gs_num_outputs = maxSlot + 1;
-
-#if 0 /* debug */
-   {
-      GLuint i;
-      printf("outputMapping? %d\n", outputMapping ? 1 : 0);
-      if (outputMapping) {
-         printf("attr -> slot\n");
-         for (i = 0; i < 16;  i++) {
-            printf(" %2d       %3d\n", i, outputMapping[i]);
-         }
-      }
-      printf("slot    sem_name  sem_index\n");
-      for (i = 0; i < gs_num_outputs; i++) {
-         printf(" %2d         %d         %d\n",
-                i,
-                gs_output_semantic_name[i],
-                gs_output_semantic_index[i]);
-      }
-   }
-#endif
-
-   /* free old shader state, if any */
-   if (stgp->tgsi.tokens) {
-      st_free_tokens(stgp->tgsi.tokens);
-      stgp->tgsi.tokens = NULL;
-   }
-
-   ureg_property_gs_input_prim(ureg, stgp->Base.InputType);
-   ureg_property_gs_output_prim(ureg, stgp->Base.OutputType);
-   ureg_property_gs_max_vertices(ureg, stgp->Base.VerticesOut);
-
-   error = st_translate_mesa_program(st->ctx,
-                                     TGSI_PROCESSOR_GEOMETRY,
-                                     ureg,
-                                     &stgp->Base.Base,
-                                     /* inputs */
-                                     gs_num_inputs,
-                                     inputMapping,
-                                     stgp->input_semantic_name,
-                                     stgp->input_semantic_index,
-                                     NULL,
-                                     /* outputs */
-                                     gs_num_outputs,
-                                     outputMapping,
-                                     gs_output_semantic_name,
-                                     gs_output_semantic_index,
-                                     FALSE);
-
-   stgp->num_inputs = gs_num_inputs;
-   stgp->tgsi.tokens = ureg_get_tokens( ureg, NULL );
-   ureg_destroy( ureg );
-
-   /* fill in new variant */
-   gpv->driver_shader = pipe->create_gs_state(pipe, &stgp->tgsi);
-   gpv->key = *key;
-
-   if ((ST_DEBUG & DEBUG_TGSI) && (ST_DEBUG & DEBUG_MESA)) {
-      _mesa_print_program(&stgp->Base.Base);
-      debug_printf("\n");
-   }
-
-   if (ST_DEBUG & DEBUG_TGSI) {
-      tgsi_dump(stgp->tgsi.tokens, 0);
-      debug_printf("\n");
-   }
-
-   return gpv;
-}
-
-
-/**
- * Get/create geometry program variant.
- */
-struct st_gp_variant *
-st_get_gp_variant(struct st_context *st,
-                  struct st_geometry_program *stgp,
-                  const struct st_gp_variant_key *key)
-{
-   struct st_gp_variant *gpv;
-
-   /* Search for existing variant */
-   for (gpv = stgp->variants; gpv; gpv = gpv->next) {
-      if (memcmp(&gpv->key, key, sizeof(*key)) == 0) {
-         break;
-      }
-   }
-
-   if (!gpv) {
-      /* create new */
-      gpv = st_translate_geometry_program(st, stgp, key);
-      if (gpv) {
-         /* insert into list */
-         gpv->next = stgp->variants;
-         stgp->variants = gpv;
-      }
-   }
-
-   return gpv;
-}
-
-
-
-
-/**
- * Debug- print current shader text
- */
-void
-st_print_shaders(struct gl_context *ctx)
-{
-   struct gl_shader_program *shProg[3] = {
-      ctx->Shader.CurrentVertexProgram,
-      ctx->Shader.CurrentGeometryProgram,
-      ctx->Shader.CurrentFragmentProgram,
-   };
-   unsigned j;
-
-   for (j = 0; j < 3; j++) {
-      unsigned i;
-
-      if (shProg[j] == NULL)
-	 continue;
-
-      for (i = 0; i < shProg[j]->NumShaders; i++) {
-	 struct gl_shader *sh;
-
-	 switch (shProg[j]->Shaders[i]->Type) {
-	 case GL_VERTEX_SHADER:
-	    sh = (i != 0) ? NULL : shProg[j]->Shaders[i];
-	    break;
-	 case GL_GEOMETRY_SHADER_ARB:
-	    sh = (i != 1) ? NULL : shProg[j]->Shaders[i];
-	    break;
-	 case GL_FRAGMENT_SHADER:
-	    sh = (i != 2) ? NULL : shProg[j]->Shaders[i];
-	    break;
-	 default:
-	    assert(0);
-	    sh = NULL;
-	    break;
-	 }
-
-	 if (sh != NULL) {
-	    printf("GLSL shader %u of %u:\n", i, shProg[j]->NumShaders);
-	    printf("%s\n", sh->Source);
-	 }
-      }
-   }
-}
-
-
-/**
- * Vert/Geom/Frag programs have per-context variants.  Free all the
- * variants attached to the given program which match the given context.
- */
-static void
-destroy_program_variants(struct st_context *st, struct gl_program *program)
-{
-   if (!program)
-      return;
-
-   switch (program->Target) {
-   case GL_VERTEX_PROGRAM_ARB:
-      {
-         struct st_vertex_program *stvp = (struct st_vertex_program *) program;
-         struct st_vp_variant *vpv, **prevPtr = &stvp->variants;
-
-         for (vpv = stvp->variants; vpv; ) {
-            struct st_vp_variant *next = vpv->next;
-            if (vpv->key.st == st) {
-               /* unlink from list */
-               *prevPtr = next;
-               /* destroy this variant */
-               delete_vp_variant(st, vpv);
-            }
-            else {
-               prevPtr = &vpv->next;
-            }
-            vpv = next;
-         }
-      }
-      break;
-   case GL_FRAGMENT_PROGRAM_ARB:
-      {
-         struct st_fragment_program *stfp =
-            (struct st_fragment_program *) program;
-         struct st_fp_variant *fpv, **prevPtr = &stfp->variants;
-
-         for (fpv = stfp->variants; fpv; ) {
-            struct st_fp_variant *next = fpv->next;
-            if (fpv->key.st == st) {
-               /* unlink from list */
-               *prevPtr = next;
-               /* destroy this variant */
-               delete_fp_variant(st, fpv);
-            }
-            else {
-               prevPtr = &fpv->next;
-            }
-            fpv = next;
-         }
-      }
-      break;
-   case MESA_GEOMETRY_PROGRAM:
-      {
-         struct st_geometry_program *stgp =
-            (struct st_geometry_program *) program;
-         struct st_gp_variant *gpv, **prevPtr = &stgp->variants;
-
-         for (gpv = stgp->variants; gpv; ) {
-            struct st_gp_variant *next = gpv->next;
-            if (gpv->key.st == st) {
-               /* unlink from list */
-               *prevPtr = next;
-               /* destroy this variant */
-               delete_gp_variant(st, gpv);
-            }
-            else {
-               prevPtr = &gpv->next;
-            }
-            gpv = next;
-         }
-      }
-      break;
-   default:
-      _mesa_problem(NULL, "Unexpected program target in "
-                    "destroy_program_variants_cb()");
-   }
-}
-
-
-/**
- * Callback for _mesa_HashWalk.  Free all the shader's program variants
- * which match the given context.
- */
-static void
-destroy_shader_program_variants_cb(GLuint key, void *data, void *userData)
-{
-   struct st_context *st = (struct st_context *) userData;
-   struct gl_shader *shader = (struct gl_shader *) data;
-
-   switch (shader->Type) {
-   case GL_SHADER_PROGRAM_MESA:
-      {
-         struct gl_shader_program *shProg = (struct gl_shader_program *) data;
-         GLuint i;
-
-         for (i = 0; i < shProg->NumShaders; i++) {
-            destroy_program_variants(st, shProg->Shaders[i]->Program);
-         }
-
-         destroy_program_variants(st, (struct gl_program *)
-                                  shProg->VertexProgram);
-         destroy_program_variants(st, (struct gl_program *)
-                                  shProg->FragmentProgram);
-         destroy_program_variants(st, (struct gl_program *)
-                                  shProg->GeometryProgram);
-      }
-      break;
-   case GL_VERTEX_SHADER:
-   case GL_FRAGMENT_SHADER:
-   case GL_GEOMETRY_SHADER:
-      {
-         destroy_program_variants(st, shader->Program);
-      }
-      break;
-   default:
-      assert(0);
-   }
-}
-
-
-/**
- * Callback for _mesa_HashWalk.  Free all the program variants which match
- * the given context.
- */
-static void
-destroy_program_variants_cb(GLuint key, void *data, void *userData)
-{
-   struct st_context *st = (struct st_context *) userData;
-   struct gl_program *program = (struct gl_program *) data;
-   destroy_program_variants(st, program);
-}
-
-
-/**
- * Walk over all shaders and programs to delete any variants which
- * belong to the given context.
- * This is called during context tear-down.
- */
-void
-st_destroy_program_variants(struct st_context *st)
-{
-   /* ARB vert/frag program */
-   _mesa_HashWalk(st->ctx->Shared->Programs,
-                  destroy_program_variants_cb, st);
-
-   /* GLSL vert/frag/geom shaders */
-   _mesa_HashWalk(st->ctx->Shared->ShaderObjects,
-                  destroy_shader_program_variants_cb, st);
-}
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+ /*

+  * Authors:

+  *   Keith Whitwell <keith@tungstengraphics.com>

+  *   Brian Paul

+  */

+

+

+#include "main/imports.h"

+#include "main/hash.h"

+#include "main/mfeatures.h"

+#include "main/mtypes.h"

+#include "program/prog_parameter.h"

+#include "program/prog_print.h"

+#include "program/programopt.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "pipe/p_shader_tokens.h"

+#include "draw/draw_context.h"

+#include "tgsi/tgsi_dump.h"

+#include "tgsi/tgsi_ureg.h"

+

+#include "st_debug.h"

+#include "st_cb_bitmap.h"

+#include "st_cb_drawpixels.h"

+#include "st_context.h"

+#include "st_program.h"

+#include "st_mesa_to_tgsi.h"

+#include "cso_cache/cso_context.h"

+

+

+

+/**

+ * Delete a vertex program variant.  Note the caller must unlink

+ * the variant from the linked list.

+ */

+static void

+delete_vp_variant(struct st_context *st, struct st_vp_variant *vpv)

+{

+   if (vpv->driver_shader) 

+      cso_delete_vertex_shader(st->cso_context, vpv->driver_shader);

+      

+#if FEATURE_feedback || FEATURE_rastpos

+   if (vpv->draw_shader)

+      draw_delete_vertex_shader( st->draw, vpv->draw_shader );

+#endif

+      

+   if (vpv->tgsi.tokens)

+      st_free_tokens(vpv->tgsi.tokens);

+      

+   FREE( vpv );

+}

+

+

+

+/**

+ * Clean out any old compilations:

+ */

+void

+st_release_vp_variants( struct st_context *st,

+                        struct st_vertex_program *stvp )

+{

+   struct st_vp_variant *vpv;

+

+   for (vpv = stvp->variants; vpv; ) {

+      struct st_vp_variant *next = vpv->next;

+      delete_vp_variant(st, vpv);

+      vpv = next;

+   }

+

+   stvp->variants = NULL;

+}

+

+

+

+/**

+ * Delete a fragment program variant.  Note the caller must unlink

+ * the variant from the linked list.

+ */

+static void

+delete_fp_variant(struct st_context *st, struct st_fp_variant *fpv)

+{

+   if (fpv->driver_shader) 

+      cso_delete_fragment_shader(st->cso_context, fpv->driver_shader);

+   if (fpv->parameters)

+      _mesa_free_parameter_list(fpv->parameters);

+      

+   FREE(fpv);

+}

+

+

+/**

+ * Free all variants of a fragment program.

+ */

+void

+st_release_fp_variants(struct st_context *st, struct st_fragment_program *stfp)

+{

+   struct st_fp_variant *fpv;

+

+   for (fpv = stfp->variants; fpv; ) {

+      struct st_fp_variant *next = fpv->next;

+      delete_fp_variant(st, fpv);

+      fpv = next;

+   }

+

+   stfp->variants = NULL;

+}

+

+

+/**

+ * Delete a geometry program variant.  Note the caller must unlink

+ * the variant from the linked list.

+ */

+static void

+delete_gp_variant(struct st_context *st, struct st_gp_variant *gpv)

+{

+   if (gpv->driver_shader) 

+      cso_delete_geometry_shader(st->cso_context, gpv->driver_shader);

+      

+   FREE(gpv);

+}

+

+

+/**

+ * Free all variants of a geometry program.

+ */

+void

+st_release_gp_variants(struct st_context *st, struct st_geometry_program *stgp)

+{

+   struct st_gp_variant *gpv;

+

+   for (gpv = stgp->variants; gpv; ) {

+      struct st_gp_variant *next = gpv->next;

+      delete_gp_variant(st, gpv);

+      gpv = next;

+   }

+

+   stgp->variants = NULL;

+}

+

+

+

+

+/**

+ * Translate a Mesa vertex shader into a TGSI shader.

+ * \param outputMapping  to map vertex program output registers (VERT_RESULT_x)

+ *       to TGSI output slots

+ * \param tokensOut  destination for TGSI tokens

+ * \return  pointer to cached pipe_shader object.

+ */

+static void

+st_prepare_vertex_program(struct st_context *st,

+                            struct st_vertex_program *stvp)

+{

+   GLuint attr;

+

+   stvp->num_inputs = 0;

+   stvp->num_outputs = 0;

+

+   if (stvp->Base.IsPositionInvariant)

+      _mesa_insert_mvp_code(st->ctx, &stvp->Base);

+

+   assert(stvp->Base.Base.NumInstructions > 1);

+

+   /*

+    * Determine number of inputs, the mappings between VERT_ATTRIB_x

+    * and TGSI generic input indexes, plus input attrib semantic info.

+    */

+   for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {

+      if (stvp->Base.Base.InputsRead & (1 << attr)) {

+         stvp->input_to_index[attr] = stvp->num_inputs;

+         stvp->index_to_input[stvp->num_inputs] = attr;

+         stvp->num_inputs++;

+      }

+   }

+   /* bit of a hack, presetup potentially unused edgeflag input */

+   stvp->input_to_index[VERT_ATTRIB_EDGEFLAG] = stvp->num_inputs;

+   stvp->index_to_input[stvp->num_inputs] = VERT_ATTRIB_EDGEFLAG;

+

+   /* Compute mapping of vertex program outputs to slots.

+    */

+   for (attr = 0; attr < VERT_RESULT_MAX; attr++) {

+      if ((stvp->Base.Base.OutputsWritten & BITFIELD64_BIT(attr)) == 0) {

+         stvp->result_to_output[attr] = ~0;

+      }

+      else {

+         unsigned slot = stvp->num_outputs++;

+

+         stvp->result_to_output[attr] = slot;

+

+         switch (attr) {

+         case VERT_RESULT_HPOS:

+            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_POSITION;

+            stvp->output_semantic_index[slot] = 0;

+            break;

+         case VERT_RESULT_COL0:

+            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;

+            stvp->output_semantic_index[slot] = 0;

+            break;

+         case VERT_RESULT_COL1:

+            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;

+            stvp->output_semantic_index[slot] = 1;

+            break;

+         case VERT_RESULT_BFC0:

+            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;

+            stvp->output_semantic_index[slot] = 0;

+            break;

+         case VERT_RESULT_BFC1:

+            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;

+            stvp->output_semantic_index[slot] = 1;

+            break;

+         case VERT_RESULT_FOGC:

+            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_FOG;

+            stvp->output_semantic_index[slot] = 0;

+            break;

+         case VERT_RESULT_PSIZ:

+            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_PSIZE;

+            stvp->output_semantic_index[slot] = 0;

+            break;

+         case VERT_RESULT_EDGE:

+            assert(0);

+            break;

+

+         case VERT_RESULT_TEX0:

+         case VERT_RESULT_TEX1:

+         case VERT_RESULT_TEX2:

+         case VERT_RESULT_TEX3:

+         case VERT_RESULT_TEX4:

+         case VERT_RESULT_TEX5:

+         case VERT_RESULT_TEX6:

+         case VERT_RESULT_TEX7:

+            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;

+            stvp->output_semantic_index[slot] = attr - VERT_RESULT_TEX0;

+            break;

+

+         case VERT_RESULT_VAR0:

+         default:

+            assert(attr < VERT_RESULT_MAX);

+            stvp->output_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;

+            stvp->output_semantic_index[slot] = (FRAG_ATTRIB_VAR0 - 

+                                                FRAG_ATTRIB_TEX0 +

+                                                attr - 

+                                                VERT_RESULT_VAR0);

+            break;

+         }

+      }

+   }

+   /* similar hack to above, presetup potentially unused edgeflag output */

+   stvp->result_to_output[VERT_RESULT_EDGE] = stvp->num_outputs;

+   stvp->output_semantic_name[stvp->num_outputs] = TGSI_SEMANTIC_EDGEFLAG;

+   stvp->output_semantic_index[stvp->num_outputs] = 0;

+}

+

+

+/**

+ * Translate a vertex program to create a new variant.

+ */

+static struct st_vp_variant *

+st_translate_vertex_program(struct st_context *st,

+                            struct st_vertex_program *stvp,

+                            const struct st_vp_variant_key *key)

+{

+   struct st_vp_variant *vpv = CALLOC_STRUCT(st_vp_variant);

+   struct pipe_context *pipe = st->pipe;

+   struct ureg_program *ureg;

+   enum pipe_error error;

+   unsigned num_outputs;

+

+   st_prepare_vertex_program( st, stvp );

+

+   _mesa_remove_output_reads(&stvp->Base.Base, PROGRAM_OUTPUT);

+   _mesa_remove_output_reads(&stvp->Base.Base, PROGRAM_VARYING);

+

+   ureg = ureg_create( TGSI_PROCESSOR_VERTEX );

+   if (ureg == NULL) {

+      FREE(vpv);

+      return NULL;

+   }

+

+   vpv->key = *key;

+

+   vpv->num_inputs = stvp->num_inputs;

+   num_outputs = stvp->num_outputs;

+   if (key->passthrough_edgeflags) {

+      vpv->num_inputs++;

+      num_outputs++;

+   }

+

+   if (ST_DEBUG & DEBUG_MESA) {

+      _mesa_print_program(&stvp->Base.Base);

+      _mesa_print_program_parameters(st->ctx, &stvp->Base.Base);

+      debug_printf("\n");

+   }

+

+   error = st_translate_mesa_program(st->ctx,

+                                     TGSI_PROCESSOR_VERTEX,

+                                     ureg,

+                                     &stvp->Base.Base,

+                                     /* inputs */

+                                     vpv->num_inputs,

+                                     stvp->input_to_index,

+                                     NULL, /* input semantic name */

+                                     NULL, /* input semantic index */

+                                     NULL,

+                                     /* outputs */

+                                     num_outputs,

+                                     stvp->result_to_output,

+                                     stvp->output_semantic_name,

+                                     stvp->output_semantic_index,

+                                     key->passthrough_edgeflags );

+

+   if (error)

+      goto fail;

+

+   vpv->tgsi.tokens = ureg_get_tokens( ureg, NULL );

+   if (!vpv->tgsi.tokens)

+      goto fail;

+

+   ureg_destroy( ureg );

+

+   vpv->driver_shader = pipe->create_vs_state(pipe, &vpv->tgsi);

+

+   if (ST_DEBUG & DEBUG_TGSI) {

+      tgsi_dump( vpv->tgsi.tokens, 0 );

+      debug_printf("\n");

+   }

+

+   return vpv;

+

+fail:

+   debug_printf("%s: failed to translate Mesa program:\n", __FUNCTION__);

+   _mesa_print_program(&stvp->Base.Base);

+   debug_assert(0);

+

+   ureg_destroy( ureg );

+   return NULL;

+}

+

+

+/**

+ * Find/create a vertex program variant.

+ */

+struct st_vp_variant *

+st_get_vp_variant(struct st_context *st,

+                  struct st_vertex_program *stvp,

+                  const struct st_vp_variant_key *key)

+{

+   struct st_vp_variant *vpv;

+

+   /* Search for existing variant */

+   for (vpv = stvp->variants; vpv; vpv = vpv->next) {

+      if (memcmp(&vpv->key, key, sizeof(*key)) == 0) {

+         break;

+      }

+   }

+

+   if (!vpv) {

+      /* create now */

+      vpv = st_translate_vertex_program(st, stvp, key);

+      if (vpv) {

+         /* insert into list */

+         vpv->next = stvp->variants;

+         stvp->variants = vpv;

+      }

+   }

+

+   return vpv;

+}

+

+

+/**

+ * Translate a Mesa fragment shader into a TGSI shader using extra info in

+ * the key.

+ * \return  new fragment program variant

+ */

+static struct st_fp_variant *

+st_translate_fragment_program(struct st_context *st,

+                              struct st_fragment_program *stfp,

+                              const struct st_fp_variant_key *key)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct st_fp_variant *variant = CALLOC_STRUCT(st_fp_variant);

+   GLboolean deleteFP = GL_FALSE;

+

+   if (!variant)

+      return NULL;

+

+   assert(!(key->bitmap && key->drawpixels));

+

+#if FEATURE_drawpix

+   if (key->bitmap) {

+      /* glBitmap drawing */

+      struct gl_fragment_program *fp; /* we free this temp program below */

+

+      st_make_bitmap_fragment_program(st, &stfp->Base,

+                                      &fp, &variant->bitmap_sampler);

+

+      variant->parameters = _mesa_clone_parameter_list(fp->Base.Parameters);

+      stfp = st_fragment_program(fp);

+      deleteFP = GL_TRUE;

+   }

+   else if (key->drawpixels) {

+      /* glDrawPixels drawing */

+      struct gl_fragment_program *fp; /* we free this temp program below */

+

+      if (key->drawpixels_z || key->drawpixels_stencil) {

+         fp = st_make_drawpix_z_stencil_program(st, key->drawpixels_z,

+                                                key->drawpixels_stencil);

+      }

+      else {

+         /* RGBA */

+         st_make_drawpix_fragment_program(st, &stfp->Base, &fp);

+         variant->parameters = _mesa_clone_parameter_list(fp->Base.Parameters);

+         deleteFP = GL_TRUE;

+      }

+      stfp = st_fragment_program(fp);

+   }

+#endif

+

+   if (!stfp->tgsi.tokens) {

+      /* need to translate Mesa instructions to TGSI now */

+      GLuint outputMapping[FRAG_RESULT_MAX];

+      GLuint inputMapping[FRAG_ATTRIB_MAX];

+      GLuint interpMode[PIPE_MAX_SHADER_INPUTS];  /* XXX size? */

+      GLuint attr;

+      enum pipe_error error;

+      const GLbitfield inputsRead = stfp->Base.Base.InputsRead;

+      struct ureg_program *ureg;

+      GLboolean write_all = GL_FALSE;

+

+      ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS];

+      ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS];

+      uint fs_num_inputs = 0;

+

+      ubyte fs_output_semantic_name[PIPE_MAX_SHADER_OUTPUTS];

+      ubyte fs_output_semantic_index[PIPE_MAX_SHADER_OUTPUTS];

+      uint fs_num_outputs = 0;

+

+

+      _mesa_remove_output_reads(&stfp->Base.Base, PROGRAM_OUTPUT);

+

+      /*

+       * Convert Mesa program inputs to TGSI input register semantics.

+       */

+      for (attr = 0; attr < FRAG_ATTRIB_MAX; attr++) {

+         if (inputsRead & (1 << attr)) {

+            const GLuint slot = fs_num_inputs++;

+

+            inputMapping[attr] = slot;

+

+            switch (attr) {

+            case FRAG_ATTRIB_WPOS:

+               input_semantic_name[slot] = TGSI_SEMANTIC_POSITION;

+               input_semantic_index[slot] = 0;

+               interpMode[slot] = TGSI_INTERPOLATE_LINEAR;

+               break;

+            case FRAG_ATTRIB_COL0:

+               input_semantic_name[slot] = TGSI_SEMANTIC_COLOR;

+               input_semantic_index[slot] = 0;

+               interpMode[slot] = TGSI_INTERPOLATE_LINEAR;

+               break;

+            case FRAG_ATTRIB_COL1:

+               input_semantic_name[slot] = TGSI_SEMANTIC_COLOR;

+               input_semantic_index[slot] = 1;

+               interpMode[slot] = TGSI_INTERPOLATE_LINEAR;

+               break;

+            case FRAG_ATTRIB_FOGC:

+               input_semantic_name[slot] = TGSI_SEMANTIC_FOG;

+               input_semantic_index[slot] = 0;

+               interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;

+               break;

+            case FRAG_ATTRIB_FACE:

+               input_semantic_name[slot] = TGSI_SEMANTIC_FACE;

+               input_semantic_index[slot] = 0;

+               interpMode[slot] = TGSI_INTERPOLATE_CONSTANT;

+               break;

+               /* In most cases, there is nothing special about these

+                * inputs, so adopt a convention to use the generic

+                * semantic name and the mesa FRAG_ATTRIB_ number as the

+                * index. 

+                * 

+                * All that is required is that the vertex shader labels

+                * its own outputs similarly, and that the vertex shader

+                * generates at least every output required by the

+                * fragment shader plus fixed-function hardware (such as

+                * BFC).

+                * 

+                * There is no requirement that semantic indexes start at

+                * zero or be restricted to a particular range -- nobody

+                * should be building tables based on semantic index.

+                */

+            case FRAG_ATTRIB_PNTC:

+            case FRAG_ATTRIB_TEX0:

+            case FRAG_ATTRIB_TEX1:

+            case FRAG_ATTRIB_TEX2:

+            case FRAG_ATTRIB_TEX3:

+            case FRAG_ATTRIB_TEX4:

+            case FRAG_ATTRIB_TEX5:

+            case FRAG_ATTRIB_TEX6:

+            case FRAG_ATTRIB_TEX7:

+            case FRAG_ATTRIB_VAR0:

+            default:

+               /* Actually, let's try and zero-base this just for

+                * readability of the generated TGSI.

+                */

+               assert(attr >= FRAG_ATTRIB_TEX0);

+               input_semantic_index[slot] = (attr - FRAG_ATTRIB_TEX0);

+               input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;

+               if (attr == FRAG_ATTRIB_PNTC)

+                  interpMode[slot] = TGSI_INTERPOLATE_LINEAR;

+               else

+                  interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;

+               break;

+            }

+         }

+         else {

+            inputMapping[attr] = -1;

+         }

+      }

+

+      /*

+       * Semantics and mapping for outputs

+       */

+      {

+         uint numColors = 0;

+         GLbitfield64 outputsWritten = stfp->Base.Base.OutputsWritten;

+

+         /* if z is written, emit that first */

+         if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_DEPTH)) {

+            fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_POSITION;

+            fs_output_semantic_index[fs_num_outputs] = 0;

+            outputMapping[FRAG_RESULT_DEPTH] = fs_num_outputs;

+            fs_num_outputs++;

+            outputsWritten &= ~(1 << FRAG_RESULT_DEPTH);

+         }

+

+         if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_STENCIL)) {

+            fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_STENCIL;

+            fs_output_semantic_index[fs_num_outputs] = 0;

+            outputMapping[FRAG_RESULT_STENCIL] = fs_num_outputs;

+            fs_num_outputs++;

+            outputsWritten &= ~(1 << FRAG_RESULT_STENCIL);

+         }

+

+         /* handle remaning outputs (color) */

+         for (attr = 0; attr < FRAG_RESULT_MAX; attr++) {

+            if (outputsWritten & BITFIELD64_BIT(attr)) {

+               switch (attr) {

+               case FRAG_RESULT_DEPTH:

+               case FRAG_RESULT_STENCIL:

+                  /* handled above */

+                  assert(0);

+                  break;

+               case FRAG_RESULT_COLOR:

+                  write_all = GL_TRUE; /* fallthrough */

+               default:

+                  assert(attr == FRAG_RESULT_COLOR ||

+                         (FRAG_RESULT_DATA0 <= attr && attr < FRAG_RESULT_MAX));

+                  fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_COLOR;

+                  fs_output_semantic_index[fs_num_outputs] = numColors;

+                  outputMapping[attr] = fs_num_outputs;

+                  numColors++;

+                  break;

+               }

+

+               fs_num_outputs++;

+            }

+         }

+      }

+

+      ureg = ureg_create( TGSI_PROCESSOR_FRAGMENT );

+      if (ureg == NULL)

+         return NULL;

+

+      if (ST_DEBUG & DEBUG_MESA) {

+         _mesa_print_program(&stfp->Base.Base);

+         _mesa_print_program_parameters(st->ctx, &stfp->Base.Base);

+         debug_printf("\n");

+      }

+      if (write_all == GL_TRUE)

+         ureg_property_fs_color0_writes_all_cbufs(ureg, 1);

+

+      error = st_translate_mesa_program(st->ctx,

+                                        TGSI_PROCESSOR_FRAGMENT,

+                                        ureg,

+                                        &stfp->Base.Base,

+                                        /* inputs */

+                                        fs_num_inputs,

+                                        inputMapping,

+                                        input_semantic_name,

+                                        input_semantic_index,

+                                        interpMode,

+                                        /* outputs */

+                                        fs_num_outputs,

+                                        outputMapping,

+                                        fs_output_semantic_name,

+                                        fs_output_semantic_index, FALSE );

+

+      stfp->tgsi.tokens = ureg_get_tokens( ureg, NULL );

+      ureg_destroy( ureg );

+   }

+

+   /* fill in variant */

+   variant->driver_shader = pipe->create_fs_state(pipe, &stfp->tgsi);

+   variant->key = *key;

+

+   if (ST_DEBUG & DEBUG_TGSI) {

+      tgsi_dump( stfp->tgsi.tokens, 0/*TGSI_DUMP_VERBOSE*/ );

+      debug_printf("\n");

+   }

+

+   if (deleteFP) {

+      /* Free the temporary program made above */

+      struct gl_fragment_program *fp = &stfp->Base;

+      _mesa_reference_fragprog(st->ctx, &fp, NULL);

+   }

+

+   return variant;

+}

+

+

+/**

+ * Translate fragment program if needed.

+ */

+struct st_fp_variant *

+st_get_fp_variant(struct st_context *st,

+                  struct st_fragment_program *stfp,

+                  const struct st_fp_variant_key *key)

+{

+   struct st_fp_variant *fpv;

+

+   /* Search for existing variant */

+   for (fpv = stfp->variants; fpv; fpv = fpv->next) {

+      if (memcmp(&fpv->key, key, sizeof(*key)) == 0) {

+         break;

+      }

+   }

+

+   if (!fpv) {

+      /* create new */

+      fpv = st_translate_fragment_program(st, stfp, key);

+      if (fpv) {

+         /* insert into list */

+         fpv->next = stfp->variants;

+         stfp->variants = fpv;

+      }

+   }

+

+   return fpv;

+}

+

+

+/**

+ * Translate a geometry program to create a new variant.

+ */

+static struct st_gp_variant *

+st_translate_geometry_program(struct st_context *st,

+                              struct st_geometry_program *stgp,

+                              const struct st_gp_variant_key *key)

+{

+   GLuint inputMapping[GEOM_ATTRIB_MAX];

+   GLuint outputMapping[GEOM_RESULT_MAX];

+   struct pipe_context *pipe = st->pipe;

+   enum pipe_error error;

+   GLuint attr;

+   const GLbitfield inputsRead = stgp->Base.Base.InputsRead;

+   GLuint vslot = 0;

+   GLuint num_generic = 0;

+

+   uint gs_num_inputs = 0;

+   uint gs_builtin_inputs = 0;

+   uint gs_array_offset = 0;

+

+   ubyte gs_output_semantic_name[PIPE_MAX_SHADER_OUTPUTS];

+   ubyte gs_output_semantic_index[PIPE_MAX_SHADER_OUTPUTS];

+   uint gs_num_outputs = 0;

+

+   GLint i;

+   GLuint maxSlot = 0;

+   struct ureg_program *ureg;

+

+   struct st_gp_variant *gpv;

+

+   gpv = CALLOC_STRUCT(st_gp_variant);

+   if (!gpv)

+      return NULL;

+

+   _mesa_remove_output_reads(&stgp->Base.Base, PROGRAM_OUTPUT);

+   _mesa_remove_output_reads(&stgp->Base.Base, PROGRAM_VARYING);

+

+   ureg = ureg_create( TGSI_PROCESSOR_GEOMETRY );

+   if (ureg == NULL) {

+      FREE(gpv);

+      return NULL;

+   }

+

+   /* which vertex output goes to the first geometry input */

+   vslot = 0;

+

+   memset(inputMapping, 0, sizeof(inputMapping));

+   memset(outputMapping, 0, sizeof(outputMapping));

+

+   /*

+    * Convert Mesa program inputs to TGSI input register semantics.

+    */

+   for (attr = 0; attr < GEOM_ATTRIB_MAX; attr++) {

+      if (inputsRead & (1 << attr)) {

+         const GLuint slot = gs_num_inputs;

+

+         gs_num_inputs++;

+

+         inputMapping[attr] = slot;

+

+         stgp->input_map[slot + gs_array_offset] = vslot - gs_builtin_inputs;

+         stgp->input_to_index[attr] = vslot;

+         stgp->index_to_input[vslot] = attr;

+         ++vslot;

+

+         if (attr != GEOM_ATTRIB_PRIMITIVE_ID) {

+            gs_array_offset += 2;

+         } else

+            ++gs_builtin_inputs;

+

+#if 0

+         debug_printf("input map at %d = %d\n",

+                      slot + gs_array_offset, stgp->input_map[slot + gs_array_offset]);

+#endif

+

+         switch (attr) {

+         case GEOM_ATTRIB_PRIMITIVE_ID:

+            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_PRIMID;

+            stgp->input_semantic_index[slot] = 0;

+            break;

+         case GEOM_ATTRIB_POSITION:

+            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_POSITION;

+            stgp->input_semantic_index[slot] = 0;

+            break;

+         case GEOM_ATTRIB_COLOR0:

+            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_COLOR;

+            stgp->input_semantic_index[slot] = 0;

+            break;

+         case GEOM_ATTRIB_COLOR1:

+            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_COLOR;

+            stgp->input_semantic_index[slot] = 1;

+            break;

+         case GEOM_ATTRIB_FOG_FRAG_COORD:

+            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_FOG;

+            stgp->input_semantic_index[slot] = 0;

+            break;

+         case GEOM_ATTRIB_TEX_COORD:

+            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;

+            stgp->input_semantic_index[slot] = num_generic++;

+            break;

+         case GEOM_ATTRIB_VAR0:

+            /* fall-through */

+         default:

+            stgp->input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;

+            stgp->input_semantic_index[slot] = num_generic++;

+         }

+      }

+   }

+

+   /* initialize output semantics to defaults */

+   for (i = 0; i < PIPE_MAX_SHADER_OUTPUTS; i++) {

+      gs_output_semantic_name[i] = TGSI_SEMANTIC_GENERIC;

+      gs_output_semantic_index[i] = 0;

+   }

+

+   num_generic = 0;

+   /*

+    * Determine number of outputs, the (default) output register

+    * mapping and the semantic information for each output.

+    */

+   for (attr = 0; attr < GEOM_RESULT_MAX; attr++) {

+      if (stgp->Base.Base.OutputsWritten & BITFIELD64_BIT(attr)) {

+         GLuint slot;

+

+         slot = gs_num_outputs;

+         gs_num_outputs++;

+         outputMapping[attr] = slot;

+

+         switch (attr) {

+         case GEOM_RESULT_POS:

+            assert(slot == 0);

+            gs_output_semantic_name[slot] = TGSI_SEMANTIC_POSITION;

+            gs_output_semantic_index[slot] = 0;

+            break;

+         case GEOM_RESULT_COL0:

+            gs_output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;

+            gs_output_semantic_index[slot] = 0;

+            break;

+         case GEOM_RESULT_COL1:

+            gs_output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;

+            gs_output_semantic_index[slot] = 1;

+            break;

+         case GEOM_RESULT_SCOL0:

+            gs_output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;

+            gs_output_semantic_index[slot] = 0;

+            break;

+         case GEOM_RESULT_SCOL1:

+            gs_output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;

+            gs_output_semantic_index[slot] = 1;

+            break;

+         case GEOM_RESULT_FOGC:

+            gs_output_semantic_name[slot] = TGSI_SEMANTIC_FOG;

+            gs_output_semantic_index[slot] = 0;

+            break;

+         case GEOM_RESULT_PSIZ:

+            gs_output_semantic_name[slot] = TGSI_SEMANTIC_PSIZE;

+            gs_output_semantic_index[slot] = 0;

+            break;

+         case GEOM_RESULT_TEX0:

+         case GEOM_RESULT_TEX1:

+         case GEOM_RESULT_TEX2:

+         case GEOM_RESULT_TEX3:

+         case GEOM_RESULT_TEX4:

+         case GEOM_RESULT_TEX5:

+         case GEOM_RESULT_TEX6:

+         case GEOM_RESULT_TEX7:

+            /* fall-through */

+         case GEOM_RESULT_VAR0:

+            /* fall-through */

+         default:

+            assert(slot < Elements(gs_output_semantic_name));

+            /* use default semantic info */

+            gs_output_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;

+            gs_output_semantic_index[slot] = num_generic++;

+         }

+      }

+   }

+

+   assert(gs_output_semantic_name[0] == TGSI_SEMANTIC_POSITION);

+

+   /* find max output slot referenced to compute gs_num_outputs */

+   for (attr = 0; attr < GEOM_RESULT_MAX; attr++) {

+      if (outputMapping[attr] != ~0 && outputMapping[attr] > maxSlot)

+         maxSlot = outputMapping[attr];

+   }

+   gs_num_outputs = maxSlot + 1;

+

+#if 0 /* debug */

+   {

+      GLuint i;

+      printf("outputMapping? %d\n", outputMapping ? 1 : 0);

+      if (outputMapping) {

+         printf("attr -> slot\n");

+         for (i = 0; i < 16;  i++) {

+            printf(" %2d       %3d\n", i, outputMapping[i]);

+         }

+      }

+      printf("slot    sem_name  sem_index\n");

+      for (i = 0; i < gs_num_outputs; i++) {

+         printf(" %2d         %d         %d\n",

+                i,

+                gs_output_semantic_name[i],

+                gs_output_semantic_index[i]);

+      }

+   }

+#endif

+

+   /* free old shader state, if any */

+   if (stgp->tgsi.tokens) {

+      st_free_tokens(stgp->tgsi.tokens);

+      stgp->tgsi.tokens = NULL;

+   }

+

+   ureg_property_gs_input_prim(ureg, stgp->Base.InputType);

+   ureg_property_gs_output_prim(ureg, stgp->Base.OutputType);

+   ureg_property_gs_max_vertices(ureg, stgp->Base.VerticesOut);

+

+   error = st_translate_mesa_program(st->ctx,

+                                     TGSI_PROCESSOR_GEOMETRY,

+                                     ureg,

+                                     &stgp->Base.Base,

+                                     /* inputs */

+                                     gs_num_inputs,

+                                     inputMapping,

+                                     stgp->input_semantic_name,

+                                     stgp->input_semantic_index,

+                                     NULL,

+                                     /* outputs */

+                                     gs_num_outputs,

+                                     outputMapping,

+                                     gs_output_semantic_name,

+                                     gs_output_semantic_index,

+                                     FALSE);

+

+   stgp->num_inputs = gs_num_inputs;

+   stgp->tgsi.tokens = ureg_get_tokens( ureg, NULL );

+   ureg_destroy( ureg );

+

+   /* fill in new variant */

+   gpv->driver_shader = pipe->create_gs_state(pipe, &stgp->tgsi);

+   gpv->key = *key;

+

+   if ((ST_DEBUG & DEBUG_TGSI) && (ST_DEBUG & DEBUG_MESA)) {

+      _mesa_print_program(&stgp->Base.Base);

+      debug_printf("\n");

+   }

+

+   if (ST_DEBUG & DEBUG_TGSI) {

+      tgsi_dump(stgp->tgsi.tokens, 0);

+      debug_printf("\n");

+   }

+

+   return gpv;

+}

+

+

+/**

+ * Get/create geometry program variant.

+ */

+struct st_gp_variant *

+st_get_gp_variant(struct st_context *st,

+                  struct st_geometry_program *stgp,

+                  const struct st_gp_variant_key *key)

+{

+   struct st_gp_variant *gpv;

+

+   /* Search for existing variant */

+   for (gpv = stgp->variants; gpv; gpv = gpv->next) {

+      if (memcmp(&gpv->key, key, sizeof(*key)) == 0) {

+         break;

+      }

+   }

+

+   if (!gpv) {

+      /* create new */

+      gpv = st_translate_geometry_program(st, stgp, key);

+      if (gpv) {

+         /* insert into list */

+         gpv->next = stgp->variants;

+         stgp->variants = gpv;

+      }

+   }

+

+   return gpv;

+}

+

+

+

+

+/**

+ * Debug- print current shader text

+ */

+void

+st_print_shaders(struct gl_context *ctx)

+{

+   struct gl_shader_program *shProg[3] = {

+      ctx->Shader.CurrentVertexProgram,

+      ctx->Shader.CurrentGeometryProgram,

+      ctx->Shader.CurrentFragmentProgram,

+   };

+   unsigned j;

+

+   for (j = 0; j < 3; j++) {

+      unsigned i;

+

+      if (shProg[j] == NULL)

+	 continue;

+

+      for (i = 0; i < shProg[j]->NumShaders; i++) {

+	 struct gl_shader *sh;

+

+	 switch (shProg[j]->Shaders[i]->Type) {

+	 case GL_VERTEX_SHADER:

+	    sh = (i != 0) ? NULL : shProg[j]->Shaders[i];

+	    break;

+	 case GL_GEOMETRY_SHADER_ARB:

+	    sh = (i != 1) ? NULL : shProg[j]->Shaders[i];

+	    break;

+	 case GL_FRAGMENT_SHADER:

+	    sh = (i != 2) ? NULL : shProg[j]->Shaders[i];

+	    break;

+	 default:

+	    assert(0);

+	    sh = NULL;

+	    break;

+	 }

+

+	 if (sh != NULL) {

+	    printf("GLSL shader %u of %u:\n", i, shProg[j]->NumShaders);

+	    printf("%s\n", sh->Source);

+	 }

+      }

+   }

+}

+

+

+/**

+ * Vert/Geom/Frag programs have per-context variants.  Free all the

+ * variants attached to the given program which match the given context.

+ */

+static void

+destroy_program_variants(struct st_context *st, struct gl_program *program)

+{

+   if (!program)

+      return;

+

+   switch (program->Target) {

+   case GL_VERTEX_PROGRAM_ARB:

+      {

+         struct st_vertex_program *stvp = (struct st_vertex_program *) program;

+         struct st_vp_variant *vpv, **prevPtr = &stvp->variants;

+

+         for (vpv = stvp->variants; vpv; ) {

+            struct st_vp_variant *next = vpv->next;

+            if (vpv->key.st == st) {

+               /* unlink from list */

+               *prevPtr = next;

+               /* destroy this variant */

+               delete_vp_variant(st, vpv);

+            }

+            else {

+               prevPtr = &vpv->next;

+            }

+            vpv = next;

+         }

+      }

+      break;

+   case GL_FRAGMENT_PROGRAM_ARB:

+      {

+         struct st_fragment_program *stfp =

+            (struct st_fragment_program *) program;

+         struct st_fp_variant *fpv, **prevPtr = &stfp->variants;

+

+         for (fpv = stfp->variants; fpv; ) {

+            struct st_fp_variant *next = fpv->next;

+            if (fpv->key.st == st) {

+               /* unlink from list */

+               *prevPtr = next;

+               /* destroy this variant */

+               delete_fp_variant(st, fpv);

+            }

+            else {

+               prevPtr = &fpv->next;

+            }

+            fpv = next;

+         }

+      }

+      break;

+   case MESA_GEOMETRY_PROGRAM:

+      {

+         struct st_geometry_program *stgp =

+            (struct st_geometry_program *) program;

+         struct st_gp_variant *gpv, **prevPtr = &stgp->variants;

+

+         for (gpv = stgp->variants; gpv; ) {

+            struct st_gp_variant *next = gpv->next;

+            if (gpv->key.st == st) {

+               /* unlink from list */

+               *prevPtr = next;

+               /* destroy this variant */

+               delete_gp_variant(st, gpv);

+            }

+            else {

+               prevPtr = &gpv->next;

+            }

+            gpv = next;

+         }

+      }

+      break;

+   default:

+      _mesa_problem(NULL, "Unexpected program target in "

+                    "destroy_program_variants_cb()");

+   }

+}

+

+

+/**

+ * Callback for _mesa_HashWalk.  Free all the shader's program variants

+ * which match the given context.

+ */

+static void

+destroy_shader_program_variants_cb(GLuint key, void *data, void *userData)

+{

+   struct st_context *st = (struct st_context *) userData;

+   struct gl_shader *shader = (struct gl_shader *) data;

+

+   switch (shader->Type) {

+   case GL_SHADER_PROGRAM_MESA:

+      {

+         struct gl_shader_program *shProg = (struct gl_shader_program *) data;

+         GLuint i;

+

+         for (i = 0; i < shProg->NumShaders; i++) {

+            destroy_program_variants(st, shProg->Shaders[i]->Program);

+         }

+

+         destroy_program_variants(st, (struct gl_program *)

+                                  shProg->VertexProgram);

+         destroy_program_variants(st, (struct gl_program *)

+                                  shProg->FragmentProgram);

+         destroy_program_variants(st, (struct gl_program *)

+                                  shProg->GeometryProgram);

+      }

+      break;

+   case GL_VERTEX_SHADER:

+   case GL_FRAGMENT_SHADER:

+   case GL_GEOMETRY_SHADER:

+      {

+         destroy_program_variants(st, shader->Program);

+      }

+      break;

+   default:

+      assert(0);

+   }

+}

+

+

+/**

+ * Callback for _mesa_HashWalk.  Free all the program variants which match

+ * the given context.

+ */

+static void

+destroy_program_variants_cb(GLuint key, void *data, void *userData)

+{

+   struct st_context *st = (struct st_context *) userData;

+   struct gl_program *program = (struct gl_program *) data;

+   destroy_program_variants(st, program);

+}

+

+

+/**

+ * Walk over all shaders and programs to delete any variants which

+ * belong to the given context.

+ * This is called during context tear-down.

+ */

+void

+st_destroy_program_variants(struct st_context *st)

+{

+   /* ARB vert/frag program */

+   _mesa_HashWalk(st->ctx->Shared->Programs,

+                  destroy_program_variants_cb, st);

+

+   /* GLSL vert/frag/geom shaders */

+   _mesa_HashWalk(st->ctx->Shared->ShaderObjects,

+                  destroy_shader_program_variants_cb, st);

+}

diff --git a/mesalib/src/mesa/swrast/s_bitmap.c b/mesalib/src/mesa/swrast/s_bitmap.c
index 18f1c1866..af65874fd 100644
--- a/mesalib/src/mesa/swrast/s_bitmap.c
+++ b/mesalib/src/mesa/swrast/s_bitmap.c
@@ -1,223 +1,223 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-/**
- * \file swrast/s_bitmap.c
- * \brief glBitmap rendering.
- * \author Brian Paul
- */
-
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/condrender.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/pbo.h"
-
-#include "s_context.h"
-#include "s_span.h"
-
-
-
-/**
- * Render a bitmap.
- * Called via ctx->Driver.Bitmap()
- * All parameter error checking will have been done before this is called.
- */
-void
-_swrast_Bitmap( struct gl_context *ctx, GLint px, GLint py,
-		GLsizei width, GLsizei height,
-		const struct gl_pixelstore_attrib *unpack,
-		const GLubyte *bitmap )
-{
-   GLint row, col;
-   GLuint count = 0;
-   SWspan span;
-
-   ASSERT(ctx->RenderMode == GL_RENDER);
-
-   if (!_mesa_check_conditional_render(ctx))
-      return; /* don't draw */
-
-   bitmap = (const GLubyte *) _mesa_map_pbo_source(ctx, unpack, bitmap);
-   if (!bitmap)
-      return;
-
-   swrast_render_start(ctx);
-
-   if (SWRAST_CONTEXT(ctx)->NewState)
-      _swrast_validate_derived( ctx );
-
-   INIT_SPAN(span, GL_BITMAP);
-   span.end = width;
-   span.arrayMask = SPAN_XY;
-   _swrast_span_default_attribs(ctx, &span);
-
-   for (row = 0; row < height; row++) {
-      const GLubyte *src = (const GLubyte *) _mesa_image_address2d(unpack,
-                 bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, row, 0);
-
-      if (unpack->LsbFirst) {
-         /* Lsb first */
-         GLubyte mask = 1U << (unpack->SkipPixels & 0x7);
-         for (col = 0; col < width; col++) {
-            if (*src & mask) {
-               span.array->x[count] = px + col;
-               span.array->y[count] = py + row;
-               count++;
-            }
-            if (mask == 128U) {
-               src++;
-               mask = 1U;
-            }
-            else {
-               mask = mask << 1;
-            }
-         }
-
-         /* get ready for next row */
-         if (mask != 1)
-            src++;
-      }
-      else {
-         /* Msb first */
-         GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
-         for (col = 0; col < width; col++) {
-            if (*src & mask) {
-               span.array->x[count] = px + col;
-               span.array->y[count] = py + row;
-               count++;
-            }
-            if (mask == 1U) {
-               src++;
-               mask = 128U;
-            }
-            else {
-               mask = mask >> 1;
-            }
-         }
-
-         /* get ready for next row */
-         if (mask != 128)
-            src++;
-      }
-
-      if (count + width >= MAX_WIDTH || row + 1 == height) {
-         /* flush the span */
-         span.end = count;
-         _swrast_write_rgba_span(ctx, &span);
-         span.end = 0;
-         count = 0;
-      }
-   }
-
-   swrast_render_finish(ctx);
-
-   _mesa_unmap_pbo_source(ctx, unpack);
-}
-
-
-#if 0
-/*
- * XXX this is another way to implement Bitmap.  Use horizontal runs of
- * fragments, initializing the mask array to indicate which fragments to
- * draw or skip.
- */
-void
-_swrast_Bitmap( struct gl_context *ctx, GLint px, GLint py,
-		GLsizei width, GLsizei height,
-		const struct gl_pixelstore_attrib *unpack,
-		const GLubyte *bitmap )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLint row, col;
-   SWspan span;
-
-   ASSERT(ctx->RenderMode == GL_RENDER);
-   ASSERT(bitmap);
-
-   swrast_render_start(ctx);
-
-   if (SWRAST_CONTEXT(ctx)->NewState)
-      _swrast_validate_derived( ctx );
-
-   INIT_SPAN(span, GL_BITMAP);
-   span.end = width;
-   span.arrayMask = SPAN_MASK;
-   _swrast_span_default_attribs(ctx, &span);
-
-   /*span.arrayMask |= SPAN_MASK;*/  /* we'll init span.mask[] */
-   span.x = px;
-   span.y = py;
-   /*span.end = width;*/
-
-   for (row=0; row<height; row++, span.y++) {
-      const GLubyte *src = (const GLubyte *) _mesa_image_address2d(unpack,
-                 bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, row, 0);
-
-      if (unpack->LsbFirst) {
-         /* Lsb first */
-         GLubyte mask = 1U << (unpack->SkipPixels & 0x7);
-         for (col=0; col<width; col++) {
-            span.array->mask[col] = (*src & mask) ? GL_TRUE : GL_FALSE;
-            if (mask == 128U) {
-               src++;
-               mask = 1U;
-            }
-            else {
-               mask = mask << 1;
-            }
-         }
-
-         _swrast_write_rgba_span(ctx, &span);
-
-         /* get ready for next row */
-         if (mask != 1)
-            src++;
-      }
-      else {
-         /* Msb first */
-         GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
-         for (col=0; col<width; col++) {
-            span.array->mask[col] = (*src & mask) ? GL_TRUE : GL_FALSE;
-            if (mask == 1U) {
-               src++;
-               mask = 128U;
-            }
-            else {
-               mask = mask >> 1;
-            }
-         }
-
-         _swrast_write_rgba_span(ctx, &span);
-
-         /* get ready for next row */
-         if (mask != 128)
-            src++;
-      }
-   }
-
-   swrast_render_finish(ctx);
-}
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+/**

+ * \file swrast/s_bitmap.c

+ * \brief glBitmap rendering.

+ * \author Brian Paul

+ */

+

+#include "main/glheader.h"

+#include "main/bufferobj.h"

+#include "main/condrender.h"

+#include "main/image.h"

+#include "main/macros.h"

+#include "main/pbo.h"

+

+#include "s_context.h"

+#include "s_span.h"

+

+

+

+/**

+ * Render a bitmap.

+ * Called via ctx->Driver.Bitmap()

+ * All parameter error checking will have been done before this is called.

+ */

+void

+_swrast_Bitmap( struct gl_context *ctx, GLint px, GLint py,

+		GLsizei width, GLsizei height,

+		const struct gl_pixelstore_attrib *unpack,

+		const GLubyte *bitmap )

+{

+   GLint row, col;

+   GLuint count = 0;

+   SWspan span;

+

+   ASSERT(ctx->RenderMode == GL_RENDER);

+

+   if (!_mesa_check_conditional_render(ctx))

+      return; /* don't draw */

+

+   bitmap = (const GLubyte *) _mesa_map_pbo_source(ctx, unpack, bitmap);

+   if (!bitmap)

+      return;

+

+   swrast_render_start(ctx);

+

+   if (SWRAST_CONTEXT(ctx)->NewState)

+      _swrast_validate_derived( ctx );

+

+   INIT_SPAN(span, GL_BITMAP);

+   span.end = width;

+   span.arrayMask = SPAN_XY;

+   _swrast_span_default_attribs(ctx, &span);

+

+   for (row = 0; row < height; row++) {

+      const GLubyte *src = (const GLubyte *) _mesa_image_address2d(unpack,

+                 bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, row, 0);

+

+      if (unpack->LsbFirst) {

+         /* Lsb first */

+         GLubyte mask = 1U << (unpack->SkipPixels & 0x7);

+         for (col = 0; col < width; col++) {

+            if (*src & mask) {

+               span.array->x[count] = px + col;

+               span.array->y[count] = py + row;

+               count++;

+            }

+            if (mask == 128U) {

+               src++;

+               mask = 1U;

+            }

+            else {

+               mask = mask << 1;

+            }

+         }

+

+         /* get ready for next row */

+         if (mask != 1)

+            src++;

+      }

+      else {

+         /* Msb first */

+         GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);

+         for (col = 0; col < width; col++) {

+            if (*src & mask) {

+               span.array->x[count] = px + col;

+               span.array->y[count] = py + row;

+               count++;

+            }

+            if (mask == 1U) {

+               src++;

+               mask = 128U;

+            }

+            else {

+               mask = mask >> 1;

+            }

+         }

+

+         /* get ready for next row */

+         if (mask != 128)

+            src++;

+      }

+

+      if (count + width >= MAX_WIDTH || row + 1 == height) {

+         /* flush the span */

+         span.end = count;

+         _swrast_write_rgba_span(ctx, &span);

+         span.end = 0;

+         count = 0;

+      }

+   }

+

+   swrast_render_finish(ctx);

+

+   _mesa_unmap_pbo_source(ctx, unpack);

+}

+

+

+#if 0

+/*

+ * XXX this is another way to implement Bitmap.  Use horizontal runs of

+ * fragments, initializing the mask array to indicate which fragments to

+ * draw or skip.

+ */

+void

+_swrast_Bitmap( struct gl_context *ctx, GLint px, GLint py,

+		GLsizei width, GLsizei height,

+		const struct gl_pixelstore_attrib *unpack,

+		const GLubyte *bitmap )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLint row, col;

+   SWspan span;

+

+   ASSERT(ctx->RenderMode == GL_RENDER);

+   ASSERT(bitmap);

+

+   swrast_render_start(ctx);

+

+   if (SWRAST_CONTEXT(ctx)->NewState)

+      _swrast_validate_derived( ctx );

+

+   INIT_SPAN(span, GL_BITMAP);

+   span.end = width;

+   span.arrayMask = SPAN_MASK;

+   _swrast_span_default_attribs(ctx, &span);

+

+   /*span.arrayMask |= SPAN_MASK;*/  /* we'll init span.mask[] */

+   span.x = px;

+   span.y = py;

+   /*span.end = width;*/

+

+   for (row=0; row<height; row++, span.y++) {

+      const GLubyte *src = (const GLubyte *) _mesa_image_address2d(unpack,

+                 bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, row, 0);

+

+      if (unpack->LsbFirst) {

+         /* Lsb first */

+         GLubyte mask = 1U << (unpack->SkipPixels & 0x7);

+         for (col=0; col<width; col++) {

+            span.array->mask[col] = (*src & mask) ? GL_TRUE : GL_FALSE;

+            if (mask == 128U) {

+               src++;

+               mask = 1U;

+            }

+            else {

+               mask = mask << 1;

+            }

+         }

+

+         _swrast_write_rgba_span(ctx, &span);

+

+         /* get ready for next row */

+         if (mask != 1)

+            src++;

+      }

+      else {

+         /* Msb first */

+         GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);

+         for (col=0; col<width; col++) {

+            span.array->mask[col] = (*src & mask) ? GL_TRUE : GL_FALSE;

+            if (mask == 1U) {

+               src++;

+               mask = 128U;

+            }

+            else {

+               mask = mask >> 1;

+            }

+         }

+

+         _swrast_write_rgba_span(ctx, &span);

+

+         /* get ready for next row */

+         if (mask != 128)

+            src++;

+      }

+   }

+

+   swrast_render_finish(ctx);

+}

+#endif

diff --git a/mesalib/src/mesa/swrast/s_drawpix.c b/mesalib/src/mesa/swrast/s_drawpix.c
index 11c63457f..71f998324 100644
--- a/mesalib/src/mesa/swrast/s_drawpix.c
+++ b/mesalib/src/mesa/swrast/s_drawpix.c
@@ -1,753 +1,753 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/condrender.h"
-#include "main/context.h"
-#include "main/image.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/pack.h"
-#include "main/pbo.h"
-#include "main/pixeltransfer.h"
-#include "main/state.h"
-
-#include "s_context.h"
-#include "s_span.h"
-#include "s_stencil.h"
-#include "s_zoom.h"
-
-
-
-/**
- * Try to do a fast and simple RGB(a) glDrawPixels.
- * Return:  GL_TRUE if success, GL_FALSE if slow path must be used instead
- */
-static GLboolean
-fast_draw_rgba_pixels(struct gl_context *ctx, GLint x, GLint y,
-                      GLsizei width, GLsizei height,
-                      GLenum format, GLenum type,
-                      const struct gl_pixelstore_attrib *userUnpack,
-                      const GLvoid *pixels)
-{
-   const GLint imgX = x, imgY = y;
-   struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];
-   GLenum rbType;
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   SWspan span;
-   GLboolean simpleZoom;
-   GLint yStep;  /* +1 or -1 */
-   struct gl_pixelstore_attrib unpack;
-   GLint destX, destY, drawWidth, drawHeight; /* post clipping */
-
-   if (!rb)
-      return GL_TRUE; /* no-op */
-
-   rbType = rb->DataType;
-
-   if ((swrast->_RasterMask & ~CLIP_BIT) ||
-       ctx->Texture._EnabledCoordUnits ||
-       userUnpack->SwapBytes ||
-       ctx->_ImageTransferState) {
-      /* can't handle any of those conditions */
-      return GL_FALSE;
-   }
-
-   INIT_SPAN(span, GL_BITMAP);
-   span.arrayMask = SPAN_RGBA;
-   span.arrayAttribs = FRAG_BIT_COL0;
-   _swrast_span_default_attribs(ctx, &span);
-
-   /* copy input params since clipping may change them */
-   unpack = *userUnpack;
-   destX = x;
-   destY = y;
-   drawWidth = width;
-   drawHeight = height;
-
-   /* check for simple zooming and clipping */
-   if (ctx->Pixel.ZoomX == 1.0F &&
-       (ctx->Pixel.ZoomY == 1.0F || ctx->Pixel.ZoomY == -1.0F)) {
-      if (!_mesa_clip_drawpixels(ctx, &destX, &destY,
-                                 &drawWidth, &drawHeight, &unpack)) {
-         /* image was completely clipped: no-op, all done */
-         return GL_TRUE;
-      }
-      simpleZoom = GL_TRUE;
-      yStep = (GLint) ctx->Pixel.ZoomY;
-      ASSERT(yStep == 1 || yStep == -1);
-   }
-   else {
-      /* non-simple zooming */
-      simpleZoom = GL_FALSE;
-      yStep = 1;
-      if (unpack.RowLength == 0)
-         unpack.RowLength = width;
-   }
-
-   /*
-    * Ready to draw!
-    */
-
-   if (format == GL_RGBA && type == rbType) {
-      const GLubyte *src
-         = (const GLubyte *) _mesa_image_address2d(&unpack, pixels, width,
-                                                   height, format, type, 0, 0);
-      const GLint srcStride = _mesa_image_row_stride(&unpack, width,
-                                                     format, type);
-      if (simpleZoom) {
-         GLint row;
-         for (row = 0; row < drawHeight; row++) {
-            rb->PutRow(ctx, rb, drawWidth, destX, destY, src, NULL);
-            src += srcStride;
-            destY += yStep;
-         }
-      }
-      else {
-         /* with zooming */
-         GLint row;
-         for (row = 0; row < drawHeight; row++) {
-            span.x = destX;
-            span.y = destY + row;
-            span.end = drawWidth;
-            span.array->ChanType = rbType;
-            _swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span, src);
-            src += srcStride;
-         }
-         span.array->ChanType = CHAN_TYPE;
-      }
-      return GL_TRUE;
-   }
-
-   if (format == GL_RGB && type == rbType) {
-      const GLubyte *src
-         = (const GLubyte *) _mesa_image_address2d(&unpack, pixels, width,
-                                                   height, format, type, 0, 0);
-      const GLint srcStride = _mesa_image_row_stride(&unpack, width,
-                                                     format, type);
-      if (simpleZoom) {
-         GLint row;
-         for (row = 0; row < drawHeight; row++) {
-            rb->PutRowRGB(ctx, rb, drawWidth, destX, destY, src, NULL);
-            src += srcStride;
-            destY += yStep;
-         }
-      }
-      else {
-         /* with zooming */
-         GLint row;
-         for (row = 0; row < drawHeight; row++) {
-            span.x = destX;
-            span.y = destY;
-            span.end = drawWidth;
-            span.array->ChanType = rbType;
-            _swrast_write_zoomed_rgb_span(ctx, imgX, imgY, &span, src);
-            src += srcStride;
-            destY++;
-         }
-         span.array->ChanType = CHAN_TYPE;
-      }
-      return GL_TRUE;
-   }
-
-   /* Remaining cases haven't been tested with alignment != 1 */
-   if (userUnpack->Alignment != 1)
-      return GL_FALSE;
-
-   if (format == GL_LUMINANCE && type == CHAN_TYPE && rbType == CHAN_TYPE) {
-      const GLchan *src = (const GLchan *) pixels
-         + (unpack.SkipRows * unpack.RowLength + unpack.SkipPixels);
-      if (simpleZoom) {
-         /* no zooming */
-         GLint row;
-         ASSERT(drawWidth <= MAX_WIDTH);
-         for (row = 0; row < drawHeight; row++) {
-            GLchan rgb[MAX_WIDTH][3];
-            GLint i;
-            for (i = 0;i<drawWidth;i++) {
-               rgb[i][0] = src[i];
-               rgb[i][1] = src[i];
-               rgb[i][2] = src[i];
-            }
-            rb->PutRowRGB(ctx, rb, drawWidth, destX, destY, rgb, NULL);
-            src += unpack.RowLength;
-            destY += yStep;
-         }
-      }
-      else {
-         /* with zooming */
-         GLint row;
-         ASSERT(drawWidth <= MAX_WIDTH);
-         for (row = 0; row < drawHeight; row++) {
-            GLchan rgb[MAX_WIDTH][3];
-            GLint i;
-            for (i = 0;i<drawWidth;i++) {
-               rgb[i][0] = src[i];
-               rgb[i][1] = src[i];
-               rgb[i][2] = src[i];
-            }
-            span.x = destX;
-            span.y = destY;
-            span.end = drawWidth;
-            _swrast_write_zoomed_rgb_span(ctx, imgX, imgY, &span, rgb);
-            src += unpack.RowLength;
-            destY++;
-         }
-      }
-      return GL_TRUE;
-   }
-
-   if (format == GL_LUMINANCE_ALPHA && type == CHAN_TYPE && rbType == CHAN_TYPE) {
-      const GLchan *src = (const GLchan *) pixels
-         + (unpack.SkipRows * unpack.RowLength + unpack.SkipPixels)*2;
-      if (simpleZoom) {
-         GLint row;
-         ASSERT(drawWidth <= MAX_WIDTH);
-         for (row = 0; row < drawHeight; row++) {
-            GLint i;
-            const GLchan *ptr = src;
-            for (i = 0;i<drawWidth;i++) {
-               span.array->rgba[i][0] = *ptr;
-               span.array->rgba[i][1] = *ptr;
-               span.array->rgba[i][2] = *ptr++;
-               span.array->rgba[i][3] = *ptr++;
-            }
-            rb->PutRow(ctx, rb, drawWidth, destX, destY,
-                       span.array->rgba, NULL);
-            src += unpack.RowLength*2;
-            destY += yStep;
-         }
-      }
-      else {
-         /* with zooming */
-         GLint row;
-         ASSERT(drawWidth <= MAX_WIDTH);
-         for (row = 0; row < drawHeight; row++) {
-            const GLchan *ptr = src;
-            GLint i;
-            for (i = 0;i<drawWidth;i++) {
-               span.array->rgba[i][0] = *ptr;
-               span.array->rgba[i][1] = *ptr;
-               span.array->rgba[i][2] = *ptr++;
-               span.array->rgba[i][3] = *ptr++;
-            }
-            span.x = destX;
-            span.y = destY;
-            span.end = drawWidth;
-            _swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span,
-                                           span.array->rgba);
-            src += unpack.RowLength*2;
-            destY++;
-         }
-      }
-      return GL_TRUE;
-   }
-
-   if (format == GL_COLOR_INDEX && type == GL_UNSIGNED_BYTE) {
-      const GLubyte *src = (const GLubyte *) pixels
-         + unpack.SkipRows * unpack.RowLength + unpack.SkipPixels;
-      if (rbType == GL_UNSIGNED_BYTE) {
-         /* convert ubyte/CI data to ubyte/RGBA */
-         if (simpleZoom) {
-            GLint row;
-            for (row = 0; row < drawHeight; row++) {
-               ASSERT(drawWidth <= MAX_WIDTH);
-               _mesa_map_ci8_to_rgba8(ctx, drawWidth, src,
-                                      span.array->rgba8);
-               rb->PutRow(ctx, rb, drawWidth, destX, destY,
-                          span.array->rgba8, NULL);
-               src += unpack.RowLength;
-               destY += yStep;
-            }
-         }
-         else {
-            /* ubyte/CI to ubyte/RGBA with zooming */
-            GLint row;
-            for (row = 0; row < drawHeight; row++) {
-               ASSERT(drawWidth <= MAX_WIDTH);
-               _mesa_map_ci8_to_rgba8(ctx, drawWidth, src,
-                                      span.array->rgba8);
-               span.x = destX;
-               span.y = destY;
-               span.end = drawWidth;
-               _swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span,
-                                              span.array->rgba8);
-               src += unpack.RowLength;
-               destY++;
-            }
-         }
-         return GL_TRUE;
-      }
-   }
-
-   /* can't handle this pixel format and/or data type */
-   return GL_FALSE;
-}
-
-
-
-/*
- * Draw stencil image.
- */
-static void
-draw_stencil_pixels( struct gl_context *ctx, GLint x, GLint y,
-                     GLsizei width, GLsizei height,
-                     GLenum type,
-                     const struct gl_pixelstore_attrib *unpack,
-                     const GLvoid *pixels )
-{
-   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;
-   GLint skipPixels;
-
-   /* if width > MAX_WIDTH, have to process image in chunks */
-   skipPixels = 0;
-   while (skipPixels < width) {
-      const GLint spanX = x + skipPixels;
-      const GLint spanWidth = MIN2(width - skipPixels, MAX_WIDTH);
-      GLint row;
-      for (row = 0; row < height; row++) {
-         const GLint spanY = y + row;
-         GLstencil values[MAX_WIDTH];
-         GLenum destType = (sizeof(GLstencil) == sizeof(GLubyte))
-                         ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
-         const GLvoid *source = _mesa_image_address2d(unpack, pixels,
-                                                      width, height,
-                                                      GL_COLOR_INDEX, type,
-                                                      row, skipPixels);
-         _mesa_unpack_stencil_span(ctx, spanWidth, destType, values,
-                                   type, source, unpack,
-                                   ctx->_ImageTransferState);
-         if (zoom) {
-            _swrast_write_zoomed_stencil_span(ctx, x, y, spanWidth,
-                                              spanX, spanY, values);
-         }
-         else {
-            _swrast_write_stencil_span(ctx, spanWidth, spanX, spanY, values);
-         }
-      }
-      skipPixels += spanWidth;
-   }
-}
-
-
-/*
- * Draw depth image.
- */
-static void
-draw_depth_pixels( struct gl_context *ctx, GLint x, GLint y,
-                   GLsizei width, GLsizei height,
-                   GLenum type,
-                   const struct gl_pixelstore_attrib *unpack,
-                   const GLvoid *pixels )
-{
-   const GLboolean scaleOrBias
-      = ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0;
-   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;
-   SWspan span;
-
-   INIT_SPAN(span, GL_BITMAP);
-   span.arrayMask = SPAN_Z;
-   _swrast_span_default_attribs(ctx, &span);
-
-   if (type == GL_UNSIGNED_SHORT
-       && ctx->DrawBuffer->Visual.depthBits == 16
-       && !scaleOrBias
-       && !zoom
-       && width <= MAX_WIDTH
-       && !unpack->SwapBytes) {
-      /* Special case: directly write 16-bit depth values */
-      GLint row;
-      for (row = 0; row < height; row++) {
-         const GLushort *zSrc = (const GLushort *)
-            _mesa_image_address2d(unpack, pixels, width, height,
-                                  GL_DEPTH_COMPONENT, type, row, 0);
-         GLint i;
-         for (i = 0; i < width; i++)
-            span.array->z[i] = zSrc[i];
-         span.x = x;
-         span.y = y + row;
-         span.end = width;
-         _swrast_write_rgba_span(ctx, &span);
-      }
-   }
-   else if (type == GL_UNSIGNED_INT
-            && !scaleOrBias
-            && !zoom
-            && width <= MAX_WIDTH
-            && !unpack->SwapBytes) {
-      /* Special case: shift 32-bit values down to Visual.depthBits */
-      const GLint shift = 32 - ctx->DrawBuffer->Visual.depthBits;
-      GLint row;
-      for (row = 0; row < height; row++) {
-         const GLuint *zSrc = (const GLuint *)
-            _mesa_image_address2d(unpack, pixels, width, height,
-                                  GL_DEPTH_COMPONENT, type, row, 0);
-         if (shift == 0) {
-            memcpy(span.array->z, zSrc, width * sizeof(GLuint));
-         }
-         else {
-            GLint col;
-            for (col = 0; col < width; col++)
-               span.array->z[col] = zSrc[col] >> shift;
-         }
-         span.x = x;
-         span.y = y + row;
-         span.end = width;
-         _swrast_write_rgba_span(ctx, &span);
-      }
-   }
-   else {
-      /* General case */
-      const GLuint depthMax = ctx->DrawBuffer->_DepthMax;
-      GLint skipPixels = 0;
-
-      /* in case width > MAX_WIDTH do the copy in chunks */
-      while (skipPixels < width) {
-         const GLint spanWidth = MIN2(width - skipPixels, MAX_WIDTH);
-         GLint row;
-         ASSERT(span.end <= MAX_WIDTH);
-         for (row = 0; row < height; row++) {
-            const GLvoid *zSrc = _mesa_image_address2d(unpack,
-                                                      pixels, width, height,
-                                                      GL_DEPTH_COMPONENT, type,
-                                                      row, skipPixels);
-
-            /* Set these for each row since the _swrast_write_* function may
-             * change them while clipping.
-             */
-            span.x = x + skipPixels;
-            span.y = y + row;
-            span.end = spanWidth;
-
-            _mesa_unpack_depth_span(ctx, spanWidth,
-                                    GL_UNSIGNED_INT, span.array->z, depthMax,
-                                    type, zSrc, unpack);
-            if (zoom) {
-               _swrast_write_zoomed_depth_span(ctx, x, y, &span);
-            }
-            else {
-               _swrast_write_rgba_span(ctx, &span);
-            }
-         }
-         skipPixels += spanWidth;
-      }
-   }
-}
-
-
-
-/**
- * Draw RGBA image.
- */
-static void
-draw_rgba_pixels( struct gl_context *ctx, GLint x, GLint y,
-                  GLsizei width, GLsizei height,
-                  GLenum format, GLenum type,
-                  const struct gl_pixelstore_attrib *unpack,
-                  const GLvoid *pixels )
-{
-   const GLint imgX = x, imgY = y;
-   const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;
-   GLfloat *convImage = NULL;
-   GLbitfield transferOps = ctx->_ImageTransferState;
-   SWspan span;
-
-   /* Try an optimized glDrawPixels first */
-   if (fast_draw_rgba_pixels(ctx, x, y, width, height, format, type,
-                             unpack, pixels)) {
-      return;
-   }
-
-   INIT_SPAN(span, GL_BITMAP);
-   _swrast_span_default_attribs(ctx, &span);
-   span.arrayMask = SPAN_RGBA;
-   span.arrayAttribs = FRAG_BIT_COL0; /* we're fill in COL0 attrib values */
-
-   if (ctx->DrawBuffer->_NumColorDrawBuffers > 0 &&
-       ctx->DrawBuffer->_ColorDrawBuffers[0]->DataType != GL_FLOAT &&
-       ctx->Color.ClampFragmentColor != GL_FALSE) {
-      /* need to clamp colors before applying fragment ops */
-      transferOps |= IMAGE_CLAMP_BIT;
-   }
-
-   /*
-    * General solution
-    */
-   {
-      const GLbitfield interpMask = span.interpMask;
-      const GLbitfield arrayMask = span.arrayMask;
-      const GLint srcStride
-         = _mesa_image_row_stride(unpack, width, format, type);
-      GLint skipPixels = 0;
-      /* use span array for temp color storage */
-      GLfloat *rgba = (GLfloat *) span.array->attribs[FRAG_ATTRIB_COL0];
-
-      /* if the span is wider than MAX_WIDTH we have to do it in chunks */
-      while (skipPixels < width) {
-         const GLint spanWidth = MIN2(width - skipPixels, MAX_WIDTH);
-         const GLubyte *source
-            = (const GLubyte *) _mesa_image_address2d(unpack, pixels,
-                                                      width, height, format,
-                                                      type, 0, skipPixels);
-         GLint row;
-
-         for (row = 0; row < height; row++) {
-            /* get image row as float/RGBA */
-            _mesa_unpack_color_span_float(ctx, spanWidth, GL_RGBA, rgba,
-                                     format, type, source, unpack,
-                                     transferOps);
-	    /* Set these for each row since the _swrast_write_* functions
-	     * may change them while clipping/rendering.
-	     */
-	    span.array->ChanType = GL_FLOAT;
-	    span.x = x + skipPixels;
-	    span.y = y + row;
-	    span.end = spanWidth;
-	    span.arrayMask = arrayMask;
-	    span.interpMask = interpMask;
-	    if (zoom) {
-	       _swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span, rgba);
-	    }
-	    else {
-	       _swrast_write_rgba_span(ctx, &span);
-	    }
-
-            source += srcStride;
-         } /* for row */
-
-         skipPixels += spanWidth;
-      } /* while skipPixels < width */
-
-      /* XXX this is ugly/temporary, to undo above change */
-      span.array->ChanType = CHAN_TYPE;
-   }
-
-   if (convImage) {
-      free(convImage);
-   }
-}
-
-
-/**
- * This is a bit different from drawing GL_DEPTH_COMPONENT pixels.
- * The only per-pixel operations that apply are depth scale/bias,
- * stencil offset/shift, GL_DEPTH_WRITEMASK and GL_STENCIL_WRITEMASK,
- * and pixel zoom.
- * Also, only the depth buffer and stencil buffers are touched, not the
- * color buffer(s).
- */
-static void
-draw_depth_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
-                          GLsizei width, GLsizei height, GLenum type,
-                          const struct gl_pixelstore_attrib *unpack,
-                          const GLvoid *pixels)
-{
-   const GLint imgX = x, imgY = y;
-   const GLboolean scaleOrBias
-      = ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0;
-   const GLuint depthMax = ctx->DrawBuffer->_DepthMax;
-   const GLuint stencilMask = ctx->Stencil.WriteMask[0];
-   const GLuint stencilType = (STENCIL_BITS == 8) ? 
-      GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
-   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;
-   struct gl_renderbuffer *depthRb, *stencilRb;
-   struct gl_pixelstore_attrib clippedUnpack = *unpack;
-
-   if (!zoom) {
-      if (!_mesa_clip_drawpixels(ctx, &x, &y, &width, &height,
-                                 &clippedUnpack)) {
-         /* totally clipped */
-         return;
-      }
-   }
-   
-   depthRb = ctx->ReadBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;
-   stencilRb = ctx->ReadBuffer->Attachment[BUFFER_STENCIL].Renderbuffer;
-   ASSERT(depthRb);
-   ASSERT(stencilRb);
-
-   if (depthRb->_BaseFormat == GL_DEPTH_STENCIL_EXT &&
-       stencilRb->_BaseFormat == GL_DEPTH_STENCIL_EXT &&
-       depthRb == stencilRb &&
-       !scaleOrBias &&
-       !zoom &&
-       ctx->Depth.Mask &&
-       (stencilMask & 0xff) == 0xff) {
-      /* This is the ideal case.
-       * Drawing GL_DEPTH_STENCIL pixels into a combined depth/stencil buffer.
-       * Plus, no pixel transfer ops, zooming, or masking needed.
-       */
-      GLint i;
-      for (i = 0; i < height; i++) {
-         const GLuint *src = (const GLuint *) 
-            _mesa_image_address2d(&clippedUnpack, pixels, width, height,
-                                  GL_DEPTH_STENCIL_EXT, type, i, 0);
-         depthRb->PutRow(ctx, depthRb, width, x, y + i, src, NULL);
-      }
-   }
-   else {
-      /* sub-optimal cases:
-       * Separate depth/stencil buffers, or pixel transfer ops required.
-       */
-      /* XXX need to handle very wide images (skippixels) */
-      GLint i;
-
-      depthRb = ctx->DrawBuffer->_DepthBuffer;
-      stencilRb = ctx->DrawBuffer->_StencilBuffer;
-
-      for (i = 0; i < height; i++) {
-         const GLuint *depthStencilSrc = (const GLuint *)
-            _mesa_image_address2d(&clippedUnpack, pixels, width, height,
-                                  GL_DEPTH_STENCIL_EXT, type, i, 0);
-
-         if (ctx->Depth.Mask) {
-            if (!scaleOrBias && ctx->DrawBuffer->Visual.depthBits == 24) {
-               /* fast path 24-bit zbuffer */
-               GLuint zValues[MAX_WIDTH];
-               GLint j;
-               ASSERT(depthRb->DataType == GL_UNSIGNED_INT);
-               for (j = 0; j < width; j++) {
-                  zValues[j] = depthStencilSrc[j] >> 8;
-               }
-               if (zoom)
-                  _swrast_write_zoomed_z_span(ctx, imgX, imgY, width,
-                                              x, y + i, zValues);
-               else
-                  depthRb->PutRow(ctx, depthRb, width, x, y + i, zValues,NULL);
-            }
-            else if (!scaleOrBias && ctx->DrawBuffer->Visual.depthBits == 16) {
-               /* fast path 16-bit zbuffer */
-               GLushort zValues[MAX_WIDTH];
-               GLint j;
-               ASSERT(depthRb->DataType == GL_UNSIGNED_SHORT);
-               for (j = 0; j < width; j++) {
-                  zValues[j] = depthStencilSrc[j] >> 16;
-               }
-               if (zoom)
-                  _swrast_write_zoomed_z_span(ctx, imgX, imgY, width,
-                                              x, y + i, zValues);
-               else
-                  depthRb->PutRow(ctx, depthRb, width, x, y + i, zValues,NULL);
-            }
-            else {
-               /* general case */
-               GLuint zValues[MAX_WIDTH];  /* 16 or 32-bit Z value storage */
-               _mesa_unpack_depth_span(ctx, width,
-                                       depthRb->DataType, zValues, depthMax,
-                                       type, depthStencilSrc, &clippedUnpack);
-               if (zoom) {
-                  _swrast_write_zoomed_z_span(ctx, imgX, imgY, width, x,
-                                              y + i, zValues);
-               }
-               else {
-                  depthRb->PutRow(ctx, depthRb, width, x, y + i, zValues,NULL);
-               }
-            }
-         }
-
-         if (stencilMask != 0x0) {
-            GLstencil stencilValues[MAX_WIDTH];
-            /* get stencil values, with shift/offset/mapping */
-            _mesa_unpack_stencil_span(ctx, width, stencilType, stencilValues,
-                                      type, depthStencilSrc, &clippedUnpack,
-                                      ctx->_ImageTransferState);
-            if (zoom)
-               _swrast_write_zoomed_stencil_span(ctx, imgX, imgY, width,
-                                                  x, y + i, stencilValues);
-            else
-               _swrast_write_stencil_span(ctx, width, x, y + i, stencilValues);
-         }
-      }
-   }
-}
-
-
-/**
- * Execute software-based glDrawPixels.
- * By time we get here, all error checking will have been done.
- */
-void
-_swrast_DrawPixels( struct gl_context *ctx,
-		    GLint x, GLint y,
-		    GLsizei width, GLsizei height,
-		    GLenum format, GLenum type,
-		    const struct gl_pixelstore_attrib *unpack,
-		    const GLvoid *pixels )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLboolean save_vp_override = ctx->VertexProgram._Overriden;
-
-   if (!_mesa_check_conditional_render(ctx))
-      return; /* don't draw */
-
-   /* We are creating fragments directly, without going through vertex
-    * programs.
-    *
-    * This override flag tells the fragment processing code that its input
-    * comes from a non-standard source, and it may therefore not rely on
-    * optimizations that assume e.g. constant color if there is no color
-    * vertex array.
-    */
-   _mesa_set_vp_override(ctx, GL_TRUE);
-
-   swrast_render_start(ctx);
-
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
-
-   if (swrast->NewState)
-      _swrast_validate_derived( ctx );
-
-   pixels = _mesa_map_pbo_source(ctx, unpack, pixels);
-   if (!pixels) {
-      swrast_render_finish(ctx);
-      _mesa_set_vp_override(ctx, save_vp_override);
-      return;
-   }
-
-   /*
-    * By time we get here, all error checking should have been done.
-    */
-   switch (format) {
-   case GL_STENCIL_INDEX:
-      draw_stencil_pixels( ctx, x, y, width, height, type, unpack, pixels );
-      break;
-   case GL_DEPTH_COMPONENT:
-      draw_depth_pixels( ctx, x, y, width, height, type, unpack, pixels );
-      break;
-   case GL_DEPTH_STENCIL_EXT:
-      draw_depth_stencil_pixels(ctx, x, y, width, height, type, unpack, pixels);
-      break;
-   default:
-      /* all other formats should be color formats */
-      draw_rgba_pixels(ctx, x, y, width, height, format, type, unpack, pixels);
-   }
-
-   swrast_render_finish(ctx);
-   _mesa_set_vp_override(ctx, save_vp_override);
-
-   _mesa_unmap_pbo_source(ctx, unpack);
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include "main/glheader.h"

+#include "main/bufferobj.h"

+#include "main/condrender.h"

+#include "main/context.h"

+#include "main/image.h"

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/pack.h"

+#include "main/pbo.h"

+#include "main/pixeltransfer.h"

+#include "main/state.h"

+

+#include "s_context.h"

+#include "s_span.h"

+#include "s_stencil.h"

+#include "s_zoom.h"

+

+

+

+/**

+ * Try to do a fast and simple RGB(a) glDrawPixels.

+ * Return:  GL_TRUE if success, GL_FALSE if slow path must be used instead

+ */

+static GLboolean

+fast_draw_rgba_pixels(struct gl_context *ctx, GLint x, GLint y,

+                      GLsizei width, GLsizei height,

+                      GLenum format, GLenum type,

+                      const struct gl_pixelstore_attrib *userUnpack,

+                      const GLvoid *pixels)

+{

+   const GLint imgX = x, imgY = y;

+   struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];

+   GLenum rbType;

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   SWspan span;

+   GLboolean simpleZoom;

+   GLint yStep;  /* +1 or -1 */

+   struct gl_pixelstore_attrib unpack;

+   GLint destX, destY, drawWidth, drawHeight; /* post clipping */

+

+   if (!rb)

+      return GL_TRUE; /* no-op */

+

+   rbType = rb->DataType;

+

+   if ((swrast->_RasterMask & ~CLIP_BIT) ||

+       ctx->Texture._EnabledCoordUnits ||

+       userUnpack->SwapBytes ||

+       ctx->_ImageTransferState) {

+      /* can't handle any of those conditions */

+      return GL_FALSE;

+   }

+

+   INIT_SPAN(span, GL_BITMAP);

+   span.arrayMask = SPAN_RGBA;

+   span.arrayAttribs = FRAG_BIT_COL0;

+   _swrast_span_default_attribs(ctx, &span);

+

+   /* copy input params since clipping may change them */

+   unpack = *userUnpack;

+   destX = x;

+   destY = y;

+   drawWidth = width;

+   drawHeight = height;

+

+   /* check for simple zooming and clipping */

+   if (ctx->Pixel.ZoomX == 1.0F &&

+       (ctx->Pixel.ZoomY == 1.0F || ctx->Pixel.ZoomY == -1.0F)) {

+      if (!_mesa_clip_drawpixels(ctx, &destX, &destY,

+                                 &drawWidth, &drawHeight, &unpack)) {

+         /* image was completely clipped: no-op, all done */

+         return GL_TRUE;

+      }

+      simpleZoom = GL_TRUE;

+      yStep = (GLint) ctx->Pixel.ZoomY;

+      ASSERT(yStep == 1 || yStep == -1);

+   }

+   else {

+      /* non-simple zooming */

+      simpleZoom = GL_FALSE;

+      yStep = 1;

+      if (unpack.RowLength == 0)

+         unpack.RowLength = width;

+   }

+

+   /*

+    * Ready to draw!

+    */

+

+   if (format == GL_RGBA && type == rbType) {

+      const GLubyte *src

+         = (const GLubyte *) _mesa_image_address2d(&unpack, pixels, width,

+                                                   height, format, type, 0, 0);

+      const GLint srcStride = _mesa_image_row_stride(&unpack, width,

+                                                     format, type);

+      if (simpleZoom) {

+         GLint row;

+         for (row = 0; row < drawHeight; row++) {

+            rb->PutRow(ctx, rb, drawWidth, destX, destY, src, NULL);

+            src += srcStride;

+            destY += yStep;

+         }

+      }

+      else {

+         /* with zooming */

+         GLint row;

+         for (row = 0; row < drawHeight; row++) {

+            span.x = destX;

+            span.y = destY + row;

+            span.end = drawWidth;

+            span.array->ChanType = rbType;

+            _swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span, src);

+            src += srcStride;

+         }

+         span.array->ChanType = CHAN_TYPE;

+      }

+      return GL_TRUE;

+   }

+

+   if (format == GL_RGB && type == rbType) {

+      const GLubyte *src

+         = (const GLubyte *) _mesa_image_address2d(&unpack, pixels, width,

+                                                   height, format, type, 0, 0);

+      const GLint srcStride = _mesa_image_row_stride(&unpack, width,

+                                                     format, type);

+      if (simpleZoom) {

+         GLint row;

+         for (row = 0; row < drawHeight; row++) {

+            rb->PutRowRGB(ctx, rb, drawWidth, destX, destY, src, NULL);

+            src += srcStride;

+            destY += yStep;

+         }

+      }

+      else {

+         /* with zooming */

+         GLint row;

+         for (row = 0; row < drawHeight; row++) {

+            span.x = destX;

+            span.y = destY;

+            span.end = drawWidth;

+            span.array->ChanType = rbType;

+            _swrast_write_zoomed_rgb_span(ctx, imgX, imgY, &span, src);

+            src += srcStride;

+            destY++;

+         }

+         span.array->ChanType = CHAN_TYPE;

+      }

+      return GL_TRUE;

+   }

+

+   /* Remaining cases haven't been tested with alignment != 1 */

+   if (userUnpack->Alignment != 1)

+      return GL_FALSE;

+

+   if (format == GL_LUMINANCE && type == CHAN_TYPE && rbType == CHAN_TYPE) {

+      const GLchan *src = (const GLchan *) pixels

+         + (unpack.SkipRows * unpack.RowLength + unpack.SkipPixels);

+      if (simpleZoom) {

+         /* no zooming */

+         GLint row;

+         ASSERT(drawWidth <= MAX_WIDTH);

+         for (row = 0; row < drawHeight; row++) {

+            GLchan rgb[MAX_WIDTH][3];

+            GLint i;

+            for (i = 0;i<drawWidth;i++) {

+               rgb[i][0] = src[i];

+               rgb[i][1] = src[i];

+               rgb[i][2] = src[i];

+            }

+            rb->PutRowRGB(ctx, rb, drawWidth, destX, destY, rgb, NULL);

+            src += unpack.RowLength;

+            destY += yStep;

+         }

+      }

+      else {

+         /* with zooming */

+         GLint row;

+         ASSERT(drawWidth <= MAX_WIDTH);

+         for (row = 0; row < drawHeight; row++) {

+            GLchan rgb[MAX_WIDTH][3];

+            GLint i;

+            for (i = 0;i<drawWidth;i++) {

+               rgb[i][0] = src[i];

+               rgb[i][1] = src[i];

+               rgb[i][2] = src[i];

+            }

+            span.x = destX;

+            span.y = destY;

+            span.end = drawWidth;

+            _swrast_write_zoomed_rgb_span(ctx, imgX, imgY, &span, rgb);

+            src += unpack.RowLength;

+            destY++;

+         }

+      }

+      return GL_TRUE;

+   }

+

+   if (format == GL_LUMINANCE_ALPHA && type == CHAN_TYPE && rbType == CHAN_TYPE) {

+      const GLchan *src = (const GLchan *) pixels

+         + (unpack.SkipRows * unpack.RowLength + unpack.SkipPixels)*2;

+      if (simpleZoom) {

+         GLint row;

+         ASSERT(drawWidth <= MAX_WIDTH);

+         for (row = 0; row < drawHeight; row++) {

+            GLint i;

+            const GLchan *ptr = src;

+            for (i = 0;i<drawWidth;i++) {

+               span.array->rgba[i][0] = *ptr;

+               span.array->rgba[i][1] = *ptr;

+               span.array->rgba[i][2] = *ptr++;

+               span.array->rgba[i][3] = *ptr++;

+            }

+            rb->PutRow(ctx, rb, drawWidth, destX, destY,

+                       span.array->rgba, NULL);

+            src += unpack.RowLength*2;

+            destY += yStep;

+         }

+      }

+      else {

+         /* with zooming */

+         GLint row;

+         ASSERT(drawWidth <= MAX_WIDTH);

+         for (row = 0; row < drawHeight; row++) {

+            const GLchan *ptr = src;

+            GLint i;

+            for (i = 0;i<drawWidth;i++) {

+               span.array->rgba[i][0] = *ptr;

+               span.array->rgba[i][1] = *ptr;

+               span.array->rgba[i][2] = *ptr++;

+               span.array->rgba[i][3] = *ptr++;

+            }

+            span.x = destX;

+            span.y = destY;

+            span.end = drawWidth;

+            _swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span,

+                                           span.array->rgba);

+            src += unpack.RowLength*2;

+            destY++;

+         }

+      }

+      return GL_TRUE;

+   }

+

+   if (format == GL_COLOR_INDEX && type == GL_UNSIGNED_BYTE) {

+      const GLubyte *src = (const GLubyte *) pixels

+         + unpack.SkipRows * unpack.RowLength + unpack.SkipPixels;

+      if (rbType == GL_UNSIGNED_BYTE) {

+         /* convert ubyte/CI data to ubyte/RGBA */

+         if (simpleZoom) {

+            GLint row;

+            for (row = 0; row < drawHeight; row++) {

+               ASSERT(drawWidth <= MAX_WIDTH);

+               _mesa_map_ci8_to_rgba8(ctx, drawWidth, src,

+                                      span.array->rgba8);

+               rb->PutRow(ctx, rb, drawWidth, destX, destY,

+                          span.array->rgba8, NULL);

+               src += unpack.RowLength;

+               destY += yStep;

+            }

+         }

+         else {

+            /* ubyte/CI to ubyte/RGBA with zooming */

+            GLint row;

+            for (row = 0; row < drawHeight; row++) {

+               ASSERT(drawWidth <= MAX_WIDTH);

+               _mesa_map_ci8_to_rgba8(ctx, drawWidth, src,

+                                      span.array->rgba8);

+               span.x = destX;

+               span.y = destY;

+               span.end = drawWidth;

+               _swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span,

+                                              span.array->rgba8);

+               src += unpack.RowLength;

+               destY++;

+            }

+         }

+         return GL_TRUE;

+      }

+   }

+

+   /* can't handle this pixel format and/or data type */

+   return GL_FALSE;

+}

+

+

+

+/*

+ * Draw stencil image.

+ */

+static void

+draw_stencil_pixels( struct gl_context *ctx, GLint x, GLint y,

+                     GLsizei width, GLsizei height,

+                     GLenum type,

+                     const struct gl_pixelstore_attrib *unpack,

+                     const GLvoid *pixels )

+{

+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;

+   GLint skipPixels;

+

+   /* if width > MAX_WIDTH, have to process image in chunks */

+   skipPixels = 0;

+   while (skipPixels < width) {

+      const GLint spanX = x + skipPixels;

+      const GLint spanWidth = MIN2(width - skipPixels, MAX_WIDTH);

+      GLint row;

+      for (row = 0; row < height; row++) {

+         const GLint spanY = y + row;

+         GLstencil values[MAX_WIDTH];

+         GLenum destType = (sizeof(GLstencil) == sizeof(GLubyte))

+                         ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;

+         const GLvoid *source = _mesa_image_address2d(unpack, pixels,

+                                                      width, height,

+                                                      GL_COLOR_INDEX, type,

+                                                      row, skipPixels);

+         _mesa_unpack_stencil_span(ctx, spanWidth, destType, values,

+                                   type, source, unpack,

+                                   ctx->_ImageTransferState);

+         if (zoom) {

+            _swrast_write_zoomed_stencil_span(ctx, x, y, spanWidth,

+                                              spanX, spanY, values);

+         }

+         else {

+            _swrast_write_stencil_span(ctx, spanWidth, spanX, spanY, values);

+         }

+      }

+      skipPixels += spanWidth;

+   }

+}

+

+

+/*

+ * Draw depth image.

+ */

+static void

+draw_depth_pixels( struct gl_context *ctx, GLint x, GLint y,

+                   GLsizei width, GLsizei height,

+                   GLenum type,

+                   const struct gl_pixelstore_attrib *unpack,

+                   const GLvoid *pixels )

+{

+   const GLboolean scaleOrBias

+      = ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0;

+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;

+   SWspan span;

+

+   INIT_SPAN(span, GL_BITMAP);

+   span.arrayMask = SPAN_Z;

+   _swrast_span_default_attribs(ctx, &span);

+

+   if (type == GL_UNSIGNED_SHORT

+       && ctx->DrawBuffer->Visual.depthBits == 16

+       && !scaleOrBias

+       && !zoom

+       && width <= MAX_WIDTH

+       && !unpack->SwapBytes) {

+      /* Special case: directly write 16-bit depth values */

+      GLint row;

+      for (row = 0; row < height; row++) {

+         const GLushort *zSrc = (const GLushort *)

+            _mesa_image_address2d(unpack, pixels, width, height,

+                                  GL_DEPTH_COMPONENT, type, row, 0);

+         GLint i;

+         for (i = 0; i < width; i++)

+            span.array->z[i] = zSrc[i];

+         span.x = x;

+         span.y = y + row;

+         span.end = width;

+         _swrast_write_rgba_span(ctx, &span);

+      }

+   }

+   else if (type == GL_UNSIGNED_INT

+            && !scaleOrBias

+            && !zoom

+            && width <= MAX_WIDTH

+            && !unpack->SwapBytes) {

+      /* Special case: shift 32-bit values down to Visual.depthBits */

+      const GLint shift = 32 - ctx->DrawBuffer->Visual.depthBits;

+      GLint row;

+      for (row = 0; row < height; row++) {

+         const GLuint *zSrc = (const GLuint *)

+            _mesa_image_address2d(unpack, pixels, width, height,

+                                  GL_DEPTH_COMPONENT, type, row, 0);

+         if (shift == 0) {

+            memcpy(span.array->z, zSrc, width * sizeof(GLuint));

+         }

+         else {

+            GLint col;

+            for (col = 0; col < width; col++)

+               span.array->z[col] = zSrc[col] >> shift;

+         }

+         span.x = x;

+         span.y = y + row;

+         span.end = width;

+         _swrast_write_rgba_span(ctx, &span);

+      }

+   }

+   else {

+      /* General case */

+      const GLuint depthMax = ctx->DrawBuffer->_DepthMax;

+      GLint skipPixels = 0;

+

+      /* in case width > MAX_WIDTH do the copy in chunks */

+      while (skipPixels < width) {

+         const GLint spanWidth = MIN2(width - skipPixels, MAX_WIDTH);

+         GLint row;

+         ASSERT(span.end <= MAX_WIDTH);

+         for (row = 0; row < height; row++) {

+            const GLvoid *zSrc = _mesa_image_address2d(unpack,

+                                                      pixels, width, height,

+                                                      GL_DEPTH_COMPONENT, type,

+                                                      row, skipPixels);

+

+            /* Set these for each row since the _swrast_write_* function may

+             * change them while clipping.

+             */

+            span.x = x + skipPixels;

+            span.y = y + row;

+            span.end = spanWidth;

+

+            _mesa_unpack_depth_span(ctx, spanWidth,

+                                    GL_UNSIGNED_INT, span.array->z, depthMax,

+                                    type, zSrc, unpack);

+            if (zoom) {

+               _swrast_write_zoomed_depth_span(ctx, x, y, &span);

+            }

+            else {

+               _swrast_write_rgba_span(ctx, &span);

+            }

+         }

+         skipPixels += spanWidth;

+      }

+   }

+}

+

+

+

+/**

+ * Draw RGBA image.

+ */

+static void

+draw_rgba_pixels( struct gl_context *ctx, GLint x, GLint y,

+                  GLsizei width, GLsizei height,

+                  GLenum format, GLenum type,

+                  const struct gl_pixelstore_attrib *unpack,

+                  const GLvoid *pixels )

+{

+   const GLint imgX = x, imgY = y;

+   const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;

+   GLfloat *convImage = NULL;

+   GLbitfield transferOps = ctx->_ImageTransferState;

+   SWspan span;

+

+   /* Try an optimized glDrawPixels first */

+   if (fast_draw_rgba_pixels(ctx, x, y, width, height, format, type,

+                             unpack, pixels)) {

+      return;

+   }

+

+   INIT_SPAN(span, GL_BITMAP);

+   _swrast_span_default_attribs(ctx, &span);

+   span.arrayMask = SPAN_RGBA;

+   span.arrayAttribs = FRAG_BIT_COL0; /* we're fill in COL0 attrib values */

+

+   if (ctx->DrawBuffer->_NumColorDrawBuffers > 0 &&

+       ctx->DrawBuffer->_ColorDrawBuffers[0]->DataType != GL_FLOAT &&

+       ctx->Color.ClampFragmentColor != GL_FALSE) {

+      /* need to clamp colors before applying fragment ops */

+      transferOps |= IMAGE_CLAMP_BIT;

+   }

+

+   /*

+    * General solution

+    */

+   {

+      const GLbitfield interpMask = span.interpMask;

+      const GLbitfield arrayMask = span.arrayMask;

+      const GLint srcStride

+         = _mesa_image_row_stride(unpack, width, format, type);

+      GLint skipPixels = 0;

+      /* use span array for temp color storage */

+      GLfloat *rgba = (GLfloat *) span.array->attribs[FRAG_ATTRIB_COL0];

+

+      /* if the span is wider than MAX_WIDTH we have to do it in chunks */

+      while (skipPixels < width) {

+         const GLint spanWidth = MIN2(width - skipPixels, MAX_WIDTH);

+         const GLubyte *source

+            = (const GLubyte *) _mesa_image_address2d(unpack, pixels,

+                                                      width, height, format,

+                                                      type, 0, skipPixels);

+         GLint row;

+

+         for (row = 0; row < height; row++) {

+            /* get image row as float/RGBA */

+            _mesa_unpack_color_span_float(ctx, spanWidth, GL_RGBA, rgba,

+                                     format, type, source, unpack,

+                                     transferOps);

+	    /* Set these for each row since the _swrast_write_* functions

+	     * may change them while clipping/rendering.

+	     */

+	    span.array->ChanType = GL_FLOAT;

+	    span.x = x + skipPixels;

+	    span.y = y + row;

+	    span.end = spanWidth;

+	    span.arrayMask = arrayMask;

+	    span.interpMask = interpMask;

+	    if (zoom) {

+	       _swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span, rgba);

+	    }

+	    else {

+	       _swrast_write_rgba_span(ctx, &span);

+	    }

+

+            source += srcStride;

+         } /* for row */

+

+         skipPixels += spanWidth;

+      } /* while skipPixels < width */

+

+      /* XXX this is ugly/temporary, to undo above change */

+      span.array->ChanType = CHAN_TYPE;

+   }

+

+   if (convImage) {

+      free(convImage);

+   }

+}

+

+

+/**

+ * This is a bit different from drawing GL_DEPTH_COMPONENT pixels.

+ * The only per-pixel operations that apply are depth scale/bias,

+ * stencil offset/shift, GL_DEPTH_WRITEMASK and GL_STENCIL_WRITEMASK,

+ * and pixel zoom.

+ * Also, only the depth buffer and stencil buffers are touched, not the

+ * color buffer(s).

+ */

+static void

+draw_depth_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,

+                          GLsizei width, GLsizei height, GLenum type,

+                          const struct gl_pixelstore_attrib *unpack,

+                          const GLvoid *pixels)

+{

+   const GLint imgX = x, imgY = y;

+   const GLboolean scaleOrBias

+      = ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0;

+   const GLuint depthMax = ctx->DrawBuffer->_DepthMax;

+   const GLuint stencilMask = ctx->Stencil.WriteMask[0];

+   const GLuint stencilType = (STENCIL_BITS == 8) ? 

+      GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;

+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;

+   struct gl_renderbuffer *depthRb, *stencilRb;

+   struct gl_pixelstore_attrib clippedUnpack = *unpack;

+

+   if (!zoom) {

+      if (!_mesa_clip_drawpixels(ctx, &x, &y, &width, &height,

+                                 &clippedUnpack)) {

+         /* totally clipped */

+         return;

+      }

+   }

+   

+   depthRb = ctx->ReadBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;

+   stencilRb = ctx->ReadBuffer->Attachment[BUFFER_STENCIL].Renderbuffer;

+   ASSERT(depthRb);

+   ASSERT(stencilRb);

+

+   if (depthRb->_BaseFormat == GL_DEPTH_STENCIL_EXT &&

+       stencilRb->_BaseFormat == GL_DEPTH_STENCIL_EXT &&

+       depthRb == stencilRb &&

+       !scaleOrBias &&

+       !zoom &&

+       ctx->Depth.Mask &&

+       (stencilMask & 0xff) == 0xff) {

+      /* This is the ideal case.

+       * Drawing GL_DEPTH_STENCIL pixels into a combined depth/stencil buffer.

+       * Plus, no pixel transfer ops, zooming, or masking needed.

+       */

+      GLint i;

+      for (i = 0; i < height; i++) {

+         const GLuint *src = (const GLuint *) 

+            _mesa_image_address2d(&clippedUnpack, pixels, width, height,

+                                  GL_DEPTH_STENCIL_EXT, type, i, 0);

+         depthRb->PutRow(ctx, depthRb, width, x, y + i, src, NULL);

+      }

+   }

+   else {

+      /* sub-optimal cases:

+       * Separate depth/stencil buffers, or pixel transfer ops required.

+       */

+      /* XXX need to handle very wide images (skippixels) */

+      GLint i;

+

+      depthRb = ctx->DrawBuffer->_DepthBuffer;

+      stencilRb = ctx->DrawBuffer->_StencilBuffer;

+

+      for (i = 0; i < height; i++) {

+         const GLuint *depthStencilSrc = (const GLuint *)

+            _mesa_image_address2d(&clippedUnpack, pixels, width, height,

+                                  GL_DEPTH_STENCIL_EXT, type, i, 0);

+

+         if (ctx->Depth.Mask) {

+            if (!scaleOrBias && ctx->DrawBuffer->Visual.depthBits == 24) {

+               /* fast path 24-bit zbuffer */

+               GLuint zValues[MAX_WIDTH];

+               GLint j;

+               ASSERT(depthRb->DataType == GL_UNSIGNED_INT);

+               for (j = 0; j < width; j++) {

+                  zValues[j] = depthStencilSrc[j] >> 8;

+               }

+               if (zoom)

+                  _swrast_write_zoomed_z_span(ctx, imgX, imgY, width,

+                                              x, y + i, zValues);

+               else

+                  depthRb->PutRow(ctx, depthRb, width, x, y + i, zValues,NULL);

+            }

+            else if (!scaleOrBias && ctx->DrawBuffer->Visual.depthBits == 16) {

+               /* fast path 16-bit zbuffer */

+               GLushort zValues[MAX_WIDTH];

+               GLint j;

+               ASSERT(depthRb->DataType == GL_UNSIGNED_SHORT);

+               for (j = 0; j < width; j++) {

+                  zValues[j] = depthStencilSrc[j] >> 16;

+               }

+               if (zoom)

+                  _swrast_write_zoomed_z_span(ctx, imgX, imgY, width,

+                                              x, y + i, zValues);

+               else

+                  depthRb->PutRow(ctx, depthRb, width, x, y + i, zValues,NULL);

+            }

+            else {

+               /* general case */

+               GLuint zValues[MAX_WIDTH];  /* 16 or 32-bit Z value storage */

+               _mesa_unpack_depth_span(ctx, width,

+                                       depthRb->DataType, zValues, depthMax,

+                                       type, depthStencilSrc, &clippedUnpack);

+               if (zoom) {

+                  _swrast_write_zoomed_z_span(ctx, imgX, imgY, width, x,

+                                              y + i, zValues);

+               }

+               else {

+                  depthRb->PutRow(ctx, depthRb, width, x, y + i, zValues,NULL);

+               }

+            }

+         }

+

+         if (stencilMask != 0x0) {

+            GLstencil stencilValues[MAX_WIDTH];

+            /* get stencil values, with shift/offset/mapping */

+            _mesa_unpack_stencil_span(ctx, width, stencilType, stencilValues,

+                                      type, depthStencilSrc, &clippedUnpack,

+                                      ctx->_ImageTransferState);

+            if (zoom)

+               _swrast_write_zoomed_stencil_span(ctx, imgX, imgY, width,

+                                                  x, y + i, stencilValues);

+            else

+               _swrast_write_stencil_span(ctx, width, x, y + i, stencilValues);

+         }

+      }

+   }

+}

+

+

+/**

+ * Execute software-based glDrawPixels.

+ * By time we get here, all error checking will have been done.

+ */

+void

+_swrast_DrawPixels( struct gl_context *ctx,

+		    GLint x, GLint y,

+		    GLsizei width, GLsizei height,

+		    GLenum format, GLenum type,

+		    const struct gl_pixelstore_attrib *unpack,

+		    const GLvoid *pixels )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLboolean save_vp_override = ctx->VertexProgram._Overriden;

+

+   if (!_mesa_check_conditional_render(ctx))

+      return; /* don't draw */

+

+   /* We are creating fragments directly, without going through vertex

+    * programs.

+    *

+    * This override flag tells the fragment processing code that its input

+    * comes from a non-standard source, and it may therefore not rely on

+    * optimizations that assume e.g. constant color if there is no color

+    * vertex array.

+    */

+   _mesa_set_vp_override(ctx, GL_TRUE);

+

+   swrast_render_start(ctx);

+

+   if (ctx->NewState)

+      _mesa_update_state(ctx);

+

+   if (swrast->NewState)

+      _swrast_validate_derived( ctx );

+

+   pixels = _mesa_map_pbo_source(ctx, unpack, pixels);

+   if (!pixels) {

+      swrast_render_finish(ctx);

+      _mesa_set_vp_override(ctx, save_vp_override);

+      return;

+   }

+

+   /*

+    * By time we get here, all error checking should have been done.

+    */

+   switch (format) {

+   case GL_STENCIL_INDEX:

+      draw_stencil_pixels( ctx, x, y, width, height, type, unpack, pixels );

+      break;

+   case GL_DEPTH_COMPONENT:

+      draw_depth_pixels( ctx, x, y, width, height, type, unpack, pixels );

+      break;

+   case GL_DEPTH_STENCIL_EXT:

+      draw_depth_stencil_pixels(ctx, x, y, width, height, type, unpack, pixels);

+      break;

+   default:

+      /* all other formats should be color formats */

+      draw_rgba_pixels(ctx, x, y, width, height, format, type, unpack, pixels);

+   }

+

+   swrast_render_finish(ctx);

+   _mesa_set_vp_override(ctx, save_vp_override);

+

+   _mesa_unmap_pbo_source(ctx, unpack);

+}

diff --git a/mesalib/src/mesa/swrast/s_readpix.c b/mesalib/src/mesa/swrast/s_readpix.c
index 5c8d7e9c5..23da10dab 100644
--- a/mesalib/src/mesa/swrast/s_readpix.c
+++ b/mesalib/src/mesa/swrast/s_readpix.c
@@ -1,508 +1,508 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.0.3
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/feedback.h"
-#include "main/formats.h"
-#include "main/image.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/pack.h"
-#include "main/pbo.h"
-#include "main/state.h"
-
-#include "s_context.h"
-#include "s_depth.h"
-#include "s_span.h"
-#include "s_stencil.h"
-
-
-/**
- * Read pixels for format=GL_DEPTH_COMPONENT.
- */
-static void
-read_depth_pixels( struct gl_context *ctx,
-                   GLint x, GLint y,
-                   GLsizei width, GLsizei height,
-                   GLenum type, GLvoid *pixels,
-                   const struct gl_pixelstore_attrib *packing )
-{
-   struct gl_framebuffer *fb = ctx->ReadBuffer;
-   struct gl_renderbuffer *rb = fb->_DepthBuffer;
-   const GLboolean biasOrScale
-      = ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0;
-
-   if (!rb)
-      return;
-
-   /* clipping should have been done already */
-   ASSERT(x >= 0);
-   ASSERT(y >= 0);
-   ASSERT(x + width <= (GLint) rb->Width);
-   ASSERT(y + height <= (GLint) rb->Height);
-   /* width should never be > MAX_WIDTH since we did clipping earlier */
-   ASSERT(width <= MAX_WIDTH);
-
-   if (type == GL_UNSIGNED_SHORT && fb->Visual.depthBits == 16
-       && !biasOrScale && !packing->SwapBytes) {
-      /* Special case: directly read 16-bit unsigned depth values. */
-      GLint j;
-      ASSERT(rb->Format == MESA_FORMAT_Z16);
-      ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-      for (j = 0; j < height; j++, y++) {
-         void *dest =_mesa_image_address2d(packing, pixels, width, height,
-                                           GL_DEPTH_COMPONENT, type, j, 0);
-         rb->GetRow(ctx, rb, width, x, y, dest);
-      }
-   }
-   else if (type == GL_UNSIGNED_INT && fb->Visual.depthBits == 24
-            && !biasOrScale && !packing->SwapBytes) {
-      /* Special case: directly read 24-bit unsigned depth values. */
-      GLint j;
-      ASSERT(rb->Format == MESA_FORMAT_X8_Z24 ||
-             rb->Format == MESA_FORMAT_S8_Z24 ||
-             rb->Format == MESA_FORMAT_Z24_X8 ||
-             rb->Format == MESA_FORMAT_Z24_S8);
-      ASSERT(rb->DataType == GL_UNSIGNED_INT ||
-             rb->DataType == GL_UNSIGNED_INT_24_8);
-      for (j = 0; j < height; j++, y++) {
-         GLuint *dest = (GLuint *)
-            _mesa_image_address2d(packing, pixels, width, height,
-                                  GL_DEPTH_COMPONENT, type, j, 0);
-         GLint k;
-         rb->GetRow(ctx, rb, width, x, y, dest);
-         /* convert range from 24-bit to 32-bit */
-         if (rb->Format == MESA_FORMAT_X8_Z24 ||
-             rb->Format == MESA_FORMAT_S8_Z24) {
-            for (k = 0; k < width; k++) {
-               /* Note: put MSByte of 24-bit value into LSByte */
-               dest[k] = (dest[k] << 8) | ((dest[k] >> 16) & 0xff);
-            }
-         }
-         else {
-            for (k = 0; k < width; k++) {
-               /* Note: fill in LSByte by replication */
-               dest[k] = dest[k] | ((dest[k] >> 8) & 0xff);
-            }
-         }
-      }
-   }
-   else if (type == GL_UNSIGNED_INT && fb->Visual.depthBits == 32
-            && !biasOrScale && !packing->SwapBytes) {
-      /* Special case: directly read 32-bit unsigned depth values. */
-      GLint j;
-      ASSERT(rb->Format == MESA_FORMAT_Z32);
-      ASSERT(rb->DataType == GL_UNSIGNED_INT);
-      for (j = 0; j < height; j++, y++) {
-         void *dest = _mesa_image_address2d(packing, pixels, width, height,
-                                            GL_DEPTH_COMPONENT, type, j, 0);
-         rb->GetRow(ctx, rb, width, x, y, dest);
-      }
-   }
-   else {
-      /* General case (slower) */
-      GLint j;
-      for (j = 0; j < height; j++, y++) {
-         GLfloat depthValues[MAX_WIDTH];
-         GLvoid *dest = _mesa_image_address2d(packing, pixels, width, height,
-                                              GL_DEPTH_COMPONENT, type, j, 0);
-         _swrast_read_depth_span_float(ctx, rb, width, x, y, depthValues);
-         _mesa_pack_depth_span(ctx, width, dest, type, depthValues, packing);
-      }
-   }
-}
-
-
-/**
- * Read pixels for format=GL_STENCIL_INDEX.
- */
-static void
-read_stencil_pixels( struct gl_context *ctx,
-                     GLint x, GLint y,
-                     GLsizei width, GLsizei height,
-                     GLenum type, GLvoid *pixels,
-                     const struct gl_pixelstore_attrib *packing )
-{
-   struct gl_framebuffer *fb = ctx->ReadBuffer;
-   struct gl_renderbuffer *rb = fb->_StencilBuffer;
-   GLint j;
-
-   if (!rb)
-      return;
-
-   /* width should never be > MAX_WIDTH since we did clipping earlier */
-   ASSERT(width <= MAX_WIDTH);
-
-   /* process image row by row */
-   for (j=0;j<height;j++,y++) {
-      GLvoid *dest;
-      GLstencil stencil[MAX_WIDTH];
-
-      _swrast_read_stencil_span(ctx, rb, width, x, y, stencil);
-
-      dest = _mesa_image_address2d(packing, pixels, width, height,
-                                   GL_STENCIL_INDEX, type, j, 0);
-
-      _mesa_pack_stencil_span(ctx, width, type, dest, stencil, packing);
-   }
-}
-
-
-
-/**
- * Optimized glReadPixels for particular pixel formats when pixel
- * scaling, biasing, mapping, etc. are disabled.
- * \return GL_TRUE if success, GL_FALSE if unable to do the readpixels
- */
-static GLboolean
-fast_read_rgba_pixels( struct gl_context *ctx,
-                       GLint x, GLint y,
-                       GLsizei width, GLsizei height,
-                       GLenum format, GLenum type,
-                       GLvoid *pixels,
-                       const struct gl_pixelstore_attrib *packing,
-                       GLbitfield transferOps)
-{
-   struct gl_renderbuffer *rb = ctx->ReadBuffer->_ColorReadBuffer;
-
-   if (!rb)
-      return GL_FALSE;
-
-   ASSERT(rb->_BaseFormat == GL_RGBA || rb->_BaseFormat == GL_RGB ||
-	  rb->_BaseFormat == GL_ALPHA);
-
-   /* clipping should have already been done */
-   ASSERT(x + width <= (GLint) rb->Width);
-   ASSERT(y + height <= (GLint) rb->Height);
-
-   /* check for things we can't handle here */
-   if (transferOps ||
-       packing->SwapBytes ||
-       packing->LsbFirst) {
-      return GL_FALSE;
-   }
-
-   if (format == GL_RGBA && rb->DataType == type) {
-      const GLint dstStride = _mesa_image_row_stride(packing, width,
-                                                     format, type);
-      GLubyte *dest
-         = (GLubyte *) _mesa_image_address2d(packing, pixels, width, height,
-                                             format, type, 0, 0);
-      GLint row;
-      ASSERT(rb->GetRow);
-      for (row = 0; row < height; row++) {
-         rb->GetRow(ctx, rb, width, x, y + row, dest);
-         dest += dstStride;
-      }
-      return GL_TRUE;
-   }
-
-   if (format == GL_RGB &&
-       rb->DataType == GL_UNSIGNED_BYTE &&
-       type == GL_UNSIGNED_BYTE) {
-      const GLint dstStride = _mesa_image_row_stride(packing, width,
-                                                     format, type);
-      GLubyte *dest
-         = (GLubyte *) _mesa_image_address2d(packing, pixels, width, height,
-                                             format, type, 0, 0);
-      GLint row;
-      ASSERT(rb->GetRow);
-      for (row = 0; row < height; row++) {
-         GLubyte tempRow[MAX_WIDTH][4];
-         GLint col;
-         rb->GetRow(ctx, rb, width, x, y + row, tempRow);
-         /* convert RGBA to RGB */
-         for (col = 0; col < width; col++) {
-            dest[col * 3 + 0] = tempRow[col][0];
-            dest[col * 3 + 1] = tempRow[col][1];
-            dest[col * 3 + 2] = tempRow[col][2];
-         }
-         dest += dstStride;
-      }
-      return GL_TRUE;
-   }
-
-   /* not handled */
-   return GL_FALSE;
-}
-
-
-/**
- * When we're using a low-precision color buffer (like 16-bit 5/6/5)
- * we have to adjust our color values a bit to pass conformance.
- * The problem is when a 5 or 6-bit color value is converted to an 8-bit
- * value and then a floating point value, the floating point values don't
- * increment uniformly as the 5 or 6-bit value is incremented.
- *
- * This function adjusts floating point values to compensate.
- */
-static void
-adjust_colors(const struct gl_framebuffer *fb, GLuint n, GLfloat rgba[][4])
-{
-   const GLuint rShift = 8 - fb->Visual.redBits;
-   const GLuint gShift = 8 - fb->Visual.greenBits;
-   const GLuint bShift = 8 - fb->Visual.blueBits;
-   GLfloat rScale = 1.0F / (GLfloat) ((1 << fb->Visual.redBits  ) - 1);
-   GLfloat gScale = 1.0F / (GLfloat) ((1 << fb->Visual.greenBits) - 1);
-   GLfloat bScale = 1.0F / (GLfloat) ((1 << fb->Visual.blueBits ) - 1);
-   GLuint i;
-
-   if (fb->Visual.redBits == 0)
-      rScale = 0;
-   if (fb->Visual.greenBits == 0)
-      gScale = 0;
-   if (fb->Visual.blueBits == 0)
-      bScale = 0;
-
-   for (i = 0; i < n; i++) {
-      GLint r, g, b;
-      /* convert float back to ubyte */
-      CLAMPED_FLOAT_TO_UBYTE(r, rgba[i][RCOMP]);
-      CLAMPED_FLOAT_TO_UBYTE(g, rgba[i][GCOMP]);
-      CLAMPED_FLOAT_TO_UBYTE(b, rgba[i][BCOMP]);
-      /* using only the N most significant bits of the ubyte value, convert to
-       * float in [0,1].
-       */
-      rgba[i][RCOMP] = (GLfloat) (r >> rShift) * rScale;
-      rgba[i][GCOMP] = (GLfloat) (g >> gShift) * gScale;
-      rgba[i][BCOMP] = (GLfloat) (b >> bShift) * bScale;
-   }
-}
-
-
-
-/*
- * Read R, G, B, A, RGB, L, or LA pixels.
- */
-static void
-read_rgba_pixels( struct gl_context *ctx,
-                  GLint x, GLint y,
-                  GLsizei width, GLsizei height,
-                  GLenum format, GLenum type, GLvoid *pixels,
-                  const struct gl_pixelstore_attrib *packing )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLbitfield transferOps = ctx->_ImageTransferState;
-   struct gl_framebuffer *fb = ctx->ReadBuffer;
-   struct gl_renderbuffer *rb = fb->_ColorReadBuffer;
-
-   if (!rb)
-      return;
-
-   if (type == GL_FLOAT && ((ctx->Color.ClampReadColor == GL_TRUE) ||
-                            (ctx->Color.ClampReadColor == GL_FIXED_ONLY_ARB &&
-                             rb->DataType != GL_FLOAT)))
-      transferOps |= IMAGE_CLAMP_BIT;
-
-   /* Try optimized path first */
-   if (fast_read_rgba_pixels(ctx, x, y, width, height,
-                             format, type, pixels, packing, transferOps)) {
-      return; /* done! */
-   }
-
-   /* width should never be > MAX_WIDTH since we did clipping earlier */
-   ASSERT(width <= MAX_WIDTH);
-
-   do {
-      const GLint dstStride
-         = _mesa_image_row_stride(packing, width, format, type);
-      GLfloat (*rgba)[4] = swrast->SpanArrays->attribs[FRAG_ATTRIB_COL0];
-      GLint row;
-      GLubyte *dst
-         = (GLubyte *) _mesa_image_address2d(packing, pixels, width, height,
-                                             format, type, 0, 0);
-
-      for (row = 0; row < height; row++, y++) {
-
-         /* Get float rgba pixels */
-         _swrast_read_rgba_span(ctx, rb, width, x, y, GL_FLOAT, rgba);
-
-         /* apply fudge factor for shallow color buffers */
-         if (fb->Visual.redBits < 8 ||
-             fb->Visual.greenBits < 8 ||
-             fb->Visual.blueBits < 8) {
-            adjust_colors(fb, width, rgba);
-         }
-
-         /* pack the row of RGBA pixels into user's buffer */
-         _mesa_pack_rgba_span_float(ctx, width, rgba, format, type, dst,
-                                    packing, transferOps);
-
-         dst += dstStride;
-      }
-   } while (0);
-}
-
-
-/**
- * Read combined depth/stencil values.
- * We'll have already done error checking to be sure the expected
- * depth and stencil buffers really exist.
- */
-static void
-read_depth_stencil_pixels(struct gl_context *ctx,
-                          GLint x, GLint y,
-                          GLsizei width, GLsizei height,
-                          GLenum type, GLvoid *pixels,
-                          const struct gl_pixelstore_attrib *packing )
-{
-   const GLboolean scaleOrBias
-      = ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0;
-   const GLboolean stencilTransfer = ctx->Pixel.IndexShift
-      || ctx->Pixel.IndexOffset || ctx->Pixel.MapStencilFlag;
-   struct gl_renderbuffer *depthRb, *stencilRb;
-
-   depthRb = ctx->ReadBuffer->_DepthBuffer;
-   stencilRb = ctx->ReadBuffer->_StencilBuffer;
-
-   if (!depthRb || !stencilRb)
-      return;
-
-   depthRb = ctx->ReadBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;
-   stencilRb = ctx->ReadBuffer->Attachment[BUFFER_STENCIL].Renderbuffer;
-
-   if (depthRb->_BaseFormat == GL_DEPTH_STENCIL_EXT &&
-       stencilRb->_BaseFormat == GL_DEPTH_STENCIL_EXT &&
-       depthRb == stencilRb &&
-       !scaleOrBias &&
-       !stencilTransfer) {
-      /* This is the ideal case.
-       * Reading GL_DEPTH_STENCIL pixels from combined depth/stencil buffer.
-       * Plus, no pixel transfer ops to worry about!
-       */
-      GLint i;
-      GLint dstStride = _mesa_image_row_stride(packing, width,
-                                               GL_DEPTH_STENCIL_EXT, type);
-      GLubyte *dst = (GLubyte *) _mesa_image_address2d(packing, pixels,
-                                                       width, height,
-                                                       GL_DEPTH_STENCIL_EXT,
-                                                       type, 0, 0);
-      for (i = 0; i < height; i++) {
-         depthRb->GetRow(ctx, depthRb, width, x, y + i, dst);
-         dst += dstStride;
-      }
-   }
-   else {
-      /* Reading GL_DEPTH_STENCIL pixels from separate depth/stencil buffers,
-       * or we need pixel transfer.
-       */
-      GLint i;
-      depthRb = ctx->ReadBuffer->_DepthBuffer;
-      stencilRb = ctx->ReadBuffer->_StencilBuffer;
-
-      for (i = 0; i < height; i++) {
-         GLstencil stencilVals[MAX_WIDTH];
-
-         GLuint *depthStencilDst = (GLuint *)
-            _mesa_image_address2d(packing, pixels, width, height,
-                                  GL_DEPTH_STENCIL_EXT, type, i, 0);
-
-         _swrast_read_stencil_span(ctx, stencilRb, width,
-                                   x, y + i, stencilVals);
-
-         if (!scaleOrBias && !stencilTransfer
-             && ctx->ReadBuffer->Visual.depthBits == 24) {
-            /* ideal case */
-            GLuint zVals[MAX_WIDTH]; /* 24-bit values! */
-            GLint j;
-            ASSERT(depthRb->DataType == GL_UNSIGNED_INT);
-            /* note, we've already been clipped */
-            depthRb->GetRow(ctx, depthRb, width, x, y + i, zVals);
-            for (j = 0; j < width; j++) {
-               depthStencilDst[j] = (zVals[j] << 8) | (stencilVals[j] & 0xff);
-            }
-         }
-         else {
-            /* general case */
-            GLfloat depthVals[MAX_WIDTH];
-            _swrast_read_depth_span_float(ctx, depthRb, width, x, y + i,
-                                          depthVals);
-            _mesa_pack_depth_stencil_span(ctx, width, depthStencilDst,
-                                          depthVals, stencilVals, packing);
-         }
-      }
-   }
-}
-
-
-
-/**
- * Software fallback routine for ctx->Driver.ReadPixels().
- * By time we get here, all error checking will have been done.
- */
-void
-_swrast_ReadPixels( struct gl_context *ctx,
-		    GLint x, GLint y, GLsizei width, GLsizei height,
-		    GLenum format, GLenum type,
-		    const struct gl_pixelstore_attrib *packing,
-		    GLvoid *pixels )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   struct gl_pixelstore_attrib clippedPacking = *packing;
-
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
-
-   /* Need to do swrast_render_start() before clipping or anything else
-    * since this is where a driver may grab the hw lock and get an updated
-    * window size.
-    */
-   swrast_render_start(ctx);
-
-   if (swrast->NewState)
-      _swrast_validate_derived( ctx );
-
-   /* Do all needed clipping here, so that we can forget about it later */
-   if (_mesa_clip_readpixels(ctx, &x, &y, &width, &height, &clippedPacking)) {
-
-      pixels = _mesa_map_pbo_dest(ctx, &clippedPacking, pixels);
-
-      if (pixels) {
-         switch (format) {
-         case GL_STENCIL_INDEX:
-            read_stencil_pixels(ctx, x, y, width, height, type, pixels,
-                                &clippedPacking);
-            break;
-         case GL_DEPTH_COMPONENT:
-            read_depth_pixels(ctx, x, y, width, height, type, pixels,
-                              &clippedPacking);
-            break;
-         case GL_DEPTH_STENCIL_EXT:
-            read_depth_stencil_pixels(ctx, x, y, width, height, type, pixels,
-                                      &clippedPacking);
-            break;
-         default:
-            /* all other formats should be color formats */
-            read_rgba_pixels(ctx, x, y, width, height, format, type, pixels,
-                             &clippedPacking);
-         }
-
-         _mesa_unmap_pbo_dest(ctx, &clippedPacking);
-      }
-   }
-
-   swrast_render_finish(ctx);
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.0.3

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/feedback.h"

+#include "main/formats.h"

+#include "main/image.h"

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/pack.h"

+#include "main/pbo.h"

+#include "main/state.h"

+

+#include "s_context.h"

+#include "s_depth.h"

+#include "s_span.h"

+#include "s_stencil.h"

+

+

+/**

+ * Read pixels for format=GL_DEPTH_COMPONENT.

+ */

+static void

+read_depth_pixels( struct gl_context *ctx,

+                   GLint x, GLint y,

+                   GLsizei width, GLsizei height,

+                   GLenum type, GLvoid *pixels,

+                   const struct gl_pixelstore_attrib *packing )

+{

+   struct gl_framebuffer *fb = ctx->ReadBuffer;

+   struct gl_renderbuffer *rb = fb->_DepthBuffer;

+   const GLboolean biasOrScale

+      = ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0;

+

+   if (!rb)

+      return;

+

+   /* clipping should have been done already */

+   ASSERT(x >= 0);

+   ASSERT(y >= 0);

+   ASSERT(x + width <= (GLint) rb->Width);

+   ASSERT(y + height <= (GLint) rb->Height);

+   /* width should never be > MAX_WIDTH since we did clipping earlier */

+   ASSERT(width <= MAX_WIDTH);

+

+   if (type == GL_UNSIGNED_SHORT && fb->Visual.depthBits == 16

+       && !biasOrScale && !packing->SwapBytes) {

+      /* Special case: directly read 16-bit unsigned depth values. */

+      GLint j;

+      ASSERT(rb->Format == MESA_FORMAT_Z16);

+      ASSERT(rb->DataType == GL_UNSIGNED_SHORT);

+      for (j = 0; j < height; j++, y++) {

+         void *dest =_mesa_image_address2d(packing, pixels, width, height,

+                                           GL_DEPTH_COMPONENT, type, j, 0);

+         rb->GetRow(ctx, rb, width, x, y, dest);

+      }

+   }

+   else if (type == GL_UNSIGNED_INT && fb->Visual.depthBits == 24

+            && !biasOrScale && !packing->SwapBytes) {

+      /* Special case: directly read 24-bit unsigned depth values. */

+      GLint j;

+      ASSERT(rb->Format == MESA_FORMAT_X8_Z24 ||

+             rb->Format == MESA_FORMAT_S8_Z24 ||

+             rb->Format == MESA_FORMAT_Z24_X8 ||

+             rb->Format == MESA_FORMAT_Z24_S8);

+      ASSERT(rb->DataType == GL_UNSIGNED_INT ||

+             rb->DataType == GL_UNSIGNED_INT_24_8);

+      for (j = 0; j < height; j++, y++) {

+         GLuint *dest = (GLuint *)

+            _mesa_image_address2d(packing, pixels, width, height,

+                                  GL_DEPTH_COMPONENT, type, j, 0);

+         GLint k;

+         rb->GetRow(ctx, rb, width, x, y, dest);

+         /* convert range from 24-bit to 32-bit */

+         if (rb->Format == MESA_FORMAT_X8_Z24 ||

+             rb->Format == MESA_FORMAT_S8_Z24) {

+            for (k = 0; k < width; k++) {

+               /* Note: put MSByte of 24-bit value into LSByte */

+               dest[k] = (dest[k] << 8) | ((dest[k] >> 16) & 0xff);

+            }

+         }

+         else {

+            for (k = 0; k < width; k++) {

+               /* Note: fill in LSByte by replication */

+               dest[k] = dest[k] | ((dest[k] >> 8) & 0xff);

+            }

+         }

+      }

+   }

+   else if (type == GL_UNSIGNED_INT && fb->Visual.depthBits == 32

+            && !biasOrScale && !packing->SwapBytes) {

+      /* Special case: directly read 32-bit unsigned depth values. */

+      GLint j;

+      ASSERT(rb->Format == MESA_FORMAT_Z32);

+      ASSERT(rb->DataType == GL_UNSIGNED_INT);

+      for (j = 0; j < height; j++, y++) {

+         void *dest = _mesa_image_address2d(packing, pixels, width, height,

+                                            GL_DEPTH_COMPONENT, type, j, 0);

+         rb->GetRow(ctx, rb, width, x, y, dest);

+      }

+   }

+   else {

+      /* General case (slower) */

+      GLint j;

+      for (j = 0; j < height; j++, y++) {

+         GLfloat depthValues[MAX_WIDTH];

+         GLvoid *dest = _mesa_image_address2d(packing, pixels, width, height,

+                                              GL_DEPTH_COMPONENT, type, j, 0);

+         _swrast_read_depth_span_float(ctx, rb, width, x, y, depthValues);

+         _mesa_pack_depth_span(ctx, width, dest, type, depthValues, packing);

+      }

+   }

+}

+

+

+/**

+ * Read pixels for format=GL_STENCIL_INDEX.

+ */

+static void

+read_stencil_pixels( struct gl_context *ctx,

+                     GLint x, GLint y,

+                     GLsizei width, GLsizei height,

+                     GLenum type, GLvoid *pixels,

+                     const struct gl_pixelstore_attrib *packing )

+{

+   struct gl_framebuffer *fb = ctx->ReadBuffer;

+   struct gl_renderbuffer *rb = fb->_StencilBuffer;

+   GLint j;

+

+   if (!rb)

+      return;

+

+   /* width should never be > MAX_WIDTH since we did clipping earlier */

+   ASSERT(width <= MAX_WIDTH);

+

+   /* process image row by row */

+   for (j=0;j<height;j++,y++) {

+      GLvoid *dest;

+      GLstencil stencil[MAX_WIDTH];

+

+      _swrast_read_stencil_span(ctx, rb, width, x, y, stencil);

+

+      dest = _mesa_image_address2d(packing, pixels, width, height,

+                                   GL_STENCIL_INDEX, type, j, 0);

+

+      _mesa_pack_stencil_span(ctx, width, type, dest, stencil, packing);

+   }

+}

+

+

+

+/**

+ * Optimized glReadPixels for particular pixel formats when pixel

+ * scaling, biasing, mapping, etc. are disabled.

+ * \return GL_TRUE if success, GL_FALSE if unable to do the readpixels

+ */

+static GLboolean

+fast_read_rgba_pixels( struct gl_context *ctx,

+                       GLint x, GLint y,

+                       GLsizei width, GLsizei height,

+                       GLenum format, GLenum type,

+                       GLvoid *pixels,

+                       const struct gl_pixelstore_attrib *packing,

+                       GLbitfield transferOps)

+{

+   struct gl_renderbuffer *rb = ctx->ReadBuffer->_ColorReadBuffer;

+

+   if (!rb)

+      return GL_FALSE;

+

+   ASSERT(rb->_BaseFormat == GL_RGBA || rb->_BaseFormat == GL_RGB ||

+	  rb->_BaseFormat == GL_ALPHA);

+

+   /* clipping should have already been done */

+   ASSERT(x + width <= (GLint) rb->Width);

+   ASSERT(y + height <= (GLint) rb->Height);

+

+   /* check for things we can't handle here */

+   if (transferOps ||

+       packing->SwapBytes ||

+       packing->LsbFirst) {

+      return GL_FALSE;

+   }

+

+   if (format == GL_RGBA && rb->DataType == type) {

+      const GLint dstStride = _mesa_image_row_stride(packing, width,

+                                                     format, type);

+      GLubyte *dest

+         = (GLubyte *) _mesa_image_address2d(packing, pixels, width, height,

+                                             format, type, 0, 0);

+      GLint row;

+      ASSERT(rb->GetRow);

+      for (row = 0; row < height; row++) {

+         rb->GetRow(ctx, rb, width, x, y + row, dest);

+         dest += dstStride;

+      }

+      return GL_TRUE;

+   }

+

+   if (format == GL_RGB &&

+       rb->DataType == GL_UNSIGNED_BYTE &&

+       type == GL_UNSIGNED_BYTE) {

+      const GLint dstStride = _mesa_image_row_stride(packing, width,

+                                                     format, type);

+      GLubyte *dest

+         = (GLubyte *) _mesa_image_address2d(packing, pixels, width, height,

+                                             format, type, 0, 0);

+      GLint row;

+      ASSERT(rb->GetRow);

+      for (row = 0; row < height; row++) {

+         GLubyte tempRow[MAX_WIDTH][4];

+         GLint col;

+         rb->GetRow(ctx, rb, width, x, y + row, tempRow);

+         /* convert RGBA to RGB */

+         for (col = 0; col < width; col++) {

+            dest[col * 3 + 0] = tempRow[col][0];

+            dest[col * 3 + 1] = tempRow[col][1];

+            dest[col * 3 + 2] = tempRow[col][2];

+         }

+         dest += dstStride;

+      }

+      return GL_TRUE;

+   }

+

+   /* not handled */

+   return GL_FALSE;

+}

+

+

+/**

+ * When we're using a low-precision color buffer (like 16-bit 5/6/5)

+ * we have to adjust our color values a bit to pass conformance.

+ * The problem is when a 5 or 6-bit color value is converted to an 8-bit

+ * value and then a floating point value, the floating point values don't

+ * increment uniformly as the 5 or 6-bit value is incremented.

+ *

+ * This function adjusts floating point values to compensate.

+ */

+static void

+adjust_colors(const struct gl_framebuffer *fb, GLuint n, GLfloat rgba[][4])

+{

+   const GLuint rShift = 8 - fb->Visual.redBits;

+   const GLuint gShift = 8 - fb->Visual.greenBits;

+   const GLuint bShift = 8 - fb->Visual.blueBits;

+   GLfloat rScale = 1.0F / (GLfloat) ((1 << fb->Visual.redBits  ) - 1);

+   GLfloat gScale = 1.0F / (GLfloat) ((1 << fb->Visual.greenBits) - 1);

+   GLfloat bScale = 1.0F / (GLfloat) ((1 << fb->Visual.blueBits ) - 1);

+   GLuint i;

+

+   if (fb->Visual.redBits == 0)

+      rScale = 0;

+   if (fb->Visual.greenBits == 0)

+      gScale = 0;

+   if (fb->Visual.blueBits == 0)

+      bScale = 0;

+

+   for (i = 0; i < n; i++) {

+      GLint r, g, b;

+      /* convert float back to ubyte */

+      CLAMPED_FLOAT_TO_UBYTE(r, rgba[i][RCOMP]);

+      CLAMPED_FLOAT_TO_UBYTE(g, rgba[i][GCOMP]);

+      CLAMPED_FLOAT_TO_UBYTE(b, rgba[i][BCOMP]);

+      /* using only the N most significant bits of the ubyte value, convert to

+       * float in [0,1].

+       */

+      rgba[i][RCOMP] = (GLfloat) (r >> rShift) * rScale;

+      rgba[i][GCOMP] = (GLfloat) (g >> gShift) * gScale;

+      rgba[i][BCOMP] = (GLfloat) (b >> bShift) * bScale;

+   }

+}

+

+

+

+/*

+ * Read R, G, B, A, RGB, L, or LA pixels.

+ */

+static void

+read_rgba_pixels( struct gl_context *ctx,

+                  GLint x, GLint y,

+                  GLsizei width, GLsizei height,

+                  GLenum format, GLenum type, GLvoid *pixels,

+                  const struct gl_pixelstore_attrib *packing )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLbitfield transferOps = ctx->_ImageTransferState;

+   struct gl_framebuffer *fb = ctx->ReadBuffer;

+   struct gl_renderbuffer *rb = fb->_ColorReadBuffer;

+

+   if (!rb)

+      return;

+

+   if (type == GL_FLOAT && ((ctx->Color.ClampReadColor == GL_TRUE) ||

+                            (ctx->Color.ClampReadColor == GL_FIXED_ONLY_ARB &&

+                             rb->DataType != GL_FLOAT)))

+      transferOps |= IMAGE_CLAMP_BIT;

+

+   /* Try optimized path first */

+   if (fast_read_rgba_pixels(ctx, x, y, width, height,

+                             format, type, pixels, packing, transferOps)) {

+      return; /* done! */

+   }

+

+   /* width should never be > MAX_WIDTH since we did clipping earlier */

+   ASSERT(width <= MAX_WIDTH);

+

+   do {

+      const GLint dstStride

+         = _mesa_image_row_stride(packing, width, format, type);

+      GLfloat (*rgba)[4] = swrast->SpanArrays->attribs[FRAG_ATTRIB_COL0];

+      GLint row;

+      GLubyte *dst

+         = (GLubyte *) _mesa_image_address2d(packing, pixels, width, height,

+                                             format, type, 0, 0);

+

+      for (row = 0; row < height; row++, y++) {

+

+         /* Get float rgba pixels */

+         _swrast_read_rgba_span(ctx, rb, width, x, y, GL_FLOAT, rgba);

+

+         /* apply fudge factor for shallow color buffers */

+         if (fb->Visual.redBits < 8 ||

+             fb->Visual.greenBits < 8 ||

+             fb->Visual.blueBits < 8) {

+            adjust_colors(fb, width, rgba);

+         }

+

+         /* pack the row of RGBA pixels into user's buffer */

+         _mesa_pack_rgba_span_float(ctx, width, rgba, format, type, dst,

+                                    packing, transferOps);

+

+         dst += dstStride;

+      }

+   } while (0);

+}

+

+

+/**

+ * Read combined depth/stencil values.

+ * We'll have already done error checking to be sure the expected

+ * depth and stencil buffers really exist.

+ */

+static void

+read_depth_stencil_pixels(struct gl_context *ctx,

+                          GLint x, GLint y,

+                          GLsizei width, GLsizei height,

+                          GLenum type, GLvoid *pixels,

+                          const struct gl_pixelstore_attrib *packing )

+{

+   const GLboolean scaleOrBias

+      = ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0;

+   const GLboolean stencilTransfer = ctx->Pixel.IndexShift

+      || ctx->Pixel.IndexOffset || ctx->Pixel.MapStencilFlag;

+   struct gl_renderbuffer *depthRb, *stencilRb;

+

+   depthRb = ctx->ReadBuffer->_DepthBuffer;

+   stencilRb = ctx->ReadBuffer->_StencilBuffer;

+

+   if (!depthRb || !stencilRb)

+      return;

+

+   depthRb = ctx->ReadBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;

+   stencilRb = ctx->ReadBuffer->Attachment[BUFFER_STENCIL].Renderbuffer;

+

+   if (depthRb->_BaseFormat == GL_DEPTH_STENCIL_EXT &&

+       stencilRb->_BaseFormat == GL_DEPTH_STENCIL_EXT &&

+       depthRb == stencilRb &&

+       !scaleOrBias &&

+       !stencilTransfer) {

+      /* This is the ideal case.

+       * Reading GL_DEPTH_STENCIL pixels from combined depth/stencil buffer.

+       * Plus, no pixel transfer ops to worry about!

+       */

+      GLint i;

+      GLint dstStride = _mesa_image_row_stride(packing, width,

+                                               GL_DEPTH_STENCIL_EXT, type);

+      GLubyte *dst = (GLubyte *) _mesa_image_address2d(packing, pixels,

+                                                       width, height,

+                                                       GL_DEPTH_STENCIL_EXT,

+                                                       type, 0, 0);

+      for (i = 0; i < height; i++) {

+         depthRb->GetRow(ctx, depthRb, width, x, y + i, dst);

+         dst += dstStride;

+      }

+   }

+   else {

+      /* Reading GL_DEPTH_STENCIL pixels from separate depth/stencil buffers,

+       * or we need pixel transfer.

+       */

+      GLint i;

+      depthRb = ctx->ReadBuffer->_DepthBuffer;

+      stencilRb = ctx->ReadBuffer->_StencilBuffer;

+

+      for (i = 0; i < height; i++) {

+         GLstencil stencilVals[MAX_WIDTH];

+

+         GLuint *depthStencilDst = (GLuint *)

+            _mesa_image_address2d(packing, pixels, width, height,

+                                  GL_DEPTH_STENCIL_EXT, type, i, 0);

+

+         _swrast_read_stencil_span(ctx, stencilRb, width,

+                                   x, y + i, stencilVals);

+

+         if (!scaleOrBias && !stencilTransfer

+             && ctx->ReadBuffer->Visual.depthBits == 24) {

+            /* ideal case */

+            GLuint zVals[MAX_WIDTH]; /* 24-bit values! */

+            GLint j;

+            ASSERT(depthRb->DataType == GL_UNSIGNED_INT);

+            /* note, we've already been clipped */

+            depthRb->GetRow(ctx, depthRb, width, x, y + i, zVals);

+            for (j = 0; j < width; j++) {

+               depthStencilDst[j] = (zVals[j] << 8) | (stencilVals[j] & 0xff);

+            }

+         }

+         else {

+            /* general case */

+            GLfloat depthVals[MAX_WIDTH];

+            _swrast_read_depth_span_float(ctx, depthRb, width, x, y + i,

+                                          depthVals);

+            _mesa_pack_depth_stencil_span(ctx, width, depthStencilDst,

+                                          depthVals, stencilVals, packing);

+         }

+      }

+   }

+}

+

+

+

+/**

+ * Software fallback routine for ctx->Driver.ReadPixels().

+ * By time we get here, all error checking will have been done.

+ */

+void

+_swrast_ReadPixels( struct gl_context *ctx,

+		    GLint x, GLint y, GLsizei width, GLsizei height,

+		    GLenum format, GLenum type,

+		    const struct gl_pixelstore_attrib *packing,

+		    GLvoid *pixels )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   struct gl_pixelstore_attrib clippedPacking = *packing;

+

+   if (ctx->NewState)

+      _mesa_update_state(ctx);

+

+   /* Need to do swrast_render_start() before clipping or anything else

+    * since this is where a driver may grab the hw lock and get an updated

+    * window size.

+    */

+   swrast_render_start(ctx);

+

+   if (swrast->NewState)

+      _swrast_validate_derived( ctx );

+

+   /* Do all needed clipping here, so that we can forget about it later */

+   if (_mesa_clip_readpixels(ctx, &x, &y, &width, &height, &clippedPacking)) {

+

+      pixels = _mesa_map_pbo_dest(ctx, &clippedPacking, pixels);

+

+      if (pixels) {

+         switch (format) {

+         case GL_STENCIL_INDEX:

+            read_stencil_pixels(ctx, x, y, width, height, type, pixels,

+                                &clippedPacking);

+            break;

+         case GL_DEPTH_COMPONENT:

+            read_depth_pixels(ctx, x, y, width, height, type, pixels,

+                              &clippedPacking);

+            break;

+         case GL_DEPTH_STENCIL_EXT:

+            read_depth_stencil_pixels(ctx, x, y, width, height, type, pixels,

+                                      &clippedPacking);

+            break;

+         default:

+            /* all other formats should be color formats */

+            read_rgba_pixels(ctx, x, y, width, height, format, type, pixels,

+                             &clippedPacking);

+         }

+

+         _mesa_unmap_pbo_dest(ctx, &clippedPacking);

+      }

+   }

+

+   swrast_render_finish(ctx);

+}

diff --git a/mesalib/src/mesa/swrast/s_texcombine.c b/mesalib/src/mesa/swrast/s_texcombine.c
index 0c8cc9ff3..a7f4fe67d 100644
--- a/mesalib/src/mesa/swrast/s_texcombine.c
+++ b/mesalib/src/mesa/swrast/s_texcombine.c
@@ -1,737 +1,737 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 2009  VMware, Inc.   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/imports.h"
-#include "main/pixeltransfer.h"
-#include "program/prog_instruction.h"
-
-#include "s_context.h"
-#include "s_texcombine.h"
-
-
-/**
- * Pointer to array of float[4]
- * This type makes the code below more concise and avoids a lot of casting.
- */
-typedef float (*float4_array)[4];
-
-
-/**
- * Return array of texels for given unit.
- */
-static INLINE float4_array
-get_texel_array(SWcontext *swrast, GLuint unit)
-{
-   return (float4_array) (swrast->TexelBuffer + unit * MAX_WIDTH * 4);
-}
-
-
-
-/**
- * Do texture application for:
- *  GL_EXT_texture_env_combine
- *  GL_ARB_texture_env_combine
- *  GL_EXT_texture_env_dot3
- *  GL_ARB_texture_env_dot3
- *  GL_ATI_texture_env_combine3
- *  GL_NV_texture_env_combine4
- *  conventional GL texture env modes
- *
- * \param ctx          rendering context
- * \param unit         the texture combiner unit
- * \param n            number of fragments to process (span width)
- * \param primary_rgba incoming fragment color array
- * \param texelBuffer  pointer to texel colors for all texture units
- * 
- * \param rgba         incoming/result fragment colors
- */
-static void
-texture_combine( struct gl_context *ctx, GLuint unit, GLuint n,
-                 const float4_array primary_rgba,
-                 const GLfloat *texelBuffer,
-                 GLchan (*rgbaChan)[4] )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const struct gl_texture_unit *textureUnit = &(ctx->Texture.Unit[unit]);
-   const struct gl_tex_env_combine_state *combine = textureUnit->_CurrentCombine;
-   float4_array argRGB[MAX_COMBINER_TERMS];
-   float4_array argA[MAX_COMBINER_TERMS];
-   const GLfloat scaleRGB = (GLfloat) (1 << combine->ScaleShiftRGB);
-   const GLfloat scaleA = (GLfloat) (1 << combine->ScaleShiftA);
-   const GLuint numArgsRGB = combine->_NumArgsRGB;
-   const GLuint numArgsA = combine->_NumArgsA;
-   float4_array ccolor[4], rgba;
-   GLuint i, term;
-
-   /* alloc temp pixel buffers */
-   rgba = (float4_array) malloc(4 * n * sizeof(GLfloat));
-   if (!rgba) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture_combine");
-      return;
-   }
-
-   for (i = 0; i < numArgsRGB || i < numArgsA; i++) {
-      ccolor[i] = (float4_array) malloc(4 * n * sizeof(GLfloat));
-      if (!ccolor[i]) {
-         while (i) {
-            free(ccolor[i]);
-            i--;
-         }
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture_combine");
-         return;
-      }
-   }
-
-   for (i = 0; i < n; i++) {
-      rgba[i][RCOMP] = CHAN_TO_FLOAT(rgbaChan[i][RCOMP]);
-      rgba[i][GCOMP] = CHAN_TO_FLOAT(rgbaChan[i][GCOMP]);
-      rgba[i][BCOMP] = CHAN_TO_FLOAT(rgbaChan[i][BCOMP]);
-      rgba[i][ACOMP] = CHAN_TO_FLOAT(rgbaChan[i][ACOMP]);
-   }
-
-   /*
-   printf("modeRGB 0x%x  modeA 0x%x  srcRGB1 0x%x  srcA1 0x%x  srcRGB2 0x%x  srcA2 0x%x\n",
-          combine->ModeRGB,
-          combine->ModeA,
-          combine->SourceRGB[0],
-          combine->SourceA[0],
-          combine->SourceRGB[1],
-          combine->SourceA[1]);
-   */
-
-   /*
-    * Do operand setup for up to 4 operands.  Loop over the terms.
-    */
-   for (term = 0; term < numArgsRGB; term++) {
-      const GLenum srcRGB = combine->SourceRGB[term];
-      const GLenum operandRGB = combine->OperandRGB[term];
-
-      switch (srcRGB) {
-         case GL_TEXTURE:
-            argRGB[term] = get_texel_array(swrast, unit);
-            break;
-         case GL_PRIMARY_COLOR:
-            argRGB[term] = primary_rgba;
-            break;
-         case GL_PREVIOUS:
-            argRGB[term] = rgba;
-            break;
-         case GL_CONSTANT:
-            {
-               float4_array c = ccolor[term];
-               GLfloat red   = textureUnit->EnvColor[0];
-               GLfloat green = textureUnit->EnvColor[1];
-               GLfloat blue  = textureUnit->EnvColor[2];
-               GLfloat alpha = textureUnit->EnvColor[3];
-               for (i = 0; i < n; i++) {
-                  ASSIGN_4V(c[i], red, green, blue, alpha);
-               }
-               argRGB[term] = ccolor[term];
-            }
-            break;
-	 /* GL_ATI_texture_env_combine3 allows GL_ZERO & GL_ONE as sources.
-	  */
-	 case GL_ZERO:
-            {
-               float4_array c = ccolor[term];
-               for (i = 0; i < n; i++) {
-                  ASSIGN_4V(c[i], 0.0F, 0.0F, 0.0F, 0.0F);
-               }
-               argRGB[term] = ccolor[term];
-            }
-            break;
-	 case GL_ONE:
-            {
-               float4_array c = ccolor[term];
-               for (i = 0; i < n; i++) {
-                  ASSIGN_4V(c[i], 1.0F, 1.0F, 1.0F, 1.0F);
-               }
-               argRGB[term] = ccolor[term];
-            }
-            break;
-         default:
-            /* ARB_texture_env_crossbar source */
-            {
-               const GLuint srcUnit = srcRGB - GL_TEXTURE0;
-               ASSERT(srcUnit < ctx->Const.MaxTextureUnits);
-               if (!ctx->Texture.Unit[srcUnit]._ReallyEnabled)
-                  goto end;
-               argRGB[term] = get_texel_array(swrast, srcUnit);
-            }
-      }
-
-      if (operandRGB != GL_SRC_COLOR) {
-         float4_array src = argRGB[term];
-         float4_array dst = ccolor[term];
-
-         /* point to new arg[term] storage */
-         argRGB[term] = ccolor[term];
-
-         switch (operandRGB) {
-         case GL_ONE_MINUS_SRC_COLOR:
-            for (i = 0; i < n; i++) {
-               dst[i][RCOMP] = 1.0F - src[i][RCOMP];
-               dst[i][GCOMP] = 1.0F - src[i][GCOMP];
-               dst[i][BCOMP] = 1.0F - src[i][BCOMP];
-            }
-            break;
-         case GL_SRC_ALPHA:
-            for (i = 0; i < n; i++) {
-               dst[i][RCOMP] =
-               dst[i][GCOMP] =
-               dst[i][BCOMP] = src[i][ACOMP];
-            }
-            break;
-         case GL_ONE_MINUS_SRC_ALPHA:
-            for (i = 0; i < n; i++) {
-               dst[i][RCOMP] =
-               dst[i][GCOMP] =
-               dst[i][BCOMP] = 1.0F - src[i][ACOMP];
-            }
-            break;
-         default:
-            _mesa_problem(ctx, "Bad operandRGB");
-         }
-      }
-   }
-
-   /*
-    * Set up the argA[term] pointers
-    */
-   for (term = 0; term < numArgsA; term++) {
-      const GLenum srcA = combine->SourceA[term];
-      const GLenum operandA = combine->OperandA[term];
-
-      switch (srcA) {
-         case GL_TEXTURE:
-            argA[term] = get_texel_array(swrast, unit);
-            break;
-         case GL_PRIMARY_COLOR:
-            argA[term] = primary_rgba;
-            break;
-         case GL_PREVIOUS:
-            argA[term] = rgba;
-            break;
-         case GL_CONSTANT:
-            {
-               float4_array c = ccolor[term];
-               GLfloat alpha = textureUnit->EnvColor[3];
-               for (i = 0; i < n; i++)
-                  c[i][ACOMP] = alpha;
-               argA[term] = ccolor[term];
-            }
-            break;
-	 /* GL_ATI_texture_env_combine3 allows GL_ZERO & GL_ONE as sources.
-	  */
-	 case GL_ZERO:
-            {
-               float4_array c = ccolor[term];
-               for (i = 0; i < n; i++)
-                  c[i][ACOMP] = 0.0F;
-               argA[term] = ccolor[term];
-            }
-            break;
-	 case GL_ONE:
-            {
-               float4_array c = ccolor[term];
-               for (i = 0; i < n; i++)
-                  c[i][ACOMP] = 1.0F;
-               argA[term] = ccolor[term];
-            }
-            break;
-         default:
-            /* ARB_texture_env_crossbar source */
-            {
-               const GLuint srcUnit = srcA - GL_TEXTURE0;
-               ASSERT(srcUnit < ctx->Const.MaxTextureUnits);
-               if (!ctx->Texture.Unit[srcUnit]._ReallyEnabled)
-                  goto end;
-               argA[term] = get_texel_array(swrast, srcUnit);
-            }
-      }
-
-      if (operandA == GL_ONE_MINUS_SRC_ALPHA) {
-         float4_array src = argA[term];
-         float4_array dst = ccolor[term];
-         argA[term] = ccolor[term];
-         for (i = 0; i < n; i++) {
-            dst[i][ACOMP] = 1.0F - src[i][ACOMP];
-         }
-      }
-   }
-
-   /* RGB channel combine */
-   {
-      float4_array arg0 = argRGB[0];
-      float4_array arg1 = argRGB[1];
-      float4_array arg2 = argRGB[2];
-      float4_array arg3 = argRGB[3];
-
-      switch (combine->ModeRGB) {
-      case GL_REPLACE:
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = arg0[i][RCOMP] * scaleRGB;
-            rgba[i][GCOMP] = arg0[i][GCOMP] * scaleRGB;
-            rgba[i][BCOMP] = arg0[i][BCOMP] * scaleRGB;
-         }
-         break;
-      case GL_MODULATE:
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = arg0[i][RCOMP] * arg1[i][RCOMP] * scaleRGB;
-            rgba[i][GCOMP] = arg0[i][GCOMP] * arg1[i][GCOMP] * scaleRGB;
-            rgba[i][BCOMP] = arg0[i][BCOMP] * arg1[i][BCOMP] * scaleRGB;
-         }
-         break;
-      case GL_ADD:
-         if (textureUnit->EnvMode == GL_COMBINE4_NV) {
-            /* (a * b) + (c * d) */
-            for (i = 0; i < n; i++) {
-               rgba[i][RCOMP] = (arg0[i][RCOMP] * arg1[i][RCOMP] +
-                                 arg2[i][RCOMP] * arg3[i][RCOMP]) * scaleRGB;
-               rgba[i][GCOMP] = (arg0[i][GCOMP] * arg1[i][GCOMP] +
-                                 arg2[i][GCOMP] * arg3[i][GCOMP]) * scaleRGB;
-               rgba[i][BCOMP] = (arg0[i][BCOMP] * arg1[i][BCOMP] +
-                                 arg2[i][BCOMP] * arg3[i][BCOMP]) * scaleRGB;
-            }
-         }
-         else {
-            /* 2-term addition */
-            for (i = 0; i < n; i++) {
-               rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP]) * scaleRGB;
-               rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP]) * scaleRGB;
-               rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP]) * scaleRGB;
-            }
-         }
-         break;
-      case GL_ADD_SIGNED:
-         if (textureUnit->EnvMode == GL_COMBINE4_NV) {
-            /* (a * b) + (c * d) - 0.5 */
-            for (i = 0; i < n; i++) {
-               rgba[i][RCOMP] = (arg0[i][RCOMP] * arg1[i][RCOMP] +
-                                 arg2[i][RCOMP] * arg3[i][RCOMP] - 0.5F) * scaleRGB;
-               rgba[i][GCOMP] = (arg0[i][GCOMP] * arg1[i][GCOMP] +
-                                 arg2[i][GCOMP] * arg3[i][GCOMP] - 0.5F) * scaleRGB;
-               rgba[i][BCOMP] = (arg0[i][BCOMP] * arg1[i][BCOMP] +
-                                 arg2[i][BCOMP] * arg3[i][BCOMP] - 0.5F) * scaleRGB;
-            }
-         }
-         else {
-            for (i = 0; i < n; i++) {
-               rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP] - 0.5F) * scaleRGB;
-               rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP] - 0.5F) * scaleRGB;
-               rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP] - 0.5F) * scaleRGB;
-            }
-         }
-         break;
-      case GL_INTERPOLATE:
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = (arg0[i][RCOMP] * arg2[i][RCOMP] +
-                          arg1[i][RCOMP] * (1.0F - arg2[i][RCOMP])) * scaleRGB;
-            rgba[i][GCOMP] = (arg0[i][GCOMP] * arg2[i][GCOMP] +
-                          arg1[i][GCOMP] * (1.0F - arg2[i][GCOMP])) * scaleRGB;
-            rgba[i][BCOMP] = (arg0[i][BCOMP] * arg2[i][BCOMP] +
-                          arg1[i][BCOMP] * (1.0F - arg2[i][BCOMP])) * scaleRGB;
-         }
-         break;
-      case GL_SUBTRACT:
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = (arg0[i][RCOMP] - arg1[i][RCOMP]) * scaleRGB;
-            rgba[i][GCOMP] = (arg0[i][GCOMP] - arg1[i][GCOMP]) * scaleRGB;
-            rgba[i][BCOMP] = (arg0[i][BCOMP] - arg1[i][BCOMP]) * scaleRGB;
-         }
-         break;
-      case GL_DOT3_RGB_EXT:
-      case GL_DOT3_RGBA_EXT:
-         /* Do not scale the result by 1 2 or 4 */
-         for (i = 0; i < n; i++) {
-            GLfloat dot = ((arg0[i][RCOMP] - 0.5F) * (arg1[i][RCOMP] - 0.5F) +
-                           (arg0[i][GCOMP] - 0.5F) * (arg1[i][GCOMP] - 0.5F) +
-                           (arg0[i][BCOMP] - 0.5F) * (arg1[i][BCOMP] - 0.5F))
-               * 4.0F;
-            dot = CLAMP(dot, 0.0F, 1.0F);
-            rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = dot;
-         }
-         break;
-      case GL_DOT3_RGB:
-      case GL_DOT3_RGBA:
-         /* DO scale the result by 1 2 or 4 */
-         for (i = 0; i < n; i++) {
-            GLfloat dot = ((arg0[i][RCOMP] - 0.5F) * (arg1[i][RCOMP] - 0.5F) +
-                           (arg0[i][GCOMP] - 0.5F) * (arg1[i][GCOMP] - 0.5F) +
-                           (arg0[i][BCOMP] - 0.5F) * (arg1[i][BCOMP] - 0.5F))
-               * 4.0F * scaleRGB;
-            dot = CLAMP(dot, 0.0F, 1.0F);
-            rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = dot;
-         }
-         break;
-      case GL_MODULATE_ADD_ATI:
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) +
-                              arg1[i][RCOMP]) * scaleRGB;
-            rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) +
-                              arg1[i][GCOMP]) * scaleRGB;
-            rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) +
-                              arg1[i][BCOMP]) * scaleRGB;
-	 }
-         break;
-      case GL_MODULATE_SIGNED_ADD_ATI:
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) +
-                              arg1[i][RCOMP] - 0.5F) * scaleRGB;
-            rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) +
-                              arg1[i][GCOMP] - 0.5F) * scaleRGB;
-            rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) +
-                              arg1[i][BCOMP] - 0.5F) * scaleRGB;
-	 }
-         break;
-      case GL_MODULATE_SUBTRACT_ATI:
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) -
-                              arg1[i][RCOMP]) * scaleRGB;
-            rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) -
-                              arg1[i][GCOMP]) * scaleRGB;
-            rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) -
-                              arg1[i][BCOMP]) * scaleRGB;
-	 }
-         break;
-      case GL_BUMP_ENVMAP_ATI:
-         /* this produces a fixed rgba color, and the coord calc is done elsewhere */
-         for (i = 0; i < n; i++) {
-            /* rgba result is 0,0,0,1 */
-            rgba[i][RCOMP] = 0.0;
-            rgba[i][GCOMP] = 0.0;
-            rgba[i][BCOMP] = 0.0;
-            rgba[i][ACOMP] = 1.0;
-	 }
-         goto end; /* no alpha processing */
-      default:
-         _mesa_problem(ctx, "invalid combine mode");
-      }
-   }
-
-   /* Alpha channel combine */
-   {
-      float4_array arg0 = argA[0];
-      float4_array arg1 = argA[1];
-      float4_array arg2 = argA[2];
-      float4_array arg3 = argA[3];
-
-      switch (combine->ModeA) {
-      case GL_REPLACE:
-         for (i = 0; i < n; i++) {
-            rgba[i][ACOMP] = arg0[i][ACOMP] * scaleA;
-         }
-         break;
-      case GL_MODULATE:
-         for (i = 0; i < n; i++) {
-            rgba[i][ACOMP] = arg0[i][ACOMP] * arg1[i][ACOMP] * scaleA;
-         }
-         break;
-      case GL_ADD:
-         if (textureUnit->EnvMode == GL_COMBINE4_NV) {
-            /* (a * b) + (c * d) */
-            for (i = 0; i < n; i++) {
-               rgba[i][ACOMP] = (arg0[i][ACOMP] * arg1[i][ACOMP] +
-                                 arg2[i][ACOMP] * arg3[i][ACOMP]) * scaleA;
-            }
-         }
-         else {
-            /* two-term add */
-            for (i = 0; i < n; i++) {
-               rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP]) * scaleA;
-            }
-         }
-         break;
-      case GL_ADD_SIGNED:
-         if (textureUnit->EnvMode == GL_COMBINE4_NV) {
-            /* (a * b) + (c * d) - 0.5 */
-            for (i = 0; i < n; i++) {
-               rgba[i][ACOMP] = (arg0[i][ACOMP] * arg1[i][ACOMP] +
-                                 arg2[i][ACOMP] * arg3[i][ACOMP] -
-                                 0.5F) * scaleA;
-            }
-         }
-         else {
-            /* a + b - 0.5 */
-            for (i = 0; i < n; i++) {
-               rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP] - 0.5F) * scaleA;
-            }
-         }
-         break;
-      case GL_INTERPOLATE:
-         for (i = 0; i < n; i++) {
-            rgba[i][ACOMP] = (arg0[i][ACOMP] * arg2[i][ACOMP] +
-                              arg1[i][ACOMP] * (1.0F - arg2[i][ACOMP]))
-               * scaleA;
-         }
-         break;
-      case GL_SUBTRACT:
-         for (i = 0; i < n; i++) {
-            rgba[i][ACOMP] = (arg0[i][ACOMP] - arg1[i][ACOMP]) * scaleA;
-         }
-         break;
-      case GL_MODULATE_ADD_ATI:
-         for (i = 0; i < n; i++) {
-            rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP])
-                              + arg1[i][ACOMP]) * scaleA;
-         }
-         break;
-      case GL_MODULATE_SIGNED_ADD_ATI:
-         for (i = 0; i < n; i++) {
-            rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP]) +
-                              arg1[i][ACOMP] - 0.5F) * scaleA;
-         }
-         break;
-      case GL_MODULATE_SUBTRACT_ATI:
-         for (i = 0; i < n; i++) {
-            rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP])
-                              - arg1[i][ACOMP]) * scaleA;
-         }
-         break;
-      default:
-         _mesa_problem(ctx, "invalid combine mode");
-      }
-   }
-
-   /* Fix the alpha component for GL_DOT3_RGBA_EXT/ARB combining.
-    * This is kind of a kludge.  It would have been better if the spec
-    * were written such that the GL_COMBINE_ALPHA value could be set to
-    * GL_DOT3.
-    */
-   if (combine->ModeRGB == GL_DOT3_RGBA_EXT ||
-       combine->ModeRGB == GL_DOT3_RGBA) {
-      for (i = 0; i < n; i++) {
-	 rgba[i][ACOMP] = rgba[i][RCOMP];
-      }
-   }
-
-   for (i = 0; i < n; i++) {
-      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][RCOMP], rgba[i][RCOMP]);
-      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][GCOMP], rgba[i][GCOMP]);
-      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][BCOMP], rgba[i][BCOMP]);
-      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][ACOMP], rgba[i][ACOMP]);
-   }
-
-end:
-   for (i = 0; i < numArgsRGB || i < numArgsA; i++) {
-      free(ccolor[i]);
-   }
-   free(rgba);
-}
-
-
-/**
- * Apply X/Y/Z/W/0/1 swizzle to an array of colors/texels.
- * See GL_EXT_texture_swizzle.
- */
-static void
-swizzle_texels(GLuint swizzle, GLuint count, float4_array texels)
-{
-   const GLuint swzR = GET_SWZ(swizzle, 0);
-   const GLuint swzG = GET_SWZ(swizzle, 1);
-   const GLuint swzB = GET_SWZ(swizzle, 2);
-   const GLuint swzA = GET_SWZ(swizzle, 3);
-   GLfloat vector[6];
-   GLuint i;
-
-   vector[SWIZZLE_ZERO] = 0;
-   vector[SWIZZLE_ONE] = 1.0F;
-
-   for (i = 0; i < count; i++) {
-      vector[SWIZZLE_X] = texels[i][0];
-      vector[SWIZZLE_Y] = texels[i][1];
-      vector[SWIZZLE_Z] = texels[i][2];
-      vector[SWIZZLE_W] = texels[i][3];
-      texels[i][RCOMP] = vector[swzR];
-      texels[i][GCOMP] = vector[swzG];
-      texels[i][BCOMP] = vector[swzB];
-      texels[i][ACOMP] = vector[swzA];
-   }
-}
-
-
-/**
- * Apply texture mapping to a span of fragments.
- */
-void
-_swrast_texture_span( struct gl_context *ctx, SWspan *span )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   float4_array primary_rgba;
-   GLuint unit;
-
-   primary_rgba = (float4_array) malloc(span->end * 4 * sizeof(GLfloat));
-
-   if (!primary_rgba) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture_span");
-      return;
-   }
-
-   ASSERT(span->end <= MAX_WIDTH);
-
-   /*
-    * Save copy of the incoming fragment colors (the GL_PRIMARY_COLOR)
-    */
-   if (swrast->_TextureCombinePrimary) {
-      GLuint i;
-      for (i = 0; i < span->end; i++) {
-         primary_rgba[i][RCOMP] = CHAN_TO_FLOAT(span->array->rgba[i][RCOMP]);
-         primary_rgba[i][GCOMP] = CHAN_TO_FLOAT(span->array->rgba[i][GCOMP]);
-         primary_rgba[i][BCOMP] = CHAN_TO_FLOAT(span->array->rgba[i][BCOMP]);
-         primary_rgba[i][ACOMP] = CHAN_TO_FLOAT(span->array->rgba[i][ACOMP]);
-      }
-   }
-
-   /* First must sample all bump maps */
-   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
-      const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-
-      if (texUnit->_ReallyEnabled &&
-         texUnit->_CurrentCombine->ModeRGB == GL_BUMP_ENVMAP_ATI) {
-         const GLfloat (*texcoords)[4] = (const GLfloat (*)[4])
-            span->array->attribs[FRAG_ATTRIB_TEX0 + unit];
-         float4_array targetcoords =
-            span->array->attribs[FRAG_ATTRIB_TEX0 +
-               ctx->Texture.Unit[unit].BumpTarget - GL_TEXTURE0];
-
-         const struct gl_texture_object *curObj = texUnit->_Current;
-         GLfloat *lambda = span->array->lambda[unit];
-         float4_array texels = get_texel_array(swrast, unit);
-         GLuint i;
-         GLfloat rotMatrix00 = ctx->Texture.Unit[unit].RotMatrix[0];
-         GLfloat rotMatrix01 = ctx->Texture.Unit[unit].RotMatrix[1];
-         GLfloat rotMatrix10 = ctx->Texture.Unit[unit].RotMatrix[2];
-         GLfloat rotMatrix11 = ctx->Texture.Unit[unit].RotMatrix[3];
-
-         /* adjust texture lod (lambda) */
-         if (span->arrayMask & SPAN_LAMBDA) {
-            if (texUnit->LodBias + curObj->LodBias != 0.0F) {
-               /* apply LOD bias, but don't clamp yet */
-               const GLfloat bias = CLAMP(texUnit->LodBias + curObj->LodBias,
-                                          -ctx->Const.MaxTextureLodBias,
-                                          ctx->Const.MaxTextureLodBias);
-               GLuint i;
-               for (i = 0; i < span->end; i++) {
-                  lambda[i] += bias;
-               }
-            }
-
-            if (curObj->MinLod != -1000.0 || curObj->MaxLod != 1000.0) {
-               /* apply LOD clamping to lambda */
-               const GLfloat min = curObj->MinLod;
-               const GLfloat max = curObj->MaxLod;
-               GLuint i;
-               for (i = 0; i < span->end; i++) {
-                  GLfloat l = lambda[i];
-                  lambda[i] = CLAMP(l, min, max);
-               }
-            }
-         }
-
-         /* Sample the texture (span->end = number of fragments) */
-         swrast->TextureSample[unit]( ctx, texUnit->_Current, span->end,
-                                      texcoords, lambda, texels );
-
-         /* manipulate the span values of the bump target
-            not sure this can work correctly even ignoring
-            the problem that channel is unsigned */
-         for (i = 0; i < span->end; i++) {
-            targetcoords[i][0] += (texels[i][0] * rotMatrix00 + texels[i][1] *
-                                  rotMatrix01) / targetcoords[i][3];
-            targetcoords[i][1] += (texels[i][0] * rotMatrix10 + texels[i][1] *
-                                  rotMatrix11) / targetcoords[i][3];
-         }
-      }
-   }
-
-   /*
-    * Must do all texture sampling before combining in order to
-    * accomodate GL_ARB_texture_env_crossbar.
-    */
-   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
-      const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-      if (texUnit->_ReallyEnabled &&
-          texUnit->_CurrentCombine->ModeRGB != GL_BUMP_ENVMAP_ATI) {
-         const GLfloat (*texcoords)[4] = (const GLfloat (*)[4])
-            span->array->attribs[FRAG_ATTRIB_TEX0 + unit];
-         const struct gl_texture_object *curObj = texUnit->_Current;
-         GLfloat *lambda = span->array->lambda[unit];
-         float4_array texels = get_texel_array(swrast, unit);
-
-         /* adjust texture lod (lambda) */
-         if (span->arrayMask & SPAN_LAMBDA) {
-            if (texUnit->LodBias + curObj->LodBias != 0.0F) {
-               /* apply LOD bias, but don't clamp yet */
-               const GLfloat bias = CLAMP(texUnit->LodBias + curObj->LodBias,
-                                          -ctx->Const.MaxTextureLodBias,
-                                          ctx->Const.MaxTextureLodBias);
-               GLuint i;
-               for (i = 0; i < span->end; i++) {
-                  lambda[i] += bias;
-               }
-            }
-
-            if (curObj->MinLod != -1000.0 || curObj->MaxLod != 1000.0) {
-               /* apply LOD clamping to lambda */
-               const GLfloat min = curObj->MinLod;
-               const GLfloat max = curObj->MaxLod;
-               GLuint i;
-               for (i = 0; i < span->end; i++) {
-                  GLfloat l = lambda[i];
-                  lambda[i] = CLAMP(l, min, max);
-               }
-            }
-         }
-
-         /* Sample the texture (span->end = number of fragments) */
-         swrast->TextureSample[unit]( ctx, texUnit->_Current, span->end,
-                                      texcoords, lambda, texels );
-
-         /* GL_EXT_texture_swizzle */
-         if (curObj->_Swizzle != SWIZZLE_NOOP) {
-            swizzle_texels(curObj->_Swizzle, span->end, texels);
-         }
-      }
-   }
-
-   /*
-    * OK, now apply the texture (aka texture combine/blend).
-    * We modify the span->color.rgba values.
-    */
-   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
-      if (ctx->Texture.Unit[unit]._ReallyEnabled) {
-         texture_combine( ctx, unit, span->end,
-                          primary_rgba,
-                          swrast->TexelBuffer,
-                          span->array->rgba );
-      }
-   }
-
-   free(primary_rgba);
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 2009  VMware, Inc.   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/colormac.h"

+#include "main/imports.h"

+#include "main/pixeltransfer.h"

+#include "program/prog_instruction.h"

+

+#include "s_context.h"

+#include "s_texcombine.h"

+

+

+/**

+ * Pointer to array of float[4]

+ * This type makes the code below more concise and avoids a lot of casting.

+ */

+typedef float (*float4_array)[4];

+

+

+/**

+ * Return array of texels for given unit.

+ */

+static INLINE float4_array

+get_texel_array(SWcontext *swrast, GLuint unit)

+{

+   return (float4_array) (swrast->TexelBuffer + unit * MAX_WIDTH * 4);

+}

+

+

+

+/**

+ * Do texture application for:

+ *  GL_EXT_texture_env_combine

+ *  GL_ARB_texture_env_combine

+ *  GL_EXT_texture_env_dot3

+ *  GL_ARB_texture_env_dot3

+ *  GL_ATI_texture_env_combine3

+ *  GL_NV_texture_env_combine4

+ *  conventional GL texture env modes

+ *

+ * \param ctx          rendering context

+ * \param unit         the texture combiner unit

+ * \param n            number of fragments to process (span width)

+ * \param primary_rgba incoming fragment color array

+ * \param texelBuffer  pointer to texel colors for all texture units

+ * 

+ * \param rgba         incoming/result fragment colors

+ */

+static void

+texture_combine( struct gl_context *ctx, GLuint unit, GLuint n,

+                 const float4_array primary_rgba,

+                 const GLfloat *texelBuffer,

+                 GLchan (*rgbaChan)[4] )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   const struct gl_texture_unit *textureUnit = &(ctx->Texture.Unit[unit]);

+   const struct gl_tex_env_combine_state *combine = textureUnit->_CurrentCombine;

+   float4_array argRGB[MAX_COMBINER_TERMS];

+   float4_array argA[MAX_COMBINER_TERMS];

+   const GLfloat scaleRGB = (GLfloat) (1 << combine->ScaleShiftRGB);

+   const GLfloat scaleA = (GLfloat) (1 << combine->ScaleShiftA);

+   const GLuint numArgsRGB = combine->_NumArgsRGB;

+   const GLuint numArgsA = combine->_NumArgsA;

+   float4_array ccolor[4], rgba;

+   GLuint i, term;

+

+   /* alloc temp pixel buffers */

+   rgba = (float4_array) malloc(4 * n * sizeof(GLfloat));

+   if (!rgba) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture_combine");

+      return;

+   }

+

+   for (i = 0; i < numArgsRGB || i < numArgsA; i++) {

+      ccolor[i] = (float4_array) malloc(4 * n * sizeof(GLfloat));

+      if (!ccolor[i]) {

+         while (i) {

+            free(ccolor[i]);

+            i--;

+         }

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture_combine");

+         return;

+      }

+   }

+

+   for (i = 0; i < n; i++) {

+      rgba[i][RCOMP] = CHAN_TO_FLOAT(rgbaChan[i][RCOMP]);

+      rgba[i][GCOMP] = CHAN_TO_FLOAT(rgbaChan[i][GCOMP]);

+      rgba[i][BCOMP] = CHAN_TO_FLOAT(rgbaChan[i][BCOMP]);

+      rgba[i][ACOMP] = CHAN_TO_FLOAT(rgbaChan[i][ACOMP]);

+   }

+

+   /*

+   printf("modeRGB 0x%x  modeA 0x%x  srcRGB1 0x%x  srcA1 0x%x  srcRGB2 0x%x  srcA2 0x%x\n",

+          combine->ModeRGB,

+          combine->ModeA,

+          combine->SourceRGB[0],

+          combine->SourceA[0],

+          combine->SourceRGB[1],

+          combine->SourceA[1]);

+   */

+

+   /*

+    * Do operand setup for up to 4 operands.  Loop over the terms.

+    */

+   for (term = 0; term < numArgsRGB; term++) {

+      const GLenum srcRGB = combine->SourceRGB[term];

+      const GLenum operandRGB = combine->OperandRGB[term];

+

+      switch (srcRGB) {

+         case GL_TEXTURE:

+            argRGB[term] = get_texel_array(swrast, unit);

+            break;

+         case GL_PRIMARY_COLOR:

+            argRGB[term] = primary_rgba;

+            break;

+         case GL_PREVIOUS:

+            argRGB[term] = rgba;

+            break;

+         case GL_CONSTANT:

+            {

+               float4_array c = ccolor[term];

+               GLfloat red   = textureUnit->EnvColor[0];

+               GLfloat green = textureUnit->EnvColor[1];

+               GLfloat blue  = textureUnit->EnvColor[2];

+               GLfloat alpha = textureUnit->EnvColor[3];

+               for (i = 0; i < n; i++) {

+                  ASSIGN_4V(c[i], red, green, blue, alpha);

+               }

+               argRGB[term] = ccolor[term];

+            }

+            break;

+	 /* GL_ATI_texture_env_combine3 allows GL_ZERO & GL_ONE as sources.

+	  */

+	 case GL_ZERO:

+            {

+               float4_array c = ccolor[term];

+               for (i = 0; i < n; i++) {

+                  ASSIGN_4V(c[i], 0.0F, 0.0F, 0.0F, 0.0F);

+               }

+               argRGB[term] = ccolor[term];

+            }

+            break;

+	 case GL_ONE:

+            {

+               float4_array c = ccolor[term];

+               for (i = 0; i < n; i++) {

+                  ASSIGN_4V(c[i], 1.0F, 1.0F, 1.0F, 1.0F);

+               }

+               argRGB[term] = ccolor[term];

+            }

+            break;

+         default:

+            /* ARB_texture_env_crossbar source */

+            {

+               const GLuint srcUnit = srcRGB - GL_TEXTURE0;

+               ASSERT(srcUnit < ctx->Const.MaxTextureUnits);

+               if (!ctx->Texture.Unit[srcUnit]._ReallyEnabled)

+                  goto end;

+               argRGB[term] = get_texel_array(swrast, srcUnit);

+            }

+      }

+

+      if (operandRGB != GL_SRC_COLOR) {

+         float4_array src = argRGB[term];

+         float4_array dst = ccolor[term];

+

+         /* point to new arg[term] storage */

+         argRGB[term] = ccolor[term];

+

+         switch (operandRGB) {

+         case GL_ONE_MINUS_SRC_COLOR:

+            for (i = 0; i < n; i++) {

+               dst[i][RCOMP] = 1.0F - src[i][RCOMP];

+               dst[i][GCOMP] = 1.0F - src[i][GCOMP];

+               dst[i][BCOMP] = 1.0F - src[i][BCOMP];

+            }

+            break;

+         case GL_SRC_ALPHA:

+            for (i = 0; i < n; i++) {

+               dst[i][RCOMP] =

+               dst[i][GCOMP] =

+               dst[i][BCOMP] = src[i][ACOMP];

+            }

+            break;

+         case GL_ONE_MINUS_SRC_ALPHA:

+            for (i = 0; i < n; i++) {

+               dst[i][RCOMP] =

+               dst[i][GCOMP] =

+               dst[i][BCOMP] = 1.0F - src[i][ACOMP];

+            }

+            break;

+         default:

+            _mesa_problem(ctx, "Bad operandRGB");

+         }

+      }

+   }

+

+   /*

+    * Set up the argA[term] pointers

+    */

+   for (term = 0; term < numArgsA; term++) {

+      const GLenum srcA = combine->SourceA[term];

+      const GLenum operandA = combine->OperandA[term];

+

+      switch (srcA) {

+         case GL_TEXTURE:

+            argA[term] = get_texel_array(swrast, unit);

+            break;

+         case GL_PRIMARY_COLOR:

+            argA[term] = primary_rgba;

+            break;

+         case GL_PREVIOUS:

+            argA[term] = rgba;

+            break;

+         case GL_CONSTANT:

+            {

+               float4_array c = ccolor[term];

+               GLfloat alpha = textureUnit->EnvColor[3];

+               for (i = 0; i < n; i++)

+                  c[i][ACOMP] = alpha;

+               argA[term] = ccolor[term];

+            }

+            break;

+	 /* GL_ATI_texture_env_combine3 allows GL_ZERO & GL_ONE as sources.

+	  */

+	 case GL_ZERO:

+            {

+               float4_array c = ccolor[term];

+               for (i = 0; i < n; i++)

+                  c[i][ACOMP] = 0.0F;

+               argA[term] = ccolor[term];

+            }

+            break;

+	 case GL_ONE:

+            {

+               float4_array c = ccolor[term];

+               for (i = 0; i < n; i++)

+                  c[i][ACOMP] = 1.0F;

+               argA[term] = ccolor[term];

+            }

+            break;

+         default:

+            /* ARB_texture_env_crossbar source */

+            {

+               const GLuint srcUnit = srcA - GL_TEXTURE0;

+               ASSERT(srcUnit < ctx->Const.MaxTextureUnits);

+               if (!ctx->Texture.Unit[srcUnit]._ReallyEnabled)

+                  goto end;

+               argA[term] = get_texel_array(swrast, srcUnit);

+            }

+      }

+

+      if (operandA == GL_ONE_MINUS_SRC_ALPHA) {

+         float4_array src = argA[term];

+         float4_array dst = ccolor[term];

+         argA[term] = ccolor[term];

+         for (i = 0; i < n; i++) {

+            dst[i][ACOMP] = 1.0F - src[i][ACOMP];

+         }

+      }

+   }

+

+   /* RGB channel combine */

+   {

+      float4_array arg0 = argRGB[0];

+      float4_array arg1 = argRGB[1];

+      float4_array arg2 = argRGB[2];

+      float4_array arg3 = argRGB[3];

+

+      switch (combine->ModeRGB) {

+      case GL_REPLACE:

+         for (i = 0; i < n; i++) {

+            rgba[i][RCOMP] = arg0[i][RCOMP] * scaleRGB;

+            rgba[i][GCOMP] = arg0[i][GCOMP] * scaleRGB;

+            rgba[i][BCOMP] = arg0[i][BCOMP] * scaleRGB;

+         }

+         break;

+      case GL_MODULATE:

+         for (i = 0; i < n; i++) {

+            rgba[i][RCOMP] = arg0[i][RCOMP] * arg1[i][RCOMP] * scaleRGB;

+            rgba[i][GCOMP] = arg0[i][GCOMP] * arg1[i][GCOMP] * scaleRGB;

+            rgba[i][BCOMP] = arg0[i][BCOMP] * arg1[i][BCOMP] * scaleRGB;

+         }

+         break;

+      case GL_ADD:

+         if (textureUnit->EnvMode == GL_COMBINE4_NV) {

+            /* (a * b) + (c * d) */

+            for (i = 0; i < n; i++) {

+               rgba[i][RCOMP] = (arg0[i][RCOMP] * arg1[i][RCOMP] +

+                                 arg2[i][RCOMP] * arg3[i][RCOMP]) * scaleRGB;

+               rgba[i][GCOMP] = (arg0[i][GCOMP] * arg1[i][GCOMP] +

+                                 arg2[i][GCOMP] * arg3[i][GCOMP]) * scaleRGB;

+               rgba[i][BCOMP] = (arg0[i][BCOMP] * arg1[i][BCOMP] +

+                                 arg2[i][BCOMP] * arg3[i][BCOMP]) * scaleRGB;

+            }

+         }

+         else {

+            /* 2-term addition */

+            for (i = 0; i < n; i++) {

+               rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP]) * scaleRGB;

+               rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP]) * scaleRGB;

+               rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP]) * scaleRGB;

+            }

+         }

+         break;

+      case GL_ADD_SIGNED:

+         if (textureUnit->EnvMode == GL_COMBINE4_NV) {

+            /* (a * b) + (c * d) - 0.5 */

+            for (i = 0; i < n; i++) {

+               rgba[i][RCOMP] = (arg0[i][RCOMP] * arg1[i][RCOMP] +

+                                 arg2[i][RCOMP] * arg3[i][RCOMP] - 0.5F) * scaleRGB;

+               rgba[i][GCOMP] = (arg0[i][GCOMP] * arg1[i][GCOMP] +

+                                 arg2[i][GCOMP] * arg3[i][GCOMP] - 0.5F) * scaleRGB;

+               rgba[i][BCOMP] = (arg0[i][BCOMP] * arg1[i][BCOMP] +

+                                 arg2[i][BCOMP] * arg3[i][BCOMP] - 0.5F) * scaleRGB;

+            }

+         }

+         else {

+            for (i = 0; i < n; i++) {

+               rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP] - 0.5F) * scaleRGB;

+               rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP] - 0.5F) * scaleRGB;

+               rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP] - 0.5F) * scaleRGB;

+            }

+         }

+         break;

+      case GL_INTERPOLATE:

+         for (i = 0; i < n; i++) {

+            rgba[i][RCOMP] = (arg0[i][RCOMP] * arg2[i][RCOMP] +

+                          arg1[i][RCOMP] * (1.0F - arg2[i][RCOMP])) * scaleRGB;

+            rgba[i][GCOMP] = (arg0[i][GCOMP] * arg2[i][GCOMP] +

+                          arg1[i][GCOMP] * (1.0F - arg2[i][GCOMP])) * scaleRGB;

+            rgba[i][BCOMP] = (arg0[i][BCOMP] * arg2[i][BCOMP] +

+                          arg1[i][BCOMP] * (1.0F - arg2[i][BCOMP])) * scaleRGB;

+         }

+         break;

+      case GL_SUBTRACT:

+         for (i = 0; i < n; i++) {

+            rgba[i][RCOMP] = (arg0[i][RCOMP] - arg1[i][RCOMP]) * scaleRGB;

+            rgba[i][GCOMP] = (arg0[i][GCOMP] - arg1[i][GCOMP]) * scaleRGB;

+            rgba[i][BCOMP] = (arg0[i][BCOMP] - arg1[i][BCOMP]) * scaleRGB;

+         }

+         break;

+      case GL_DOT3_RGB_EXT:

+      case GL_DOT3_RGBA_EXT:

+         /* Do not scale the result by 1 2 or 4 */

+         for (i = 0; i < n; i++) {

+            GLfloat dot = ((arg0[i][RCOMP] - 0.5F) * (arg1[i][RCOMP] - 0.5F) +

+                           (arg0[i][GCOMP] - 0.5F) * (arg1[i][GCOMP] - 0.5F) +

+                           (arg0[i][BCOMP] - 0.5F) * (arg1[i][BCOMP] - 0.5F))

+               * 4.0F;

+            dot = CLAMP(dot, 0.0F, 1.0F);

+            rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = dot;

+         }

+         break;

+      case GL_DOT3_RGB:

+      case GL_DOT3_RGBA:

+         /* DO scale the result by 1 2 or 4 */

+         for (i = 0; i < n; i++) {

+            GLfloat dot = ((arg0[i][RCOMP] - 0.5F) * (arg1[i][RCOMP] - 0.5F) +

+                           (arg0[i][GCOMP] - 0.5F) * (arg1[i][GCOMP] - 0.5F) +

+                           (arg0[i][BCOMP] - 0.5F) * (arg1[i][BCOMP] - 0.5F))

+               * 4.0F * scaleRGB;

+            dot = CLAMP(dot, 0.0F, 1.0F);

+            rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = dot;

+         }

+         break;

+      case GL_MODULATE_ADD_ATI:

+         for (i = 0; i < n; i++) {

+            rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) +

+                              arg1[i][RCOMP]) * scaleRGB;

+            rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) +

+                              arg1[i][GCOMP]) * scaleRGB;

+            rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) +

+                              arg1[i][BCOMP]) * scaleRGB;

+	 }

+         break;

+      case GL_MODULATE_SIGNED_ADD_ATI:

+         for (i = 0; i < n; i++) {

+            rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) +

+                              arg1[i][RCOMP] - 0.5F) * scaleRGB;

+            rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) +

+                              arg1[i][GCOMP] - 0.5F) * scaleRGB;

+            rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) +

+                              arg1[i][BCOMP] - 0.5F) * scaleRGB;

+	 }

+         break;

+      case GL_MODULATE_SUBTRACT_ATI:

+         for (i = 0; i < n; i++) {

+            rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) -

+                              arg1[i][RCOMP]) * scaleRGB;

+            rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) -

+                              arg1[i][GCOMP]) * scaleRGB;

+            rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) -

+                              arg1[i][BCOMP]) * scaleRGB;

+	 }

+         break;

+      case GL_BUMP_ENVMAP_ATI:

+         /* this produces a fixed rgba color, and the coord calc is done elsewhere */

+         for (i = 0; i < n; i++) {

+            /* rgba result is 0,0,0,1 */

+            rgba[i][RCOMP] = 0.0;

+            rgba[i][GCOMP] = 0.0;

+            rgba[i][BCOMP] = 0.0;

+            rgba[i][ACOMP] = 1.0;

+	 }

+         goto end; /* no alpha processing */

+      default:

+         _mesa_problem(ctx, "invalid combine mode");

+      }

+   }

+

+   /* Alpha channel combine */

+   {

+      float4_array arg0 = argA[0];

+      float4_array arg1 = argA[1];

+      float4_array arg2 = argA[2];

+      float4_array arg3 = argA[3];

+

+      switch (combine->ModeA) {

+      case GL_REPLACE:

+         for (i = 0; i < n; i++) {

+            rgba[i][ACOMP] = arg0[i][ACOMP] * scaleA;

+         }

+         break;

+      case GL_MODULATE:

+         for (i = 0; i < n; i++) {

+            rgba[i][ACOMP] = arg0[i][ACOMP] * arg1[i][ACOMP] * scaleA;

+         }

+         break;

+      case GL_ADD:

+         if (textureUnit->EnvMode == GL_COMBINE4_NV) {

+            /* (a * b) + (c * d) */

+            for (i = 0; i < n; i++) {

+               rgba[i][ACOMP] = (arg0[i][ACOMP] * arg1[i][ACOMP] +

+                                 arg2[i][ACOMP] * arg3[i][ACOMP]) * scaleA;

+            }

+         }

+         else {

+            /* two-term add */

+            for (i = 0; i < n; i++) {

+               rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP]) * scaleA;

+            }

+         }

+         break;

+      case GL_ADD_SIGNED:

+         if (textureUnit->EnvMode == GL_COMBINE4_NV) {

+            /* (a * b) + (c * d) - 0.5 */

+            for (i = 0; i < n; i++) {

+               rgba[i][ACOMP] = (arg0[i][ACOMP] * arg1[i][ACOMP] +

+                                 arg2[i][ACOMP] * arg3[i][ACOMP] -

+                                 0.5F) * scaleA;

+            }

+         }

+         else {

+            /* a + b - 0.5 */

+            for (i = 0; i < n; i++) {

+               rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP] - 0.5F) * scaleA;

+            }

+         }

+         break;

+      case GL_INTERPOLATE:

+         for (i = 0; i < n; i++) {

+            rgba[i][ACOMP] = (arg0[i][ACOMP] * arg2[i][ACOMP] +

+                              arg1[i][ACOMP] * (1.0F - arg2[i][ACOMP]))

+               * scaleA;

+         }

+         break;

+      case GL_SUBTRACT:

+         for (i = 0; i < n; i++) {

+            rgba[i][ACOMP] = (arg0[i][ACOMP] - arg1[i][ACOMP]) * scaleA;

+         }

+         break;

+      case GL_MODULATE_ADD_ATI:

+         for (i = 0; i < n; i++) {

+            rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP])

+                              + arg1[i][ACOMP]) * scaleA;

+         }

+         break;

+      case GL_MODULATE_SIGNED_ADD_ATI:

+         for (i = 0; i < n; i++) {

+            rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP]) +

+                              arg1[i][ACOMP] - 0.5F) * scaleA;

+         }

+         break;

+      case GL_MODULATE_SUBTRACT_ATI:

+         for (i = 0; i < n; i++) {

+            rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP])

+                              - arg1[i][ACOMP]) * scaleA;

+         }

+         break;

+      default:

+         _mesa_problem(ctx, "invalid combine mode");

+      }

+   }

+

+   /* Fix the alpha component for GL_DOT3_RGBA_EXT/ARB combining.

+    * This is kind of a kludge.  It would have been better if the spec

+    * were written such that the GL_COMBINE_ALPHA value could be set to

+    * GL_DOT3.

+    */

+   if (combine->ModeRGB == GL_DOT3_RGBA_EXT ||

+       combine->ModeRGB == GL_DOT3_RGBA) {

+      for (i = 0; i < n; i++) {

+	 rgba[i][ACOMP] = rgba[i][RCOMP];

+      }

+   }

+

+   for (i = 0; i < n; i++) {

+      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][RCOMP], rgba[i][RCOMP]);

+      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][GCOMP], rgba[i][GCOMP]);

+      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][BCOMP], rgba[i][BCOMP]);

+      UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][ACOMP], rgba[i][ACOMP]);

+   }

+

+end:

+   for (i = 0; i < numArgsRGB || i < numArgsA; i++) {

+      free(ccolor[i]);

+   }

+   free(rgba);

+}

+

+

+/**

+ * Apply X/Y/Z/W/0/1 swizzle to an array of colors/texels.

+ * See GL_EXT_texture_swizzle.

+ */

+static void

+swizzle_texels(GLuint swizzle, GLuint count, float4_array texels)

+{

+   const GLuint swzR = GET_SWZ(swizzle, 0);

+   const GLuint swzG = GET_SWZ(swizzle, 1);

+   const GLuint swzB = GET_SWZ(swizzle, 2);

+   const GLuint swzA = GET_SWZ(swizzle, 3);

+   GLfloat vector[6];

+   GLuint i;

+

+   vector[SWIZZLE_ZERO] = 0;

+   vector[SWIZZLE_ONE] = 1.0F;

+

+   for (i = 0; i < count; i++) {

+      vector[SWIZZLE_X] = texels[i][0];

+      vector[SWIZZLE_Y] = texels[i][1];

+      vector[SWIZZLE_Z] = texels[i][2];

+      vector[SWIZZLE_W] = texels[i][3];

+      texels[i][RCOMP] = vector[swzR];

+      texels[i][GCOMP] = vector[swzG];

+      texels[i][BCOMP] = vector[swzB];

+      texels[i][ACOMP] = vector[swzA];

+   }

+}

+

+

+/**

+ * Apply texture mapping to a span of fragments.

+ */

+void

+_swrast_texture_span( struct gl_context *ctx, SWspan *span )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   float4_array primary_rgba;

+   GLuint unit;

+

+   primary_rgba = (float4_array) malloc(span->end * 4 * sizeof(GLfloat));

+

+   if (!primary_rgba) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture_span");

+      return;

+   }

+

+   ASSERT(span->end <= MAX_WIDTH);

+

+   /*

+    * Save copy of the incoming fragment colors (the GL_PRIMARY_COLOR)

+    */

+   if (swrast->_TextureCombinePrimary) {

+      GLuint i;

+      for (i = 0; i < span->end; i++) {

+         primary_rgba[i][RCOMP] = CHAN_TO_FLOAT(span->array->rgba[i][RCOMP]);

+         primary_rgba[i][GCOMP] = CHAN_TO_FLOAT(span->array->rgba[i][GCOMP]);

+         primary_rgba[i][BCOMP] = CHAN_TO_FLOAT(span->array->rgba[i][BCOMP]);

+         primary_rgba[i][ACOMP] = CHAN_TO_FLOAT(span->array->rgba[i][ACOMP]);

+      }

+   }

+

+   /* First must sample all bump maps */

+   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {

+      const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];

+

+      if (texUnit->_ReallyEnabled &&

+         texUnit->_CurrentCombine->ModeRGB == GL_BUMP_ENVMAP_ATI) {

+         const GLfloat (*texcoords)[4] = (const GLfloat (*)[4])

+            span->array->attribs[FRAG_ATTRIB_TEX0 + unit];

+         float4_array targetcoords =

+            span->array->attribs[FRAG_ATTRIB_TEX0 +

+               ctx->Texture.Unit[unit].BumpTarget - GL_TEXTURE0];

+

+         const struct gl_texture_object *curObj = texUnit->_Current;

+         GLfloat *lambda = span->array->lambda[unit];

+         float4_array texels = get_texel_array(swrast, unit);

+         GLuint i;

+         GLfloat rotMatrix00 = ctx->Texture.Unit[unit].RotMatrix[0];

+         GLfloat rotMatrix01 = ctx->Texture.Unit[unit].RotMatrix[1];

+         GLfloat rotMatrix10 = ctx->Texture.Unit[unit].RotMatrix[2];

+         GLfloat rotMatrix11 = ctx->Texture.Unit[unit].RotMatrix[3];

+

+         /* adjust texture lod (lambda) */

+         if (span->arrayMask & SPAN_LAMBDA) {

+            if (texUnit->LodBias + curObj->LodBias != 0.0F) {

+               /* apply LOD bias, but don't clamp yet */

+               const GLfloat bias = CLAMP(texUnit->LodBias + curObj->LodBias,

+                                          -ctx->Const.MaxTextureLodBias,

+                                          ctx->Const.MaxTextureLodBias);

+               GLuint i;

+               for (i = 0; i < span->end; i++) {

+                  lambda[i] += bias;

+               }

+            }

+

+            if (curObj->MinLod != -1000.0 || curObj->MaxLod != 1000.0) {

+               /* apply LOD clamping to lambda */

+               const GLfloat min = curObj->MinLod;

+               const GLfloat max = curObj->MaxLod;

+               GLuint i;

+               for (i = 0; i < span->end; i++) {

+                  GLfloat l = lambda[i];

+                  lambda[i] = CLAMP(l, min, max);

+               }

+            }

+         }

+

+         /* Sample the texture (span->end = number of fragments) */

+         swrast->TextureSample[unit]( ctx, texUnit->_Current, span->end,

+                                      texcoords, lambda, texels );

+

+         /* manipulate the span values of the bump target

+            not sure this can work correctly even ignoring

+            the problem that channel is unsigned */

+         for (i = 0; i < span->end; i++) {

+            targetcoords[i][0] += (texels[i][0] * rotMatrix00 + texels[i][1] *

+                                  rotMatrix01) / targetcoords[i][3];

+            targetcoords[i][1] += (texels[i][0] * rotMatrix10 + texels[i][1] *

+                                  rotMatrix11) / targetcoords[i][3];

+         }

+      }

+   }

+

+   /*

+    * Must do all texture sampling before combining in order to

+    * accomodate GL_ARB_texture_env_crossbar.

+    */

+   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {

+      const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];

+      if (texUnit->_ReallyEnabled &&

+          texUnit->_CurrentCombine->ModeRGB != GL_BUMP_ENVMAP_ATI) {

+         const GLfloat (*texcoords)[4] = (const GLfloat (*)[4])

+            span->array->attribs[FRAG_ATTRIB_TEX0 + unit];

+         const struct gl_texture_object *curObj = texUnit->_Current;

+         GLfloat *lambda = span->array->lambda[unit];

+         float4_array texels = get_texel_array(swrast, unit);

+

+         /* adjust texture lod (lambda) */

+         if (span->arrayMask & SPAN_LAMBDA) {

+            if (texUnit->LodBias + curObj->LodBias != 0.0F) {

+               /* apply LOD bias, but don't clamp yet */

+               const GLfloat bias = CLAMP(texUnit->LodBias + curObj->LodBias,

+                                          -ctx->Const.MaxTextureLodBias,

+                                          ctx->Const.MaxTextureLodBias);

+               GLuint i;

+               for (i = 0; i < span->end; i++) {

+                  lambda[i] += bias;

+               }

+            }

+

+            if (curObj->MinLod != -1000.0 || curObj->MaxLod != 1000.0) {

+               /* apply LOD clamping to lambda */

+               const GLfloat min = curObj->MinLod;

+               const GLfloat max = curObj->MaxLod;

+               GLuint i;

+               for (i = 0; i < span->end; i++) {

+                  GLfloat l = lambda[i];

+                  lambda[i] = CLAMP(l, min, max);

+               }

+            }

+         }

+

+         /* Sample the texture (span->end = number of fragments) */

+         swrast->TextureSample[unit]( ctx, texUnit->_Current, span->end,

+                                      texcoords, lambda, texels );

+

+         /* GL_EXT_texture_swizzle */

+         if (curObj->_Swizzle != SWIZZLE_NOOP) {

+            swizzle_texels(curObj->_Swizzle, span->end, texels);

+         }

+      }

+   }

+

+   /*

+    * OK, now apply the texture (aka texture combine/blend).

+    * We modify the span->color.rgba values.

+    */

+   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {

+      if (ctx->Texture.Unit[unit]._ReallyEnabled) {

+         texture_combine( ctx, unit, span->end,

+                          primary_rgba,

+                          swrast->TexelBuffer,

+                          span->array->rgba );

+      }

+   }

+

+   free(primary_rgba);

+}

diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c
index 42785400c..1d2b635e7 100644
--- a/mesalib/src/mesa/swrast/s_texfilter.c
+++ b/mesalib/src/mesa/swrast/s_texfilter.c
@@ -1,3314 +1,3314 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/imports.h"
-
-#include "s_context.h"
-#include "s_texfilter.h"
-
-
-/*
- * Note, the FRAC macro has to work perfectly.  Otherwise you'll sometimes
- * see 1-pixel bands of improperly weighted linear-filtered textures.
- * The tests/texwrap.c demo is a good test.
- * Also note, FRAC(x) doesn't truly return the fractional part of x for x < 0.
- * Instead, if x < 0 then FRAC(x) = 1 - true_frac(x).
- */
-#define FRAC(f)  ((f) - IFLOOR(f))
-
-
-
-/**
- * Linear interpolation macro
- */
-#define LERP(T, A, B)  ( (A) + (T) * ((B) - (A)) )
-
-
-/**
- * Do 2D/biliner interpolation of float values.
- * v00, v10, v01 and v11 are typically four texture samples in a square/box.
- * a and b are the horizontal and vertical interpolants.
- * It's important that this function is inlined when compiled with
- * optimization!  If we find that's not true on some systems, convert
- * to a macro.
- */
-static INLINE GLfloat
-lerp_2d(GLfloat a, GLfloat b,
-        GLfloat v00, GLfloat v10, GLfloat v01, GLfloat v11)
-{
-   const GLfloat temp0 = LERP(a, v00, v10);
-   const GLfloat temp1 = LERP(a, v01, v11);
-   return LERP(b, temp0, temp1);
-}
-
-
-/**
- * Do 3D/trilinear interpolation of float values.
- * \sa lerp_2d
- */
-static INLINE GLfloat
-lerp_3d(GLfloat a, GLfloat b, GLfloat c,
-        GLfloat v000, GLfloat v100, GLfloat v010, GLfloat v110,
-        GLfloat v001, GLfloat v101, GLfloat v011, GLfloat v111)
-{
-   const GLfloat temp00 = LERP(a, v000, v100);
-   const GLfloat temp10 = LERP(a, v010, v110);
-   const GLfloat temp01 = LERP(a, v001, v101);
-   const GLfloat temp11 = LERP(a, v011, v111);
-   const GLfloat temp0 = LERP(b, temp00, temp10);
-   const GLfloat temp1 = LERP(b, temp01, temp11);
-   return LERP(c, temp0, temp1);
-}
-
-
-/**
- * Do linear interpolation of colors.
- */
-static INLINE void
-lerp_rgba(GLfloat result[4], GLfloat t, const GLfloat a[4], const GLfloat b[4])
-{
-   result[0] = LERP(t, a[0], b[0]);
-   result[1] = LERP(t, a[1], b[1]);
-   result[2] = LERP(t, a[2], b[2]);
-   result[3] = LERP(t, a[3], b[3]);
-}
-
-
-/**
- * Do bilinear interpolation of colors.
- */
-static INLINE void
-lerp_rgba_2d(GLfloat result[4], GLfloat a, GLfloat b,
-             const GLfloat t00[4], const GLfloat t10[4],
-             const GLfloat t01[4], const GLfloat t11[4])
-{
-   result[0] = lerp_2d(a, b, t00[0], t10[0], t01[0], t11[0]);
-   result[1] = lerp_2d(a, b, t00[1], t10[1], t01[1], t11[1]);
-   result[2] = lerp_2d(a, b, t00[2], t10[2], t01[2], t11[2]);
-   result[3] = lerp_2d(a, b, t00[3], t10[3], t01[3], t11[3]);
-}
-
-
-/**
- * Do trilinear interpolation of colors.
- */
-static INLINE void
-lerp_rgba_3d(GLfloat result[4], GLfloat a, GLfloat b, GLfloat c,
-             const GLfloat t000[4], const GLfloat t100[4],
-             const GLfloat t010[4], const GLfloat t110[4],
-             const GLfloat t001[4], const GLfloat t101[4],
-             const GLfloat t011[4], const GLfloat t111[4])
-{
-   GLuint k;
-   /* compiler should unroll these short loops */
-   for (k = 0; k < 4; k++) {
-      result[k] = lerp_3d(a, b, c, t000[k], t100[k], t010[k], t110[k],
-                                   t001[k], t101[k], t011[k], t111[k]);
-   }
-}
-
-
-/**
- * Used for GL_REPEAT wrap mode.  Using A % B doesn't produce the
- * right results for A<0.  Casting to A to be unsigned only works if B
- * is a power of two.  Adding a bias to A (which is a multiple of B)
- * avoids the problems with A < 0 (for reasonable A) without using a
- * conditional.
- */
-#define REMAINDER(A, B) (((A) + (B) * 1024) % (B))
-
-
-/**
- * Used to compute texel locations for linear sampling.
- * Input:
- *    wrapMode = GL_REPEAT, GL_CLAMP, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_BORDER
- *    s = texcoord in [0,1]
- *    size = width (or height or depth) of texture
- * Output:
- *    i0, i1 = returns two nearest texel indexes
- *    weight = returns blend factor between texels
- */
-static INLINE void
-linear_texel_locations(GLenum wrapMode,
-                       const struct gl_texture_image *img,
-                       GLint size, GLfloat s,
-                       GLint *i0, GLint *i1, GLfloat *weight)
-{
-   GLfloat u;
-   switch (wrapMode) {
-   case GL_REPEAT:
-      u = s * size - 0.5F;
-      if (img->_IsPowerOfTwo) {
-         *i0 = IFLOOR(u) & (size - 1);
-         *i1 = (*i0 + 1) & (size - 1);
-      }
-      else {
-         *i0 = REMAINDER(IFLOOR(u), size);
-         *i1 = REMAINDER(*i0 + 1, size);
-      }
-      break;
-   case GL_CLAMP_TO_EDGE:
-      if (s <= 0.0F)
-         u = 0.0F;
-      else if (s >= 1.0F)
-         u = (GLfloat) size;
-      else
-         u = s * size;
-      u -= 0.5F;
-      *i0 = IFLOOR(u);
-      *i1 = *i0 + 1;
-      if (*i0 < 0)
-         *i0 = 0;
-      if (*i1 >= (GLint) size)
-         *i1 = size - 1;
-      break;
-   case GL_CLAMP_TO_BORDER:
-      {
-         const GLfloat min = -1.0F / (2.0F * size);
-         const GLfloat max = 1.0F - min;
-         if (s <= min)
-            u = min * size;
-         else if (s >= max)
-            u = max * size;
-         else
-            u = s * size;
-         u -= 0.5F;
-         *i0 = IFLOOR(u);
-         *i1 = *i0 + 1;
-      }
-      break;
-   case GL_MIRRORED_REPEAT:
-      {
-         const GLint flr = IFLOOR(s);
-         if (flr & 1)
-            u = 1.0F - (s - (GLfloat) flr);
-         else
-            u = s - (GLfloat) flr;
-         u = (u * size) - 0.5F;
-         *i0 = IFLOOR(u);
-         *i1 = *i0 + 1;
-         if (*i0 < 0)
-            *i0 = 0;
-         if (*i1 >= (GLint) size)
-            *i1 = size - 1;
-      }
-      break;
-   case GL_MIRROR_CLAMP_EXT:
-      u = FABSF(s);
-      if (u >= 1.0F)
-         u = (GLfloat) size;
-      else
-         u *= size;
-      u -= 0.5F;
-      *i0 = IFLOOR(u);
-      *i1 = *i0 + 1;
-      break;
-   case GL_MIRROR_CLAMP_TO_EDGE_EXT:
-      u = FABSF(s);
-      if (u >= 1.0F)
-         u = (GLfloat) size;
-      else
-         u *= size;
-      u -= 0.5F;
-      *i0 = IFLOOR(u);
-      *i1 = *i0 + 1;
-      if (*i0 < 0)
-         *i0 = 0;
-      if (*i1 >= (GLint) size)
-         *i1 = size - 1;
-      break;
-   case GL_MIRROR_CLAMP_TO_BORDER_EXT:
-      {
-         const GLfloat min = -1.0F / (2.0F * size);
-         const GLfloat max = 1.0F - min;
-         u = FABSF(s);
-         if (u <= min)
-            u = min * size;
-         else if (u >= max)
-            u = max * size;
-         else
-            u *= size;
-         u -= 0.5F;
-         *i0 = IFLOOR(u);
-         *i1 = *i0 + 1;
-      }
-      break;
-   case GL_CLAMP:
-      if (s <= 0.0F)
-         u = 0.0F;
-      else if (s >= 1.0F)
-         u = (GLfloat) size;
-      else
-         u = s * size;
-      u -= 0.5F;
-      *i0 = IFLOOR(u);
-      *i1 = *i0 + 1;
-      break;
-   default:
-      _mesa_problem(NULL, "Bad wrap mode");
-      u = 0.0F;
-   }
-   *weight = FRAC(u);
-}
-
-
-/**
- * Used to compute texel location for nearest sampling.
- */
-static INLINE GLint
-nearest_texel_location(GLenum wrapMode,
-                       const struct gl_texture_image *img,
-                       GLint size, GLfloat s)
-{
-   GLint i;
-
-   switch (wrapMode) {
-   case GL_REPEAT:
-      /* s limited to [0,1) */
-      /* i limited to [0,size-1] */
-      i = IFLOOR(s * size);
-      if (img->_IsPowerOfTwo)
-         i &= (size - 1);
-      else
-         i = REMAINDER(i, size);
-      return i;
-   case GL_CLAMP_TO_EDGE:
-      {
-         /* s limited to [min,max] */
-         /* i limited to [0, size-1] */
-         const GLfloat min = 1.0F / (2.0F * size);
-         const GLfloat max = 1.0F - min;
-         if (s < min)
-            i = 0;
-         else if (s > max)
-            i = size - 1;
-         else
-            i = IFLOOR(s * size);
-      }
-      return i;
-   case GL_CLAMP_TO_BORDER:
-      {
-         /* s limited to [min,max] */
-         /* i limited to [-1, size] */
-         const GLfloat min = -1.0F / (2.0F * size);
-         const GLfloat max = 1.0F - min;
-         if (s <= min)
-            i = -1;
-         else if (s >= max)
-            i = size;
-         else
-            i = IFLOOR(s * size);
-      }
-      return i;
-   case GL_MIRRORED_REPEAT:
-      {
-         const GLfloat min = 1.0F / (2.0F * size);
-         const GLfloat max = 1.0F - min;
-         const GLint flr = IFLOOR(s);
-         GLfloat u;
-         if (flr & 1)
-            u = 1.0F - (s - (GLfloat) flr);
-         else
-            u = s - (GLfloat) flr;
-         if (u < min)
-            i = 0;
-         else if (u > max)
-            i = size - 1;
-         else
-            i = IFLOOR(u * size);
-      }
-      return i;
-   case GL_MIRROR_CLAMP_EXT:
-      {
-         /* s limited to [0,1] */
-         /* i limited to [0,size-1] */
-         const GLfloat u = FABSF(s);
-         if (u <= 0.0F)
-            i = 0;
-         else if (u >= 1.0F)
-            i = size - 1;
-         else
-            i = IFLOOR(u * size);
-      }
-      return i;
-   case GL_MIRROR_CLAMP_TO_EDGE_EXT:
-      {
-         /* s limited to [min,max] */
-         /* i limited to [0, size-1] */
-         const GLfloat min = 1.0F / (2.0F * size);
-         const GLfloat max = 1.0F - min;
-         const GLfloat u = FABSF(s);
-         if (u < min)
-            i = 0;
-         else if (u > max)
-            i = size - 1;
-         else
-            i = IFLOOR(u * size);
-      }
-      return i;
-   case GL_MIRROR_CLAMP_TO_BORDER_EXT:
-      {
-         /* s limited to [min,max] */
-         /* i limited to [0, size-1] */
-         const GLfloat min = -1.0F / (2.0F * size);
-         const GLfloat max = 1.0F - min;
-         const GLfloat u = FABSF(s);
-         if (u < min)
-            i = -1;
-         else if (u > max)
-            i = size;
-         else
-            i = IFLOOR(u * size);
-      }
-      return i;
-   case GL_CLAMP:
-      /* s limited to [0,1] */
-      /* i limited to [0,size-1] */
-      if (s <= 0.0F)
-         i = 0;
-      else if (s >= 1.0F)
-         i = size - 1;
-      else
-         i = IFLOOR(s * size);
-      return i;
-   default:
-      _mesa_problem(NULL, "Bad wrap mode");
-      return 0;
-   }
-}
-
-
-/* Power of two image sizes only */
-static INLINE void
-linear_repeat_texel_location(GLuint size, GLfloat s,
-                             GLint *i0, GLint *i1, GLfloat *weight)
-{
-   GLfloat u = s * size - 0.5F;
-   *i0 = IFLOOR(u) & (size - 1);
-   *i1 = (*i0 + 1) & (size - 1);
-   *weight = FRAC(u);
-}
-
-
-/**
- * Do clamp/wrap for a texture rectangle coord, GL_NEAREST filter mode.
- */
-static INLINE GLint
-clamp_rect_coord_nearest(GLenum wrapMode, GLfloat coord, GLint max)
-{
-   switch (wrapMode) {
-   case GL_CLAMP:
-      return IFLOOR( CLAMP(coord, 0.0F, max - 1) );
-   case GL_CLAMP_TO_EDGE:
-      return IFLOOR( CLAMP(coord, 0.5F, max - 0.5F) );
-   case GL_CLAMP_TO_BORDER:
-      return IFLOOR( CLAMP(coord, -0.5F, max + 0.5F) );
-   default:
-      _mesa_problem(NULL, "bad wrapMode in clamp_rect_coord_nearest");
-      return 0;
-   }
-}
-
-
-/**
- * As above, but GL_LINEAR filtering.
- */
-static INLINE void
-clamp_rect_coord_linear(GLenum wrapMode, GLfloat coord, GLint max,
-                        GLint *i0out, GLint *i1out, GLfloat *weight)
-{
-   GLfloat fcol;
-   GLint i0, i1;
-   switch (wrapMode) {
-   case GL_CLAMP:
-      /* Not exactly what the spec says, but it matches NVIDIA output */
-      fcol = CLAMP(coord - 0.5F, 0.0F, max - 1);
-      i0 = IFLOOR(fcol);
-      i1 = i0 + 1;
-      break;
-   case GL_CLAMP_TO_EDGE:
-      fcol = CLAMP(coord, 0.5F, max - 0.5F);
-      fcol -= 0.5F;
-      i0 = IFLOOR(fcol);
-      i1 = i0 + 1;
-      if (i1 > max - 1)
-         i1 = max - 1;
-      break;
-   case GL_CLAMP_TO_BORDER:
-      fcol = CLAMP(coord, -0.5F, max + 0.5F);
-      fcol -= 0.5F;
-      i0 = IFLOOR(fcol);
-      i1 = i0 + 1;
-      break;
-   default:
-      _mesa_problem(NULL, "bad wrapMode in clamp_rect_coord_linear");
-      i0 = i1 = 0;
-      fcol = 0.0F;
-   }
-   *i0out = i0;
-   *i1out = i1;
-   *weight = FRAC(fcol);
-}
-
-
-/**
- * Compute slice/image to use for 1D or 2D array texture.
- */
-static INLINE GLint
-tex_array_slice(GLfloat coord, GLsizei size)
-{
-   GLint slice = IFLOOR(coord + 0.5f);
-   slice = CLAMP(slice, 0, size - 1);
-   return slice;
-}
-
-
-/**
- * Compute nearest integer texcoords for given texobj and coordinate.
- * NOTE: only used for depth texture sampling.
- */
-static INLINE void
-nearest_texcoord(const struct gl_texture_object *texObj,
-                 GLuint level,
-                 const GLfloat texcoord[4],
-                 GLint *i, GLint *j, GLint *k)
-{
-   const struct gl_texture_image *img = texObj->Image[0][level];
-   const GLint width = img->Width;
-   const GLint height = img->Height;
-   const GLint depth = img->Depth;
-
-   switch (texObj->Target) {
-   case GL_TEXTURE_RECTANGLE_ARB:
-      *i = clamp_rect_coord_nearest(texObj->WrapS, texcoord[0], width);
-      *j = clamp_rect_coord_nearest(texObj->WrapT, texcoord[1], height);
-      *k = 0;
-      break;
-   case GL_TEXTURE_1D:
-      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);
-      *j = 0;
-      *k = 0;
-      break;
-   case GL_TEXTURE_2D:
-      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);
-      *j = nearest_texel_location(texObj->WrapT, img, height, texcoord[1]);
-      *k = 0;
-      break;
-   case GL_TEXTURE_1D_ARRAY_EXT:
-      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);
-      *j = tex_array_slice(texcoord[1], height);
-      *k = 0;
-      break;
-   case GL_TEXTURE_2D_ARRAY_EXT:
-      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);
-      *j = nearest_texel_location(texObj->WrapT, img, height, texcoord[1]);
-      *k = tex_array_slice(texcoord[2], depth);
-      break;
-   default:
-      *i = *j = *k = 0;
-   }
-}
-
-
-/**
- * Compute linear integer texcoords for given texobj and coordinate.
- * NOTE: only used for depth texture sampling.
- */
-static INLINE void
-linear_texcoord(const struct gl_texture_object *texObj,
-                GLuint level,
-                const GLfloat texcoord[4],
-                GLint *i0, GLint *i1, GLint *j0, GLint *j1, GLint *slice,
-                GLfloat *wi, GLfloat *wj)
-{
-   const struct gl_texture_image *img = texObj->Image[0][level];
-   const GLint width = img->Width;
-   const GLint height = img->Height;
-   const GLint depth = img->Depth;
-
-   switch (texObj->Target) {
-   case GL_TEXTURE_RECTANGLE_ARB:
-      clamp_rect_coord_linear(texObj->WrapS, texcoord[0],
-                              width, i0, i1, wi);
-      clamp_rect_coord_linear(texObj->WrapT, texcoord[1],
-                              height, j0, j1, wj);
-      *slice = 0;
-      break;
-
-   case GL_TEXTURE_1D:
-   case GL_TEXTURE_2D:
-      linear_texel_locations(texObj->WrapS, img, width,
-                             texcoord[0], i0, i1, wi);
-      linear_texel_locations(texObj->WrapT, img, height,
-                             texcoord[1], j0, j1, wj);
-      *slice = 0;
-      break;
-
-   case GL_TEXTURE_1D_ARRAY_EXT:
-      linear_texel_locations(texObj->WrapS, img, width,
-                             texcoord[0], i0, i1, wi);
-      *j0 = tex_array_slice(texcoord[1], height);
-      *j1 = *j0;
-      *slice = 0;
-      break;
-
-   case GL_TEXTURE_2D_ARRAY_EXT:
-      linear_texel_locations(texObj->WrapS, img, width,
-                             texcoord[0], i0, i1, wi);
-      linear_texel_locations(texObj->WrapT, img, height,
-                             texcoord[1], j0, j1, wj);
-      *slice = tex_array_slice(texcoord[2], depth);
-      break;
-
-   default:
-      *slice = 0;
-   }
-}
-
-
-
-/**
- * For linear interpolation between mipmap levels N and N+1, this function
- * computes N.
- */
-static INLINE GLint
-linear_mipmap_level(const struct gl_texture_object *tObj, GLfloat lambda)
-{
-   if (lambda < 0.0F)
-      return tObj->BaseLevel;
-   else if (lambda > tObj->_MaxLambda)
-      return (GLint) (tObj->BaseLevel + tObj->_MaxLambda);
-   else
-      return (GLint) (tObj->BaseLevel + lambda);
-}
-
-
-/**
- * Compute the nearest mipmap level to take texels from.
- */
-static INLINE GLint
-nearest_mipmap_level(const struct gl_texture_object *tObj, GLfloat lambda)
-{
-   GLfloat l;
-   GLint level;
-   if (lambda <= 0.5F)
-      l = 0.0F;
-   else if (lambda > tObj->_MaxLambda + 0.4999F)
-      l = tObj->_MaxLambda + 0.4999F;
-   else
-      l = lambda;
-   level = (GLint) (tObj->BaseLevel + l + 0.5F);
-   if (level > tObj->_MaxLevel)
-      level = tObj->_MaxLevel;
-   return level;
-}
-
-
-
-/*
- * Bitflags for texture border color sampling.
- */
-#define I0BIT   1
-#define I1BIT   2
-#define J0BIT   4
-#define J1BIT   8
-#define K0BIT  16
-#define K1BIT  32
-
-
-
-/**
- * The lambda[] array values are always monotonic.  Either the whole span
- * will be minified, magnified, or split between the two.  This function
- * determines the subranges in [0, n-1] that are to be minified or magnified.
- */
-static INLINE void
-compute_min_mag_ranges(const struct gl_texture_object *tObj,
-                       GLuint n, const GLfloat lambda[],
-                       GLuint *minStart, GLuint *minEnd,
-                       GLuint *magStart, GLuint *magEnd)
-{
-   GLfloat minMagThresh;
-
-   /* we shouldn't be here if minfilter == magfilter */
-   ASSERT(tObj->MinFilter != tObj->MagFilter);
-
-   /* This bit comes from the OpenGL spec: */
-   if (tObj->MagFilter == GL_LINEAR
-       && (tObj->MinFilter == GL_NEAREST_MIPMAP_NEAREST ||
-           tObj->MinFilter == GL_NEAREST_MIPMAP_LINEAR)) {
-      minMagThresh = 0.5F;
-   }
-   else {
-      minMagThresh = 0.0F;
-   }
-
-#if 0
-   /* DEBUG CODE: Verify that lambda[] is monotonic.
-    * We can't really use this because the inaccuracy in the LOG2 function
-    * causes this test to fail, yet the resulting texturing is correct.
-    */
-   if (n > 1) {
-      GLuint i;
-      printf("lambda delta = %g\n", lambda[0] - lambda[n-1]);
-      if (lambda[0] >= lambda[n-1]) { /* decreasing */
-         for (i = 0; i < n - 1; i++) {
-            ASSERT((GLint) (lambda[i] * 10) >= (GLint) (lambda[i+1] * 10));
-         }
-      }
-      else { /* increasing */
-         for (i = 0; i < n - 1; i++) {
-            ASSERT((GLint) (lambda[i] * 10) <= (GLint) (lambda[i+1] * 10));
-         }
-      }
-   }
-#endif /* DEBUG */
-
-   if (lambda[0] <= minMagThresh && (n <= 1 || lambda[n-1] <= minMagThresh)) {
-      /* magnification for whole span */
-      *magStart = 0;
-      *magEnd = n;
-      *minStart = *minEnd = 0;
-   }
-   else if (lambda[0] > minMagThresh && (n <=1 || lambda[n-1] > minMagThresh)) {
-      /* minification for whole span */
-      *minStart = 0;
-      *minEnd = n;
-      *magStart = *magEnd = 0;
-   }
-   else {
-      /* a mix of minification and magnification */
-      GLuint i;
-      if (lambda[0] > minMagThresh) {
-         /* start with minification */
-         for (i = 1; i < n; i++) {
-            if (lambda[i] <= minMagThresh)
-               break;
-         }
-         *minStart = 0;
-         *minEnd = i;
-         *magStart = i;
-         *magEnd = n;
-      }
-      else {
-         /* start with magnification */
-         for (i = 1; i < n; i++) {
-            if (lambda[i] > minMagThresh)
-               break;
-         }
-         *magStart = 0;
-         *magEnd = i;
-         *minStart = i;
-         *minEnd = n;
-      }
-   }
-
-#if 0
-   /* Verify the min/mag Start/End values
-    * We don't use this either (see above)
-    */
-   {
-      GLint i;
-      for (i = 0; i < n; i++) {
-         if (lambda[i] > minMagThresh) {
-            /* minification */
-            ASSERT(i >= *minStart);
-            ASSERT(i < *minEnd);
-         }
-         else {
-            /* magnification */
-            ASSERT(i >= *magStart);
-            ASSERT(i < *magEnd);
-         }
-      }
-   }
-#endif
-}
-
-
-/**
- * When we sample the border color, it must be interpreted according to
- * the base texture format.  Ex: if the texture base format it GL_ALPHA,
- * we return (0,0,0,BorderAlpha).
- */
-static INLINE void
-get_border_color(const struct gl_texture_object *tObj,
-                 const struct gl_texture_image *img,
-                 GLfloat rgba[4])
-{
-   switch (img->_BaseFormat) {
-   case GL_RGB:
-      rgba[0] = tObj->BorderColor.f[0];
-      rgba[1] = tObj->BorderColor.f[1];
-      rgba[2] = tObj->BorderColor.f[2];
-      rgba[3] = 1.0F;
-      break;
-   case GL_ALPHA:
-      rgba[0] = rgba[1] = rgba[2] = 0.0;
-      rgba[3] = tObj->BorderColor.f[3];
-      break;
-   case GL_LUMINANCE:
-      rgba[0] = rgba[1] = rgba[2] = tObj->BorderColor.f[0];
-      rgba[3] = 1.0;
-      break;
-   case GL_LUMINANCE_ALPHA:
-      rgba[0] = rgba[1] = rgba[2] = tObj->BorderColor.f[0];
-      rgba[3] = tObj->BorderColor.f[3];
-      break;
-   case GL_INTENSITY:
-      rgba[0] = rgba[1] = rgba[2] = rgba[3] = tObj->BorderColor.f[0];
-      break;
-   default:
-      COPY_4V(rgba, tObj->BorderColor.f);
-   }
-}
-
-
-/**********************************************************************/
-/*                    1-D Texture Sampling Functions                  */
-/**********************************************************************/
-
-/**
- * Return the texture sample for coordinate (s) using GL_NEAREST filter.
- */
-static INLINE void
-sample_1d_nearest(struct gl_context *ctx,
-                  const struct gl_texture_object *tObj,
-                  const struct gl_texture_image *img,
-                  const GLfloat texcoord[4], GLfloat rgba[4])
-{
-   const GLint width = img->Width2;  /* without border, power of two */
-   GLint i;
-   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);
-   /* skip over the border, if any */
-   i += img->Border;
-   if (i < 0 || i >= (GLint) img->Width) {
-      /* Need this test for GL_CLAMP_TO_BORDER mode */
-      get_border_color(tObj, img, rgba);
-   }
-   else {
-      img->FetchTexelf(img, i, 0, 0, rgba);
-   }
-}
-
-
-/**
- * Return the texture sample for coordinate (s) using GL_LINEAR filter.
- */
-static INLINE void
-sample_1d_linear(struct gl_context *ctx,
-                 const struct gl_texture_object *tObj,
-                 const struct gl_texture_image *img,
-                 const GLfloat texcoord[4], GLfloat rgba[4])
-{
-   const GLint width = img->Width2;
-   GLint i0, i1;
-   GLbitfield useBorderColor = 0x0;
-   GLfloat a;
-   GLfloat t0[4], t1[4];  /* texels */
-
-   linear_texel_locations(tObj->WrapS, img, width, texcoord[0], &i0, &i1, &a);
-
-   if (img->Border) {
-      i0 += img->Border;
-      i1 += img->Border;
-   }
-   else {
-      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;
-      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;
-   }
-
-   /* fetch texel colors */
-   if (useBorderColor & I0BIT) {
-      get_border_color(tObj, img, t0);
-   }
-   else {
-      img->FetchTexelf(img, i0, 0, 0, t0);
-   }
-   if (useBorderColor & I1BIT) {
-      get_border_color(tObj, img, t1);
-   }
-   else {
-      img->FetchTexelf(img, i1, 0, 0, t1);
-   }
-
-   lerp_rgba(rgba, a, t0, t1);
-}
-
-
-static void
-sample_1d_nearest_mipmap_nearest(struct gl_context *ctx,
-                                 const struct gl_texture_object *tObj,
-                                 GLuint n, const GLfloat texcoord[][4],
-                                 const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = nearest_mipmap_level(tObj, lambda[i]);
-      sample_1d_nearest(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);
-   }
-}
-
-
-static void
-sample_1d_linear_mipmap_nearest(struct gl_context *ctx,
-                                const struct gl_texture_object *tObj,
-                                GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = nearest_mipmap_level(tObj, lambda[i]);
-      sample_1d_linear(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);
-   }
-}
-
-
-static void
-sample_1d_nearest_mipmap_linear(struct gl_context *ctx,
-                                const struct gl_texture_object *tObj,
-                                GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      if (level >= tObj->_MaxLevel) {
-         sample_1d_nearest(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],
-                           texcoord[i], rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];
-         const GLfloat f = FRAC(lambda[i]);
-         sample_1d_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
-         sample_1d_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-static void
-sample_1d_linear_mipmap_linear(struct gl_context *ctx,
-                               const struct gl_texture_object *tObj,
-                               GLuint n, const GLfloat texcoord[][4],
-                               const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      if (level >= tObj->_MaxLevel) {
-         sample_1d_linear(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],
-                          texcoord[i], rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];
-         const GLfloat f = FRAC(lambda[i]);
-         sample_1d_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
-         sample_1d_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-/** Sample 1D texture, nearest filtering for both min/magnification */
-static void
-sample_nearest_1d( struct gl_context *ctx,
-                   const struct gl_texture_object *tObj, GLuint n,
-                   const GLfloat texcoords[][4], const GLfloat lambda[],
-                   GLfloat rgba[][4] )
-{
-   GLuint i;
-   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      sample_1d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);
-   }
-}
-
-
-/** Sample 1D texture, linear filtering for both min/magnification */
-static void
-sample_linear_1d( struct gl_context *ctx,
-                  const struct gl_texture_object *tObj, GLuint n,
-                  const GLfloat texcoords[][4], const GLfloat lambda[],
-                  GLfloat rgba[][4] )
-{
-   GLuint i;
-   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      sample_1d_linear(ctx, tObj, image, texcoords[i], rgba[i]);
-   }
-}
-
-
-/** Sample 1D texture, using lambda to choose between min/magnification */
-static void
-sample_lambda_1d( struct gl_context *ctx,
-                  const struct gl_texture_object *tObj, GLuint n,
-                  const GLfloat texcoords[][4],
-                  const GLfloat lambda[], GLfloat rgba[][4] )
-{
-   GLuint minStart, minEnd;  /* texels with minification */
-   GLuint magStart, magEnd;  /* texels with magnification */
-   GLuint i;
-
-   ASSERT(lambda != NULL);
-   compute_min_mag_ranges(tObj, n, lambda,
-                          &minStart, &minEnd, &magStart, &magEnd);
-
-   if (minStart < minEnd) {
-      /* do the minified texels */
-      const GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
-      case GL_NEAREST:
-         for (i = minStart; i < minEnd; i++)
-            sample_1d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                              texcoords[i], rgba[i]);
-         break;
-      case GL_LINEAR:
-         for (i = minStart; i < minEnd; i++)
-            sample_1d_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                             texcoords[i], rgba[i]);
-         break;
-      case GL_NEAREST_MIPMAP_NEAREST:
-         sample_1d_nearest_mipmap_nearest(ctx, tObj, m, texcoords + minStart,
-                                          lambda + minStart, rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_NEAREST:
-         sample_1d_linear_mipmap_nearest(ctx, tObj, m, texcoords + minStart,
-                                         lambda + minStart, rgba + minStart);
-         break;
-      case GL_NEAREST_MIPMAP_LINEAR:
-         sample_1d_nearest_mipmap_linear(ctx, tObj, m, texcoords + minStart,
-                                         lambda + minStart, rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_LINEAR:
-         sample_1d_linear_mipmap_linear(ctx, tObj, m, texcoords + minStart,
-                                        lambda + minStart, rgba + minStart);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad min filter in sample_1d_texture");
-         return;
-      }
-   }
-
-   if (magStart < magEnd) {
-      /* do the magnified texels */
-      switch (tObj->MagFilter) {
-      case GL_NEAREST:
-         for (i = magStart; i < magEnd; i++)
-            sample_1d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                              texcoords[i], rgba[i]);
-         break;
-      case GL_LINEAR:
-         for (i = magStart; i < magEnd; i++)
-            sample_1d_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                             texcoords[i], rgba[i]);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad mag filter in sample_1d_texture");
-         return;
-      }
-   }
-}
-
-
-/**********************************************************************/
-/*                    2-D Texture Sampling Functions                  */
-/**********************************************************************/
-
-
-/**
- * Return the texture sample for coordinate (s,t) using GL_NEAREST filter.
- */
-static INLINE void
-sample_2d_nearest(struct gl_context *ctx,
-                  const struct gl_texture_object *tObj,
-                  const struct gl_texture_image *img,
-                  const GLfloat texcoord[4],
-                  GLfloat rgba[])
-{
-   const GLint width = img->Width2;    /* without border, power of two */
-   const GLint height = img->Height2;  /* without border, power of two */
-   GLint i, j;
-   (void) ctx;
-
-   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);
-   j = nearest_texel_location(tObj->WrapT, img, height, texcoord[1]);
-
-   /* skip over the border, if any */
-   i += img->Border;
-   j += img->Border;
-
-   if (i < 0 || i >= (GLint) img->Width || j < 0 || j >= (GLint) img->Height) {
-      /* Need this test for GL_CLAMP_TO_BORDER mode */
-      get_border_color(tObj, img, rgba);
-   }
-   else {
-      img->FetchTexelf(img, i, j, 0, rgba);
-   }
-}
-
-
-/**
- * Return the texture sample for coordinate (s,t) using GL_LINEAR filter.
- * New sampling code contributed by Lynn Quam <quam@ai.sri.com>.
- */
-static INLINE void
-sample_2d_linear(struct gl_context *ctx,
-                 const struct gl_texture_object *tObj,
-                 const struct gl_texture_image *img,
-                 const GLfloat texcoord[4],
-                 GLfloat rgba[])
-{
-   const GLint width = img->Width2;
-   const GLint height = img->Height2;
-   GLint i0, j0, i1, j1;
-   GLbitfield useBorderColor = 0x0;
-   GLfloat a, b;
-   GLfloat t00[4], t10[4], t01[4], t11[4]; /* sampled texel colors */
-
-   linear_texel_locations(tObj->WrapS, img, width, texcoord[0],  &i0, &i1, &a);
-   linear_texel_locations(tObj->WrapT, img, height, texcoord[1], &j0, &j1, &b);
-
-   if (img->Border) {
-      i0 += img->Border;
-      i1 += img->Border;
-      j0 += img->Border;
-      j1 += img->Border;
-   }
-   else {
-      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;
-      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;
-      if (j0 < 0 || j0 >= height)  useBorderColor |= J0BIT;
-      if (j1 < 0 || j1 >= height)  useBorderColor |= J1BIT;
-   }
-
-   /* fetch four texel colors */
-   if (useBorderColor & (I0BIT | J0BIT)) {
-      get_border_color(tObj, img, t00);
-   }
-   else {
-      img->FetchTexelf(img, i0, j0, 0, t00);
-   }
-   if (useBorderColor & (I1BIT | J0BIT)) {
-      get_border_color(tObj, img, t10);
-   }
-   else {
-      img->FetchTexelf(img, i1, j0, 0, t10);
-   }
-   if (useBorderColor & (I0BIT | J1BIT)) {
-      get_border_color(tObj, img, t01);
-   }
-   else {
-      img->FetchTexelf(img, i0, j1, 0, t01);
-   }
-   if (useBorderColor & (I1BIT | J1BIT)) {
-      get_border_color(tObj, img, t11);
-   }
-   else {
-      img->FetchTexelf(img, i1, j1, 0, t11);
-   }
-
-   lerp_rgba_2d(rgba, a, b, t00, t10, t01, t11);
-}
-
-
-/**
- * As above, but we know WRAP_S == REPEAT and WRAP_T == REPEAT.
- * We don't have to worry about the texture border.
- */
-static INLINE void
-sample_2d_linear_repeat(struct gl_context *ctx,
-                        const struct gl_texture_object *tObj,
-                        const struct gl_texture_image *img,
-                        const GLfloat texcoord[4],
-                        GLfloat rgba[])
-{
-   const GLint width = img->Width2;
-   const GLint height = img->Height2;
-   GLint i0, j0, i1, j1;
-   GLfloat wi, wj;
-   GLfloat t00[4], t10[4], t01[4], t11[4]; /* sampled texel colors */
-
-   (void) ctx;
-
-   ASSERT(tObj->WrapS == GL_REPEAT);
-   ASSERT(tObj->WrapT == GL_REPEAT);
-   ASSERT(img->Border == 0);
-   ASSERT(img->_BaseFormat != GL_COLOR_INDEX);
-   ASSERT(img->_IsPowerOfTwo);
-
-   linear_repeat_texel_location(width,  texcoord[0], &i0, &i1, &wi);
-   linear_repeat_texel_location(height, texcoord[1], &j0, &j1, &wj);
-
-   img->FetchTexelf(img, i0, j0, 0, t00);
-   img->FetchTexelf(img, i1, j0, 0, t10);
-   img->FetchTexelf(img, i0, j1, 0, t01);
-   img->FetchTexelf(img, i1, j1, 0, t11);
-
-   lerp_rgba_2d(rgba, wi, wj, t00, t10, t01, t11);
-}
-
-
-static void
-sample_2d_nearest_mipmap_nearest(struct gl_context *ctx,
-                                 const struct gl_texture_object *tObj,
-                                 GLuint n, const GLfloat texcoord[][4],
-                                 const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      GLint level = nearest_mipmap_level(tObj, lambda[i]);
-      sample_2d_nearest(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);
-   }
-}
-
-
-static void
-sample_2d_linear_mipmap_nearest(struct gl_context *ctx,
-                                const struct gl_texture_object *tObj,
-                                GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = nearest_mipmap_level(tObj, lambda[i]);
-      sample_2d_linear(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);
-   }
-}
-
-
-static void
-sample_2d_nearest_mipmap_linear(struct gl_context *ctx,
-                                const struct gl_texture_object *tObj,
-                                GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      if (level >= tObj->_MaxLevel) {
-         sample_2d_nearest(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],
-                           texcoord[i], rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];  /* texels */
-         const GLfloat f = FRAC(lambda[i]);
-         sample_2d_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
-         sample_2d_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-static void
-sample_2d_linear_mipmap_linear( struct gl_context *ctx,
-                                const struct gl_texture_object *tObj,
-                                GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLfloat rgba[][4] )
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      if (level >= tObj->_MaxLevel) {
-         sample_2d_linear(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],
-                          texcoord[i], rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];  /* texels */
-         const GLfloat f = FRAC(lambda[i]);
-         sample_2d_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
-         sample_2d_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-static void
-sample_2d_linear_mipmap_linear_repeat(struct gl_context *ctx,
-                                      const struct gl_texture_object *tObj,
-                                      GLuint n, const GLfloat texcoord[][4],
-                                      const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   ASSERT(tObj->WrapS == GL_REPEAT);
-   ASSERT(tObj->WrapT == GL_REPEAT);
-   for (i = 0; i < n; i++) {
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      if (level >= tObj->_MaxLevel) {
-         sample_2d_linear_repeat(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],
-                                 texcoord[i], rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];  /* texels */
-         const GLfloat f = FRAC(lambda[i]);
-         sample_2d_linear_repeat(ctx, tObj, tObj->Image[0][level  ],
-                                 texcoord[i], t0);
-         sample_2d_linear_repeat(ctx, tObj, tObj->Image[0][level+1],
-                                 texcoord[i], t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-/** Sample 2D texture, nearest filtering for both min/magnification */
-static void
-sample_nearest_2d(struct gl_context *ctx,
-                  const struct gl_texture_object *tObj, GLuint n,
-                  const GLfloat texcoords[][4],
-                  const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      sample_2d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);
-   }
-}
-
-
-/** Sample 2D texture, linear filtering for both min/magnification */
-static void
-sample_linear_2d(struct gl_context *ctx,
-                 const struct gl_texture_object *tObj, GLuint n,
-                 const GLfloat texcoords[][4],
-                 const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
-   (void) lambda;
-   if (tObj->WrapS == GL_REPEAT &&
-       tObj->WrapT == GL_REPEAT &&
-       image->_IsPowerOfTwo &&
-       image->Border == 0) {
-      for (i = 0; i < n; i++) {
-         sample_2d_linear_repeat(ctx, tObj, image, texcoords[i], rgba[i]);
-      }
-   }
-   else {
-      for (i = 0; i < n; i++) {
-         sample_2d_linear(ctx, tObj, image, texcoords[i], rgba[i]);
-      }
-   }
-}
-
-
-/**
- * Optimized 2-D texture sampling:
- *    S and T wrap mode == GL_REPEAT
- *    GL_NEAREST min/mag filter
- *    No border, 
- *    RowStride == Width,
- *    Format = GL_RGB
- */
-static void
-opt_sample_rgb_2d(struct gl_context *ctx,
-                  const struct gl_texture_object *tObj,
-                  GLuint n, const GLfloat texcoords[][4],
-                  const GLfloat lambda[], GLfloat rgba[][4])
-{
-   const struct gl_texture_image *img = tObj->Image[0][tObj->BaseLevel];
-   const GLfloat width = (GLfloat) img->Width;
-   const GLfloat height = (GLfloat) img->Height;
-   const GLint colMask = img->Width - 1;
-   const GLint rowMask = img->Height - 1;
-   const GLint shift = img->WidthLog2;
-   GLuint k;
-   (void) ctx;
-   (void) lambda;
-   ASSERT(tObj->WrapS==GL_REPEAT);
-   ASSERT(tObj->WrapT==GL_REPEAT);
-   ASSERT(img->Border==0);
-   ASSERT(img->TexFormat == MESA_FORMAT_RGB888);
-   ASSERT(img->_IsPowerOfTwo);
-
-   for (k=0; k<n; k++) {
-      GLint i = IFLOOR(texcoords[k][0] * width) & colMask;
-      GLint j = IFLOOR(texcoords[k][1] * height) & rowMask;
-      GLint pos = (j << shift) | i;
-      GLubyte *texel = ((GLubyte *) img->Data) + 3*pos;
-      rgba[k][RCOMP] = UBYTE_TO_FLOAT(texel[2]);
-      rgba[k][GCOMP] = UBYTE_TO_FLOAT(texel[1]);
-      rgba[k][BCOMP] = UBYTE_TO_FLOAT(texel[0]);
-      rgba[k][ACOMP] = 1.0F;
-   }
-}
-
-
-/**
- * Optimized 2-D texture sampling:
- *    S and T wrap mode == GL_REPEAT
- *    GL_NEAREST min/mag filter
- *    No border
- *    RowStride == Width,
- *    Format = GL_RGBA
- */
-static void
-opt_sample_rgba_2d(struct gl_context *ctx,
-                   const struct gl_texture_object *tObj,
-                   GLuint n, const GLfloat texcoords[][4],
-                   const GLfloat lambda[], GLfloat rgba[][4])
-{
-   const struct gl_texture_image *img = tObj->Image[0][tObj->BaseLevel];
-   const GLfloat width = (GLfloat) img->Width;
-   const GLfloat height = (GLfloat) img->Height;
-   const GLint colMask = img->Width - 1;
-   const GLint rowMask = img->Height - 1;
-   const GLint shift = img->WidthLog2;
-   GLuint i;
-   (void) ctx;
-   (void) lambda;
-   ASSERT(tObj->WrapS==GL_REPEAT);
-   ASSERT(tObj->WrapT==GL_REPEAT);
-   ASSERT(img->Border==0);
-   ASSERT(img->TexFormat == MESA_FORMAT_RGBA8888);
-   ASSERT(img->_IsPowerOfTwo);
-
-   for (i = 0; i < n; i++) {
-      const GLint col = IFLOOR(texcoords[i][0] * width) & colMask;
-      const GLint row = IFLOOR(texcoords[i][1] * height) & rowMask;
-      const GLint pos = (row << shift) | col;
-      const GLuint texel = *((GLuint *) img->Data + pos);
-      rgba[i][RCOMP] = UBYTE_TO_FLOAT( (texel >> 24)        );
-      rgba[i][GCOMP] = UBYTE_TO_FLOAT( (texel >> 16) & 0xff );
-      rgba[i][BCOMP] = UBYTE_TO_FLOAT( (texel >>  8) & 0xff );
-      rgba[i][ACOMP] = UBYTE_TO_FLOAT( (texel      ) & 0xff );
-   }
-}
-
-
-/** Sample 2D texture, using lambda to choose between min/magnification */
-static void
-sample_lambda_2d(struct gl_context *ctx,
-                 const struct gl_texture_object *tObj,
-                 GLuint n, const GLfloat texcoords[][4],
-                 const GLfloat lambda[], GLfloat rgba[][4])
-{
-   const struct gl_texture_image *tImg = tObj->Image[0][tObj->BaseLevel];
-   GLuint minStart, minEnd;  /* texels with minification */
-   GLuint magStart, magEnd;  /* texels with magnification */
-
-   const GLboolean repeatNoBorderPOT = (tObj->WrapS == GL_REPEAT)
-      && (tObj->WrapT == GL_REPEAT)
-      && (tImg->Border == 0 && (tImg->Width == tImg->RowStride))
-      && (tImg->_BaseFormat != GL_COLOR_INDEX)
-      && tImg->_IsPowerOfTwo;
-
-   ASSERT(lambda != NULL);
-   compute_min_mag_ranges(tObj, n, lambda,
-                          &minStart, &minEnd, &magStart, &magEnd);
-
-   if (minStart < minEnd) {
-      /* do the minified texels */
-      const GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
-      case GL_NEAREST:
-         if (repeatNoBorderPOT) {
-            switch (tImg->TexFormat) {
-            case MESA_FORMAT_RGB888:
-               opt_sample_rgb_2d(ctx, tObj, m, texcoords + minStart,
-                                 NULL, rgba + minStart);
-               break;
-            case MESA_FORMAT_RGBA8888:
-	       opt_sample_rgba_2d(ctx, tObj, m, texcoords + minStart,
-                                  NULL, rgba + minStart);
-               break;
-            default:
-               sample_nearest_2d(ctx, tObj, m, texcoords + minStart,
-                                 NULL, rgba + minStart );
-            }
-         }
-         else {
-            sample_nearest_2d(ctx, tObj, m, texcoords + minStart,
-                              NULL, rgba + minStart);
-         }
-         break;
-      case GL_LINEAR:
-	 sample_linear_2d(ctx, tObj, m, texcoords + minStart,
-			  NULL, rgba + minStart);
-         break;
-      case GL_NEAREST_MIPMAP_NEAREST:
-         sample_2d_nearest_mipmap_nearest(ctx, tObj, m,
-                                          texcoords + minStart,
-                                          lambda + minStart, rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_NEAREST:
-         sample_2d_linear_mipmap_nearest(ctx, tObj, m, texcoords + minStart,
-                                         lambda + minStart, rgba + minStart);
-         break;
-      case GL_NEAREST_MIPMAP_LINEAR:
-         sample_2d_nearest_mipmap_linear(ctx, tObj, m, texcoords + minStart,
-                                         lambda + minStart, rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_LINEAR:
-         if (repeatNoBorderPOT)
-            sample_2d_linear_mipmap_linear_repeat(ctx, tObj, m,
-                  texcoords + minStart, lambda + minStart, rgba + minStart);
-         else
-            sample_2d_linear_mipmap_linear(ctx, tObj, m, texcoords + minStart,
-                                        lambda + minStart, rgba + minStart);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad min filter in sample_2d_texture");
-         return;
-      }
-   }
-
-   if (magStart < magEnd) {
-      /* do the magnified texels */
-      const GLuint m = magEnd - magStart;
-
-      switch (tObj->MagFilter) {
-      case GL_NEAREST:
-         if (repeatNoBorderPOT) {
-            switch (tImg->TexFormat) {
-            case MESA_FORMAT_RGB888:
-               opt_sample_rgb_2d(ctx, tObj, m, texcoords + magStart,
-                                 NULL, rgba + magStart);
-               break;
-            case MESA_FORMAT_RGBA8888:
-	       opt_sample_rgba_2d(ctx, tObj, m, texcoords + magStart,
-                                  NULL, rgba + magStart);
-               break;
-            default:
-               sample_nearest_2d(ctx, tObj, m, texcoords + magStart,
-                                 NULL, rgba + magStart );
-            }
-         }
-         else {
-            sample_nearest_2d(ctx, tObj, m, texcoords + magStart,
-                              NULL, rgba + magStart);
-         }
-         break;
-      case GL_LINEAR:
-	 sample_linear_2d(ctx, tObj, m, texcoords + magStart,
-			  NULL, rgba + magStart);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad mag filter in sample_lambda_2d");
-      }
-   }
-}
-
-
-
-/**********************************************************************/
-/*                    3-D Texture Sampling Functions                  */
-/**********************************************************************/
-
-/**
- * Return the texture sample for coordinate (s,t,r) using GL_NEAREST filter.
- */
-static INLINE void
-sample_3d_nearest(struct gl_context *ctx,
-                  const struct gl_texture_object *tObj,
-                  const struct gl_texture_image *img,
-                  const GLfloat texcoord[4],
-                  GLfloat rgba[4])
-{
-   const GLint width = img->Width2;     /* without border, power of two */
-   const GLint height = img->Height2;   /* without border, power of two */
-   const GLint depth = img->Depth2;     /* without border, power of two */
-   GLint i, j, k;
-   (void) ctx;
-
-   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);
-   j = nearest_texel_location(tObj->WrapT, img, height, texcoord[1]);
-   k = nearest_texel_location(tObj->WrapR, img, depth, texcoord[2]);
-
-   if (i < 0 || i >= (GLint) img->Width ||
-       j < 0 || j >= (GLint) img->Height ||
-       k < 0 || k >= (GLint) img->Depth) {
-      /* Need this test for GL_CLAMP_TO_BORDER mode */
-      get_border_color(tObj, img, rgba);
-   }
-   else {
-      img->FetchTexelf(img, i, j, k, rgba);
-   }
-}
-
-
-/**
- * Return the texture sample for coordinate (s,t,r) using GL_LINEAR filter.
- */
-static void
-sample_3d_linear(struct gl_context *ctx,
-                 const struct gl_texture_object *tObj,
-                 const struct gl_texture_image *img,
-                 const GLfloat texcoord[4],
-                 GLfloat rgba[4])
-{
-   const GLint width = img->Width2;
-   const GLint height = img->Height2;
-   const GLint depth = img->Depth2;
-   GLint i0, j0, k0, i1, j1, k1;
-   GLbitfield useBorderColor = 0x0;
-   GLfloat a, b, c;
-   GLfloat t000[4], t010[4], t001[4], t011[4];
-   GLfloat t100[4], t110[4], t101[4], t111[4];
-
-   linear_texel_locations(tObj->WrapS, img, width, texcoord[0],  &i0, &i1, &a);
-   linear_texel_locations(tObj->WrapT, img, height, texcoord[1], &j0, &j1, &b);
-   linear_texel_locations(tObj->WrapR, img, depth, texcoord[2],  &k0, &k1, &c);
-
-   if (img->Border) {
-      i0 += img->Border;
-      i1 += img->Border;
-      j0 += img->Border;
-      j1 += img->Border;
-      k0 += img->Border;
-      k1 += img->Border;
-   }
-   else {
-      /* check if sampling texture border color */
-      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;
-      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;
-      if (j0 < 0 || j0 >= height)  useBorderColor |= J0BIT;
-      if (j1 < 0 || j1 >= height)  useBorderColor |= J1BIT;
-      if (k0 < 0 || k0 >= depth)   useBorderColor |= K0BIT;
-      if (k1 < 0 || k1 >= depth)   useBorderColor |= K1BIT;
-   }
-
-   /* Fetch texels */
-   if (useBorderColor & (I0BIT | J0BIT | K0BIT)) {
-      get_border_color(tObj, img, t000);
-   }
-   else {
-      img->FetchTexelf(img, i0, j0, k0, t000);
-   }
-   if (useBorderColor & (I1BIT | J0BIT | K0BIT)) {
-      get_border_color(tObj, img, t100);
-   }
-   else {
-      img->FetchTexelf(img, i1, j0, k0, t100);
-   }
-   if (useBorderColor & (I0BIT | J1BIT | K0BIT)) {
-      get_border_color(tObj, img, t010);
-   }
-   else {
-      img->FetchTexelf(img, i0, j1, k0, t010);
-   }
-   if (useBorderColor & (I1BIT | J1BIT | K0BIT)) {
-      get_border_color(tObj, img, t110);
-   }
-   else {
-      img->FetchTexelf(img, i1, j1, k0, t110);
-   }
-
-   if (useBorderColor & (I0BIT | J0BIT | K1BIT)) {
-      get_border_color(tObj, img, t001);
-   }
-   else {
-      img->FetchTexelf(img, i0, j0, k1, t001);
-   }
-   if (useBorderColor & (I1BIT | J0BIT | K1BIT)) {
-      get_border_color(tObj, img, t101);
-   }
-   else {
-      img->FetchTexelf(img, i1, j0, k1, t101);
-   }
-   if (useBorderColor & (I0BIT | J1BIT | K1BIT)) {
-      get_border_color(tObj, img, t011);
-   }
-   else {
-      img->FetchTexelf(img, i0, j1, k1, t011);
-   }
-   if (useBorderColor & (I1BIT | J1BIT | K1BIT)) {
-      get_border_color(tObj, img, t111);
-   }
-   else {
-      img->FetchTexelf(img, i1, j1, k1, t111);
-   }
-
-   /* trilinear interpolation of samples */
-   lerp_rgba_3d(rgba, a, b, c, t000, t100, t010, t110, t001, t101, t011, t111);
-}
-
-
-static void
-sample_3d_nearest_mipmap_nearest(struct gl_context *ctx,
-                                 const struct gl_texture_object *tObj,
-                                 GLuint n, const GLfloat texcoord[][4],
-                                 const GLfloat lambda[], GLfloat rgba[][4] )
-{
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      GLint level = nearest_mipmap_level(tObj, lambda[i]);
-      sample_3d_nearest(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);
-   }
-}
-
-
-static void
-sample_3d_linear_mipmap_nearest(struct gl_context *ctx,
-                                const struct gl_texture_object *tObj,
-                                GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = nearest_mipmap_level(tObj, lambda[i]);
-      sample_3d_linear(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);
-   }
-}
-
-
-static void
-sample_3d_nearest_mipmap_linear(struct gl_context *ctx,
-                                const struct gl_texture_object *tObj,
-                                GLuint n, const GLfloat texcoord[][4],
-                                const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      if (level >= tObj->_MaxLevel) {
-         sample_3d_nearest(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],
-                           texcoord[i], rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];  /* texels */
-         const GLfloat f = FRAC(lambda[i]);
-         sample_3d_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
-         sample_3d_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-static void
-sample_3d_linear_mipmap_linear(struct gl_context *ctx,
-                               const struct gl_texture_object *tObj,
-                               GLuint n, const GLfloat texcoord[][4],
-                               const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      if (level >= tObj->_MaxLevel) {
-         sample_3d_linear(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],
-                          texcoord[i], rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];  /* texels */
-         const GLfloat f = FRAC(lambda[i]);
-         sample_3d_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
-         sample_3d_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-/** Sample 3D texture, nearest filtering for both min/magnification */
-static void
-sample_nearest_3d(struct gl_context *ctx,
-                  const struct gl_texture_object *tObj, GLuint n,
-                  const GLfloat texcoords[][4], const GLfloat lambda[],
-                  GLfloat rgba[][4])
-{
-   GLuint i;
-   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      sample_3d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);
-   }
-}
-
-
-/** Sample 3D texture, linear filtering for both min/magnification */
-static void
-sample_linear_3d(struct gl_context *ctx,
-                 const struct gl_texture_object *tObj, GLuint n,
-                 const GLfloat texcoords[][4],
-		 const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      sample_3d_linear(ctx, tObj, image, texcoords[i], rgba[i]);
-   }
-}
-
-
-/** Sample 3D texture, using lambda to choose between min/magnification */
-static void
-sample_lambda_3d(struct gl_context *ctx,
-                 const struct gl_texture_object *tObj, GLuint n,
-                 const GLfloat texcoords[][4], const GLfloat lambda[],
-                 GLfloat rgba[][4])
-{
-   GLuint minStart, minEnd;  /* texels with minification */
-   GLuint magStart, magEnd;  /* texels with magnification */
-   GLuint i;
-
-   ASSERT(lambda != NULL);
-   compute_min_mag_ranges(tObj, n, lambda,
-                          &minStart, &minEnd, &magStart, &magEnd);
-
-   if (minStart < minEnd) {
-      /* do the minified texels */
-      GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
-      case GL_NEAREST:
-         for (i = minStart; i < minEnd; i++)
-            sample_3d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                              texcoords[i], rgba[i]);
-         break;
-      case GL_LINEAR:
-         for (i = minStart; i < minEnd; i++)
-            sample_3d_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                             texcoords[i], rgba[i]);
-         break;
-      case GL_NEAREST_MIPMAP_NEAREST:
-         sample_3d_nearest_mipmap_nearest(ctx, tObj, m, texcoords + minStart,
-                                          lambda + minStart, rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_NEAREST:
-         sample_3d_linear_mipmap_nearest(ctx, tObj, m, texcoords + minStart,
-                                         lambda + minStart, rgba + minStart);
-         break;
-      case GL_NEAREST_MIPMAP_LINEAR:
-         sample_3d_nearest_mipmap_linear(ctx, tObj, m, texcoords + minStart,
-                                         lambda + minStart, rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_LINEAR:
-         sample_3d_linear_mipmap_linear(ctx, tObj, m, texcoords + minStart,
-                                        lambda + minStart, rgba + minStart);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad min filter in sample_3d_texture");
-         return;
-      }
-   }
-
-   if (magStart < magEnd) {
-      /* do the magnified texels */
-      switch (tObj->MagFilter) {
-      case GL_NEAREST:
-         for (i = magStart; i < magEnd; i++)
-            sample_3d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                              texcoords[i], rgba[i]);
-         break;
-      case GL_LINEAR:
-         for (i = magStart; i < magEnd; i++)
-            sample_3d_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                             texcoords[i], rgba[i]);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad mag filter in sample_3d_texture");
-         return;
-      }
-   }
-}
-
-
-/**********************************************************************/
-/*                Texture Cube Map Sampling Functions                 */
-/**********************************************************************/
-
-/**
- * Choose one of six sides of a texture cube map given the texture
- * coord (rx,ry,rz).  Return pointer to corresponding array of texture
- * images.
- */
-static const struct gl_texture_image **
-choose_cube_face(const struct gl_texture_object *texObj,
-                 const GLfloat texcoord[4], GLfloat newCoord[4])
-{
-   /*
-      major axis
-      direction     target                             sc     tc    ma
-      ----------    -------------------------------    ---    ---   ---
-       +rx          TEXTURE_CUBE_MAP_POSITIVE_X_EXT    -rz    -ry   rx
-       -rx          TEXTURE_CUBE_MAP_NEGATIVE_X_EXT    +rz    -ry   rx
-       +ry          TEXTURE_CUBE_MAP_POSITIVE_Y_EXT    +rx    +rz   ry
-       -ry          TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT    +rx    -rz   ry
-       +rz          TEXTURE_CUBE_MAP_POSITIVE_Z_EXT    +rx    -ry   rz
-       -rz          TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT    -rx    -ry   rz
-   */
-   const GLfloat rx = texcoord[0];
-   const GLfloat ry = texcoord[1];
-   const GLfloat rz = texcoord[2];
-   const GLfloat arx = FABSF(rx), ary = FABSF(ry), arz = FABSF(rz);
-   GLuint face;
-   GLfloat sc, tc, ma;
-
-   if (arx >= ary && arx >= arz) {
-      if (rx >= 0.0F) {
-         face = FACE_POS_X;
-         sc = -rz;
-         tc = -ry;
-         ma = arx;
-      }
-      else {
-         face = FACE_NEG_X;
-         sc = rz;
-         tc = -ry;
-         ma = arx;
-      }
-   }
-   else if (ary >= arx && ary >= arz) {
-      if (ry >= 0.0F) {
-         face = FACE_POS_Y;
-         sc = rx;
-         tc = rz;
-         ma = ary;
-      }
-      else {
-         face = FACE_NEG_Y;
-         sc = rx;
-         tc = -rz;
-         ma = ary;
-      }
-   }
-   else {
-      if (rz > 0.0F) {
-         face = FACE_POS_Z;
-         sc = rx;
-         tc = -ry;
-         ma = arz;
-      }
-      else {
-         face = FACE_NEG_Z;
-         sc = -rx;
-         tc = -ry;
-         ma = arz;
-      }
-   }
-
-   { 
-      const float ima = 1.0F / ma;
-      newCoord[0] = ( sc * ima + 1.0F ) * 0.5F;
-      newCoord[1] = ( tc * ima + 1.0F ) * 0.5F;
-   }
-
-   return (const struct gl_texture_image **) texObj->Image[face];
-}
-
-
-static void
-sample_nearest_cube(struct gl_context *ctx,
-		    const struct gl_texture_object *tObj, GLuint n,
-                    const GLfloat texcoords[][4], const GLfloat lambda[],
-                    GLfloat rgba[][4])
-{
-   GLuint i;
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      const struct gl_texture_image **images;
-      GLfloat newCoord[4];
-      images = choose_cube_face(tObj, texcoords[i], newCoord);
-      sample_2d_nearest(ctx, tObj, images[tObj->BaseLevel],
-                        newCoord, rgba[i]);
-   }
-}
-
-
-static void
-sample_linear_cube(struct gl_context *ctx,
-		   const struct gl_texture_object *tObj, GLuint n,
-                   const GLfloat texcoords[][4],
-		   const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      const struct gl_texture_image **images;
-      GLfloat newCoord[4];
-      images = choose_cube_face(tObj, texcoords[i], newCoord);
-      sample_2d_linear(ctx, tObj, images[tObj->BaseLevel],
-                       newCoord, rgba[i]);
-   }
-}
-
-
-static void
-sample_cube_nearest_mipmap_nearest(struct gl_context *ctx,
-                                   const struct gl_texture_object *tObj,
-                                   GLuint n, const GLfloat texcoord[][4],
-                                   const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      const struct gl_texture_image **images;
-      GLfloat newCoord[4];
-      GLint level;
-      images = choose_cube_face(tObj, texcoord[i], newCoord);
-
-      /* XXX we actually need to recompute lambda here based on the newCoords.
-       * But we would need the texcoords of adjacent fragments to compute that
-       * properly, and we don't have those here.
-       * For now, do an approximation:  subtracting 1 from the chosen mipmap
-       * level seems to work in some test cases.
-       * The same adjustment is done in the next few functions.
-      */
-      level = nearest_mipmap_level(tObj, lambda[i]);
-      level = MAX2(level - 1, 0);
-
-      sample_2d_nearest(ctx, tObj, images[level], newCoord, rgba[i]);
-   }
-}
-
-
-static void
-sample_cube_linear_mipmap_nearest(struct gl_context *ctx,
-                                  const struct gl_texture_object *tObj,
-                                  GLuint n, const GLfloat texcoord[][4],
-                                  const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      const struct gl_texture_image **images;
-      GLfloat newCoord[4];
-      GLint level = nearest_mipmap_level(tObj, lambda[i]);
-      level = MAX2(level - 1, 0); /* see comment above */
-      images = choose_cube_face(tObj, texcoord[i], newCoord);
-      sample_2d_linear(ctx, tObj, images[level], newCoord, rgba[i]);
-   }
-}
-
-
-static void
-sample_cube_nearest_mipmap_linear(struct gl_context *ctx,
-                                  const struct gl_texture_object *tObj,
-                                  GLuint n, const GLfloat texcoord[][4],
-                                  const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      const struct gl_texture_image **images;
-      GLfloat newCoord[4];
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      level = MAX2(level - 1, 0); /* see comment above */
-      images = choose_cube_face(tObj, texcoord[i], newCoord);
-      if (level >= tObj->_MaxLevel) {
-         sample_2d_nearest(ctx, tObj, images[tObj->_MaxLevel],
-                           newCoord, rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];  /* texels */
-         const GLfloat f = FRAC(lambda[i]);
-         sample_2d_nearest(ctx, tObj, images[level  ], newCoord, t0);
-         sample_2d_nearest(ctx, tObj, images[level+1], newCoord, t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-static void
-sample_cube_linear_mipmap_linear(struct gl_context *ctx,
-                                 const struct gl_texture_object *tObj,
-                                 GLuint n, const GLfloat texcoord[][4],
-                                 const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      const struct gl_texture_image **images;
-      GLfloat newCoord[4];
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      level = MAX2(level - 1, 0); /* see comment above */
-      images = choose_cube_face(tObj, texcoord[i], newCoord);
-      if (level >= tObj->_MaxLevel) {
-         sample_2d_linear(ctx, tObj, images[tObj->_MaxLevel],
-                          newCoord, rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];
-         const GLfloat f = FRAC(lambda[i]);
-         sample_2d_linear(ctx, tObj, images[level  ], newCoord, t0);
-         sample_2d_linear(ctx, tObj, images[level+1], newCoord, t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-/** Sample cube texture, using lambda to choose between min/magnification */
-static void
-sample_lambda_cube(struct gl_context *ctx,
-		   const struct gl_texture_object *tObj, GLuint n,
-		   const GLfloat texcoords[][4], const GLfloat lambda[],
-		   GLfloat rgba[][4])
-{
-   GLuint minStart, minEnd;  /* texels with minification */
-   GLuint magStart, magEnd;  /* texels with magnification */
-
-   ASSERT(lambda != NULL);
-   compute_min_mag_ranges(tObj, n, lambda,
-                          &minStart, &minEnd, &magStart, &magEnd);
-
-   if (minStart < minEnd) {
-      /* do the minified texels */
-      const GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
-      case GL_NEAREST:
-         sample_nearest_cube(ctx, tObj, m, texcoords + minStart,
-                             lambda + minStart, rgba + minStart);
-         break;
-      case GL_LINEAR:
-         sample_linear_cube(ctx, tObj, m, texcoords + minStart,
-                            lambda + minStart, rgba + minStart);
-         break;
-      case GL_NEAREST_MIPMAP_NEAREST:
-         sample_cube_nearest_mipmap_nearest(ctx, tObj, m,
-                                            texcoords + minStart,
-                                           lambda + minStart, rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_NEAREST:
-         sample_cube_linear_mipmap_nearest(ctx, tObj, m,
-                                           texcoords + minStart,
-                                           lambda + minStart, rgba + minStart);
-         break;
-      case GL_NEAREST_MIPMAP_LINEAR:
-         sample_cube_nearest_mipmap_linear(ctx, tObj, m,
-                                           texcoords + minStart,
-                                           lambda + minStart, rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_LINEAR:
-         sample_cube_linear_mipmap_linear(ctx, tObj, m,
-                                          texcoords + minStart,
-                                          lambda + minStart, rgba + minStart);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad min filter in sample_lambda_cube");
-      }
-   }
-
-   if (magStart < magEnd) {
-      /* do the magnified texels */
-      const GLuint m = magEnd - magStart;
-      switch (tObj->MagFilter) {
-      case GL_NEAREST:
-         sample_nearest_cube(ctx, tObj, m, texcoords + magStart,
-                             lambda + magStart, rgba + magStart);
-         break;
-      case GL_LINEAR:
-         sample_linear_cube(ctx, tObj, m, texcoords + magStart,
-                            lambda + magStart, rgba + magStart);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad mag filter in sample_lambda_cube");
-      }
-   }
-}
-
-
-/**********************************************************************/
-/*               Texture Rectangle Sampling Functions                 */
-/**********************************************************************/
-
-
-static void
-sample_nearest_rect(struct gl_context *ctx,
-		    const struct gl_texture_object *tObj, GLuint n,
-                    const GLfloat texcoords[][4], const GLfloat lambda[],
-                    GLfloat rgba[][4])
-{
-   const struct gl_texture_image *img = tObj->Image[0][0];
-   const GLint width = img->Width;
-   const GLint height = img->Height;
-   GLuint i;
-
-   (void) ctx;
-   (void) lambda;
-
-   ASSERT(tObj->WrapS == GL_CLAMP ||
-          tObj->WrapS == GL_CLAMP_TO_EDGE ||
-          tObj->WrapS == GL_CLAMP_TO_BORDER);
-   ASSERT(tObj->WrapT == GL_CLAMP ||
-          tObj->WrapT == GL_CLAMP_TO_EDGE ||
-          tObj->WrapT == GL_CLAMP_TO_BORDER);
-   ASSERT(img->_BaseFormat != GL_COLOR_INDEX);
-
-   for (i = 0; i < n; i++) {
-      GLint row, col;
-      col = clamp_rect_coord_nearest(tObj->WrapS, texcoords[i][0], width);
-      row = clamp_rect_coord_nearest(tObj->WrapT, texcoords[i][1], height);
-      if (col < 0 || col >= width || row < 0 || row >= height)
-         get_border_color(tObj, img, rgba[i]);
-      else
-         img->FetchTexelf(img, col, row, 0, rgba[i]);
-   }
-}
-
-
-static void
-sample_linear_rect(struct gl_context *ctx,
-		   const struct gl_texture_object *tObj, GLuint n,
-                   const GLfloat texcoords[][4],
-		   const GLfloat lambda[], GLfloat rgba[][4])
-{
-   const struct gl_texture_image *img = tObj->Image[0][0];
-   const GLint width = img->Width;
-   const GLint height = img->Height;
-   GLuint i;
-
-   (void) ctx;
-   (void) lambda;
-
-   ASSERT(tObj->WrapS == GL_CLAMP ||
-          tObj->WrapS == GL_CLAMP_TO_EDGE ||
-          tObj->WrapS == GL_CLAMP_TO_BORDER);
-   ASSERT(tObj->WrapT == GL_CLAMP ||
-          tObj->WrapT == GL_CLAMP_TO_EDGE ||
-          tObj->WrapT == GL_CLAMP_TO_BORDER);
-   ASSERT(img->_BaseFormat != GL_COLOR_INDEX);
-
-   for (i = 0; i < n; i++) {
-      GLint i0, j0, i1, j1;
-      GLfloat t00[4], t01[4], t10[4], t11[4];
-      GLfloat a, b;
-      GLbitfield useBorderColor = 0x0;
-
-      clamp_rect_coord_linear(tObj->WrapS, texcoords[i][0], width,
-                              &i0, &i1, &a);
-      clamp_rect_coord_linear(tObj->WrapT, texcoords[i][1], height,
-                              &j0, &j1, &b);
-
-      /* compute integer rows/columns */
-      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;
-      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;
-      if (j0 < 0 || j0 >= height)  useBorderColor |= J0BIT;
-      if (j1 < 0 || j1 >= height)  useBorderColor |= J1BIT;
-
-      /* get four texel samples */
-      if (useBorderColor & (I0BIT | J0BIT))
-         get_border_color(tObj, img, t00);
-      else
-         img->FetchTexelf(img, i0, j0, 0, t00);
-
-      if (useBorderColor & (I1BIT | J0BIT))
-         get_border_color(tObj, img, t10);
-      else
-         img->FetchTexelf(img, i1, j0, 0, t10);
-
-      if (useBorderColor & (I0BIT | J1BIT))
-         get_border_color(tObj, img, t01);
-      else
-         img->FetchTexelf(img, i0, j1, 0, t01);
-
-      if (useBorderColor & (I1BIT | J1BIT))
-         get_border_color(tObj, img, t11);
-      else
-         img->FetchTexelf(img, i1, j1, 0, t11);
-
-      lerp_rgba_2d(rgba[i], a, b, t00, t10, t01, t11);
-   }
-}
-
-
-/** Sample Rect texture, using lambda to choose between min/magnification */
-static void
-sample_lambda_rect(struct gl_context *ctx,
-		   const struct gl_texture_object *tObj, GLuint n,
-		   const GLfloat texcoords[][4], const GLfloat lambda[],
-		   GLfloat rgba[][4])
-{
-   GLuint minStart, minEnd, magStart, magEnd;
-
-   /* We only need lambda to decide between minification and magnification.
-    * There is no mipmapping with rectangular textures.
-    */
-   compute_min_mag_ranges(tObj, n, lambda,
-                          &minStart, &minEnd, &magStart, &magEnd);
-
-   if (minStart < minEnd) {
-      if (tObj->MinFilter == GL_NEAREST) {
-         sample_nearest_rect(ctx, tObj, minEnd - minStart,
-                             texcoords + minStart, NULL, rgba + minStart);
-      }
-      else {
-         sample_linear_rect(ctx, tObj, minEnd - minStart,
-                            texcoords + minStart, NULL, rgba + minStart);
-      }
-   }
-   if (magStart < magEnd) {
-      if (tObj->MagFilter == GL_NEAREST) {
-         sample_nearest_rect(ctx, tObj, magEnd - magStart,
-                             texcoords + magStart, NULL, rgba + magStart);
-      }
-      else {
-         sample_linear_rect(ctx, tObj, magEnd - magStart,
-                            texcoords + magStart, NULL, rgba + magStart);
-      }
-   }
-}
-
-
-/**********************************************************************/
-/*                2D Texture Array Sampling Functions                 */
-/**********************************************************************/
-
-/**
- * Return the texture sample for coordinate (s,t,r) using GL_NEAREST filter.
- */
-static void
-sample_2d_array_nearest(struct gl_context *ctx,
-                        const struct gl_texture_object *tObj,
-                        const struct gl_texture_image *img,
-                        const GLfloat texcoord[4],
-                        GLfloat rgba[4])
-{
-   const GLint width = img->Width2;     /* without border, power of two */
-   const GLint height = img->Height2;   /* without border, power of two */
-   const GLint depth = img->Depth;
-   GLint i, j;
-   GLint array;
-   (void) ctx;
-
-   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);
-   j = nearest_texel_location(tObj->WrapT, img, height, texcoord[1]);
-   array = tex_array_slice(texcoord[2], depth);
-
-   if (i < 0 || i >= (GLint) img->Width ||
-       j < 0 || j >= (GLint) img->Height ||
-       array < 0 || array >= (GLint) img->Depth) {
-      /* Need this test for GL_CLAMP_TO_BORDER mode */
-      get_border_color(tObj, img, rgba);
-   }
-   else {
-      img->FetchTexelf(img, i, j, array, rgba);
-   }
-}
-
-
-/**
- * Return the texture sample for coordinate (s,t,r) using GL_LINEAR filter.
- */
-static void
-sample_2d_array_linear(struct gl_context *ctx,
-                       const struct gl_texture_object *tObj,
-                       const struct gl_texture_image *img,
-                       const GLfloat texcoord[4],
-                       GLfloat rgba[4])
-{
-   const GLint width = img->Width2;
-   const GLint height = img->Height2;
-   const GLint depth = img->Depth;
-   GLint i0, j0, i1, j1;
-   GLint array;
-   GLbitfield useBorderColor = 0x0;
-   GLfloat a, b;
-   GLfloat t00[4], t01[4], t10[4], t11[4];
-
-   linear_texel_locations(tObj->WrapS, img, width,  texcoord[0], &i0, &i1, &a);
-   linear_texel_locations(tObj->WrapT, img, height, texcoord[1], &j0, &j1, &b);
-   array = tex_array_slice(texcoord[2], depth);
-
-   if (array < 0 || array >= depth) {
-      COPY_4V(rgba, tObj->BorderColor.f);
-   }
-   else {
-      if (img->Border) {
-	 i0 += img->Border;
-	 i1 += img->Border;
-	 j0 += img->Border;
-	 j1 += img->Border;
-      }
-      else {
-	 /* check if sampling texture border color */
-	 if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;
-	 if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;
-	 if (j0 < 0 || j0 >= height)  useBorderColor |= J0BIT;
-	 if (j1 < 0 || j1 >= height)  useBorderColor |= J1BIT;
-      }
-
-      /* Fetch texels */
-      if (useBorderColor & (I0BIT | J0BIT)) {
-         get_border_color(tObj, img, t00);
-      }
-      else {
-	 img->FetchTexelf(img, i0, j0, array, t00);
-      }
-      if (useBorderColor & (I1BIT | J0BIT)) {
-         get_border_color(tObj, img, t10);
-      }
-      else {
-	 img->FetchTexelf(img, i1, j0, array, t10);
-      }
-      if (useBorderColor & (I0BIT | J1BIT)) {
-         get_border_color(tObj, img, t01);
-      }
-      else {
-	 img->FetchTexelf(img, i0, j1, array, t01);
-      }
-      if (useBorderColor & (I1BIT | J1BIT)) {
-         get_border_color(tObj, img, t11);
-      }
-      else {
-	 img->FetchTexelf(img, i1, j1, array, t11);
-      }
-      
-      /* trilinear interpolation of samples */
-      lerp_rgba_2d(rgba, a, b, t00, t10, t01, t11);
-   }
-}
-
-
-static void
-sample_2d_array_nearest_mipmap_nearest(struct gl_context *ctx,
-                                       const struct gl_texture_object *tObj,
-                                       GLuint n, const GLfloat texcoord[][4],
-                                       const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      GLint level = nearest_mipmap_level(tObj, lambda[i]);
-      sample_2d_array_nearest(ctx, tObj, tObj->Image[0][level], texcoord[i],
-                              rgba[i]);
-   }
-}
-
-
-static void
-sample_2d_array_linear_mipmap_nearest(struct gl_context *ctx,
-                                      const struct gl_texture_object *tObj,
-                                      GLuint n, const GLfloat texcoord[][4],
-                                      const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = nearest_mipmap_level(tObj, lambda[i]);
-      sample_2d_array_linear(ctx, tObj, tObj->Image[0][level],
-                             texcoord[i], rgba[i]);
-   }
-}
-
-
-static void
-sample_2d_array_nearest_mipmap_linear(struct gl_context *ctx,
-                                      const struct gl_texture_object *tObj,
-                                      GLuint n, const GLfloat texcoord[][4],
-                                      const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      if (level >= tObj->_MaxLevel) {
-         sample_2d_array_nearest(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],
-                                 texcoord[i], rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];  /* texels */
-         const GLfloat f = FRAC(lambda[i]);
-         sample_2d_array_nearest(ctx, tObj, tObj->Image[0][level  ],
-                                 texcoord[i], t0);
-         sample_2d_array_nearest(ctx, tObj, tObj->Image[0][level+1],
-                                 texcoord[i], t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-static void
-sample_2d_array_linear_mipmap_linear(struct gl_context *ctx,
-                                     const struct gl_texture_object *tObj,
-                                     GLuint n, const GLfloat texcoord[][4],
-                                     const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      if (level >= tObj->_MaxLevel) {
-         sample_2d_array_linear(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],
-                          texcoord[i], rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];  /* texels */
-         const GLfloat f = FRAC(lambda[i]);
-         sample_2d_array_linear(ctx, tObj, tObj->Image[0][level  ],
-                                texcoord[i], t0);
-         sample_2d_array_linear(ctx, tObj, tObj->Image[0][level+1],
-                                texcoord[i], t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-/** Sample 2D Array texture, nearest filtering for both min/magnification */
-static void
-sample_nearest_2d_array(struct gl_context *ctx,
-                        const struct gl_texture_object *tObj, GLuint n,
-                        const GLfloat texcoords[][4], const GLfloat lambda[],
-                        GLfloat rgba[][4])
-{
-   GLuint i;
-   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      sample_2d_array_nearest(ctx, tObj, image, texcoords[i], rgba[i]);
-   }
-}
-
-
-
-/** Sample 2D Array texture, linear filtering for both min/magnification */
-static void
-sample_linear_2d_array(struct gl_context *ctx,
-                       const struct gl_texture_object *tObj, GLuint n,
-                       const GLfloat texcoords[][4],
-                       const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      sample_2d_array_linear(ctx, tObj, image, texcoords[i], rgba[i]);
-   }
-}
-
-
-/** Sample 2D Array texture, using lambda to choose between min/magnification */
-static void
-sample_lambda_2d_array(struct gl_context *ctx,
-                       const struct gl_texture_object *tObj, GLuint n,
-                       const GLfloat texcoords[][4], const GLfloat lambda[],
-                       GLfloat rgba[][4])
-{
-   GLuint minStart, minEnd;  /* texels with minification */
-   GLuint magStart, magEnd;  /* texels with magnification */
-   GLuint i;
-
-   ASSERT(lambda != NULL);
-   compute_min_mag_ranges(tObj, n, lambda,
-                          &minStart, &minEnd, &magStart, &magEnd);
-
-   if (minStart < minEnd) {
-      /* do the minified texels */
-      GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
-      case GL_NEAREST:
-         for (i = minStart; i < minEnd; i++)
-            sample_2d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                                    texcoords[i], rgba[i]);
-         break;
-      case GL_LINEAR:
-         for (i = minStart; i < minEnd; i++)
-            sample_2d_array_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                                   texcoords[i], rgba[i]);
-         break;
-      case GL_NEAREST_MIPMAP_NEAREST:
-         sample_2d_array_nearest_mipmap_nearest(ctx, tObj, m,
-                                                texcoords + minStart,
-                                                lambda + minStart,
-                                                rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_NEAREST:
-         sample_2d_array_linear_mipmap_nearest(ctx, tObj, m, 
-                                               texcoords + minStart,
-                                               lambda + minStart,
-                                               rgba + minStart);
-         break;
-      case GL_NEAREST_MIPMAP_LINEAR:
-         sample_2d_array_nearest_mipmap_linear(ctx, tObj, m,
-                                               texcoords + minStart,
-                                               lambda + minStart,
-                                               rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_LINEAR:
-         sample_2d_array_linear_mipmap_linear(ctx, tObj, m, 
-                                              texcoords + minStart,
-                                              lambda + minStart, 
-                                              rgba + minStart);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad min filter in sample_2d_array_texture");
-         return;
-      }
-   }
-
-   if (magStart < magEnd) {
-      /* do the magnified texels */
-      switch (tObj->MagFilter) {
-      case GL_NEAREST:
-         for (i = magStart; i < magEnd; i++)
-            sample_2d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                              texcoords[i], rgba[i]);
-         break;
-      case GL_LINEAR:
-         for (i = magStart; i < magEnd; i++)
-            sample_2d_array_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                                   texcoords[i], rgba[i]);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad mag filter in sample_2d_array_texture");
-         return;
-      }
-   }
-}
-
-
-
-
-/**********************************************************************/
-/*                1D Texture Array Sampling Functions                 */
-/**********************************************************************/
-
-/**
- * Return the texture sample for coordinate (s,t,r) using GL_NEAREST filter.
- */
-static void
-sample_1d_array_nearest(struct gl_context *ctx,
-                        const struct gl_texture_object *tObj,
-                        const struct gl_texture_image *img,
-                        const GLfloat texcoord[4],
-                        GLfloat rgba[4])
-{
-   const GLint width = img->Width2;     /* without border, power of two */
-   const GLint height = img->Height;
-   GLint i;
-   GLint array;
-   (void) ctx;
-
-   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);
-   array = tex_array_slice(texcoord[1], height);
-
-   if (i < 0 || i >= (GLint) img->Width ||
-       array < 0 || array >= (GLint) img->Height) {
-      /* Need this test for GL_CLAMP_TO_BORDER mode */
-      get_border_color(tObj, img, rgba);
-   }
-   else {
-      img->FetchTexelf(img, i, array, 0, rgba);
-   }
-}
-
-
-/**
- * Return the texture sample for coordinate (s,t,r) using GL_LINEAR filter.
- */
-static void
-sample_1d_array_linear(struct gl_context *ctx,
-                       const struct gl_texture_object *tObj,
-                       const struct gl_texture_image *img,
-                       const GLfloat texcoord[4],
-                       GLfloat rgba[4])
-{
-   const GLint width = img->Width2;
-   const GLint height = img->Height;
-   GLint i0, i1;
-   GLint array;
-   GLbitfield useBorderColor = 0x0;
-   GLfloat a;
-   GLfloat t0[4], t1[4];
-
-   linear_texel_locations(tObj->WrapS, img, width, texcoord[0], &i0, &i1, &a);
-   array = tex_array_slice(texcoord[1], height);
-
-   if (img->Border) {
-      i0 += img->Border;
-      i1 += img->Border;
-   }
-   else {
-      /* check if sampling texture border color */
-      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;
-      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;
-   }
-
-   if (array < 0 || array >= height)   useBorderColor |= K0BIT;
-
-   /* Fetch texels */
-   if (useBorderColor & (I0BIT | K0BIT)) {
-      get_border_color(tObj, img, t0);
-   }
-   else {
-      img->FetchTexelf(img, i0, array, 0, t0);
-   }
-   if (useBorderColor & (I1BIT | K0BIT)) {
-      get_border_color(tObj, img, t1);
-   }
-   else {
-      img->FetchTexelf(img, i1, array, 0, t1);
-   }
-
-   /* bilinear interpolation of samples */
-   lerp_rgba(rgba, a, t0, t1);
-}
-
-
-static void
-sample_1d_array_nearest_mipmap_nearest(struct gl_context *ctx,
-                                       const struct gl_texture_object *tObj,
-                                       GLuint n, const GLfloat texcoord[][4],
-                                       const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      GLint level = nearest_mipmap_level(tObj, lambda[i]);
-      sample_1d_array_nearest(ctx, tObj, tObj->Image[0][level], texcoord[i],
-                              rgba[i]);
-   }
-}
-
-
-static void
-sample_1d_array_linear_mipmap_nearest(struct gl_context *ctx,
-                                      const struct gl_texture_object *tObj,
-                                      GLuint n, const GLfloat texcoord[][4],
-                                      const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = nearest_mipmap_level(tObj, lambda[i]);
-      sample_1d_array_linear(ctx, tObj, tObj->Image[0][level],
-                             texcoord[i], rgba[i]);
-   }
-}
-
-
-static void
-sample_1d_array_nearest_mipmap_linear(struct gl_context *ctx,
-                                      const struct gl_texture_object *tObj,
-                                      GLuint n, const GLfloat texcoord[][4],
-                                      const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      if (level >= tObj->_MaxLevel) {
-         sample_1d_array_nearest(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],
-                                 texcoord[i], rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];  /* texels */
-         const GLfloat f = FRAC(lambda[i]);
-         sample_1d_array_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
-         sample_1d_array_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-static void
-sample_1d_array_linear_mipmap_linear(struct gl_context *ctx,
-                                     const struct gl_texture_object *tObj,
-                                     GLuint n, const GLfloat texcoord[][4],
-                                     const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   ASSERT(lambda != NULL);
-   for (i = 0; i < n; i++) {
-      GLint level = linear_mipmap_level(tObj, lambda[i]);
-      if (level >= tObj->_MaxLevel) {
-         sample_1d_array_linear(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],
-                          texcoord[i], rgba[i]);
-      }
-      else {
-         GLfloat t0[4], t1[4];  /* texels */
-         const GLfloat f = FRAC(lambda[i]);
-         sample_1d_array_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);
-         sample_1d_array_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);
-         lerp_rgba(rgba[i], f, t0, t1);
-      }
-   }
-}
-
-
-/** Sample 1D Array texture, nearest filtering for both min/magnification */
-static void
-sample_nearest_1d_array(struct gl_context *ctx,
-                        const struct gl_texture_object *tObj, GLuint n,
-                        const GLfloat texcoords[][4], const GLfloat lambda[],
-                        GLfloat rgba[][4])
-{
-   GLuint i;
-   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      sample_1d_array_nearest(ctx, tObj, image, texcoords[i], rgba[i]);
-   }
-}
-
-
-/** Sample 1D Array texture, linear filtering for both min/magnification */
-static void
-sample_linear_1d_array(struct gl_context *ctx,
-                       const struct gl_texture_object *tObj, GLuint n,
-                       const GLfloat texcoords[][4],
-                       const GLfloat lambda[], GLfloat rgba[][4])
-{
-   GLuint i;
-   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      sample_1d_array_linear(ctx, tObj, image, texcoords[i], rgba[i]);
-   }
-}
-
-
-/** Sample 1D Array texture, using lambda to choose between min/magnification */
-static void
-sample_lambda_1d_array(struct gl_context *ctx,
-                       const struct gl_texture_object *tObj, GLuint n,
-                       const GLfloat texcoords[][4], const GLfloat lambda[],
-                       GLfloat rgba[][4])
-{
-   GLuint minStart, minEnd;  /* texels with minification */
-   GLuint magStart, magEnd;  /* texels with magnification */
-   GLuint i;
-
-   ASSERT(lambda != NULL);
-   compute_min_mag_ranges(tObj, n, lambda,
-                          &minStart, &minEnd, &magStart, &magEnd);
-
-   if (minStart < minEnd) {
-      /* do the minified texels */
-      GLuint m = minEnd - minStart;
-      switch (tObj->MinFilter) {
-      case GL_NEAREST:
-         for (i = minStart; i < minEnd; i++)
-            sample_1d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                                    texcoords[i], rgba[i]);
-         break;
-      case GL_LINEAR:
-         for (i = minStart; i < minEnd; i++)
-            sample_1d_array_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                                   texcoords[i], rgba[i]);
-         break;
-      case GL_NEAREST_MIPMAP_NEAREST:
-         sample_1d_array_nearest_mipmap_nearest(ctx, tObj, m, texcoords + minStart,
-                                                lambda + minStart, rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_NEAREST:
-         sample_1d_array_linear_mipmap_nearest(ctx, tObj, m, 
-                                               texcoords + minStart,
-                                               lambda + minStart,
-                                               rgba + minStart);
-         break;
-      case GL_NEAREST_MIPMAP_LINEAR:
-         sample_1d_array_nearest_mipmap_linear(ctx, tObj, m, texcoords + minStart,
-                                               lambda + minStart, rgba + minStart);
-         break;
-      case GL_LINEAR_MIPMAP_LINEAR:
-         sample_1d_array_linear_mipmap_linear(ctx, tObj, m, 
-                                              texcoords + minStart,
-                                              lambda + minStart, 
-                                              rgba + minStart);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad min filter in sample_1d_array_texture");
-         return;
-      }
-   }
-
-   if (magStart < magEnd) {
-      /* do the magnified texels */
-      switch (tObj->MagFilter) {
-      case GL_NEAREST:
-         for (i = magStart; i < magEnd; i++)
-            sample_1d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                              texcoords[i], rgba[i]);
-         break;
-      case GL_LINEAR:
-         for (i = magStart; i < magEnd; i++)
-            sample_1d_array_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],
-                                   texcoords[i], rgba[i]);
-         break;
-      default:
-         _mesa_problem(ctx, "Bad mag filter in sample_1d_array_texture");
-         return;
-      }
-   }
-}
-
-
-/**
- * Compare texcoord against depth sample.  Return 1.0 or the ambient value.
- */
-static INLINE GLfloat
-shadow_compare(GLenum function, GLfloat coord, GLfloat depthSample,
-               GLfloat ambient)
-{
-   switch (function) {
-   case GL_LEQUAL:
-      return (coord <= depthSample) ? 1.0F : ambient;
-   case GL_GEQUAL:
-      return (coord >= depthSample) ? 1.0F : ambient;
-   case GL_LESS:
-      return (coord < depthSample) ? 1.0F : ambient;
-   case GL_GREATER:
-      return (coord > depthSample) ? 1.0F : ambient;
-   case GL_EQUAL:
-      return (coord == depthSample) ? 1.0F : ambient;
-   case GL_NOTEQUAL:
-      return (coord != depthSample) ? 1.0F : ambient;
-   case GL_ALWAYS:
-      return 1.0F;
-   case GL_NEVER:
-      return ambient;
-   case GL_NONE:
-      return depthSample;
-   default:
-      _mesa_problem(NULL, "Bad compare func in shadow_compare");
-      return ambient;
-   }
-}
-
-
-/**
- * Compare texcoord against four depth samples.
- */
-static INLINE GLfloat
-shadow_compare4(GLenum function, GLfloat coord,
-                GLfloat depth00, GLfloat depth01,
-                GLfloat depth10, GLfloat depth11,
-                GLfloat ambient, GLfloat wi, GLfloat wj)
-{
-   const GLfloat d = (1.0F - (GLfloat) ambient) * 0.25F;
-   GLfloat luminance = 1.0F;
-
-   switch (function) {
-   case GL_LEQUAL:
-      if (coord > depth00)  luminance -= d;
-      if (coord > depth01)  luminance -= d;
-      if (coord > depth10)  luminance -= d;
-      if (coord > depth11)  luminance -= d;
-      return luminance;
-   case GL_GEQUAL:
-      if (coord < depth00)  luminance -= d;
-      if (coord < depth01)  luminance -= d;
-      if (coord < depth10)  luminance -= d;
-      if (coord < depth11)  luminance -= d;
-      return luminance;
-   case GL_LESS:
-      if (coord >= depth00)  luminance -= d;
-      if (coord >= depth01)  luminance -= d;
-      if (coord >= depth10)  luminance -= d;
-      if (coord >= depth11)  luminance -= d;
-      return luminance;
-   case GL_GREATER:
-      if (coord <= depth00)  luminance -= d;
-      if (coord <= depth01)  luminance -= d;
-      if (coord <= depth10)  luminance -= d;
-      if (coord <= depth11)  luminance -= d;
-      return luminance;
-   case GL_EQUAL:
-      if (coord != depth00)  luminance -= d;
-      if (coord != depth01)  luminance -= d;
-      if (coord != depth10)  luminance -= d;
-      if (coord != depth11)  luminance -= d;
-      return luminance;
-   case GL_NOTEQUAL:
-      if (coord == depth00)  luminance -= d;
-      if (coord == depth01)  luminance -= d;
-      if (coord == depth10)  luminance -= d;
-      if (coord == depth11)  luminance -= d;
-      return luminance;
-   case GL_ALWAYS:
-      return 1.0F;
-   case GL_NEVER:
-      return ambient;
-   case GL_NONE:
-      /* ordinary bilinear filtering */
-      return lerp_2d(wi, wj, depth00, depth10, depth01, depth11);
-   default:
-      _mesa_problem(NULL, "Bad compare func in sample_compare4");
-      return ambient;
-   }
-}
-
-
-/**
- * Choose the mipmap level to use when sampling from a depth texture.
- */
-static int
-choose_depth_texture_level(const struct gl_texture_object *tObj, GLfloat lambda)
-{
-   GLint level;
-
-   if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {
-      /* no mipmapping - use base level */
-      level = tObj->BaseLevel;
-   }
-   else {
-      /* choose mipmap level */
-      lambda = CLAMP(lambda, tObj->MinLod, tObj->MaxLod);
-      level = (GLint) lambda;
-      level = CLAMP(level, tObj->BaseLevel, tObj->_MaxLevel);
-   }
-
-   return level;
-}
-
-
-/**
- * Sample a shadow/depth texture.  This function is incomplete.  It doesn't
- * check for minification vs. magnification, etc.
- */
-static void
-sample_depth_texture( struct gl_context *ctx,
-                      const struct gl_texture_object *tObj, GLuint n,
-                      const GLfloat texcoords[][4], const GLfloat lambda[],
-                      GLfloat texel[][4] )
-{
-   const GLint level = choose_depth_texture_level(tObj, lambda[0]);
-   const struct gl_texture_image *img = tObj->Image[0][level];
-   const GLint width = img->Width;
-   const GLint height = img->Height;
-   const GLint depth = img->Depth;
-   const GLuint compare_coord = (tObj->Target == GL_TEXTURE_2D_ARRAY_EXT)
-       ? 3 : 2;
-   GLfloat ambient;
-   GLenum function;
-   GLfloat result;
-
-   ASSERT(img->_BaseFormat == GL_DEPTH_COMPONENT ||
-          img->_BaseFormat == GL_DEPTH_STENCIL_EXT);
-
-   ASSERT(tObj->Target == GL_TEXTURE_1D ||
-          tObj->Target == GL_TEXTURE_2D ||
-          tObj->Target == GL_TEXTURE_RECTANGLE_NV ||
-          tObj->Target == GL_TEXTURE_1D_ARRAY_EXT ||
-          tObj->Target == GL_TEXTURE_2D_ARRAY_EXT);
-
-   ambient = tObj->CompareFailValue;
-
-   /* XXXX if tObj->MinFilter != tObj->MagFilter, we're ignoring lambda */
-
-   function = (tObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) ?
-      tObj->CompareFunc : GL_NONE;
-
-   if (tObj->MagFilter == GL_NEAREST) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         GLfloat depthSample, depthRef;
-         GLint col, row, slice;
-
-         nearest_texcoord(tObj, level, texcoords[i], &col, &row, &slice);
-
-         if (col >= 0 && row >= 0 && col < width && row < height && 
-             slice >= 0 && slice < depth) {
-            img->FetchTexelf(img, col, row, slice, &depthSample);
-         }
-         else {
-            depthSample = tObj->BorderColor.f[0];
-         }
-
-         depthRef = CLAMP(texcoords[i][compare_coord], 0.0F, 1.0F);
-
-         result = shadow_compare(function, depthRef, depthSample, ambient);
-
-         switch (tObj->DepthMode) {
-         case GL_LUMINANCE:
-            ASSIGN_4V(texel[i], result, result, result, 1.0F);
-            break;
-         case GL_INTENSITY:
-            ASSIGN_4V(texel[i], result, result, result, result);
-            break;
-         case GL_ALPHA:
-            ASSIGN_4V(texel[i], 0.0F, 0.0F, 0.0F, result);
-            break;
-         case GL_RED:
-            ASSIGN_4V(texel[i], result, 0.0F, 0.0F, 1.0F);
-            break;
-         default:
-            _mesa_problem(ctx, "Bad depth texture mode");
-         }
-      }
-   }
-   else {
-      GLuint i;
-      ASSERT(tObj->MagFilter == GL_LINEAR);
-      for (i = 0; i < n; i++) {
-         GLfloat depth00, depth01, depth10, depth11, depthRef;
-         GLint i0, i1, j0, j1;
-         GLint slice;
-         GLfloat wi, wj;
-         GLuint useBorderTexel;
-
-         linear_texcoord(tObj, level, texcoords[i], &i0, &i1, &j0, &j1, &slice,
-                         &wi, &wj);
-
-         useBorderTexel = 0;
-         if (img->Border) {
-            i0 += img->Border;
-            i1 += img->Border;
-            if (tObj->Target != GL_TEXTURE_1D_ARRAY_EXT) {
-               j0 += img->Border;
-               j1 += img->Border;
-            }
-         }
-         else {
-            if (i0 < 0 || i0 >= (GLint) width)   useBorderTexel |= I0BIT;
-            if (i1 < 0 || i1 >= (GLint) width)   useBorderTexel |= I1BIT;
-            if (j0 < 0 || j0 >= (GLint) height)  useBorderTexel |= J0BIT;
-            if (j1 < 0 || j1 >= (GLint) height)  useBorderTexel |= J1BIT;
-         }
-
-         if (slice < 0 || slice >= (GLint) depth) {
-            depth00 = tObj->BorderColor.f[0];
-            depth01 = tObj->BorderColor.f[0];
-            depth10 = tObj->BorderColor.f[0];
-            depth11 = tObj->BorderColor.f[0];
-         }
-         else {
-            /* get four depth samples from the texture */
-            if (useBorderTexel & (I0BIT | J0BIT)) {
-               depth00 = tObj->BorderColor.f[0];
-            }
-            else {
-               img->FetchTexelf(img, i0, j0, slice, &depth00);
-            }
-            if (useBorderTexel & (I1BIT | J0BIT)) {
-               depth10 = tObj->BorderColor.f[0];
-            }
-            else {
-               img->FetchTexelf(img, i1, j0, slice, &depth10);
-            }
-
-            if (tObj->Target != GL_TEXTURE_1D_ARRAY_EXT) {
-               if (useBorderTexel & (I0BIT | J1BIT)) {
-                  depth01 = tObj->BorderColor.f[0];
-               }
-               else {
-                  img->FetchTexelf(img, i0, j1, slice, &depth01);
-               }
-               if (useBorderTexel & (I1BIT | J1BIT)) {
-                  depth11 = tObj->BorderColor.f[0];
-               }
-               else {
-                  img->FetchTexelf(img, i1, j1, slice, &depth11);
-               }
-            }
-            else {
-               depth01 = depth00;
-               depth11 = depth10;
-            }
-         }
-
-         depthRef = CLAMP(texcoords[i][compare_coord], 0.0F, 1.0F);
-
-         result = shadow_compare4(function, depthRef,
-                                  depth00, depth01, depth10, depth11,
-                                  ambient, wi, wj);
-
-         switch (tObj->DepthMode) {
-         case GL_LUMINANCE:
-            ASSIGN_4V(texel[i], result, result, result, 1.0F);
-            break;
-         case GL_INTENSITY:
-            ASSIGN_4V(texel[i], result, result, result, result);
-            break;
-         case GL_ALPHA:
-            ASSIGN_4V(texel[i], 0.0F, 0.0F, 0.0F, result);
-            break;
-         default:
-            _mesa_problem(ctx, "Bad depth texture mode");
-         }
-
-      }  /* for */
-   }  /* if filter */
-}
-
-
-/**
- * We use this function when a texture object is in an "incomplete" state.
- * When a fragment program attempts to sample an incomplete texture we
- * return black (see issue 23 in GL_ARB_fragment_program spec).
- * Note: fragment programs don't observe the texture enable/disable flags.
- */
-static void
-null_sample_func( struct gl_context *ctx,
-		  const struct gl_texture_object *tObj, GLuint n,
-		  const GLfloat texcoords[][4], const GLfloat lambda[],
-		  GLfloat rgba[][4])
-{
-   GLuint i;
-   (void) ctx;
-   (void) tObj;
-   (void) texcoords;
-   (void) lambda;
-   for (i = 0; i < n; i++) {
-      rgba[i][RCOMP] = 0;
-      rgba[i][GCOMP] = 0;
-      rgba[i][BCOMP] = 0;
-      rgba[i][ACOMP] = 1.0;
-   }
-}
-
-
-/**
- * Choose the texture sampling function for the given texture object.
- */
-texture_sample_func
-_swrast_choose_texture_sample_func( struct gl_context *ctx,
-				    const struct gl_texture_object *t )
-{
-   if (!t || !t->_Complete) {
-      return &null_sample_func;
-   }
-   else {
-      const GLboolean needLambda = (GLboolean) (t->MinFilter != t->MagFilter);
-      const GLenum format = t->Image[0][t->BaseLevel]->_BaseFormat;
-
-      switch (t->Target) {
-      case GL_TEXTURE_1D:
-         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
-            return &sample_depth_texture;
-         }
-         else if (needLambda) {
-            return &sample_lambda_1d;
-         }
-         else if (t->MinFilter == GL_LINEAR) {
-            return &sample_linear_1d;
-         }
-         else {
-            ASSERT(t->MinFilter == GL_NEAREST);
-            return &sample_nearest_1d;
-         }
-      case GL_TEXTURE_2D:
-         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
-            return &sample_depth_texture;
-         }
-         else if (needLambda) {
-            return &sample_lambda_2d;
-         }
-         else if (t->MinFilter == GL_LINEAR) {
-            return &sample_linear_2d;
-         }
-         else {
-            /* check for a few optimized cases */
-            const struct gl_texture_image *img = t->Image[0][t->BaseLevel];
-            ASSERT(t->MinFilter == GL_NEAREST);
-            if (t->WrapS == GL_REPEAT &&
-                t->WrapT == GL_REPEAT &&
-                img->_IsPowerOfTwo &&
-                img->Border == 0 &&
-                img->TexFormat == MESA_FORMAT_RGB888) {
-               return &opt_sample_rgb_2d;
-            }
-            else if (t->WrapS == GL_REPEAT &&
-                     t->WrapT == GL_REPEAT &&
-                     img->_IsPowerOfTwo &&
-                     img->Border == 0 &&
-                     img->TexFormat == MESA_FORMAT_RGBA8888) {
-               return &opt_sample_rgba_2d;
-            }
-            else {
-               return &sample_nearest_2d;
-            }
-         }
-      case GL_TEXTURE_3D:
-         if (needLambda) {
-            return &sample_lambda_3d;
-         }
-         else if (t->MinFilter == GL_LINEAR) {
-            return &sample_linear_3d;
-         }
-         else {
-            ASSERT(t->MinFilter == GL_NEAREST);
-            return &sample_nearest_3d;
-         }
-      case GL_TEXTURE_CUBE_MAP:
-         if (needLambda) {
-            return &sample_lambda_cube;
-         }
-         else if (t->MinFilter == GL_LINEAR) {
-            return &sample_linear_cube;
-         }
-         else {
-            ASSERT(t->MinFilter == GL_NEAREST);
-            return &sample_nearest_cube;
-         }
-      case GL_TEXTURE_RECTANGLE_NV:
-         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
-            return &sample_depth_texture;
-         }
-         else if (needLambda) {
-            return &sample_lambda_rect;
-         }
-         else if (t->MinFilter == GL_LINEAR) {
-            return &sample_linear_rect;
-         }
-         else {
-            ASSERT(t->MinFilter == GL_NEAREST);
-            return &sample_nearest_rect;
-         }
-      case GL_TEXTURE_1D_ARRAY_EXT:
-         if (needLambda) {
-            return &sample_lambda_1d_array;
-         }
-         else if (t->MinFilter == GL_LINEAR) {
-            return &sample_linear_1d_array;
-         }
-         else {
-            ASSERT(t->MinFilter == GL_NEAREST);
-            return &sample_nearest_1d_array;
-         }
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         if (needLambda) {
-            return &sample_lambda_2d_array;
-         }
-         else if (t->MinFilter == GL_LINEAR) {
-            return &sample_linear_2d_array;
-         }
-         else {
-            ASSERT(t->MinFilter == GL_NEAREST);
-            return &sample_nearest_2d_array;
-         }
-      default:
-         _mesa_problem(ctx,
-                       "invalid target in _swrast_choose_texture_sample_func");
-         return &null_sample_func;
-      }
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.3

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/colormac.h"

+#include "main/imports.h"

+

+#include "s_context.h"

+#include "s_texfilter.h"

+

+

+/*

+ * Note, the FRAC macro has to work perfectly.  Otherwise you'll sometimes

+ * see 1-pixel bands of improperly weighted linear-filtered textures.

+ * The tests/texwrap.c demo is a good test.

+ * Also note, FRAC(x) doesn't truly return the fractional part of x for x < 0.

+ * Instead, if x < 0 then FRAC(x) = 1 - true_frac(x).

+ */

+#define FRAC(f)  ((f) - IFLOOR(f))

+

+

+

+/**

+ * Linear interpolation macro

+ */

+#define LERP(T, A, B)  ( (A) + (T) * ((B) - (A)) )

+

+

+/**

+ * Do 2D/biliner interpolation of float values.

+ * v00, v10, v01 and v11 are typically four texture samples in a square/box.

+ * a and b are the horizontal and vertical interpolants.

+ * It's important that this function is inlined when compiled with

+ * optimization!  If we find that's not true on some systems, convert

+ * to a macro.

+ */

+static INLINE GLfloat

+lerp_2d(GLfloat a, GLfloat b,

+        GLfloat v00, GLfloat v10, GLfloat v01, GLfloat v11)

+{

+   const GLfloat temp0 = LERP(a, v00, v10);

+   const GLfloat temp1 = LERP(a, v01, v11);

+   return LERP(b, temp0, temp1);

+}

+

+

+/**

+ * Do 3D/trilinear interpolation of float values.

+ * \sa lerp_2d

+ */

+static INLINE GLfloat

+lerp_3d(GLfloat a, GLfloat b, GLfloat c,

+        GLfloat v000, GLfloat v100, GLfloat v010, GLfloat v110,

+        GLfloat v001, GLfloat v101, GLfloat v011, GLfloat v111)

+{

+   const GLfloat temp00 = LERP(a, v000, v100);

+   const GLfloat temp10 = LERP(a, v010, v110);

+   const GLfloat temp01 = LERP(a, v001, v101);

+   const GLfloat temp11 = LERP(a, v011, v111);

+   const GLfloat temp0 = LERP(b, temp00, temp10);

+   const GLfloat temp1 = LERP(b, temp01, temp11);

+   return LERP(c, temp0, temp1);

+}

+

+

+/**

+ * Do linear interpolation of colors.

+ */

+static INLINE void

+lerp_rgba(GLfloat result[4], GLfloat t, const GLfloat a[4], const GLfloat b[4])

+{

+   result[0] = LERP(t, a[0], b[0]);

+   result[1] = LERP(t, a[1], b[1]);

+   result[2] = LERP(t, a[2], b[2]);

+   result[3] = LERP(t, a[3], b[3]);

+}

+

+

+/**

+ * Do bilinear interpolation of colors.

+ */

+static INLINE void

+lerp_rgba_2d(GLfloat result[4], GLfloat a, GLfloat b,

+             const GLfloat t00[4], const GLfloat t10[4],

+             const GLfloat t01[4], const GLfloat t11[4])

+{

+   result[0] = lerp_2d(a, b, t00[0], t10[0], t01[0], t11[0]);

+   result[1] = lerp_2d(a, b, t00[1], t10[1], t01[1], t11[1]);

+   result[2] = lerp_2d(a, b, t00[2], t10[2], t01[2], t11[2]);

+   result[3] = lerp_2d(a, b, t00[3], t10[3], t01[3], t11[3]);

+}

+

+

+/**

+ * Do trilinear interpolation of colors.

+ */

+static INLINE void

+lerp_rgba_3d(GLfloat result[4], GLfloat a, GLfloat b, GLfloat c,

+             const GLfloat t000[4], const GLfloat t100[4],

+             const GLfloat t010[4], const GLfloat t110[4],

+             const GLfloat t001[4], const GLfloat t101[4],

+             const GLfloat t011[4], const GLfloat t111[4])

+{

+   GLuint k;

+   /* compiler should unroll these short loops */

+   for (k = 0; k < 4; k++) {

+      result[k] = lerp_3d(a, b, c, t000[k], t100[k], t010[k], t110[k],

+                                   t001[k], t101[k], t011[k], t111[k]);

+   }

+}

+

+

+/**

+ * Used for GL_REPEAT wrap mode.  Using A % B doesn't produce the

+ * right results for A<0.  Casting to A to be unsigned only works if B

+ * is a power of two.  Adding a bias to A (which is a multiple of B)

+ * avoids the problems with A < 0 (for reasonable A) without using a

+ * conditional.

+ */

+#define REMAINDER(A, B) (((A) + (B) * 1024) % (B))

+

+

+/**

+ * Used to compute texel locations for linear sampling.

+ * Input:

+ *    wrapMode = GL_REPEAT, GL_CLAMP, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_BORDER

+ *    s = texcoord in [0,1]

+ *    size = width (or height or depth) of texture

+ * Output:

+ *    i0, i1 = returns two nearest texel indexes

+ *    weight = returns blend factor between texels

+ */

+static INLINE void

+linear_texel_locations(GLenum wrapMode,

+                       const struct gl_texture_image *img,

+                       GLint size, GLfloat s,

+                       GLint *i0, GLint *i1, GLfloat *weight)

+{

+   GLfloat u;

+   switch (wrapMode) {

+   case GL_REPEAT:

+      u = s * size - 0.5F;

+      if (img->_IsPowerOfTwo) {

+         *i0 = IFLOOR(u) & (size - 1);

+         *i1 = (*i0 + 1) & (size - 1);

+      }

+      else {

+         *i0 = REMAINDER(IFLOOR(u), size);

+         *i1 = REMAINDER(*i0 + 1, size);

+      }

+      break;

+   case GL_CLAMP_TO_EDGE:

+      if (s <= 0.0F)

+         u = 0.0F;

+      else if (s >= 1.0F)

+         u = (GLfloat) size;

+      else

+         u = s * size;

+      u -= 0.5F;

+      *i0 = IFLOOR(u);

+      *i1 = *i0 + 1;

+      if (*i0 < 0)

+         *i0 = 0;

+      if (*i1 >= (GLint) size)

+         *i1 = size - 1;

+      break;

+   case GL_CLAMP_TO_BORDER:

+      {

+         const GLfloat min = -1.0F / (2.0F * size);

+         const GLfloat max = 1.0F - min;

+         if (s <= min)

+            u = min * size;

+         else if (s >= max)

+            u = max * size;

+         else

+            u = s * size;

+         u -= 0.5F;

+         *i0 = IFLOOR(u);

+         *i1 = *i0 + 1;

+      }

+      break;

+   case GL_MIRRORED_REPEAT:

+      {

+         const GLint flr = IFLOOR(s);

+         if (flr & 1)

+            u = 1.0F - (s - (GLfloat) flr);

+         else

+            u = s - (GLfloat) flr;

+         u = (u * size) - 0.5F;

+         *i0 = IFLOOR(u);

+         *i1 = *i0 + 1;

+         if (*i0 < 0)

+            *i0 = 0;

+         if (*i1 >= (GLint) size)

+            *i1 = size - 1;

+      }

+      break;

+   case GL_MIRROR_CLAMP_EXT:

+      u = FABSF(s);

+      if (u >= 1.0F)

+         u = (GLfloat) size;

+      else

+         u *= size;

+      u -= 0.5F;

+      *i0 = IFLOOR(u);

+      *i1 = *i0 + 1;

+      break;

+   case GL_MIRROR_CLAMP_TO_EDGE_EXT:

+      u = FABSF(s);

+      if (u >= 1.0F)

+         u = (GLfloat) size;

+      else

+         u *= size;

+      u -= 0.5F;

+      *i0 = IFLOOR(u);

+      *i1 = *i0 + 1;

+      if (*i0 < 0)

+         *i0 = 0;

+      if (*i1 >= (GLint) size)

+         *i1 = size - 1;

+      break;

+   case GL_MIRROR_CLAMP_TO_BORDER_EXT:

+      {

+         const GLfloat min = -1.0F / (2.0F * size);

+         const GLfloat max = 1.0F - min;

+         u = FABSF(s);

+         if (u <= min)

+            u = min * size;

+         else if (u >= max)

+            u = max * size;

+         else

+            u *= size;

+         u -= 0.5F;

+         *i0 = IFLOOR(u);

+         *i1 = *i0 + 1;

+      }

+      break;

+   case GL_CLAMP:

+      if (s <= 0.0F)

+         u = 0.0F;

+      else if (s >= 1.0F)

+         u = (GLfloat) size;

+      else

+         u = s * size;

+      u -= 0.5F;

+      *i0 = IFLOOR(u);

+      *i1 = *i0 + 1;

+      break;

+   default:

+      _mesa_problem(NULL, "Bad wrap mode");

+      u = 0.0F;

+   }

+   *weight = FRAC(u);

+}

+

+

+/**

+ * Used to compute texel location for nearest sampling.

+ */

+static INLINE GLint

+nearest_texel_location(GLenum wrapMode,

+                       const struct gl_texture_image *img,

+                       GLint size, GLfloat s)

+{

+   GLint i;

+

+   switch (wrapMode) {

+   case GL_REPEAT:

+      /* s limited to [0,1) */

+      /* i limited to [0,size-1] */

+      i = IFLOOR(s * size);

+      if (img->_IsPowerOfTwo)

+         i &= (size - 1);

+      else

+         i = REMAINDER(i, size);

+      return i;

+   case GL_CLAMP_TO_EDGE:

+      {

+         /* s limited to [min,max] */

+         /* i limited to [0, size-1] */

+         const GLfloat min = 1.0F / (2.0F * size);

+         const GLfloat max = 1.0F - min;

+         if (s < min)

+            i = 0;

+         else if (s > max)

+            i = size - 1;

+         else

+            i = IFLOOR(s * size);

+      }

+      return i;

+   case GL_CLAMP_TO_BORDER:

+      {

+         /* s limited to [min,max] */

+         /* i limited to [-1, size] */

+         const GLfloat min = -1.0F / (2.0F * size);

+         const GLfloat max = 1.0F - min;

+         if (s <= min)

+            i = -1;

+         else if (s >= max)

+            i = size;

+         else

+            i = IFLOOR(s * size);

+      }

+      return i;

+   case GL_MIRRORED_REPEAT:

+      {

+         const GLfloat min = 1.0F / (2.0F * size);

+         const GLfloat max = 1.0F - min;

+         const GLint flr = IFLOOR(s);

+         GLfloat u;

+         if (flr & 1)

+            u = 1.0F - (s - (GLfloat) flr);

+         else

+            u = s - (GLfloat) flr;

+         if (u < min)

+            i = 0;

+         else if (u > max)

+            i = size - 1;

+         else

+            i = IFLOOR(u * size);

+      }

+      return i;

+   case GL_MIRROR_CLAMP_EXT:

+      {

+         /* s limited to [0,1] */

+         /* i limited to [0,size-1] */

+         const GLfloat u = FABSF(s);

+         if (u <= 0.0F)

+            i = 0;

+         else if (u >= 1.0F)

+            i = size - 1;

+         else

+            i = IFLOOR(u * size);

+      }

+      return i;

+   case GL_MIRROR_CLAMP_TO_EDGE_EXT:

+      {

+         /* s limited to [min,max] */

+         /* i limited to [0, size-1] */

+         const GLfloat min = 1.0F / (2.0F * size);

+         const GLfloat max = 1.0F - min;

+         const GLfloat u = FABSF(s);

+         if (u < min)

+            i = 0;

+         else if (u > max)

+            i = size - 1;

+         else

+            i = IFLOOR(u * size);

+      }

+      return i;

+   case GL_MIRROR_CLAMP_TO_BORDER_EXT:

+      {

+         /* s limited to [min,max] */

+         /* i limited to [0, size-1] */

+         const GLfloat min = -1.0F / (2.0F * size);

+         const GLfloat max = 1.0F - min;

+         const GLfloat u = FABSF(s);

+         if (u < min)

+            i = -1;

+         else if (u > max)

+            i = size;

+         else

+            i = IFLOOR(u * size);

+      }

+      return i;

+   case GL_CLAMP:

+      /* s limited to [0,1] */

+      /* i limited to [0,size-1] */

+      if (s <= 0.0F)

+         i = 0;

+      else if (s >= 1.0F)

+         i = size - 1;

+      else

+         i = IFLOOR(s * size);

+      return i;

+   default:

+      _mesa_problem(NULL, "Bad wrap mode");

+      return 0;

+   }

+}

+

+

+/* Power of two image sizes only */

+static INLINE void

+linear_repeat_texel_location(GLuint size, GLfloat s,

+                             GLint *i0, GLint *i1, GLfloat *weight)

+{

+   GLfloat u = s * size - 0.5F;

+   *i0 = IFLOOR(u) & (size - 1);

+   *i1 = (*i0 + 1) & (size - 1);

+   *weight = FRAC(u);

+}

+

+

+/**

+ * Do clamp/wrap for a texture rectangle coord, GL_NEAREST filter mode.

+ */

+static INLINE GLint

+clamp_rect_coord_nearest(GLenum wrapMode, GLfloat coord, GLint max)

+{

+   switch (wrapMode) {

+   case GL_CLAMP:

+      return IFLOOR( CLAMP(coord, 0.0F, max - 1) );

+   case GL_CLAMP_TO_EDGE:

+      return IFLOOR( CLAMP(coord, 0.5F, max - 0.5F) );

+   case GL_CLAMP_TO_BORDER:

+      return IFLOOR( CLAMP(coord, -0.5F, max + 0.5F) );

+   default:

+      _mesa_problem(NULL, "bad wrapMode in clamp_rect_coord_nearest");

+      return 0;

+   }

+}

+

+

+/**

+ * As above, but GL_LINEAR filtering.

+ */

+static INLINE void

+clamp_rect_coord_linear(GLenum wrapMode, GLfloat coord, GLint max,

+                        GLint *i0out, GLint *i1out, GLfloat *weight)

+{

+   GLfloat fcol;

+   GLint i0, i1;

+   switch (wrapMode) {

+   case GL_CLAMP:

+      /* Not exactly what the spec says, but it matches NVIDIA output */

+      fcol = CLAMP(coord - 0.5F, 0.0F, max - 1);

+      i0 = IFLOOR(fcol);

+      i1 = i0 + 1;

+      break;

+   case GL_CLAMP_TO_EDGE:

+      fcol = CLAMP(coord, 0.5F, max - 0.5F);

+      fcol -= 0.5F;

+      i0 = IFLOOR(fcol);

+      i1 = i0 + 1;

+      if (i1 > max - 1)

+         i1 = max - 1;

+      break;

+   case GL_CLAMP_TO_BORDER:

+      fcol = CLAMP(coord, -0.5F, max + 0.5F);

+      fcol -= 0.5F;

+      i0 = IFLOOR(fcol);

+      i1 = i0 + 1;

+      break;

+   default:

+      _mesa_problem(NULL, "bad wrapMode in clamp_rect_coord_linear");

+      i0 = i1 = 0;

+      fcol = 0.0F;

+   }

+   *i0out = i0;

+   *i1out = i1;

+   *weight = FRAC(fcol);

+}

+

+

+/**

+ * Compute slice/image to use for 1D or 2D array texture.

+ */

+static INLINE GLint

+tex_array_slice(GLfloat coord, GLsizei size)

+{

+   GLint slice = IFLOOR(coord + 0.5f);

+   slice = CLAMP(slice, 0, size - 1);

+   return slice;

+}

+

+

+/**

+ * Compute nearest integer texcoords for given texobj and coordinate.

+ * NOTE: only used for depth texture sampling.

+ */

+static INLINE void

+nearest_texcoord(const struct gl_texture_object *texObj,

+                 GLuint level,

+                 const GLfloat texcoord[4],

+                 GLint *i, GLint *j, GLint *k)

+{

+   const struct gl_texture_image *img = texObj->Image[0][level];

+   const GLint width = img->Width;

+   const GLint height = img->Height;

+   const GLint depth = img->Depth;

+

+   switch (texObj->Target) {

+   case GL_TEXTURE_RECTANGLE_ARB:

+      *i = clamp_rect_coord_nearest(texObj->WrapS, texcoord[0], width);

+      *j = clamp_rect_coord_nearest(texObj->WrapT, texcoord[1], height);

+      *k = 0;

+      break;

+   case GL_TEXTURE_1D:

+      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);

+      *j = 0;

+      *k = 0;

+      break;

+   case GL_TEXTURE_2D:

+      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);

+      *j = nearest_texel_location(texObj->WrapT, img, height, texcoord[1]);

+      *k = 0;

+      break;

+   case GL_TEXTURE_1D_ARRAY_EXT:

+      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);

+      *j = tex_array_slice(texcoord[1], height);

+      *k = 0;

+      break;

+   case GL_TEXTURE_2D_ARRAY_EXT:

+      *i = nearest_texel_location(texObj->WrapS, img, width, texcoord[0]);

+      *j = nearest_texel_location(texObj->WrapT, img, height, texcoord[1]);

+      *k = tex_array_slice(texcoord[2], depth);

+      break;

+   default:

+      *i = *j = *k = 0;

+   }

+}

+

+

+/**

+ * Compute linear integer texcoords for given texobj and coordinate.

+ * NOTE: only used for depth texture sampling.

+ */

+static INLINE void

+linear_texcoord(const struct gl_texture_object *texObj,

+                GLuint level,

+                const GLfloat texcoord[4],

+                GLint *i0, GLint *i1, GLint *j0, GLint *j1, GLint *slice,

+                GLfloat *wi, GLfloat *wj)

+{

+   const struct gl_texture_image *img = texObj->Image[0][level];

+   const GLint width = img->Width;

+   const GLint height = img->Height;

+   const GLint depth = img->Depth;

+

+   switch (texObj->Target) {

+   case GL_TEXTURE_RECTANGLE_ARB:

+      clamp_rect_coord_linear(texObj->WrapS, texcoord[0],

+                              width, i0, i1, wi);

+      clamp_rect_coord_linear(texObj->WrapT, texcoord[1],

+                              height, j0, j1, wj);

+      *slice = 0;

+      break;

+

+   case GL_TEXTURE_1D:

+   case GL_TEXTURE_2D:

+      linear_texel_locations(texObj->WrapS, img, width,

+                             texcoord[0], i0, i1, wi);

+      linear_texel_locations(texObj->WrapT, img, height,

+                             texcoord[1], j0, j1, wj);

+      *slice = 0;

+      break;

+

+   case GL_TEXTURE_1D_ARRAY_EXT:

+      linear_texel_locations(texObj->WrapS, img, width,

+                             texcoord[0], i0, i1, wi);

+      *j0 = tex_array_slice(texcoord[1], height);

+      *j1 = *j0;

+      *slice = 0;

+      break;

+

+   case GL_TEXTURE_2D_ARRAY_EXT:

+      linear_texel_locations(texObj->WrapS, img, width,

+                             texcoord[0], i0, i1, wi);

+      linear_texel_locations(texObj->WrapT, img, height,

+                             texcoord[1], j0, j1, wj);

+      *slice = tex_array_slice(texcoord[2], depth);

+      break;

+

+   default:

+      *slice = 0;

+   }

+}

+

+

+

+/**

+ * For linear interpolation between mipmap levels N and N+1, this function

+ * computes N.

+ */

+static INLINE GLint

+linear_mipmap_level(const struct gl_texture_object *tObj, GLfloat lambda)

+{

+   if (lambda < 0.0F)

+      return tObj->BaseLevel;

+   else if (lambda > tObj->_MaxLambda)

+      return (GLint) (tObj->BaseLevel + tObj->_MaxLambda);

+   else

+      return (GLint) (tObj->BaseLevel + lambda);

+}

+

+

+/**

+ * Compute the nearest mipmap level to take texels from.

+ */

+static INLINE GLint

+nearest_mipmap_level(const struct gl_texture_object *tObj, GLfloat lambda)

+{

+   GLfloat l;

+   GLint level;

+   if (lambda <= 0.5F)

+      l = 0.0F;

+   else if (lambda > tObj->_MaxLambda + 0.4999F)

+      l = tObj->_MaxLambda + 0.4999F;

+   else

+      l = lambda;

+   level = (GLint) (tObj->BaseLevel + l + 0.5F);

+   if (level > tObj->_MaxLevel)

+      level = tObj->_MaxLevel;

+   return level;

+}

+

+

+

+/*

+ * Bitflags for texture border color sampling.

+ */

+#define I0BIT   1

+#define I1BIT   2

+#define J0BIT   4

+#define J1BIT   8

+#define K0BIT  16

+#define K1BIT  32

+

+

+

+/**

+ * The lambda[] array values are always monotonic.  Either the whole span

+ * will be minified, magnified, or split between the two.  This function

+ * determines the subranges in [0, n-1] that are to be minified or magnified.

+ */

+static INLINE void

+compute_min_mag_ranges(const struct gl_texture_object *tObj,

+                       GLuint n, const GLfloat lambda[],

+                       GLuint *minStart, GLuint *minEnd,

+                       GLuint *magStart, GLuint *magEnd)

+{

+   GLfloat minMagThresh;

+

+   /* we shouldn't be here if minfilter == magfilter */

+   ASSERT(tObj->MinFilter != tObj->MagFilter);

+

+   /* This bit comes from the OpenGL spec: */

+   if (tObj->MagFilter == GL_LINEAR

+       && (tObj->MinFilter == GL_NEAREST_MIPMAP_NEAREST ||

+           tObj->MinFilter == GL_NEAREST_MIPMAP_LINEAR)) {

+      minMagThresh = 0.5F;

+   }

+   else {

+      minMagThresh = 0.0F;

+   }

+

+#if 0

+   /* DEBUG CODE: Verify that lambda[] is monotonic.

+    * We can't really use this because the inaccuracy in the LOG2 function

+    * causes this test to fail, yet the resulting texturing is correct.

+    */

+   if (n > 1) {

+      GLuint i;

+      printf("lambda delta = %g\n", lambda[0] - lambda[n-1]);

+      if (lambda[0] >= lambda[n-1]) { /* decreasing */

+         for (i = 0; i < n - 1; i++) {

+            ASSERT((GLint) (lambda[i] * 10) >= (GLint) (lambda[i+1] * 10));

+         }

+      }

+      else { /* increasing */

+         for (i = 0; i < n - 1; i++) {

+            ASSERT((GLint) (lambda[i] * 10) <= (GLint) (lambda[i+1] * 10));

+         }

+      }

+   }

+#endif /* DEBUG */

+

+   if (lambda[0] <= minMagThresh && (n <= 1 || lambda[n-1] <= minMagThresh)) {

+      /* magnification for whole span */

+      *magStart = 0;

+      *magEnd = n;

+      *minStart = *minEnd = 0;

+   }

+   else if (lambda[0] > minMagThresh && (n <=1 || lambda[n-1] > minMagThresh)) {

+      /* minification for whole span */

+      *minStart = 0;

+      *minEnd = n;

+      *magStart = *magEnd = 0;

+   }

+   else {

+      /* a mix of minification and magnification */

+      GLuint i;

+      if (lambda[0] > minMagThresh) {

+         /* start with minification */

+         for (i = 1; i < n; i++) {

+            if (lambda[i] <= minMagThresh)

+               break;

+         }

+         *minStart = 0;

+         *minEnd = i;

+         *magStart = i;

+         *magEnd = n;

+      }

+      else {

+         /* start with magnification */

+         for (i = 1; i < n; i++) {

+            if (lambda[i] > minMagThresh)

+               break;

+         }

+         *magStart = 0;

+         *magEnd = i;

+         *minStart = i;

+         *minEnd = n;

+      }

+   }

+

+#if 0

+   /* Verify the min/mag Start/End values

+    * We don't use this either (see above)

+    */

+   {

+      GLint i;

+      for (i = 0; i < n; i++) {

+         if (lambda[i] > minMagThresh) {

+            /* minification */

+            ASSERT(i >= *minStart);

+            ASSERT(i < *minEnd);

+         }

+         else {

+            /* magnification */

+            ASSERT(i >= *magStart);

+            ASSERT(i < *magEnd);

+         }

+      }

+   }

+#endif

+}

+

+

+/**

+ * When we sample the border color, it must be interpreted according to

+ * the base texture format.  Ex: if the texture base format it GL_ALPHA,

+ * we return (0,0,0,BorderAlpha).

+ */

+static INLINE void

+get_border_color(const struct gl_texture_object *tObj,

+                 const struct gl_texture_image *img,

+                 GLfloat rgba[4])

+{

+   switch (img->_BaseFormat) {

+   case GL_RGB:

+      rgba[0] = tObj->BorderColor.f[0];

+      rgba[1] = tObj->BorderColor.f[1];

+      rgba[2] = tObj->BorderColor.f[2];

+      rgba[3] = 1.0F;

+      break;

+   case GL_ALPHA:

+      rgba[0] = rgba[1] = rgba[2] = 0.0;

+      rgba[3] = tObj->BorderColor.f[3];

+      break;

+   case GL_LUMINANCE:

+      rgba[0] = rgba[1] = rgba[2] = tObj->BorderColor.f[0];

+      rgba[3] = 1.0;

+      break;

+   case GL_LUMINANCE_ALPHA:

+      rgba[0] = rgba[1] = rgba[2] = tObj->BorderColor.f[0];

+      rgba[3] = tObj->BorderColor.f[3];

+      break;

+   case GL_INTENSITY:

+      rgba[0] = rgba[1] = rgba[2] = rgba[3] = tObj->BorderColor.f[0];

+      break;

+   default:

+      COPY_4V(rgba, tObj->BorderColor.f);

+   }

+}

+

+

+/**********************************************************************/

+/*                    1-D Texture Sampling Functions                  */

+/**********************************************************************/

+

+/**

+ * Return the texture sample for coordinate (s) using GL_NEAREST filter.

+ */

+static INLINE void

+sample_1d_nearest(struct gl_context *ctx,

+                  const struct gl_texture_object *tObj,

+                  const struct gl_texture_image *img,

+                  const GLfloat texcoord[4], GLfloat rgba[4])

+{

+   const GLint width = img->Width2;  /* without border, power of two */

+   GLint i;

+   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);

+   /* skip over the border, if any */

+   i += img->Border;

+   if (i < 0 || i >= (GLint) img->Width) {

+      /* Need this test for GL_CLAMP_TO_BORDER mode */

+      get_border_color(tObj, img, rgba);

+   }

+   else {

+      img->FetchTexelf(img, i, 0, 0, rgba);

+   }

+}

+

+

+/**

+ * Return the texture sample for coordinate (s) using GL_LINEAR filter.

+ */

+static INLINE void

+sample_1d_linear(struct gl_context *ctx,

+                 const struct gl_texture_object *tObj,

+                 const struct gl_texture_image *img,

+                 const GLfloat texcoord[4], GLfloat rgba[4])

+{

+   const GLint width = img->Width2;

+   GLint i0, i1;

+   GLbitfield useBorderColor = 0x0;

+   GLfloat a;

+   GLfloat t0[4], t1[4];  /* texels */

+

+   linear_texel_locations(tObj->WrapS, img, width, texcoord[0], &i0, &i1, &a);

+

+   if (img->Border) {

+      i0 += img->Border;

+      i1 += img->Border;

+   }

+   else {

+      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;

+      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;

+   }

+

+   /* fetch texel colors */

+   if (useBorderColor & I0BIT) {

+      get_border_color(tObj, img, t0);

+   }

+   else {

+      img->FetchTexelf(img, i0, 0, 0, t0);

+   }

+   if (useBorderColor & I1BIT) {

+      get_border_color(tObj, img, t1);

+   }

+   else {

+      img->FetchTexelf(img, i1, 0, 0, t1);

+   }

+

+   lerp_rgba(rgba, a, t0, t1);

+}

+

+

+static void

+sample_1d_nearest_mipmap_nearest(struct gl_context *ctx,

+                                 const struct gl_texture_object *tObj,

+                                 GLuint n, const GLfloat texcoord[][4],

+                                 const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = nearest_mipmap_level(tObj, lambda[i]);

+      sample_1d_nearest(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);

+   }

+}

+

+

+static void

+sample_1d_linear_mipmap_nearest(struct gl_context *ctx,

+                                const struct gl_texture_object *tObj,

+                                GLuint n, const GLfloat texcoord[][4],

+                                const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = nearest_mipmap_level(tObj, lambda[i]);

+      sample_1d_linear(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);

+   }

+}

+

+

+static void

+sample_1d_nearest_mipmap_linear(struct gl_context *ctx,

+                                const struct gl_texture_object *tObj,

+                                GLuint n, const GLfloat texcoord[][4],

+                                const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      if (level >= tObj->_MaxLevel) {

+         sample_1d_nearest(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],

+                           texcoord[i], rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];

+         const GLfloat f = FRAC(lambda[i]);

+         sample_1d_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);

+         sample_1d_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+static void

+sample_1d_linear_mipmap_linear(struct gl_context *ctx,

+                               const struct gl_texture_object *tObj,

+                               GLuint n, const GLfloat texcoord[][4],

+                               const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      if (level >= tObj->_MaxLevel) {

+         sample_1d_linear(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],

+                          texcoord[i], rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];

+         const GLfloat f = FRAC(lambda[i]);

+         sample_1d_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);

+         sample_1d_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+/** Sample 1D texture, nearest filtering for both min/magnification */

+static void

+sample_nearest_1d( struct gl_context *ctx,

+                   const struct gl_texture_object *tObj, GLuint n,

+                   const GLfloat texcoords[][4], const GLfloat lambda[],

+                   GLfloat rgba[][4] )

+{

+   GLuint i;

+   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      sample_1d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);

+   }

+}

+

+

+/** Sample 1D texture, linear filtering for both min/magnification */

+static void

+sample_linear_1d( struct gl_context *ctx,

+                  const struct gl_texture_object *tObj, GLuint n,

+                  const GLfloat texcoords[][4], const GLfloat lambda[],

+                  GLfloat rgba[][4] )

+{

+   GLuint i;

+   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      sample_1d_linear(ctx, tObj, image, texcoords[i], rgba[i]);

+   }

+}

+

+

+/** Sample 1D texture, using lambda to choose between min/magnification */

+static void

+sample_lambda_1d( struct gl_context *ctx,

+                  const struct gl_texture_object *tObj, GLuint n,

+                  const GLfloat texcoords[][4],

+                  const GLfloat lambda[], GLfloat rgba[][4] )

+{

+   GLuint minStart, minEnd;  /* texels with minification */

+   GLuint magStart, magEnd;  /* texels with magnification */

+   GLuint i;

+

+   ASSERT(lambda != NULL);

+   compute_min_mag_ranges(tObj, n, lambda,

+                          &minStart, &minEnd, &magStart, &magEnd);

+

+   if (minStart < minEnd) {

+      /* do the minified texels */

+      const GLuint m = minEnd - minStart;

+      switch (tObj->MinFilter) {

+      case GL_NEAREST:

+         for (i = minStart; i < minEnd; i++)

+            sample_1d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                              texcoords[i], rgba[i]);

+         break;

+      case GL_LINEAR:

+         for (i = minStart; i < minEnd; i++)

+            sample_1d_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                             texcoords[i], rgba[i]);

+         break;

+      case GL_NEAREST_MIPMAP_NEAREST:

+         sample_1d_nearest_mipmap_nearest(ctx, tObj, m, texcoords + minStart,

+                                          lambda + minStart, rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_NEAREST:

+         sample_1d_linear_mipmap_nearest(ctx, tObj, m, texcoords + minStart,

+                                         lambda + minStart, rgba + minStart);

+         break;

+      case GL_NEAREST_MIPMAP_LINEAR:

+         sample_1d_nearest_mipmap_linear(ctx, tObj, m, texcoords + minStart,

+                                         lambda + minStart, rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_LINEAR:

+         sample_1d_linear_mipmap_linear(ctx, tObj, m, texcoords + minStart,

+                                        lambda + minStart, rgba + minStart);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad min filter in sample_1d_texture");

+         return;

+      }

+   }

+

+   if (magStart < magEnd) {

+      /* do the magnified texels */

+      switch (tObj->MagFilter) {

+      case GL_NEAREST:

+         for (i = magStart; i < magEnd; i++)

+            sample_1d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                              texcoords[i], rgba[i]);

+         break;

+      case GL_LINEAR:

+         for (i = magStart; i < magEnd; i++)

+            sample_1d_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                             texcoords[i], rgba[i]);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad mag filter in sample_1d_texture");

+         return;

+      }

+   }

+}

+

+

+/**********************************************************************/

+/*                    2-D Texture Sampling Functions                  */

+/**********************************************************************/

+

+

+/**

+ * Return the texture sample for coordinate (s,t) using GL_NEAREST filter.

+ */

+static INLINE void

+sample_2d_nearest(struct gl_context *ctx,

+                  const struct gl_texture_object *tObj,

+                  const struct gl_texture_image *img,

+                  const GLfloat texcoord[4],

+                  GLfloat rgba[])

+{

+   const GLint width = img->Width2;    /* without border, power of two */

+   const GLint height = img->Height2;  /* without border, power of two */

+   GLint i, j;

+   (void) ctx;

+

+   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);

+   j = nearest_texel_location(tObj->WrapT, img, height, texcoord[1]);

+

+   /* skip over the border, if any */

+   i += img->Border;

+   j += img->Border;

+

+   if (i < 0 || i >= (GLint) img->Width || j < 0 || j >= (GLint) img->Height) {

+      /* Need this test for GL_CLAMP_TO_BORDER mode */

+      get_border_color(tObj, img, rgba);

+   }

+   else {

+      img->FetchTexelf(img, i, j, 0, rgba);

+   }

+}

+

+

+/**

+ * Return the texture sample for coordinate (s,t) using GL_LINEAR filter.

+ * New sampling code contributed by Lynn Quam <quam@ai.sri.com>.

+ */

+static INLINE void

+sample_2d_linear(struct gl_context *ctx,

+                 const struct gl_texture_object *tObj,

+                 const struct gl_texture_image *img,

+                 const GLfloat texcoord[4],

+                 GLfloat rgba[])

+{

+   const GLint width = img->Width2;

+   const GLint height = img->Height2;

+   GLint i0, j0, i1, j1;

+   GLbitfield useBorderColor = 0x0;

+   GLfloat a, b;

+   GLfloat t00[4], t10[4], t01[4], t11[4]; /* sampled texel colors */

+

+   linear_texel_locations(tObj->WrapS, img, width, texcoord[0],  &i0, &i1, &a);

+   linear_texel_locations(tObj->WrapT, img, height, texcoord[1], &j0, &j1, &b);

+

+   if (img->Border) {

+      i0 += img->Border;

+      i1 += img->Border;

+      j0 += img->Border;

+      j1 += img->Border;

+   }

+   else {

+      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;

+      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;

+      if (j0 < 0 || j0 >= height)  useBorderColor |= J0BIT;

+      if (j1 < 0 || j1 >= height)  useBorderColor |= J1BIT;

+   }

+

+   /* fetch four texel colors */

+   if (useBorderColor & (I0BIT | J0BIT)) {

+      get_border_color(tObj, img, t00);

+   }

+   else {

+      img->FetchTexelf(img, i0, j0, 0, t00);

+   }

+   if (useBorderColor & (I1BIT | J0BIT)) {

+      get_border_color(tObj, img, t10);

+   }

+   else {

+      img->FetchTexelf(img, i1, j0, 0, t10);

+   }

+   if (useBorderColor & (I0BIT | J1BIT)) {

+      get_border_color(tObj, img, t01);

+   }

+   else {

+      img->FetchTexelf(img, i0, j1, 0, t01);

+   }

+   if (useBorderColor & (I1BIT | J1BIT)) {

+      get_border_color(tObj, img, t11);

+   }

+   else {

+      img->FetchTexelf(img, i1, j1, 0, t11);

+   }

+

+   lerp_rgba_2d(rgba, a, b, t00, t10, t01, t11);

+}

+

+

+/**

+ * As above, but we know WRAP_S == REPEAT and WRAP_T == REPEAT.

+ * We don't have to worry about the texture border.

+ */

+static INLINE void

+sample_2d_linear_repeat(struct gl_context *ctx,

+                        const struct gl_texture_object *tObj,

+                        const struct gl_texture_image *img,

+                        const GLfloat texcoord[4],

+                        GLfloat rgba[])

+{

+   const GLint width = img->Width2;

+   const GLint height = img->Height2;

+   GLint i0, j0, i1, j1;

+   GLfloat wi, wj;

+   GLfloat t00[4], t10[4], t01[4], t11[4]; /* sampled texel colors */

+

+   (void) ctx;

+

+   ASSERT(tObj->WrapS == GL_REPEAT);

+   ASSERT(tObj->WrapT == GL_REPEAT);

+   ASSERT(img->Border == 0);

+   ASSERT(img->_BaseFormat != GL_COLOR_INDEX);

+   ASSERT(img->_IsPowerOfTwo);

+

+   linear_repeat_texel_location(width,  texcoord[0], &i0, &i1, &wi);

+   linear_repeat_texel_location(height, texcoord[1], &j0, &j1, &wj);

+

+   img->FetchTexelf(img, i0, j0, 0, t00);

+   img->FetchTexelf(img, i1, j0, 0, t10);

+   img->FetchTexelf(img, i0, j1, 0, t01);

+   img->FetchTexelf(img, i1, j1, 0, t11);

+

+   lerp_rgba_2d(rgba, wi, wj, t00, t10, t01, t11);

+}

+

+

+static void

+sample_2d_nearest_mipmap_nearest(struct gl_context *ctx,

+                                 const struct gl_texture_object *tObj,

+                                 GLuint n, const GLfloat texcoord[][4],

+                                 const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   for (i = 0; i < n; i++) {

+      GLint level = nearest_mipmap_level(tObj, lambda[i]);

+      sample_2d_nearest(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);

+   }

+}

+

+

+static void

+sample_2d_linear_mipmap_nearest(struct gl_context *ctx,

+                                const struct gl_texture_object *tObj,

+                                GLuint n, const GLfloat texcoord[][4],

+                                const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = nearest_mipmap_level(tObj, lambda[i]);

+      sample_2d_linear(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);

+   }

+}

+

+

+static void

+sample_2d_nearest_mipmap_linear(struct gl_context *ctx,

+                                const struct gl_texture_object *tObj,

+                                GLuint n, const GLfloat texcoord[][4],

+                                const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      if (level >= tObj->_MaxLevel) {

+         sample_2d_nearest(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],

+                           texcoord[i], rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];  /* texels */

+         const GLfloat f = FRAC(lambda[i]);

+         sample_2d_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);

+         sample_2d_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+static void

+sample_2d_linear_mipmap_linear( struct gl_context *ctx,

+                                const struct gl_texture_object *tObj,

+                                GLuint n, const GLfloat texcoord[][4],

+                                const GLfloat lambda[], GLfloat rgba[][4] )

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      if (level >= tObj->_MaxLevel) {

+         sample_2d_linear(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],

+                          texcoord[i], rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];  /* texels */

+         const GLfloat f = FRAC(lambda[i]);

+         sample_2d_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);

+         sample_2d_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+static void

+sample_2d_linear_mipmap_linear_repeat(struct gl_context *ctx,

+                                      const struct gl_texture_object *tObj,

+                                      GLuint n, const GLfloat texcoord[][4],

+                                      const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   ASSERT(tObj->WrapS == GL_REPEAT);

+   ASSERT(tObj->WrapT == GL_REPEAT);

+   for (i = 0; i < n; i++) {

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      if (level >= tObj->_MaxLevel) {

+         sample_2d_linear_repeat(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],

+                                 texcoord[i], rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];  /* texels */

+         const GLfloat f = FRAC(lambda[i]);

+         sample_2d_linear_repeat(ctx, tObj, tObj->Image[0][level  ],

+                                 texcoord[i], t0);

+         sample_2d_linear_repeat(ctx, tObj, tObj->Image[0][level+1],

+                                 texcoord[i], t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+/** Sample 2D texture, nearest filtering for both min/magnification */

+static void

+sample_nearest_2d(struct gl_context *ctx,

+                  const struct gl_texture_object *tObj, GLuint n,

+                  const GLfloat texcoords[][4],

+                  const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      sample_2d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);

+   }

+}

+

+

+/** Sample 2D texture, linear filtering for both min/magnification */

+static void

+sample_linear_2d(struct gl_context *ctx,

+                 const struct gl_texture_object *tObj, GLuint n,

+                 const GLfloat texcoords[][4],

+                 const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];

+   (void) lambda;

+   if (tObj->WrapS == GL_REPEAT &&

+       tObj->WrapT == GL_REPEAT &&

+       image->_IsPowerOfTwo &&

+       image->Border == 0) {

+      for (i = 0; i < n; i++) {

+         sample_2d_linear_repeat(ctx, tObj, image, texcoords[i], rgba[i]);

+      }

+   }

+   else {

+      for (i = 0; i < n; i++) {

+         sample_2d_linear(ctx, tObj, image, texcoords[i], rgba[i]);

+      }

+   }

+}

+

+

+/**

+ * Optimized 2-D texture sampling:

+ *    S and T wrap mode == GL_REPEAT

+ *    GL_NEAREST min/mag filter

+ *    No border, 

+ *    RowStride == Width,

+ *    Format = GL_RGB

+ */

+static void

+opt_sample_rgb_2d(struct gl_context *ctx,

+                  const struct gl_texture_object *tObj,

+                  GLuint n, const GLfloat texcoords[][4],

+                  const GLfloat lambda[], GLfloat rgba[][4])

+{

+   const struct gl_texture_image *img = tObj->Image[0][tObj->BaseLevel];

+   const GLfloat width = (GLfloat) img->Width;

+   const GLfloat height = (GLfloat) img->Height;

+   const GLint colMask = img->Width - 1;

+   const GLint rowMask = img->Height - 1;

+   const GLint shift = img->WidthLog2;

+   GLuint k;

+   (void) ctx;

+   (void) lambda;

+   ASSERT(tObj->WrapS==GL_REPEAT);

+   ASSERT(tObj->WrapT==GL_REPEAT);

+   ASSERT(img->Border==0);

+   ASSERT(img->TexFormat == MESA_FORMAT_RGB888);

+   ASSERT(img->_IsPowerOfTwo);

+

+   for (k=0; k<n; k++) {

+      GLint i = IFLOOR(texcoords[k][0] * width) & colMask;

+      GLint j = IFLOOR(texcoords[k][1] * height) & rowMask;

+      GLint pos = (j << shift) | i;

+      GLubyte *texel = ((GLubyte *) img->Data) + 3*pos;

+      rgba[k][RCOMP] = UBYTE_TO_FLOAT(texel[2]);

+      rgba[k][GCOMP] = UBYTE_TO_FLOAT(texel[1]);

+      rgba[k][BCOMP] = UBYTE_TO_FLOAT(texel[0]);

+      rgba[k][ACOMP] = 1.0F;

+   }

+}

+

+

+/**

+ * Optimized 2-D texture sampling:

+ *    S and T wrap mode == GL_REPEAT

+ *    GL_NEAREST min/mag filter

+ *    No border

+ *    RowStride == Width,

+ *    Format = GL_RGBA

+ */

+static void

+opt_sample_rgba_2d(struct gl_context *ctx,

+                   const struct gl_texture_object *tObj,

+                   GLuint n, const GLfloat texcoords[][4],

+                   const GLfloat lambda[], GLfloat rgba[][4])

+{

+   const struct gl_texture_image *img = tObj->Image[0][tObj->BaseLevel];

+   const GLfloat width = (GLfloat) img->Width;

+   const GLfloat height = (GLfloat) img->Height;

+   const GLint colMask = img->Width - 1;

+   const GLint rowMask = img->Height - 1;

+   const GLint shift = img->WidthLog2;

+   GLuint i;

+   (void) ctx;

+   (void) lambda;

+   ASSERT(tObj->WrapS==GL_REPEAT);

+   ASSERT(tObj->WrapT==GL_REPEAT);

+   ASSERT(img->Border==0);

+   ASSERT(img->TexFormat == MESA_FORMAT_RGBA8888);

+   ASSERT(img->_IsPowerOfTwo);

+

+   for (i = 0; i < n; i++) {

+      const GLint col = IFLOOR(texcoords[i][0] * width) & colMask;

+      const GLint row = IFLOOR(texcoords[i][1] * height) & rowMask;

+      const GLint pos = (row << shift) | col;

+      const GLuint texel = *((GLuint *) img->Data + pos);

+      rgba[i][RCOMP] = UBYTE_TO_FLOAT( (texel >> 24)        );

+      rgba[i][GCOMP] = UBYTE_TO_FLOAT( (texel >> 16) & 0xff );

+      rgba[i][BCOMP] = UBYTE_TO_FLOAT( (texel >>  8) & 0xff );

+      rgba[i][ACOMP] = UBYTE_TO_FLOAT( (texel      ) & 0xff );

+   }

+}

+

+

+/** Sample 2D texture, using lambda to choose between min/magnification */

+static void

+sample_lambda_2d(struct gl_context *ctx,

+                 const struct gl_texture_object *tObj,

+                 GLuint n, const GLfloat texcoords[][4],

+                 const GLfloat lambda[], GLfloat rgba[][4])

+{

+   const struct gl_texture_image *tImg = tObj->Image[0][tObj->BaseLevel];

+   GLuint minStart, minEnd;  /* texels with minification */

+   GLuint magStart, magEnd;  /* texels with magnification */

+

+   const GLboolean repeatNoBorderPOT = (tObj->WrapS == GL_REPEAT)

+      && (tObj->WrapT == GL_REPEAT)

+      && (tImg->Border == 0 && (tImg->Width == tImg->RowStride))

+      && (tImg->_BaseFormat != GL_COLOR_INDEX)

+      && tImg->_IsPowerOfTwo;

+

+   ASSERT(lambda != NULL);

+   compute_min_mag_ranges(tObj, n, lambda,

+                          &minStart, &minEnd, &magStart, &magEnd);

+

+   if (minStart < minEnd) {

+      /* do the minified texels */

+      const GLuint m = minEnd - minStart;

+      switch (tObj->MinFilter) {

+      case GL_NEAREST:

+         if (repeatNoBorderPOT) {

+            switch (tImg->TexFormat) {

+            case MESA_FORMAT_RGB888:

+               opt_sample_rgb_2d(ctx, tObj, m, texcoords + minStart,

+                                 NULL, rgba + minStart);

+               break;

+            case MESA_FORMAT_RGBA8888:

+	       opt_sample_rgba_2d(ctx, tObj, m, texcoords + minStart,

+                                  NULL, rgba + minStart);

+               break;

+            default:

+               sample_nearest_2d(ctx, tObj, m, texcoords + minStart,

+                                 NULL, rgba + minStart );

+            }

+         }

+         else {

+            sample_nearest_2d(ctx, tObj, m, texcoords + minStart,

+                              NULL, rgba + minStart);

+         }

+         break;

+      case GL_LINEAR:

+	 sample_linear_2d(ctx, tObj, m, texcoords + minStart,

+			  NULL, rgba + minStart);

+         break;

+      case GL_NEAREST_MIPMAP_NEAREST:

+         sample_2d_nearest_mipmap_nearest(ctx, tObj, m,

+                                          texcoords + minStart,

+                                          lambda + minStart, rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_NEAREST:

+         sample_2d_linear_mipmap_nearest(ctx, tObj, m, texcoords + minStart,

+                                         lambda + minStart, rgba + minStart);

+         break;

+      case GL_NEAREST_MIPMAP_LINEAR:

+         sample_2d_nearest_mipmap_linear(ctx, tObj, m, texcoords + minStart,

+                                         lambda + minStart, rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_LINEAR:

+         if (repeatNoBorderPOT)

+            sample_2d_linear_mipmap_linear_repeat(ctx, tObj, m,

+                  texcoords + minStart, lambda + minStart, rgba + minStart);

+         else

+            sample_2d_linear_mipmap_linear(ctx, tObj, m, texcoords + minStart,

+                                        lambda + minStart, rgba + minStart);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad min filter in sample_2d_texture");

+         return;

+      }

+   }

+

+   if (magStart < magEnd) {

+      /* do the magnified texels */

+      const GLuint m = magEnd - magStart;

+

+      switch (tObj->MagFilter) {

+      case GL_NEAREST:

+         if (repeatNoBorderPOT) {

+            switch (tImg->TexFormat) {

+            case MESA_FORMAT_RGB888:

+               opt_sample_rgb_2d(ctx, tObj, m, texcoords + magStart,

+                                 NULL, rgba + magStart);

+               break;

+            case MESA_FORMAT_RGBA8888:

+	       opt_sample_rgba_2d(ctx, tObj, m, texcoords + magStart,

+                                  NULL, rgba + magStart);

+               break;

+            default:

+               sample_nearest_2d(ctx, tObj, m, texcoords + magStart,

+                                 NULL, rgba + magStart );

+            }

+         }

+         else {

+            sample_nearest_2d(ctx, tObj, m, texcoords + magStart,

+                              NULL, rgba + magStart);

+         }

+         break;

+      case GL_LINEAR:

+	 sample_linear_2d(ctx, tObj, m, texcoords + magStart,

+			  NULL, rgba + magStart);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad mag filter in sample_lambda_2d");

+      }

+   }

+}

+

+

+

+/**********************************************************************/

+/*                    3-D Texture Sampling Functions                  */

+/**********************************************************************/

+

+/**

+ * Return the texture sample for coordinate (s,t,r) using GL_NEAREST filter.

+ */

+static INLINE void

+sample_3d_nearest(struct gl_context *ctx,

+                  const struct gl_texture_object *tObj,

+                  const struct gl_texture_image *img,

+                  const GLfloat texcoord[4],

+                  GLfloat rgba[4])

+{

+   const GLint width = img->Width2;     /* without border, power of two */

+   const GLint height = img->Height2;   /* without border, power of two */

+   const GLint depth = img->Depth2;     /* without border, power of two */

+   GLint i, j, k;

+   (void) ctx;

+

+   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);

+   j = nearest_texel_location(tObj->WrapT, img, height, texcoord[1]);

+   k = nearest_texel_location(tObj->WrapR, img, depth, texcoord[2]);

+

+   if (i < 0 || i >= (GLint) img->Width ||

+       j < 0 || j >= (GLint) img->Height ||

+       k < 0 || k >= (GLint) img->Depth) {

+      /* Need this test for GL_CLAMP_TO_BORDER mode */

+      get_border_color(tObj, img, rgba);

+   }

+   else {

+      img->FetchTexelf(img, i, j, k, rgba);

+   }

+}

+

+

+/**

+ * Return the texture sample for coordinate (s,t,r) using GL_LINEAR filter.

+ */

+static void

+sample_3d_linear(struct gl_context *ctx,

+                 const struct gl_texture_object *tObj,

+                 const struct gl_texture_image *img,

+                 const GLfloat texcoord[4],

+                 GLfloat rgba[4])

+{

+   const GLint width = img->Width2;

+   const GLint height = img->Height2;

+   const GLint depth = img->Depth2;

+   GLint i0, j0, k0, i1, j1, k1;

+   GLbitfield useBorderColor = 0x0;

+   GLfloat a, b, c;

+   GLfloat t000[4], t010[4], t001[4], t011[4];

+   GLfloat t100[4], t110[4], t101[4], t111[4];

+

+   linear_texel_locations(tObj->WrapS, img, width, texcoord[0],  &i0, &i1, &a);

+   linear_texel_locations(tObj->WrapT, img, height, texcoord[1], &j0, &j1, &b);

+   linear_texel_locations(tObj->WrapR, img, depth, texcoord[2],  &k0, &k1, &c);

+

+   if (img->Border) {

+      i0 += img->Border;

+      i1 += img->Border;

+      j0 += img->Border;

+      j1 += img->Border;

+      k0 += img->Border;

+      k1 += img->Border;

+   }

+   else {

+      /* check if sampling texture border color */

+      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;

+      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;

+      if (j0 < 0 || j0 >= height)  useBorderColor |= J0BIT;

+      if (j1 < 0 || j1 >= height)  useBorderColor |= J1BIT;

+      if (k0 < 0 || k0 >= depth)   useBorderColor |= K0BIT;

+      if (k1 < 0 || k1 >= depth)   useBorderColor |= K1BIT;

+   }

+

+   /* Fetch texels */

+   if (useBorderColor & (I0BIT | J0BIT | K0BIT)) {

+      get_border_color(tObj, img, t000);

+   }

+   else {

+      img->FetchTexelf(img, i0, j0, k0, t000);

+   }

+   if (useBorderColor & (I1BIT | J0BIT | K0BIT)) {

+      get_border_color(tObj, img, t100);

+   }

+   else {

+      img->FetchTexelf(img, i1, j0, k0, t100);

+   }

+   if (useBorderColor & (I0BIT | J1BIT | K0BIT)) {

+      get_border_color(tObj, img, t010);

+   }

+   else {

+      img->FetchTexelf(img, i0, j1, k0, t010);

+   }

+   if (useBorderColor & (I1BIT | J1BIT | K0BIT)) {

+      get_border_color(tObj, img, t110);

+   }

+   else {

+      img->FetchTexelf(img, i1, j1, k0, t110);

+   }

+

+   if (useBorderColor & (I0BIT | J0BIT | K1BIT)) {

+      get_border_color(tObj, img, t001);

+   }

+   else {

+      img->FetchTexelf(img, i0, j0, k1, t001);

+   }

+   if (useBorderColor & (I1BIT | J0BIT | K1BIT)) {

+      get_border_color(tObj, img, t101);

+   }

+   else {

+      img->FetchTexelf(img, i1, j0, k1, t101);

+   }

+   if (useBorderColor & (I0BIT | J1BIT | K1BIT)) {

+      get_border_color(tObj, img, t011);

+   }

+   else {

+      img->FetchTexelf(img, i0, j1, k1, t011);

+   }

+   if (useBorderColor & (I1BIT | J1BIT | K1BIT)) {

+      get_border_color(tObj, img, t111);

+   }

+   else {

+      img->FetchTexelf(img, i1, j1, k1, t111);

+   }

+

+   /* trilinear interpolation of samples */

+   lerp_rgba_3d(rgba, a, b, c, t000, t100, t010, t110, t001, t101, t011, t111);

+}

+

+

+static void

+sample_3d_nearest_mipmap_nearest(struct gl_context *ctx,

+                                 const struct gl_texture_object *tObj,

+                                 GLuint n, const GLfloat texcoord[][4],

+                                 const GLfloat lambda[], GLfloat rgba[][4] )

+{

+   GLuint i;

+   for (i = 0; i < n; i++) {

+      GLint level = nearest_mipmap_level(tObj, lambda[i]);

+      sample_3d_nearest(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);

+   }

+}

+

+

+static void

+sample_3d_linear_mipmap_nearest(struct gl_context *ctx,

+                                const struct gl_texture_object *tObj,

+                                GLuint n, const GLfloat texcoord[][4],

+                                const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = nearest_mipmap_level(tObj, lambda[i]);

+      sample_3d_linear(ctx, tObj, tObj->Image[0][level], texcoord[i], rgba[i]);

+   }

+}

+

+

+static void

+sample_3d_nearest_mipmap_linear(struct gl_context *ctx,

+                                const struct gl_texture_object *tObj,

+                                GLuint n, const GLfloat texcoord[][4],

+                                const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      if (level >= tObj->_MaxLevel) {

+         sample_3d_nearest(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],

+                           texcoord[i], rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];  /* texels */

+         const GLfloat f = FRAC(lambda[i]);

+         sample_3d_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);

+         sample_3d_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+static void

+sample_3d_linear_mipmap_linear(struct gl_context *ctx,

+                               const struct gl_texture_object *tObj,

+                               GLuint n, const GLfloat texcoord[][4],

+                               const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      if (level >= tObj->_MaxLevel) {

+         sample_3d_linear(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],

+                          texcoord[i], rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];  /* texels */

+         const GLfloat f = FRAC(lambda[i]);

+         sample_3d_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);

+         sample_3d_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+/** Sample 3D texture, nearest filtering for both min/magnification */

+static void

+sample_nearest_3d(struct gl_context *ctx,

+                  const struct gl_texture_object *tObj, GLuint n,

+                  const GLfloat texcoords[][4], const GLfloat lambda[],

+                  GLfloat rgba[][4])

+{

+   GLuint i;

+   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      sample_3d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);

+   }

+}

+

+

+/** Sample 3D texture, linear filtering for both min/magnification */

+static void

+sample_linear_3d(struct gl_context *ctx,

+                 const struct gl_texture_object *tObj, GLuint n,

+                 const GLfloat texcoords[][4],

+		 const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      sample_3d_linear(ctx, tObj, image, texcoords[i], rgba[i]);

+   }

+}

+

+

+/** Sample 3D texture, using lambda to choose between min/magnification */

+static void

+sample_lambda_3d(struct gl_context *ctx,

+                 const struct gl_texture_object *tObj, GLuint n,

+                 const GLfloat texcoords[][4], const GLfloat lambda[],

+                 GLfloat rgba[][4])

+{

+   GLuint minStart, minEnd;  /* texels with minification */

+   GLuint magStart, magEnd;  /* texels with magnification */

+   GLuint i;

+

+   ASSERT(lambda != NULL);

+   compute_min_mag_ranges(tObj, n, lambda,

+                          &minStart, &minEnd, &magStart, &magEnd);

+

+   if (minStart < minEnd) {

+      /* do the minified texels */

+      GLuint m = minEnd - minStart;

+      switch (tObj->MinFilter) {

+      case GL_NEAREST:

+         for (i = minStart; i < minEnd; i++)

+            sample_3d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                              texcoords[i], rgba[i]);

+         break;

+      case GL_LINEAR:

+         for (i = minStart; i < minEnd; i++)

+            sample_3d_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                             texcoords[i], rgba[i]);

+         break;

+      case GL_NEAREST_MIPMAP_NEAREST:

+         sample_3d_nearest_mipmap_nearest(ctx, tObj, m, texcoords + minStart,

+                                          lambda + minStart, rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_NEAREST:

+         sample_3d_linear_mipmap_nearest(ctx, tObj, m, texcoords + minStart,

+                                         lambda + minStart, rgba + minStart);

+         break;

+      case GL_NEAREST_MIPMAP_LINEAR:

+         sample_3d_nearest_mipmap_linear(ctx, tObj, m, texcoords + minStart,

+                                         lambda + minStart, rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_LINEAR:

+         sample_3d_linear_mipmap_linear(ctx, tObj, m, texcoords + minStart,

+                                        lambda + minStart, rgba + minStart);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad min filter in sample_3d_texture");

+         return;

+      }

+   }

+

+   if (magStart < magEnd) {

+      /* do the magnified texels */

+      switch (tObj->MagFilter) {

+      case GL_NEAREST:

+         for (i = magStart; i < magEnd; i++)

+            sample_3d_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                              texcoords[i], rgba[i]);

+         break;

+      case GL_LINEAR:

+         for (i = magStart; i < magEnd; i++)

+            sample_3d_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                             texcoords[i], rgba[i]);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad mag filter in sample_3d_texture");

+         return;

+      }

+   }

+}

+

+

+/**********************************************************************/

+/*                Texture Cube Map Sampling Functions                 */

+/**********************************************************************/

+

+/**

+ * Choose one of six sides of a texture cube map given the texture

+ * coord (rx,ry,rz).  Return pointer to corresponding array of texture

+ * images.

+ */

+static const struct gl_texture_image **

+choose_cube_face(const struct gl_texture_object *texObj,

+                 const GLfloat texcoord[4], GLfloat newCoord[4])

+{

+   /*

+      major axis

+      direction     target                             sc     tc    ma

+      ----------    -------------------------------    ---    ---   ---

+       +rx          TEXTURE_CUBE_MAP_POSITIVE_X_EXT    -rz    -ry   rx

+       -rx          TEXTURE_CUBE_MAP_NEGATIVE_X_EXT    +rz    -ry   rx

+       +ry          TEXTURE_CUBE_MAP_POSITIVE_Y_EXT    +rx    +rz   ry

+       -ry          TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT    +rx    -rz   ry

+       +rz          TEXTURE_CUBE_MAP_POSITIVE_Z_EXT    +rx    -ry   rz

+       -rz          TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT    -rx    -ry   rz

+   */

+   const GLfloat rx = texcoord[0];

+   const GLfloat ry = texcoord[1];

+   const GLfloat rz = texcoord[2];

+   const GLfloat arx = FABSF(rx), ary = FABSF(ry), arz = FABSF(rz);

+   GLuint face;

+   GLfloat sc, tc, ma;

+

+   if (arx >= ary && arx >= arz) {

+      if (rx >= 0.0F) {

+         face = FACE_POS_X;

+         sc = -rz;

+         tc = -ry;

+         ma = arx;

+      }

+      else {

+         face = FACE_NEG_X;

+         sc = rz;

+         tc = -ry;

+         ma = arx;

+      }

+   }

+   else if (ary >= arx && ary >= arz) {

+      if (ry >= 0.0F) {

+         face = FACE_POS_Y;

+         sc = rx;

+         tc = rz;

+         ma = ary;

+      }

+      else {

+         face = FACE_NEG_Y;

+         sc = rx;

+         tc = -rz;

+         ma = ary;

+      }

+   }

+   else {

+      if (rz > 0.0F) {

+         face = FACE_POS_Z;

+         sc = rx;

+         tc = -ry;

+         ma = arz;

+      }

+      else {

+         face = FACE_NEG_Z;

+         sc = -rx;

+         tc = -ry;

+         ma = arz;

+      }

+   }

+

+   { 

+      const float ima = 1.0F / ma;

+      newCoord[0] = ( sc * ima + 1.0F ) * 0.5F;

+      newCoord[1] = ( tc * ima + 1.0F ) * 0.5F;

+   }

+

+   return (const struct gl_texture_image **) texObj->Image[face];

+}

+

+

+static void

+sample_nearest_cube(struct gl_context *ctx,

+		    const struct gl_texture_object *tObj, GLuint n,

+                    const GLfloat texcoords[][4], const GLfloat lambda[],

+                    GLfloat rgba[][4])

+{

+   GLuint i;

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      const struct gl_texture_image **images;

+      GLfloat newCoord[4];

+      images = choose_cube_face(tObj, texcoords[i], newCoord);

+      sample_2d_nearest(ctx, tObj, images[tObj->BaseLevel],

+                        newCoord, rgba[i]);

+   }

+}

+

+

+static void

+sample_linear_cube(struct gl_context *ctx,

+		   const struct gl_texture_object *tObj, GLuint n,

+                   const GLfloat texcoords[][4],

+		   const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      const struct gl_texture_image **images;

+      GLfloat newCoord[4];

+      images = choose_cube_face(tObj, texcoords[i], newCoord);

+      sample_2d_linear(ctx, tObj, images[tObj->BaseLevel],

+                       newCoord, rgba[i]);

+   }

+}

+

+

+static void

+sample_cube_nearest_mipmap_nearest(struct gl_context *ctx,

+                                   const struct gl_texture_object *tObj,

+                                   GLuint n, const GLfloat texcoord[][4],

+                                   const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      const struct gl_texture_image **images;

+      GLfloat newCoord[4];

+      GLint level;

+      images = choose_cube_face(tObj, texcoord[i], newCoord);

+

+      /* XXX we actually need to recompute lambda here based on the newCoords.

+       * But we would need the texcoords of adjacent fragments to compute that

+       * properly, and we don't have those here.

+       * For now, do an approximation:  subtracting 1 from the chosen mipmap

+       * level seems to work in some test cases.

+       * The same adjustment is done in the next few functions.

+      */

+      level = nearest_mipmap_level(tObj, lambda[i]);

+      level = MAX2(level - 1, 0);

+

+      sample_2d_nearest(ctx, tObj, images[level], newCoord, rgba[i]);

+   }

+}

+

+

+static void

+sample_cube_linear_mipmap_nearest(struct gl_context *ctx,

+                                  const struct gl_texture_object *tObj,

+                                  GLuint n, const GLfloat texcoord[][4],

+                                  const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      const struct gl_texture_image **images;

+      GLfloat newCoord[4];

+      GLint level = nearest_mipmap_level(tObj, lambda[i]);

+      level = MAX2(level - 1, 0); /* see comment above */

+      images = choose_cube_face(tObj, texcoord[i], newCoord);

+      sample_2d_linear(ctx, tObj, images[level], newCoord, rgba[i]);

+   }

+}

+

+

+static void

+sample_cube_nearest_mipmap_linear(struct gl_context *ctx,

+                                  const struct gl_texture_object *tObj,

+                                  GLuint n, const GLfloat texcoord[][4],

+                                  const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      const struct gl_texture_image **images;

+      GLfloat newCoord[4];

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      level = MAX2(level - 1, 0); /* see comment above */

+      images = choose_cube_face(tObj, texcoord[i], newCoord);

+      if (level >= tObj->_MaxLevel) {

+         sample_2d_nearest(ctx, tObj, images[tObj->_MaxLevel],

+                           newCoord, rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];  /* texels */

+         const GLfloat f = FRAC(lambda[i]);

+         sample_2d_nearest(ctx, tObj, images[level  ], newCoord, t0);

+         sample_2d_nearest(ctx, tObj, images[level+1], newCoord, t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+static void

+sample_cube_linear_mipmap_linear(struct gl_context *ctx,

+                                 const struct gl_texture_object *tObj,

+                                 GLuint n, const GLfloat texcoord[][4],

+                                 const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      const struct gl_texture_image **images;

+      GLfloat newCoord[4];

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      level = MAX2(level - 1, 0); /* see comment above */

+      images = choose_cube_face(tObj, texcoord[i], newCoord);

+      if (level >= tObj->_MaxLevel) {

+         sample_2d_linear(ctx, tObj, images[tObj->_MaxLevel],

+                          newCoord, rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];

+         const GLfloat f = FRAC(lambda[i]);

+         sample_2d_linear(ctx, tObj, images[level  ], newCoord, t0);

+         sample_2d_linear(ctx, tObj, images[level+1], newCoord, t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+/** Sample cube texture, using lambda to choose between min/magnification */

+static void

+sample_lambda_cube(struct gl_context *ctx,

+		   const struct gl_texture_object *tObj, GLuint n,

+		   const GLfloat texcoords[][4], const GLfloat lambda[],

+		   GLfloat rgba[][4])

+{

+   GLuint minStart, minEnd;  /* texels with minification */

+   GLuint magStart, magEnd;  /* texels with magnification */

+

+   ASSERT(lambda != NULL);

+   compute_min_mag_ranges(tObj, n, lambda,

+                          &minStart, &minEnd, &magStart, &magEnd);

+

+   if (minStart < minEnd) {

+      /* do the minified texels */

+      const GLuint m = minEnd - minStart;

+      switch (tObj->MinFilter) {

+      case GL_NEAREST:

+         sample_nearest_cube(ctx, tObj, m, texcoords + minStart,

+                             lambda + minStart, rgba + minStart);

+         break;

+      case GL_LINEAR:

+         sample_linear_cube(ctx, tObj, m, texcoords + minStart,

+                            lambda + minStart, rgba + minStart);

+         break;

+      case GL_NEAREST_MIPMAP_NEAREST:

+         sample_cube_nearest_mipmap_nearest(ctx, tObj, m,

+                                            texcoords + minStart,

+                                           lambda + minStart, rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_NEAREST:

+         sample_cube_linear_mipmap_nearest(ctx, tObj, m,

+                                           texcoords + minStart,

+                                           lambda + minStart, rgba + minStart);

+         break;

+      case GL_NEAREST_MIPMAP_LINEAR:

+         sample_cube_nearest_mipmap_linear(ctx, tObj, m,

+                                           texcoords + minStart,

+                                           lambda + minStart, rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_LINEAR:

+         sample_cube_linear_mipmap_linear(ctx, tObj, m,

+                                          texcoords + minStart,

+                                          lambda + minStart, rgba + minStart);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad min filter in sample_lambda_cube");

+      }

+   }

+

+   if (magStart < magEnd) {

+      /* do the magnified texels */

+      const GLuint m = magEnd - magStart;

+      switch (tObj->MagFilter) {

+      case GL_NEAREST:

+         sample_nearest_cube(ctx, tObj, m, texcoords + magStart,

+                             lambda + magStart, rgba + magStart);

+         break;

+      case GL_LINEAR:

+         sample_linear_cube(ctx, tObj, m, texcoords + magStart,

+                            lambda + magStart, rgba + magStart);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad mag filter in sample_lambda_cube");

+      }

+   }

+}

+

+

+/**********************************************************************/

+/*               Texture Rectangle Sampling Functions                 */

+/**********************************************************************/

+

+

+static void

+sample_nearest_rect(struct gl_context *ctx,

+		    const struct gl_texture_object *tObj, GLuint n,

+                    const GLfloat texcoords[][4], const GLfloat lambda[],

+                    GLfloat rgba[][4])

+{

+   const struct gl_texture_image *img = tObj->Image[0][0];

+   const GLint width = img->Width;

+   const GLint height = img->Height;

+   GLuint i;

+

+   (void) ctx;

+   (void) lambda;

+

+   ASSERT(tObj->WrapS == GL_CLAMP ||

+          tObj->WrapS == GL_CLAMP_TO_EDGE ||

+          tObj->WrapS == GL_CLAMP_TO_BORDER);

+   ASSERT(tObj->WrapT == GL_CLAMP ||

+          tObj->WrapT == GL_CLAMP_TO_EDGE ||

+          tObj->WrapT == GL_CLAMP_TO_BORDER);

+   ASSERT(img->_BaseFormat != GL_COLOR_INDEX);

+

+   for (i = 0; i < n; i++) {

+      GLint row, col;

+      col = clamp_rect_coord_nearest(tObj->WrapS, texcoords[i][0], width);

+      row = clamp_rect_coord_nearest(tObj->WrapT, texcoords[i][1], height);

+      if (col < 0 || col >= width || row < 0 || row >= height)

+         get_border_color(tObj, img, rgba[i]);

+      else

+         img->FetchTexelf(img, col, row, 0, rgba[i]);

+   }

+}

+

+

+static void

+sample_linear_rect(struct gl_context *ctx,

+		   const struct gl_texture_object *tObj, GLuint n,

+                   const GLfloat texcoords[][4],

+		   const GLfloat lambda[], GLfloat rgba[][4])

+{

+   const struct gl_texture_image *img = tObj->Image[0][0];

+   const GLint width = img->Width;

+   const GLint height = img->Height;

+   GLuint i;

+

+   (void) ctx;

+   (void) lambda;

+

+   ASSERT(tObj->WrapS == GL_CLAMP ||

+          tObj->WrapS == GL_CLAMP_TO_EDGE ||

+          tObj->WrapS == GL_CLAMP_TO_BORDER);

+   ASSERT(tObj->WrapT == GL_CLAMP ||

+          tObj->WrapT == GL_CLAMP_TO_EDGE ||

+          tObj->WrapT == GL_CLAMP_TO_BORDER);

+   ASSERT(img->_BaseFormat != GL_COLOR_INDEX);

+

+   for (i = 0; i < n; i++) {

+      GLint i0, j0, i1, j1;

+      GLfloat t00[4], t01[4], t10[4], t11[4];

+      GLfloat a, b;

+      GLbitfield useBorderColor = 0x0;

+

+      clamp_rect_coord_linear(tObj->WrapS, texcoords[i][0], width,

+                              &i0, &i1, &a);

+      clamp_rect_coord_linear(tObj->WrapT, texcoords[i][1], height,

+                              &j0, &j1, &b);

+

+      /* compute integer rows/columns */

+      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;

+      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;

+      if (j0 < 0 || j0 >= height)  useBorderColor |= J0BIT;

+      if (j1 < 0 || j1 >= height)  useBorderColor |= J1BIT;

+

+      /* get four texel samples */

+      if (useBorderColor & (I0BIT | J0BIT))

+         get_border_color(tObj, img, t00);

+      else

+         img->FetchTexelf(img, i0, j0, 0, t00);

+

+      if (useBorderColor & (I1BIT | J0BIT))

+         get_border_color(tObj, img, t10);

+      else

+         img->FetchTexelf(img, i1, j0, 0, t10);

+

+      if (useBorderColor & (I0BIT | J1BIT))

+         get_border_color(tObj, img, t01);

+      else

+         img->FetchTexelf(img, i0, j1, 0, t01);

+

+      if (useBorderColor & (I1BIT | J1BIT))

+         get_border_color(tObj, img, t11);

+      else

+         img->FetchTexelf(img, i1, j1, 0, t11);

+

+      lerp_rgba_2d(rgba[i], a, b, t00, t10, t01, t11);

+   }

+}

+

+

+/** Sample Rect texture, using lambda to choose between min/magnification */

+static void

+sample_lambda_rect(struct gl_context *ctx,

+		   const struct gl_texture_object *tObj, GLuint n,

+		   const GLfloat texcoords[][4], const GLfloat lambda[],

+		   GLfloat rgba[][4])

+{

+   GLuint minStart, minEnd, magStart, magEnd;

+

+   /* We only need lambda to decide between minification and magnification.

+    * There is no mipmapping with rectangular textures.

+    */

+   compute_min_mag_ranges(tObj, n, lambda,

+                          &minStart, &minEnd, &magStart, &magEnd);

+

+   if (minStart < minEnd) {

+      if (tObj->MinFilter == GL_NEAREST) {

+         sample_nearest_rect(ctx, tObj, minEnd - minStart,

+                             texcoords + minStart, NULL, rgba + minStart);

+      }

+      else {

+         sample_linear_rect(ctx, tObj, minEnd - minStart,

+                            texcoords + minStart, NULL, rgba + minStart);

+      }

+   }

+   if (magStart < magEnd) {

+      if (tObj->MagFilter == GL_NEAREST) {

+         sample_nearest_rect(ctx, tObj, magEnd - magStart,

+                             texcoords + magStart, NULL, rgba + magStart);

+      }

+      else {

+         sample_linear_rect(ctx, tObj, magEnd - magStart,

+                            texcoords + magStart, NULL, rgba + magStart);

+      }

+   }

+}

+

+

+/**********************************************************************/

+/*                2D Texture Array Sampling Functions                 */

+/**********************************************************************/

+

+/**

+ * Return the texture sample for coordinate (s,t,r) using GL_NEAREST filter.

+ */

+static void

+sample_2d_array_nearest(struct gl_context *ctx,

+                        const struct gl_texture_object *tObj,

+                        const struct gl_texture_image *img,

+                        const GLfloat texcoord[4],

+                        GLfloat rgba[4])

+{

+   const GLint width = img->Width2;     /* without border, power of two */

+   const GLint height = img->Height2;   /* without border, power of two */

+   const GLint depth = img->Depth;

+   GLint i, j;

+   GLint array;

+   (void) ctx;

+

+   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);

+   j = nearest_texel_location(tObj->WrapT, img, height, texcoord[1]);

+   array = tex_array_slice(texcoord[2], depth);

+

+   if (i < 0 || i >= (GLint) img->Width ||

+       j < 0 || j >= (GLint) img->Height ||

+       array < 0 || array >= (GLint) img->Depth) {

+      /* Need this test for GL_CLAMP_TO_BORDER mode */

+      get_border_color(tObj, img, rgba);

+   }

+   else {

+      img->FetchTexelf(img, i, j, array, rgba);

+   }

+}

+

+

+/**

+ * Return the texture sample for coordinate (s,t,r) using GL_LINEAR filter.

+ */

+static void

+sample_2d_array_linear(struct gl_context *ctx,

+                       const struct gl_texture_object *tObj,

+                       const struct gl_texture_image *img,

+                       const GLfloat texcoord[4],

+                       GLfloat rgba[4])

+{

+   const GLint width = img->Width2;

+   const GLint height = img->Height2;

+   const GLint depth = img->Depth;

+   GLint i0, j0, i1, j1;

+   GLint array;

+   GLbitfield useBorderColor = 0x0;

+   GLfloat a, b;

+   GLfloat t00[4], t01[4], t10[4], t11[4];

+

+   linear_texel_locations(tObj->WrapS, img, width,  texcoord[0], &i0, &i1, &a);

+   linear_texel_locations(tObj->WrapT, img, height, texcoord[1], &j0, &j1, &b);

+   array = tex_array_slice(texcoord[2], depth);

+

+   if (array < 0 || array >= depth) {

+      COPY_4V(rgba, tObj->BorderColor.f);

+   }

+   else {

+      if (img->Border) {

+	 i0 += img->Border;

+	 i1 += img->Border;

+	 j0 += img->Border;

+	 j1 += img->Border;

+      }

+      else {

+	 /* check if sampling texture border color */

+	 if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;

+	 if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;

+	 if (j0 < 0 || j0 >= height)  useBorderColor |= J0BIT;

+	 if (j1 < 0 || j1 >= height)  useBorderColor |= J1BIT;

+      }

+

+      /* Fetch texels */

+      if (useBorderColor & (I0BIT | J0BIT)) {

+         get_border_color(tObj, img, t00);

+      }

+      else {

+	 img->FetchTexelf(img, i0, j0, array, t00);

+      }

+      if (useBorderColor & (I1BIT | J0BIT)) {

+         get_border_color(tObj, img, t10);

+      }

+      else {

+	 img->FetchTexelf(img, i1, j0, array, t10);

+      }

+      if (useBorderColor & (I0BIT | J1BIT)) {

+         get_border_color(tObj, img, t01);

+      }

+      else {

+	 img->FetchTexelf(img, i0, j1, array, t01);

+      }

+      if (useBorderColor & (I1BIT | J1BIT)) {

+         get_border_color(tObj, img, t11);

+      }

+      else {

+	 img->FetchTexelf(img, i1, j1, array, t11);

+      }

+      

+      /* trilinear interpolation of samples */

+      lerp_rgba_2d(rgba, a, b, t00, t10, t01, t11);

+   }

+}

+

+

+static void

+sample_2d_array_nearest_mipmap_nearest(struct gl_context *ctx,

+                                       const struct gl_texture_object *tObj,

+                                       GLuint n, const GLfloat texcoord[][4],

+                                       const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   for (i = 0; i < n; i++) {

+      GLint level = nearest_mipmap_level(tObj, lambda[i]);

+      sample_2d_array_nearest(ctx, tObj, tObj->Image[0][level], texcoord[i],

+                              rgba[i]);

+   }

+}

+

+

+static void

+sample_2d_array_linear_mipmap_nearest(struct gl_context *ctx,

+                                      const struct gl_texture_object *tObj,

+                                      GLuint n, const GLfloat texcoord[][4],

+                                      const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = nearest_mipmap_level(tObj, lambda[i]);

+      sample_2d_array_linear(ctx, tObj, tObj->Image[0][level],

+                             texcoord[i], rgba[i]);

+   }

+}

+

+

+static void

+sample_2d_array_nearest_mipmap_linear(struct gl_context *ctx,

+                                      const struct gl_texture_object *tObj,

+                                      GLuint n, const GLfloat texcoord[][4],

+                                      const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      if (level >= tObj->_MaxLevel) {

+         sample_2d_array_nearest(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],

+                                 texcoord[i], rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];  /* texels */

+         const GLfloat f = FRAC(lambda[i]);

+         sample_2d_array_nearest(ctx, tObj, tObj->Image[0][level  ],

+                                 texcoord[i], t0);

+         sample_2d_array_nearest(ctx, tObj, tObj->Image[0][level+1],

+                                 texcoord[i], t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+static void

+sample_2d_array_linear_mipmap_linear(struct gl_context *ctx,

+                                     const struct gl_texture_object *tObj,

+                                     GLuint n, const GLfloat texcoord[][4],

+                                     const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      if (level >= tObj->_MaxLevel) {

+         sample_2d_array_linear(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],

+                          texcoord[i], rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];  /* texels */

+         const GLfloat f = FRAC(lambda[i]);

+         sample_2d_array_linear(ctx, tObj, tObj->Image[0][level  ],

+                                texcoord[i], t0);

+         sample_2d_array_linear(ctx, tObj, tObj->Image[0][level+1],

+                                texcoord[i], t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+/** Sample 2D Array texture, nearest filtering for both min/magnification */

+static void

+sample_nearest_2d_array(struct gl_context *ctx,

+                        const struct gl_texture_object *tObj, GLuint n,

+                        const GLfloat texcoords[][4], const GLfloat lambda[],

+                        GLfloat rgba[][4])

+{

+   GLuint i;

+   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      sample_2d_array_nearest(ctx, tObj, image, texcoords[i], rgba[i]);

+   }

+}

+

+

+

+/** Sample 2D Array texture, linear filtering for both min/magnification */

+static void

+sample_linear_2d_array(struct gl_context *ctx,

+                       const struct gl_texture_object *tObj, GLuint n,

+                       const GLfloat texcoords[][4],

+                       const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      sample_2d_array_linear(ctx, tObj, image, texcoords[i], rgba[i]);

+   }

+}

+

+

+/** Sample 2D Array texture, using lambda to choose between min/magnification */

+static void

+sample_lambda_2d_array(struct gl_context *ctx,

+                       const struct gl_texture_object *tObj, GLuint n,

+                       const GLfloat texcoords[][4], const GLfloat lambda[],

+                       GLfloat rgba[][4])

+{

+   GLuint minStart, minEnd;  /* texels with minification */

+   GLuint magStart, magEnd;  /* texels with magnification */

+   GLuint i;

+

+   ASSERT(lambda != NULL);

+   compute_min_mag_ranges(tObj, n, lambda,

+                          &minStart, &minEnd, &magStart, &magEnd);

+

+   if (minStart < minEnd) {

+      /* do the minified texels */

+      GLuint m = minEnd - minStart;

+      switch (tObj->MinFilter) {

+      case GL_NEAREST:

+         for (i = minStart; i < minEnd; i++)

+            sample_2d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                                    texcoords[i], rgba[i]);

+         break;

+      case GL_LINEAR:

+         for (i = minStart; i < minEnd; i++)

+            sample_2d_array_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                                   texcoords[i], rgba[i]);

+         break;

+      case GL_NEAREST_MIPMAP_NEAREST:

+         sample_2d_array_nearest_mipmap_nearest(ctx, tObj, m,

+                                                texcoords + minStart,

+                                                lambda + minStart,

+                                                rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_NEAREST:

+         sample_2d_array_linear_mipmap_nearest(ctx, tObj, m, 

+                                               texcoords + minStart,

+                                               lambda + minStart,

+                                               rgba + minStart);

+         break;

+      case GL_NEAREST_MIPMAP_LINEAR:

+         sample_2d_array_nearest_mipmap_linear(ctx, tObj, m,

+                                               texcoords + minStart,

+                                               lambda + minStart,

+                                               rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_LINEAR:

+         sample_2d_array_linear_mipmap_linear(ctx, tObj, m, 

+                                              texcoords + minStart,

+                                              lambda + minStart, 

+                                              rgba + minStart);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad min filter in sample_2d_array_texture");

+         return;

+      }

+   }

+

+   if (magStart < magEnd) {

+      /* do the magnified texels */

+      switch (tObj->MagFilter) {

+      case GL_NEAREST:

+         for (i = magStart; i < magEnd; i++)

+            sample_2d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                              texcoords[i], rgba[i]);

+         break;

+      case GL_LINEAR:

+         for (i = magStart; i < magEnd; i++)

+            sample_2d_array_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                                   texcoords[i], rgba[i]);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad mag filter in sample_2d_array_texture");

+         return;

+      }

+   }

+}

+

+

+

+

+/**********************************************************************/

+/*                1D Texture Array Sampling Functions                 */

+/**********************************************************************/

+

+/**

+ * Return the texture sample for coordinate (s,t,r) using GL_NEAREST filter.

+ */

+static void

+sample_1d_array_nearest(struct gl_context *ctx,

+                        const struct gl_texture_object *tObj,

+                        const struct gl_texture_image *img,

+                        const GLfloat texcoord[4],

+                        GLfloat rgba[4])

+{

+   const GLint width = img->Width2;     /* without border, power of two */

+   const GLint height = img->Height;

+   GLint i;

+   GLint array;

+   (void) ctx;

+

+   i = nearest_texel_location(tObj->WrapS, img, width, texcoord[0]);

+   array = tex_array_slice(texcoord[1], height);

+

+   if (i < 0 || i >= (GLint) img->Width ||

+       array < 0 || array >= (GLint) img->Height) {

+      /* Need this test for GL_CLAMP_TO_BORDER mode */

+      get_border_color(tObj, img, rgba);

+   }

+   else {

+      img->FetchTexelf(img, i, array, 0, rgba);

+   }

+}

+

+

+/**

+ * Return the texture sample for coordinate (s,t,r) using GL_LINEAR filter.

+ */

+static void

+sample_1d_array_linear(struct gl_context *ctx,

+                       const struct gl_texture_object *tObj,

+                       const struct gl_texture_image *img,

+                       const GLfloat texcoord[4],

+                       GLfloat rgba[4])

+{

+   const GLint width = img->Width2;

+   const GLint height = img->Height;

+   GLint i0, i1;

+   GLint array;

+   GLbitfield useBorderColor = 0x0;

+   GLfloat a;

+   GLfloat t0[4], t1[4];

+

+   linear_texel_locations(tObj->WrapS, img, width, texcoord[0], &i0, &i1, &a);

+   array = tex_array_slice(texcoord[1], height);

+

+   if (img->Border) {

+      i0 += img->Border;

+      i1 += img->Border;

+   }

+   else {

+      /* check if sampling texture border color */

+      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;

+      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;

+   }

+

+   if (array < 0 || array >= height)   useBorderColor |= K0BIT;

+

+   /* Fetch texels */

+   if (useBorderColor & (I0BIT | K0BIT)) {

+      get_border_color(tObj, img, t0);

+   }

+   else {

+      img->FetchTexelf(img, i0, array, 0, t0);

+   }

+   if (useBorderColor & (I1BIT | K0BIT)) {

+      get_border_color(tObj, img, t1);

+   }

+   else {

+      img->FetchTexelf(img, i1, array, 0, t1);

+   }

+

+   /* bilinear interpolation of samples */

+   lerp_rgba(rgba, a, t0, t1);

+}

+

+

+static void

+sample_1d_array_nearest_mipmap_nearest(struct gl_context *ctx,

+                                       const struct gl_texture_object *tObj,

+                                       GLuint n, const GLfloat texcoord[][4],

+                                       const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   for (i = 0; i < n; i++) {

+      GLint level = nearest_mipmap_level(tObj, lambda[i]);

+      sample_1d_array_nearest(ctx, tObj, tObj->Image[0][level], texcoord[i],

+                              rgba[i]);

+   }

+}

+

+

+static void

+sample_1d_array_linear_mipmap_nearest(struct gl_context *ctx,

+                                      const struct gl_texture_object *tObj,

+                                      GLuint n, const GLfloat texcoord[][4],

+                                      const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = nearest_mipmap_level(tObj, lambda[i]);

+      sample_1d_array_linear(ctx, tObj, tObj->Image[0][level],

+                             texcoord[i], rgba[i]);

+   }

+}

+

+

+static void

+sample_1d_array_nearest_mipmap_linear(struct gl_context *ctx,

+                                      const struct gl_texture_object *tObj,

+                                      GLuint n, const GLfloat texcoord[][4],

+                                      const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      if (level >= tObj->_MaxLevel) {

+         sample_1d_array_nearest(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],

+                                 texcoord[i], rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];  /* texels */

+         const GLfloat f = FRAC(lambda[i]);

+         sample_1d_array_nearest(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);

+         sample_1d_array_nearest(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+static void

+sample_1d_array_linear_mipmap_linear(struct gl_context *ctx,

+                                     const struct gl_texture_object *tObj,

+                                     GLuint n, const GLfloat texcoord[][4],

+                                     const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   ASSERT(lambda != NULL);

+   for (i = 0; i < n; i++) {

+      GLint level = linear_mipmap_level(tObj, lambda[i]);

+      if (level >= tObj->_MaxLevel) {

+         sample_1d_array_linear(ctx, tObj, tObj->Image[0][tObj->_MaxLevel],

+                          texcoord[i], rgba[i]);

+      }

+      else {

+         GLfloat t0[4], t1[4];  /* texels */

+         const GLfloat f = FRAC(lambda[i]);

+         sample_1d_array_linear(ctx, tObj, tObj->Image[0][level  ], texcoord[i], t0);

+         sample_1d_array_linear(ctx, tObj, tObj->Image[0][level+1], texcoord[i], t1);

+         lerp_rgba(rgba[i], f, t0, t1);

+      }

+   }

+}

+

+

+/** Sample 1D Array texture, nearest filtering for both min/magnification */

+static void

+sample_nearest_1d_array(struct gl_context *ctx,

+                        const struct gl_texture_object *tObj, GLuint n,

+                        const GLfloat texcoords[][4], const GLfloat lambda[],

+                        GLfloat rgba[][4])

+{

+   GLuint i;

+   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      sample_1d_array_nearest(ctx, tObj, image, texcoords[i], rgba[i]);

+   }

+}

+

+

+/** Sample 1D Array texture, linear filtering for both min/magnification */

+static void

+sample_linear_1d_array(struct gl_context *ctx,

+                       const struct gl_texture_object *tObj, GLuint n,

+                       const GLfloat texcoords[][4],

+                       const GLfloat lambda[], GLfloat rgba[][4])

+{

+   GLuint i;

+   struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      sample_1d_array_linear(ctx, tObj, image, texcoords[i], rgba[i]);

+   }

+}

+

+

+/** Sample 1D Array texture, using lambda to choose between min/magnification */

+static void

+sample_lambda_1d_array(struct gl_context *ctx,

+                       const struct gl_texture_object *tObj, GLuint n,

+                       const GLfloat texcoords[][4], const GLfloat lambda[],

+                       GLfloat rgba[][4])

+{

+   GLuint minStart, minEnd;  /* texels with minification */

+   GLuint magStart, magEnd;  /* texels with magnification */

+   GLuint i;

+

+   ASSERT(lambda != NULL);

+   compute_min_mag_ranges(tObj, n, lambda,

+                          &minStart, &minEnd, &magStart, &magEnd);

+

+   if (minStart < minEnd) {

+      /* do the minified texels */

+      GLuint m = minEnd - minStart;

+      switch (tObj->MinFilter) {

+      case GL_NEAREST:

+         for (i = minStart; i < minEnd; i++)

+            sample_1d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                                    texcoords[i], rgba[i]);

+         break;

+      case GL_LINEAR:

+         for (i = minStart; i < minEnd; i++)

+            sample_1d_array_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                                   texcoords[i], rgba[i]);

+         break;

+      case GL_NEAREST_MIPMAP_NEAREST:

+         sample_1d_array_nearest_mipmap_nearest(ctx, tObj, m, texcoords + minStart,

+                                                lambda + minStart, rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_NEAREST:

+         sample_1d_array_linear_mipmap_nearest(ctx, tObj, m, 

+                                               texcoords + minStart,

+                                               lambda + minStart,

+                                               rgba + minStart);

+         break;

+      case GL_NEAREST_MIPMAP_LINEAR:

+         sample_1d_array_nearest_mipmap_linear(ctx, tObj, m, texcoords + minStart,

+                                               lambda + minStart, rgba + minStart);

+         break;

+      case GL_LINEAR_MIPMAP_LINEAR:

+         sample_1d_array_linear_mipmap_linear(ctx, tObj, m, 

+                                              texcoords + minStart,

+                                              lambda + minStart, 

+                                              rgba + minStart);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad min filter in sample_1d_array_texture");

+         return;

+      }

+   }

+

+   if (magStart < magEnd) {

+      /* do the magnified texels */

+      switch (tObj->MagFilter) {

+      case GL_NEAREST:

+         for (i = magStart; i < magEnd; i++)

+            sample_1d_array_nearest(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                              texcoords[i], rgba[i]);

+         break;

+      case GL_LINEAR:

+         for (i = magStart; i < magEnd; i++)

+            sample_1d_array_linear(ctx, tObj, tObj->Image[0][tObj->BaseLevel],

+                                   texcoords[i], rgba[i]);

+         break;

+      default:

+         _mesa_problem(ctx, "Bad mag filter in sample_1d_array_texture");

+         return;

+      }

+   }

+}

+

+

+/**

+ * Compare texcoord against depth sample.  Return 1.0 or the ambient value.

+ */

+static INLINE GLfloat

+shadow_compare(GLenum function, GLfloat coord, GLfloat depthSample,

+               GLfloat ambient)

+{

+   switch (function) {

+   case GL_LEQUAL:

+      return (coord <= depthSample) ? 1.0F : ambient;

+   case GL_GEQUAL:

+      return (coord >= depthSample) ? 1.0F : ambient;

+   case GL_LESS:

+      return (coord < depthSample) ? 1.0F : ambient;

+   case GL_GREATER:

+      return (coord > depthSample) ? 1.0F : ambient;

+   case GL_EQUAL:

+      return (coord == depthSample) ? 1.0F : ambient;

+   case GL_NOTEQUAL:

+      return (coord != depthSample) ? 1.0F : ambient;

+   case GL_ALWAYS:

+      return 1.0F;

+   case GL_NEVER:

+      return ambient;

+   case GL_NONE:

+      return depthSample;

+   default:

+      _mesa_problem(NULL, "Bad compare func in shadow_compare");

+      return ambient;

+   }

+}

+

+

+/**

+ * Compare texcoord against four depth samples.

+ */

+static INLINE GLfloat

+shadow_compare4(GLenum function, GLfloat coord,

+                GLfloat depth00, GLfloat depth01,

+                GLfloat depth10, GLfloat depth11,

+                GLfloat ambient, GLfloat wi, GLfloat wj)

+{

+   const GLfloat d = (1.0F - (GLfloat) ambient) * 0.25F;

+   GLfloat luminance = 1.0F;

+

+   switch (function) {

+   case GL_LEQUAL:

+      if (coord > depth00)  luminance -= d;

+      if (coord > depth01)  luminance -= d;

+      if (coord > depth10)  luminance -= d;

+      if (coord > depth11)  luminance -= d;

+      return luminance;

+   case GL_GEQUAL:

+      if (coord < depth00)  luminance -= d;

+      if (coord < depth01)  luminance -= d;

+      if (coord < depth10)  luminance -= d;

+      if (coord < depth11)  luminance -= d;

+      return luminance;

+   case GL_LESS:

+      if (coord >= depth00)  luminance -= d;

+      if (coord >= depth01)  luminance -= d;

+      if (coord >= depth10)  luminance -= d;

+      if (coord >= depth11)  luminance -= d;

+      return luminance;

+   case GL_GREATER:

+      if (coord <= depth00)  luminance -= d;

+      if (coord <= depth01)  luminance -= d;

+      if (coord <= depth10)  luminance -= d;

+      if (coord <= depth11)  luminance -= d;

+      return luminance;

+   case GL_EQUAL:

+      if (coord != depth00)  luminance -= d;

+      if (coord != depth01)  luminance -= d;

+      if (coord != depth10)  luminance -= d;

+      if (coord != depth11)  luminance -= d;

+      return luminance;

+   case GL_NOTEQUAL:

+      if (coord == depth00)  luminance -= d;

+      if (coord == depth01)  luminance -= d;

+      if (coord == depth10)  luminance -= d;

+      if (coord == depth11)  luminance -= d;

+      return luminance;

+   case GL_ALWAYS:

+      return 1.0F;

+   case GL_NEVER:

+      return ambient;

+   case GL_NONE:

+      /* ordinary bilinear filtering */

+      return lerp_2d(wi, wj, depth00, depth10, depth01, depth11);

+   default:

+      _mesa_problem(NULL, "Bad compare func in sample_compare4");

+      return ambient;

+   }

+}

+

+

+/**

+ * Choose the mipmap level to use when sampling from a depth texture.

+ */

+static int

+choose_depth_texture_level(const struct gl_texture_object *tObj, GLfloat lambda)

+{

+   GLint level;

+

+   if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {

+      /* no mipmapping - use base level */

+      level = tObj->BaseLevel;

+   }

+   else {

+      /* choose mipmap level */

+      lambda = CLAMP(lambda, tObj->MinLod, tObj->MaxLod);

+      level = (GLint) lambda;

+      level = CLAMP(level, tObj->BaseLevel, tObj->_MaxLevel);

+   }

+

+   return level;

+}

+

+

+/**

+ * Sample a shadow/depth texture.  This function is incomplete.  It doesn't

+ * check for minification vs. magnification, etc.

+ */

+static void

+sample_depth_texture( struct gl_context *ctx,

+                      const struct gl_texture_object *tObj, GLuint n,

+                      const GLfloat texcoords[][4], const GLfloat lambda[],

+                      GLfloat texel[][4] )

+{

+   const GLint level = choose_depth_texture_level(tObj, lambda[0]);

+   const struct gl_texture_image *img = tObj->Image[0][level];

+   const GLint width = img->Width;

+   const GLint height = img->Height;

+   const GLint depth = img->Depth;

+   const GLuint compare_coord = (tObj->Target == GL_TEXTURE_2D_ARRAY_EXT)

+       ? 3 : 2;

+   GLfloat ambient;

+   GLenum function;

+   GLfloat result;

+

+   ASSERT(img->_BaseFormat == GL_DEPTH_COMPONENT ||

+          img->_BaseFormat == GL_DEPTH_STENCIL_EXT);

+

+   ASSERT(tObj->Target == GL_TEXTURE_1D ||

+          tObj->Target == GL_TEXTURE_2D ||

+          tObj->Target == GL_TEXTURE_RECTANGLE_NV ||

+          tObj->Target == GL_TEXTURE_1D_ARRAY_EXT ||

+          tObj->Target == GL_TEXTURE_2D_ARRAY_EXT);

+

+   ambient = tObj->CompareFailValue;

+

+   /* XXXX if tObj->MinFilter != tObj->MagFilter, we're ignoring lambda */

+

+   function = (tObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) ?

+      tObj->CompareFunc : GL_NONE;

+

+   if (tObj->MagFilter == GL_NEAREST) {

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         GLfloat depthSample, depthRef;

+         GLint col, row, slice;

+

+         nearest_texcoord(tObj, level, texcoords[i], &col, &row, &slice);

+

+         if (col >= 0 && row >= 0 && col < width && row < height && 

+             slice >= 0 && slice < depth) {

+            img->FetchTexelf(img, col, row, slice, &depthSample);

+         }

+         else {

+            depthSample = tObj->BorderColor.f[0];

+         }

+

+         depthRef = CLAMP(texcoords[i][compare_coord], 0.0F, 1.0F);

+

+         result = shadow_compare(function, depthRef, depthSample, ambient);

+

+         switch (tObj->DepthMode) {

+         case GL_LUMINANCE:

+            ASSIGN_4V(texel[i], result, result, result, 1.0F);

+            break;

+         case GL_INTENSITY:

+            ASSIGN_4V(texel[i], result, result, result, result);

+            break;

+         case GL_ALPHA:

+            ASSIGN_4V(texel[i], 0.0F, 0.0F, 0.0F, result);

+            break;

+         case GL_RED:

+            ASSIGN_4V(texel[i], result, 0.0F, 0.0F, 1.0F);

+            break;

+         default:

+            _mesa_problem(ctx, "Bad depth texture mode");

+         }

+      }

+   }

+   else {

+      GLuint i;

+      ASSERT(tObj->MagFilter == GL_LINEAR);

+      for (i = 0; i < n; i++) {

+         GLfloat depth00, depth01, depth10, depth11, depthRef;

+         GLint i0, i1, j0, j1;

+         GLint slice;

+         GLfloat wi, wj;

+         GLuint useBorderTexel;

+

+         linear_texcoord(tObj, level, texcoords[i], &i0, &i1, &j0, &j1, &slice,

+                         &wi, &wj);

+

+         useBorderTexel = 0;

+         if (img->Border) {

+            i0 += img->Border;

+            i1 += img->Border;

+            if (tObj->Target != GL_TEXTURE_1D_ARRAY_EXT) {

+               j0 += img->Border;

+               j1 += img->Border;

+            }

+         }

+         else {

+            if (i0 < 0 || i0 >= (GLint) width)   useBorderTexel |= I0BIT;

+            if (i1 < 0 || i1 >= (GLint) width)   useBorderTexel |= I1BIT;

+            if (j0 < 0 || j0 >= (GLint) height)  useBorderTexel |= J0BIT;

+            if (j1 < 0 || j1 >= (GLint) height)  useBorderTexel |= J1BIT;

+         }

+

+         if (slice < 0 || slice >= (GLint) depth) {

+            depth00 = tObj->BorderColor.f[0];

+            depth01 = tObj->BorderColor.f[0];

+            depth10 = tObj->BorderColor.f[0];

+            depth11 = tObj->BorderColor.f[0];

+         }

+         else {

+            /* get four depth samples from the texture */

+            if (useBorderTexel & (I0BIT | J0BIT)) {

+               depth00 = tObj->BorderColor.f[0];

+            }

+            else {

+               img->FetchTexelf(img, i0, j0, slice, &depth00);

+            }

+            if (useBorderTexel & (I1BIT | J0BIT)) {

+               depth10 = tObj->BorderColor.f[0];

+            }

+            else {

+               img->FetchTexelf(img, i1, j0, slice, &depth10);

+            }

+

+            if (tObj->Target != GL_TEXTURE_1D_ARRAY_EXT) {

+               if (useBorderTexel & (I0BIT | J1BIT)) {

+                  depth01 = tObj->BorderColor.f[0];

+               }

+               else {

+                  img->FetchTexelf(img, i0, j1, slice, &depth01);

+               }

+               if (useBorderTexel & (I1BIT | J1BIT)) {

+                  depth11 = tObj->BorderColor.f[0];

+               }

+               else {

+                  img->FetchTexelf(img, i1, j1, slice, &depth11);

+               }

+            }

+            else {

+               depth01 = depth00;

+               depth11 = depth10;

+            }

+         }

+

+         depthRef = CLAMP(texcoords[i][compare_coord], 0.0F, 1.0F);

+

+         result = shadow_compare4(function, depthRef,

+                                  depth00, depth01, depth10, depth11,

+                                  ambient, wi, wj);

+

+         switch (tObj->DepthMode) {

+         case GL_LUMINANCE:

+            ASSIGN_4V(texel[i], result, result, result, 1.0F);

+            break;

+         case GL_INTENSITY:

+            ASSIGN_4V(texel[i], result, result, result, result);

+            break;

+         case GL_ALPHA:

+            ASSIGN_4V(texel[i], 0.0F, 0.0F, 0.0F, result);

+            break;

+         default:

+            _mesa_problem(ctx, "Bad depth texture mode");

+         }

+

+      }  /* for */

+   }  /* if filter */

+}

+

+

+/**

+ * We use this function when a texture object is in an "incomplete" state.

+ * When a fragment program attempts to sample an incomplete texture we

+ * return black (see issue 23 in GL_ARB_fragment_program spec).

+ * Note: fragment programs don't observe the texture enable/disable flags.

+ */

+static void

+null_sample_func( struct gl_context *ctx,

+		  const struct gl_texture_object *tObj, GLuint n,

+		  const GLfloat texcoords[][4], const GLfloat lambda[],

+		  GLfloat rgba[][4])

+{

+   GLuint i;

+   (void) ctx;

+   (void) tObj;

+   (void) texcoords;

+   (void) lambda;

+   for (i = 0; i < n; i++) {

+      rgba[i][RCOMP] = 0;

+      rgba[i][GCOMP] = 0;

+      rgba[i][BCOMP] = 0;

+      rgba[i][ACOMP] = 1.0;

+   }

+}

+

+

+/**

+ * Choose the texture sampling function for the given texture object.

+ */

+texture_sample_func

+_swrast_choose_texture_sample_func( struct gl_context *ctx,

+				    const struct gl_texture_object *t )

+{

+   if (!t || !t->_Complete) {

+      return &null_sample_func;

+   }

+   else {

+      const GLboolean needLambda = (GLboolean) (t->MinFilter != t->MagFilter);

+      const GLenum format = t->Image[0][t->BaseLevel]->_BaseFormat;

+

+      switch (t->Target) {

+      case GL_TEXTURE_1D:

+         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {

+            return &sample_depth_texture;

+         }

+         else if (needLambda) {

+            return &sample_lambda_1d;

+         }

+         else if (t->MinFilter == GL_LINEAR) {

+            return &sample_linear_1d;

+         }

+         else {

+            ASSERT(t->MinFilter == GL_NEAREST);

+            return &sample_nearest_1d;

+         }

+      case GL_TEXTURE_2D:

+         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {

+            return &sample_depth_texture;

+         }

+         else if (needLambda) {

+            return &sample_lambda_2d;

+         }

+         else if (t->MinFilter == GL_LINEAR) {

+            return &sample_linear_2d;

+         }

+         else {

+            /* check for a few optimized cases */

+            const struct gl_texture_image *img = t->Image[0][t->BaseLevel];

+            ASSERT(t->MinFilter == GL_NEAREST);

+            if (t->WrapS == GL_REPEAT &&

+                t->WrapT == GL_REPEAT &&

+                img->_IsPowerOfTwo &&

+                img->Border == 0 &&

+                img->TexFormat == MESA_FORMAT_RGB888) {

+               return &opt_sample_rgb_2d;

+            }

+            else if (t->WrapS == GL_REPEAT &&

+                     t->WrapT == GL_REPEAT &&

+                     img->_IsPowerOfTwo &&

+                     img->Border == 0 &&

+                     img->TexFormat == MESA_FORMAT_RGBA8888) {

+               return &opt_sample_rgba_2d;

+            }

+            else {

+               return &sample_nearest_2d;

+            }

+         }

+      case GL_TEXTURE_3D:

+         if (needLambda) {

+            return &sample_lambda_3d;

+         }

+         else if (t->MinFilter == GL_LINEAR) {

+            return &sample_linear_3d;

+         }

+         else {

+            ASSERT(t->MinFilter == GL_NEAREST);

+            return &sample_nearest_3d;

+         }

+      case GL_TEXTURE_CUBE_MAP:

+         if (needLambda) {

+            return &sample_lambda_cube;

+         }

+         else if (t->MinFilter == GL_LINEAR) {

+            return &sample_linear_cube;

+         }

+         else {

+            ASSERT(t->MinFilter == GL_NEAREST);

+            return &sample_nearest_cube;

+         }

+      case GL_TEXTURE_RECTANGLE_NV:

+         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {

+            return &sample_depth_texture;

+         }

+         else if (needLambda) {

+            return &sample_lambda_rect;

+         }

+         else if (t->MinFilter == GL_LINEAR) {

+            return &sample_linear_rect;

+         }

+         else {

+            ASSERT(t->MinFilter == GL_NEAREST);

+            return &sample_nearest_rect;

+         }

+      case GL_TEXTURE_1D_ARRAY_EXT:

+         if (needLambda) {

+            return &sample_lambda_1d_array;

+         }

+         else if (t->MinFilter == GL_LINEAR) {

+            return &sample_linear_1d_array;

+         }

+         else {

+            ASSERT(t->MinFilter == GL_NEAREST);

+            return &sample_nearest_1d_array;

+         }

+      case GL_TEXTURE_2D_ARRAY_EXT:

+         if (needLambda) {

+            return &sample_lambda_2d_array;

+         }

+         else if (t->MinFilter == GL_LINEAR) {

+            return &sample_linear_2d_array;

+         }

+         else {

+            ASSERT(t->MinFilter == GL_NEAREST);

+            return &sample_nearest_2d_array;

+         }

+      default:

+         _mesa_problem(ctx,

+                       "invalid target in _swrast_choose_texture_sample_func");

+         return &null_sample_func;

+      }

+   }

+}

diff --git a/mesalib/src/mesa/tnl/t_draw.c b/mesalib/src/mesa/tnl/t_draw.c
index b1967e654..a2ca6225b 100644
--- a/mesalib/src/mesa/tnl/t_draw.c
+++ b/mesalib/src/mesa/tnl/t_draw.c
@@ -1,534 +1,534 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#include "main/glheader.h"
-#include "main/condrender.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "main/macros.h"
-#include "main/enums.h"
-
-#include "t_context.h"
-#include "tnl.h"
-
-
-
-static GLubyte *get_space(struct gl_context *ctx, GLuint bytes)
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   GLubyte *space = malloc(bytes);
-   
-   tnl->block[tnl->nr_blocks++] = space;
-   return space;
-}
-
-
-static void free_space(struct gl_context *ctx)
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   GLuint i;
-   for (i = 0; i < tnl->nr_blocks; i++)
-      free(tnl->block[i]);
-   tnl->nr_blocks = 0;
-}
-
-
-/* Convert the incoming array to GLfloats.  Understands the
- * array->Normalized flag and selects the correct conversion method.
- */
-#define CONVERT( TYPE, MACRO ) do {		\
-   GLuint i, j;					\
-   if (input->Normalized) {			\
-      for (i = 0; i < count; i++) {		\
-	 const TYPE *in = (TYPE *)ptr;		\
-	 for (j = 0; j < sz; j++) {		\
-	    *fptr++ = MACRO(*in);		\
-	    in++;				\
-	 }					\
-	 ptr += input->StrideB;			\
-      }						\
-   } else {					\
-      for (i = 0; i < count; i++) {		\
-	 const TYPE *in = (TYPE *)ptr;		\
-	 for (j = 0; j < sz; j++) {		\
-	    *fptr++ = (GLfloat)(*in);		\
-	    in++;				\
-	 }					\
-	 ptr += input->StrideB;			\
-      }						\
-   }						\
-} while (0)
-
-
-/**
- * Convert array of BGRA/GLubyte[4] values to RGBA/float[4]
- * \param ptr  input/ubyte array
- * \param fptr  output/float array
- */
-static void
-convert_bgra_to_float(const struct gl_client_array *input,
-                      const GLubyte *ptr, GLfloat *fptr,
-                      GLuint count )
-{
-   GLuint i;
-   assert(input->Normalized);
-   assert(input->Size == 4);
-   for (i = 0; i < count; i++) {
-      const GLubyte *in = (GLubyte *) ptr;  /* in is in BGRA order */
-      *fptr++ = UBYTE_TO_FLOAT(in[2]);  /* red */
-      *fptr++ = UBYTE_TO_FLOAT(in[1]);  /* green */
-      *fptr++ = UBYTE_TO_FLOAT(in[0]);  /* blue */
-      *fptr++ = UBYTE_TO_FLOAT(in[3]);  /* alpha */
-      ptr += input->StrideB;
-   }
-}
-
-static void
-convert_half_to_float(const struct gl_client_array *input,
-		      const GLubyte *ptr, GLfloat *fptr,
-		      GLuint count, GLuint sz)
-{
-   GLuint i, j;
-
-   for (i = 0; i < count; i++) {
-      GLhalfARB *in = (GLhalfARB *)ptr;
-
-      for (j = 0; j < sz; j++) {
-	 *fptr++ = _mesa_half_to_float(in[j]);
-      }
-      ptr += input->StrideB;
-   }
-}
-
-/**
- * \brief Convert fixed-point to floating-point.
- *
- * In OpenGL, a fixed-point number is a "signed 2's complement 16.16 scaled
- * integer" (Table 2.2 of the OpenGL ES 2.0 spec).
- *
- * If the buffer has the \c normalized flag set, the formula
- *     \code normalize(x) := (2*x + 1) / (2^16 - 1) \endcode
- * is used to map the fixed-point numbers into the range [-1, 1].
- */
-static void
-convert_fixed_to_float(const struct gl_client_array *input,
-                       const GLubyte *ptr, GLfloat *fptr,
-                       GLuint count)
-{
-   GLuint i, j;
-   const GLint size = input->Size;
-
-   if (input->Normalized) {
-      for (i = 0; i < count; ++i) {
-         const GLfixed *in = (GLfixed *) ptr;
-         for (j = 0; j < size; ++j) {
-            *fptr++ = (GLfloat) (2 * in[j] + 1) / (GLfloat) ((1 << 16) - 1);
-         }
-         ptr += input->StrideB;
-      }
-   } else {
-      for (i = 0; i < count; ++i) {
-         const GLfixed *in = (GLfixed *) ptr;
-         for (j = 0; j < size; ++j) {
-            *fptr++ = in[j] / (GLfloat) (1 << 16);
-         }
-         ptr += input->StrideB;
-      }
-   }
-}
-
-/* Adjust pointer to point at first requested element, convert to
- * floating point, populate VB->AttribPtr[].
- */
-static void _tnl_import_array( struct gl_context *ctx,
-			       GLuint attrib,
-			       GLuint count,
-			       const struct gl_client_array *input,
-			       const GLubyte *ptr )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   GLuint stride = input->StrideB;
-
-   if (input->Type != GL_FLOAT) {
-      const GLuint sz = input->Size;
-      GLubyte *buf = get_space(ctx, count * sz * sizeof(GLfloat));
-      GLfloat *fptr = (GLfloat *)buf;
-
-      switch (input->Type) {
-      case GL_BYTE: 
-	 CONVERT(GLbyte, BYTE_TO_FLOAT); 
-	 break;
-      case GL_UNSIGNED_BYTE: 
-         if (input->Format == GL_BGRA) {
-            /* See GL_EXT_vertex_array_bgra */
-            convert_bgra_to_float(input, ptr, fptr, count);
-         }
-         else {
-            CONVERT(GLubyte, UBYTE_TO_FLOAT); 
-         }
-	 break;
-      case GL_SHORT: 
-	 CONVERT(GLshort, SHORT_TO_FLOAT); 
-	 break;
-      case GL_UNSIGNED_SHORT: 
-	 CONVERT(GLushort, USHORT_TO_FLOAT); 
-	 break;
-      case GL_INT: 
-	 CONVERT(GLint, INT_TO_FLOAT); 
-	 break;
-      case GL_UNSIGNED_INT: 
-	 CONVERT(GLuint, UINT_TO_FLOAT); 
-	 break;
-      case GL_DOUBLE: 
-	 CONVERT(GLdouble, (GLfloat)); 
-	 break;
-      case GL_HALF_FLOAT:
-	 convert_half_to_float(input, ptr, fptr, count, sz);
-	 break;
-      case GL_FIXED:
-         convert_fixed_to_float(input, ptr, fptr, count);
-         break;
-      default:
-	 assert(0);
-	 break;
-      }
-
-      ptr = buf;
-      stride = sz * sizeof(GLfloat);
-   }
-
-   VB->AttribPtr[attrib] = &tnl->tmp_inputs[attrib];
-   VB->AttribPtr[attrib]->data = (GLfloat (*)[4])ptr;
-   VB->AttribPtr[attrib]->start = (GLfloat *)ptr;
-   VB->AttribPtr[attrib]->count = count;
-   VB->AttribPtr[attrib]->stride = stride;
-   VB->AttribPtr[attrib]->size = input->Size;
-
-   /* This should die, but so should the whole GLvector4f concept: 
-    */
-   VB->AttribPtr[attrib]->flags = (((1<<input->Size)-1) | 
-				   VEC_NOT_WRITEABLE |
-				   (stride == 4*sizeof(GLfloat) ? 0 : VEC_BAD_STRIDE));
-   
-   VB->AttribPtr[attrib]->storage = NULL;
-}
-
-#define CLIPVERTS  ((6 + MAX_CLIP_PLANES) * 2)
-
-
-static GLboolean *_tnl_import_edgeflag( struct gl_context *ctx,
-					const GLvector4f *input,
-					GLuint count)
-{
-   const GLubyte *ptr = (const GLubyte *)input->data;
-   const GLuint stride = input->stride;
-   GLboolean *space = (GLboolean *)get_space(ctx, count + CLIPVERTS);
-   GLboolean *bptr = space;
-   GLuint i;
-
-   for (i = 0; i < count; i++) {
-      *bptr++ = ((GLfloat *)ptr)[0] == 1.0;
-      ptr += stride;
-   }
-
-   return space;
-}
-
-
-static void bind_inputs( struct gl_context *ctx, 
-			 const struct gl_client_array *inputs[],
-			 GLint count,
-			 struct gl_buffer_object **bo,
-			 GLuint *nr_bo )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   GLuint i;
-
-   /* Map all the VBOs
-    */
-   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
-      const void *ptr;
-
-      if (inputs[i]->BufferObj->Name) { 
-	 if (!inputs[i]->BufferObj->Pointer) {
-	    bo[*nr_bo] = inputs[i]->BufferObj;
-	    (*nr_bo)++;
-	    ctx->Driver.MapBuffer(ctx, 
-				  GL_ARRAY_BUFFER,
-				  GL_READ_ONLY_ARB,
-				  inputs[i]->BufferObj);
-	    
-	    assert(inputs[i]->BufferObj->Pointer);
-	 }
-	 
-	 ptr = ADD_POINTERS(inputs[i]->BufferObj->Pointer,
-			    inputs[i]->Ptr);
-      }
-      else
-	 ptr = inputs[i]->Ptr;
-
-      /* Just make sure the array is floating point, otherwise convert to
-       * temporary storage.  
-       *
-       * XXX: remove the GLvector4f type at some stage and just use
-       * client arrays.
-       */
-      _tnl_import_array(ctx, i, count, inputs[i], ptr);
-   }
-
-   /* We process only the vertices between min & max index:
-    */
-   VB->Count = count;
-
-   /* These should perhaps be part of _TNL_ATTRIB_* */
-   VB->BackfaceColorPtr = NULL;
-   VB->BackfaceIndexPtr = NULL;
-   VB->BackfaceSecondaryColorPtr = NULL;
-
-   /* Clipping and drawing code still requires this to be a packed
-    * array of ubytes which can be written into.  TODO: Fix and
-    * remove.
-    */
-   if (ctx->Polygon.FrontMode != GL_FILL ||
-       ctx->Polygon.BackMode != GL_FILL)
-   {
-      VB->EdgeFlag = _tnl_import_edgeflag( ctx, 
-					   VB->AttribPtr[_TNL_ATTRIB_EDGEFLAG],
-					   VB->Count );
-   }
-   else {
-      /* the data previously pointed to by EdgeFlag may have been freed */
-      VB->EdgeFlag = NULL;
-   }
-}
-
-
-/* Translate indices to GLuints and store in VB->Elts.
- */
-static void bind_indices( struct gl_context *ctx,
-			  const struct _mesa_index_buffer *ib,
-			  struct gl_buffer_object **bo,
-			  GLuint *nr_bo)
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   GLuint i;
-   void *ptr;
-
-   if (!ib) {
-      VB->Elts = NULL;
-      return;
-   }
-
-   if (ib->obj->Name && !ib->obj->Pointer) {
-      bo[*nr_bo] = ib->obj;
-      (*nr_bo)++;
-      ctx->Driver.MapBuffer(ctx, 
-			    GL_ELEMENT_ARRAY_BUFFER,
-			    GL_READ_ONLY_ARB,
-			    ib->obj);
-
-      assert(ib->obj->Pointer);
-   }
-
-   ptr = ADD_POINTERS(ib->obj->Pointer, ib->ptr);
-
-   if (ib->type == GL_UNSIGNED_INT && VB->Primitive[0].basevertex == 0) {
-      VB->Elts = (GLuint *) ptr;
-   }
-   else {
-      GLuint *elts = (GLuint *)get_space(ctx, ib->count * sizeof(GLuint));
-      VB->Elts = elts;
-
-      if (ib->type == GL_UNSIGNED_INT) {
-	 const GLuint *in = (GLuint *)ptr;
-	 for (i = 0; i < ib->count; i++)
-	    *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex;
-      }
-      else if (ib->type == GL_UNSIGNED_SHORT) {
-	 const GLushort *in = (GLushort *)ptr;
-	 for (i = 0; i < ib->count; i++) 
-	    *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex;
-      }
-      else {
-	 const GLubyte *in = (GLubyte *)ptr;
-	 for (i = 0; i < ib->count; i++) 
-	    *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex;
-      }
-   }
-}
-
-static void bind_prims( struct gl_context *ctx,
-			const struct _mesa_prim *prim,
-			GLuint nr_prims )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-
-   VB->Primitive = prim;
-   VB->PrimitiveCount = nr_prims;
-}
-
-static void unmap_vbos( struct gl_context *ctx,
-			struct gl_buffer_object **bo,
-			GLuint nr_bo )
-{
-   GLuint i;
-   for (i = 0; i < nr_bo; i++) { 
-      ctx->Driver.UnmapBuffer(ctx, 
-			      0, /* target -- I don't see why this would be needed */
-			      bo[i]);
-   }
-}
-
-
-void _tnl_vbo_draw_prims(struct gl_context *ctx,
-			 const struct gl_client_array *arrays[],
-			 const struct _mesa_prim *prim,
-			 GLuint nr_prims,
-			 const struct _mesa_index_buffer *ib,
-			 GLboolean index_bounds_valid,
-			 GLuint min_index,
-			 GLuint max_index)
-{
-   if (!index_bounds_valid)
-      vbo_get_minmax_index(ctx, prim, ib, &min_index, &max_index);
-
-   _tnl_draw_prims(ctx, arrays, prim, nr_prims, ib, min_index, max_index);
-}
-
-/* This is the main entrypoint into the slimmed-down software tnl
- * module.  In a regular swtnl driver, this can be plugged straight
- * into the vbo->Driver.DrawPrims() callback.
- */
-void _tnl_draw_prims( struct gl_context *ctx,
-		      const struct gl_client_array *arrays[],
-		      const struct _mesa_prim *prim,
-		      GLuint nr_prims,
-		      const struct _mesa_index_buffer *ib,
-		      GLuint min_index,
-		      GLuint max_index)
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   const GLuint TEST_SPLIT = 0;
-   const GLint max = TEST_SPLIT ? 8 : tnl->vb.Size - MAX_CLIPPED_VERTICES;
-   GLint max_basevertex = prim->basevertex;
-   GLuint i;
-
-   /* Mesa core state should have been validated already */
-   assert(ctx->NewState == 0x0);
-
-   if (!_mesa_check_conditional_render(ctx))
-      return; /* don't draw */
-
-   for (i = 1; i < nr_prims; i++)
-      max_basevertex = MAX2(max_basevertex, prim[i].basevertex);
-
-   if (0)
-   {
-      printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
-      for (i = 0; i < nr_prims; i++)
-	 printf("prim %d: %s start %d count %d\n", i, 
-		_mesa_lookup_enum_by_nr(prim[i].mode),
-		prim[i].start,
-		prim[i].count);
-   }
-
-   if (min_index) {
-      /* We always translate away calls with min_index != 0. 
-       */
-      vbo_rebase_prims( ctx, arrays, prim, nr_prims, ib, 
-			min_index, max_index,
-			_tnl_vbo_draw_prims );
-      return;
-   }
-   else if ((GLint)max_index + max_basevertex > max) {
-      /* The software TNL pipeline has a fixed amount of storage for
-       * vertices and it is necessary to split incoming drawing commands
-       * if they exceed that limit.
-       */
-      struct split_limits limits;
-      limits.max_verts = max;
-      limits.max_vb_size = ~0;
-      limits.max_indices = ~0;
-
-      /* This will split the buffers one way or another and
-       * recursively call back into this function.
-       */
-      vbo_split_prims( ctx, arrays, prim, nr_prims, ib, 
-		       0, max_index + prim->basevertex,
-		       _tnl_vbo_draw_prims,
-		       &limits );
-   }
-   else {
-      /* May need to map a vertex buffer object for every attribute plus
-       * one for the index buffer.
-       */
-      struct gl_buffer_object *bo[VERT_ATTRIB_MAX + 1];
-      GLuint nr_bo = 0;
-      GLuint inst;
-
-      for (i = 0; i < nr_prims;) {
-	 GLuint this_nr_prims;
-
-	 /* Our SW TNL pipeline doesn't handle basevertex yet, so bind_indices
-	  * will rebase the elements to the basevertex, and we'll only
-	  * emit strings of prims with the same basevertex in one draw call.
-	  */
-	 for (this_nr_prims = 1; i + this_nr_prims < nr_prims;
-	      this_nr_prims++) {
-	    if (prim[i].basevertex != prim[i + this_nr_prims].basevertex)
-	       break;
-	 }
-
-         assert(prim[i].num_instances > 0);
-
-	 /* Binding inputs may imply mapping some vertex buffer objects.
-	  * They will need to be unmapped below.
-	  */
-         for (inst = 0; inst < prim[i].num_instances; inst++) {
-
-            bind_prims(ctx, &prim[i], this_nr_prims);
-            bind_inputs(ctx, arrays, max_index + prim[i].basevertex + 1,
-                        bo, &nr_bo);
-            bind_indices(ctx, ib, bo, &nr_bo);
-
-            tnl->CurInstance = inst;
-            TNL_CONTEXT(ctx)->Driver.RunPipeline(ctx);
-
-            unmap_vbos(ctx, bo, nr_bo);
-            free_space(ctx);
-         }
-
-	 i += this_nr_prims;
-      }
-   }
-}
-
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+#include "main/glheader.h"

+#include "main/condrender.h"

+#include "main/context.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+#include "main/macros.h"

+#include "main/enums.h"

+

+#include "t_context.h"

+#include "tnl.h"

+

+

+

+static GLubyte *get_space(struct gl_context *ctx, GLuint bytes)

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   GLubyte *space = malloc(bytes);

+   

+   tnl->block[tnl->nr_blocks++] = space;

+   return space;

+}

+

+

+static void free_space(struct gl_context *ctx)

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   GLuint i;

+   for (i = 0; i < tnl->nr_blocks; i++)

+      free(tnl->block[i]);

+   tnl->nr_blocks = 0;

+}

+

+

+/* Convert the incoming array to GLfloats.  Understands the

+ * array->Normalized flag and selects the correct conversion method.

+ */

+#define CONVERT( TYPE, MACRO ) do {		\

+   GLuint i, j;					\

+   if (input->Normalized) {			\

+      for (i = 0; i < count; i++) {		\

+	 const TYPE *in = (TYPE *)ptr;		\

+	 for (j = 0; j < sz; j++) {		\

+	    *fptr++ = MACRO(*in);		\

+	    in++;				\

+	 }					\

+	 ptr += input->StrideB;			\

+      }						\

+   } else {					\

+      for (i = 0; i < count; i++) {		\

+	 const TYPE *in = (TYPE *)ptr;		\

+	 for (j = 0; j < sz; j++) {		\

+	    *fptr++ = (GLfloat)(*in);		\

+	    in++;				\

+	 }					\

+	 ptr += input->StrideB;			\

+      }						\

+   }						\

+} while (0)

+

+

+/**

+ * Convert array of BGRA/GLubyte[4] values to RGBA/float[4]

+ * \param ptr  input/ubyte array

+ * \param fptr  output/float array

+ */

+static void

+convert_bgra_to_float(const struct gl_client_array *input,

+                      const GLubyte *ptr, GLfloat *fptr,

+                      GLuint count )

+{

+   GLuint i;

+   assert(input->Normalized);

+   assert(input->Size == 4);

+   for (i = 0; i < count; i++) {

+      const GLubyte *in = (GLubyte *) ptr;  /* in is in BGRA order */

+      *fptr++ = UBYTE_TO_FLOAT(in[2]);  /* red */

+      *fptr++ = UBYTE_TO_FLOAT(in[1]);  /* green */

+      *fptr++ = UBYTE_TO_FLOAT(in[0]);  /* blue */

+      *fptr++ = UBYTE_TO_FLOAT(in[3]);  /* alpha */

+      ptr += input->StrideB;

+   }

+}

+

+static void

+convert_half_to_float(const struct gl_client_array *input,

+		      const GLubyte *ptr, GLfloat *fptr,

+		      GLuint count, GLuint sz)

+{

+   GLuint i, j;

+

+   for (i = 0; i < count; i++) {

+      GLhalfARB *in = (GLhalfARB *)ptr;

+

+      for (j = 0; j < sz; j++) {

+	 *fptr++ = _mesa_half_to_float(in[j]);

+      }

+      ptr += input->StrideB;

+   }

+}

+

+/**

+ * \brief Convert fixed-point to floating-point.

+ *

+ * In OpenGL, a fixed-point number is a "signed 2's complement 16.16 scaled

+ * integer" (Table 2.2 of the OpenGL ES 2.0 spec).

+ *

+ * If the buffer has the \c normalized flag set, the formula

+ *     \code normalize(x) := (2*x + 1) / (2^16 - 1) \endcode

+ * is used to map the fixed-point numbers into the range [-1, 1].

+ */

+static void

+convert_fixed_to_float(const struct gl_client_array *input,

+                       const GLubyte *ptr, GLfloat *fptr,

+                       GLuint count)

+{

+   GLuint i, j;

+   const GLint size = input->Size;

+

+   if (input->Normalized) {

+      for (i = 0; i < count; ++i) {

+         const GLfixed *in = (GLfixed *) ptr;

+         for (j = 0; j < size; ++j) {

+            *fptr++ = (GLfloat) (2 * in[j] + 1) / (GLfloat) ((1 << 16) - 1);

+         }

+         ptr += input->StrideB;

+      }

+   } else {

+      for (i = 0; i < count; ++i) {

+         const GLfixed *in = (GLfixed *) ptr;

+         for (j = 0; j < size; ++j) {

+            *fptr++ = in[j] / (GLfloat) (1 << 16);

+         }

+         ptr += input->StrideB;

+      }

+   }

+}

+

+/* Adjust pointer to point at first requested element, convert to

+ * floating point, populate VB->AttribPtr[].

+ */

+static void _tnl_import_array( struct gl_context *ctx,

+			       GLuint attrib,

+			       GLuint count,

+			       const struct gl_client_array *input,

+			       const GLubyte *ptr )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   GLuint stride = input->StrideB;

+

+   if (input->Type != GL_FLOAT) {

+      const GLuint sz = input->Size;

+      GLubyte *buf = get_space(ctx, count * sz * sizeof(GLfloat));

+      GLfloat *fptr = (GLfloat *)buf;

+

+      switch (input->Type) {

+      case GL_BYTE: 

+	 CONVERT(GLbyte, BYTE_TO_FLOAT); 

+	 break;

+      case GL_UNSIGNED_BYTE: 

+         if (input->Format == GL_BGRA) {

+            /* See GL_EXT_vertex_array_bgra */

+            convert_bgra_to_float(input, ptr, fptr, count);

+         }

+         else {

+            CONVERT(GLubyte, UBYTE_TO_FLOAT); 

+         }

+	 break;

+      case GL_SHORT: 

+	 CONVERT(GLshort, SHORT_TO_FLOAT); 

+	 break;

+      case GL_UNSIGNED_SHORT: 

+	 CONVERT(GLushort, USHORT_TO_FLOAT); 

+	 break;

+      case GL_INT: 

+	 CONVERT(GLint, INT_TO_FLOAT); 

+	 break;

+      case GL_UNSIGNED_INT: 

+	 CONVERT(GLuint, UINT_TO_FLOAT); 

+	 break;

+      case GL_DOUBLE: 

+	 CONVERT(GLdouble, (GLfloat)); 

+	 break;

+      case GL_HALF_FLOAT:

+	 convert_half_to_float(input, ptr, fptr, count, sz);

+	 break;

+      case GL_FIXED:

+         convert_fixed_to_float(input, ptr, fptr, count);

+         break;

+      default:

+	 assert(0);

+	 break;

+      }

+

+      ptr = buf;

+      stride = sz * sizeof(GLfloat);

+   }

+

+   VB->AttribPtr[attrib] = &tnl->tmp_inputs[attrib];

+   VB->AttribPtr[attrib]->data = (GLfloat (*)[4])ptr;

+   VB->AttribPtr[attrib]->start = (GLfloat *)ptr;

+   VB->AttribPtr[attrib]->count = count;

+   VB->AttribPtr[attrib]->stride = stride;

+   VB->AttribPtr[attrib]->size = input->Size;

+

+   /* This should die, but so should the whole GLvector4f concept: 

+    */

+   VB->AttribPtr[attrib]->flags = (((1<<input->Size)-1) | 

+				   VEC_NOT_WRITEABLE |

+				   (stride == 4*sizeof(GLfloat) ? 0 : VEC_BAD_STRIDE));

+   

+   VB->AttribPtr[attrib]->storage = NULL;

+}

+

+#define CLIPVERTS  ((6 + MAX_CLIP_PLANES) * 2)

+

+

+static GLboolean *_tnl_import_edgeflag( struct gl_context *ctx,

+					const GLvector4f *input,

+					GLuint count)

+{

+   const GLubyte *ptr = (const GLubyte *)input->data;

+   const GLuint stride = input->stride;

+   GLboolean *space = (GLboolean *)get_space(ctx, count + CLIPVERTS);

+   GLboolean *bptr = space;

+   GLuint i;

+

+   for (i = 0; i < count; i++) {

+      *bptr++ = ((GLfloat *)ptr)[0] == 1.0;

+      ptr += stride;

+   }

+

+   return space;

+}

+

+

+static void bind_inputs( struct gl_context *ctx, 

+			 const struct gl_client_array *inputs[],

+			 GLint count,

+			 struct gl_buffer_object **bo,

+			 GLuint *nr_bo )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   GLuint i;

+

+   /* Map all the VBOs

+    */

+   for (i = 0; i < VERT_ATTRIB_MAX; i++) {

+      const void *ptr;

+

+      if (inputs[i]->BufferObj->Name) { 

+	 if (!inputs[i]->BufferObj->Pointer) {

+	    bo[*nr_bo] = inputs[i]->BufferObj;

+	    (*nr_bo)++;

+	    ctx->Driver.MapBuffer(ctx, 

+				  GL_ARRAY_BUFFER,

+				  GL_READ_ONLY_ARB,

+				  inputs[i]->BufferObj);

+	    

+	    assert(inputs[i]->BufferObj->Pointer);

+	 }

+	 

+	 ptr = ADD_POINTERS(inputs[i]->BufferObj->Pointer,

+			    inputs[i]->Ptr);

+      }

+      else

+	 ptr = inputs[i]->Ptr;

+

+      /* Just make sure the array is floating point, otherwise convert to

+       * temporary storage.  

+       *

+       * XXX: remove the GLvector4f type at some stage and just use

+       * client arrays.

+       */

+      _tnl_import_array(ctx, i, count, inputs[i], ptr);

+   }

+

+   /* We process only the vertices between min & max index:

+    */

+   VB->Count = count;

+

+   /* These should perhaps be part of _TNL_ATTRIB_* */

+   VB->BackfaceColorPtr = NULL;

+   VB->BackfaceIndexPtr = NULL;

+   VB->BackfaceSecondaryColorPtr = NULL;

+

+   /* Clipping and drawing code still requires this to be a packed

+    * array of ubytes which can be written into.  TODO: Fix and

+    * remove.

+    */

+   if (ctx->Polygon.FrontMode != GL_FILL ||

+       ctx->Polygon.BackMode != GL_FILL)

+   {

+      VB->EdgeFlag = _tnl_import_edgeflag( ctx, 

+					   VB->AttribPtr[_TNL_ATTRIB_EDGEFLAG],

+					   VB->Count );

+   }

+   else {

+      /* the data previously pointed to by EdgeFlag may have been freed */

+      VB->EdgeFlag = NULL;

+   }

+}

+

+

+/* Translate indices to GLuints and store in VB->Elts.

+ */

+static void bind_indices( struct gl_context *ctx,

+			  const struct _mesa_index_buffer *ib,

+			  struct gl_buffer_object **bo,

+			  GLuint *nr_bo)

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   GLuint i;

+   void *ptr;

+

+   if (!ib) {

+      VB->Elts = NULL;

+      return;

+   }

+

+   if (ib->obj->Name && !ib->obj->Pointer) {

+      bo[*nr_bo] = ib->obj;

+      (*nr_bo)++;

+      ctx->Driver.MapBuffer(ctx, 

+			    GL_ELEMENT_ARRAY_BUFFER,

+			    GL_READ_ONLY_ARB,

+			    ib->obj);

+

+      assert(ib->obj->Pointer);

+   }

+

+   ptr = ADD_POINTERS(ib->obj->Pointer, ib->ptr);

+

+   if (ib->type == GL_UNSIGNED_INT && VB->Primitive[0].basevertex == 0) {

+      VB->Elts = (GLuint *) ptr;

+   }

+   else {

+      GLuint *elts = (GLuint *)get_space(ctx, ib->count * sizeof(GLuint));

+      VB->Elts = elts;

+

+      if (ib->type == GL_UNSIGNED_INT) {

+	 const GLuint *in = (GLuint *)ptr;

+	 for (i = 0; i < ib->count; i++)

+	    *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex;

+      }

+      else if (ib->type == GL_UNSIGNED_SHORT) {

+	 const GLushort *in = (GLushort *)ptr;

+	 for (i = 0; i < ib->count; i++) 

+	    *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex;

+      }

+      else {

+	 const GLubyte *in = (GLubyte *)ptr;

+	 for (i = 0; i < ib->count; i++) 

+	    *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex;

+      }

+   }

+}

+

+static void bind_prims( struct gl_context *ctx,

+			const struct _mesa_prim *prim,

+			GLuint nr_prims )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+

+   VB->Primitive = prim;

+   VB->PrimitiveCount = nr_prims;

+}

+

+static void unmap_vbos( struct gl_context *ctx,

+			struct gl_buffer_object **bo,

+			GLuint nr_bo )

+{

+   GLuint i;

+   for (i = 0; i < nr_bo; i++) { 

+      ctx->Driver.UnmapBuffer(ctx, 

+			      0, /* target -- I don't see why this would be needed */

+			      bo[i]);

+   }

+}

+

+

+void _tnl_vbo_draw_prims(struct gl_context *ctx,

+			 const struct gl_client_array *arrays[],

+			 const struct _mesa_prim *prim,

+			 GLuint nr_prims,

+			 const struct _mesa_index_buffer *ib,

+			 GLboolean index_bounds_valid,

+			 GLuint min_index,

+			 GLuint max_index)

+{

+   if (!index_bounds_valid)

+      vbo_get_minmax_index(ctx, prim, ib, &min_index, &max_index);

+

+   _tnl_draw_prims(ctx, arrays, prim, nr_prims, ib, min_index, max_index);

+}

+

+/* This is the main entrypoint into the slimmed-down software tnl

+ * module.  In a regular swtnl driver, this can be plugged straight

+ * into the vbo->Driver.DrawPrims() callback.

+ */

+void _tnl_draw_prims( struct gl_context *ctx,

+		      const struct gl_client_array *arrays[],

+		      const struct _mesa_prim *prim,

+		      GLuint nr_prims,

+		      const struct _mesa_index_buffer *ib,

+		      GLuint min_index,

+		      GLuint max_index)

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   const GLuint TEST_SPLIT = 0;

+   const GLint max = TEST_SPLIT ? 8 : tnl->vb.Size - MAX_CLIPPED_VERTICES;

+   GLint max_basevertex = prim->basevertex;

+   GLuint i;

+

+   /* Mesa core state should have been validated already */

+   assert(ctx->NewState == 0x0);

+

+   if (!_mesa_check_conditional_render(ctx))

+      return; /* don't draw */

+

+   for (i = 1; i < nr_prims; i++)

+      max_basevertex = MAX2(max_basevertex, prim[i].basevertex);

+

+   if (0)

+   {

+      printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);

+      for (i = 0; i < nr_prims; i++)

+	 printf("prim %d: %s start %d count %d\n", i, 

+		_mesa_lookup_enum_by_nr(prim[i].mode),

+		prim[i].start,

+		prim[i].count);

+   }

+

+   if (min_index) {

+      /* We always translate away calls with min_index != 0. 

+       */

+      vbo_rebase_prims( ctx, arrays, prim, nr_prims, ib, 

+			min_index, max_index,

+			_tnl_vbo_draw_prims );

+      return;

+   }

+   else if ((GLint)max_index + max_basevertex > max) {

+      /* The software TNL pipeline has a fixed amount of storage for

+       * vertices and it is necessary to split incoming drawing commands

+       * if they exceed that limit.

+       */

+      struct split_limits limits;

+      limits.max_verts = max;

+      limits.max_vb_size = ~0;

+      limits.max_indices = ~0;

+

+      /* This will split the buffers one way or another and

+       * recursively call back into this function.

+       */

+      vbo_split_prims( ctx, arrays, prim, nr_prims, ib, 

+		       0, max_index + prim->basevertex,

+		       _tnl_vbo_draw_prims,

+		       &limits );

+   }

+   else {

+      /* May need to map a vertex buffer object for every attribute plus

+       * one for the index buffer.

+       */

+      struct gl_buffer_object *bo[VERT_ATTRIB_MAX + 1];

+      GLuint nr_bo = 0;

+      GLuint inst;

+

+      for (i = 0; i < nr_prims;) {

+	 GLuint this_nr_prims;

+

+	 /* Our SW TNL pipeline doesn't handle basevertex yet, so bind_indices

+	  * will rebase the elements to the basevertex, and we'll only

+	  * emit strings of prims with the same basevertex in one draw call.

+	  */

+	 for (this_nr_prims = 1; i + this_nr_prims < nr_prims;

+	      this_nr_prims++) {

+	    if (prim[i].basevertex != prim[i + this_nr_prims].basevertex)

+	       break;

+	 }

+

+         assert(prim[i].num_instances > 0);

+

+	 /* Binding inputs may imply mapping some vertex buffer objects.

+	  * They will need to be unmapped below.

+	  */

+         for (inst = 0; inst < prim[i].num_instances; inst++) {

+

+            bind_prims(ctx, &prim[i], this_nr_prims);

+            bind_inputs(ctx, arrays, max_index + prim[i].basevertex + 1,

+                        bo, &nr_bo);

+            bind_indices(ctx, ib, bo, &nr_bo);

+

+            tnl->CurInstance = inst;

+            TNL_CONTEXT(ctx)->Driver.RunPipeline(ctx);

+

+            unmap_vbos(ctx, bo, nr_bo);

+            free_space(ctx);

+         }

+

+	 i += this_nr_prims;

+      }

+   }

+}

+

diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h
index 26c3d4e0a..37bdde9a8 100644
--- a/mesalib/src/mesa/vbo/vbo.h
+++ b/mesalib/src/mesa/vbo/vbo.h
@@ -1,176 +1,176 @@
-/*
- * mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-/**
- * \file vbo_context.h
- * \brief VBO builder module datatypes and definitions.
- * \author Keith Whitwell
- */
-
-
-#ifndef _VBO_H
-#define _VBO_H
-
-#include "main/glheader.h"
-
-struct gl_client_array;
-struct gl_context;
-
-struct _mesa_prim {
-   GLuint mode:8;    /**< GL_POINTS, GL_LINES, GL_QUAD_STRIP, etc */
-   GLuint indexed:1;
-   GLuint begin:1;
-   GLuint end:1;
-   GLuint weak:1;
-   GLuint no_current_update:1;
-   GLuint pad:19;
-
-   GLuint start;
-   GLuint count;
-   GLint basevertex;
-   GLsizei num_instances;
-};
-
-/* Would like to call this a "vbo_index_buffer", but this would be
- * confusing as the indices are not neccessarily yet in a non-null
- * buffer object.
- */
-struct _mesa_index_buffer {
-   GLuint count;
-   GLenum type;
-   struct gl_buffer_object *obj;
-   const void *ptr;
-};
-
-
-
-GLboolean _vbo_CreateContext( struct gl_context *ctx );
-void _vbo_DestroyContext( struct gl_context *ctx );
-void _vbo_InvalidateState( struct gl_context *ctx, GLuint new_state );
-
-
-typedef void (*vbo_draw_func)( struct gl_context *ctx,
-			       const struct gl_client_array **arrays,
-			       const struct _mesa_prim *prims,
-			       GLuint nr_prims,
-			       const struct _mesa_index_buffer *ib,
-			       GLboolean index_bounds_valid,
-			       GLuint min_index,
-			       GLuint max_index );
-
-
-
-
-/* Utility function to cope with various constraints on tnl modules or
- * hardware.  This can be used to split an incoming set of arrays and
- * primitives against the following constraints:
- *    - Maximum number of indices in index buffer.
- *    - Maximum number of vertices referenced by index buffer.
- *    - Maximum hardware vertex buffer size.
- */
-struct split_limits {
-   GLuint max_verts;
-   GLuint max_indices;
-   GLuint max_vb_size;		/* bytes */
-};
-
-
-void vbo_split_prims( struct gl_context *ctx,
-		      const struct gl_client_array *arrays[],
-		      const struct _mesa_prim *prim,
-		      GLuint nr_prims,
-		      const struct _mesa_index_buffer *ib,
-		      GLuint min_index,
-		      GLuint max_index,
-		      vbo_draw_func draw,
-		      const struct split_limits *limits );
-
-
-/* Helpers for dealing translating away non-zero min_index.
- */
-GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] );
-GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] );
-
-void vbo_rebase_prims( struct gl_context *ctx,
-		       const struct gl_client_array *arrays[],
-		       const struct _mesa_prim *prim,
-		       GLuint nr_prims,
-		       const struct _mesa_index_buffer *ib,
-		       GLuint min_index,
-		       GLuint max_index,
-		       vbo_draw_func draw );
-void
-vbo_get_minmax_index(struct gl_context *ctx, const struct _mesa_prim *prim,
-		     const struct _mesa_index_buffer *ib,
-		     GLuint *min_index, GLuint *max_index);
-
-void vbo_use_buffer_objects(struct gl_context *ctx);
-
-void vbo_always_unmap_buffers(struct gl_context *ctx);
-
-void vbo_set_draw_func(struct gl_context *ctx, vbo_draw_func func);
-
-void vbo_check_buffers_are_unmapped(struct gl_context *ctx);
-
-
-void GLAPIENTRY
-_es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a);
-
-void GLAPIENTRY
-_es_Normal3f(GLfloat x, GLfloat y, GLfloat z);
-
-void GLAPIENTRY
-_es_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-
-void GLAPIENTRY
-_es_Materialfv(GLenum face, GLenum pname, const GLfloat *params);
-
-void GLAPIENTRY
-_es_Materialf(GLenum face, GLenum pname, GLfloat param);
-
-void GLAPIENTRY
-_es_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
-void GLAPIENTRY
-_es_VertexAttrib1f(GLuint indx, GLfloat x);
-
-void GLAPIENTRY
-_es_VertexAttrib1fv(GLuint indx, const GLfloat* values);
-
-void GLAPIENTRY
-_es_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);
-
-void GLAPIENTRY
-_es_VertexAttrib2fv(GLuint indx, const GLfloat* values);
-
-void GLAPIENTRY
-_es_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
-
-void GLAPIENTRY
-_es_VertexAttrib3fv(GLuint indx, const GLfloat* values);
-
-void GLAPIENTRY
-_es_VertexAttrib4fv(GLuint indx, const GLfloat* values);
-
-#endif
+/*

+ * mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+/**

+ * \file vbo_context.h

+ * \brief VBO builder module datatypes and definitions.

+ * \author Keith Whitwell

+ */

+

+

+#ifndef _VBO_H

+#define _VBO_H

+

+#include "main/glheader.h"

+

+struct gl_client_array;

+struct gl_context;

+

+struct _mesa_prim {

+   GLuint mode:8;    /**< GL_POINTS, GL_LINES, GL_QUAD_STRIP, etc */

+   GLuint indexed:1;

+   GLuint begin:1;

+   GLuint end:1;

+   GLuint weak:1;

+   GLuint no_current_update:1;

+   GLuint pad:19;

+

+   GLuint start;

+   GLuint count;

+   GLint basevertex;

+   GLsizei num_instances;

+};

+

+/* Would like to call this a "vbo_index_buffer", but this would be

+ * confusing as the indices are not neccessarily yet in a non-null

+ * buffer object.

+ */

+struct _mesa_index_buffer {

+   GLuint count;

+   GLenum type;

+   struct gl_buffer_object *obj;

+   const void *ptr;

+};

+

+

+

+GLboolean _vbo_CreateContext( struct gl_context *ctx );

+void _vbo_DestroyContext( struct gl_context *ctx );

+void _vbo_InvalidateState( struct gl_context *ctx, GLuint new_state );

+

+

+typedef void (*vbo_draw_func)( struct gl_context *ctx,

+			       const struct gl_client_array **arrays,

+			       const struct _mesa_prim *prims,

+			       GLuint nr_prims,

+			       const struct _mesa_index_buffer *ib,

+			       GLboolean index_bounds_valid,

+			       GLuint min_index,

+			       GLuint max_index );

+

+

+

+

+/* Utility function to cope with various constraints on tnl modules or

+ * hardware.  This can be used to split an incoming set of arrays and

+ * primitives against the following constraints:

+ *    - Maximum number of indices in index buffer.

+ *    - Maximum number of vertices referenced by index buffer.

+ *    - Maximum hardware vertex buffer size.

+ */

+struct split_limits {

+   GLuint max_verts;

+   GLuint max_indices;

+   GLuint max_vb_size;		/* bytes */

+};

+

+

+void vbo_split_prims( struct gl_context *ctx,

+		      const struct gl_client_array *arrays[],

+		      const struct _mesa_prim *prim,

+		      GLuint nr_prims,

+		      const struct _mesa_index_buffer *ib,

+		      GLuint min_index,

+		      GLuint max_index,

+		      vbo_draw_func draw,

+		      const struct split_limits *limits );

+

+

+/* Helpers for dealing translating away non-zero min_index.

+ */

+GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] );

+GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] );

+

+void vbo_rebase_prims( struct gl_context *ctx,

+		       const struct gl_client_array *arrays[],

+		       const struct _mesa_prim *prim,

+		       GLuint nr_prims,

+		       const struct _mesa_index_buffer *ib,

+		       GLuint min_index,

+		       GLuint max_index,

+		       vbo_draw_func draw );

+void

+vbo_get_minmax_index(struct gl_context *ctx, const struct _mesa_prim *prim,

+		     const struct _mesa_index_buffer *ib,

+		     GLuint *min_index, GLuint *max_index);

+

+void vbo_use_buffer_objects(struct gl_context *ctx);

+

+void vbo_always_unmap_buffers(struct gl_context *ctx);

+

+void vbo_set_draw_func(struct gl_context *ctx, vbo_draw_func func);

+

+void vbo_check_buffers_are_unmapped(struct gl_context *ctx);

+

+

+void GLAPIENTRY

+_es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a);

+

+void GLAPIENTRY

+_es_Normal3f(GLfloat x, GLfloat y, GLfloat z);

+

+void GLAPIENTRY

+_es_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);

+

+void GLAPIENTRY

+_es_Materialfv(GLenum face, GLenum pname, const GLfloat *params);

+

+void GLAPIENTRY

+_es_Materialf(GLenum face, GLenum pname, GLfloat param);

+

+void GLAPIENTRY

+_es_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);

+

+void GLAPIENTRY

+_es_VertexAttrib1f(GLuint indx, GLfloat x);

+

+void GLAPIENTRY

+_es_VertexAttrib1fv(GLuint indx, const GLfloat* values);

+

+void GLAPIENTRY

+_es_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);

+

+void GLAPIENTRY

+_es_VertexAttrib2fv(GLuint indx, const GLfloat* values);

+

+void GLAPIENTRY

+_es_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);

+

+void GLAPIENTRY

+_es_VertexAttrib3fv(GLuint indx, const GLfloat* values);

+

+void GLAPIENTRY

+_es_VertexAttrib4fv(GLuint indx, const GLfloat* values);

+

+#endif

diff --git a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
index c793ce0dc..198b2d85f 100644
--- a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
@@ -1,740 +1,740 @@
-/**************************************************************************
-
-Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
-
-All Rights Reserved.
-
-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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, 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 (including the next
-paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
-TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS 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.
-
-**************************************************************************/
-
-/* float */
-#define ATTR1FV( A, V ) ATTR( A, 1, (V)[0], 0, 0, 1 )
-#define ATTR2FV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )
-#define ATTR3FV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )
-#define ATTR4FV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
-
-#define ATTR1F( A, X )          ATTR( A, 1, X, 0, 0, 1 )
-#define ATTR2F( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )
-#define ATTR3F( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )
-#define ATTR4F( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )
-
-/* int */
-#define ATTR2IV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )
-#define ATTR3IV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )
-#define ATTR4IV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
-
-#define ATTR1I( A, X )          ATTR( A, 1, X, 0, 0, 1 )
-#define ATTR2I( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )
-#define ATTR3I( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )
-#define ATTR4I( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )
-
-
-/* uint */
-#define ATTR2UIV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )
-#define ATTR3UIV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )
-#define ATTR4UIV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
-
-#define ATTR1UI( A, X )          ATTR( A, 1, X, 0, 0, 1 )
-#define ATTR2UI( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )
-#define ATTR3UI( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )
-#define ATTR4UI( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )
-
-#define MAT_ATTR( A, N, V ) ATTR( A, N, (V)[0], (V)[1], (V)[2], (V)[3] )
-
-
-
-static void GLAPIENTRY
-TAG(Vertex2f)(GLfloat x, GLfloat y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR2F(VBO_ATTRIB_POS, x, y);
-}
-
-static void GLAPIENTRY
-TAG(Vertex2fv)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR2FV(VBO_ATTRIB_POS, v);
-}
-
-static void GLAPIENTRY
-TAG(Vertex3f)(GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR3F(VBO_ATTRIB_POS, x, y, z);
-}
-
-static void GLAPIENTRY
-TAG(Vertex3fv)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR3FV(VBO_ATTRIB_POS, v);
-}
-
-static void GLAPIENTRY
-TAG(Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR4F(VBO_ATTRIB_POS, x, y, z, w);
-}
-
-static void GLAPIENTRY
-TAG(Vertex4fv)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR4FV(VBO_ATTRIB_POS, v);
-}
-
-
-
-static void GLAPIENTRY
-TAG(TexCoord1f)(GLfloat x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR1F(VBO_ATTRIB_TEX0, x);
-}
-
-static void GLAPIENTRY
-TAG(TexCoord1fv)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR1FV(VBO_ATTRIB_TEX0, v);
-}
-
-static void GLAPIENTRY
-TAG(TexCoord2f)(GLfloat x, GLfloat y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR2F(VBO_ATTRIB_TEX0, x, y);
-}
-
-static void GLAPIENTRY
-TAG(TexCoord2fv)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR2FV(VBO_ATTRIB_TEX0, v);
-}
-
-static void GLAPIENTRY
-TAG(TexCoord3f)(GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR3F(VBO_ATTRIB_TEX0, x, y, z);
-}
-
-static void GLAPIENTRY
-TAG(TexCoord3fv)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR3FV(VBO_ATTRIB_TEX0, v);
-}
-
-static void GLAPIENTRY
-TAG(TexCoord4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR4F(VBO_ATTRIB_TEX0, x, y, z, w);
-}
-
-static void GLAPIENTRY
-TAG(TexCoord4fv)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR4FV(VBO_ATTRIB_TEX0, v);
-}
-
-
-
-static void GLAPIENTRY
-TAG(Normal3f)(GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR3F(VBO_ATTRIB_NORMAL, x, y, z);
-}
-
-static void GLAPIENTRY
-TAG(Normal3fv)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR3FV(VBO_ATTRIB_NORMAL, v);
-}
-
-
-
-static void GLAPIENTRY
-TAG(FogCoordfEXT)(GLfloat x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR1F(VBO_ATTRIB_FOG, x);
-}
-
-
-
-static void GLAPIENTRY
-TAG(FogCoordfvEXT)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR1FV(VBO_ATTRIB_FOG, v);
-}
-
-static void GLAPIENTRY
-TAG(Color3f)(GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR3F(VBO_ATTRIB_COLOR0, x, y, z);
-}
-
-static void GLAPIENTRY
-TAG(Color3fv)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR3FV(VBO_ATTRIB_COLOR0, v);
-}
-
-static void GLAPIENTRY
-TAG(Color4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR4F(VBO_ATTRIB_COLOR0, x, y, z, w);
-}
-
-static void GLAPIENTRY
-TAG(Color4fv)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR4FV(VBO_ATTRIB_COLOR0, v);
-}
-
-
-
-static void GLAPIENTRY
-TAG(SecondaryColor3fEXT)(GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR3F(VBO_ATTRIB_COLOR1, x, y, z);
-}
-
-static void GLAPIENTRY
-TAG(SecondaryColor3fvEXT)(const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR3FV(VBO_ATTRIB_COLOR1, v);
-}
-
-
-
-static void GLAPIENTRY
-TAG(EdgeFlag)(GLboolean b)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR1F(VBO_ATTRIB_EDGEFLAG, (GLfloat) b);
-}
-
-
-
-static void GLAPIENTRY
-TAG(Indexf)(GLfloat f)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR1F(VBO_ATTRIB_INDEX, f);
-}
-
-static void GLAPIENTRY
-TAG(Indexfv)(const GLfloat * f)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ATTR1FV(VBO_ATTRIB_INDEX, f);
-}
-
-
-
-static void GLAPIENTRY
-TAG(MultiTexCoord1f)(GLenum target, GLfloat x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR1F(attr, x);
-}
-
-static void GLAPIENTRY
-TAG(MultiTexCoord1fv)(GLenum target, const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR1FV(attr, v);
-}
-
-static void GLAPIENTRY
-TAG(MultiTexCoord2f)(GLenum target, GLfloat x, GLfloat y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR2F(attr, x, y);
-}
-
-static void GLAPIENTRY
-TAG(MultiTexCoord2fv)(GLenum target, const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR2FV(attr, v);
-}
-
-static void GLAPIENTRY
-TAG(MultiTexCoord3f)(GLenum target, GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR3F(attr, x, y, z);
-}
-
-static void GLAPIENTRY
-TAG(MultiTexCoord3fv)(GLenum target, const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR3FV(attr, v);
-}
-
-static void GLAPIENTRY
-TAG(MultiTexCoord4f)(GLenum target, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR4F(attr, x, y, z, w);
-}
-
-static void GLAPIENTRY
-TAG(MultiTexCoord4fv)(GLenum target, const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR4FV(attr, v);
-}
-
-
-
-static void GLAPIENTRY
-TAG(VertexAttrib1fARB)(GLuint index, GLfloat x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR1F(0, x);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR1F(VBO_ATTRIB_GENERIC0 + index, x);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib1fvARB)(GLuint index, const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR1FV(0, v);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR1FV(VBO_ATTRIB_GENERIC0 + index, v);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR2F(0, x, y);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR2F(VBO_ATTRIB_GENERIC0 + index, x, y);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib2fvARB)(GLuint index, const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR2FV(0, v);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR2FV(VBO_ATTRIB_GENERIC0 + index, v);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR3F(0, x, y, z);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR3F(VBO_ATTRIB_GENERIC0 + index, x, y, z);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib3fvARB)(GLuint index, const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR3FV(0, v);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR3FV(VBO_ATTRIB_GENERIC0 + index, v);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR4F(0, x, y, z, w);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR4F(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib4fvARB)(GLuint index, const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR4FV(0, v);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR4FV(VBO_ATTRIB_GENERIC0 + index, v);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-
-
-/* Integer-valued generic attributes.
- * XXX: the integers just get converted to floats at this time
- */
-static void GLAPIENTRY
-TAG(VertexAttribI1i)(GLuint index, GLint x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR1I(0, x);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR1I(VBO_ATTRIB_GENERIC0 + index, x);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI2i)(GLuint index, GLint x, GLint y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR2I(0, x, y);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR2I(VBO_ATTRIB_GENERIC0 + index, x, y);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR3I(0, x, y, z);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR3I(VBO_ATTRIB_GENERIC0 + index, x, y, z);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR4I(0, x, y, z, w);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR4I(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI2iv)(GLuint index, const GLint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR2IV(0, v);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR2IV(VBO_ATTRIB_GENERIC0 + index, v);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI3iv)(GLuint index, const GLint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR3IV(0, v);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR3IV(VBO_ATTRIB_GENERIC0 + index, v);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI4iv)(GLuint index, const GLint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR4IV(0, v);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR4IV(VBO_ATTRIB_GENERIC0 + index, v);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-
-
-/* Unsigned integer-valued generic attributes.
- * XXX: the integers just get converted to floats at this time
- */
-static void GLAPIENTRY
-TAG(VertexAttribI1ui)(GLuint index, GLuint x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR1UI(0, x);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR1UI(VBO_ATTRIB_GENERIC0 + index, x);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR2UI(0, x, y);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR2UI(VBO_ATTRIB_GENERIC0 + index, x, y);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR3UI(0, x, y, z);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR3UI(VBO_ATTRIB_GENERIC0 + index, x, y, z);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR4UI(0, x, y, z, w);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR4UI(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI2uiv)(GLuint index, const GLuint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR2UIV(0, v);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR2UIV(VBO_ATTRIB_GENERIC0 + index, v);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI3uiv)(GLuint index, const GLuint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR3UIV(0, v);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR3UIV(VBO_ATTRIB_GENERIC0 + index, v);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttribI4uiv)(GLuint index, const GLuint *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index == 0)
-      ATTR4UIV(0, v);
-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR4UIV(VBO_ATTRIB_GENERIC0 + index, v);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-
-
-/* In addition to supporting NV_vertex_program, these entrypoints are
- * used by the display list and other code specifically because of
- * their property of aliasing with other attributes.  (See
- * vbo_save_loopback.c)
- */
-static void GLAPIENTRY
-TAG(VertexAttrib1fNV)(GLuint index, GLfloat x)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < VBO_ATTRIB_MAX)
-      ATTR1F(index, x);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib1fvNV)(GLuint index, const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < VBO_ATTRIB_MAX)
-      ATTR1FV(index, v);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < VBO_ATTRIB_MAX)
-      ATTR2F(index, x, y);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib2fvNV)(GLuint index, const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < VBO_ATTRIB_MAX)
-      ATTR2FV(index, v);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < VBO_ATTRIB_MAX)
-      ATTR3F(index, x, y, z);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib3fvNV)(GLuint index,
- const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < VBO_ATTRIB_MAX)
-      ATTR3FV(index, v);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < VBO_ATTRIB_MAX)
-      ATTR4F(index, x, y, z, w);
-}
-
-static void GLAPIENTRY
-TAG(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < VBO_ATTRIB_MAX)
-      ATTR4FV(index, v);
-}
-
-
-
-#define MAT( ATTR, N, face, params )			\
-do {							\
-   if (face != GL_BACK)					\
-      MAT_ATTR( ATTR, N, params ); /* front */		\
-   if (face != GL_FRONT)				\
-      MAT_ATTR( ATTR + 1, N, params ); /* back */	\
-} while (0)
-
-
-/* Colormaterial conflicts are dealt with later.
- */
-static void GLAPIENTRY
-TAG(Materialfv)(GLenum face, GLenum pname,
-                 const GLfloat * params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   switch (pname) {
-   case GL_EMISSION:
-      MAT(VBO_ATTRIB_MAT_FRONT_EMISSION, 4, face, params);
-      break;
-   case GL_AMBIENT:
-      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);
-      break;
-   case GL_DIFFUSE:
-      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);
-      break;
-   case GL_SPECULAR:
-      MAT(VBO_ATTRIB_MAT_FRONT_SPECULAR, 4, face, params);
-      break;
-   case GL_SHININESS:
-      MAT(VBO_ATTRIB_MAT_FRONT_SHININESS, 1, face, params);
-      break;
-   case GL_COLOR_INDEXES:
-      MAT(VBO_ATTRIB_MAT_FRONT_INDEXES, 3, face, params);
-      break;
-   case GL_AMBIENT_AND_DIFFUSE:
-      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);
-      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);
-      break;
-   default:
-      ERROR(GL_INVALID_ENUM);
-      return;
-   }
-}
-
-
-#undef ATTR1FV
-#undef ATTR2FV
-#undef ATTR3FV
-#undef ATTR4FV
-
-#undef ATTR1F
-#undef ATTR2F
-#undef ATTR3F
-#undef ATTR4F
-
-#undef MAT
-#undef MAT_ATTR
+/**************************************************************************

+

+Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.

+

+All Rights Reserved.

+

+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

+on the rights to use, copy, modify, merge, publish, distribute, sub

+license, 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 (including the next

+paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL

+TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS 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.

+

+**************************************************************************/

+

+/* float */

+#define ATTR1FV( A, V ) ATTR( A, 1, (V)[0], 0, 0, 1 )

+#define ATTR2FV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )

+#define ATTR3FV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )

+#define ATTR4FV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )

+

+#define ATTR1F( A, X )          ATTR( A, 1, X, 0, 0, 1 )

+#define ATTR2F( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )

+#define ATTR3F( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )

+#define ATTR4F( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )

+

+/* int */

+#define ATTR2IV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )

+#define ATTR3IV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )

+#define ATTR4IV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )

+

+#define ATTR1I( A, X )          ATTR( A, 1, X, 0, 0, 1 )

+#define ATTR2I( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )

+#define ATTR3I( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )

+#define ATTR4I( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )

+

+

+/* uint */

+#define ATTR2UIV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )

+#define ATTR3UIV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )

+#define ATTR4UIV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )

+

+#define ATTR1UI( A, X )          ATTR( A, 1, X, 0, 0, 1 )

+#define ATTR2UI( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )

+#define ATTR3UI( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )

+#define ATTR4UI( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )

+

+#define MAT_ATTR( A, N, V ) ATTR( A, N, (V)[0], (V)[1], (V)[2], (V)[3] )

+

+

+

+static void GLAPIENTRY

+TAG(Vertex2f)(GLfloat x, GLfloat y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR2F(VBO_ATTRIB_POS, x, y);

+}

+

+static void GLAPIENTRY

+TAG(Vertex2fv)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR2FV(VBO_ATTRIB_POS, v);

+}

+

+static void GLAPIENTRY

+TAG(Vertex3f)(GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR3F(VBO_ATTRIB_POS, x, y, z);

+}

+

+static void GLAPIENTRY

+TAG(Vertex3fv)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR3FV(VBO_ATTRIB_POS, v);

+}

+

+static void GLAPIENTRY

+TAG(Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR4F(VBO_ATTRIB_POS, x, y, z, w);

+}

+

+static void GLAPIENTRY

+TAG(Vertex4fv)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR4FV(VBO_ATTRIB_POS, v);

+}

+

+

+

+static void GLAPIENTRY

+TAG(TexCoord1f)(GLfloat x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR1F(VBO_ATTRIB_TEX0, x);

+}

+

+static void GLAPIENTRY

+TAG(TexCoord1fv)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR1FV(VBO_ATTRIB_TEX0, v);

+}

+

+static void GLAPIENTRY

+TAG(TexCoord2f)(GLfloat x, GLfloat y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR2F(VBO_ATTRIB_TEX0, x, y);

+}

+

+static void GLAPIENTRY

+TAG(TexCoord2fv)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR2FV(VBO_ATTRIB_TEX0, v);

+}

+

+static void GLAPIENTRY

+TAG(TexCoord3f)(GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR3F(VBO_ATTRIB_TEX0, x, y, z);

+}

+

+static void GLAPIENTRY

+TAG(TexCoord3fv)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR3FV(VBO_ATTRIB_TEX0, v);

+}

+

+static void GLAPIENTRY

+TAG(TexCoord4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR4F(VBO_ATTRIB_TEX0, x, y, z, w);

+}

+

+static void GLAPIENTRY

+TAG(TexCoord4fv)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR4FV(VBO_ATTRIB_TEX0, v);

+}

+

+

+

+static void GLAPIENTRY

+TAG(Normal3f)(GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR3F(VBO_ATTRIB_NORMAL, x, y, z);

+}

+

+static void GLAPIENTRY

+TAG(Normal3fv)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR3FV(VBO_ATTRIB_NORMAL, v);

+}

+

+

+

+static void GLAPIENTRY

+TAG(FogCoordfEXT)(GLfloat x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR1F(VBO_ATTRIB_FOG, x);

+}

+

+

+

+static void GLAPIENTRY

+TAG(FogCoordfvEXT)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR1FV(VBO_ATTRIB_FOG, v);

+}

+

+static void GLAPIENTRY

+TAG(Color3f)(GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR3F(VBO_ATTRIB_COLOR0, x, y, z);

+}

+

+static void GLAPIENTRY

+TAG(Color3fv)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR3FV(VBO_ATTRIB_COLOR0, v);

+}

+

+static void GLAPIENTRY

+TAG(Color4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR4F(VBO_ATTRIB_COLOR0, x, y, z, w);

+}

+

+static void GLAPIENTRY

+TAG(Color4fv)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR4FV(VBO_ATTRIB_COLOR0, v);

+}

+

+

+

+static void GLAPIENTRY

+TAG(SecondaryColor3fEXT)(GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR3F(VBO_ATTRIB_COLOR1, x, y, z);

+}

+

+static void GLAPIENTRY

+TAG(SecondaryColor3fvEXT)(const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR3FV(VBO_ATTRIB_COLOR1, v);

+}

+

+

+

+static void GLAPIENTRY

+TAG(EdgeFlag)(GLboolean b)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR1F(VBO_ATTRIB_EDGEFLAG, (GLfloat) b);

+}

+

+

+

+static void GLAPIENTRY

+TAG(Indexf)(GLfloat f)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR1F(VBO_ATTRIB_INDEX, f);

+}

+

+static void GLAPIENTRY

+TAG(Indexfv)(const GLfloat * f)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ATTR1FV(VBO_ATTRIB_INDEX, f);

+}

+

+

+

+static void GLAPIENTRY

+TAG(MultiTexCoord1f)(GLenum target, GLfloat x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

+   ATTR1F(attr, x);

+}

+

+static void GLAPIENTRY

+TAG(MultiTexCoord1fv)(GLenum target, const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

+   ATTR1FV(attr, v);

+}

+

+static void GLAPIENTRY

+TAG(MultiTexCoord2f)(GLenum target, GLfloat x, GLfloat y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

+   ATTR2F(attr, x, y);

+}

+

+static void GLAPIENTRY

+TAG(MultiTexCoord2fv)(GLenum target, const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

+   ATTR2FV(attr, v);

+}

+

+static void GLAPIENTRY

+TAG(MultiTexCoord3f)(GLenum target, GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

+   ATTR3F(attr, x, y, z);

+}

+

+static void GLAPIENTRY

+TAG(MultiTexCoord3fv)(GLenum target, const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

+   ATTR3FV(attr, v);

+}

+

+static void GLAPIENTRY

+TAG(MultiTexCoord4f)(GLenum target, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

+   ATTR4F(attr, x, y, z, w);

+}

+

+static void GLAPIENTRY

+TAG(MultiTexCoord4fv)(GLenum target, const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

+   ATTR4FV(attr, v);

+}

+

+

+

+static void GLAPIENTRY

+TAG(VertexAttrib1fARB)(GLuint index, GLfloat x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR1F(0, x);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR1F(VBO_ATTRIB_GENERIC0 + index, x);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib1fvARB)(GLuint index, const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR1FV(0, v);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR1FV(VBO_ATTRIB_GENERIC0 + index, v);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR2F(0, x, y);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR2F(VBO_ATTRIB_GENERIC0 + index, x, y);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib2fvARB)(GLuint index, const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR2FV(0, v);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR2FV(VBO_ATTRIB_GENERIC0 + index, v);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR3F(0, x, y, z);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR3F(VBO_ATTRIB_GENERIC0 + index, x, y, z);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib3fvARB)(GLuint index, const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR3FV(0, v);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR3FV(VBO_ATTRIB_GENERIC0 + index, v);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR4F(0, x, y, z, w);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR4F(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib4fvARB)(GLuint index, const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR4FV(0, v);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR4FV(VBO_ATTRIB_GENERIC0 + index, v);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+

+

+/* Integer-valued generic attributes.

+ * XXX: the integers just get converted to floats at this time

+ */

+static void GLAPIENTRY

+TAG(VertexAttribI1i)(GLuint index, GLint x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR1I(0, x);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR1I(VBO_ATTRIB_GENERIC0 + index, x);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI2i)(GLuint index, GLint x, GLint y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR2I(0, x, y);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR2I(VBO_ATTRIB_GENERIC0 + index, x, y);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR3I(0, x, y, z);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR3I(VBO_ATTRIB_GENERIC0 + index, x, y, z);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR4I(0, x, y, z, w);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR4I(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI2iv)(GLuint index, const GLint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR2IV(0, v);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR2IV(VBO_ATTRIB_GENERIC0 + index, v);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI3iv)(GLuint index, const GLint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR3IV(0, v);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR3IV(VBO_ATTRIB_GENERIC0 + index, v);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI4iv)(GLuint index, const GLint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR4IV(0, v);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR4IV(VBO_ATTRIB_GENERIC0 + index, v);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+

+

+/* Unsigned integer-valued generic attributes.

+ * XXX: the integers just get converted to floats at this time

+ */

+static void GLAPIENTRY

+TAG(VertexAttribI1ui)(GLuint index, GLuint x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR1UI(0, x);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR1UI(VBO_ATTRIB_GENERIC0 + index, x);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR2UI(0, x, y);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR2UI(VBO_ATTRIB_GENERIC0 + index, x, y);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR3UI(0, x, y, z);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR3UI(VBO_ATTRIB_GENERIC0 + index, x, y, z);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR4UI(0, x, y, z, w);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR4UI(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI2uiv)(GLuint index, const GLuint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR2UIV(0, v);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR2UIV(VBO_ATTRIB_GENERIC0 + index, v);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI3uiv)(GLuint index, const GLuint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR3UIV(0, v);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR3UIV(VBO_ATTRIB_GENERIC0 + index, v);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttribI4uiv)(GLuint index, const GLuint *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index == 0)

+      ATTR4UIV(0, v);

+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR4UIV(VBO_ATTRIB_GENERIC0 + index, v);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+

+

+/* In addition to supporting NV_vertex_program, these entrypoints are

+ * used by the display list and other code specifically because of

+ * their property of aliasing with other attributes.  (See

+ * vbo_save_loopback.c)

+ */

+static void GLAPIENTRY

+TAG(VertexAttrib1fNV)(GLuint index, GLfloat x)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < VBO_ATTRIB_MAX)

+      ATTR1F(index, x);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib1fvNV)(GLuint index, const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < VBO_ATTRIB_MAX)

+      ATTR1FV(index, v);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < VBO_ATTRIB_MAX)

+      ATTR2F(index, x, y);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib2fvNV)(GLuint index, const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < VBO_ATTRIB_MAX)

+      ATTR2FV(index, v);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < VBO_ATTRIB_MAX)

+      ATTR3F(index, x, y, z);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib3fvNV)(GLuint index,

+ const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < VBO_ATTRIB_MAX)

+      ATTR3FV(index, v);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < VBO_ATTRIB_MAX)

+      ATTR4F(index, x, y, z, w);

+}

+

+static void GLAPIENTRY

+TAG(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < VBO_ATTRIB_MAX)

+      ATTR4FV(index, v);

+}

+

+

+

+#define MAT( ATTR, N, face, params )			\

+do {							\

+   if (face != GL_BACK)					\

+      MAT_ATTR( ATTR, N, params ); /* front */		\

+   if (face != GL_FRONT)				\

+      MAT_ATTR( ATTR + 1, N, params ); /* back */	\

+} while (0)

+

+

+/* Colormaterial conflicts are dealt with later.

+ */

+static void GLAPIENTRY

+TAG(Materialfv)(GLenum face, GLenum pname,

+                 const GLfloat * params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   switch (pname) {

+   case GL_EMISSION:

+      MAT(VBO_ATTRIB_MAT_FRONT_EMISSION, 4, face, params);

+      break;

+   case GL_AMBIENT:

+      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);

+      break;

+   case GL_DIFFUSE:

+      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);

+      break;

+   case GL_SPECULAR:

+      MAT(VBO_ATTRIB_MAT_FRONT_SPECULAR, 4, face, params);

+      break;

+   case GL_SHININESS:

+      MAT(VBO_ATTRIB_MAT_FRONT_SHININESS, 1, face, params);

+      break;

+   case GL_COLOR_INDEXES:

+      MAT(VBO_ATTRIB_MAT_FRONT_INDEXES, 3, face, params);

+      break;

+   case GL_AMBIENT_AND_DIFFUSE:

+      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);

+      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);

+      break;

+   default:

+      ERROR(GL_INVALID_ENUM);

+      return;

+   }

+}

+

+

+#undef ATTR1FV

+#undef ATTR2FV

+#undef ATTR3FV

+#undef ATTR4FV

+

+#undef ATTR1F

+#undef ATTR2F

+#undef ATTR3F

+#undef ATTR4F

+

+#undef MAT

+#undef MAT_ATTR

diff --git a/mesalib/src/mesa/vbo/vbo_exec.h b/mesalib/src/mesa/vbo/vbo_exec.h
index d52a557e0..c8e509285 100644
--- a/mesalib/src/mesa/vbo/vbo_exec.h
+++ b/mesalib/src/mesa/vbo/vbo_exec.h
@@ -1,204 +1,204 @@
-/**************************************************************************
-
-Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
-
-All Rights Reserved.
-
-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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, 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 (including the next
-paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
-TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS 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.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Keith Whitwell <keith@tungstengraphics.com>
- *
- */
-
-#ifndef __VBO_EXEC_H__
-#define __VBO_EXEC_H__
-
-#include "main/mfeatures.h"
-#include "main/mtypes.h"
-#include "vbo.h"
-#include "vbo_attrib.h"
-
-
-/**
- * Max number of primitives (number of glBegin/End pairs) per VBO.
- */
-#define VBO_MAX_PRIM 64
-
-
-/**
- * Size of the VBO to use for glBegin/glVertex/glEnd-style rendering.
- */
-#define VBO_VERT_BUFFER_SIZE (1024*64)	/* bytes */
-
-
-/** Current vertex program mode */
-enum vp_mode {
-   VP_NONE,   /**< fixed function */
-   VP_NV,     /**< NV vertex program */
-   VP_ARB     /**< ARB vertex program or GLSL vertex shader */
-};
-
-
-struct vbo_exec_eval1_map {
-   struct gl_1d_map *map;
-   GLuint sz;
-};
-
-struct vbo_exec_eval2_map {
-   struct gl_2d_map *map;
-   GLuint sz;
-};
-
-
-
-struct vbo_exec_copied_vtx {
-   GLfloat buffer[VBO_ATTRIB_MAX * 4 * VBO_MAX_COPIED_VERTS];
-   GLuint nr;
-};
-
-
-typedef void (*vbo_attrfv_func)( const GLfloat * );
-
-
-struct vbo_exec_context
-{
-   struct gl_context *ctx;   
-   GLvertexformat vtxfmt;
-
-   struct {
-      struct gl_buffer_object *bufferobj;
-
-      GLuint vertex_size;       /* in dwords */
-
-      struct _mesa_prim prim[VBO_MAX_PRIM];
-      GLuint prim_count;
-
-      GLfloat *buffer_map;
-      GLfloat *buffer_ptr;              /* cursor, points into buffer */
-      GLuint   buffer_used;             /* in bytes */
-      GLfloat vertex[VBO_ATTRIB_MAX*4]; /* current vertex */
-
-      GLuint vert_count;
-      GLuint max_vert;
-      struct vbo_exec_copied_vtx copied;
-
-      GLubyte attrsz[VBO_ATTRIB_MAX];
-      GLubyte active_sz[VBO_ATTRIB_MAX];
-
-      GLfloat *attrptr[VBO_ATTRIB_MAX]; 
-      struct gl_client_array arrays[VERT_ATTRIB_MAX];
-
-      /* According to program mode, the values above plus current
-       * values are squashed down to the 32 attributes passed to the
-       * vertex program below:
-       */
-      enum vp_mode program_mode;
-      GLuint enabled_flags;
-      const struct gl_client_array *inputs[VERT_ATTRIB_MAX];
-   } vtx;
-
-   
-   struct {
-      GLboolean recalculate_maps;
-      struct vbo_exec_eval1_map map1[VERT_ATTRIB_MAX];
-      struct vbo_exec_eval2_map map2[VERT_ATTRIB_MAX];
-   } eval;
-
-   struct {
-      enum vp_mode program_mode;
-      GLuint enabled_flags;
-      GLuint array_obj;
-
-      /* These just mirror the current arrayobj (todo: make arrayobj
-       * look like this and remove the mirror):
-       */
-      const struct gl_client_array *legacy_array[16];
-      const struct gl_client_array *generic_array[16];
-
-      /* Arrays and current values manipulated according to program
-       * mode, etc.  These are the attributes as seen by vertex
-       * programs:
-       */
-      const struct gl_client_array *inputs[VERT_ATTRIB_MAX];
-   } array;
-
-   /* Which flags to set in vbo_exec_BeginVertices() */
-   GLbitfield begin_vertices_flags;
-
-#ifdef DEBUG
-   GLint flush_call_depth;
-#endif
-};
-
-
-
-/* External API:
- */
-void vbo_exec_init( struct gl_context *ctx );
-void vbo_exec_destroy( struct gl_context *ctx );
-void vbo_exec_invalidate_state( struct gl_context *ctx, GLuint new_state );
-
-void vbo_exec_BeginVertices( struct gl_context *ctx );
-void vbo_exec_FlushVertices( struct gl_context *ctx, GLuint flags );
-
-
-/* Internal functions:
- */
-void vbo_exec_array_init( struct vbo_exec_context *exec );
-void vbo_exec_array_destroy( struct vbo_exec_context *exec );
-
-
-void vbo_exec_vtx_init( struct vbo_exec_context *exec );
-void vbo_exec_vtx_destroy( struct vbo_exec_context *exec );
-
-#if FEATURE_beginend
-
-void vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap );
-void vbo_exec_vtx_map( struct vbo_exec_context *exec );
-
-#else /* FEATURE_beginend */
-
-static INLINE void
-vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap )
-{
-}
-
-static INLINE void
-vbo_exec_vtx_map( struct vbo_exec_context *exec )
-{
-}
-
-#endif /* FEATURE_beginend */
-
-void vbo_exec_vtx_wrap( struct vbo_exec_context *exec );
-
-void vbo_exec_eval_update( struct vbo_exec_context *exec );
-
-void vbo_exec_do_EvalCoord2f( struct vbo_exec_context *exec, 
-				     GLfloat u, GLfloat v );
-
-void vbo_exec_do_EvalCoord1f( struct vbo_exec_context *exec,
-				     GLfloat u);
-
-#endif
+/**************************************************************************

+

+Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.

+

+All Rights Reserved.

+

+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

+on the rights to use, copy, modify, merge, publish, distribute, sub

+license, 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 (including the next

+paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL

+TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS 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.

+

+**************************************************************************/

+

+/*

+ * Authors:

+ *   Keith Whitwell <keith@tungstengraphics.com>

+ *

+ */

+

+#ifndef __VBO_EXEC_H__

+#define __VBO_EXEC_H__

+

+#include "main/mfeatures.h"

+#include "main/mtypes.h"

+#include "vbo.h"

+#include "vbo_attrib.h"

+

+

+/**

+ * Max number of primitives (number of glBegin/End pairs) per VBO.

+ */

+#define VBO_MAX_PRIM 64

+

+

+/**

+ * Size of the VBO to use for glBegin/glVertex/glEnd-style rendering.

+ */

+#define VBO_VERT_BUFFER_SIZE (1024*64)	/* bytes */

+

+

+/** Current vertex program mode */

+enum vp_mode {

+   VP_NONE,   /**< fixed function */

+   VP_NV,     /**< NV vertex program */

+   VP_ARB     /**< ARB vertex program or GLSL vertex shader */

+};

+

+

+struct vbo_exec_eval1_map {

+   struct gl_1d_map *map;

+   GLuint sz;

+};

+

+struct vbo_exec_eval2_map {

+   struct gl_2d_map *map;

+   GLuint sz;

+};

+

+

+

+struct vbo_exec_copied_vtx {

+   GLfloat buffer[VBO_ATTRIB_MAX * 4 * VBO_MAX_COPIED_VERTS];

+   GLuint nr;

+};

+

+

+typedef void (*vbo_attrfv_func)( const GLfloat * );

+

+

+struct vbo_exec_context

+{

+   struct gl_context *ctx;   

+   GLvertexformat vtxfmt;

+

+   struct {

+      struct gl_buffer_object *bufferobj;

+

+      GLuint vertex_size;       /* in dwords */

+

+      struct _mesa_prim prim[VBO_MAX_PRIM];

+      GLuint prim_count;

+

+      GLfloat *buffer_map;

+      GLfloat *buffer_ptr;              /* cursor, points into buffer */

+      GLuint   buffer_used;             /* in bytes */

+      GLfloat vertex[VBO_ATTRIB_MAX*4]; /* current vertex */

+

+      GLuint vert_count;

+      GLuint max_vert;

+      struct vbo_exec_copied_vtx copied;

+

+      GLubyte attrsz[VBO_ATTRIB_MAX];

+      GLubyte active_sz[VBO_ATTRIB_MAX];

+

+      GLfloat *attrptr[VBO_ATTRIB_MAX]; 

+      struct gl_client_array arrays[VERT_ATTRIB_MAX];

+

+      /* According to program mode, the values above plus current

+       * values are squashed down to the 32 attributes passed to the

+       * vertex program below:

+       */

+      enum vp_mode program_mode;

+      GLuint enabled_flags;

+      const struct gl_client_array *inputs[VERT_ATTRIB_MAX];

+   } vtx;

+

+   

+   struct {

+      GLboolean recalculate_maps;

+      struct vbo_exec_eval1_map map1[VERT_ATTRIB_MAX];

+      struct vbo_exec_eval2_map map2[VERT_ATTRIB_MAX];

+   } eval;

+

+   struct {

+      enum vp_mode program_mode;

+      GLuint enabled_flags;

+      GLuint array_obj;

+

+      /* These just mirror the current arrayobj (todo: make arrayobj

+       * look like this and remove the mirror):

+       */

+      const struct gl_client_array *legacy_array[16];

+      const struct gl_client_array *generic_array[16];

+

+      /* Arrays and current values manipulated according to program

+       * mode, etc.  These are the attributes as seen by vertex

+       * programs:

+       */

+      const struct gl_client_array *inputs[VERT_ATTRIB_MAX];

+   } array;

+

+   /* Which flags to set in vbo_exec_BeginVertices() */

+   GLbitfield begin_vertices_flags;

+

+#ifdef DEBUG

+   GLint flush_call_depth;

+#endif

+};

+

+

+

+/* External API:

+ */

+void vbo_exec_init( struct gl_context *ctx );

+void vbo_exec_destroy( struct gl_context *ctx );

+void vbo_exec_invalidate_state( struct gl_context *ctx, GLuint new_state );

+

+void vbo_exec_BeginVertices( struct gl_context *ctx );

+void vbo_exec_FlushVertices( struct gl_context *ctx, GLuint flags );

+

+

+/* Internal functions:

+ */

+void vbo_exec_array_init( struct vbo_exec_context *exec );

+void vbo_exec_array_destroy( struct vbo_exec_context *exec );

+

+

+void vbo_exec_vtx_init( struct vbo_exec_context *exec );

+void vbo_exec_vtx_destroy( struct vbo_exec_context *exec );

+

+#if FEATURE_beginend

+

+void vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap );

+void vbo_exec_vtx_map( struct vbo_exec_context *exec );

+

+#else /* FEATURE_beginend */

+

+static INLINE void

+vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap )

+{

+}

+

+static INLINE void

+vbo_exec_vtx_map( struct vbo_exec_context *exec )

+{

+}

+

+#endif /* FEATURE_beginend */

+

+void vbo_exec_vtx_wrap( struct vbo_exec_context *exec );

+

+void vbo_exec_eval_update( struct vbo_exec_context *exec );

+

+void vbo_exec_do_EvalCoord2f( struct vbo_exec_context *exec, 

+				     GLfloat u, GLfloat v );

+

+void vbo_exec_do_EvalCoord1f( struct vbo_exec_context *exec,

+				     GLfloat u);

+

+#endif

diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c
index fcd544de7..790310903 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_api.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_api.c
@@ -1,1121 +1,1121 @@
-/**************************************************************************
-
-Copyright 2002-2008 Tungsten Graphics Inc., Cedar Park, Texas.
-
-All Rights Reserved.
-
-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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, 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 (including the next
-paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
-TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS 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.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-#include "main/vtxfmt.h"
-#include "main/dlist.h"
-#include "main/eval.h"
-#include "main/state.h"
-#include "main/light.h"
-#include "main/api_arrayelt.h"
-#include "main/api_noop.h"
-#include "main/dispatch.h"
-
-#include "vbo_context.h"
-
-#ifdef ERROR
-#undef ERROR
-#endif
-
-
-/** ID/name for immediate-mode VBO */
-#define IMM_BUFFER_NAME 0xaabbccdd
-
-
-static void reset_attrfv( struct vbo_exec_context *exec );
-
-
-/**
- * Close off the last primitive, execute the buffer, restart the
- * primitive.  
- */
-static void vbo_exec_wrap_buffers( struct vbo_exec_context *exec )
-{
-   if (exec->vtx.prim_count == 0) {
-      exec->vtx.copied.nr = 0;
-      exec->vtx.vert_count = 0;
-      exec->vtx.buffer_ptr = exec->vtx.buffer_map;
-   }
-   else {
-      GLuint last_begin = exec->vtx.prim[exec->vtx.prim_count-1].begin;
-      GLuint last_count;
-
-      if (exec->ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {
-	 GLint i = exec->vtx.prim_count - 1;
-	 assert(i >= 0);
-	 exec->vtx.prim[i].count = (exec->vtx.vert_count - 
-				    exec->vtx.prim[i].start);
-      }
-
-      last_count = exec->vtx.prim[exec->vtx.prim_count-1].count;
-
-      /* Execute the buffer and save copied vertices.
-       */
-      if (exec->vtx.vert_count)
-	 vbo_exec_vtx_flush( exec, GL_FALSE );
-      else {
-	 exec->vtx.prim_count = 0;
-	 exec->vtx.copied.nr = 0;
-      }
-
-      /* Emit a glBegin to start the new list.
-       */
-      assert(exec->vtx.prim_count == 0);
-
-      if (exec->ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {
-	 exec->vtx.prim[0].mode = exec->ctx->Driver.CurrentExecPrimitive;
-	 exec->vtx.prim[0].start = 0;
-	 exec->vtx.prim[0].count = 0;
-	 exec->vtx.prim_count++;
-      
-	 if (exec->vtx.copied.nr == last_count)
-	    exec->vtx.prim[0].begin = last_begin;
-      }
-   }
-}
-
-
-/**
- * Deal with buffer wrapping where provoked by the vertex buffer
- * filling up, as opposed to upgrade_vertex().
- */
-void vbo_exec_vtx_wrap( struct vbo_exec_context *exec )
-{
-   GLfloat *data = exec->vtx.copied.buffer;
-   GLuint i;
-
-   /* Run pipeline on current vertices, copy wrapped vertices
-    * to exec->vtx.copied.
-    */
-   vbo_exec_wrap_buffers( exec );
-   
-   /* Copy stored stored vertices to start of new list. 
-    */
-   assert(exec->vtx.max_vert - exec->vtx.vert_count > exec->vtx.copied.nr);
-
-   for (i = 0 ; i < exec->vtx.copied.nr ; i++) {
-      memcpy( exec->vtx.buffer_ptr, data, 
-	      exec->vtx.vertex_size * sizeof(GLfloat));
-      exec->vtx.buffer_ptr += exec->vtx.vertex_size;
-      data += exec->vtx.vertex_size;
-      exec->vtx.vert_count++;
-   }
-
-   exec->vtx.copied.nr = 0;
-}
-
-
-/**
- * Copy the active vertex's values to the ctx->Current fields.
- */
-static void vbo_exec_copy_to_current( struct vbo_exec_context *exec )
-{
-   struct gl_context *ctx = exec->ctx;
-   struct vbo_context *vbo = vbo_context(ctx);
-   GLuint i;
-
-   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {
-      if (exec->vtx.attrsz[i]) {
-         /* Note: the exec->vtx.current[i] pointers point into the
-          * ctx->Current.Attrib and ctx->Light.Material.Attrib arrays.
-          */
-	 GLfloat *current = (GLfloat *)vbo->currval[i].Ptr;
-         GLfloat tmp[4];
-
-         COPY_CLEAN_4V(tmp, 
-                       exec->vtx.attrsz[i], 
-                       exec->vtx.attrptr[i]);
-         
-         if (memcmp(current, tmp, sizeof(tmp)) != 0) { 
-            memcpy(current, tmp, sizeof(tmp));
-	 
-            /* Given that we explicitly state size here, there is no need
-             * for the COPY_CLEAN above, could just copy 16 bytes and be
-             * done.  The only problem is when Mesa accesses ctx->Current
-             * directly.
-             */
-            vbo->currval[i].Size = exec->vtx.attrsz[i];
-
-            /* This triggers rather too much recalculation of Mesa state
-             * that doesn't get used (eg light positions).
-             */
-            if (i >= VBO_ATTRIB_MAT_FRONT_AMBIENT &&
-                i <= VBO_ATTRIB_MAT_BACK_INDEXES)
-               ctx->NewState |= _NEW_LIGHT;
-            
-            ctx->NewState |= _NEW_CURRENT_ATTRIB;
-         }
-      }
-   }
-
-   /* Colormaterial -- this kindof sucks.
-    */
-   if (ctx->Light.ColorMaterialEnabled &&
-       exec->vtx.attrsz[VBO_ATTRIB_COLOR0]) {
-      _mesa_update_color_material(ctx, 
-				  ctx->Current.Attrib[VBO_ATTRIB_COLOR0]);
-   }
-}
-
-
-/**
- * Copy current vertex attribute values into the current vertex.
- */
-static void
-vbo_exec_copy_from_current(struct vbo_exec_context *exec)
-{
-   struct gl_context *ctx = exec->ctx;
-   struct vbo_context *vbo = vbo_context(ctx);
-   GLint i;
-
-   for (i = VBO_ATTRIB_POS + 1; i < VBO_ATTRIB_MAX; i++) {
-      const GLfloat *current = (GLfloat *) vbo->currval[i].Ptr;
-      switch (exec->vtx.attrsz[i]) {
-      case 4: exec->vtx.attrptr[i][3] = current[3];
-      case 3: exec->vtx.attrptr[i][2] = current[2];
-      case 2: exec->vtx.attrptr[i][1] = current[1];
-      case 1: exec->vtx.attrptr[i][0] = current[0];
-	 break;
-      }
-   }
-}
-
-
-/**
- * Flush existing data, set new attrib size, replay copied vertices.
- * This is called when we transition from a small vertex attribute size
- * to a larger one.  Ex: glTexCoord2f -> glTexCoord4f.
- * We need to go back over the previous 2-component texcoords and insert
- * zero and one values.
- */ 
-static void
-vbo_exec_wrap_upgrade_vertex(struct vbo_exec_context *exec,
-                             GLuint attr, GLuint newSize )
-{
-   struct gl_context *ctx = exec->ctx;
-   struct vbo_context *vbo = vbo_context(ctx);
-   const GLint lastcount = exec->vtx.vert_count;
-   GLfloat *old_attrptr[VBO_ATTRIB_MAX];
-   const GLuint old_vtx_size = exec->vtx.vertex_size; /* floats per vertex */
-   const GLuint oldSize = exec->vtx.attrsz[attr];
-   GLuint i;
-
-   /* Run pipeline on current vertices, copy wrapped vertices
-    * to exec->vtx.copied.
-    */
-   vbo_exec_wrap_buffers( exec );
-
-   if (unlikely(exec->vtx.copied.nr)) {
-      /* We're in the middle of a primitive, keep the old vertex
-       * format around to be able to translate the copied vertices to
-       * the new format.
-       */
-      memcpy(old_attrptr, exec->vtx.attrptr, sizeof(old_attrptr));
-   }
-
-   if (unlikely(oldSize)) {
-      /* Do a COPY_TO_CURRENT to ensure back-copying works for the
-       * case when the attribute already exists in the vertex and is
-       * having its size increased.
-       */
-      vbo_exec_copy_to_current( exec );
-   }
-
-   /* Heuristic: Attempt to isolate attributes received outside
-    * begin/end so that they don't bloat the vertices.
-    */
-   if (ctx->Driver.CurrentExecPrimitive == PRIM_OUTSIDE_BEGIN_END &&
-       !oldSize && lastcount > 8 && exec->vtx.vertex_size) {
-      vbo_exec_copy_to_current( exec );
-      reset_attrfv( exec );
-   }
-
-   /* Fix up sizes:
-    */
-   exec->vtx.attrsz[attr] = newSize;
-   exec->vtx.vertex_size += newSize - oldSize;
-   exec->vtx.max_vert = ((VBO_VERT_BUFFER_SIZE - exec->vtx.buffer_used) / 
-                         (exec->vtx.vertex_size * sizeof(GLfloat)));
-   exec->vtx.vert_count = 0;
-   exec->vtx.buffer_ptr = exec->vtx.buffer_map;
-
-   if (unlikely(oldSize)) {
-      /* Size changed, recalculate all the attrptr[] values
-       */
-      GLfloat *tmp = exec->vtx.vertex;
-
-      for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {
-	 if (exec->vtx.attrsz[i]) {
-	    exec->vtx.attrptr[i] = tmp;
-	    tmp += exec->vtx.attrsz[i];
-	 }
-	 else
-	    exec->vtx.attrptr[i] = NULL; /* will not be dereferenced */
-      }
-
-      /* Copy from current to repopulate the vertex with correct
-       * values.
-       */
-      vbo_exec_copy_from_current( exec );
-   }
-   else {
-      /* Just have to append the new attribute at the end */
-      exec->vtx.attrptr[attr] = exec->vtx.vertex +
-	 exec->vtx.vertex_size - newSize;
-   }
-
-   /* Replay stored vertices to translate them
-    * to new format here.
-    *
-    * -- No need to replay - just copy piecewise
-    */
-   if (unlikely(exec->vtx.copied.nr)) {
-      GLfloat *data = exec->vtx.copied.buffer;
-      GLfloat *dest = exec->vtx.buffer_ptr;
-      GLuint j;
-
-      assert(exec->vtx.buffer_ptr == exec->vtx.buffer_map);
-
-      for (i = 0 ; i < exec->vtx.copied.nr ; i++) {
-	 for (j = 0 ; j < VBO_ATTRIB_MAX ; j++) {
-	    GLuint sz = exec->vtx.attrsz[j];
-
-	    if (sz) {
-	       GLint old_offset = old_attrptr[j] - exec->vtx.vertex;
-	       GLint new_offset = exec->vtx.attrptr[j] - exec->vtx.vertex;
-
-	       if (j == attr) {
-		  if (oldSize) {
-		     GLfloat tmp[4];
-		     COPY_CLEAN_4V(tmp, oldSize, data + old_offset);
-		     COPY_SZ_4V(dest + new_offset, newSize, tmp);
-		  } else {
-		     GLfloat *current = (GLfloat *)vbo->currval[j].Ptr;
-		     COPY_SZ_4V(dest + new_offset, sz, current);
-		  }
-	       }
-	       else {
-		  COPY_SZ_4V(dest + new_offset, sz, data + old_offset);
-	       }
-	    }
-	 }
-
-	 data += old_vtx_size;
-	 dest += exec->vtx.vertex_size;
-      }
-
-      exec->vtx.buffer_ptr = dest;
-      exec->vtx.vert_count += exec->vtx.copied.nr;
-      exec->vtx.copied.nr = 0;
-   }
-}
-
-
-/**
- * This is when a vertex attribute transitions to a different size.
- * For example, we saw a bunch of glTexCoord2f() calls and now we got a
- * glTexCoord4f() call.  We promote the array from size=2 to size=4.
- */
-static void
-vbo_exec_fixup_vertex(struct gl_context *ctx, GLuint attr, GLuint newSize)
-{
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-
-   if (newSize > exec->vtx.attrsz[attr]) {
-      /* New size is larger.  Need to flush existing vertices and get
-       * an enlarged vertex format.
-       */
-      vbo_exec_wrap_upgrade_vertex( exec, attr, newSize );
-   }
-   else if (newSize < exec->vtx.active_sz[attr]) {
-      static const GLfloat id[4] = { 0, 0, 0, 1 };
-      GLuint i;
-
-      /* New size is smaller - just need to fill in some
-       * zeros.  Don't need to flush or wrap.
-       */
-      for (i = newSize; i <= exec->vtx.attrsz[attr]; i++)
-	 exec->vtx.attrptr[attr][i-1] = id[i-1];
-   }
-
-   exec->vtx.active_sz[attr] = newSize;
-
-   /* Does setting NeedFlush belong here?  Necessitates resetting
-    * vtxfmt on each flush (otherwise flags won't get reset
-    * afterwards).
-    */
-   if (attr == 0) 
-      ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;
-}
-
-
-/**
- * This macro is used to implement all the glVertex, glColor, glTexCoord,
- * glVertexAttrib, etc functions.
- */
-#define ATTR( A, N, V0, V1, V2, V3 )					\
-do {									\
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;		\
-									\
-   if (unlikely(!(ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT)))	\
-      ctx->Driver.BeginVertices( ctx );					\
-   									\
-   if (unlikely(exec->vtx.active_sz[A] != N))				\
-      vbo_exec_fixup_vertex(ctx, A, N);					\
-   									\
-   {									\
-      GLfloat *dest = exec->vtx.attrptr[A];				\
-      if (N>0) dest[0] = V0;						\
-      if (N>1) dest[1] = V1;						\
-      if (N>2) dest[2] = V2;						\
-      if (N>3) dest[3] = V3;						\
-   }									\
-									\
-   if ((A) == 0) {							\
-      /* This is a glVertex call */					\
-      GLuint i;								\
-									\
-      for (i = 0; i < exec->vtx.vertex_size; i++)			\
-	 exec->vtx.buffer_ptr[i] = exec->vtx.vertex[i];			\
-									\
-      exec->vtx.buffer_ptr += exec->vtx.vertex_size;			\
-									\
-      /* Set FLUSH_STORED_VERTICES to indicate that there's now */	\
-      /* something to draw (not just updating a color or texcoord).*/	\
-      ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;			\
-									\
-      if (++exec->vtx.vert_count >= exec->vtx.max_vert)			\
-	 vbo_exec_vtx_wrap( exec );					\
-   }									\
-} while (0)
-
-
-#define ERROR(err) _mesa_error( ctx, err, __FUNCTION__ )
-#define TAG(x) vbo_##x
-
-#include "vbo_attrib_tmp.h"
-
-
-#if FEATURE_beginend
-
-
-#if FEATURE_evaluators
-
-static void GLAPIENTRY vbo_exec_EvalCoord1f( GLfloat u )
-{
-   GET_CURRENT_CONTEXT( ctx );
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-
-   {
-      GLint i;
-      if (exec->eval.recalculate_maps) 
-	 vbo_exec_eval_update( exec );
-
-      for (i = 0; i <= VBO_ATTRIB_TEX7; i++) {
-	 if (exec->eval.map1[i].map) 
-	    if (exec->vtx.active_sz[i] != exec->eval.map1[i].sz)
-	       vbo_exec_fixup_vertex( ctx, i, exec->eval.map1[i].sz );
-      }
-   }
-
-
-   memcpy( exec->vtx.copied.buffer, exec->vtx.vertex, 
-           exec->vtx.vertex_size * sizeof(GLfloat));
-
-   vbo_exec_do_EvalCoord1f( exec, u );
-
-   memcpy( exec->vtx.vertex, exec->vtx.copied.buffer,
-           exec->vtx.vertex_size * sizeof(GLfloat));
-}
-
-static void GLAPIENTRY vbo_exec_EvalCoord2f( GLfloat u, GLfloat v )
-{
-   GET_CURRENT_CONTEXT( ctx );
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-
-   {
-      GLint i;
-      if (exec->eval.recalculate_maps) 
-	 vbo_exec_eval_update( exec );
-
-      for (i = 0; i <= VBO_ATTRIB_TEX7; i++) {
-	 if (exec->eval.map2[i].map) 
-	    if (exec->vtx.active_sz[i] != exec->eval.map2[i].sz)
-	       vbo_exec_fixup_vertex( ctx, i, exec->eval.map2[i].sz );
-      }
-
-      if (ctx->Eval.AutoNormal) 
-	 if (exec->vtx.active_sz[VBO_ATTRIB_NORMAL] != 3)
-	    vbo_exec_fixup_vertex( ctx, VBO_ATTRIB_NORMAL, 3 );
-   }
-
-   memcpy( exec->vtx.copied.buffer, exec->vtx.vertex, 
-           exec->vtx.vertex_size * sizeof(GLfloat));
-
-   vbo_exec_do_EvalCoord2f( exec, u, v );
-
-   memcpy( exec->vtx.vertex, exec->vtx.copied.buffer, 
-           exec->vtx.vertex_size * sizeof(GLfloat));
-}
-
-static void GLAPIENTRY vbo_exec_EvalCoord1fv( const GLfloat *u )
-{
-   vbo_exec_EvalCoord1f( u[0] );
-}
-
-static void GLAPIENTRY vbo_exec_EvalCoord2fv( const GLfloat *u )
-{
-   vbo_exec_EvalCoord2f( u[0], u[1] );
-}
-
-static void GLAPIENTRY vbo_exec_EvalPoint1( GLint i )
-{
-   GET_CURRENT_CONTEXT( ctx );
-   GLfloat du = ((ctx->Eval.MapGrid1u2 - ctx->Eval.MapGrid1u1) /
-		 (GLfloat) ctx->Eval.MapGrid1un);
-   GLfloat u = i * du + ctx->Eval.MapGrid1u1;
-
-   vbo_exec_EvalCoord1f( u );
-}
-
-
-static void GLAPIENTRY vbo_exec_EvalPoint2( GLint i, GLint j )
-{
-   GET_CURRENT_CONTEXT( ctx );
-   GLfloat du = ((ctx->Eval.MapGrid2u2 - ctx->Eval.MapGrid2u1) / 
-		 (GLfloat) ctx->Eval.MapGrid2un);
-   GLfloat dv = ((ctx->Eval.MapGrid2v2 - ctx->Eval.MapGrid2v1) / 
-		 (GLfloat) ctx->Eval.MapGrid2vn);
-   GLfloat u = i * du + ctx->Eval.MapGrid2u1;
-   GLfloat v = j * dv + ctx->Eval.MapGrid2v1;
-
-   vbo_exec_EvalCoord2f( u, v );
-}
-
-/* use noop eval mesh */
-#define vbo_exec_EvalMesh1 _mesa_noop_EvalMesh1
-#define vbo_exec_EvalMesh2 _mesa_noop_EvalMesh2
-
-#endif /* FEATURE_evaluators */
-
-
-/**
- * Flush (draw) vertices.
- * \param  unmap - leave VBO unmapped after flushing?
- */
-static void
-vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap)
-{
-   if (exec->vtx.vert_count || unmap) {
-      vbo_exec_vtx_flush( exec, unmap );
-   }
-
-   if (exec->vtx.vertex_size) {
-      vbo_exec_copy_to_current( exec );
-      reset_attrfv( exec );
-   }
-}
-
-
-/**
- * Called via glBegin.
- */
-static void GLAPIENTRY vbo_exec_Begin( GLenum mode )
-{
-   GET_CURRENT_CONTEXT( ctx ); 
-
-   if (ctx->Driver.CurrentExecPrimitive == PRIM_OUTSIDE_BEGIN_END) {
-      struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-      int i;
-
-      if (ctx->NewState) {
-	 _mesa_update_state( ctx );
-
-	 CALL_Begin(ctx->Exec, (mode));
-	 return;
-      }
-
-      if (!_mesa_valid_to_render(ctx, "glBegin")) {
-         return;
-      }
-
-      /* Heuristic: attempt to isolate attributes occuring outside
-       * begin/end pairs.
-       */
-      if (exec->vtx.vertex_size && !exec->vtx.attrsz[0]) 
-	 vbo_exec_FlushVertices_internal(exec, GL_FALSE);
-
-      i = exec->vtx.prim_count++;
-      exec->vtx.prim[i].mode = mode;
-      exec->vtx.prim[i].begin = 1;
-      exec->vtx.prim[i].end = 0;
-      exec->vtx.prim[i].indexed = 0;
-      exec->vtx.prim[i].weak = 0;
-      exec->vtx.prim[i].pad = 0;
-      exec->vtx.prim[i].start = exec->vtx.vert_count;
-      exec->vtx.prim[i].count = 0;
-      exec->vtx.prim[i].num_instances = 1;
-
-      ctx->Driver.CurrentExecPrimitive = mode;
-   }
-   else 
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glBegin" );
-      
-}
-
-
-/**
- * Called via glEnd.
- */
-static void GLAPIENTRY vbo_exec_End( void )
-{
-   GET_CURRENT_CONTEXT( ctx ); 
-
-   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {
-      struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-      int idx = exec->vtx.vert_count;
-      int i = exec->vtx.prim_count - 1;
-
-      exec->vtx.prim[i].end = 1; 
-      exec->vtx.prim[i].count = idx - exec->vtx.prim[i].start;
-
-      ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;
-
-      if (exec->vtx.prim_count == VBO_MAX_PRIM)
-	 vbo_exec_vtx_flush( exec, GL_FALSE );
-   }
-   else 
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glEnd" );
-}
-
-
-/**
- * Called via glPrimitiveRestartNV()
- */
-static void GLAPIENTRY
-vbo_exec_PrimitiveRestartNV(void)
-{
-   GLenum curPrim;
-   GET_CURRENT_CONTEXT( ctx ); 
-
-   curPrim = ctx->Driver.CurrentExecPrimitive;
-
-   if (curPrim == PRIM_OUTSIDE_BEGIN_END) {
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glPrimitiveRestartNV" );
-   }
-   else {
-      vbo_exec_End();
-      vbo_exec_Begin(curPrim);
-   }
-}
-
-
-
-static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
-{
-   GLvertexformat *vfmt = &exec->vtxfmt;
-
-   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
-
-   vfmt->Begin = vbo_exec_Begin;
-   vfmt->End = vbo_exec_End;
-   vfmt->PrimitiveRestartNV = vbo_exec_PrimitiveRestartNV;
-
-   _MESA_INIT_DLIST_VTXFMT(vfmt, _mesa_);
-   _MESA_INIT_EVAL_VTXFMT(vfmt, vbo_exec_);
-
-   vfmt->Rectf = _mesa_noop_Rectf;
-
-   /* from attrib_tmp.h:
-    */
-   vfmt->Color3f = vbo_Color3f;
-   vfmt->Color3fv = vbo_Color3fv;
-   vfmt->Color4f = vbo_Color4f;
-   vfmt->Color4fv = vbo_Color4fv;
-   vfmt->FogCoordfEXT = vbo_FogCoordfEXT;
-   vfmt->FogCoordfvEXT = vbo_FogCoordfvEXT;
-   vfmt->MultiTexCoord1fARB = vbo_MultiTexCoord1f;
-   vfmt->MultiTexCoord1fvARB = vbo_MultiTexCoord1fv;
-   vfmt->MultiTexCoord2fARB = vbo_MultiTexCoord2f;
-   vfmt->MultiTexCoord2fvARB = vbo_MultiTexCoord2fv;
-   vfmt->MultiTexCoord3fARB = vbo_MultiTexCoord3f;
-   vfmt->MultiTexCoord3fvARB = vbo_MultiTexCoord3fv;
-   vfmt->MultiTexCoord4fARB = vbo_MultiTexCoord4f;
-   vfmt->MultiTexCoord4fvARB = vbo_MultiTexCoord4fv;
-   vfmt->Normal3f = vbo_Normal3f;
-   vfmt->Normal3fv = vbo_Normal3fv;
-   vfmt->SecondaryColor3fEXT = vbo_SecondaryColor3fEXT;
-   vfmt->SecondaryColor3fvEXT = vbo_SecondaryColor3fvEXT;
-   vfmt->TexCoord1f = vbo_TexCoord1f;
-   vfmt->TexCoord1fv = vbo_TexCoord1fv;
-   vfmt->TexCoord2f = vbo_TexCoord2f;
-   vfmt->TexCoord2fv = vbo_TexCoord2fv;
-   vfmt->TexCoord3f = vbo_TexCoord3f;
-   vfmt->TexCoord3fv = vbo_TexCoord3fv;
-   vfmt->TexCoord4f = vbo_TexCoord4f;
-   vfmt->TexCoord4fv = vbo_TexCoord4fv;
-   vfmt->Vertex2f = vbo_Vertex2f;
-   vfmt->Vertex2fv = vbo_Vertex2fv;
-   vfmt->Vertex3f = vbo_Vertex3f;
-   vfmt->Vertex3fv = vbo_Vertex3fv;
-   vfmt->Vertex4f = vbo_Vertex4f;
-   vfmt->Vertex4fv = vbo_Vertex4fv;
-   
-   vfmt->VertexAttrib1fARB = vbo_VertexAttrib1fARB;
-   vfmt->VertexAttrib1fvARB = vbo_VertexAttrib1fvARB;
-   vfmt->VertexAttrib2fARB = vbo_VertexAttrib2fARB;
-   vfmt->VertexAttrib2fvARB = vbo_VertexAttrib2fvARB;
-   vfmt->VertexAttrib3fARB = vbo_VertexAttrib3fARB;
-   vfmt->VertexAttrib3fvARB = vbo_VertexAttrib3fvARB;
-   vfmt->VertexAttrib4fARB = vbo_VertexAttrib4fARB;
-   vfmt->VertexAttrib4fvARB = vbo_VertexAttrib4fvARB;
-
-   vfmt->VertexAttrib1fNV = vbo_VertexAttrib1fNV;
-   vfmt->VertexAttrib1fvNV = vbo_VertexAttrib1fvNV;
-   vfmt->VertexAttrib2fNV = vbo_VertexAttrib2fNV;
-   vfmt->VertexAttrib2fvNV = vbo_VertexAttrib2fvNV;
-   vfmt->VertexAttrib3fNV = vbo_VertexAttrib3fNV;
-   vfmt->VertexAttrib3fvNV = vbo_VertexAttrib3fvNV;
-   vfmt->VertexAttrib4fNV = vbo_VertexAttrib4fNV;
-   vfmt->VertexAttrib4fvNV = vbo_VertexAttrib4fvNV;
-
-   /* integer-valued */
-   vfmt->VertexAttribI1i = vbo_VertexAttribI1i;
-   vfmt->VertexAttribI2i = vbo_VertexAttribI2i;
-   vfmt->VertexAttribI3i = vbo_VertexAttribI3i;
-   vfmt->VertexAttribI4i = vbo_VertexAttribI4i;
-   vfmt->VertexAttribI2iv = vbo_VertexAttribI2iv;
-   vfmt->VertexAttribI3iv = vbo_VertexAttribI3iv;
-   vfmt->VertexAttribI4iv = vbo_VertexAttribI4iv;
-
-   /* unsigned integer-valued */
-   vfmt->VertexAttribI1ui = vbo_VertexAttribI1ui;
-   vfmt->VertexAttribI2ui = vbo_VertexAttribI2ui;
-   vfmt->VertexAttribI3ui = vbo_VertexAttribI3ui;
-   vfmt->VertexAttribI4ui = vbo_VertexAttribI4ui;
-   vfmt->VertexAttribI2uiv = vbo_VertexAttribI2uiv;
-   vfmt->VertexAttribI3uiv = vbo_VertexAttribI3uiv;
-   vfmt->VertexAttribI4uiv = vbo_VertexAttribI4uiv;
-
-   vfmt->Materialfv = vbo_Materialfv;
-
-   vfmt->EdgeFlag = vbo_EdgeFlag;
-   vfmt->Indexf = vbo_Indexf;
-   vfmt->Indexfv = vbo_Indexfv;
-
-}
-
-
-#else /* FEATURE_beginend */
-
-
-static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
-{
-   /* silence warnings */
-   (void) vbo_Color3f;
-   (void) vbo_Color3fv;
-   (void) vbo_Color4f;
-   (void) vbo_Color4fv;
-   (void) vbo_FogCoordfEXT;
-   (void) vbo_FogCoordfvEXT;
-   (void) vbo_MultiTexCoord1f;
-   (void) vbo_MultiTexCoord1fv;
-   (void) vbo_MultiTexCoord2f;
-   (void) vbo_MultiTexCoord2fv;
-   (void) vbo_MultiTexCoord3f;
-   (void) vbo_MultiTexCoord3fv;
-   (void) vbo_MultiTexCoord4f;
-   (void) vbo_MultiTexCoord4fv;
-   (void) vbo_Normal3f;
-   (void) vbo_Normal3fv;
-   (void) vbo_SecondaryColor3fEXT;
-   (void) vbo_SecondaryColor3fvEXT;
-   (void) vbo_TexCoord1f;
-   (void) vbo_TexCoord1fv;
-   (void) vbo_TexCoord2f;
-   (void) vbo_TexCoord2fv;
-   (void) vbo_TexCoord3f;
-   (void) vbo_TexCoord3fv;
-   (void) vbo_TexCoord4f;
-   (void) vbo_TexCoord4fv;
-   (void) vbo_Vertex2f;
-   (void) vbo_Vertex2fv;
-   (void) vbo_Vertex3f;
-   (void) vbo_Vertex3fv;
-   (void) vbo_Vertex4f;
-   (void) vbo_Vertex4fv;
-
-   (void) vbo_VertexAttrib1fARB;
-   (void) vbo_VertexAttrib1fvARB;
-   (void) vbo_VertexAttrib2fARB;
-   (void) vbo_VertexAttrib2fvARB;
-   (void) vbo_VertexAttrib3fARB;
-   (void) vbo_VertexAttrib3fvARB;
-   (void) vbo_VertexAttrib4fARB;
-   (void) vbo_VertexAttrib4fvARB;
-
-   (void) vbo_VertexAttrib1fNV;
-   (void) vbo_VertexAttrib1fvNV;
-   (void) vbo_VertexAttrib2fNV;
-   (void) vbo_VertexAttrib2fvNV;
-   (void) vbo_VertexAttrib3fNV;
-   (void) vbo_VertexAttrib3fvNV;
-   (void) vbo_VertexAttrib4fNV;
-   (void) vbo_VertexAttrib4fvNV;
-
-   (void) vbo_Materialfv;
-
-   (void) vbo_EdgeFlag;
-   (void) vbo_Indexf;
-   (void) vbo_Indexfv;
-}
-
-
-#endif /* FEATURE_beginend */
-
-
-/**
- * Tell the VBO module to use a real OpenGL vertex buffer object to
- * store accumulated immediate-mode vertex data.
- * This replaces the malloced buffer which was created in
- * vb_exec_vtx_init() below.
- */
-void vbo_use_buffer_objects(struct gl_context *ctx)
-{
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-   /* Any buffer name but 0 can be used here since this bufferobj won't
-    * go into the bufferobj hashtable.
-    */
-   GLuint bufName = IMM_BUFFER_NAME;
-   GLenum target = GL_ARRAY_BUFFER_ARB;
-   GLenum usage = GL_STREAM_DRAW_ARB;
-   GLsizei size = VBO_VERT_BUFFER_SIZE;
-
-   /* Make sure this func is only used once */
-   assert(exec->vtx.bufferobj == ctx->Shared->NullBufferObj);
-   if (exec->vtx.buffer_map) {
-      _mesa_align_free(exec->vtx.buffer_map);
-      exec->vtx.buffer_map = NULL;
-      exec->vtx.buffer_ptr = NULL;
-   }
-
-   /* Allocate a real buffer object now */
-   _mesa_reference_buffer_object(ctx, &exec->vtx.bufferobj, NULL);
-   exec->vtx.bufferobj = ctx->Driver.NewBufferObject(ctx, bufName, target);
-   ctx->Driver.BufferData(ctx, target, size, NULL, usage, exec->vtx.bufferobj);
-}
-
-
-/**
- * If this function is called, all VBO buffers will be unmapped when
- * we flush.
- * Otherwise, if a simple command like glColor3f() is called and we flush,
- * the current VBO may be left mapped.
- */
-void
-vbo_always_unmap_buffers(struct gl_context *ctx)
-{
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-   exec->begin_vertices_flags |= FLUSH_STORED_VERTICES;
-}
-
-
-void vbo_exec_vtx_init( struct vbo_exec_context *exec )
-{
-   struct gl_context *ctx = exec->ctx;
-   struct vbo_context *vbo = vbo_context(ctx);
-   GLuint i;
-
-   /* Allocate a buffer object.  Will just reuse this object
-    * continuously, unless vbo_use_buffer_objects() is called to enable
-    * use of real VBOs.
-    */
-   _mesa_reference_buffer_object(ctx,
-                                 &exec->vtx.bufferobj,
-                                 ctx->Shared->NullBufferObj);
-
-   ASSERT(!exec->vtx.buffer_map);
-   exec->vtx.buffer_map = (GLfloat *)_mesa_align_malloc(VBO_VERT_BUFFER_SIZE, 64);
-   exec->vtx.buffer_ptr = exec->vtx.buffer_map;
-
-   vbo_exec_vtxfmt_init( exec );
-
-   /* Hook our functions into the dispatch table.
-    */
-   _mesa_install_exec_vtxfmt( ctx, &exec->vtxfmt );
-
-   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {
-      ASSERT(i < Elements(exec->vtx.attrsz));
-      exec->vtx.attrsz[i] = 0;
-      ASSERT(i < Elements(exec->vtx.active_sz));
-      exec->vtx.active_sz[i] = 0;
-   }
-   for (i = 0 ; i < VERT_ATTRIB_MAX; i++) {
-      ASSERT(i < Elements(exec->vtx.inputs));
-      ASSERT(i < Elements(exec->vtx.arrays));
-      exec->vtx.inputs[i] = &exec->vtx.arrays[i];
-   }
-   
-   {
-      struct gl_client_array *arrays = exec->vtx.arrays;
-      unsigned i;
-
-      memcpy(arrays,      vbo->legacy_currval,  16 * sizeof(arrays[0]));
-      memcpy(arrays + 16, vbo->generic_currval, 16 * sizeof(arrays[0]));
-
-      for (i = 0; i < 16; ++i) {
-         arrays[i     ].BufferObj = NULL;
-         arrays[i + 16].BufferObj = NULL;
-         _mesa_reference_buffer_object(ctx, &arrays[i     ].BufferObj,
-                                       vbo->legacy_currval[i].BufferObj);
-         _mesa_reference_buffer_object(ctx, &arrays[i + 16].BufferObj,
-                                       vbo->generic_currval[i].BufferObj);
-      }
-   }
-
-   exec->vtx.vertex_size = 0;
-
-   exec->begin_vertices_flags = FLUSH_UPDATE_CURRENT;
-}
-
-
-void vbo_exec_vtx_destroy( struct vbo_exec_context *exec )
-{
-   /* using a real VBO for vertex data */
-   struct gl_context *ctx = exec->ctx;
-   unsigned i;
-
-   /* True VBOs should already be unmapped
-    */
-   if (exec->vtx.buffer_map) {
-      ASSERT(exec->vtx.bufferobj->Name == 0 ||
-             exec->vtx.bufferobj->Name == IMM_BUFFER_NAME);
-      if (exec->vtx.bufferobj->Name == 0) {
-         _mesa_align_free(exec->vtx.buffer_map);
-         exec->vtx.buffer_map = NULL;
-         exec->vtx.buffer_ptr = NULL;
-      }
-   }
-
-   /* Drop any outstanding reference to the vertex buffer
-    */
-   for (i = 0; i < Elements(exec->vtx.arrays); i++) {
-      _mesa_reference_buffer_object(ctx,
-                                    &exec->vtx.arrays[i].BufferObj,
-                                    NULL);
-   }
-
-   /* Free the vertex buffer.  Unmap first if needed.
-    */
-   if (_mesa_bufferobj_mapped(exec->vtx.bufferobj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER, exec->vtx.bufferobj);
-   }
-   _mesa_reference_buffer_object(ctx, &exec->vtx.bufferobj, NULL);
-}
-
-
-/**
- * Called upon first glVertex, glColor, glTexCoord, etc.
- */
-void vbo_exec_BeginVertices( struct gl_context *ctx )
-{
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-
-   vbo_exec_vtx_map( exec );
-
-   assert((ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) == 0);
-   assert(exec->begin_vertices_flags);
-
-   ctx->Driver.NeedFlush |= exec->begin_vertices_flags;
-}
-
-
-/**
- * Called via ctx->Driver.FlushVertices()
- * \param flags  bitmask of FLUSH_STORED_VERTICES, FLUSH_UPDATE_CURRENT
- */
-void vbo_exec_FlushVertices( struct gl_context *ctx, GLuint flags )
-{
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-
-#ifdef DEBUG
-   /* debug check: make sure we don't get called recursively */
-   exec->flush_call_depth++;
-   assert(exec->flush_call_depth == 1);
-#endif
-
-   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {
-      /* We've had glBegin but not glEnd! */
-#ifdef DEBUG
-      exec->flush_call_depth--;
-      assert(exec->flush_call_depth == 0);
-#endif
-      return;
-   }
-
-   /* Flush (draw), and make sure VBO is left unmapped when done */
-   vbo_exec_FlushVertices_internal(exec, GL_TRUE);
-
-   /* Need to do this to ensure BeginVertices gets called again:
-    */
-   ctx->Driver.NeedFlush &= ~(FLUSH_UPDATE_CURRENT | flags);
-
-#ifdef DEBUG
-   exec->flush_call_depth--;
-   assert(exec->flush_call_depth == 0);
-#endif
-}
-
-
-static void reset_attrfv( struct vbo_exec_context *exec )
-{   
-   GLuint i;
-
-   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {
-      exec->vtx.attrsz[i] = 0;
-      exec->vtx.active_sz[i] = 0;
-   }
-
-   exec->vtx.vertex_size = 0;
-}
-      
-
-void GLAPIENTRY
-_es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a)
-{
-   vbo_Color4f(r, g, b, a);
-}
-
-
-void GLAPIENTRY
-_es_Normal3f(GLfloat x, GLfloat y, GLfloat z)
-{
-   vbo_Normal3f(x, y, z);
-}
-
-
-void GLAPIENTRY
-_es_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
-{
-   vbo_MultiTexCoord4f(target, s, t, r, q);
-}
-
-
-void GLAPIENTRY
-_es_Materialfv(GLenum face, GLenum pname, const GLfloat *params)
-{
-   vbo_Materialfv(face, pname, params);
-}
-
-
-void GLAPIENTRY
-_es_Materialf(GLenum face, GLenum pname, GLfloat param)
-{
-   GLfloat p[4];
-   p[0] = param;
-   p[1] = p[2] = p[3] = 0.0F;
-   vbo_Materialfv(face, pname, p);
-}
-
-
-/**
- * A special version of glVertexAttrib4f that does not treat index 0 as
- * VBO_ATTRIB_POS.
- */
-static void
-VertexAttrib4f_nopos(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS)
-      ATTR(VBO_ATTRIB_GENERIC0 + index, 4, x, y, z, w);
-   else
-      ERROR(GL_INVALID_VALUE);
-}
-
-void GLAPIENTRY
-_es_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   VertexAttrib4f_nopos(index, x, y, z, w);
-}
-
-
-void GLAPIENTRY
-_es_VertexAttrib1f(GLuint indx, GLfloat x)
-{
-   VertexAttrib4f_nopos(indx, x, 0.0f, 0.0f, 1.0f);
-}
-
-
-void GLAPIENTRY
-_es_VertexAttrib1fv(GLuint indx, const GLfloat* values)
-{
-   VertexAttrib4f_nopos(indx, values[0], 0.0f, 0.0f, 1.0f);
-}
-
-
-void GLAPIENTRY
-_es_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
-{
-   VertexAttrib4f_nopos(indx, x, y, 0.0f, 1.0f);
-}
-
-
-void GLAPIENTRY
-_es_VertexAttrib2fv(GLuint indx, const GLfloat* values)
-{
-   VertexAttrib4f_nopos(indx, values[0], values[1], 0.0f, 1.0f);
-}
-
-
-void GLAPIENTRY
-_es_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
-{
-   VertexAttrib4f_nopos(indx, x, y, z, 1.0f);
-}
-
-
-void GLAPIENTRY
-_es_VertexAttrib3fv(GLuint indx, const GLfloat* values)
-{
-   VertexAttrib4f_nopos(indx, values[0], values[1], values[2], 1.0f);
-}
-
-
-void GLAPIENTRY
-_es_VertexAttrib4fv(GLuint indx, const GLfloat* values)
-{
-   VertexAttrib4f_nopos(indx, values[0], values[1], values[2], values[3]);
-}
+/**************************************************************************

+

+Copyright 2002-2008 Tungsten Graphics Inc., Cedar Park, Texas.

+

+All Rights Reserved.

+

+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

+on the rights to use, copy, modify, merge, publish, distribute, sub

+license, 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 (including the next

+paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL

+TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS 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.

+

+**************************************************************************/

+

+/*

+ * Authors:

+ *   Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+#include "main/glheader.h"

+#include "main/bufferobj.h"

+#include "main/context.h"

+#include "main/macros.h"

+#include "main/mfeatures.h"

+#include "main/vtxfmt.h"

+#include "main/dlist.h"

+#include "main/eval.h"

+#include "main/state.h"

+#include "main/light.h"

+#include "main/api_arrayelt.h"

+#include "main/api_noop.h"

+#include "main/dispatch.h"

+

+#include "vbo_context.h"

+

+#ifdef ERROR

+#undef ERROR

+#endif

+

+

+/** ID/name for immediate-mode VBO */

+#define IMM_BUFFER_NAME 0xaabbccdd

+

+

+static void reset_attrfv( struct vbo_exec_context *exec );

+

+

+/**

+ * Close off the last primitive, execute the buffer, restart the

+ * primitive.  

+ */

+static void vbo_exec_wrap_buffers( struct vbo_exec_context *exec )

+{

+   if (exec->vtx.prim_count == 0) {

+      exec->vtx.copied.nr = 0;

+      exec->vtx.vert_count = 0;

+      exec->vtx.buffer_ptr = exec->vtx.buffer_map;

+   }

+   else {

+      GLuint last_begin = exec->vtx.prim[exec->vtx.prim_count-1].begin;

+      GLuint last_count;

+

+      if (exec->ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {

+	 GLint i = exec->vtx.prim_count - 1;

+	 assert(i >= 0);

+	 exec->vtx.prim[i].count = (exec->vtx.vert_count - 

+				    exec->vtx.prim[i].start);

+      }

+

+      last_count = exec->vtx.prim[exec->vtx.prim_count-1].count;

+

+      /* Execute the buffer and save copied vertices.

+       */

+      if (exec->vtx.vert_count)

+	 vbo_exec_vtx_flush( exec, GL_FALSE );

+      else {

+	 exec->vtx.prim_count = 0;

+	 exec->vtx.copied.nr = 0;

+      }

+

+      /* Emit a glBegin to start the new list.

+       */

+      assert(exec->vtx.prim_count == 0);

+

+      if (exec->ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {

+	 exec->vtx.prim[0].mode = exec->ctx->Driver.CurrentExecPrimitive;

+	 exec->vtx.prim[0].start = 0;

+	 exec->vtx.prim[0].count = 0;

+	 exec->vtx.prim_count++;

+      

+	 if (exec->vtx.copied.nr == last_count)

+	    exec->vtx.prim[0].begin = last_begin;

+      }

+   }

+}

+

+

+/**

+ * Deal with buffer wrapping where provoked by the vertex buffer

+ * filling up, as opposed to upgrade_vertex().

+ */

+void vbo_exec_vtx_wrap( struct vbo_exec_context *exec )

+{

+   GLfloat *data = exec->vtx.copied.buffer;

+   GLuint i;

+

+   /* Run pipeline on current vertices, copy wrapped vertices

+    * to exec->vtx.copied.

+    */

+   vbo_exec_wrap_buffers( exec );

+   

+   /* Copy stored stored vertices to start of new list. 

+    */

+   assert(exec->vtx.max_vert - exec->vtx.vert_count > exec->vtx.copied.nr);

+

+   for (i = 0 ; i < exec->vtx.copied.nr ; i++) {

+      memcpy( exec->vtx.buffer_ptr, data, 

+	      exec->vtx.vertex_size * sizeof(GLfloat));

+      exec->vtx.buffer_ptr += exec->vtx.vertex_size;

+      data += exec->vtx.vertex_size;

+      exec->vtx.vert_count++;

+   }

+

+   exec->vtx.copied.nr = 0;

+}

+

+

+/**

+ * Copy the active vertex's values to the ctx->Current fields.

+ */

+static void vbo_exec_copy_to_current( struct vbo_exec_context *exec )

+{

+   struct gl_context *ctx = exec->ctx;

+   struct vbo_context *vbo = vbo_context(ctx);

+   GLuint i;

+

+   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {

+      if (exec->vtx.attrsz[i]) {

+         /* Note: the exec->vtx.current[i] pointers point into the

+          * ctx->Current.Attrib and ctx->Light.Material.Attrib arrays.

+          */

+	 GLfloat *current = (GLfloat *)vbo->currval[i].Ptr;

+         GLfloat tmp[4];

+

+         COPY_CLEAN_4V(tmp, 

+                       exec->vtx.attrsz[i], 

+                       exec->vtx.attrptr[i]);

+         

+         if (memcmp(current, tmp, sizeof(tmp)) != 0) { 

+            memcpy(current, tmp, sizeof(tmp));

+	 

+            /* Given that we explicitly state size here, there is no need

+             * for the COPY_CLEAN above, could just copy 16 bytes and be

+             * done.  The only problem is when Mesa accesses ctx->Current

+             * directly.

+             */

+            vbo->currval[i].Size = exec->vtx.attrsz[i];

+

+            /* This triggers rather too much recalculation of Mesa state

+             * that doesn't get used (eg light positions).

+             */

+            if (i >= VBO_ATTRIB_MAT_FRONT_AMBIENT &&

+                i <= VBO_ATTRIB_MAT_BACK_INDEXES)

+               ctx->NewState |= _NEW_LIGHT;

+            

+            ctx->NewState |= _NEW_CURRENT_ATTRIB;

+         }

+      }

+   }

+

+   /* Colormaterial -- this kindof sucks.

+    */

+   if (ctx->Light.ColorMaterialEnabled &&

+       exec->vtx.attrsz[VBO_ATTRIB_COLOR0]) {

+      _mesa_update_color_material(ctx, 

+				  ctx->Current.Attrib[VBO_ATTRIB_COLOR0]);

+   }

+}

+

+

+/**

+ * Copy current vertex attribute values into the current vertex.

+ */

+static void

+vbo_exec_copy_from_current(struct vbo_exec_context *exec)

+{

+   struct gl_context *ctx = exec->ctx;

+   struct vbo_context *vbo = vbo_context(ctx);

+   GLint i;

+

+   for (i = VBO_ATTRIB_POS + 1; i < VBO_ATTRIB_MAX; i++) {

+      const GLfloat *current = (GLfloat *) vbo->currval[i].Ptr;

+      switch (exec->vtx.attrsz[i]) {

+      case 4: exec->vtx.attrptr[i][3] = current[3];

+      case 3: exec->vtx.attrptr[i][2] = current[2];

+      case 2: exec->vtx.attrptr[i][1] = current[1];

+      case 1: exec->vtx.attrptr[i][0] = current[0];

+	 break;

+      }

+   }

+}

+

+

+/**

+ * Flush existing data, set new attrib size, replay copied vertices.

+ * This is called when we transition from a small vertex attribute size

+ * to a larger one.  Ex: glTexCoord2f -> glTexCoord4f.

+ * We need to go back over the previous 2-component texcoords and insert

+ * zero and one values.

+ */ 

+static void

+vbo_exec_wrap_upgrade_vertex(struct vbo_exec_context *exec,

+                             GLuint attr, GLuint newSize )

+{

+   struct gl_context *ctx = exec->ctx;

+   struct vbo_context *vbo = vbo_context(ctx);

+   const GLint lastcount = exec->vtx.vert_count;

+   GLfloat *old_attrptr[VBO_ATTRIB_MAX];

+   const GLuint old_vtx_size = exec->vtx.vertex_size; /* floats per vertex */

+   const GLuint oldSize = exec->vtx.attrsz[attr];

+   GLuint i;

+

+   /* Run pipeline on current vertices, copy wrapped vertices

+    * to exec->vtx.copied.

+    */

+   vbo_exec_wrap_buffers( exec );

+

+   if (unlikely(exec->vtx.copied.nr)) {

+      /* We're in the middle of a primitive, keep the old vertex

+       * format around to be able to translate the copied vertices to

+       * the new format.

+       */

+      memcpy(old_attrptr, exec->vtx.attrptr, sizeof(old_attrptr));

+   }

+

+   if (unlikely(oldSize)) {

+      /* Do a COPY_TO_CURRENT to ensure back-copying works for the

+       * case when the attribute already exists in the vertex and is

+       * having its size increased.

+       */

+      vbo_exec_copy_to_current( exec );

+   }

+

+   /* Heuristic: Attempt to isolate attributes received outside

+    * begin/end so that they don't bloat the vertices.

+    */

+   if (ctx->Driver.CurrentExecPrimitive == PRIM_OUTSIDE_BEGIN_END &&

+       !oldSize && lastcount > 8 && exec->vtx.vertex_size) {

+      vbo_exec_copy_to_current( exec );

+      reset_attrfv( exec );

+   }

+

+   /* Fix up sizes:

+    */

+   exec->vtx.attrsz[attr] = newSize;

+   exec->vtx.vertex_size += newSize - oldSize;

+   exec->vtx.max_vert = ((VBO_VERT_BUFFER_SIZE - exec->vtx.buffer_used) / 

+                         (exec->vtx.vertex_size * sizeof(GLfloat)));

+   exec->vtx.vert_count = 0;

+   exec->vtx.buffer_ptr = exec->vtx.buffer_map;

+

+   if (unlikely(oldSize)) {

+      /* Size changed, recalculate all the attrptr[] values

+       */

+      GLfloat *tmp = exec->vtx.vertex;

+

+      for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {

+	 if (exec->vtx.attrsz[i]) {

+	    exec->vtx.attrptr[i] = tmp;

+	    tmp += exec->vtx.attrsz[i];

+	 }

+	 else

+	    exec->vtx.attrptr[i] = NULL; /* will not be dereferenced */

+      }

+

+      /* Copy from current to repopulate the vertex with correct

+       * values.

+       */

+      vbo_exec_copy_from_current( exec );

+   }

+   else {

+      /* Just have to append the new attribute at the end */

+      exec->vtx.attrptr[attr] = exec->vtx.vertex +

+	 exec->vtx.vertex_size - newSize;

+   }

+

+   /* Replay stored vertices to translate them

+    * to new format here.

+    *

+    * -- No need to replay - just copy piecewise

+    */

+   if (unlikely(exec->vtx.copied.nr)) {

+      GLfloat *data = exec->vtx.copied.buffer;

+      GLfloat *dest = exec->vtx.buffer_ptr;

+      GLuint j;

+

+      assert(exec->vtx.buffer_ptr == exec->vtx.buffer_map);

+

+      for (i = 0 ; i < exec->vtx.copied.nr ; i++) {

+	 for (j = 0 ; j < VBO_ATTRIB_MAX ; j++) {

+	    GLuint sz = exec->vtx.attrsz[j];

+

+	    if (sz) {

+	       GLint old_offset = old_attrptr[j] - exec->vtx.vertex;

+	       GLint new_offset = exec->vtx.attrptr[j] - exec->vtx.vertex;

+

+	       if (j == attr) {

+		  if (oldSize) {

+		     GLfloat tmp[4];

+		     COPY_CLEAN_4V(tmp, oldSize, data + old_offset);

+		     COPY_SZ_4V(dest + new_offset, newSize, tmp);

+		  } else {

+		     GLfloat *current = (GLfloat *)vbo->currval[j].Ptr;

+		     COPY_SZ_4V(dest + new_offset, sz, current);

+		  }

+	       }

+	       else {

+		  COPY_SZ_4V(dest + new_offset, sz, data + old_offset);

+	       }

+	    }

+	 }

+

+	 data += old_vtx_size;

+	 dest += exec->vtx.vertex_size;

+      }

+

+      exec->vtx.buffer_ptr = dest;

+      exec->vtx.vert_count += exec->vtx.copied.nr;

+      exec->vtx.copied.nr = 0;

+   }

+}

+

+

+/**

+ * This is when a vertex attribute transitions to a different size.

+ * For example, we saw a bunch of glTexCoord2f() calls and now we got a

+ * glTexCoord4f() call.  We promote the array from size=2 to size=4.

+ */

+static void

+vbo_exec_fixup_vertex(struct gl_context *ctx, GLuint attr, GLuint newSize)

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+

+   if (newSize > exec->vtx.attrsz[attr]) {

+      /* New size is larger.  Need to flush existing vertices and get

+       * an enlarged vertex format.

+       */

+      vbo_exec_wrap_upgrade_vertex( exec, attr, newSize );

+   }

+   else if (newSize < exec->vtx.active_sz[attr]) {

+      static const GLfloat id[4] = { 0, 0, 0, 1 };

+      GLuint i;

+

+      /* New size is smaller - just need to fill in some

+       * zeros.  Don't need to flush or wrap.

+       */

+      for (i = newSize; i <= exec->vtx.attrsz[attr]; i++)

+	 exec->vtx.attrptr[attr][i-1] = id[i-1];

+   }

+

+   exec->vtx.active_sz[attr] = newSize;

+

+   /* Does setting NeedFlush belong here?  Necessitates resetting

+    * vtxfmt on each flush (otherwise flags won't get reset

+    * afterwards).

+    */

+   if (attr == 0) 

+      ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;

+}

+

+

+/**

+ * This macro is used to implement all the glVertex, glColor, glTexCoord,

+ * glVertexAttrib, etc functions.

+ */

+#define ATTR( A, N, V0, V1, V2, V3 )					\

+do {									\

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;		\

+									\

+   if (unlikely(!(ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT)))	\

+      ctx->Driver.BeginVertices( ctx );					\

+   									\

+   if (unlikely(exec->vtx.active_sz[A] != N))				\

+      vbo_exec_fixup_vertex(ctx, A, N);					\

+   									\

+   {									\

+      GLfloat *dest = exec->vtx.attrptr[A];				\

+      if (N>0) dest[0] = V0;						\

+      if (N>1) dest[1] = V1;						\

+      if (N>2) dest[2] = V2;						\

+      if (N>3) dest[3] = V3;						\

+   }									\

+									\

+   if ((A) == 0) {							\

+      /* This is a glVertex call */					\

+      GLuint i;								\

+									\

+      for (i = 0; i < exec->vtx.vertex_size; i++)			\

+	 exec->vtx.buffer_ptr[i] = exec->vtx.vertex[i];			\

+									\

+      exec->vtx.buffer_ptr += exec->vtx.vertex_size;			\

+									\

+      /* Set FLUSH_STORED_VERTICES to indicate that there's now */	\

+      /* something to draw (not just updating a color or texcoord).*/	\

+      ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;			\

+									\

+      if (++exec->vtx.vert_count >= exec->vtx.max_vert)			\

+	 vbo_exec_vtx_wrap( exec );					\

+   }									\

+} while (0)

+

+

+#define ERROR(err) _mesa_error( ctx, err, __FUNCTION__ )

+#define TAG(x) vbo_##x

+

+#include "vbo_attrib_tmp.h"

+

+

+#if FEATURE_beginend

+

+

+#if FEATURE_evaluators

+

+static void GLAPIENTRY vbo_exec_EvalCoord1f( GLfloat u )

+{

+   GET_CURRENT_CONTEXT( ctx );

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+

+   {

+      GLint i;

+      if (exec->eval.recalculate_maps) 

+	 vbo_exec_eval_update( exec );

+

+      for (i = 0; i <= VBO_ATTRIB_TEX7; i++) {

+	 if (exec->eval.map1[i].map) 

+	    if (exec->vtx.active_sz[i] != exec->eval.map1[i].sz)

+	       vbo_exec_fixup_vertex( ctx, i, exec->eval.map1[i].sz );

+      }

+   }

+

+

+   memcpy( exec->vtx.copied.buffer, exec->vtx.vertex, 

+           exec->vtx.vertex_size * sizeof(GLfloat));

+

+   vbo_exec_do_EvalCoord1f( exec, u );

+

+   memcpy( exec->vtx.vertex, exec->vtx.copied.buffer,

+           exec->vtx.vertex_size * sizeof(GLfloat));

+}

+

+static void GLAPIENTRY vbo_exec_EvalCoord2f( GLfloat u, GLfloat v )

+{

+   GET_CURRENT_CONTEXT( ctx );

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+

+   {

+      GLint i;

+      if (exec->eval.recalculate_maps) 

+	 vbo_exec_eval_update( exec );

+

+      for (i = 0; i <= VBO_ATTRIB_TEX7; i++) {

+	 if (exec->eval.map2[i].map) 

+	    if (exec->vtx.active_sz[i] != exec->eval.map2[i].sz)

+	       vbo_exec_fixup_vertex( ctx, i, exec->eval.map2[i].sz );

+      }

+

+      if (ctx->Eval.AutoNormal) 

+	 if (exec->vtx.active_sz[VBO_ATTRIB_NORMAL] != 3)

+	    vbo_exec_fixup_vertex( ctx, VBO_ATTRIB_NORMAL, 3 );

+   }

+

+   memcpy( exec->vtx.copied.buffer, exec->vtx.vertex, 

+           exec->vtx.vertex_size * sizeof(GLfloat));

+

+   vbo_exec_do_EvalCoord2f( exec, u, v );

+

+   memcpy( exec->vtx.vertex, exec->vtx.copied.buffer, 

+           exec->vtx.vertex_size * sizeof(GLfloat));

+}

+

+static void GLAPIENTRY vbo_exec_EvalCoord1fv( const GLfloat *u )

+{

+   vbo_exec_EvalCoord1f( u[0] );

+}

+

+static void GLAPIENTRY vbo_exec_EvalCoord2fv( const GLfloat *u )

+{

+   vbo_exec_EvalCoord2f( u[0], u[1] );

+}

+

+static void GLAPIENTRY vbo_exec_EvalPoint1( GLint i )

+{

+   GET_CURRENT_CONTEXT( ctx );

+   GLfloat du = ((ctx->Eval.MapGrid1u2 - ctx->Eval.MapGrid1u1) /

+		 (GLfloat) ctx->Eval.MapGrid1un);

+   GLfloat u = i * du + ctx->Eval.MapGrid1u1;

+

+   vbo_exec_EvalCoord1f( u );

+}

+

+

+static void GLAPIENTRY vbo_exec_EvalPoint2( GLint i, GLint j )

+{

+   GET_CURRENT_CONTEXT( ctx );

+   GLfloat du = ((ctx->Eval.MapGrid2u2 - ctx->Eval.MapGrid2u1) / 

+		 (GLfloat) ctx->Eval.MapGrid2un);

+   GLfloat dv = ((ctx->Eval.MapGrid2v2 - ctx->Eval.MapGrid2v1) / 

+		 (GLfloat) ctx->Eval.MapGrid2vn);

+   GLfloat u = i * du + ctx->Eval.MapGrid2u1;

+   GLfloat v = j * dv + ctx->Eval.MapGrid2v1;

+

+   vbo_exec_EvalCoord2f( u, v );

+}

+

+/* use noop eval mesh */

+#define vbo_exec_EvalMesh1 _mesa_noop_EvalMesh1

+#define vbo_exec_EvalMesh2 _mesa_noop_EvalMesh2

+

+#endif /* FEATURE_evaluators */

+

+

+/**

+ * Flush (draw) vertices.

+ * \param  unmap - leave VBO unmapped after flushing?

+ */

+static void

+vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap)

+{

+   if (exec->vtx.vert_count || unmap) {

+      vbo_exec_vtx_flush( exec, unmap );

+   }

+

+   if (exec->vtx.vertex_size) {

+      vbo_exec_copy_to_current( exec );

+      reset_attrfv( exec );

+   }

+}

+

+

+/**

+ * Called via glBegin.

+ */

+static void GLAPIENTRY vbo_exec_Begin( GLenum mode )

+{

+   GET_CURRENT_CONTEXT( ctx ); 

+

+   if (ctx->Driver.CurrentExecPrimitive == PRIM_OUTSIDE_BEGIN_END) {

+      struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+      int i;

+

+      if (ctx->NewState) {

+	 _mesa_update_state( ctx );

+

+	 CALL_Begin(ctx->Exec, (mode));

+	 return;

+      }

+

+      if (!_mesa_valid_to_render(ctx, "glBegin")) {

+         return;

+      }

+

+      /* Heuristic: attempt to isolate attributes occuring outside

+       * begin/end pairs.

+       */

+      if (exec->vtx.vertex_size && !exec->vtx.attrsz[0]) 

+	 vbo_exec_FlushVertices_internal(exec, GL_FALSE);

+

+      i = exec->vtx.prim_count++;

+      exec->vtx.prim[i].mode = mode;

+      exec->vtx.prim[i].begin = 1;

+      exec->vtx.prim[i].end = 0;

+      exec->vtx.prim[i].indexed = 0;

+      exec->vtx.prim[i].weak = 0;

+      exec->vtx.prim[i].pad = 0;

+      exec->vtx.prim[i].start = exec->vtx.vert_count;

+      exec->vtx.prim[i].count = 0;

+      exec->vtx.prim[i].num_instances = 1;

+

+      ctx->Driver.CurrentExecPrimitive = mode;

+   }

+   else 

+      _mesa_error( ctx, GL_INVALID_OPERATION, "glBegin" );

+      

+}

+

+

+/**

+ * Called via glEnd.

+ */

+static void GLAPIENTRY vbo_exec_End( void )

+{

+   GET_CURRENT_CONTEXT( ctx ); 

+

+   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {

+      struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+      int idx = exec->vtx.vert_count;

+      int i = exec->vtx.prim_count - 1;

+

+      exec->vtx.prim[i].end = 1; 

+      exec->vtx.prim[i].count = idx - exec->vtx.prim[i].start;

+

+      ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;

+

+      if (exec->vtx.prim_count == VBO_MAX_PRIM)

+	 vbo_exec_vtx_flush( exec, GL_FALSE );

+   }

+   else 

+      _mesa_error( ctx, GL_INVALID_OPERATION, "glEnd" );

+}

+

+

+/**

+ * Called via glPrimitiveRestartNV()

+ */

+static void GLAPIENTRY

+vbo_exec_PrimitiveRestartNV(void)

+{

+   GLenum curPrim;

+   GET_CURRENT_CONTEXT( ctx ); 

+

+   curPrim = ctx->Driver.CurrentExecPrimitive;

+

+   if (curPrim == PRIM_OUTSIDE_BEGIN_END) {

+      _mesa_error( ctx, GL_INVALID_OPERATION, "glPrimitiveRestartNV" );

+   }

+   else {

+      vbo_exec_End();

+      vbo_exec_Begin(curPrim);

+   }

+}

+

+

+

+static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )

+{

+   GLvertexformat *vfmt = &exec->vtxfmt;

+

+   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);

+

+   vfmt->Begin = vbo_exec_Begin;

+   vfmt->End = vbo_exec_End;

+   vfmt->PrimitiveRestartNV = vbo_exec_PrimitiveRestartNV;

+

+   _MESA_INIT_DLIST_VTXFMT(vfmt, _mesa_);

+   _MESA_INIT_EVAL_VTXFMT(vfmt, vbo_exec_);

+

+   vfmt->Rectf = _mesa_noop_Rectf;

+

+   /* from attrib_tmp.h:

+    */

+   vfmt->Color3f = vbo_Color3f;

+   vfmt->Color3fv = vbo_Color3fv;

+   vfmt->Color4f = vbo_Color4f;

+   vfmt->Color4fv = vbo_Color4fv;

+   vfmt->FogCoordfEXT = vbo_FogCoordfEXT;

+   vfmt->FogCoordfvEXT = vbo_FogCoordfvEXT;

+   vfmt->MultiTexCoord1fARB = vbo_MultiTexCoord1f;

+   vfmt->MultiTexCoord1fvARB = vbo_MultiTexCoord1fv;

+   vfmt->MultiTexCoord2fARB = vbo_MultiTexCoord2f;

+   vfmt->MultiTexCoord2fvARB = vbo_MultiTexCoord2fv;

+   vfmt->MultiTexCoord3fARB = vbo_MultiTexCoord3f;

+   vfmt->MultiTexCoord3fvARB = vbo_MultiTexCoord3fv;

+   vfmt->MultiTexCoord4fARB = vbo_MultiTexCoord4f;

+   vfmt->MultiTexCoord4fvARB = vbo_MultiTexCoord4fv;

+   vfmt->Normal3f = vbo_Normal3f;

+   vfmt->Normal3fv = vbo_Normal3fv;

+   vfmt->SecondaryColor3fEXT = vbo_SecondaryColor3fEXT;

+   vfmt->SecondaryColor3fvEXT = vbo_SecondaryColor3fvEXT;

+   vfmt->TexCoord1f = vbo_TexCoord1f;

+   vfmt->TexCoord1fv = vbo_TexCoord1fv;

+   vfmt->TexCoord2f = vbo_TexCoord2f;

+   vfmt->TexCoord2fv = vbo_TexCoord2fv;

+   vfmt->TexCoord3f = vbo_TexCoord3f;

+   vfmt->TexCoord3fv = vbo_TexCoord3fv;

+   vfmt->TexCoord4f = vbo_TexCoord4f;

+   vfmt->TexCoord4fv = vbo_TexCoord4fv;

+   vfmt->Vertex2f = vbo_Vertex2f;

+   vfmt->Vertex2fv = vbo_Vertex2fv;

+   vfmt->Vertex3f = vbo_Vertex3f;

+   vfmt->Vertex3fv = vbo_Vertex3fv;

+   vfmt->Vertex4f = vbo_Vertex4f;

+   vfmt->Vertex4fv = vbo_Vertex4fv;

+   

+   vfmt->VertexAttrib1fARB = vbo_VertexAttrib1fARB;

+   vfmt->VertexAttrib1fvARB = vbo_VertexAttrib1fvARB;

+   vfmt->VertexAttrib2fARB = vbo_VertexAttrib2fARB;

+   vfmt->VertexAttrib2fvARB = vbo_VertexAttrib2fvARB;

+   vfmt->VertexAttrib3fARB = vbo_VertexAttrib3fARB;

+   vfmt->VertexAttrib3fvARB = vbo_VertexAttrib3fvARB;

+   vfmt->VertexAttrib4fARB = vbo_VertexAttrib4fARB;

+   vfmt->VertexAttrib4fvARB = vbo_VertexAttrib4fvARB;

+

+   vfmt->VertexAttrib1fNV = vbo_VertexAttrib1fNV;

+   vfmt->VertexAttrib1fvNV = vbo_VertexAttrib1fvNV;

+   vfmt->VertexAttrib2fNV = vbo_VertexAttrib2fNV;

+   vfmt->VertexAttrib2fvNV = vbo_VertexAttrib2fvNV;

+   vfmt->VertexAttrib3fNV = vbo_VertexAttrib3fNV;

+   vfmt->VertexAttrib3fvNV = vbo_VertexAttrib3fvNV;

+   vfmt->VertexAttrib4fNV = vbo_VertexAttrib4fNV;

+   vfmt->VertexAttrib4fvNV = vbo_VertexAttrib4fvNV;

+

+   /* integer-valued */

+   vfmt->VertexAttribI1i = vbo_VertexAttribI1i;

+   vfmt->VertexAttribI2i = vbo_VertexAttribI2i;

+   vfmt->VertexAttribI3i = vbo_VertexAttribI3i;

+   vfmt->VertexAttribI4i = vbo_VertexAttribI4i;

+   vfmt->VertexAttribI2iv = vbo_VertexAttribI2iv;

+   vfmt->VertexAttribI3iv = vbo_VertexAttribI3iv;

+   vfmt->VertexAttribI4iv = vbo_VertexAttribI4iv;

+

+   /* unsigned integer-valued */

+   vfmt->VertexAttribI1ui = vbo_VertexAttribI1ui;

+   vfmt->VertexAttribI2ui = vbo_VertexAttribI2ui;

+   vfmt->VertexAttribI3ui = vbo_VertexAttribI3ui;

+   vfmt->VertexAttribI4ui = vbo_VertexAttribI4ui;

+   vfmt->VertexAttribI2uiv = vbo_VertexAttribI2uiv;

+   vfmt->VertexAttribI3uiv = vbo_VertexAttribI3uiv;

+   vfmt->VertexAttribI4uiv = vbo_VertexAttribI4uiv;

+

+   vfmt->Materialfv = vbo_Materialfv;

+

+   vfmt->EdgeFlag = vbo_EdgeFlag;

+   vfmt->Indexf = vbo_Indexf;

+   vfmt->Indexfv = vbo_Indexfv;

+

+}

+

+

+#else /* FEATURE_beginend */

+

+

+static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )

+{

+   /* silence warnings */

+   (void) vbo_Color3f;

+   (void) vbo_Color3fv;

+   (void) vbo_Color4f;

+   (void) vbo_Color4fv;

+   (void) vbo_FogCoordfEXT;

+   (void) vbo_FogCoordfvEXT;

+   (void) vbo_MultiTexCoord1f;

+   (void) vbo_MultiTexCoord1fv;

+   (void) vbo_MultiTexCoord2f;

+   (void) vbo_MultiTexCoord2fv;

+   (void) vbo_MultiTexCoord3f;

+   (void) vbo_MultiTexCoord3fv;

+   (void) vbo_MultiTexCoord4f;

+   (void) vbo_MultiTexCoord4fv;

+   (void) vbo_Normal3f;

+   (void) vbo_Normal3fv;

+   (void) vbo_SecondaryColor3fEXT;

+   (void) vbo_SecondaryColor3fvEXT;

+   (void) vbo_TexCoord1f;

+   (void) vbo_TexCoord1fv;

+   (void) vbo_TexCoord2f;

+   (void) vbo_TexCoord2fv;

+   (void) vbo_TexCoord3f;

+   (void) vbo_TexCoord3fv;

+   (void) vbo_TexCoord4f;

+   (void) vbo_TexCoord4fv;

+   (void) vbo_Vertex2f;

+   (void) vbo_Vertex2fv;

+   (void) vbo_Vertex3f;

+   (void) vbo_Vertex3fv;

+   (void) vbo_Vertex4f;

+   (void) vbo_Vertex4fv;

+

+   (void) vbo_VertexAttrib1fARB;

+   (void) vbo_VertexAttrib1fvARB;

+   (void) vbo_VertexAttrib2fARB;

+   (void) vbo_VertexAttrib2fvARB;

+   (void) vbo_VertexAttrib3fARB;

+   (void) vbo_VertexAttrib3fvARB;

+   (void) vbo_VertexAttrib4fARB;

+   (void) vbo_VertexAttrib4fvARB;

+

+   (void) vbo_VertexAttrib1fNV;

+   (void) vbo_VertexAttrib1fvNV;

+   (void) vbo_VertexAttrib2fNV;

+   (void) vbo_VertexAttrib2fvNV;

+   (void) vbo_VertexAttrib3fNV;

+   (void) vbo_VertexAttrib3fvNV;

+   (void) vbo_VertexAttrib4fNV;

+   (void) vbo_VertexAttrib4fvNV;

+

+   (void) vbo_Materialfv;

+

+   (void) vbo_EdgeFlag;

+   (void) vbo_Indexf;

+   (void) vbo_Indexfv;

+}

+

+

+#endif /* FEATURE_beginend */

+

+

+/**

+ * Tell the VBO module to use a real OpenGL vertex buffer object to

+ * store accumulated immediate-mode vertex data.

+ * This replaces the malloced buffer which was created in

+ * vb_exec_vtx_init() below.

+ */

+void vbo_use_buffer_objects(struct gl_context *ctx)

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+   /* Any buffer name but 0 can be used here since this bufferobj won't

+    * go into the bufferobj hashtable.

+    */

+   GLuint bufName = IMM_BUFFER_NAME;

+   GLenum target = GL_ARRAY_BUFFER_ARB;

+   GLenum usage = GL_STREAM_DRAW_ARB;

+   GLsizei size = VBO_VERT_BUFFER_SIZE;

+

+   /* Make sure this func is only used once */

+   assert(exec->vtx.bufferobj == ctx->Shared->NullBufferObj);

+   if (exec->vtx.buffer_map) {

+      _mesa_align_free(exec->vtx.buffer_map);

+      exec->vtx.buffer_map = NULL;

+      exec->vtx.buffer_ptr = NULL;

+   }

+

+   /* Allocate a real buffer object now */

+   _mesa_reference_buffer_object(ctx, &exec->vtx.bufferobj, NULL);

+   exec->vtx.bufferobj = ctx->Driver.NewBufferObject(ctx, bufName, target);

+   ctx->Driver.BufferData(ctx, target, size, NULL, usage, exec->vtx.bufferobj);

+}

+

+

+/**

+ * If this function is called, all VBO buffers will be unmapped when

+ * we flush.

+ * Otherwise, if a simple command like glColor3f() is called and we flush,

+ * the current VBO may be left mapped.

+ */

+void

+vbo_always_unmap_buffers(struct gl_context *ctx)

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+   exec->begin_vertices_flags |= FLUSH_STORED_VERTICES;

+}

+

+

+void vbo_exec_vtx_init( struct vbo_exec_context *exec )

+{

+   struct gl_context *ctx = exec->ctx;

+   struct vbo_context *vbo = vbo_context(ctx);

+   GLuint i;

+

+   /* Allocate a buffer object.  Will just reuse this object

+    * continuously, unless vbo_use_buffer_objects() is called to enable

+    * use of real VBOs.

+    */

+   _mesa_reference_buffer_object(ctx,

+                                 &exec->vtx.bufferobj,

+                                 ctx->Shared->NullBufferObj);

+

+   ASSERT(!exec->vtx.buffer_map);

+   exec->vtx.buffer_map = (GLfloat *)_mesa_align_malloc(VBO_VERT_BUFFER_SIZE, 64);

+   exec->vtx.buffer_ptr = exec->vtx.buffer_map;

+

+   vbo_exec_vtxfmt_init( exec );

+

+   /* Hook our functions into the dispatch table.

+    */

+   _mesa_install_exec_vtxfmt( ctx, &exec->vtxfmt );

+

+   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {

+      ASSERT(i < Elements(exec->vtx.attrsz));

+      exec->vtx.attrsz[i] = 0;

+      ASSERT(i < Elements(exec->vtx.active_sz));

+      exec->vtx.active_sz[i] = 0;

+   }

+   for (i = 0 ; i < VERT_ATTRIB_MAX; i++) {

+      ASSERT(i < Elements(exec->vtx.inputs));

+      ASSERT(i < Elements(exec->vtx.arrays));

+      exec->vtx.inputs[i] = &exec->vtx.arrays[i];

+   }

+   

+   {

+      struct gl_client_array *arrays = exec->vtx.arrays;

+      unsigned i;

+

+      memcpy(arrays,      vbo->legacy_currval,  16 * sizeof(arrays[0]));

+      memcpy(arrays + 16, vbo->generic_currval, 16 * sizeof(arrays[0]));

+

+      for (i = 0; i < 16; ++i) {

+         arrays[i     ].BufferObj = NULL;

+         arrays[i + 16].BufferObj = NULL;

+         _mesa_reference_buffer_object(ctx, &arrays[i     ].BufferObj,

+                                       vbo->legacy_currval[i].BufferObj);

+         _mesa_reference_buffer_object(ctx, &arrays[i + 16].BufferObj,

+                                       vbo->generic_currval[i].BufferObj);

+      }

+   }

+

+   exec->vtx.vertex_size = 0;

+

+   exec->begin_vertices_flags = FLUSH_UPDATE_CURRENT;

+}

+

+

+void vbo_exec_vtx_destroy( struct vbo_exec_context *exec )

+{

+   /* using a real VBO for vertex data */

+   struct gl_context *ctx = exec->ctx;

+   unsigned i;

+

+   /* True VBOs should already be unmapped

+    */

+   if (exec->vtx.buffer_map) {

+      ASSERT(exec->vtx.bufferobj->Name == 0 ||

+             exec->vtx.bufferobj->Name == IMM_BUFFER_NAME);

+      if (exec->vtx.bufferobj->Name == 0) {

+         _mesa_align_free(exec->vtx.buffer_map);

+         exec->vtx.buffer_map = NULL;

+         exec->vtx.buffer_ptr = NULL;

+      }

+   }

+

+   /* Drop any outstanding reference to the vertex buffer

+    */

+   for (i = 0; i < Elements(exec->vtx.arrays); i++) {

+      _mesa_reference_buffer_object(ctx,

+                                    &exec->vtx.arrays[i].BufferObj,

+                                    NULL);

+   }

+

+   /* Free the vertex buffer.  Unmap first if needed.

+    */

+   if (_mesa_bufferobj_mapped(exec->vtx.bufferobj)) {

+      ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER, exec->vtx.bufferobj);

+   }

+   _mesa_reference_buffer_object(ctx, &exec->vtx.bufferobj, NULL);

+}

+

+

+/**

+ * Called upon first glVertex, glColor, glTexCoord, etc.

+ */

+void vbo_exec_BeginVertices( struct gl_context *ctx )

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+

+   vbo_exec_vtx_map( exec );

+

+   assert((ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) == 0);

+   assert(exec->begin_vertices_flags);

+

+   ctx->Driver.NeedFlush |= exec->begin_vertices_flags;

+}

+

+

+/**

+ * Called via ctx->Driver.FlushVertices()

+ * \param flags  bitmask of FLUSH_STORED_VERTICES, FLUSH_UPDATE_CURRENT

+ */

+void vbo_exec_FlushVertices( struct gl_context *ctx, GLuint flags )

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+

+#ifdef DEBUG

+   /* debug check: make sure we don't get called recursively */

+   exec->flush_call_depth++;

+   assert(exec->flush_call_depth == 1);

+#endif

+

+   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {

+      /* We've had glBegin but not glEnd! */

+#ifdef DEBUG

+      exec->flush_call_depth--;

+      assert(exec->flush_call_depth == 0);

+#endif

+      return;

+   }

+

+   /* Flush (draw), and make sure VBO is left unmapped when done */

+   vbo_exec_FlushVertices_internal(exec, GL_TRUE);

+

+   /* Need to do this to ensure BeginVertices gets called again:

+    */

+   ctx->Driver.NeedFlush &= ~(FLUSH_UPDATE_CURRENT | flags);

+

+#ifdef DEBUG

+   exec->flush_call_depth--;

+   assert(exec->flush_call_depth == 0);

+#endif

+}

+

+

+static void reset_attrfv( struct vbo_exec_context *exec )

+{   

+   GLuint i;

+

+   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {

+      exec->vtx.attrsz[i] = 0;

+      exec->vtx.active_sz[i] = 0;

+   }

+

+   exec->vtx.vertex_size = 0;

+}

+      

+

+void GLAPIENTRY

+_es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a)

+{

+   vbo_Color4f(r, g, b, a);

+}

+

+

+void GLAPIENTRY

+_es_Normal3f(GLfloat x, GLfloat y, GLfloat z)

+{

+   vbo_Normal3f(x, y, z);

+}

+

+

+void GLAPIENTRY

+_es_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)

+{

+   vbo_MultiTexCoord4f(target, s, t, r, q);

+}

+

+

+void GLAPIENTRY

+_es_Materialfv(GLenum face, GLenum pname, const GLfloat *params)

+{

+   vbo_Materialfv(face, pname, params);

+}

+

+

+void GLAPIENTRY

+_es_Materialf(GLenum face, GLenum pname, GLfloat param)

+{

+   GLfloat p[4];

+   p[0] = param;

+   p[1] = p[2] = p[3] = 0.0F;

+   vbo_Materialfv(face, pname, p);

+}

+

+

+/**

+ * A special version of glVertexAttrib4f that does not treat index 0 as

+ * VBO_ATTRIB_POS.

+ */

+static void

+VertexAttrib4f_nopos(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS)

+      ATTR(VBO_ATTRIB_GENERIC0 + index, 4, x, y, z, w);

+   else

+      ERROR(GL_INVALID_VALUE);

+}

+

+void GLAPIENTRY

+_es_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   VertexAttrib4f_nopos(index, x, y, z, w);

+}

+

+

+void GLAPIENTRY

+_es_VertexAttrib1f(GLuint indx, GLfloat x)

+{

+   VertexAttrib4f_nopos(indx, x, 0.0f, 0.0f, 1.0f);

+}

+

+

+void GLAPIENTRY

+_es_VertexAttrib1fv(GLuint indx, const GLfloat* values)

+{

+   VertexAttrib4f_nopos(indx, values[0], 0.0f, 0.0f, 1.0f);

+}

+

+

+void GLAPIENTRY

+_es_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)

+{

+   VertexAttrib4f_nopos(indx, x, y, 0.0f, 1.0f);

+}

+

+

+void GLAPIENTRY

+_es_VertexAttrib2fv(GLuint indx, const GLfloat* values)

+{

+   VertexAttrib4f_nopos(indx, values[0], values[1], 0.0f, 1.0f);

+}

+

+

+void GLAPIENTRY

+_es_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)

+{

+   VertexAttrib4f_nopos(indx, x, y, z, 1.0f);

+}

+

+

+void GLAPIENTRY

+_es_VertexAttrib3fv(GLuint indx, const GLfloat* values)

+{

+   VertexAttrib4f_nopos(indx, values[0], values[1], values[2], 1.0f);

+}

+

+

+void GLAPIENTRY

+_es_VertexAttrib4fv(GLuint indx, const GLfloat* values)

+{

+   VertexAttrib4f_nopos(indx, values[0], values[1], values[2], values[3]);

+}

diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c
index 98d6badc4..37656c23a 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_array.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_array.c
@@ -1,1336 +1,1336 @@
-/**************************************************************************
- * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * Copyright 2009 VMware, Inc.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/state.h"
-#include "main/api_validate.h"
-#include "main/varray.h"
-#include "main/bufferobj.h"
-#include "main/enums.h"
-#include "main/macros.h"
-
-#include "vbo_context.h"
-
-
-/**
- * All vertex buffers should be in an unmapped state when we're about
- * to draw.  This debug function checks that.
- */
-static void
-check_buffers_are_unmapped(const struct gl_client_array **inputs)
-{
-#ifdef DEBUG
-   GLuint i;
-
-   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
-      if (inputs[i]) {
-         struct gl_buffer_object *obj = inputs[i]->BufferObj;
-         assert(!_mesa_bufferobj_mapped(obj));
-         (void) obj;
-      }
-   }
-#endif
-}
-
-
-/**
- * A debug function that may be called from other parts of Mesa as
- * needed during debugging.
- */
-void
-vbo_check_buffers_are_unmapped(struct gl_context *ctx)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   /* check the current vertex arrays */
-   check_buffers_are_unmapped(exec->array.inputs);
-   /* check the current glBegin/glVertex/glEnd-style VBO */
-   assert(!_mesa_bufferobj_mapped(exec->vtx.bufferobj));
-}
-
-
-
-/**
- * Compute min and max elements by scanning the index buffer for
- * glDraw[Range]Elements() calls.
- * If primitive restart is enabled, we need to ignore restart
- * indexes when computing min/max.
- */
-void
-vbo_get_minmax_index(struct gl_context *ctx,
-		     const struct _mesa_prim *prim,
-		     const struct _mesa_index_buffer *ib,
-		     GLuint *min_index, GLuint *max_index)
-{
-   const GLboolean restart = ctx->Array.PrimitiveRestart;
-   const GLuint restartIndex = ctx->Array.RestartIndex;
-   const GLuint count = prim->count;
-   const void *indices;
-   GLuint i;
-
-   if (_mesa_is_bufferobj(ib->obj)) {
-      const GLvoid *map =
-         ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB,
-                               GL_READ_ONLY, ib->obj);
-      indices = ADD_POINTERS(map, ib->ptr);
-   } else {
-      indices = ib->ptr;
-   }
-
-   switch (ib->type) {
-   case GL_UNSIGNED_INT: {
-      const GLuint *ui_indices = (const GLuint *)indices;
-      GLuint max_ui = 0;
-      GLuint min_ui = ~0U;
-      if (restart) {
-         for (i = 0; i < count; i++) {
-            if (ui_indices[i] != restartIndex) {
-               if (ui_indices[i] > max_ui) max_ui = ui_indices[i];
-               if (ui_indices[i] < min_ui) min_ui = ui_indices[i];
-            }
-         }
-      }
-      else {
-         for (i = 0; i < count; i++) {
-            if (ui_indices[i] > max_ui) max_ui = ui_indices[i];
-            if (ui_indices[i] < min_ui) min_ui = ui_indices[i];
-         }
-      }
-      *min_index = min_ui;
-      *max_index = max_ui;
-      break;
-   }
-   case GL_UNSIGNED_SHORT: {
-      const GLushort *us_indices = (const GLushort *)indices;
-      GLuint max_us = 0;
-      GLuint min_us = ~0U;
-      if (restart) {
-         for (i = 0; i < count; i++) {
-            if (us_indices[i] != restartIndex) {
-               if (us_indices[i] > max_us) max_us = us_indices[i];
-               if (us_indices[i] < min_us) min_us = us_indices[i];
-            }
-         }
-      }
-      else {
-         for (i = 0; i < count; i++) {
-            if (us_indices[i] > max_us) max_us = us_indices[i];
-            if (us_indices[i] < min_us) min_us = us_indices[i];
-         }
-      }
-      *min_index = min_us;
-      *max_index = max_us;
-      break;
-   }
-   case GL_UNSIGNED_BYTE: {
-      const GLubyte *ub_indices = (const GLubyte *)indices;
-      GLuint max_ub = 0;
-      GLuint min_ub = ~0U;
-      if (restart) {
-         for (i = 0; i < count; i++) {
-            if (ub_indices[i] != restartIndex) {
-               if (ub_indices[i] > max_ub) max_ub = ub_indices[i];
-               if (ub_indices[i] < min_ub) min_ub = ub_indices[i];
-            }
-         }
-      }
-      else {
-         for (i = 0; i < count; i++) {
-            if (ub_indices[i] > max_ub) max_ub = ub_indices[i];
-            if (ub_indices[i] < min_ub) min_ub = ub_indices[i];
-         }
-      }
-      *min_index = min_ub;
-      *max_index = max_ub;
-      break;
-   }
-   default:
-      assert(0);
-      break;
-   }
-
-   if (_mesa_is_bufferobj(ib->obj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, ib->obj);
-   }
-}
-
-
-/**
- * Check that element 'j' of the array has reasonable data.
- * Map VBO if needed.
- * For debugging purposes; not normally used.
- */
-static void
-check_array_data(struct gl_context *ctx, struct gl_client_array *array,
-                 GLuint attrib, GLuint j)
-{
-   if (array->Enabled) {
-      const void *data = array->Ptr;
-      if (_mesa_is_bufferobj(array->BufferObj)) {
-         if (!array->BufferObj->Pointer) {
-            /* need to map now */
-            array->BufferObj->Pointer =
-               ctx->Driver.MapBuffer(ctx, GL_ARRAY_BUFFER_ARB,
-                                     GL_READ_ONLY, array->BufferObj);
-         }
-         data = ADD_POINTERS(data, array->BufferObj->Pointer);
-      }
-      switch (array->Type) {
-      case GL_FLOAT:
-         {
-            GLfloat *f = (GLfloat *) ((GLubyte *) data + array->StrideB * j);
-            GLint k;
-            for (k = 0; k < array->Size; k++) {
-               if (IS_INF_OR_NAN(f[k]) ||
-                   f[k] >= 1.0e20 || f[k] <= -1.0e10) {
-                  printf("Bad array data:\n");
-                  printf("  Element[%u].%u = %f\n", j, k, f[k]);
-                  printf("  Array %u at %p\n", attrib, (void* ) array);
-                  printf("  Type 0x%x, Size %d, Stride %d\n",
-			 array->Type, array->Size, array->Stride);
-                  printf("  Address/offset %p in Buffer Object %u\n",
-			 array->Ptr, array->BufferObj->Name);
-                  f[k] = 1.0; /* XXX replace the bad value! */
-               }
-               /*assert(!IS_INF_OR_NAN(f[k]));*/
-            }
-         }
-         break;
-      default:
-         ;
-      }
-   }
-}
-
-
-/**
- * Unmap the buffer object referenced by given array, if mapped.
- */
-static void
-unmap_array_buffer(struct gl_context *ctx, struct gl_client_array *array)
-{
-   if (array->Enabled &&
-       _mesa_is_bufferobj(array->BufferObj) &&
-       _mesa_bufferobj_mapped(array->BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER_ARB, array->BufferObj);
-   }
-}
-
-
-/**
- * Examine the array's data for NaNs, etc.
- * For debug purposes; not normally used.
- */
-static void
-check_draw_elements_data(struct gl_context *ctx, GLsizei count, GLenum elemType,
-                         const void *elements, GLint basevertex)
-{
-   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
-   const void *elemMap;
-   GLint i, k;
-
-   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {
-      elemMap = ctx->Driver.MapBuffer(ctx,
-                                      GL_ELEMENT_ARRAY_BUFFER_ARB,
-                                      GL_READ_ONLY,
-                                      ctx->Array.ElementArrayBufferObj);
-      elements = ADD_POINTERS(elements, elemMap);
-   }
-
-   for (i = 0; i < count; i++) {
-      GLuint j;
-
-      /* j = element[i] */
-      switch (elemType) {
-      case GL_UNSIGNED_BYTE:
-         j = ((const GLubyte *) elements)[i];
-         break;
-      case GL_UNSIGNED_SHORT:
-         j = ((const GLushort *) elements)[i];
-         break;
-      case GL_UNSIGNED_INT:
-         j = ((const GLuint *) elements)[i];
-         break;
-      default:
-         assert(0);
-      }
-
-      /* check element j of each enabled array */
-      check_array_data(ctx, &arrayObj->Vertex, VERT_ATTRIB_POS, j);
-      check_array_data(ctx, &arrayObj->Normal, VERT_ATTRIB_NORMAL, j);
-      check_array_data(ctx, &arrayObj->Color, VERT_ATTRIB_COLOR0, j);
-      check_array_data(ctx, &arrayObj->SecondaryColor, VERT_ATTRIB_COLOR1, j);
-      for (k = 0; k < Elements(arrayObj->TexCoord); k++) {
-         check_array_data(ctx, &arrayObj->TexCoord[k], VERT_ATTRIB_TEX0 + k, j);
-      }
-      for (k = 0; k < Elements(arrayObj->VertexAttrib); k++) {
-         check_array_data(ctx, &arrayObj->VertexAttrib[k],
-                          VERT_ATTRIB_GENERIC0 + k, j);
-      }
-   }
-
-   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB,
-			      ctx->Array.ElementArrayBufferObj);
-   }
-
-   unmap_array_buffer(ctx, &arrayObj->Vertex);
-   unmap_array_buffer(ctx, &arrayObj->Normal);
-   unmap_array_buffer(ctx, &arrayObj->Color);
-   for (k = 0; k < Elements(arrayObj->TexCoord); k++) {
-      unmap_array_buffer(ctx, &arrayObj->TexCoord[k]);
-   }
-   for (k = 0; k < Elements(arrayObj->VertexAttrib); k++) {
-      unmap_array_buffer(ctx, &arrayObj->VertexAttrib[k]);
-   }
-}
-
-
-/**
- * Check array data, looking for NaNs, etc.
- */
-static void
-check_draw_arrays_data(struct gl_context *ctx, GLint start, GLsizei count)
-{
-   /* TO DO */
-}
-
-
-/**
- * Print info/data for glDrawArrays(), for debugging.
- */
-static void
-print_draw_arrays(struct gl_context *ctx,
-                  GLenum mode, GLint start, GLsizei count)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   int i;
-
-   printf("vbo_exec_DrawArrays(mode 0x%x, start %d, count %d):\n",
-	  mode, start, count);
-
-   for (i = 0; i < 32; i++) {
-      GLuint bufName = exec->array.inputs[i]->BufferObj->Name;
-      GLint stride = exec->array.inputs[i]->Stride;
-      printf("attr %2d: size %d stride %d  enabled %d  "
-	     "ptr %p  Bufobj %u\n",
-	     i,
-	     exec->array.inputs[i]->Size,
-	     stride,
-	     /*exec->array.inputs[i]->Enabled,*/
-	     exec->array.legacy_array[i]->Enabled,
-	     exec->array.inputs[i]->Ptr,
-	     bufName);
-
-      if (bufName) {
-         struct gl_buffer_object *buf = _mesa_lookup_bufferobj(ctx, bufName);
-         GLubyte *p = ctx->Driver.MapBuffer(ctx, GL_ARRAY_BUFFER_ARB,
-                                            GL_READ_ONLY_ARB, buf);
-         int offset = (int) (GLintptr) exec->array.inputs[i]->Ptr;
-         float *f = (float *) (p + offset);
-         int *k = (int *) f;
-         int i;
-         int n = (count * stride) / 4;
-         if (n > 32)
-            n = 32;
-         printf("  Data at offset %d:\n", offset);
-         for (i = 0; i < n; i++) {
-            printf("    float[%d] = 0x%08x %f\n", i, k[i], f[i]);
-         }
-         ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER_ARB, buf);
-      }
-   }
-}
-
-
-/**
- * Bind the VBO executor to the current vertex array object prior
- * to drawing.
- *
- * Just translate the arrayobj into a sane layout.
- */
-static void
-bind_array_obj(struct gl_context *ctx)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
-   GLuint i;
-
-   /* TODO: Fix the ArrayObj struct to keep legacy arrays in an array
-    * rather than as individual named arrays.  Then this function can
-    * go away.
-    */
-   exec->array.legacy_array[VERT_ATTRIB_POS] = &arrayObj->Vertex;
-   exec->array.legacy_array[VERT_ATTRIB_WEIGHT] = &arrayObj->Weight;
-   exec->array.legacy_array[VERT_ATTRIB_NORMAL] = &arrayObj->Normal;
-   exec->array.legacy_array[VERT_ATTRIB_COLOR0] = &arrayObj->Color;
-   exec->array.legacy_array[VERT_ATTRIB_COLOR1] = &arrayObj->SecondaryColor;
-   exec->array.legacy_array[VERT_ATTRIB_FOG] = &arrayObj->FogCoord;
-   exec->array.legacy_array[VERT_ATTRIB_COLOR_INDEX] = &arrayObj->Index;
-   if (arrayObj->PointSize.Enabled) {
-      /* this aliases COLOR_INDEX */
-      exec->array.legacy_array[VERT_ATTRIB_POINT_SIZE] = &arrayObj->PointSize;
-   }
-   exec->array.legacy_array[VERT_ATTRIB_EDGEFLAG] = &arrayObj->EdgeFlag;
-
-   for (i = 0; i < Elements(arrayObj->TexCoord); i++)
-      exec->array.legacy_array[VERT_ATTRIB_TEX0 + i] = &arrayObj->TexCoord[i];
-
-   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++) {
-      assert(i < Elements(exec->array.generic_array));
-      exec->array.generic_array[i] = &arrayObj->VertexAttrib[i];
-   }
-   
-   exec->array.array_obj = arrayObj->Name;
-}
-
-
-/**
- * Set the vbo->exec->inputs[] pointers to point to the enabled
- * vertex arrays.  This depends on the current vertex program/shader
- * being executed because of whether or not generic vertex arrays
- * alias the conventional vertex arrays.
- * For arrays that aren't enabled, we set the input[attrib] pointer
- * to point at a zero-stride current value "array".
- */
-static void
-recalculate_input_bindings(struct gl_context *ctx)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   const struct gl_client_array **inputs = &exec->array.inputs[0];
-   GLbitfield const_inputs = 0x0;
-   GLuint i;
-
-   exec->array.program_mode = get_program_mode(ctx);
-   exec->array.enabled_flags = ctx->Array.ArrayObj->_Enabled;
-
-   switch (exec->array.program_mode) {
-   case VP_NONE:
-      /* When no vertex program is active (or the vertex program is generated
-       * from fixed-function state).  We put the material values into the
-       * generic slots.  This is the only situation where material values
-       * are available as per-vertex attributes.
-       */
-      for (i = 0; i <= VERT_ATTRIB_TEX7; i++) {
-	 if (exec->array.legacy_array[i]->Enabled)
-	    inputs[i] = exec->array.legacy_array[i];
-	 else {
-	    inputs[i] = &vbo->legacy_currval[i];
-            const_inputs |= 1 << i;
-         }
-      }
-
-      for (i = 0; i < MAT_ATTRIB_MAX; i++) {
-	 inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->mat_currval[i];
-         const_inputs |= 1 << (VERT_ATTRIB_GENERIC0 + i);
-      }
-
-      /* Could use just about anything, just to fill in the empty
-       * slots:
-       */
-      for (i = MAT_ATTRIB_MAX; i < VERT_ATTRIB_MAX - VERT_ATTRIB_GENERIC0; i++) {
-	 inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->generic_currval[i];
-         const_inputs |= 1 << (VERT_ATTRIB_GENERIC0 + i);
-      }
-
-      /* There is no need to make _NEW_ARRAY dirty here for the TnL program,
-       * because it already takes care of invalidating the state necessary
-       * to revalidate vertex arrays. Not marking the state as dirty also
-       * improves performance (quite significantly in some apps).
-       */
-      if (!ctx->VertexProgram._MaintainTnlProgram)
-         ctx->NewState |= _NEW_ARRAY;
-      break;
-
-   case VP_NV:
-      /* NV_vertex_program - attribute arrays alias and override
-       * conventional, legacy arrays.  No materials, and the generic
-       * slots are vacant.
-       */
-      for (i = 0; i <= VERT_ATTRIB_TEX7; i++) {
-	 if (exec->array.generic_array[i]->Enabled)
-	    inputs[i] = exec->array.generic_array[i];
-	 else if (exec->array.legacy_array[i]->Enabled)
-	    inputs[i] = exec->array.legacy_array[i];
-	 else {
-	    inputs[i] = &vbo->legacy_currval[i];
-            const_inputs |= 1 << i;
-         }
-      }
-
-      /* Could use just about anything, just to fill in the empty
-       * slots:
-       */
-      for (i = VERT_ATTRIB_GENERIC0; i < VERT_ATTRIB_MAX; i++) {
-	 inputs[i] = &vbo->generic_currval[i - VERT_ATTRIB_GENERIC0];
-         const_inputs |= 1 << i;
-      }
-
-      ctx->NewState |= _NEW_ARRAY;
-      break;
-
-   case VP_ARB:
-      /* GL_ARB_vertex_program or GLSL vertex shader - Only the generic[0]
-       * attribute array aliases and overrides the legacy position array.  
-       *
-       * Otherwise, legacy attributes available in the legacy slots,
-       * generic attributes in the generic slots and materials are not
-       * available as per-vertex attributes.
-       */
-      if (exec->array.generic_array[0]->Enabled)
-	 inputs[0] = exec->array.generic_array[0];
-      else if (exec->array.legacy_array[0]->Enabled)
-	 inputs[0] = exec->array.legacy_array[0];
-      else {
-	 inputs[0] = &vbo->legacy_currval[0];
-         const_inputs |= 1 << 0;
-      }
-
-      for (i = 1; i <= VERT_ATTRIB_TEX7; i++) {
-	 if (exec->array.legacy_array[i]->Enabled)
-	    inputs[i] = exec->array.legacy_array[i];
-	 else {
-	    inputs[i] = &vbo->legacy_currval[i];
-            const_inputs |= 1 << i;
-         }
-      }
-
-      for (i = 0; i < MAX_VERTEX_GENERIC_ATTRIBS; i++) {
-	 if (exec->array.generic_array[i]->Enabled)
-	    inputs[VERT_ATTRIB_GENERIC0 + i] = exec->array.generic_array[i];
-	 else {
-	    inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->generic_currval[i];
-            const_inputs |= 1 << (VERT_ATTRIB_GENERIC0 + i);
-         }
-      }
-
-      ctx->NewState |= _NEW_ARRAY;
-      break;
-   }
-
-   _mesa_set_varying_vp_inputs( ctx, ~const_inputs );
-}
-
-
-/**
- * Examine the enabled vertex arrays to set the exec->array.inputs[] values.
- * These will point to the arrays to actually use for drawing.  Some will
- * be user-provided arrays, other will be zero-stride const-valued arrays.
- * Note that this might set the _NEW_ARRAY dirty flag so state validation
- * must be done after this call.
- */
-static void
-bind_arrays(struct gl_context *ctx)
-{
-   if (!ctx->Array.RebindArrays) {
-      return;
-   }
-
-   bind_array_obj(ctx);
-   recalculate_input_bindings(ctx);
-   ctx->Array.RebindArrays = GL_FALSE;
-}
-
-
-/**
- * Helper function called by the other DrawArrays() functions below.
- * This is where we handle primitive restart for drawing non-indexed
- * arrays.  If primitive restart is enabled, it typically means
- * splitting one DrawArrays() into two.
- */
-static void
-vbo_draw_arrays(struct gl_context *ctx, GLenum mode, GLint start,
-                GLsizei count, GLuint numInstances)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   struct _mesa_prim prim[2];
-
-   bind_arrays(ctx);
-
-   /* Again... because we may have changed the bitmask of per-vertex varying
-    * attributes.  If we regenerate the fixed-function vertex program now
-    * we may be able to prune down the number of vertex attributes which we
-    * need in the shader.
-    */
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
-
-   prim[0].begin = 1;
-   prim[0].end = 1;
-   prim[0].weak = 0;
-   prim[0].pad = 0;
-   prim[0].mode = mode;
-   prim[0].start = 0; /* filled in below */
-   prim[0].count = 0; /* filled in below */
-   prim[0].indexed = 0;
-   prim[0].basevertex = 0;
-   prim[0].num_instances = numInstances;
-
-   /* Implement the primitive restart index */
-   if (ctx->Array.PrimitiveRestart && ctx->Array.RestartIndex < count) {
-      GLuint primCount = 0;
-
-      if (ctx->Array.RestartIndex == start) {
-         /* special case: RestartIndex at beginning */
-         if (count > 1) {
-            prim[0].start = start + 1;
-            prim[0].count = count - 1;
-            primCount = 1;
-         }
-      }
-      else if (ctx->Array.RestartIndex == start + count - 1) {
-         /* special case: RestartIndex at end */
-         if (count > 1) {
-            prim[0].start = start;
-            prim[0].count = count - 1;
-            primCount = 1;
-         }
-      }
-      else {
-         /* general case: RestartIndex in middle, split into two prims */
-         prim[0].start = start;
-         prim[0].count = ctx->Array.RestartIndex - start;
-
-         prim[1] = prim[0];
-         prim[1].start = ctx->Array.RestartIndex + 1;
-         prim[1].count = count - prim[1].start;
-
-         primCount = 2;
-      }
-
-      if (primCount > 0) {
-         /* draw one or two prims */
-         check_buffers_are_unmapped(exec->array.inputs);
-         vbo->draw_prims(ctx, exec->array.inputs, prim, primCount, NULL,
-                         GL_TRUE, start, start + count - 1);
-      }
-   }
-   else {
-      /* no prim restart */
-      prim[0].start = start;
-      prim[0].count = count;
-
-      check_buffers_are_unmapped(exec->array.inputs);
-      vbo->draw_prims(ctx, exec->array.inputs, prim, 1, NULL,
-                      GL_TRUE, start, start + count - 1);
-   }
-}
-
-
-
-/**
- * Called from glDrawArrays when in immediate mode (not display list mode).
- */
-static void GLAPIENTRY
-vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_DRAW)
-      _mesa_debug(ctx, "glDrawArrays(%s, %d, %d)\n",
-                  _mesa_lookup_enum_by_nr(mode), start, count);
-
-   if (!_mesa_validate_DrawArrays( ctx, mode, start, count ))
-      return;
-
-   FLUSH_CURRENT( ctx, 0 );
-
-   if (!_mesa_valid_to_render(ctx, "glDrawArrays")) {
-      return;
-   }
-
-   if (0)
-      check_draw_arrays_data(ctx, start, count);
-
-   vbo_draw_arrays(ctx, mode, start, count, 1);
-
-   if (0)
-      print_draw_arrays(ctx, mode, start, count);
-}
-
-
-/**
- * Called from glDrawArraysInstanced when in immediate mode (not
- * display list mode).
- */
-static void GLAPIENTRY
-vbo_exec_DrawArraysInstanced(GLenum mode, GLint start, GLsizei count,
-                             GLsizei numInstances)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_DRAW)
-      _mesa_debug(ctx, "glDrawArraysInstanced(%s, %d, %d, %d)\n",
-                  _mesa_lookup_enum_by_nr(mode), start, count, numInstances);
-
-   if (!_mesa_validate_DrawArraysInstanced(ctx, mode, start, count, numInstances))
-      return;
-
-   FLUSH_CURRENT( ctx, 0 );
-
-   if (!_mesa_valid_to_render(ctx, "glDrawArraysInstanced")) {
-      return;
-   }
-
-   if (0)
-      check_draw_arrays_data(ctx, start, count);
-
-   vbo_draw_arrays(ctx, mode, start, count, numInstances);
-
-   if (0)
-      print_draw_arrays(ctx, mode, start, count);
-}
-
-
-/**
- * Map GL_ELEMENT_ARRAY_BUFFER and print contents.
- * For debugging.
- */
-static void
-dump_element_buffer(struct gl_context *ctx, GLenum type)
-{
-   const GLvoid *map = ctx->Driver.MapBuffer(ctx,
-                                             GL_ELEMENT_ARRAY_BUFFER_ARB,
-                                             GL_READ_ONLY,
-                                             ctx->Array.ElementArrayBufferObj);
-   switch (type) {
-   case GL_UNSIGNED_BYTE:
-      {
-         const GLubyte *us = (const GLubyte *) map;
-         GLint i;
-         for (i = 0; i < ctx->Array.ElementArrayBufferObj->Size; i++) {
-            printf("%02x ", us[i]);
-            if (i % 32 == 31)
-               printf("\n");
-         }
-         printf("\n");
-      }
-      break;
-   case GL_UNSIGNED_SHORT:
-      {
-         const GLushort *us = (const GLushort *) map;
-         GLint i;
-         for (i = 0; i < ctx->Array.ElementArrayBufferObj->Size / 2; i++) {
-            printf("%04x ", us[i]);
-            if (i % 16 == 15)
-               printf("\n");
-         }
-         printf("\n");
-      }
-      break;
-   case GL_UNSIGNED_INT:
-      {
-         const GLuint *us = (const GLuint *) map;
-         GLint i;
-         for (i = 0; i < ctx->Array.ElementArrayBufferObj->Size / 4; i++) {
-            printf("%08x ", us[i]);
-            if (i % 8 == 7)
-               printf("\n");
-         }
-         printf("\n");
-      }
-      break;
-   default:
-      ;
-   }
-
-   ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB,
-                           ctx->Array.ElementArrayBufferObj);
-}
-
-
-/**
- * Inner support for both _mesa_DrawElements and _mesa_DrawRangeElements.
- * Do the rendering for a glDrawElements or glDrawRangeElements call after
- * we've validated buffer bounds, etc.
- */
-static void
-vbo_validated_drawrangeelements(struct gl_context *ctx, GLenum mode,
-				GLboolean index_bounds_valid,
-				GLuint start, GLuint end,
-				GLsizei count, GLenum type,
-				const GLvoid *indices,
-				GLint basevertex, GLint numInstances)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   struct _mesa_index_buffer ib;
-   struct _mesa_prim prim[1];
-
-   FLUSH_CURRENT( ctx, 0 );
-
-   if (!_mesa_valid_to_render(ctx, "glDraw[Range]Elements")) {
-      return;
-   }
-
-   bind_arrays( ctx );
-
-   /* check for dirty state again */
-   if (ctx->NewState)
-      _mesa_update_state( ctx );
-
-   ib.count = count;
-   ib.type = type;
-   ib.obj = ctx->Array.ElementArrayBufferObj;
-   ib.ptr = indices;
-
-   prim[0].begin = 1;
-   prim[0].end = 1;
-   prim[0].weak = 0;
-   prim[0].pad = 0;
-   prim[0].mode = mode;
-   prim[0].start = 0;
-   prim[0].count = count;
-   prim[0].indexed = 1;
-   prim[0].basevertex = basevertex;
-   prim[0].num_instances = numInstances;
-
-   /* Need to give special consideration to rendering a range of
-    * indices starting somewhere above zero.  Typically the
-    * application is issuing multiple DrawRangeElements() to draw
-    * successive primitives layed out linearly in the vertex arrays.
-    * Unless the vertex arrays are all in a VBO (or locked as with
-    * CVA), the OpenGL semantics imply that we need to re-read or
-    * re-upload the vertex data on each draw call.  
-    *
-    * In the case of hardware tnl, we want to avoid starting the
-    * upload at zero, as it will mean every draw call uploads an
-    * increasing amount of not-used vertex data.  Worse - in the
-    * software tnl module, all those vertices might be transformed and
-    * lit but never rendered.
-    *
-    * If we just upload or transform the vertices in start..end,
-    * however, the indices will be incorrect.
-    *
-    * At this level, we don't know exactly what the requirements of
-    * the backend are going to be, though it will likely boil down to
-    * either:
-    *
-    * 1) Do nothing, everything is in a VBO and is processed once
-    *       only.
-    *
-    * 2) Adjust the indices and vertex arrays so that start becomes
-    *    zero.
-    *
-    * Rather than doing anything here, I'll provide a helper function
-    * for the latter case elsewhere.
-    */
-
-   check_buffers_are_unmapped(exec->array.inputs);
-   vbo->draw_prims( ctx, exec->array.inputs, prim, 1, &ib,
-		    index_bounds_valid, start, end );
-}
-
-
-/**
- * Called by glDrawRangeElementsBaseVertex() in immediate mode.
- */
-static void GLAPIENTRY
-vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
-				     GLuint start, GLuint end,
-				     GLsizei count, GLenum type,
-				     const GLvoid *indices,
-				     GLint basevertex)
-{
-   static GLuint warnCount = 0;
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_DRAW)
-      _mesa_debug(ctx,
-                "glDrawRangeElementsBaseVertex(%s, %u, %u, %d, %s, %p, %d)\n",
-                _mesa_lookup_enum_by_nr(mode), start, end, count,
-                _mesa_lookup_enum_by_nr(type), indices, basevertex);
-
-   if (!_mesa_validate_DrawRangeElements( ctx, mode, start, end, count,
-                                          type, indices, basevertex ))
-      return;
-
-   /* NOTE: It's important that 'end' is a reasonable value.
-    * in _tnl_draw_prims(), we use end to determine how many vertices
-    * to transform.  If it's too large, we can unnecessarily split prims
-    * or we can read/write out of memory in several different places!
-    */
-
-   /* Catch/fix some potential user errors */
-   if (type == GL_UNSIGNED_BYTE) {
-      start = MIN2(start, 0xff);
-      end = MIN2(end, 0xff);
-   }
-   else if (type == GL_UNSIGNED_SHORT) {
-      start = MIN2(start, 0xffff);
-      end = MIN2(end, 0xffff);
-   }
-
-   if (end >= ctx->Array.ArrayObj->_MaxElement) {
-      /* the max element is out of bounds of one or more enabled arrays */
-      warnCount++;
-
-      if (warnCount < 10) {
-         _mesa_warning(ctx, "glDraw[Range]Elements(start %u, end %u, count %d, "
-                       "type 0x%x, indices=%p)\n"
-                       "\tend is out of bounds (max=%u)  "
-                       "Element Buffer %u (size %d)\n"
-                       "\tThis should probably be fixed in the application.",
-                       start, end, count, type, indices,
-                       ctx->Array.ArrayObj->_MaxElement - 1,
-                       ctx->Array.ElementArrayBufferObj->Name,
-                       (int) ctx->Array.ElementArrayBufferObj->Size);
-      }
-
-      if (0)
-         dump_element_buffer(ctx, type);
-
-      if (0)
-         _mesa_print_arrays(ctx);
-
-#ifdef DEBUG
-      /* 'end' was out of bounds, but now let's check the actual array
-       * indexes to see if any of them are out of bounds.
-       */
-      {
-         GLuint max = _mesa_max_buffer_index(ctx, count, type, indices,
-                                             ctx->Array.ElementArrayBufferObj);
-         if (max >= ctx->Array.ArrayObj->_MaxElement) {
-            if (warnCount < 10) {
-               _mesa_warning(ctx, "glDraw[Range]Elements(start %u, end %u, "
-                             "count %d, type 0x%x, indices=%p)\n"
-                             "\tindex=%u is out of bounds (max=%u)  "
-                             "Element Buffer %u (size %d)\n"
-                             "\tSkipping the glDrawRangeElements() call",
-                             start, end, count, type, indices, max,
-                             ctx->Array.ArrayObj->_MaxElement - 1,
-                             ctx->Array.ElementArrayBufferObj->Name,
-                             (int) ctx->Array.ElementArrayBufferObj->Size);
-            }
-         }
-         /* XXX we could also find the min index and compare to 'start'
-          * to see if start is correct.  But it's more likely to get the
-          * upper bound wrong.
-          */
-      }
-#endif
-
-      /* Set 'end' to the max possible legal value */
-      assert(ctx->Array.ArrayObj->_MaxElement >= 1);
-      end = ctx->Array.ArrayObj->_MaxElement - 1;
-   }
-   else if (0) {
-      printf("glDraw[Range]Elements{,BaseVertex}"
-	     "(start %u, end %u, type 0x%x, count %d) ElemBuf %u, "
-	     "base %d\n",
-	     start, end, type, count,
-	     ctx->Array.ElementArrayBufferObj->Name,
-	     basevertex);
-   }
-
-#if 0
-   check_draw_elements_data(ctx, count, type, indices);
-#else
-   (void) check_draw_elements_data;
-#endif
-
-   vbo_validated_drawrangeelements(ctx, mode, GL_TRUE, start, end,
-				   count, type, indices, basevertex, 1);
-}
-
-
-/**
- * Called by glDrawRangeElements() in immediate mode.
- */
-static void GLAPIENTRY
-vbo_exec_DrawRangeElements(GLenum mode, GLuint start, GLuint end,
-                           GLsizei count, GLenum type, const GLvoid *indices)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_DRAW)
-      _mesa_debug(ctx,
-                  "glDrawRangeElements(%s, %u, %u, %d, %s, %p)\n",
-                  _mesa_lookup_enum_by_nr(mode), start, end, count,
-                  _mesa_lookup_enum_by_nr(type), indices);
-
-   vbo_exec_DrawRangeElementsBaseVertex(mode, start, end, count, type,
-					indices, 0);
-}
-
-
-/**
- * Called by glDrawElements() in immediate mode.
- */
-static void GLAPIENTRY
-vbo_exec_DrawElements(GLenum mode, GLsizei count, GLenum type,
-                      const GLvoid *indices)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_DRAW)
-      _mesa_debug(ctx, "glDrawElements(%s, %u, %s, %p)\n",
-                  _mesa_lookup_enum_by_nr(mode), count,
-                  _mesa_lookup_enum_by_nr(type), indices);
-
-   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices, 0 ))
-      return;
-
-   vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,
-				   count, type, indices, 0, 1);
-}
-
-
-/**
- * Called by glDrawElementsBaseVertex() in immediate mode.
- */
-static void GLAPIENTRY
-vbo_exec_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
-				const GLvoid *indices, GLint basevertex)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_DRAW)
-      _mesa_debug(ctx, "glDrawElementsBaseVertex(%s, %d, %s, %p, %d)\n",
-                  _mesa_lookup_enum_by_nr(mode), count,
-                  _mesa_lookup_enum_by_nr(type), indices, basevertex);
-
-   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices,
-				     basevertex ))
-      return;
-
-   vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,
-				   count, type, indices, basevertex, 1);
-}
-
-
-/**
- * Called by glDrawElementsInstanced() in immediate mode.
- */
-static void GLAPIENTRY
-vbo_exec_DrawElementsInstanced(GLenum mode, GLsizei count, GLenum type,
-                               const GLvoid *indices, GLsizei numInstances)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_DRAW)
-      _mesa_debug(ctx, "glDrawElementsInstanced(%s, %d, %s, %p, %d)\n",
-                  _mesa_lookup_enum_by_nr(mode), count,
-                  _mesa_lookup_enum_by_nr(type), indices, numInstances);
-
-   if (!_mesa_validate_DrawElementsInstanced(ctx, mode, count, type, indices,
-                                             numInstances))
-      return;
-
-   vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,
-				   count, type, indices, 0, numInstances);
-}
-
-
-/**
- * Inner support for both _mesa_MultiDrawElements() and
- * _mesa_MultiDrawRangeElements().
- * This does the actual rendering after we've checked array indexes, etc.
- */
-static void
-vbo_validated_multidrawelements(struct gl_context *ctx, GLenum mode,
-				const GLsizei *count, GLenum type,
-				const GLvoid **indices, GLsizei primcount,
-				const GLint *basevertex)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   struct _mesa_index_buffer ib;
-   struct _mesa_prim *prim;
-   unsigned int index_type_size = 0;
-   uintptr_t min_index_ptr, max_index_ptr;
-   GLboolean fallback = GL_FALSE;
-   int i;
-
-   if (primcount == 0)
-      return;
-
-   FLUSH_CURRENT( ctx, 0 );
-
-   if (!_mesa_valid_to_render(ctx, "glMultiDrawElements")) {
-      return;
-   }
-
-   prim = calloc(1, primcount * sizeof(*prim));
-   if (prim == NULL) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMultiDrawElements");
-      return;
-   }
-
-   /* Decide if we can do this all as one set of primitives sharing the
-    * same index buffer, or if we have to reset the index pointer per
-    * primitive.
-    */
-   bind_arrays( ctx );
-
-   /* check for dirty state again */
-   if (ctx->NewState)
-      _mesa_update_state( ctx );
-
-   switch (type) {
-   case GL_UNSIGNED_INT:
-      index_type_size = 4;
-      break;
-   case GL_UNSIGNED_SHORT:
-      index_type_size = 2;
-      break;
-   case GL_UNSIGNED_BYTE:
-      index_type_size = 1;
-      break;
-   default:
-      assert(0);
-   }
-
-   min_index_ptr = (uintptr_t)indices[0];
-   max_index_ptr = 0;
-   for (i = 0; i < primcount; i++) {
-      min_index_ptr = MIN2(min_index_ptr, (uintptr_t)indices[i]);
-      max_index_ptr = MAX2(max_index_ptr, (uintptr_t)indices[i] +
-			   index_type_size * count[i]);
-   }
-
-   /* Check if we can handle this thing as a bunch of index offsets from the
-    * same index pointer.  If we can't, then we have to fall back to doing
-    * a draw_prims per primitive.
-    * Check that the difference between each prim's indexes is a multiple of
-    * the index/element size.
-    */
-   if (index_type_size != 1) {
-      for (i = 0; i < primcount; i++) {
-	 if ((((uintptr_t)indices[i] - min_index_ptr) % index_type_size) != 0) {
-	    fallback = GL_TRUE;
-	    break;
-	 }
-      }
-   }
-
-   /* If the index buffer isn't in a VBO, then treating the application's
-    * subranges of the index buffer as one large index buffer may lead to
-    * us reading unmapped memory.
-    */
-   if (!_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj))
-      fallback = GL_TRUE;
-
-   if (!fallback) {
-      ib.count = (max_index_ptr - min_index_ptr) / index_type_size;
-      ib.type = type;
-      ib.obj = ctx->Array.ElementArrayBufferObj;
-      ib.ptr = (void *)min_index_ptr;
-
-      for (i = 0; i < primcount; i++) {
-	 prim[i].begin = (i == 0);
-	 prim[i].end = (i == primcount - 1);
-	 prim[i].weak = 0;
-	 prim[i].pad = 0;
-	 prim[i].mode = mode;
-	 prim[i].start = ((uintptr_t)indices[i] - min_index_ptr) / index_type_size;
-	 prim[i].count = count[i];
-	 prim[i].indexed = 1;
-         prim[i].num_instances = 1;
-	 if (basevertex != NULL)
-	    prim[i].basevertex = basevertex[i];
-	 else
-	    prim[i].basevertex = 0;
-      }
-
-      check_buffers_are_unmapped(exec->array.inputs);
-      vbo->draw_prims(ctx, exec->array.inputs, prim, primcount, &ib,
-		      GL_FALSE, ~0, ~0);
-   } else {
-      /* render one prim at a time */
-      for (i = 0; i < primcount; i++) {
-	 ib.count = count[i];
-	 ib.type = type;
-	 ib.obj = ctx->Array.ElementArrayBufferObj;
-	 ib.ptr = indices[i];
-
-	 prim[0].begin = 1;
-	 prim[0].end = 1;
-	 prim[0].weak = 0;
-	 prim[0].pad = 0;
-	 prim[0].mode = mode;
-	 prim[0].start = 0;
-	 prim[0].count = count[i];
-	 prim[0].indexed = 1;
-         prim[0].num_instances = 1;
-	 if (basevertex != NULL)
-	    prim[0].basevertex = basevertex[i];
-	 else
-	    prim[0].basevertex = 0;
-
-         check_buffers_are_unmapped(exec->array.inputs);
-         vbo->draw_prims(ctx, exec->array.inputs, prim, 1, &ib,
-                         GL_FALSE, ~0, ~0);
-      }
-   }
-
-   free(prim);
-}
-
-
-static void GLAPIENTRY
-vbo_exec_MultiDrawElements(GLenum mode,
-			   const GLsizei *count, GLenum type,
-			   const GLvoid **indices,
-			   GLsizei primcount)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   for (i = 0; i < primcount; i++) {
-      if (!_mesa_validate_DrawElements(ctx, mode, count[i], type, indices[i],
-				       0))
-	 return;
-   }
-
-   vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount,
-				   NULL);
-}
-
-
-static void GLAPIENTRY
-vbo_exec_MultiDrawElementsBaseVertex(GLenum mode,
-				     const GLsizei *count, GLenum type,
-				     const GLvoid **indices,
-				     GLsizei primcount,
-				     const GLsizei *basevertex)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   for (i = 0; i < primcount; i++) {
-      if (!_mesa_validate_DrawElements(ctx, mode, count[i], type, indices[i],
-				       basevertex[i]))
-	 return;
-   }
-
-   vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount,
-				   basevertex);
-}
-
-
-/**
- * Plug in the immediate-mode vertex array drawing commands into the
- * givven vbo_exec_context object.
- */
-void
-vbo_exec_array_init( struct vbo_exec_context *exec )
-{
-   exec->vtxfmt.DrawArrays = vbo_exec_DrawArrays;
-   exec->vtxfmt.DrawElements = vbo_exec_DrawElements;
-   exec->vtxfmt.DrawRangeElements = vbo_exec_DrawRangeElements;
-   exec->vtxfmt.MultiDrawElementsEXT = vbo_exec_MultiDrawElements;
-   exec->vtxfmt.DrawElementsBaseVertex = vbo_exec_DrawElementsBaseVertex;
-   exec->vtxfmt.DrawRangeElementsBaseVertex = vbo_exec_DrawRangeElementsBaseVertex;
-   exec->vtxfmt.MultiDrawElementsBaseVertex = vbo_exec_MultiDrawElementsBaseVertex;
-   exec->vtxfmt.DrawArraysInstanced = vbo_exec_DrawArraysInstanced;
-   exec->vtxfmt.DrawElementsInstanced = vbo_exec_DrawElementsInstanced;
-}
-
-
-void
-vbo_exec_array_destroy( struct vbo_exec_context *exec )
-{
-   /* nothing to do */
-}
-
-
-
-/**
- * The following functions are only used for OpenGL ES 1/2 support.
- * And some aren't even supported (yet) in ES 1/2.
- */
-
-
-void GLAPIENTRY
-_mesa_DrawArrays(GLenum mode, GLint first, GLsizei count)
-{
-   vbo_exec_DrawArrays(mode, first, count);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,
-                   const GLvoid *indices)
-{
-   vbo_exec_DrawElements(mode, count, type, indices);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
-			     const GLvoid *indices, GLint basevertex)
-{
-   vbo_exec_DrawElementsBaseVertex(mode, count, type, indices, basevertex);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
-                        GLenum type, const GLvoid *indices)
-{
-   vbo_exec_DrawRangeElements(mode, start, end, count, type, indices);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
-				  GLsizei count, GLenum type,
-				  const GLvoid *indices, GLint basevertex)
-{
-   vbo_exec_DrawRangeElementsBaseVertex(mode, start, end, count, type,
-					indices, basevertex);
-}
-
-
-void GLAPIENTRY
-_mesa_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type,
-			   const GLvoid **indices, GLsizei primcount)
-{
-   vbo_exec_MultiDrawElements(mode, count, type, indices, primcount);
-}
-
-
-void GLAPIENTRY
-_mesa_MultiDrawElementsBaseVertex(GLenum mode,
-				  const GLsizei *count, GLenum type,
-				  const GLvoid **indices, GLsizei primcount,
-				  const GLint *basevertex)
-{
-   vbo_exec_MultiDrawElementsBaseVertex(mode, count, type, indices,
-					primcount, basevertex);
-}
+/**************************************************************************

+ * 

+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * Copyright 2009 VMware, Inc.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 (including the

+ * next paragraph) 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

+ * 

+ **************************************************************************/

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/state.h"

+#include "main/api_validate.h"

+#include "main/varray.h"

+#include "main/bufferobj.h"

+#include "main/enums.h"

+#include "main/macros.h"

+

+#include "vbo_context.h"

+

+

+/**

+ * All vertex buffers should be in an unmapped state when we're about

+ * to draw.  This debug function checks that.

+ */

+static void

+check_buffers_are_unmapped(const struct gl_client_array **inputs)

+{

+#ifdef DEBUG

+   GLuint i;

+

+   for (i = 0; i < VERT_ATTRIB_MAX; i++) {

+      if (inputs[i]) {

+         struct gl_buffer_object *obj = inputs[i]->BufferObj;

+         assert(!_mesa_bufferobj_mapped(obj));

+         (void) obj;

+      }

+   }

+#endif

+}

+

+

+/**

+ * A debug function that may be called from other parts of Mesa as

+ * needed during debugging.

+ */

+void

+vbo_check_buffers_are_unmapped(struct gl_context *ctx)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct vbo_exec_context *exec = &vbo->exec;

+   /* check the current vertex arrays */

+   check_buffers_are_unmapped(exec->array.inputs);

+   /* check the current glBegin/glVertex/glEnd-style VBO */

+   assert(!_mesa_bufferobj_mapped(exec->vtx.bufferobj));

+}

+

+

+

+/**

+ * Compute min and max elements by scanning the index buffer for

+ * glDraw[Range]Elements() calls.

+ * If primitive restart is enabled, we need to ignore restart

+ * indexes when computing min/max.

+ */

+void

+vbo_get_minmax_index(struct gl_context *ctx,

+		     const struct _mesa_prim *prim,

+		     const struct _mesa_index_buffer *ib,

+		     GLuint *min_index, GLuint *max_index)

+{

+   const GLboolean restart = ctx->Array.PrimitiveRestart;

+   const GLuint restartIndex = ctx->Array.RestartIndex;

+   const GLuint count = prim->count;

+   const void *indices;

+   GLuint i;

+

+   if (_mesa_is_bufferobj(ib->obj)) {

+      const GLvoid *map =

+         ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB,

+                               GL_READ_ONLY, ib->obj);

+      indices = ADD_POINTERS(map, ib->ptr);

+   } else {

+      indices = ib->ptr;

+   }

+

+   switch (ib->type) {

+   case GL_UNSIGNED_INT: {

+      const GLuint *ui_indices = (const GLuint *)indices;

+      GLuint max_ui = 0;

+      GLuint min_ui = ~0U;

+      if (restart) {

+         for (i = 0; i < count; i++) {

+            if (ui_indices[i] != restartIndex) {

+               if (ui_indices[i] > max_ui) max_ui = ui_indices[i];

+               if (ui_indices[i] < min_ui) min_ui = ui_indices[i];

+            }

+         }

+      }

+      else {

+         for (i = 0; i < count; i++) {

+            if (ui_indices[i] > max_ui) max_ui = ui_indices[i];

+            if (ui_indices[i] < min_ui) min_ui = ui_indices[i];

+         }

+      }

+      *min_index = min_ui;

+      *max_index = max_ui;

+      break;

+   }

+   case GL_UNSIGNED_SHORT: {

+      const GLushort *us_indices = (const GLushort *)indices;

+      GLuint max_us = 0;

+      GLuint min_us = ~0U;

+      if (restart) {

+         for (i = 0; i < count; i++) {

+            if (us_indices[i] != restartIndex) {

+               if (us_indices[i] > max_us) max_us = us_indices[i];

+               if (us_indices[i] < min_us) min_us = us_indices[i];

+            }

+         }

+      }

+      else {

+         for (i = 0; i < count; i++) {

+            if (us_indices[i] > max_us) max_us = us_indices[i];

+            if (us_indices[i] < min_us) min_us = us_indices[i];

+         }

+      }

+      *min_index = min_us;

+      *max_index = max_us;

+      break;

+   }

+   case GL_UNSIGNED_BYTE: {

+      const GLubyte *ub_indices = (const GLubyte *)indices;

+      GLuint max_ub = 0;

+      GLuint min_ub = ~0U;

+      if (restart) {

+         for (i = 0; i < count; i++) {

+            if (ub_indices[i] != restartIndex) {

+               if (ub_indices[i] > max_ub) max_ub = ub_indices[i];

+               if (ub_indices[i] < min_ub) min_ub = ub_indices[i];

+            }

+         }

+      }

+      else {

+         for (i = 0; i < count; i++) {

+            if (ub_indices[i] > max_ub) max_ub = ub_indices[i];

+            if (ub_indices[i] < min_ub) min_ub = ub_indices[i];

+         }

+      }

+      *min_index = min_ub;

+      *max_index = max_ub;

+      break;

+   }

+   default:

+      assert(0);

+      break;

+   }

+

+   if (_mesa_is_bufferobj(ib->obj)) {

+      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, ib->obj);

+   }

+}

+

+

+/**

+ * Check that element 'j' of the array has reasonable data.

+ * Map VBO if needed.

+ * For debugging purposes; not normally used.

+ */

+static void

+check_array_data(struct gl_context *ctx, struct gl_client_array *array,

+                 GLuint attrib, GLuint j)

+{

+   if (array->Enabled) {

+      const void *data = array->Ptr;

+      if (_mesa_is_bufferobj(array->BufferObj)) {

+         if (!array->BufferObj->Pointer) {

+            /* need to map now */

+            array->BufferObj->Pointer =

+               ctx->Driver.MapBuffer(ctx, GL_ARRAY_BUFFER_ARB,

+                                     GL_READ_ONLY, array->BufferObj);

+         }

+         data = ADD_POINTERS(data, array->BufferObj->Pointer);

+      }

+      switch (array->Type) {

+      case GL_FLOAT:

+         {

+            GLfloat *f = (GLfloat *) ((GLubyte *) data + array->StrideB * j);

+            GLint k;

+            for (k = 0; k < array->Size; k++) {

+               if (IS_INF_OR_NAN(f[k]) ||

+                   f[k] >= 1.0e20 || f[k] <= -1.0e10) {

+                  printf("Bad array data:\n");

+                  printf("  Element[%u].%u = %f\n", j, k, f[k]);

+                  printf("  Array %u at %p\n", attrib, (void* ) array);

+                  printf("  Type 0x%x, Size %d, Stride %d\n",

+			 array->Type, array->Size, array->Stride);

+                  printf("  Address/offset %p in Buffer Object %u\n",

+			 array->Ptr, array->BufferObj->Name);

+                  f[k] = 1.0; /* XXX replace the bad value! */

+               }

+               /*assert(!IS_INF_OR_NAN(f[k]));*/

+            }

+         }

+         break;

+      default:

+         ;

+      }

+   }

+}

+

+

+/**

+ * Unmap the buffer object referenced by given array, if mapped.

+ */

+static void

+unmap_array_buffer(struct gl_context *ctx, struct gl_client_array *array)

+{

+   if (array->Enabled &&

+       _mesa_is_bufferobj(array->BufferObj) &&

+       _mesa_bufferobj_mapped(array->BufferObj)) {

+      ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER_ARB, array->BufferObj);

+   }

+}

+

+

+/**

+ * Examine the array's data for NaNs, etc.

+ * For debug purposes; not normally used.

+ */

+static void

+check_draw_elements_data(struct gl_context *ctx, GLsizei count, GLenum elemType,

+                         const void *elements, GLint basevertex)

+{

+   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;

+   const void *elemMap;

+   GLint i, k;

+

+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {

+      elemMap = ctx->Driver.MapBuffer(ctx,

+                                      GL_ELEMENT_ARRAY_BUFFER_ARB,

+                                      GL_READ_ONLY,

+                                      ctx->Array.ElementArrayBufferObj);

+      elements = ADD_POINTERS(elements, elemMap);

+   }

+

+   for (i = 0; i < count; i++) {

+      GLuint j;

+

+      /* j = element[i] */

+      switch (elemType) {

+      case GL_UNSIGNED_BYTE:

+         j = ((const GLubyte *) elements)[i];

+         break;

+      case GL_UNSIGNED_SHORT:

+         j = ((const GLushort *) elements)[i];

+         break;

+      case GL_UNSIGNED_INT:

+         j = ((const GLuint *) elements)[i];

+         break;

+      default:

+         assert(0);

+      }

+

+      /* check element j of each enabled array */

+      check_array_data(ctx, &arrayObj->Vertex, VERT_ATTRIB_POS, j);

+      check_array_data(ctx, &arrayObj->Normal, VERT_ATTRIB_NORMAL, j);

+      check_array_data(ctx, &arrayObj->Color, VERT_ATTRIB_COLOR0, j);

+      check_array_data(ctx, &arrayObj->SecondaryColor, VERT_ATTRIB_COLOR1, j);

+      for (k = 0; k < Elements(arrayObj->TexCoord); k++) {

+         check_array_data(ctx, &arrayObj->TexCoord[k], VERT_ATTRIB_TEX0 + k, j);

+      }

+      for (k = 0; k < Elements(arrayObj->VertexAttrib); k++) {

+         check_array_data(ctx, &arrayObj->VertexAttrib[k],

+                          VERT_ATTRIB_GENERIC0 + k, j);

+      }

+   }

+

+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {

+      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB,

+			      ctx->Array.ElementArrayBufferObj);

+   }

+

+   unmap_array_buffer(ctx, &arrayObj->Vertex);

+   unmap_array_buffer(ctx, &arrayObj->Normal);

+   unmap_array_buffer(ctx, &arrayObj->Color);

+   for (k = 0; k < Elements(arrayObj->TexCoord); k++) {

+      unmap_array_buffer(ctx, &arrayObj->TexCoord[k]);

+   }

+   for (k = 0; k < Elements(arrayObj->VertexAttrib); k++) {

+      unmap_array_buffer(ctx, &arrayObj->VertexAttrib[k]);

+   }

+}

+

+

+/**

+ * Check array data, looking for NaNs, etc.

+ */

+static void

+check_draw_arrays_data(struct gl_context *ctx, GLint start, GLsizei count)

+{

+   /* TO DO */

+}

+

+

+/**

+ * Print info/data for glDrawArrays(), for debugging.

+ */

+static void

+print_draw_arrays(struct gl_context *ctx,

+                  GLenum mode, GLint start, GLsizei count)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct vbo_exec_context *exec = &vbo->exec;

+   int i;

+

+   printf("vbo_exec_DrawArrays(mode 0x%x, start %d, count %d):\n",

+	  mode, start, count);

+

+   for (i = 0; i < 32; i++) {

+      GLuint bufName = exec->array.inputs[i]->BufferObj->Name;

+      GLint stride = exec->array.inputs[i]->Stride;

+      printf("attr %2d: size %d stride %d  enabled %d  "

+	     "ptr %p  Bufobj %u\n",

+	     i,

+	     exec->array.inputs[i]->Size,

+	     stride,

+	     /*exec->array.inputs[i]->Enabled,*/

+	     exec->array.legacy_array[i]->Enabled,

+	     exec->array.inputs[i]->Ptr,

+	     bufName);

+

+      if (bufName) {

+         struct gl_buffer_object *buf = _mesa_lookup_bufferobj(ctx, bufName);

+         GLubyte *p = ctx->Driver.MapBuffer(ctx, GL_ARRAY_BUFFER_ARB,

+                                            GL_READ_ONLY_ARB, buf);

+         int offset = (int) (GLintptr) exec->array.inputs[i]->Ptr;

+         float *f = (float *) (p + offset);

+         int *k = (int *) f;

+         int i;

+         int n = (count * stride) / 4;

+         if (n > 32)

+            n = 32;

+         printf("  Data at offset %d:\n", offset);

+         for (i = 0; i < n; i++) {

+            printf("    float[%d] = 0x%08x %f\n", i, k[i], f[i]);

+         }

+         ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER_ARB, buf);

+      }

+   }

+}

+

+

+/**

+ * Bind the VBO executor to the current vertex array object prior

+ * to drawing.

+ *

+ * Just translate the arrayobj into a sane layout.

+ */

+static void

+bind_array_obj(struct gl_context *ctx)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct vbo_exec_context *exec = &vbo->exec;

+   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;

+   GLuint i;

+

+   /* TODO: Fix the ArrayObj struct to keep legacy arrays in an array

+    * rather than as individual named arrays.  Then this function can

+    * go away.

+    */

+   exec->array.legacy_array[VERT_ATTRIB_POS] = &arrayObj->Vertex;

+   exec->array.legacy_array[VERT_ATTRIB_WEIGHT] = &arrayObj->Weight;

+   exec->array.legacy_array[VERT_ATTRIB_NORMAL] = &arrayObj->Normal;

+   exec->array.legacy_array[VERT_ATTRIB_COLOR0] = &arrayObj->Color;

+   exec->array.legacy_array[VERT_ATTRIB_COLOR1] = &arrayObj->SecondaryColor;

+   exec->array.legacy_array[VERT_ATTRIB_FOG] = &arrayObj->FogCoord;

+   exec->array.legacy_array[VERT_ATTRIB_COLOR_INDEX] = &arrayObj->Index;

+   if (arrayObj->PointSize.Enabled) {

+      /* this aliases COLOR_INDEX */

+      exec->array.legacy_array[VERT_ATTRIB_POINT_SIZE] = &arrayObj->PointSize;

+   }

+   exec->array.legacy_array[VERT_ATTRIB_EDGEFLAG] = &arrayObj->EdgeFlag;

+

+   for (i = 0; i < Elements(arrayObj->TexCoord); i++)

+      exec->array.legacy_array[VERT_ATTRIB_TEX0 + i] = &arrayObj->TexCoord[i];

+

+   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++) {

+      assert(i < Elements(exec->array.generic_array));

+      exec->array.generic_array[i] = &arrayObj->VertexAttrib[i];

+   }

+   

+   exec->array.array_obj = arrayObj->Name;

+}

+

+

+/**

+ * Set the vbo->exec->inputs[] pointers to point to the enabled

+ * vertex arrays.  This depends on the current vertex program/shader

+ * being executed because of whether or not generic vertex arrays

+ * alias the conventional vertex arrays.

+ * For arrays that aren't enabled, we set the input[attrib] pointer

+ * to point at a zero-stride current value "array".

+ */

+static void

+recalculate_input_bindings(struct gl_context *ctx)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct vbo_exec_context *exec = &vbo->exec;

+   const struct gl_client_array **inputs = &exec->array.inputs[0];

+   GLbitfield const_inputs = 0x0;

+   GLuint i;

+

+   exec->array.program_mode = get_program_mode(ctx);

+   exec->array.enabled_flags = ctx->Array.ArrayObj->_Enabled;

+

+   switch (exec->array.program_mode) {

+   case VP_NONE:

+      /* When no vertex program is active (or the vertex program is generated

+       * from fixed-function state).  We put the material values into the

+       * generic slots.  This is the only situation where material values

+       * are available as per-vertex attributes.

+       */

+      for (i = 0; i <= VERT_ATTRIB_TEX7; i++) {

+	 if (exec->array.legacy_array[i]->Enabled)

+	    inputs[i] = exec->array.legacy_array[i];

+	 else {

+	    inputs[i] = &vbo->legacy_currval[i];

+            const_inputs |= 1 << i;

+         }

+      }

+

+      for (i = 0; i < MAT_ATTRIB_MAX; i++) {

+	 inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->mat_currval[i];

+         const_inputs |= 1 << (VERT_ATTRIB_GENERIC0 + i);

+      }

+

+      /* Could use just about anything, just to fill in the empty

+       * slots:

+       */

+      for (i = MAT_ATTRIB_MAX; i < VERT_ATTRIB_MAX - VERT_ATTRIB_GENERIC0; i++) {

+	 inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->generic_currval[i];

+         const_inputs |= 1 << (VERT_ATTRIB_GENERIC0 + i);

+      }

+

+      /* There is no need to make _NEW_ARRAY dirty here for the TnL program,

+       * because it already takes care of invalidating the state necessary

+       * to revalidate vertex arrays. Not marking the state as dirty also

+       * improves performance (quite significantly in some apps).

+       */

+      if (!ctx->VertexProgram._MaintainTnlProgram)

+         ctx->NewState |= _NEW_ARRAY;

+      break;

+

+   case VP_NV:

+      /* NV_vertex_program - attribute arrays alias and override

+       * conventional, legacy arrays.  No materials, and the generic

+       * slots are vacant.

+       */

+      for (i = 0; i <= VERT_ATTRIB_TEX7; i++) {

+	 if (exec->array.generic_array[i]->Enabled)

+	    inputs[i] = exec->array.generic_array[i];

+	 else if (exec->array.legacy_array[i]->Enabled)

+	    inputs[i] = exec->array.legacy_array[i];

+	 else {

+	    inputs[i] = &vbo->legacy_currval[i];

+            const_inputs |= 1 << i;

+         }

+      }

+

+      /* Could use just about anything, just to fill in the empty

+       * slots:

+       */

+      for (i = VERT_ATTRIB_GENERIC0; i < VERT_ATTRIB_MAX; i++) {

+	 inputs[i] = &vbo->generic_currval[i - VERT_ATTRIB_GENERIC0];

+         const_inputs |= 1 << i;

+      }

+

+      ctx->NewState |= _NEW_ARRAY;

+      break;

+

+   case VP_ARB:

+      /* GL_ARB_vertex_program or GLSL vertex shader - Only the generic[0]

+       * attribute array aliases and overrides the legacy position array.  

+       *

+       * Otherwise, legacy attributes available in the legacy slots,

+       * generic attributes in the generic slots and materials are not

+       * available as per-vertex attributes.

+       */

+      if (exec->array.generic_array[0]->Enabled)

+	 inputs[0] = exec->array.generic_array[0];

+      else if (exec->array.legacy_array[0]->Enabled)

+	 inputs[0] = exec->array.legacy_array[0];

+      else {

+	 inputs[0] = &vbo->legacy_currval[0];

+         const_inputs |= 1 << 0;

+      }

+

+      for (i = 1; i <= VERT_ATTRIB_TEX7; i++) {

+	 if (exec->array.legacy_array[i]->Enabled)

+	    inputs[i] = exec->array.legacy_array[i];

+	 else {

+	    inputs[i] = &vbo->legacy_currval[i];

+            const_inputs |= 1 << i;

+         }

+      }

+

+      for (i = 0; i < MAX_VERTEX_GENERIC_ATTRIBS; i++) {

+	 if (exec->array.generic_array[i]->Enabled)

+	    inputs[VERT_ATTRIB_GENERIC0 + i] = exec->array.generic_array[i];

+	 else {

+	    inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->generic_currval[i];

+            const_inputs |= 1 << (VERT_ATTRIB_GENERIC0 + i);

+         }

+      }

+

+      ctx->NewState |= _NEW_ARRAY;

+      break;

+   }

+

+   _mesa_set_varying_vp_inputs( ctx, ~const_inputs );

+}

+

+

+/**

+ * Examine the enabled vertex arrays to set the exec->array.inputs[] values.

+ * These will point to the arrays to actually use for drawing.  Some will

+ * be user-provided arrays, other will be zero-stride const-valued arrays.

+ * Note that this might set the _NEW_ARRAY dirty flag so state validation

+ * must be done after this call.

+ */

+static void

+bind_arrays(struct gl_context *ctx)

+{

+   if (!ctx->Array.RebindArrays) {

+      return;

+   }

+

+   bind_array_obj(ctx);

+   recalculate_input_bindings(ctx);

+   ctx->Array.RebindArrays = GL_FALSE;

+}

+

+

+/**

+ * Helper function called by the other DrawArrays() functions below.

+ * This is where we handle primitive restart for drawing non-indexed

+ * arrays.  If primitive restart is enabled, it typically means

+ * splitting one DrawArrays() into two.

+ */

+static void

+vbo_draw_arrays(struct gl_context *ctx, GLenum mode, GLint start,

+                GLsizei count, GLuint numInstances)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct vbo_exec_context *exec = &vbo->exec;

+   struct _mesa_prim prim[2];

+

+   bind_arrays(ctx);

+

+   /* Again... because we may have changed the bitmask of per-vertex varying

+    * attributes.  If we regenerate the fixed-function vertex program now

+    * we may be able to prune down the number of vertex attributes which we

+    * need in the shader.

+    */

+   if (ctx->NewState)

+      _mesa_update_state(ctx);

+

+   prim[0].begin = 1;

+   prim[0].end = 1;

+   prim[0].weak = 0;

+   prim[0].pad = 0;

+   prim[0].mode = mode;

+   prim[0].start = 0; /* filled in below */

+   prim[0].count = 0; /* filled in below */

+   prim[0].indexed = 0;

+   prim[0].basevertex = 0;

+   prim[0].num_instances = numInstances;

+

+   /* Implement the primitive restart index */

+   if (ctx->Array.PrimitiveRestart && ctx->Array.RestartIndex < count) {

+      GLuint primCount = 0;

+

+      if (ctx->Array.RestartIndex == start) {

+         /* special case: RestartIndex at beginning */

+         if (count > 1) {

+            prim[0].start = start + 1;

+            prim[0].count = count - 1;

+            primCount = 1;

+         }

+      }

+      else if (ctx->Array.RestartIndex == start + count - 1) {

+         /* special case: RestartIndex at end */

+         if (count > 1) {

+            prim[0].start = start;

+            prim[0].count = count - 1;

+            primCount = 1;

+         }

+      }

+      else {

+         /* general case: RestartIndex in middle, split into two prims */

+         prim[0].start = start;

+         prim[0].count = ctx->Array.RestartIndex - start;

+

+         prim[1] = prim[0];

+         prim[1].start = ctx->Array.RestartIndex + 1;

+         prim[1].count = count - prim[1].start;

+

+         primCount = 2;

+      }

+

+      if (primCount > 0) {

+         /* draw one or two prims */

+         check_buffers_are_unmapped(exec->array.inputs);

+         vbo->draw_prims(ctx, exec->array.inputs, prim, primCount, NULL,

+                         GL_TRUE, start, start + count - 1);

+      }

+   }

+   else {

+      /* no prim restart */

+      prim[0].start = start;

+      prim[0].count = count;

+

+      check_buffers_are_unmapped(exec->array.inputs);

+      vbo->draw_prims(ctx, exec->array.inputs, prim, 1, NULL,

+                      GL_TRUE, start, start + count - 1);

+   }

+}

+

+

+

+/**

+ * Called from glDrawArrays when in immediate mode (not display list mode).

+ */

+static void GLAPIENTRY

+vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_DRAW)

+      _mesa_debug(ctx, "glDrawArrays(%s, %d, %d)\n",

+                  _mesa_lookup_enum_by_nr(mode), start, count);

+

+   if (!_mesa_validate_DrawArrays( ctx, mode, start, count ))

+      return;

+

+   FLUSH_CURRENT( ctx, 0 );

+

+   if (!_mesa_valid_to_render(ctx, "glDrawArrays")) {

+      return;

+   }

+

+   if (0)

+      check_draw_arrays_data(ctx, start, count);

+

+   vbo_draw_arrays(ctx, mode, start, count, 1);

+

+   if (0)

+      print_draw_arrays(ctx, mode, start, count);

+}

+

+

+/**

+ * Called from glDrawArraysInstanced when in immediate mode (not

+ * display list mode).

+ */

+static void GLAPIENTRY

+vbo_exec_DrawArraysInstanced(GLenum mode, GLint start, GLsizei count,

+                             GLsizei numInstances)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_DRAW)

+      _mesa_debug(ctx, "glDrawArraysInstanced(%s, %d, %d, %d)\n",

+                  _mesa_lookup_enum_by_nr(mode), start, count, numInstances);

+

+   if (!_mesa_validate_DrawArraysInstanced(ctx, mode, start, count, numInstances))

+      return;

+

+   FLUSH_CURRENT( ctx, 0 );

+

+   if (!_mesa_valid_to_render(ctx, "glDrawArraysInstanced")) {

+      return;

+   }

+

+   if (0)

+      check_draw_arrays_data(ctx, start, count);

+

+   vbo_draw_arrays(ctx, mode, start, count, numInstances);

+

+   if (0)

+      print_draw_arrays(ctx, mode, start, count);

+}

+

+

+/**

+ * Map GL_ELEMENT_ARRAY_BUFFER and print contents.

+ * For debugging.

+ */

+static void

+dump_element_buffer(struct gl_context *ctx, GLenum type)

+{

+   const GLvoid *map = ctx->Driver.MapBuffer(ctx,

+                                             GL_ELEMENT_ARRAY_BUFFER_ARB,

+                                             GL_READ_ONLY,

+                                             ctx->Array.ElementArrayBufferObj);

+   switch (type) {

+   case GL_UNSIGNED_BYTE:

+      {

+         const GLubyte *us = (const GLubyte *) map;

+         GLint i;

+         for (i = 0; i < ctx->Array.ElementArrayBufferObj->Size; i++) {

+            printf("%02x ", us[i]);

+            if (i % 32 == 31)

+               printf("\n");

+         }

+         printf("\n");

+      }

+      break;

+   case GL_UNSIGNED_SHORT:

+      {

+         const GLushort *us = (const GLushort *) map;

+         GLint i;

+         for (i = 0; i < ctx->Array.ElementArrayBufferObj->Size / 2; i++) {

+            printf("%04x ", us[i]);

+            if (i % 16 == 15)

+               printf("\n");

+         }

+         printf("\n");

+      }

+      break;

+   case GL_UNSIGNED_INT:

+      {

+         const GLuint *us = (const GLuint *) map;

+         GLint i;

+         for (i = 0; i < ctx->Array.ElementArrayBufferObj->Size / 4; i++) {

+            printf("%08x ", us[i]);

+            if (i % 8 == 7)

+               printf("\n");

+         }

+         printf("\n");

+      }

+      break;

+   default:

+      ;

+   }

+

+   ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB,

+                           ctx->Array.ElementArrayBufferObj);

+}

+

+

+/**

+ * Inner support for both _mesa_DrawElements and _mesa_DrawRangeElements.

+ * Do the rendering for a glDrawElements or glDrawRangeElements call after

+ * we've validated buffer bounds, etc.

+ */

+static void

+vbo_validated_drawrangeelements(struct gl_context *ctx, GLenum mode,

+				GLboolean index_bounds_valid,

+				GLuint start, GLuint end,

+				GLsizei count, GLenum type,

+				const GLvoid *indices,

+				GLint basevertex, GLint numInstances)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct vbo_exec_context *exec = &vbo->exec;

+   struct _mesa_index_buffer ib;

+   struct _mesa_prim prim[1];

+

+   FLUSH_CURRENT( ctx, 0 );

+

+   if (!_mesa_valid_to_render(ctx, "glDraw[Range]Elements")) {

+      return;

+   }

+

+   bind_arrays( ctx );

+

+   /* check for dirty state again */

+   if (ctx->NewState)

+      _mesa_update_state( ctx );

+

+   ib.count = count;

+   ib.type = type;

+   ib.obj = ctx->Array.ElementArrayBufferObj;

+   ib.ptr = indices;

+

+   prim[0].begin = 1;

+   prim[0].end = 1;

+   prim[0].weak = 0;

+   prim[0].pad = 0;

+   prim[0].mode = mode;

+   prim[0].start = 0;

+   prim[0].count = count;

+   prim[0].indexed = 1;

+   prim[0].basevertex = basevertex;

+   prim[0].num_instances = numInstances;

+

+   /* Need to give special consideration to rendering a range of

+    * indices starting somewhere above zero.  Typically the

+    * application is issuing multiple DrawRangeElements() to draw

+    * successive primitives layed out linearly in the vertex arrays.

+    * Unless the vertex arrays are all in a VBO (or locked as with

+    * CVA), the OpenGL semantics imply that we need to re-read or

+    * re-upload the vertex data on each draw call.  

+    *

+    * In the case of hardware tnl, we want to avoid starting the

+    * upload at zero, as it will mean every draw call uploads an

+    * increasing amount of not-used vertex data.  Worse - in the

+    * software tnl module, all those vertices might be transformed and

+    * lit but never rendered.

+    *

+    * If we just upload or transform the vertices in start..end,

+    * however, the indices will be incorrect.

+    *

+    * At this level, we don't know exactly what the requirements of

+    * the backend are going to be, though it will likely boil down to

+    * either:

+    *

+    * 1) Do nothing, everything is in a VBO and is processed once

+    *       only.

+    *

+    * 2) Adjust the indices and vertex arrays so that start becomes

+    *    zero.

+    *

+    * Rather than doing anything here, I'll provide a helper function

+    * for the latter case elsewhere.

+    */

+

+   check_buffers_are_unmapped(exec->array.inputs);

+   vbo->draw_prims( ctx, exec->array.inputs, prim, 1, &ib,

+		    index_bounds_valid, start, end );

+}

+

+

+/**

+ * Called by glDrawRangeElementsBaseVertex() in immediate mode.

+ */

+static void GLAPIENTRY

+vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,

+				     GLuint start, GLuint end,

+				     GLsizei count, GLenum type,

+				     const GLvoid *indices,

+				     GLint basevertex)

+{

+   static GLuint warnCount = 0;

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_DRAW)

+      _mesa_debug(ctx,

+                "glDrawRangeElementsBaseVertex(%s, %u, %u, %d, %s, %p, %d)\n",

+                _mesa_lookup_enum_by_nr(mode), start, end, count,

+                _mesa_lookup_enum_by_nr(type), indices, basevertex);

+

+   if (!_mesa_validate_DrawRangeElements( ctx, mode, start, end, count,

+                                          type, indices, basevertex ))

+      return;

+

+   /* NOTE: It's important that 'end' is a reasonable value.

+    * in _tnl_draw_prims(), we use end to determine how many vertices

+    * to transform.  If it's too large, we can unnecessarily split prims

+    * or we can read/write out of memory in several different places!

+    */

+

+   /* Catch/fix some potential user errors */

+   if (type == GL_UNSIGNED_BYTE) {

+      start = MIN2(start, 0xff);

+      end = MIN2(end, 0xff);

+   }

+   else if (type == GL_UNSIGNED_SHORT) {

+      start = MIN2(start, 0xffff);

+      end = MIN2(end, 0xffff);

+   }

+

+   if (end >= ctx->Array.ArrayObj->_MaxElement) {

+      /* the max element is out of bounds of one or more enabled arrays */

+      warnCount++;

+

+      if (warnCount < 10) {

+         _mesa_warning(ctx, "glDraw[Range]Elements(start %u, end %u, count %d, "

+                       "type 0x%x, indices=%p)\n"

+                       "\tend is out of bounds (max=%u)  "

+                       "Element Buffer %u (size %d)\n"

+                       "\tThis should probably be fixed in the application.",

+                       start, end, count, type, indices,

+                       ctx->Array.ArrayObj->_MaxElement - 1,

+                       ctx->Array.ElementArrayBufferObj->Name,

+                       (int) ctx->Array.ElementArrayBufferObj->Size);

+      }

+

+      if (0)

+         dump_element_buffer(ctx, type);

+

+      if (0)

+         _mesa_print_arrays(ctx);

+

+#ifdef DEBUG

+      /* 'end' was out of bounds, but now let's check the actual array

+       * indexes to see if any of them are out of bounds.

+       */

+      {

+         GLuint max = _mesa_max_buffer_index(ctx, count, type, indices,

+                                             ctx->Array.ElementArrayBufferObj);

+         if (max >= ctx->Array.ArrayObj->_MaxElement) {

+            if (warnCount < 10) {

+               _mesa_warning(ctx, "glDraw[Range]Elements(start %u, end %u, "

+                             "count %d, type 0x%x, indices=%p)\n"

+                             "\tindex=%u is out of bounds (max=%u)  "

+                             "Element Buffer %u (size %d)\n"

+                             "\tSkipping the glDrawRangeElements() call",

+                             start, end, count, type, indices, max,

+                             ctx->Array.ArrayObj->_MaxElement - 1,

+                             ctx->Array.ElementArrayBufferObj->Name,

+                             (int) ctx->Array.ElementArrayBufferObj->Size);

+            }

+         }

+         /* XXX we could also find the min index and compare to 'start'

+          * to see if start is correct.  But it's more likely to get the

+          * upper bound wrong.

+          */

+      }

+#endif

+

+      /* Set 'end' to the max possible legal value */

+      assert(ctx->Array.ArrayObj->_MaxElement >= 1);

+      end = ctx->Array.ArrayObj->_MaxElement - 1;

+   }

+   else if (0) {

+      printf("glDraw[Range]Elements{,BaseVertex}"

+	     "(start %u, end %u, type 0x%x, count %d) ElemBuf %u, "

+	     "base %d\n",

+	     start, end, type, count,

+	     ctx->Array.ElementArrayBufferObj->Name,

+	     basevertex);

+   }

+

+#if 0

+   check_draw_elements_data(ctx, count, type, indices);

+#else

+   (void) check_draw_elements_data;

+#endif

+

+   vbo_validated_drawrangeelements(ctx, mode, GL_TRUE, start, end,

+				   count, type, indices, basevertex, 1);

+}

+

+

+/**

+ * Called by glDrawRangeElements() in immediate mode.

+ */

+static void GLAPIENTRY

+vbo_exec_DrawRangeElements(GLenum mode, GLuint start, GLuint end,

+                           GLsizei count, GLenum type, const GLvoid *indices)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_DRAW)

+      _mesa_debug(ctx,

+                  "glDrawRangeElements(%s, %u, %u, %d, %s, %p)\n",

+                  _mesa_lookup_enum_by_nr(mode), start, end, count,

+                  _mesa_lookup_enum_by_nr(type), indices);

+

+   vbo_exec_DrawRangeElementsBaseVertex(mode, start, end, count, type,

+					indices, 0);

+}

+

+

+/**

+ * Called by glDrawElements() in immediate mode.

+ */

+static void GLAPIENTRY

+vbo_exec_DrawElements(GLenum mode, GLsizei count, GLenum type,

+                      const GLvoid *indices)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_DRAW)

+      _mesa_debug(ctx, "glDrawElements(%s, %u, %s, %p)\n",

+                  _mesa_lookup_enum_by_nr(mode), count,

+                  _mesa_lookup_enum_by_nr(type), indices);

+

+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices, 0 ))

+      return;

+

+   vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,

+				   count, type, indices, 0, 1);

+}

+

+

+/**

+ * Called by glDrawElementsBaseVertex() in immediate mode.

+ */

+static void GLAPIENTRY

+vbo_exec_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,

+				const GLvoid *indices, GLint basevertex)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_DRAW)

+      _mesa_debug(ctx, "glDrawElementsBaseVertex(%s, %d, %s, %p, %d)\n",

+                  _mesa_lookup_enum_by_nr(mode), count,

+                  _mesa_lookup_enum_by_nr(type), indices, basevertex);

+

+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices,

+				     basevertex ))

+      return;

+

+   vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,

+				   count, type, indices, basevertex, 1);

+}

+

+

+/**

+ * Called by glDrawElementsInstanced() in immediate mode.

+ */

+static void GLAPIENTRY

+vbo_exec_DrawElementsInstanced(GLenum mode, GLsizei count, GLenum type,

+                               const GLvoid *indices, GLsizei numInstances)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_DRAW)

+      _mesa_debug(ctx, "glDrawElementsInstanced(%s, %d, %s, %p, %d)\n",

+                  _mesa_lookup_enum_by_nr(mode), count,

+                  _mesa_lookup_enum_by_nr(type), indices, numInstances);

+

+   if (!_mesa_validate_DrawElementsInstanced(ctx, mode, count, type, indices,

+                                             numInstances))

+      return;

+

+   vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,

+				   count, type, indices, 0, numInstances);

+}

+

+

+/**

+ * Inner support for both _mesa_MultiDrawElements() and

+ * _mesa_MultiDrawRangeElements().

+ * This does the actual rendering after we've checked array indexes, etc.

+ */

+static void

+vbo_validated_multidrawelements(struct gl_context *ctx, GLenum mode,

+				const GLsizei *count, GLenum type,

+				const GLvoid **indices, GLsizei primcount,

+				const GLint *basevertex)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct vbo_exec_context *exec = &vbo->exec;

+   struct _mesa_index_buffer ib;

+   struct _mesa_prim *prim;

+   unsigned int index_type_size = 0;

+   uintptr_t min_index_ptr, max_index_ptr;

+   GLboolean fallback = GL_FALSE;

+   int i;

+

+   if (primcount == 0)

+      return;

+

+   FLUSH_CURRENT( ctx, 0 );

+

+   if (!_mesa_valid_to_render(ctx, "glMultiDrawElements")) {

+      return;

+   }

+

+   prim = calloc(1, primcount * sizeof(*prim));

+   if (prim == NULL) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMultiDrawElements");

+      return;

+   }

+

+   /* Decide if we can do this all as one set of primitives sharing the

+    * same index buffer, or if we have to reset the index pointer per

+    * primitive.

+    */

+   bind_arrays( ctx );

+

+   /* check for dirty state again */

+   if (ctx->NewState)

+      _mesa_update_state( ctx );

+

+   switch (type) {

+   case GL_UNSIGNED_INT:

+      index_type_size = 4;

+      break;

+   case GL_UNSIGNED_SHORT:

+      index_type_size = 2;

+      break;

+   case GL_UNSIGNED_BYTE:

+      index_type_size = 1;

+      break;

+   default:

+      assert(0);

+   }

+

+   min_index_ptr = (uintptr_t)indices[0];

+   max_index_ptr = 0;

+   for (i = 0; i < primcount; i++) {

+      min_index_ptr = MIN2(min_index_ptr, (uintptr_t)indices[i]);

+      max_index_ptr = MAX2(max_index_ptr, (uintptr_t)indices[i] +

+			   index_type_size * count[i]);

+   }

+

+   /* Check if we can handle this thing as a bunch of index offsets from the

+    * same index pointer.  If we can't, then we have to fall back to doing

+    * a draw_prims per primitive.

+    * Check that the difference between each prim's indexes is a multiple of

+    * the index/element size.

+    */

+   if (index_type_size != 1) {

+      for (i = 0; i < primcount; i++) {

+	 if ((((uintptr_t)indices[i] - min_index_ptr) % index_type_size) != 0) {

+	    fallback = GL_TRUE;

+	    break;

+	 }

+      }

+   }

+

+   /* If the index buffer isn't in a VBO, then treating the application's

+    * subranges of the index buffer as one large index buffer may lead to

+    * us reading unmapped memory.

+    */

+   if (!_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj))

+      fallback = GL_TRUE;

+

+   if (!fallback) {

+      ib.count = (max_index_ptr - min_index_ptr) / index_type_size;

+      ib.type = type;

+      ib.obj = ctx->Array.ElementArrayBufferObj;

+      ib.ptr = (void *)min_index_ptr;

+

+      for (i = 0; i < primcount; i++) {

+	 prim[i].begin = (i == 0);

+	 prim[i].end = (i == primcount - 1);

+	 prim[i].weak = 0;

+	 prim[i].pad = 0;

+	 prim[i].mode = mode;

+	 prim[i].start = ((uintptr_t)indices[i] - min_index_ptr) / index_type_size;

+	 prim[i].count = count[i];

+	 prim[i].indexed = 1;

+         prim[i].num_instances = 1;

+	 if (basevertex != NULL)

+	    prim[i].basevertex = basevertex[i];

+	 else

+	    prim[i].basevertex = 0;

+      }

+

+      check_buffers_are_unmapped(exec->array.inputs);

+      vbo->draw_prims(ctx, exec->array.inputs, prim, primcount, &ib,

+		      GL_FALSE, ~0, ~0);

+   } else {

+      /* render one prim at a time */

+      for (i = 0; i < primcount; i++) {

+	 ib.count = count[i];

+	 ib.type = type;

+	 ib.obj = ctx->Array.ElementArrayBufferObj;

+	 ib.ptr = indices[i];

+

+	 prim[0].begin = 1;

+	 prim[0].end = 1;

+	 prim[0].weak = 0;

+	 prim[0].pad = 0;

+	 prim[0].mode = mode;

+	 prim[0].start = 0;

+	 prim[0].count = count[i];

+	 prim[0].indexed = 1;

+         prim[0].num_instances = 1;

+	 if (basevertex != NULL)

+	    prim[0].basevertex = basevertex[i];

+	 else

+	    prim[0].basevertex = 0;

+

+         check_buffers_are_unmapped(exec->array.inputs);

+         vbo->draw_prims(ctx, exec->array.inputs, prim, 1, &ib,

+                         GL_FALSE, ~0, ~0);

+      }

+   }

+

+   free(prim);

+}

+

+

+static void GLAPIENTRY

+vbo_exec_MultiDrawElements(GLenum mode,

+			   const GLsizei *count, GLenum type,

+			   const GLvoid **indices,

+			   GLsizei primcount)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   for (i = 0; i < primcount; i++) {

+      if (!_mesa_validate_DrawElements(ctx, mode, count[i], type, indices[i],

+				       0))

+	 return;

+   }

+

+   vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount,

+				   NULL);

+}

+

+

+static void GLAPIENTRY

+vbo_exec_MultiDrawElementsBaseVertex(GLenum mode,

+				     const GLsizei *count, GLenum type,

+				     const GLvoid **indices,

+				     GLsizei primcount,

+				     const GLsizei *basevertex)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   for (i = 0; i < primcount; i++) {

+      if (!_mesa_validate_DrawElements(ctx, mode, count[i], type, indices[i],

+				       basevertex[i]))

+	 return;

+   }

+

+   vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount,

+				   basevertex);

+}

+

+

+/**

+ * Plug in the immediate-mode vertex array drawing commands into the

+ * givven vbo_exec_context object.

+ */

+void

+vbo_exec_array_init( struct vbo_exec_context *exec )

+{

+   exec->vtxfmt.DrawArrays = vbo_exec_DrawArrays;

+   exec->vtxfmt.DrawElements = vbo_exec_DrawElements;

+   exec->vtxfmt.DrawRangeElements = vbo_exec_DrawRangeElements;

+   exec->vtxfmt.MultiDrawElementsEXT = vbo_exec_MultiDrawElements;

+   exec->vtxfmt.DrawElementsBaseVertex = vbo_exec_DrawElementsBaseVertex;

+   exec->vtxfmt.DrawRangeElementsBaseVertex = vbo_exec_DrawRangeElementsBaseVertex;

+   exec->vtxfmt.MultiDrawElementsBaseVertex = vbo_exec_MultiDrawElementsBaseVertex;

+   exec->vtxfmt.DrawArraysInstanced = vbo_exec_DrawArraysInstanced;

+   exec->vtxfmt.DrawElementsInstanced = vbo_exec_DrawElementsInstanced;

+}

+

+

+void

+vbo_exec_array_destroy( struct vbo_exec_context *exec )

+{

+   /* nothing to do */

+}

+

+

+

+/**

+ * The following functions are only used for OpenGL ES 1/2 support.

+ * And some aren't even supported (yet) in ES 1/2.

+ */

+

+

+void GLAPIENTRY

+_mesa_DrawArrays(GLenum mode, GLint first, GLsizei count)

+{

+   vbo_exec_DrawArrays(mode, first, count);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,

+                   const GLvoid *indices)

+{

+   vbo_exec_DrawElements(mode, count, type, indices);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,

+			     const GLvoid *indices, GLint basevertex)

+{

+   vbo_exec_DrawElementsBaseVertex(mode, count, type, indices, basevertex);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,

+                        GLenum type, const GLvoid *indices)

+{

+   vbo_exec_DrawRangeElements(mode, start, end, count, type, indices);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,

+				  GLsizei count, GLenum type,

+				  const GLvoid *indices, GLint basevertex)

+{

+   vbo_exec_DrawRangeElementsBaseVertex(mode, start, end, count, type,

+					indices, basevertex);

+}

+

+

+void GLAPIENTRY

+_mesa_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type,

+			   const GLvoid **indices, GLsizei primcount)

+{

+   vbo_exec_MultiDrawElements(mode, count, type, indices, primcount);

+}

+

+

+void GLAPIENTRY

+_mesa_MultiDrawElementsBaseVertex(GLenum mode,

+				  const GLsizei *count, GLenum type,

+				  const GLvoid **indices, GLsizei primcount,

+				  const GLint *basevertex)

+{

+   vbo_exec_MultiDrawElementsBaseVertex(mode, count, type, indices,

+					primcount, basevertex);

+}

diff --git a/mesalib/src/mesa/vbo/vbo_exec_draw.c b/mesalib/src/mesa/vbo/vbo_exec_draw.c
index 539658021..7cc843779 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_draw.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_draw.c
@@ -1,426 +1,426 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.2
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/compiler.h"
-#include "main/enums.h"
-#include "main/mfeatures.h"
-#include "main/state.h"
-
-#include "vbo_context.h"
-
-
-#if FEATURE_beginend
-
-
-static void
-vbo_exec_debug_verts( struct vbo_exec_context *exec )
-{
-   GLuint count = exec->vtx.vert_count;
-   GLuint i;
-
-   printf("%s: %u vertices %d primitives, %d vertsize\n",
-	  __FUNCTION__,
-	  count,
-	  exec->vtx.prim_count,
-	  exec->vtx.vertex_size);
-
-   for (i = 0 ; i < exec->vtx.prim_count ; i++) {
-      struct _mesa_prim *prim = &exec->vtx.prim[i];
-      printf("   prim %d: %s%s %d..%d %s %s\n",
-	     i, 
-	     _mesa_lookup_prim_by_nr(prim->mode),
-	     prim->weak ? " (weak)" : "",
-	     prim->start, 
-	     prim->start + prim->count,
-	     prim->begin ? "BEGIN" : "(wrap)",
-	     prim->end ? "END" : "(wrap)");
-   }
-}
-
-
-/*
- * NOTE: Need to have calculated primitives by this point -- do it on the fly.
- * NOTE: Old 'parity' issue is gone.
- */
-static GLuint
-vbo_copy_vertices( struct vbo_exec_context *exec )
-{
-   GLuint nr = exec->vtx.prim[exec->vtx.prim_count-1].count;
-   GLuint ovf, i;
-   GLuint sz = exec->vtx.vertex_size;
-   GLfloat *dst = exec->vtx.copied.buffer;
-   const GLfloat *src = (exec->vtx.buffer_map + 
-                         exec->vtx.prim[exec->vtx.prim_count-1].start * 
-                         exec->vtx.vertex_size);
-
-
-   switch (exec->ctx->Driver.CurrentExecPrimitive) {
-   case GL_POINTS:
-      return 0;
-   case GL_LINES:
-      ovf = nr&1;
-      for (i = 0 ; i < ovf ; i++)
-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
-      return i;
-   case GL_TRIANGLES:
-      ovf = nr%3;
-      for (i = 0 ; i < ovf ; i++)
-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
-      return i;
-   case GL_QUADS:
-      ovf = nr&3;
-      for (i = 0 ; i < ovf ; i++)
-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
-      return i;
-   case GL_LINE_STRIP:
-      if (nr == 0) {
-	 return 0;
-      }
-      else {
-	 memcpy( dst, src+(nr-1)*sz, sz * sizeof(GLfloat) );
-	 return 1;
-      }
-   case GL_LINE_LOOP:
-   case GL_TRIANGLE_FAN:
-   case GL_POLYGON:
-      if (nr == 0) {
-	 return 0;
-      }
-      else if (nr == 1) {
-	 memcpy( dst, src+0, sz * sizeof(GLfloat) );
-	 return 1;
-      }
-      else {
-	 memcpy( dst, src+0, sz * sizeof(GLfloat) );
-	 memcpy( dst+sz, src+(nr-1)*sz, sz * sizeof(GLfloat) );
-	 return 2;
-      }
-   case GL_TRIANGLE_STRIP:
-      /* no parity issue, but need to make sure the tri is not drawn twice */
-      if (nr & 1) {
-	 exec->vtx.prim[exec->vtx.prim_count-1].count--;
-      }
-      /* fallthrough */
-   case GL_QUAD_STRIP:
-      switch (nr) {
-      case 0:
-         ovf = 0;
-         break;
-      case 1:
-         ovf = 1;
-         break;
-      default:
-         ovf = 2 + (nr & 1);
-         break;
-      }
-      for (i = 0 ; i < ovf ; i++)
-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
-      return i;
-   case PRIM_OUTSIDE_BEGIN_END:
-      return 0;
-   default:
-      assert(0);
-      return 0;
-   }
-}
-
-
-
-/* TODO: populate these as the vertex is defined:
- */
-static void
-vbo_exec_bind_arrays( struct gl_context *ctx )
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   struct gl_client_array *arrays = exec->vtx.arrays;
-   const GLuint count = exec->vtx.vert_count;
-   const GLuint *map;
-   GLuint attr;
-   GLbitfield varying_inputs = 0x0;
-
-   /* Install the default (ie Current) attributes first, then overlay
-    * all active ones.
-    */
-   switch (get_program_mode(exec->ctx)) {
-   case VP_NONE:
-      for (attr = 0; attr < 16; attr++) {
-         exec->vtx.inputs[attr] = &vbo->legacy_currval[attr];
-      }
-      for (attr = 0; attr < MAT_ATTRIB_MAX; attr++) {
-         ASSERT(attr + 16 < Elements(exec->vtx.inputs));
-         exec->vtx.inputs[attr + 16] = &vbo->mat_currval[attr];
-      }
-      map = vbo->map_vp_none;
-      break;
-   case VP_NV:
-   case VP_ARB:
-      /* The aliasing of attributes for NV vertex programs has already
-       * occurred.  NV vertex programs cannot access material values,
-       * nor attributes greater than VERT_ATTRIB_TEX7.  
-       */
-      for (attr = 0; attr < 16; attr++) {
-         exec->vtx.inputs[attr] = &vbo->legacy_currval[attr];
-         ASSERT(attr + 16 < Elements(exec->vtx.inputs));
-         exec->vtx.inputs[attr + 16] = &vbo->generic_currval[attr];
-      }
-      map = vbo->map_vp_arb;
-
-      /* check if VERT_ATTRIB_POS is not read but VERT_BIT_GENERIC0 is read.
-       * In that case we effectively need to route the data from
-       * glVertexAttrib(0, val) calls to feed into the GENERIC0 input.
-       */
-      if ((ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_POS) == 0 &&
-          (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) {
-         exec->vtx.inputs[16] = exec->vtx.inputs[0];
-         exec->vtx.attrsz[16] = exec->vtx.attrsz[0];
-         exec->vtx.attrptr[16] = exec->vtx.attrptr[0];
-         exec->vtx.attrsz[0] = 0;
-      }
-      break;
-   default:
-      assert(0);
-   }
-
-   /* Make all active attributes (including edgeflag) available as
-    * arrays of floats.
-    */
-   for (attr = 0; attr < VERT_ATTRIB_MAX ; attr++) {
-      const GLuint src = map[attr];
-
-      if (exec->vtx.attrsz[src]) {
-	 GLsizeiptr offset = (GLbyte *)exec->vtx.attrptr[src] -
-	    (GLbyte *)exec->vtx.vertex;
-
-         /* override the default array set above */
-         ASSERT(attr < Elements(exec->vtx.inputs));
-         ASSERT(attr < Elements(exec->vtx.arrays)); /* arrays[] */
-         exec->vtx.inputs[attr] = &arrays[attr];
-
-         if (_mesa_is_bufferobj(exec->vtx.bufferobj)) {
-            /* a real buffer obj: Ptr is an offset, not a pointer*/
-            assert(exec->vtx.bufferobj->Pointer);  /* buf should be mapped */
-            assert(offset >= 0);
-            arrays[attr].Ptr = (GLubyte *)exec->vtx.bufferobj->Offset + offset;
-         }
-         else {
-            /* Ptr into ordinary app memory */
-            arrays[attr].Ptr = (GLubyte *)exec->vtx.buffer_map + offset;
-         }
-	 arrays[attr].Size = exec->vtx.attrsz[src];
-	 arrays[attr].StrideB = exec->vtx.vertex_size * sizeof(GLfloat);
-	 arrays[attr].Stride = exec->vtx.vertex_size * sizeof(GLfloat);
-	 arrays[attr].Type = GL_FLOAT;
-         arrays[attr].Format = GL_RGBA;
-	 arrays[attr].Enabled = 1;
-         _mesa_reference_buffer_object(ctx,
-                                       &arrays[attr].BufferObj,
-                                       exec->vtx.bufferobj);
-	 arrays[attr]._MaxElement = count; /* ??? */
-
-         varying_inputs |= 1 << attr;
-         ctx->NewState |= _NEW_ARRAY;
-      }
-   }
-
-   _mesa_set_varying_vp_inputs( ctx, varying_inputs );
-}
-
-
-/**
- * Unmap the VBO.  This is called before drawing.
- */
-static void
-vbo_exec_vtx_unmap( struct vbo_exec_context *exec )
-{
-   GLenum target = GL_ARRAY_BUFFER_ARB;
-
-   if (_mesa_is_bufferobj(exec->vtx.bufferobj)) {
-      struct gl_context *ctx = exec->ctx;
-      
-      if (ctx->Driver.FlushMappedBufferRange) {
-         GLintptr offset = exec->vtx.buffer_used - exec->vtx.bufferobj->Offset;
-         GLsizeiptr length = (exec->vtx.buffer_ptr - exec->vtx.buffer_map) * sizeof(float);
-
-         if (length)
-            ctx->Driver.FlushMappedBufferRange(ctx, target,
-                                               offset, length,
-                                               exec->vtx.bufferobj);
-      }
-
-      exec->vtx.buffer_used += (exec->vtx.buffer_ptr -
-                                exec->vtx.buffer_map) * sizeof(float);
-
-      assert(exec->vtx.buffer_used <= VBO_VERT_BUFFER_SIZE);
-      assert(exec->vtx.buffer_ptr != NULL);
-      
-      ctx->Driver.UnmapBuffer(ctx, target, exec->vtx.bufferobj);
-      exec->vtx.buffer_map = NULL;
-      exec->vtx.buffer_ptr = NULL;
-      exec->vtx.max_vert = 0;
-   }
-}
-
-
-/**
- * Map the vertex buffer to begin storing glVertex, glColor, etc data.
- */
-void
-vbo_exec_vtx_map( struct vbo_exec_context *exec )
-{
-   struct gl_context *ctx = exec->ctx;
-   const GLenum target = GL_ARRAY_BUFFER_ARB;
-   const GLenum access = GL_READ_WRITE_ARB; /* for MapBuffer */
-   const GLenum accessRange = GL_MAP_WRITE_BIT |  /* for MapBufferRange */
-                              GL_MAP_INVALIDATE_RANGE_BIT |
-                              GL_MAP_UNSYNCHRONIZED_BIT |
-                              GL_MAP_FLUSH_EXPLICIT_BIT |
-                              MESA_MAP_NOWAIT_BIT;
-   const GLenum usage = GL_STREAM_DRAW_ARB;
-   
-   if (!_mesa_is_bufferobj(exec->vtx.bufferobj))
-      return;
-
-   assert(!exec->vtx.buffer_map);
-   assert(!exec->vtx.buffer_ptr);
-
-   if (VBO_VERT_BUFFER_SIZE > exec->vtx.buffer_used + 1024 &&
-       ctx->Driver.MapBufferRange) {
-      /* The VBO exists and there's room for more */
-      exec->vtx.buffer_map = 
-         (GLfloat *)ctx->Driver.MapBufferRange(ctx, 
-                                               target, 
-                                               exec->vtx.buffer_used,
-                                               (VBO_VERT_BUFFER_SIZE - 
-                                                exec->vtx.buffer_used),
-                                               accessRange,
-                                               exec->vtx.bufferobj);
-      exec->vtx.buffer_ptr = exec->vtx.buffer_map;
-   }
-   
-   if (!exec->vtx.buffer_map) {
-      /* Need to allocate a new VBO */
-      exec->vtx.buffer_used = 0;
-
-      ctx->Driver.BufferData(ctx, target, 
-                             VBO_VERT_BUFFER_SIZE, 
-                             NULL, usage, exec->vtx.bufferobj);
-
-
-      if (ctx->Driver.MapBufferRange)
-         exec->vtx.buffer_map = 
-            (GLfloat *)ctx->Driver.MapBufferRange(ctx, target,
-                                                  0, VBO_VERT_BUFFER_SIZE,
-                                                  accessRange,
-                                                  exec->vtx.bufferobj);
-      if (!exec->vtx.buffer_map)
-         exec->vtx.buffer_map =
-            (GLfloat *)ctx->Driver.MapBuffer(ctx, target, access, exec->vtx.bufferobj);
-      assert(exec->vtx.buffer_map);
-      exec->vtx.buffer_ptr = exec->vtx.buffer_map;
-   }
-
-   if (0)
-      printf("map %d..\n", exec->vtx.buffer_used);
-}
-
-
-
-/**
- * Execute the buffer and save copied verts.
- * \param keep_unmapped  if true, leave the VBO unmapped when we're done.
- */
-void
-vbo_exec_vtx_flush(struct vbo_exec_context *exec, GLboolean keepUnmapped)
-{
-   if (0)
-      vbo_exec_debug_verts( exec );
-
-   if (exec->vtx.prim_count && 
-       exec->vtx.vert_count) {
-
-      exec->vtx.copied.nr = vbo_copy_vertices( exec ); 
-
-      if (exec->vtx.copied.nr != exec->vtx.vert_count) {
-	 struct gl_context *ctx = exec->ctx;
-	 
-	 /* Before the update_state() as this may raise _NEW_ARRAY
-          * from _mesa_set_varying_vp_inputs().
-	  */
-	 vbo_exec_bind_arrays( ctx );
-
-         if (ctx->NewState)
-            _mesa_update_state( ctx );
-
-         if (_mesa_is_bufferobj(exec->vtx.bufferobj)) {
-            vbo_exec_vtx_unmap( exec );
-         }
-
-         if (0)
-            printf("%s %d %d\n", __FUNCTION__, exec->vtx.prim_count,
-		   exec->vtx.vert_count);
-
-	 vbo_context(ctx)->draw_prims( ctx, 
-				       exec->vtx.inputs, 
-				       exec->vtx.prim, 
-				       exec->vtx.prim_count,
-				       NULL,
-				       GL_TRUE,
-				       0,
-				       exec->vtx.vert_count - 1);
-
-	 /* If using a real VBO, get new storage -- unless asked not to.
-          */
-         if (_mesa_is_bufferobj(exec->vtx.bufferobj) && !keepUnmapped) {
-            vbo_exec_vtx_map( exec );
-         }
-      }
-   }
-
-   /* May have to unmap explicitly if we didn't draw:
-    */
-   if (keepUnmapped &&
-       _mesa_is_bufferobj(exec->vtx.bufferobj) &&
-       exec->vtx.buffer_map) {
-      vbo_exec_vtx_unmap( exec );
-   }
-
-   if (keepUnmapped || exec->vtx.vertex_size == 0)
-      exec->vtx.max_vert = 0;
-   else
-      exec->vtx.max_vert = ((VBO_VERT_BUFFER_SIZE - exec->vtx.buffer_used) / 
-                            (exec->vtx.vertex_size * sizeof(GLfloat)));
-
-   exec->vtx.buffer_ptr = exec->vtx.buffer_map;
-   exec->vtx.prim_count = 0;
-   exec->vtx.vert_count = 0;
-}
-
-
-#endif /* FEATURE_beginend */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.2

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+#include "main/glheader.h"

+#include "main/bufferobj.h"

+#include "main/compiler.h"

+#include "main/enums.h"

+#include "main/mfeatures.h"

+#include "main/state.h"

+

+#include "vbo_context.h"

+

+

+#if FEATURE_beginend

+

+

+static void

+vbo_exec_debug_verts( struct vbo_exec_context *exec )

+{

+   GLuint count = exec->vtx.vert_count;

+   GLuint i;

+

+   printf("%s: %u vertices %d primitives, %d vertsize\n",

+	  __FUNCTION__,

+	  count,

+	  exec->vtx.prim_count,

+	  exec->vtx.vertex_size);

+

+   for (i = 0 ; i < exec->vtx.prim_count ; i++) {

+      struct _mesa_prim *prim = &exec->vtx.prim[i];

+      printf("   prim %d: %s%s %d..%d %s %s\n",

+	     i, 

+	     _mesa_lookup_prim_by_nr(prim->mode),

+	     prim->weak ? " (weak)" : "",

+	     prim->start, 

+	     prim->start + prim->count,

+	     prim->begin ? "BEGIN" : "(wrap)",

+	     prim->end ? "END" : "(wrap)");

+   }

+}

+

+

+/*

+ * NOTE: Need to have calculated primitives by this point -- do it on the fly.

+ * NOTE: Old 'parity' issue is gone.

+ */

+static GLuint

+vbo_copy_vertices( struct vbo_exec_context *exec )

+{

+   GLuint nr = exec->vtx.prim[exec->vtx.prim_count-1].count;

+   GLuint ovf, i;

+   GLuint sz = exec->vtx.vertex_size;

+   GLfloat *dst = exec->vtx.copied.buffer;

+   const GLfloat *src = (exec->vtx.buffer_map + 

+                         exec->vtx.prim[exec->vtx.prim_count-1].start * 

+                         exec->vtx.vertex_size);

+

+

+   switch (exec->ctx->Driver.CurrentExecPrimitive) {

+   case GL_POINTS:

+      return 0;

+   case GL_LINES:

+      ovf = nr&1;

+      for (i = 0 ; i < ovf ; i++)

+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );

+      return i;

+   case GL_TRIANGLES:

+      ovf = nr%3;

+      for (i = 0 ; i < ovf ; i++)

+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );

+      return i;

+   case GL_QUADS:

+      ovf = nr&3;

+      for (i = 0 ; i < ovf ; i++)

+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );

+      return i;

+   case GL_LINE_STRIP:

+      if (nr == 0) {

+	 return 0;

+      }

+      else {

+	 memcpy( dst, src+(nr-1)*sz, sz * sizeof(GLfloat) );

+	 return 1;

+      }

+   case GL_LINE_LOOP:

+   case GL_TRIANGLE_FAN:

+   case GL_POLYGON:

+      if (nr == 0) {

+	 return 0;

+      }

+      else if (nr == 1) {

+	 memcpy( dst, src+0, sz * sizeof(GLfloat) );

+	 return 1;

+      }

+      else {

+	 memcpy( dst, src+0, sz * sizeof(GLfloat) );

+	 memcpy( dst+sz, src+(nr-1)*sz, sz * sizeof(GLfloat) );

+	 return 2;

+      }

+   case GL_TRIANGLE_STRIP:

+      /* no parity issue, but need to make sure the tri is not drawn twice */

+      if (nr & 1) {

+	 exec->vtx.prim[exec->vtx.prim_count-1].count--;

+      }

+      /* fallthrough */

+   case GL_QUAD_STRIP:

+      switch (nr) {

+      case 0:

+         ovf = 0;

+         break;

+      case 1:

+         ovf = 1;

+         break;

+      default:

+         ovf = 2 + (nr & 1);

+         break;

+      }

+      for (i = 0 ; i < ovf ; i++)

+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );

+      return i;

+   case PRIM_OUTSIDE_BEGIN_END:

+      return 0;

+   default:

+      assert(0);

+      return 0;

+   }

+}

+

+

+

+/* TODO: populate these as the vertex is defined:

+ */

+static void

+vbo_exec_bind_arrays( struct gl_context *ctx )

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct vbo_exec_context *exec = &vbo->exec;

+   struct gl_client_array *arrays = exec->vtx.arrays;

+   const GLuint count = exec->vtx.vert_count;

+   const GLuint *map;

+   GLuint attr;

+   GLbitfield varying_inputs = 0x0;

+

+   /* Install the default (ie Current) attributes first, then overlay

+    * all active ones.

+    */

+   switch (get_program_mode(exec->ctx)) {

+   case VP_NONE:

+      for (attr = 0; attr < 16; attr++) {

+         exec->vtx.inputs[attr] = &vbo->legacy_currval[attr];

+      }

+      for (attr = 0; attr < MAT_ATTRIB_MAX; attr++) {

+         ASSERT(attr + 16 < Elements(exec->vtx.inputs));

+         exec->vtx.inputs[attr + 16] = &vbo->mat_currval[attr];

+      }

+      map = vbo->map_vp_none;

+      break;

+   case VP_NV:

+   case VP_ARB:

+      /* The aliasing of attributes for NV vertex programs has already

+       * occurred.  NV vertex programs cannot access material values,

+       * nor attributes greater than VERT_ATTRIB_TEX7.  

+       */

+      for (attr = 0; attr < 16; attr++) {

+         exec->vtx.inputs[attr] = &vbo->legacy_currval[attr];

+         ASSERT(attr + 16 < Elements(exec->vtx.inputs));

+         exec->vtx.inputs[attr + 16] = &vbo->generic_currval[attr];

+      }

+      map = vbo->map_vp_arb;

+

+      /* check if VERT_ATTRIB_POS is not read but VERT_BIT_GENERIC0 is read.

+       * In that case we effectively need to route the data from

+       * glVertexAttrib(0, val) calls to feed into the GENERIC0 input.

+       */

+      if ((ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_POS) == 0 &&

+          (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) {

+         exec->vtx.inputs[16] = exec->vtx.inputs[0];

+         exec->vtx.attrsz[16] = exec->vtx.attrsz[0];

+         exec->vtx.attrptr[16] = exec->vtx.attrptr[0];

+         exec->vtx.attrsz[0] = 0;

+      }

+      break;

+   default:

+      assert(0);

+   }

+

+   /* Make all active attributes (including edgeflag) available as

+    * arrays of floats.

+    */

+   for (attr = 0; attr < VERT_ATTRIB_MAX ; attr++) {

+      const GLuint src = map[attr];

+

+      if (exec->vtx.attrsz[src]) {

+	 GLsizeiptr offset = (GLbyte *)exec->vtx.attrptr[src] -

+	    (GLbyte *)exec->vtx.vertex;

+

+         /* override the default array set above */

+         ASSERT(attr < Elements(exec->vtx.inputs));

+         ASSERT(attr < Elements(exec->vtx.arrays)); /* arrays[] */

+         exec->vtx.inputs[attr] = &arrays[attr];

+

+         if (_mesa_is_bufferobj(exec->vtx.bufferobj)) {

+            /* a real buffer obj: Ptr is an offset, not a pointer*/

+            assert(exec->vtx.bufferobj->Pointer);  /* buf should be mapped */

+            assert(offset >= 0);

+            arrays[attr].Ptr = (GLubyte *)exec->vtx.bufferobj->Offset + offset;

+         }

+         else {

+            /* Ptr into ordinary app memory */

+            arrays[attr].Ptr = (GLubyte *)exec->vtx.buffer_map + offset;

+         }

+	 arrays[attr].Size = exec->vtx.attrsz[src];

+	 arrays[attr].StrideB = exec->vtx.vertex_size * sizeof(GLfloat);

+	 arrays[attr].Stride = exec->vtx.vertex_size * sizeof(GLfloat);

+	 arrays[attr].Type = GL_FLOAT;

+         arrays[attr].Format = GL_RGBA;

+	 arrays[attr].Enabled = 1;

+         _mesa_reference_buffer_object(ctx,

+                                       &arrays[attr].BufferObj,

+                                       exec->vtx.bufferobj);

+	 arrays[attr]._MaxElement = count; /* ??? */

+

+         varying_inputs |= 1 << attr;

+         ctx->NewState |= _NEW_ARRAY;

+      }

+   }

+

+   _mesa_set_varying_vp_inputs( ctx, varying_inputs );

+}

+

+

+/**

+ * Unmap the VBO.  This is called before drawing.

+ */

+static void

+vbo_exec_vtx_unmap( struct vbo_exec_context *exec )

+{

+   GLenum target = GL_ARRAY_BUFFER_ARB;

+

+   if (_mesa_is_bufferobj(exec->vtx.bufferobj)) {

+      struct gl_context *ctx = exec->ctx;

+      

+      if (ctx->Driver.FlushMappedBufferRange) {

+         GLintptr offset = exec->vtx.buffer_used - exec->vtx.bufferobj->Offset;

+         GLsizeiptr length = (exec->vtx.buffer_ptr - exec->vtx.buffer_map) * sizeof(float);

+

+         if (length)

+            ctx->Driver.FlushMappedBufferRange(ctx, target,

+                                               offset, length,

+                                               exec->vtx.bufferobj);

+      }

+

+      exec->vtx.buffer_used += (exec->vtx.buffer_ptr -

+                                exec->vtx.buffer_map) * sizeof(float);

+

+      assert(exec->vtx.buffer_used <= VBO_VERT_BUFFER_SIZE);

+      assert(exec->vtx.buffer_ptr != NULL);

+      

+      ctx->Driver.UnmapBuffer(ctx, target, exec->vtx.bufferobj);

+      exec->vtx.buffer_map = NULL;

+      exec->vtx.buffer_ptr = NULL;

+      exec->vtx.max_vert = 0;

+   }

+}

+

+

+/**

+ * Map the vertex buffer to begin storing glVertex, glColor, etc data.

+ */

+void

+vbo_exec_vtx_map( struct vbo_exec_context *exec )

+{

+   struct gl_context *ctx = exec->ctx;

+   const GLenum target = GL_ARRAY_BUFFER_ARB;

+   const GLenum access = GL_READ_WRITE_ARB; /* for MapBuffer */

+   const GLenum accessRange = GL_MAP_WRITE_BIT |  /* for MapBufferRange */

+                              GL_MAP_INVALIDATE_RANGE_BIT |

+                              GL_MAP_UNSYNCHRONIZED_BIT |

+                              GL_MAP_FLUSH_EXPLICIT_BIT |

+                              MESA_MAP_NOWAIT_BIT;

+   const GLenum usage = GL_STREAM_DRAW_ARB;

+   

+   if (!_mesa_is_bufferobj(exec->vtx.bufferobj))

+      return;

+

+   assert(!exec->vtx.buffer_map);

+   assert(!exec->vtx.buffer_ptr);

+

+   if (VBO_VERT_BUFFER_SIZE > exec->vtx.buffer_used + 1024 &&

+       ctx->Driver.MapBufferRange) {

+      /* The VBO exists and there's room for more */

+      exec->vtx.buffer_map = 

+         (GLfloat *)ctx->Driver.MapBufferRange(ctx, 

+                                               target, 

+                                               exec->vtx.buffer_used,

+                                               (VBO_VERT_BUFFER_SIZE - 

+                                                exec->vtx.buffer_used),

+                                               accessRange,

+                                               exec->vtx.bufferobj);

+      exec->vtx.buffer_ptr = exec->vtx.buffer_map;

+   }

+   

+   if (!exec->vtx.buffer_map) {

+      /* Need to allocate a new VBO */

+      exec->vtx.buffer_used = 0;

+

+      ctx->Driver.BufferData(ctx, target, 

+                             VBO_VERT_BUFFER_SIZE, 

+                             NULL, usage, exec->vtx.bufferobj);

+

+

+      if (ctx->Driver.MapBufferRange)

+         exec->vtx.buffer_map = 

+            (GLfloat *)ctx->Driver.MapBufferRange(ctx, target,

+                                                  0, VBO_VERT_BUFFER_SIZE,

+                                                  accessRange,

+                                                  exec->vtx.bufferobj);

+      if (!exec->vtx.buffer_map)

+         exec->vtx.buffer_map =

+            (GLfloat *)ctx->Driver.MapBuffer(ctx, target, access, exec->vtx.bufferobj);

+      assert(exec->vtx.buffer_map);

+      exec->vtx.buffer_ptr = exec->vtx.buffer_map;

+   }

+

+   if (0)

+      printf("map %d..\n", exec->vtx.buffer_used);

+}

+

+

+

+/**

+ * Execute the buffer and save copied verts.

+ * \param keep_unmapped  if true, leave the VBO unmapped when we're done.

+ */

+void

+vbo_exec_vtx_flush(struct vbo_exec_context *exec, GLboolean keepUnmapped)

+{

+   if (0)

+      vbo_exec_debug_verts( exec );

+

+   if (exec->vtx.prim_count && 

+       exec->vtx.vert_count) {

+

+      exec->vtx.copied.nr = vbo_copy_vertices( exec ); 

+

+      if (exec->vtx.copied.nr != exec->vtx.vert_count) {

+	 struct gl_context *ctx = exec->ctx;

+	 

+	 /* Before the update_state() as this may raise _NEW_ARRAY

+          * from _mesa_set_varying_vp_inputs().

+	  */

+	 vbo_exec_bind_arrays( ctx );

+

+         if (ctx->NewState)

+            _mesa_update_state( ctx );

+

+         if (_mesa_is_bufferobj(exec->vtx.bufferobj)) {

+            vbo_exec_vtx_unmap( exec );

+         }

+

+         if (0)

+            printf("%s %d %d\n", __FUNCTION__, exec->vtx.prim_count,

+		   exec->vtx.vert_count);

+

+	 vbo_context(ctx)->draw_prims( ctx, 

+				       exec->vtx.inputs, 

+				       exec->vtx.prim, 

+				       exec->vtx.prim_count,

+				       NULL,

+				       GL_TRUE,

+				       0,

+				       exec->vtx.vert_count - 1);

+

+	 /* If using a real VBO, get new storage -- unless asked not to.

+          */

+         if (_mesa_is_bufferobj(exec->vtx.bufferobj) && !keepUnmapped) {

+            vbo_exec_vtx_map( exec );

+         }

+      }

+   }

+

+   /* May have to unmap explicitly if we didn't draw:

+    */

+   if (keepUnmapped &&

+       _mesa_is_bufferobj(exec->vtx.bufferobj) &&

+       exec->vtx.buffer_map) {

+      vbo_exec_vtx_unmap( exec );

+   }

+

+   if (keepUnmapped || exec->vtx.vertex_size == 0)

+      exec->vtx.max_vert = 0;

+   else

+      exec->vtx.max_vert = ((VBO_VERT_BUFFER_SIZE - exec->vtx.buffer_used) / 

+                            (exec->vtx.vertex_size * sizeof(GLfloat)));

+

+   exec->vtx.buffer_ptr = exec->vtx.buffer_map;

+   exec->vtx.prim_count = 0;

+   exec->vtx.vert_count = 0;

+}

+

+

+#endif /* FEATURE_beginend */

diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c
index 836c76fe8..52418788d 100644
--- a/mesalib/src/mesa/vbo/vbo_save_api.c
+++ b/mesalib/src/mesa/vbo/vbo_save_api.c
@@ -1,1310 +1,1310 @@
-/**************************************************************************
-
-Copyright 2002-2008 Tungsten Graphics Inc., Cedar Park, Texas.
-
-All Rights Reserved.
-
-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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, 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 (including the next
-paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
-TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS 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.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-
-/* Display list compiler attempts to store lists of vertices with the
- * same vertex layout.  Additionally it attempts to minimize the need
- * for execute-time fixup of these vertex lists, allowing them to be
- * cached on hardware.
- *
- * There are still some circumstances where this can be thwarted, for
- * example by building a list that consists of one very long primitive
- * (eg Begin(Triangles), 1000 vertices, End), and calling that list
- * from inside a different begin/end object (Begin(Lines), CallList,
- * End).  
- *
- * In that case the code will have to replay the list as individual
- * commands through the Exec dispatch table, or fix up the copied
- * vertices at execute-time.
- *
- * The other case where fixup is required is when a vertex attribute
- * is introduced in the middle of a primitive.  Eg:
- *  Begin(Lines)
- *  TexCoord1f()           Vertex2f()
- *  TexCoord1f() Color3f() Vertex2f()
- *  End()
- *
- *  If the current value of Color isn't known at compile-time, this
- *  primitive will require fixup.
- *
- *
- * The list compiler currently doesn't attempt to compile lists
- * containing EvalCoord or EvalPoint commands.  On encountering one of
- * these, compilation falls back to opcodes.  
- *
- * This could be improved to fallback only when a mix of EvalCoord and
- * Vertex commands are issued within a single primitive.
- */
-
-
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/context.h"
-#include "main/dlist.h"
-#include "main/enums.h"
-#include "main/eval.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-#include "main/api_noop.h"
-#include "main/api_validate.h"
-#include "main/api_arrayelt.h"
-#include "main/vtxfmt.h"
-#include "main/dispatch.h"
-
-#include "vbo_context.h"
-
-
-#if FEATURE_dlist
-
-
-#ifdef ERROR
-#undef ERROR
-#endif
-
-
-/* An interesting VBO number/name to help with debugging */
-#define VBO_BUF_ID  12345
-
-
-/*
- * NOTE: Old 'parity' issue is gone, but copying can still be
- * wrong-footed on replay.
- */
-static GLuint _save_copy_vertices( struct gl_context *ctx, 
-				   const struct vbo_save_vertex_list *node,
-				   const GLfloat *src_buffer)
-{
-   struct vbo_save_context *save = &vbo_context( ctx )->save;
-   const struct _mesa_prim *prim = &node->prim[node->prim_count-1];
-   GLuint nr = prim->count;
-   GLuint sz = save->vertex_size;
-   const GLfloat *src = src_buffer + prim->start * sz;
-   GLfloat *dst = save->copied.buffer;
-   GLuint ovf, i;
-
-   if (prim->end)
-      return 0;
-	 
-   switch( prim->mode )
-   {
-   case GL_POINTS:
-      return 0;
-   case GL_LINES:
-      ovf = nr&1;
-      for (i = 0 ; i < ovf ; i++)
-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
-      return i;
-   case GL_TRIANGLES:
-      ovf = nr%3;
-      for (i = 0 ; i < ovf ; i++)
-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
-      return i;
-   case GL_QUADS:
-      ovf = nr&3;
-      for (i = 0 ; i < ovf ; i++)
-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
-      return i;
-   case GL_LINE_STRIP:
-      if (nr == 0) 
-	 return 0;
-      else {
-	 memcpy( dst, src+(nr-1)*sz, sz*sizeof(GLfloat) );
-	 return 1;
-      }
-   case GL_LINE_LOOP:
-   case GL_TRIANGLE_FAN:
-   case GL_POLYGON:
-      if (nr == 0) 
-	 return 0;
-      else if (nr == 1) {
-	 memcpy( dst, src+0, sz*sizeof(GLfloat) );
-	 return 1;
-      } else {
-	 memcpy( dst, src+0, sz*sizeof(GLfloat) );
-	 memcpy( dst+sz, src+(nr-1)*sz, sz*sizeof(GLfloat) );
-	 return 2;
-      }
-   case GL_TRIANGLE_STRIP:
-   case GL_QUAD_STRIP:
-      switch (nr) {
-      case 0: ovf = 0; break;
-      case 1: ovf = 1; break;
-      default: ovf = 2 + (nr&1); break;
-      }
-      for (i = 0 ; i < ovf ; i++)
-	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
-      return i;
-   default:
-      assert(0);
-      return 0;
-   }
-}
-
-
-static struct vbo_save_vertex_store *alloc_vertex_store( struct gl_context *ctx )
-{
-   struct vbo_save_vertex_store *vertex_store = CALLOC_STRUCT(vbo_save_vertex_store);
-
-   /* obj->Name needs to be non-zero, but won't ever be examined more
-    * closely than that.  In particular these buffers won't be entered
-    * into the hash and can never be confused with ones visible to the
-    * user.  Perhaps there could be a special number for internal
-    * buffers:
-    */
-   vertex_store->bufferobj = ctx->Driver.NewBufferObject(ctx,
-                                                         VBO_BUF_ID,
-                                                         GL_ARRAY_BUFFER_ARB);
-
-   ctx->Driver.BufferData( ctx, 
-			   GL_ARRAY_BUFFER_ARB, 
-			   VBO_SAVE_BUFFER_SIZE * sizeof(GLfloat),
-			   NULL,
-			   GL_STATIC_DRAW_ARB,
-			   vertex_store->bufferobj);
-
-   vertex_store->buffer = NULL;
-   vertex_store->used = 0;
-   vertex_store->refcount = 1;
-
-   return vertex_store;
-}
-
-static void free_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )
-{
-   assert(!vertex_store->buffer);
-
-   if (vertex_store->bufferobj) {
-      _mesa_reference_buffer_object(ctx, &vertex_store->bufferobj, NULL);
-   }
-
-   FREE( vertex_store );
-}
-
-static GLfloat *map_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )
-{
-   assert(vertex_store->bufferobj);
-   assert(!vertex_store->buffer);
-   vertex_store->buffer = (GLfloat *)ctx->Driver.MapBuffer(ctx, 
-							   GL_ARRAY_BUFFER_ARB,	/* not used */
-							   GL_WRITE_ONLY, /* not used */
-							   vertex_store->bufferobj); 
-
-   assert(vertex_store->buffer);
-   return vertex_store->buffer + vertex_store->used;
-}
-
-static void unmap_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )
-{
-   ctx->Driver.UnmapBuffer( ctx, GL_ARRAY_BUFFER_ARB, vertex_store->bufferobj );
-   vertex_store->buffer = NULL;
-}
-
-
-static struct vbo_save_primitive_store *alloc_prim_store( struct gl_context *ctx )
-{
-   struct vbo_save_primitive_store *store = CALLOC_STRUCT(vbo_save_primitive_store);
-   (void) ctx;
-   store->used = 0;
-   store->refcount = 1;
-   return store;
-}
-
-static void _save_reset_counters( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-
-   save->prim = save->prim_store->buffer + save->prim_store->used;
-   save->buffer = (save->vertex_store->buffer + 
-		   save->vertex_store->used);
-
-   assert(save->buffer == save->buffer_ptr);
-
-   if (save->vertex_size)
-      save->max_vert = ((VBO_SAVE_BUFFER_SIZE - save->vertex_store->used) / 
-			 save->vertex_size);
-   else
-      save->max_vert = 0;
-
-   save->vert_count = 0;
-   save->prim_count = 0;
-   save->prim_max = VBO_SAVE_PRIM_SIZE - save->prim_store->used;
-   save->dangling_attr_ref = 0;
-}
-
-
-/* Insert the active immediate struct onto the display list currently
- * being built.
- */
-static void _save_compile_vertex_list( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-   struct vbo_save_vertex_list *node;
-
-   /* Allocate space for this structure in the display list currently
-    * being compiled.
-    */
-   node = (struct vbo_save_vertex_list *)
-      _mesa_dlist_alloc(ctx, save->opcode_vertex_list, sizeof(*node));
-
-   if (!node)
-      return;
-
-   /* Duplicate our template, increment refcounts to the storage structs:
-    */
-   memcpy(node->attrsz, save->attrsz, sizeof(node->attrsz));
-   node->vertex_size = save->vertex_size;
-   node->buffer_offset = (save->buffer - save->vertex_store->buffer) * sizeof(GLfloat); 
-   node->count = save->vert_count;
-   node->wrap_count = save->copied.nr;
-   node->dangling_attr_ref = save->dangling_attr_ref;
-   node->prim = save->prim;
-   node->prim_count = save->prim_count;
-   node->vertex_store = save->vertex_store;
-   node->prim_store = save->prim_store;
-
-   node->vertex_store->refcount++;
-   node->prim_store->refcount++;
-
-   if (node->prim[0].no_current_update) {
-      node->current_size = 0;
-      node->current_data = NULL;
-   } else {
-      node->current_size = node->vertex_size - node->attrsz[0];
-      node->current_data = NULL;
-     
-      if (node->current_size) {
-         /* If the malloc fails, we just pull the data out of the VBO
-          * later instead.
-          */
-         node->current_data = MALLOC( node->current_size * sizeof(GLfloat) );
-         if (node->current_data) {
-            const char *buffer = (const char *)save->vertex_store->buffer;
-            unsigned attr_offset = node->attrsz[0] * sizeof(GLfloat);
-            unsigned vertex_offset = 0;
-            
-            if (node->count)
-               vertex_offset = (node->count-1) * node->vertex_size * sizeof(GLfloat);
-         
-            memcpy( node->current_data,
-                    buffer + node->buffer_offset + vertex_offset + attr_offset,
-                    node->current_size * sizeof(GLfloat) );
-         }
-      }
-   }
-
-
-
-   assert(node->attrsz[VBO_ATTRIB_POS] != 0 ||
-	  node->count == 0);
-
-   if (save->dangling_attr_ref)
-      ctx->ListState.CurrentList->Flags |= DLIST_DANGLING_REFS;
-
-   save->vertex_store->used += save->vertex_size * node->count;
-   save->prim_store->used += node->prim_count;
-
-
-   /* Copy duplicated vertices 
-    */
-   save->copied.nr = _save_copy_vertices( ctx, node, save->buffer );
-
-
-   /* Deal with GL_COMPILE_AND_EXECUTE:
-    */
-   if (ctx->ExecuteFlag) {
-      struct _glapi_table *dispatch = GET_DISPATCH();
-
-      _glapi_set_dispatch(ctx->Exec);
-
-      vbo_loopback_vertex_list( ctx,
-				(const GLfloat *)((const char *)save->vertex_store->buffer + 
-						  node->buffer_offset),
-				node->attrsz,
-				node->prim,
-				node->prim_count,
-				node->wrap_count,
-				node->vertex_size);
-
-      _glapi_set_dispatch(dispatch);
-   }
-
-
-   /* Decide whether the storage structs are full, or can be used for
-    * the next vertex lists as well.
-    */
-   if (save->vertex_store->used > 
-       VBO_SAVE_BUFFER_SIZE - 16 * (save->vertex_size + 4)) {
-
-      /* Unmap old store:
-       */
-      unmap_vertex_store( ctx, save->vertex_store );
-
-      /* Release old reference:
-       */
-      save->vertex_store->refcount--; 
-      assert(save->vertex_store->refcount != 0);
-      save->vertex_store = NULL;
-
-      /* Allocate and map new store:
-       */
-      save->vertex_store = alloc_vertex_store( ctx );
-      save->buffer_ptr = map_vertex_store( ctx, save->vertex_store );
-   } 
-
-   if (save->prim_store->used > VBO_SAVE_PRIM_SIZE - 6) {
-      save->prim_store->refcount--; 
-      assert(save->prim_store->refcount != 0);
-      save->prim_store = alloc_prim_store( ctx );
-   } 
-
-   /* Reset our structures for the next run of vertices:
-    */
-   _save_reset_counters( ctx );
-}
-
-
-/* TODO -- If no new vertices have been stored, don't bother saving
- * it.
- */
-static void _save_wrap_buffers( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-   GLint i = save->prim_count - 1;
-   GLenum mode;
-   GLboolean weak;
-   GLboolean no_current_update;
-
-   assert(i < (GLint) save->prim_max);
-   assert(i >= 0);
-
-   /* Close off in-progress primitive.
-    */
-   save->prim[i].count = (save->vert_count - 
-			  save->prim[i].start);
-   mode = save->prim[i].mode;
-   weak = save->prim[i].weak;
-   no_current_update = save->prim[i].no_current_update;
-   
-   /* store the copied vertices, and allocate a new list.
-    */
-   _save_compile_vertex_list( ctx );
-
-   /* Restart interrupted primitive
-    */
-   save->prim[0].mode = mode;
-   save->prim[0].weak = weak;
-   save->prim[0].no_current_update = no_current_update;
-   save->prim[0].begin = 0;
-   save->prim[0].end = 0;
-   save->prim[0].pad = 0;
-   save->prim[0].start = 0;
-   save->prim[0].count = 0;
-   save->prim[0].num_instances = 1;
-   save->prim_count = 1;
-}
-
-
-
-/* Called only when buffers are wrapped as the result of filling the
- * vertex_store struct.  
- */
-static void _save_wrap_filled_vertex( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-   GLfloat *data = save->copied.buffer;
-   GLuint i;
-
-   /* Emit a glEnd to close off the last vertex list.
-    */
-   _save_wrap_buffers( ctx );
-   
-    /* Copy stored stored vertices to start of new list.
-    */
-   assert(save->max_vert - save->vert_count > save->copied.nr);
-
-   for (i = 0 ; i < save->copied.nr ; i++) {
-      memcpy( save->buffer_ptr, data, save->vertex_size * sizeof(GLfloat));
-      data += save->vertex_size;
-      save->buffer_ptr += save->vertex_size;
-      save->vert_count++;
-   }
-}
-
-
-static void _save_copy_to_current( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save; 
-   GLuint i;
-
-   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {
-      if (save->attrsz[i]) {
-	 save->currentsz[i][0] = save->attrsz[i];
-	 COPY_CLEAN_4V(save->current[i], 
-		       save->attrsz[i], 
-		       save->attrptr[i]);
-      }
-   }
-}
-
-
-static void _save_copy_from_current( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save; 
-   GLint i;
-
-   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {
-      switch (save->attrsz[i]) {
-      case 4: save->attrptr[i][3] = save->current[i][3];
-      case 3: save->attrptr[i][2] = save->current[i][2];
-      case 2: save->attrptr[i][1] = save->current[i][1];
-      case 1: save->attrptr[i][0] = save->current[i][0];
-      case 0: break;
-      }
-   }
-}
-
-
-
-
-/* Flush existing data, set new attrib size, replay copied vertices.
- */ 
-static void _save_upgrade_vertex( struct gl_context *ctx, 
-				 GLuint attr,
-				 GLuint newsz )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-   GLuint oldsz;
-   GLuint i;
-   GLfloat *tmp;
-
-   /* Store the current run of vertices, and emit a GL_END.  Emit a
-    * BEGIN in the new buffer.
-    */
-   if (save->vert_count) 
-      _save_wrap_buffers( ctx );
-   else
-      assert( save->copied.nr == 0 );
-
-   /* Do a COPY_TO_CURRENT to ensure back-copying works for the case
-    * when the attribute already exists in the vertex and is having
-    * its size increased.  
-    */
-   _save_copy_to_current( ctx );
-
-   /* Fix up sizes:
-    */
-   oldsz = save->attrsz[attr];
-   save->attrsz[attr] = newsz;
-
-   save->vertex_size += newsz - oldsz;
-   save->max_vert = ((VBO_SAVE_BUFFER_SIZE - save->vertex_store->used) / 
-		      save->vertex_size);
-   save->vert_count = 0;
-
-   /* Recalculate all the attrptr[] values:
-    */
-   for (i = 0, tmp = save->vertex ; i < VBO_ATTRIB_MAX ; i++) {
-      if (save->attrsz[i]) {
-	 save->attrptr[i] = tmp;
-	 tmp += save->attrsz[i];
-      }
-      else 
-	 save->attrptr[i] = NULL; /* will not be dereferenced. */
-   }
-
-   /* Copy from current to repopulate the vertex with correct values.
-    */
-   _save_copy_from_current( ctx );
-
-   /* Replay stored vertices to translate them to new format here.
-    *
-    * If there are copied vertices and the new (upgraded) attribute
-    * has not been defined before, this list is somewhat degenerate,
-    * and will need fixup at runtime.
-    */
-   if (save->copied.nr)
-   {
-      GLfloat *data = save->copied.buffer;
-      GLfloat *dest = save->buffer;
-      GLuint j;
-
-      /* Need to note this and fix up at runtime (or loopback):
-       */
-      if (attr != VBO_ATTRIB_POS && save->currentsz[attr][0] == 0) {
-	 assert(oldsz == 0);
-	 save->dangling_attr_ref = GL_TRUE;
-      }
-
-      for (i = 0 ; i < save->copied.nr ; i++) {
-	 for (j = 0 ; j < VBO_ATTRIB_MAX ; j++) {
-	    if (save->attrsz[j]) {
-	       if (j == attr) {
-		  if (oldsz) {
-		     COPY_CLEAN_4V( dest, oldsz, data );
-		     data += oldsz;
-		     dest += newsz;
-		  }
-		  else {
-		     COPY_SZ_4V( dest, newsz, save->current[attr] );
-		     dest += newsz;
-		  }
-	       }
-	       else {
-		  GLint sz = save->attrsz[j];
-		  COPY_SZ_4V( dest, sz, data );
-		  data += sz;
-		  dest += sz;
-	       }
-	    }
-	 }
-      }
-
-      save->buffer_ptr = dest;
-      save->vert_count += save->copied.nr;
-   }
-}
-
-static void save_fixup_vertex( struct gl_context *ctx, GLuint attr, GLuint sz )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save; 
-
-   if (sz > save->attrsz[attr]) {
-      /* New size is larger.  Need to flush existing vertices and get
-       * an enlarged vertex format.
-       */
-      _save_upgrade_vertex( ctx, attr, sz );
-   }
-   else if (sz < save->active_sz[attr]) {
-      static GLfloat id[4] = { 0, 0, 0, 1 };
-      GLuint i;
-
-      /* New size is equal or smaller - just need to fill in some
-       * zeros.
-       */
-      for (i = sz ; i <= save->attrsz[attr] ; i++)
-	 save->attrptr[attr][i-1] = id[i-1];
-   }
-
-   save->active_sz[attr] = sz;
-}
-
-static void _save_reset_vertex( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-   GLuint i;
-
-   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {
-      save->attrsz[i] = 0;
-      save->active_sz[i] = 0;
-   }
-      
-   save->vertex_size = 0;
-}
-
-
-
-#define ERROR(err)   _mesa_compile_error( ctx, err, __FUNCTION__ );
-
-
-/* Only one size for each attribute may be active at once.  Eg. if
- * Color3f is installed/active, then Color4f may not be, even if the
- * vertex actually contains 4 color coordinates.  This is because the
- * 3f version won't otherwise set color[3] to 1.0 -- this is the job
- * of the chooser function when switching between Color4f and Color3f.
- */
-#define ATTR( A, N, V0, V1, V2, V3 )				\
-do {								\
-   struct vbo_save_context *save = &vbo_context(ctx)->save;	\
-								\
-   if (save->active_sz[A] != N)					\
-      save_fixup_vertex(ctx, A, N);				\
-								\
-   {								\
-      GLfloat *dest = save->attrptr[A];				\
-      if (N>0) dest[0] = V0;					\
-      if (N>1) dest[1] = V1;					\
-      if (N>2) dest[2] = V2;					\
-      if (N>3) dest[3] = V3;					\
-   }								\
-								\
-   if ((A) == 0) {						\
-      GLuint i;							\
-								\
-      for (i = 0; i < save->vertex_size; i++)			\
-	 save->buffer_ptr[i] = save->vertex[i];			\
-								\
-      save->buffer_ptr += save->vertex_size;			\
-								\
-      if (++save->vert_count >= save->max_vert)			\
-	 _save_wrap_filled_vertex( ctx );			\
-   }								\
-} while (0)
-
-#define TAG(x) _save_##x
-
-#include "vbo_attrib_tmp.h"
-
-
-
-
-/* Cope with EvalCoord/CallList called within a begin/end object:
- *     -- Flush current buffer
- *     -- Fallback to opcodes for the rest of the begin/end object.
- */
-static void DO_FALLBACK( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-
-   if (save->vert_count || save->prim_count) {
-      GLint i = save->prim_count - 1;
-
-      /* Close off in-progress primitive.
-       */
-      save->prim[i].count = (save->vert_count - 
-                             save->prim[i].start);
-
-      /* Need to replay this display list with loopback,
-       * unfortunately, otherwise this primitive won't be handled
-       * properly:
-       */
-      save->dangling_attr_ref = 1;
-      
-      _save_compile_vertex_list( ctx );
-   }
-
-   _save_copy_to_current( ctx );
-   _save_reset_vertex( ctx );
-   _save_reset_counters( ctx );
-   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
-   ctx->Driver.SaveNeedFlush = 0;
-}
-
-static void GLAPIENTRY _save_EvalCoord1f( GLfloat u )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   CALL_EvalCoord1f(ctx->Save, (u));
-}
-
-static void GLAPIENTRY _save_EvalCoord1fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   CALL_EvalCoord1fv(ctx->Save, (v));
-}
-
-static void GLAPIENTRY _save_EvalCoord2f( GLfloat u, GLfloat v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   CALL_EvalCoord2f(ctx->Save, (u, v));
-}
-
-static void GLAPIENTRY _save_EvalCoord2fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   CALL_EvalCoord2fv(ctx->Save, (v));
-}
-
-static void GLAPIENTRY _save_EvalPoint1( GLint i )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   CALL_EvalPoint1(ctx->Save, (i));
-}
-
-static void GLAPIENTRY _save_EvalPoint2( GLint i, GLint j )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   CALL_EvalPoint2(ctx->Save, (i, j));
-}
-
-static void GLAPIENTRY _save_CallList( GLuint l )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   CALL_CallList(ctx->Save, (l));
-}
-
-static void GLAPIENTRY _save_CallLists( GLsizei n, GLenum type, const GLvoid *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   CALL_CallLists(ctx->Save, (n, type, v));
-}
-
-
-
-
-/* This begin is hooked into ...  Updating of
- * ctx->Driver.CurrentSavePrimitive is already taken care of.
- */
-GLboolean vbo_save_NotifyBegin( struct gl_context *ctx, GLenum mode )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save; 
-
-   GLuint i = save->prim_count++;
-
-   assert(i < save->prim_max);
-   save->prim[i].mode = mode & VBO_SAVE_PRIM_MODE_MASK;
-   save->prim[i].begin = 1;
-   save->prim[i].end = 0;
-   save->prim[i].weak = (mode & VBO_SAVE_PRIM_WEAK) ? 1 : 0;
-   save->prim[i].no_current_update = (mode & VBO_SAVE_PRIM_NO_CURRENT_UPDATE) ? 1 : 0;
-   save->prim[i].pad = 0;
-   save->prim[i].start = save->vert_count;
-   save->prim[i].count = 0;   
-   save->prim[i].num_instances = 1;   
-
-   _mesa_install_save_vtxfmt( ctx, &save->vtxfmt );      
-   ctx->Driver.SaveNeedFlush = 1;
-   return GL_TRUE;
-}
-
-
-
-static void GLAPIENTRY _save_End( void )
-{
-   GET_CURRENT_CONTEXT( ctx ); 
-   struct vbo_save_context *save = &vbo_context(ctx)->save; 
-   GLint i = save->prim_count - 1;
-
-   ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;
-   save->prim[i].end = 1;
-   save->prim[i].count = (save->vert_count - 
-			  save->prim[i].start);
-
-   if (i == (GLint) save->prim_max - 1) {
-      _save_compile_vertex_list( ctx );
-      assert(save->copied.nr == 0);
-   }
-
-   /* Swap out this vertex format while outside begin/end.  Any color,
-    * etc. received between here and the next begin will be compiled
-    * as opcodes.
-    */   
-   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
-}
-
-
-/* These are all errors as this vtxfmt is only installed inside
- * begin/end pairs.
- */
-static void GLAPIENTRY _save_DrawElements(GLenum mode, GLsizei count, GLenum type,
-			       const GLvoid *indices)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   (void) mode; (void) count; (void) type; (void) indices;
-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawElements" );
-}
-
-
-static void GLAPIENTRY _save_DrawRangeElements(GLenum mode,
-				    GLuint start, GLuint end,
-				    GLsizei count, GLenum type,
-				    const GLvoid *indices)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   (void) mode; (void) start; (void) end; (void) count; (void) type; (void) indices;
-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawRangeElements" );
-}
-
-static void GLAPIENTRY _save_DrawElementsBaseVertex(GLenum mode,
-						    GLsizei count,
-						    GLenum type,
-						    const GLvoid *indices,
-						    GLint basevertex)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   (void) mode; (void) count; (void) type; (void) indices; (void)basevertex;
-
-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawElements" );
-}
-
-static void GLAPIENTRY _save_DrawRangeElementsBaseVertex(GLenum mode,
-							 GLuint start,
-							 GLuint end,
-							 GLsizei count,
-							 GLenum type,
-							 const GLvoid *indices,
-							 GLint basevertex)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   (void) mode; (void) start; (void) end; (void) count; (void) type;
-   (void) indices; (void)basevertex;
-
-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawRangeElements" );
-}
-
-static void GLAPIENTRY _save_DrawArrays(GLenum mode, GLint start, GLsizei count)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   (void) mode; (void) start; (void) count;
-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawArrays" );
-}
-
-static void GLAPIENTRY _save_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   (void) x1; (void) y1; (void) x2; (void) y2;
-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glRectf" );
-}
-
-static void GLAPIENTRY _save_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   (void) mode; (void) i1; (void) i2;
-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glEvalMesh1" );
-}
-
-static void GLAPIENTRY _save_EvalMesh2( GLenum mode, GLint i1, GLint i2,
-				  GLint j1, GLint j2 )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   (void) mode; (void) i1; (void) i2; (void) j1; (void) j2;
-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glEvalMesh2" );
-}
-
-static void GLAPIENTRY _save_Begin( GLenum mode )
-{
-   GET_CURRENT_CONTEXT( ctx );
-   (void) mode;
-   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "Recursive glBegin" );
-}
-
-
-static void GLAPIENTRY _save_PrimitiveRestartNV( void )
-{
-   GLenum curPrim;
-   GET_CURRENT_CONTEXT( ctx ); 
-
-   curPrim = ctx->Driver.CurrentSavePrimitive;
-
-   _save_End();
-   _save_Begin(curPrim);
-}
-
-
-/* Unlike the functions above, these are to be hooked into the vtxfmt
- * maintained in ctx->ListState, active when the list is known or
- * suspected to be outside any begin/end primitive.
- */
-static void GLAPIENTRY _save_OBE_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   vbo_save_NotifyBegin( ctx, GL_QUADS | VBO_SAVE_PRIM_WEAK );
-   CALL_Vertex2f(GET_DISPATCH(), ( x1, y1 ));
-   CALL_Vertex2f(GET_DISPATCH(), ( x2, y1 ));
-   CALL_Vertex2f(GET_DISPATCH(), ( x2, y2 ));
-   CALL_Vertex2f(GET_DISPATCH(), ( x1, y2 ));
-   CALL_End(GET_DISPATCH(), ());
-}
-
-
-static void GLAPIENTRY _save_OBE_DrawArrays(GLenum mode, GLint start, GLsizei count)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-
-   if (!_mesa_validate_DrawArrays( ctx, mode, start, count ))
-      return;
-
-   _ae_map_vbos( ctx );
-
-   vbo_save_NotifyBegin( ctx, mode | VBO_SAVE_PRIM_WEAK | VBO_SAVE_PRIM_NO_CURRENT_UPDATE);
-
-   for (i = 0; i < count; i++)
-       CALL_ArrayElement(GET_DISPATCH(), (start + i));
-   CALL_End(GET_DISPATCH(), ());
-
-   _ae_unmap_vbos( ctx );
-}
-
-/* Could do better by copying the arrays and element list intact and
- * then emitting an indexed prim at runtime.
- */
-static void GLAPIENTRY _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum type,
-				   const GLvoid *indices)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-
-   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices, 0 ))
-      return;
-
-   _ae_map_vbos( ctx );
-
-   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj))
-      indices = ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Pointer, indices);
-
-   vbo_save_NotifyBegin( ctx, mode | VBO_SAVE_PRIM_WEAK | VBO_SAVE_PRIM_NO_CURRENT_UPDATE );
-
-   switch (type) {
-   case GL_UNSIGNED_BYTE:
-      for (i = 0 ; i < count ; i++)
-	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLubyte *)indices)[i] ));
-      break;
-   case GL_UNSIGNED_SHORT:
-      for (i = 0 ; i < count ; i++)
-	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLushort *)indices)[i] ));
-      break;
-   case GL_UNSIGNED_INT:
-      for (i = 0 ; i < count ; i++)
-	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLuint *)indices)[i] ));
-      break;
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glDrawElements(type)" );
-      break;
-   }
-
-   CALL_End(GET_DISPATCH(), ());
-
-   _ae_unmap_vbos( ctx );
-}
-
-static void GLAPIENTRY _save_OBE_DrawRangeElements(GLenum mode,
-					GLuint start, GLuint end,
-					GLsizei count, GLenum type,
-					const GLvoid *indices)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (_mesa_validate_DrawRangeElements( ctx, mode,
-					 start, end,
-					 count, type, indices, 0 ))
-      _save_OBE_DrawElements( mode, count, type, indices );
-}
-
-
-
-
-
-static void _save_vtxfmt_init( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-   GLvertexformat *vfmt = &save->vtxfmt;
-
-   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
-
-   vfmt->Begin = _save_Begin;
-   vfmt->Color3f = _save_Color3f;
-   vfmt->Color3fv = _save_Color3fv;
-   vfmt->Color4f = _save_Color4f;
-   vfmt->Color4fv = _save_Color4fv;
-   vfmt->EdgeFlag = _save_EdgeFlag;
-   vfmt->End = _save_End;
-   vfmt->PrimitiveRestartNV = _save_PrimitiveRestartNV;
-   vfmt->FogCoordfEXT = _save_FogCoordfEXT;
-   vfmt->FogCoordfvEXT = _save_FogCoordfvEXT;
-   vfmt->Indexf = _save_Indexf;
-   vfmt->Indexfv = _save_Indexfv;
-   vfmt->Materialfv = _save_Materialfv;
-   vfmt->MultiTexCoord1fARB = _save_MultiTexCoord1f;
-   vfmt->MultiTexCoord1fvARB = _save_MultiTexCoord1fv;
-   vfmt->MultiTexCoord2fARB = _save_MultiTexCoord2f;
-   vfmt->MultiTexCoord2fvARB = _save_MultiTexCoord2fv;
-   vfmt->MultiTexCoord3fARB = _save_MultiTexCoord3f;
-   vfmt->MultiTexCoord3fvARB = _save_MultiTexCoord3fv;
-   vfmt->MultiTexCoord4fARB = _save_MultiTexCoord4f;
-   vfmt->MultiTexCoord4fvARB = _save_MultiTexCoord4fv;
-   vfmt->Normal3f = _save_Normal3f;
-   vfmt->Normal3fv = _save_Normal3fv;
-   vfmt->SecondaryColor3fEXT = _save_SecondaryColor3fEXT;
-   vfmt->SecondaryColor3fvEXT = _save_SecondaryColor3fvEXT;
-   vfmt->TexCoord1f = _save_TexCoord1f;
-   vfmt->TexCoord1fv = _save_TexCoord1fv;
-   vfmt->TexCoord2f = _save_TexCoord2f;
-   vfmt->TexCoord2fv = _save_TexCoord2fv;
-   vfmt->TexCoord3f = _save_TexCoord3f;
-   vfmt->TexCoord3fv = _save_TexCoord3fv;
-   vfmt->TexCoord4f = _save_TexCoord4f;
-   vfmt->TexCoord4fv = _save_TexCoord4fv;
-   vfmt->Vertex2f = _save_Vertex2f;
-   vfmt->Vertex2fv = _save_Vertex2fv;
-   vfmt->Vertex3f = _save_Vertex3f;
-   vfmt->Vertex3fv = _save_Vertex3fv;
-   vfmt->Vertex4f = _save_Vertex4f;
-   vfmt->Vertex4fv = _save_Vertex4fv;
-   vfmt->VertexAttrib1fARB = _save_VertexAttrib1fARB;
-   vfmt->VertexAttrib1fvARB = _save_VertexAttrib1fvARB;
-   vfmt->VertexAttrib2fARB = _save_VertexAttrib2fARB;
-   vfmt->VertexAttrib2fvARB = _save_VertexAttrib2fvARB;
-   vfmt->VertexAttrib3fARB = _save_VertexAttrib3fARB;
-   vfmt->VertexAttrib3fvARB = _save_VertexAttrib3fvARB;
-   vfmt->VertexAttrib4fARB = _save_VertexAttrib4fARB;
-   vfmt->VertexAttrib4fvARB = _save_VertexAttrib4fvARB;
-
-   vfmt->VertexAttrib1fNV = _save_VertexAttrib1fNV;
-   vfmt->VertexAttrib1fvNV = _save_VertexAttrib1fvNV;
-   vfmt->VertexAttrib2fNV = _save_VertexAttrib2fNV;
-   vfmt->VertexAttrib2fvNV = _save_VertexAttrib2fvNV;
-   vfmt->VertexAttrib3fNV = _save_VertexAttrib3fNV;
-   vfmt->VertexAttrib3fvNV = _save_VertexAttrib3fvNV;
-   vfmt->VertexAttrib4fNV = _save_VertexAttrib4fNV;
-   vfmt->VertexAttrib4fvNV = _save_VertexAttrib4fvNV;
-   
-   /* integer-valued */
-   vfmt->VertexAttribI1i = _save_VertexAttribI1i;
-   vfmt->VertexAttribI2i = _save_VertexAttribI2i;
-   vfmt->VertexAttribI3i = _save_VertexAttribI3i;
-   vfmt->VertexAttribI4i = _save_VertexAttribI4i;
-   vfmt->VertexAttribI2iv = _save_VertexAttribI2iv;
-   vfmt->VertexAttribI3iv = _save_VertexAttribI3iv;
-   vfmt->VertexAttribI4iv = _save_VertexAttribI4iv;
-
-   /* unsigned integer-valued */
-   vfmt->VertexAttribI1ui = _save_VertexAttribI1ui;
-   vfmt->VertexAttribI2ui = _save_VertexAttribI2ui;
-   vfmt->VertexAttribI3ui = _save_VertexAttribI3ui;
-   vfmt->VertexAttribI4ui = _save_VertexAttribI4ui;
-   vfmt->VertexAttribI2uiv = _save_VertexAttribI2uiv;
-   vfmt->VertexAttribI3uiv = _save_VertexAttribI3uiv;
-   vfmt->VertexAttribI4uiv = _save_VertexAttribI4uiv;
-
-   /* This will all require us to fallback to saving the list as opcodes:
-    */ 
-   _MESA_INIT_DLIST_VTXFMT(vfmt, _save_); /* inside begin/end */
-
-   _MESA_INIT_EVAL_VTXFMT(vfmt, _save_);
-
-   /* These are all errors as we at least know we are in some sort of
-    * begin/end pair:
-    */
-   vfmt->Begin = _save_Begin;
-   vfmt->Rectf = _save_Rectf;
-   vfmt->DrawArrays = _save_DrawArrays;
-   vfmt->DrawElements = _save_DrawElements;
-   vfmt->DrawRangeElements = _save_DrawRangeElements;
-   vfmt->DrawElementsBaseVertex = _save_DrawElementsBaseVertex;
-   vfmt->DrawRangeElementsBaseVertex = _save_DrawRangeElementsBaseVertex;
-   /* Loops back into vfmt->DrawElements */
-   vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
-   vfmt->MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
-}
-
-
-void vbo_save_SaveFlushVertices( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-
-   /* Noop when we are actually active:
-    */
-   if (ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM ||
-       ctx->Driver.CurrentSavePrimitive <= GL_POLYGON)
-      return;
-
-   if (save->vert_count ||
-       save->prim_count) 
-      _save_compile_vertex_list( ctx );
-   
-   _save_copy_to_current( ctx );
-   _save_reset_vertex( ctx );
-   _save_reset_counters( ctx );  
-   ctx->Driver.SaveNeedFlush = 0;
-}
-
-void vbo_save_NewList( struct gl_context *ctx, GLuint list, GLenum mode )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-
-   (void) list; (void) mode;
-
-   if (!save->prim_store)
-      save->prim_store = alloc_prim_store( ctx );
-
-   if (!save->vertex_store) 
-      save->vertex_store = alloc_vertex_store( ctx );
-      
-   save->buffer_ptr = map_vertex_store( ctx, save->vertex_store );
-   
-   _save_reset_vertex( ctx );
-   _save_reset_counters( ctx );  
-   ctx->Driver.SaveNeedFlush = 0;
-}
-
-void vbo_save_EndList( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-
-   /* EndList called inside a (saved) Begin/End pair?
-    */
-   if (ctx->Driver.CurrentSavePrimitive != PRIM_OUTSIDE_BEGIN_END) {
-
-      if (save->prim_count > 0) {
-         GLint i = save->prim_count - 1;
-         ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;
-         save->prim[i].end = 0;
-         save->prim[i].count = (save->vert_count - 
-                                save->prim[i].start);
-      }
-
-      /* Make sure this vertex list gets replayed by the "loopback"
-       * mechanism:
-       */
-      save->dangling_attr_ref = 1;
-      vbo_save_SaveFlushVertices( ctx );
-
-      /* Swap out this vertex format while outside begin/end.  Any color,
-       * etc. received between here and the next begin will be compiled
-       * as opcodes.
-       */   
-      _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
-   }
-
-   unmap_vertex_store( ctx, save->vertex_store );
-
-   assert(save->vertex_size == 0);
-}
- 
-void vbo_save_BeginCallList( struct gl_context *ctx, struct gl_display_list *dlist )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-   save->replay_flags |= dlist->Flags;
-}
-
-void vbo_save_EndCallList( struct gl_context *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-   
-   if (ctx->ListState.CallDepth == 1) {
-      /* This is correct: want to keep only the VBO_SAVE_FALLBACK
-       * flag, if it is set:
-       */
-      save->replay_flags &= VBO_SAVE_FALLBACK;
-   }
-}
-
-
-static void vbo_destroy_vertex_list( struct gl_context *ctx, void *data )
-{
-   struct vbo_save_vertex_list *node = (struct vbo_save_vertex_list *)data;
-   (void) ctx;
-
-   if ( --node->vertex_store->refcount == 0 ) 
-      free_vertex_store( ctx, node->vertex_store );
-
-   if ( --node->prim_store->refcount == 0 )
-      FREE( node->prim_store );
-
-   if (node->current_data) {
-      FREE(node->current_data);
-      node->current_data = NULL;
-   }
-}
-
-
-static void vbo_print_vertex_list( struct gl_context *ctx, void *data )
-{
-   struct vbo_save_vertex_list *node = (struct vbo_save_vertex_list *)data;
-   GLuint i;
-   (void) ctx;
-
-   printf("VBO-VERTEX-LIST, %u vertices %d primitives, %d vertsize\n",
-	  node->count,
-	  node->prim_count,
-	  node->vertex_size);
-
-   for (i = 0 ; i < node->prim_count ; i++) {
-      struct _mesa_prim *prim = &node->prim[i];
-      _mesa_debug(NULL, "   prim %d: %s%s %d..%d %s %s\n",
-		  i, 
-		  _mesa_lookup_prim_by_nr(prim->mode),
-		  prim->weak ? " (weak)" : "",
-		  prim->start, 
-		  prim->start + prim->count,
-		  (prim->begin) ? "BEGIN" : "(wrap)",
-		  (prim->end) ? "END" : "(wrap)");
-   }
-}
-
-
-static void _save_current_init( struct gl_context *ctx ) 
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-   GLint i;
-
-   for (i = VBO_ATTRIB_POS; i <= VBO_ATTRIB_GENERIC15; i++) {
-      const GLuint j = i - VBO_ATTRIB_POS;
-      ASSERT(j < VERT_ATTRIB_MAX);
-      save->currentsz[i] = &ctx->ListState.ActiveAttribSize[j];
-      save->current[i] = ctx->ListState.CurrentAttrib[j];
-   }
-
-   for (i = VBO_ATTRIB_FIRST_MATERIAL; i <= VBO_ATTRIB_LAST_MATERIAL; i++) {
-      const GLuint j = i - VBO_ATTRIB_FIRST_MATERIAL;
-      ASSERT(j < MAT_ATTRIB_MAX);
-      save->currentsz[i] = &ctx->ListState.ActiveMaterialSize[j];
-      save->current[i] = ctx->ListState.CurrentMaterial[j];
-   }
-}
-
-/**
- * Initialize the display list compiler
- */
-void vbo_save_api_init( struct vbo_save_context *save )
-{
-   struct gl_context *ctx = save->ctx;
-   GLuint i;
-
-   save->opcode_vertex_list =
-      _mesa_dlist_alloc_opcode( ctx,
-                                sizeof(struct vbo_save_vertex_list),
-                                vbo_save_playback_vertex_list,
-                                vbo_destroy_vertex_list,
-                                vbo_print_vertex_list );
-
-   ctx->Driver.NotifySaveBegin = vbo_save_NotifyBegin;
-
-   _save_vtxfmt_init( ctx );
-   _save_current_init( ctx );
-
-   /* These will actually get set again when binding/drawing */
-   for (i = 0; i < VBO_ATTRIB_MAX; i++)
-      save->inputs[i] = &save->arrays[i];
-
-   /* Hook our array functions into the outside-begin-end vtxfmt in 
-    * ctx->ListState.
-    */
-   ctx->ListState.ListVtxfmt.Rectf = _save_OBE_Rectf;
-   ctx->ListState.ListVtxfmt.DrawArrays = _save_OBE_DrawArrays;
-   ctx->ListState.ListVtxfmt.DrawElements = _save_OBE_DrawElements;
-   ctx->ListState.ListVtxfmt.DrawRangeElements = _save_OBE_DrawRangeElements;
-   /* loops back into _save_OBE_DrawElements */
-   ctx->ListState.ListVtxfmt.MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
-   ctx->ListState.ListVtxfmt.MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
-   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
-}
-
-
-#endif /* FEATURE_dlist */
+/**************************************************************************

+

+Copyright 2002-2008 Tungsten Graphics Inc., Cedar Park, Texas.

+

+All Rights Reserved.

+

+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

+on the rights to use, copy, modify, merge, publish, distribute, sub

+license, 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 (including the next

+paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL

+TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS 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.

+

+**************************************************************************/

+

+/*

+ * Authors:

+ *   Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+

+/* Display list compiler attempts to store lists of vertices with the

+ * same vertex layout.  Additionally it attempts to minimize the need

+ * for execute-time fixup of these vertex lists, allowing them to be

+ * cached on hardware.

+ *

+ * There are still some circumstances where this can be thwarted, for

+ * example by building a list that consists of one very long primitive

+ * (eg Begin(Triangles), 1000 vertices, End), and calling that list

+ * from inside a different begin/end object (Begin(Lines), CallList,

+ * End).  

+ *

+ * In that case the code will have to replay the list as individual

+ * commands through the Exec dispatch table, or fix up the copied

+ * vertices at execute-time.

+ *

+ * The other case where fixup is required is when a vertex attribute

+ * is introduced in the middle of a primitive.  Eg:

+ *  Begin(Lines)

+ *  TexCoord1f()           Vertex2f()

+ *  TexCoord1f() Color3f() Vertex2f()

+ *  End()

+ *

+ *  If the current value of Color isn't known at compile-time, this

+ *  primitive will require fixup.

+ *

+ *

+ * The list compiler currently doesn't attempt to compile lists

+ * containing EvalCoord or EvalPoint commands.  On encountering one of

+ * these, compilation falls back to opcodes.  

+ *

+ * This could be improved to fallback only when a mix of EvalCoord and

+ * Vertex commands are issued within a single primitive.

+ */

+

+

+#include "main/glheader.h"

+#include "main/bufferobj.h"

+#include "main/context.h"

+#include "main/dlist.h"

+#include "main/enums.h"

+#include "main/eval.h"

+#include "main/macros.h"

+#include "main/mfeatures.h"

+#include "main/api_noop.h"

+#include "main/api_validate.h"

+#include "main/api_arrayelt.h"

+#include "main/vtxfmt.h"

+#include "main/dispatch.h"

+

+#include "vbo_context.h"

+

+

+#if FEATURE_dlist

+

+

+#ifdef ERROR

+#undef ERROR

+#endif

+

+

+/* An interesting VBO number/name to help with debugging */

+#define VBO_BUF_ID  12345

+

+

+/*

+ * NOTE: Old 'parity' issue is gone, but copying can still be

+ * wrong-footed on replay.

+ */

+static GLuint _save_copy_vertices( struct gl_context *ctx, 

+				   const struct vbo_save_vertex_list *node,

+				   const GLfloat *src_buffer)

+{

+   struct vbo_save_context *save = &vbo_context( ctx )->save;

+   const struct _mesa_prim *prim = &node->prim[node->prim_count-1];

+   GLuint nr = prim->count;

+   GLuint sz = save->vertex_size;

+   const GLfloat *src = src_buffer + prim->start * sz;

+   GLfloat *dst = save->copied.buffer;

+   GLuint ovf, i;

+

+   if (prim->end)

+      return 0;

+	 

+   switch( prim->mode )

+   {

+   case GL_POINTS:

+      return 0;

+   case GL_LINES:

+      ovf = nr&1;

+      for (i = 0 ; i < ovf ; i++)

+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );

+      return i;

+   case GL_TRIANGLES:

+      ovf = nr%3;

+      for (i = 0 ; i < ovf ; i++)

+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );

+      return i;

+   case GL_QUADS:

+      ovf = nr&3;

+      for (i = 0 ; i < ovf ; i++)

+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );

+      return i;

+   case GL_LINE_STRIP:

+      if (nr == 0) 

+	 return 0;

+      else {

+	 memcpy( dst, src+(nr-1)*sz, sz*sizeof(GLfloat) );

+	 return 1;

+      }

+   case GL_LINE_LOOP:

+   case GL_TRIANGLE_FAN:

+   case GL_POLYGON:

+      if (nr == 0) 

+	 return 0;

+      else if (nr == 1) {

+	 memcpy( dst, src+0, sz*sizeof(GLfloat) );

+	 return 1;

+      } else {

+	 memcpy( dst, src+0, sz*sizeof(GLfloat) );

+	 memcpy( dst+sz, src+(nr-1)*sz, sz*sizeof(GLfloat) );

+	 return 2;

+      }

+   case GL_TRIANGLE_STRIP:

+   case GL_QUAD_STRIP:

+      switch (nr) {

+      case 0: ovf = 0; break;

+      case 1: ovf = 1; break;

+      default: ovf = 2 + (nr&1); break;

+      }

+      for (i = 0 ; i < ovf ; i++)

+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );

+      return i;

+   default:

+      assert(0);

+      return 0;

+   }

+}

+

+

+static struct vbo_save_vertex_store *alloc_vertex_store( struct gl_context *ctx )

+{

+   struct vbo_save_vertex_store *vertex_store = CALLOC_STRUCT(vbo_save_vertex_store);

+

+   /* obj->Name needs to be non-zero, but won't ever be examined more

+    * closely than that.  In particular these buffers won't be entered

+    * into the hash and can never be confused with ones visible to the

+    * user.  Perhaps there could be a special number for internal

+    * buffers:

+    */

+   vertex_store->bufferobj = ctx->Driver.NewBufferObject(ctx,

+                                                         VBO_BUF_ID,

+                                                         GL_ARRAY_BUFFER_ARB);

+

+   ctx->Driver.BufferData( ctx, 

+			   GL_ARRAY_BUFFER_ARB, 

+			   VBO_SAVE_BUFFER_SIZE * sizeof(GLfloat),

+			   NULL,

+			   GL_STATIC_DRAW_ARB,

+			   vertex_store->bufferobj);

+

+   vertex_store->buffer = NULL;

+   vertex_store->used = 0;

+   vertex_store->refcount = 1;

+

+   return vertex_store;

+}

+

+static void free_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )

+{

+   assert(!vertex_store->buffer);

+

+   if (vertex_store->bufferobj) {

+      _mesa_reference_buffer_object(ctx, &vertex_store->bufferobj, NULL);

+   }

+

+   FREE( vertex_store );

+}

+

+static GLfloat *map_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )

+{

+   assert(vertex_store->bufferobj);

+   assert(!vertex_store->buffer);

+   vertex_store->buffer = (GLfloat *)ctx->Driver.MapBuffer(ctx, 

+							   GL_ARRAY_BUFFER_ARB,	/* not used */

+							   GL_WRITE_ONLY, /* not used */

+							   vertex_store->bufferobj); 

+

+   assert(vertex_store->buffer);

+   return vertex_store->buffer + vertex_store->used;

+}

+

+static void unmap_vertex_store( struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store )

+{

+   ctx->Driver.UnmapBuffer( ctx, GL_ARRAY_BUFFER_ARB, vertex_store->bufferobj );

+   vertex_store->buffer = NULL;

+}

+

+

+static struct vbo_save_primitive_store *alloc_prim_store( struct gl_context *ctx )

+{

+   struct vbo_save_primitive_store *store = CALLOC_STRUCT(vbo_save_primitive_store);

+   (void) ctx;

+   store->used = 0;

+   store->refcount = 1;

+   return store;

+}

+

+static void _save_reset_counters( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+

+   save->prim = save->prim_store->buffer + save->prim_store->used;

+   save->buffer = (save->vertex_store->buffer + 

+		   save->vertex_store->used);

+

+   assert(save->buffer == save->buffer_ptr);

+

+   if (save->vertex_size)

+      save->max_vert = ((VBO_SAVE_BUFFER_SIZE - save->vertex_store->used) / 

+			 save->vertex_size);

+   else

+      save->max_vert = 0;

+

+   save->vert_count = 0;

+   save->prim_count = 0;

+   save->prim_max = VBO_SAVE_PRIM_SIZE - save->prim_store->used;

+   save->dangling_attr_ref = 0;

+}

+

+

+/* Insert the active immediate struct onto the display list currently

+ * being built.

+ */

+static void _save_compile_vertex_list( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+   struct vbo_save_vertex_list *node;

+

+   /* Allocate space for this structure in the display list currently

+    * being compiled.

+    */

+   node = (struct vbo_save_vertex_list *)

+      _mesa_dlist_alloc(ctx, save->opcode_vertex_list, sizeof(*node));

+

+   if (!node)

+      return;

+

+   /* Duplicate our template, increment refcounts to the storage structs:

+    */

+   memcpy(node->attrsz, save->attrsz, sizeof(node->attrsz));

+   node->vertex_size = save->vertex_size;

+   node->buffer_offset = (save->buffer - save->vertex_store->buffer) * sizeof(GLfloat); 

+   node->count = save->vert_count;

+   node->wrap_count = save->copied.nr;

+   node->dangling_attr_ref = save->dangling_attr_ref;

+   node->prim = save->prim;

+   node->prim_count = save->prim_count;

+   node->vertex_store = save->vertex_store;

+   node->prim_store = save->prim_store;

+

+   node->vertex_store->refcount++;

+   node->prim_store->refcount++;

+

+   if (node->prim[0].no_current_update) {

+      node->current_size = 0;

+      node->current_data = NULL;

+   } else {

+      node->current_size = node->vertex_size - node->attrsz[0];

+      node->current_data = NULL;

+     

+      if (node->current_size) {

+         /* If the malloc fails, we just pull the data out of the VBO

+          * later instead.

+          */

+         node->current_data = MALLOC( node->current_size * sizeof(GLfloat) );

+         if (node->current_data) {

+            const char *buffer = (const char *)save->vertex_store->buffer;

+            unsigned attr_offset = node->attrsz[0] * sizeof(GLfloat);

+            unsigned vertex_offset = 0;

+            

+            if (node->count)

+               vertex_offset = (node->count-1) * node->vertex_size * sizeof(GLfloat);

+         

+            memcpy( node->current_data,

+                    buffer + node->buffer_offset + vertex_offset + attr_offset,

+                    node->current_size * sizeof(GLfloat) );

+         }

+      }

+   }

+

+

+

+   assert(node->attrsz[VBO_ATTRIB_POS] != 0 ||

+	  node->count == 0);

+

+   if (save->dangling_attr_ref)

+      ctx->ListState.CurrentList->Flags |= DLIST_DANGLING_REFS;

+

+   save->vertex_store->used += save->vertex_size * node->count;

+   save->prim_store->used += node->prim_count;

+

+

+   /* Copy duplicated vertices 

+    */

+   save->copied.nr = _save_copy_vertices( ctx, node, save->buffer );

+

+

+   /* Deal with GL_COMPILE_AND_EXECUTE:

+    */

+   if (ctx->ExecuteFlag) {

+      struct _glapi_table *dispatch = GET_DISPATCH();

+

+      _glapi_set_dispatch(ctx->Exec);

+

+      vbo_loopback_vertex_list( ctx,

+				(const GLfloat *)((const char *)save->vertex_store->buffer + 

+						  node->buffer_offset),

+				node->attrsz,

+				node->prim,

+				node->prim_count,

+				node->wrap_count,

+				node->vertex_size);

+

+      _glapi_set_dispatch(dispatch);

+   }

+

+

+   /* Decide whether the storage structs are full, or can be used for

+    * the next vertex lists as well.

+    */

+   if (save->vertex_store->used > 

+       VBO_SAVE_BUFFER_SIZE - 16 * (save->vertex_size + 4)) {

+

+      /* Unmap old store:

+       */

+      unmap_vertex_store( ctx, save->vertex_store );

+

+      /* Release old reference:

+       */

+      save->vertex_store->refcount--; 

+      assert(save->vertex_store->refcount != 0);

+      save->vertex_store = NULL;

+

+      /* Allocate and map new store:

+       */

+      save->vertex_store = alloc_vertex_store( ctx );

+      save->buffer_ptr = map_vertex_store( ctx, save->vertex_store );

+   } 

+

+   if (save->prim_store->used > VBO_SAVE_PRIM_SIZE - 6) {

+      save->prim_store->refcount--; 

+      assert(save->prim_store->refcount != 0);

+      save->prim_store = alloc_prim_store( ctx );

+   } 

+

+   /* Reset our structures for the next run of vertices:

+    */

+   _save_reset_counters( ctx );

+}

+

+

+/* TODO -- If no new vertices have been stored, don't bother saving

+ * it.

+ */

+static void _save_wrap_buffers( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+   GLint i = save->prim_count - 1;

+   GLenum mode;

+   GLboolean weak;

+   GLboolean no_current_update;

+

+   assert(i < (GLint) save->prim_max);

+   assert(i >= 0);

+

+   /* Close off in-progress primitive.

+    */

+   save->prim[i].count = (save->vert_count - 

+			  save->prim[i].start);

+   mode = save->prim[i].mode;

+   weak = save->prim[i].weak;

+   no_current_update = save->prim[i].no_current_update;

+   

+   /* store the copied vertices, and allocate a new list.

+    */

+   _save_compile_vertex_list( ctx );

+

+   /* Restart interrupted primitive

+    */

+   save->prim[0].mode = mode;

+   save->prim[0].weak = weak;

+   save->prim[0].no_current_update = no_current_update;

+   save->prim[0].begin = 0;

+   save->prim[0].end = 0;

+   save->prim[0].pad = 0;

+   save->prim[0].start = 0;

+   save->prim[0].count = 0;

+   save->prim[0].num_instances = 1;

+   save->prim_count = 1;

+}

+

+

+

+/* Called only when buffers are wrapped as the result of filling the

+ * vertex_store struct.  

+ */

+static void _save_wrap_filled_vertex( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+   GLfloat *data = save->copied.buffer;

+   GLuint i;

+

+   /* Emit a glEnd to close off the last vertex list.

+    */

+   _save_wrap_buffers( ctx );

+   

+    /* Copy stored stored vertices to start of new list.

+    */

+   assert(save->max_vert - save->vert_count > save->copied.nr);

+

+   for (i = 0 ; i < save->copied.nr ; i++) {

+      memcpy( save->buffer_ptr, data, save->vertex_size * sizeof(GLfloat));

+      data += save->vertex_size;

+      save->buffer_ptr += save->vertex_size;

+      save->vert_count++;

+   }

+}

+

+

+static void _save_copy_to_current( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save; 

+   GLuint i;

+

+   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {

+      if (save->attrsz[i]) {

+	 save->currentsz[i][0] = save->attrsz[i];

+	 COPY_CLEAN_4V(save->current[i], 

+		       save->attrsz[i], 

+		       save->attrptr[i]);

+      }

+   }

+}

+

+

+static void _save_copy_from_current( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save; 

+   GLint i;

+

+   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {

+      switch (save->attrsz[i]) {

+      case 4: save->attrptr[i][3] = save->current[i][3];

+      case 3: save->attrptr[i][2] = save->current[i][2];

+      case 2: save->attrptr[i][1] = save->current[i][1];

+      case 1: save->attrptr[i][0] = save->current[i][0];

+      case 0: break;

+      }

+   }

+}

+

+

+

+

+/* Flush existing data, set new attrib size, replay copied vertices.

+ */ 

+static void _save_upgrade_vertex( struct gl_context *ctx, 

+				 GLuint attr,

+				 GLuint newsz )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+   GLuint oldsz;

+   GLuint i;

+   GLfloat *tmp;

+

+   /* Store the current run of vertices, and emit a GL_END.  Emit a

+    * BEGIN in the new buffer.

+    */

+   if (save->vert_count) 

+      _save_wrap_buffers( ctx );

+   else

+      assert( save->copied.nr == 0 );

+

+   /* Do a COPY_TO_CURRENT to ensure back-copying works for the case

+    * when the attribute already exists in the vertex and is having

+    * its size increased.  

+    */

+   _save_copy_to_current( ctx );

+

+   /* Fix up sizes:

+    */

+   oldsz = save->attrsz[attr];

+   save->attrsz[attr] = newsz;

+

+   save->vertex_size += newsz - oldsz;

+   save->max_vert = ((VBO_SAVE_BUFFER_SIZE - save->vertex_store->used) / 

+		      save->vertex_size);

+   save->vert_count = 0;

+

+   /* Recalculate all the attrptr[] values:

+    */

+   for (i = 0, tmp = save->vertex ; i < VBO_ATTRIB_MAX ; i++) {

+      if (save->attrsz[i]) {

+	 save->attrptr[i] = tmp;

+	 tmp += save->attrsz[i];

+      }

+      else 

+	 save->attrptr[i] = NULL; /* will not be dereferenced. */

+   }

+

+   /* Copy from current to repopulate the vertex with correct values.

+    */

+   _save_copy_from_current( ctx );

+

+   /* Replay stored vertices to translate them to new format here.

+    *

+    * If there are copied vertices and the new (upgraded) attribute

+    * has not been defined before, this list is somewhat degenerate,

+    * and will need fixup at runtime.

+    */

+   if (save->copied.nr)

+   {

+      GLfloat *data = save->copied.buffer;

+      GLfloat *dest = save->buffer;

+      GLuint j;

+

+      /* Need to note this and fix up at runtime (or loopback):

+       */

+      if (attr != VBO_ATTRIB_POS && save->currentsz[attr][0] == 0) {

+	 assert(oldsz == 0);

+	 save->dangling_attr_ref = GL_TRUE;

+      }

+

+      for (i = 0 ; i < save->copied.nr ; i++) {

+	 for (j = 0 ; j < VBO_ATTRIB_MAX ; j++) {

+	    if (save->attrsz[j]) {

+	       if (j == attr) {

+		  if (oldsz) {

+		     COPY_CLEAN_4V( dest, oldsz, data );

+		     data += oldsz;

+		     dest += newsz;

+		  }

+		  else {

+		     COPY_SZ_4V( dest, newsz, save->current[attr] );

+		     dest += newsz;

+		  }

+	       }

+	       else {

+		  GLint sz = save->attrsz[j];

+		  COPY_SZ_4V( dest, sz, data );

+		  data += sz;

+		  dest += sz;

+	       }

+	    }

+	 }

+      }

+

+      save->buffer_ptr = dest;

+      save->vert_count += save->copied.nr;

+   }

+}

+

+static void save_fixup_vertex( struct gl_context *ctx, GLuint attr, GLuint sz )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save; 

+

+   if (sz > save->attrsz[attr]) {

+      /* New size is larger.  Need to flush existing vertices and get

+       * an enlarged vertex format.

+       */

+      _save_upgrade_vertex( ctx, attr, sz );

+   }

+   else if (sz < save->active_sz[attr]) {

+      static GLfloat id[4] = { 0, 0, 0, 1 };

+      GLuint i;

+

+      /* New size is equal or smaller - just need to fill in some

+       * zeros.

+       */

+      for (i = sz ; i <= save->attrsz[attr] ; i++)

+	 save->attrptr[attr][i-1] = id[i-1];

+   }

+

+   save->active_sz[attr] = sz;

+}

+

+static void _save_reset_vertex( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+   GLuint i;

+

+   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {

+      save->attrsz[i] = 0;

+      save->active_sz[i] = 0;

+   }

+      

+   save->vertex_size = 0;

+}

+

+

+

+#define ERROR(err)   _mesa_compile_error( ctx, err, __FUNCTION__ );

+

+

+/* Only one size for each attribute may be active at once.  Eg. if

+ * Color3f is installed/active, then Color4f may not be, even if the

+ * vertex actually contains 4 color coordinates.  This is because the

+ * 3f version won't otherwise set color[3] to 1.0 -- this is the job

+ * of the chooser function when switching between Color4f and Color3f.

+ */

+#define ATTR( A, N, V0, V1, V2, V3 )				\

+do {								\

+   struct vbo_save_context *save = &vbo_context(ctx)->save;	\

+								\

+   if (save->active_sz[A] != N)					\

+      save_fixup_vertex(ctx, A, N);				\

+								\

+   {								\

+      GLfloat *dest = save->attrptr[A];				\

+      if (N>0) dest[0] = V0;					\

+      if (N>1) dest[1] = V1;					\

+      if (N>2) dest[2] = V2;					\

+      if (N>3) dest[3] = V3;					\

+   }								\

+								\

+   if ((A) == 0) {						\

+      GLuint i;							\

+								\

+      for (i = 0; i < save->vertex_size; i++)			\

+	 save->buffer_ptr[i] = save->vertex[i];			\

+								\

+      save->buffer_ptr += save->vertex_size;			\

+								\

+      if (++save->vert_count >= save->max_vert)			\

+	 _save_wrap_filled_vertex( ctx );			\

+   }								\

+} while (0)

+

+#define TAG(x) _save_##x

+

+#include "vbo_attrib_tmp.h"

+

+

+

+

+/* Cope with EvalCoord/CallList called within a begin/end object:

+ *     -- Flush current buffer

+ *     -- Fallback to opcodes for the rest of the begin/end object.

+ */

+static void DO_FALLBACK( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+

+   if (save->vert_count || save->prim_count) {

+      GLint i = save->prim_count - 1;

+

+      /* Close off in-progress primitive.

+       */

+      save->prim[i].count = (save->vert_count - 

+                             save->prim[i].start);

+

+      /* Need to replay this display list with loopback,

+       * unfortunately, otherwise this primitive won't be handled

+       * properly:

+       */

+      save->dangling_attr_ref = 1;

+      

+      _save_compile_vertex_list( ctx );

+   }

+

+   _save_copy_to_current( ctx );

+   _save_reset_vertex( ctx );

+   _save_reset_counters( ctx );

+   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );

+   ctx->Driver.SaveNeedFlush = 0;

+}

+

+static void GLAPIENTRY _save_EvalCoord1f( GLfloat u )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   DO_FALLBACK(ctx);

+   CALL_EvalCoord1f(ctx->Save, (u));

+}

+

+static void GLAPIENTRY _save_EvalCoord1fv( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   DO_FALLBACK(ctx);

+   CALL_EvalCoord1fv(ctx->Save, (v));

+}

+

+static void GLAPIENTRY _save_EvalCoord2f( GLfloat u, GLfloat v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   DO_FALLBACK(ctx);

+   CALL_EvalCoord2f(ctx->Save, (u, v));

+}

+

+static void GLAPIENTRY _save_EvalCoord2fv( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   DO_FALLBACK(ctx);

+   CALL_EvalCoord2fv(ctx->Save, (v));

+}

+

+static void GLAPIENTRY _save_EvalPoint1( GLint i )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   DO_FALLBACK(ctx);

+   CALL_EvalPoint1(ctx->Save, (i));

+}

+

+static void GLAPIENTRY _save_EvalPoint2( GLint i, GLint j )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   DO_FALLBACK(ctx);

+   CALL_EvalPoint2(ctx->Save, (i, j));

+}

+

+static void GLAPIENTRY _save_CallList( GLuint l )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   DO_FALLBACK(ctx);

+   CALL_CallList(ctx->Save, (l));

+}

+

+static void GLAPIENTRY _save_CallLists( GLsizei n, GLenum type, const GLvoid *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   DO_FALLBACK(ctx);

+   CALL_CallLists(ctx->Save, (n, type, v));

+}

+

+

+

+

+/* This begin is hooked into ...  Updating of

+ * ctx->Driver.CurrentSavePrimitive is already taken care of.

+ */

+GLboolean vbo_save_NotifyBegin( struct gl_context *ctx, GLenum mode )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save; 

+

+   GLuint i = save->prim_count++;

+

+   assert(i < save->prim_max);

+   save->prim[i].mode = mode & VBO_SAVE_PRIM_MODE_MASK;

+   save->prim[i].begin = 1;

+   save->prim[i].end = 0;

+   save->prim[i].weak = (mode & VBO_SAVE_PRIM_WEAK) ? 1 : 0;

+   save->prim[i].no_current_update = (mode & VBO_SAVE_PRIM_NO_CURRENT_UPDATE) ? 1 : 0;

+   save->prim[i].pad = 0;

+   save->prim[i].start = save->vert_count;

+   save->prim[i].count = 0;   

+   save->prim[i].num_instances = 1;   

+

+   _mesa_install_save_vtxfmt( ctx, &save->vtxfmt );      

+   ctx->Driver.SaveNeedFlush = 1;

+   return GL_TRUE;

+}

+

+

+

+static void GLAPIENTRY _save_End( void )

+{

+   GET_CURRENT_CONTEXT( ctx ); 

+   struct vbo_save_context *save = &vbo_context(ctx)->save; 

+   GLint i = save->prim_count - 1;

+

+   ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;

+   save->prim[i].end = 1;

+   save->prim[i].count = (save->vert_count - 

+			  save->prim[i].start);

+

+   if (i == (GLint) save->prim_max - 1) {

+      _save_compile_vertex_list( ctx );

+      assert(save->copied.nr == 0);

+   }

+

+   /* Swap out this vertex format while outside begin/end.  Any color,

+    * etc. received between here and the next begin will be compiled

+    * as opcodes.

+    */   

+   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );

+}

+

+

+/* These are all errors as this vtxfmt is only installed inside

+ * begin/end pairs.

+ */

+static void GLAPIENTRY _save_DrawElements(GLenum mode, GLsizei count, GLenum type,

+			       const GLvoid *indices)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   (void) mode; (void) count; (void) type; (void) indices;

+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawElements" );

+}

+

+

+static void GLAPIENTRY _save_DrawRangeElements(GLenum mode,

+				    GLuint start, GLuint end,

+				    GLsizei count, GLenum type,

+				    const GLvoid *indices)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   (void) mode; (void) start; (void) end; (void) count; (void) type; (void) indices;

+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawRangeElements" );

+}

+

+static void GLAPIENTRY _save_DrawElementsBaseVertex(GLenum mode,

+						    GLsizei count,

+						    GLenum type,

+						    const GLvoid *indices,

+						    GLint basevertex)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   (void) mode; (void) count; (void) type; (void) indices; (void)basevertex;

+

+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawElements" );

+}

+

+static void GLAPIENTRY _save_DrawRangeElementsBaseVertex(GLenum mode,

+							 GLuint start,

+							 GLuint end,

+							 GLsizei count,

+							 GLenum type,

+							 const GLvoid *indices,

+							 GLint basevertex)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   (void) mode; (void) start; (void) end; (void) count; (void) type;

+   (void) indices; (void)basevertex;

+

+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawRangeElements" );

+}

+

+static void GLAPIENTRY _save_DrawArrays(GLenum mode, GLint start, GLsizei count)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   (void) mode; (void) start; (void) count;

+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawArrays" );

+}

+

+static void GLAPIENTRY _save_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   (void) x1; (void) y1; (void) x2; (void) y2;

+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glRectf" );

+}

+

+static void GLAPIENTRY _save_EvalMesh1( GLenum mode, GLint i1, GLint i2 )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   (void) mode; (void) i1; (void) i2;

+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glEvalMesh1" );

+}

+

+static void GLAPIENTRY _save_EvalMesh2( GLenum mode, GLint i1, GLint i2,

+				  GLint j1, GLint j2 )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   (void) mode; (void) i1; (void) i2; (void) j1; (void) j2;

+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glEvalMesh2" );

+}

+

+static void GLAPIENTRY _save_Begin( GLenum mode )

+{

+   GET_CURRENT_CONTEXT( ctx );

+   (void) mode;

+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "Recursive glBegin" );

+}

+

+

+static void GLAPIENTRY _save_PrimitiveRestartNV( void )

+{

+   GLenum curPrim;

+   GET_CURRENT_CONTEXT( ctx ); 

+

+   curPrim = ctx->Driver.CurrentSavePrimitive;

+

+   _save_End();

+   _save_Begin(curPrim);

+}

+

+

+/* Unlike the functions above, these are to be hooked into the vtxfmt

+ * maintained in ctx->ListState, active when the list is known or

+ * suspected to be outside any begin/end primitive.

+ */

+static void GLAPIENTRY _save_OBE_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   vbo_save_NotifyBegin( ctx, GL_QUADS | VBO_SAVE_PRIM_WEAK );

+   CALL_Vertex2f(GET_DISPATCH(), ( x1, y1 ));

+   CALL_Vertex2f(GET_DISPATCH(), ( x2, y1 ));

+   CALL_Vertex2f(GET_DISPATCH(), ( x2, y2 ));

+   CALL_Vertex2f(GET_DISPATCH(), ( x1, y2 ));

+   CALL_End(GET_DISPATCH(), ());

+}

+

+

+static void GLAPIENTRY _save_OBE_DrawArrays(GLenum mode, GLint start, GLsizei count)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+

+   if (!_mesa_validate_DrawArrays( ctx, mode, start, count ))

+      return;

+

+   _ae_map_vbos( ctx );

+

+   vbo_save_NotifyBegin( ctx, mode | VBO_SAVE_PRIM_WEAK | VBO_SAVE_PRIM_NO_CURRENT_UPDATE);

+

+   for (i = 0; i < count; i++)

+       CALL_ArrayElement(GET_DISPATCH(), (start + i));

+   CALL_End(GET_DISPATCH(), ());

+

+   _ae_unmap_vbos( ctx );

+}

+

+/* Could do better by copying the arrays and element list intact and

+ * then emitting an indexed prim at runtime.

+ */

+static void GLAPIENTRY _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum type,

+				   const GLvoid *indices)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+

+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices, 0 ))

+      return;

+

+   _ae_map_vbos( ctx );

+

+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj))

+      indices = ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Pointer, indices);

+

+   vbo_save_NotifyBegin( ctx, mode | VBO_SAVE_PRIM_WEAK | VBO_SAVE_PRIM_NO_CURRENT_UPDATE );

+

+   switch (type) {

+   case GL_UNSIGNED_BYTE:

+      for (i = 0 ; i < count ; i++)

+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLubyte *)indices)[i] ));

+      break;

+   case GL_UNSIGNED_SHORT:

+      for (i = 0 ; i < count ; i++)

+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLushort *)indices)[i] ));

+      break;

+   case GL_UNSIGNED_INT:

+      for (i = 0 ; i < count ; i++)

+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLuint *)indices)[i] ));

+      break;

+   default:

+      _mesa_error( ctx, GL_INVALID_ENUM, "glDrawElements(type)" );

+      break;

+   }

+

+   CALL_End(GET_DISPATCH(), ());

+

+   _ae_unmap_vbos( ctx );

+}

+

+static void GLAPIENTRY _save_OBE_DrawRangeElements(GLenum mode,

+					GLuint start, GLuint end,

+					GLsizei count, GLenum type,

+					const GLvoid *indices)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (_mesa_validate_DrawRangeElements( ctx, mode,

+					 start, end,

+					 count, type, indices, 0 ))

+      _save_OBE_DrawElements( mode, count, type, indices );

+}

+

+

+

+

+

+static void _save_vtxfmt_init( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+   GLvertexformat *vfmt = &save->vtxfmt;

+

+   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);

+

+   vfmt->Begin = _save_Begin;

+   vfmt->Color3f = _save_Color3f;

+   vfmt->Color3fv = _save_Color3fv;

+   vfmt->Color4f = _save_Color4f;

+   vfmt->Color4fv = _save_Color4fv;

+   vfmt->EdgeFlag = _save_EdgeFlag;

+   vfmt->End = _save_End;

+   vfmt->PrimitiveRestartNV = _save_PrimitiveRestartNV;

+   vfmt->FogCoordfEXT = _save_FogCoordfEXT;

+   vfmt->FogCoordfvEXT = _save_FogCoordfvEXT;

+   vfmt->Indexf = _save_Indexf;

+   vfmt->Indexfv = _save_Indexfv;

+   vfmt->Materialfv = _save_Materialfv;

+   vfmt->MultiTexCoord1fARB = _save_MultiTexCoord1f;

+   vfmt->MultiTexCoord1fvARB = _save_MultiTexCoord1fv;

+   vfmt->MultiTexCoord2fARB = _save_MultiTexCoord2f;

+   vfmt->MultiTexCoord2fvARB = _save_MultiTexCoord2fv;

+   vfmt->MultiTexCoord3fARB = _save_MultiTexCoord3f;

+   vfmt->MultiTexCoord3fvARB = _save_MultiTexCoord3fv;

+   vfmt->MultiTexCoord4fARB = _save_MultiTexCoord4f;

+   vfmt->MultiTexCoord4fvARB = _save_MultiTexCoord4fv;

+   vfmt->Normal3f = _save_Normal3f;

+   vfmt->Normal3fv = _save_Normal3fv;

+   vfmt->SecondaryColor3fEXT = _save_SecondaryColor3fEXT;

+   vfmt->SecondaryColor3fvEXT = _save_SecondaryColor3fvEXT;

+   vfmt->TexCoord1f = _save_TexCoord1f;

+   vfmt->TexCoord1fv = _save_TexCoord1fv;

+   vfmt->TexCoord2f = _save_TexCoord2f;

+   vfmt->TexCoord2fv = _save_TexCoord2fv;

+   vfmt->TexCoord3f = _save_TexCoord3f;

+   vfmt->TexCoord3fv = _save_TexCoord3fv;

+   vfmt->TexCoord4f = _save_TexCoord4f;

+   vfmt->TexCoord4fv = _save_TexCoord4fv;

+   vfmt->Vertex2f = _save_Vertex2f;

+   vfmt->Vertex2fv = _save_Vertex2fv;

+   vfmt->Vertex3f = _save_Vertex3f;

+   vfmt->Vertex3fv = _save_Vertex3fv;

+   vfmt->Vertex4f = _save_Vertex4f;

+   vfmt->Vertex4fv = _save_Vertex4fv;

+   vfmt->VertexAttrib1fARB = _save_VertexAttrib1fARB;

+   vfmt->VertexAttrib1fvARB = _save_VertexAttrib1fvARB;

+   vfmt->VertexAttrib2fARB = _save_VertexAttrib2fARB;

+   vfmt->VertexAttrib2fvARB = _save_VertexAttrib2fvARB;

+   vfmt->VertexAttrib3fARB = _save_VertexAttrib3fARB;

+   vfmt->VertexAttrib3fvARB = _save_VertexAttrib3fvARB;

+   vfmt->VertexAttrib4fARB = _save_VertexAttrib4fARB;

+   vfmt->VertexAttrib4fvARB = _save_VertexAttrib4fvARB;

+

+   vfmt->VertexAttrib1fNV = _save_VertexAttrib1fNV;

+   vfmt->VertexAttrib1fvNV = _save_VertexAttrib1fvNV;

+   vfmt->VertexAttrib2fNV = _save_VertexAttrib2fNV;

+   vfmt->VertexAttrib2fvNV = _save_VertexAttrib2fvNV;

+   vfmt->VertexAttrib3fNV = _save_VertexAttrib3fNV;

+   vfmt->VertexAttrib3fvNV = _save_VertexAttrib3fvNV;

+   vfmt->VertexAttrib4fNV = _save_VertexAttrib4fNV;

+   vfmt->VertexAttrib4fvNV = _save_VertexAttrib4fvNV;

+   

+   /* integer-valued */

+   vfmt->VertexAttribI1i = _save_VertexAttribI1i;

+   vfmt->VertexAttribI2i = _save_VertexAttribI2i;

+   vfmt->VertexAttribI3i = _save_VertexAttribI3i;

+   vfmt->VertexAttribI4i = _save_VertexAttribI4i;

+   vfmt->VertexAttribI2iv = _save_VertexAttribI2iv;

+   vfmt->VertexAttribI3iv = _save_VertexAttribI3iv;

+   vfmt->VertexAttribI4iv = _save_VertexAttribI4iv;

+

+   /* unsigned integer-valued */

+   vfmt->VertexAttribI1ui = _save_VertexAttribI1ui;

+   vfmt->VertexAttribI2ui = _save_VertexAttribI2ui;

+   vfmt->VertexAttribI3ui = _save_VertexAttribI3ui;

+   vfmt->VertexAttribI4ui = _save_VertexAttribI4ui;

+   vfmt->VertexAttribI2uiv = _save_VertexAttribI2uiv;

+   vfmt->VertexAttribI3uiv = _save_VertexAttribI3uiv;

+   vfmt->VertexAttribI4uiv = _save_VertexAttribI4uiv;

+

+   /* This will all require us to fallback to saving the list as opcodes:

+    */ 

+   _MESA_INIT_DLIST_VTXFMT(vfmt, _save_); /* inside begin/end */

+

+   _MESA_INIT_EVAL_VTXFMT(vfmt, _save_);

+

+   /* These are all errors as we at least know we are in some sort of

+    * begin/end pair:

+    */

+   vfmt->Begin = _save_Begin;

+   vfmt->Rectf = _save_Rectf;

+   vfmt->DrawArrays = _save_DrawArrays;

+   vfmt->DrawElements = _save_DrawElements;

+   vfmt->DrawRangeElements = _save_DrawRangeElements;

+   vfmt->DrawElementsBaseVertex = _save_DrawElementsBaseVertex;

+   vfmt->DrawRangeElementsBaseVertex = _save_DrawRangeElementsBaseVertex;

+   /* Loops back into vfmt->DrawElements */

+   vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;

+   vfmt->MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;

+}

+

+

+void vbo_save_SaveFlushVertices( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+

+   /* Noop when we are actually active:

+    */

+   if (ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM ||

+       ctx->Driver.CurrentSavePrimitive <= GL_POLYGON)

+      return;

+

+   if (save->vert_count ||

+       save->prim_count) 

+      _save_compile_vertex_list( ctx );

+   

+   _save_copy_to_current( ctx );

+   _save_reset_vertex( ctx );

+   _save_reset_counters( ctx );  

+   ctx->Driver.SaveNeedFlush = 0;

+}

+

+void vbo_save_NewList( struct gl_context *ctx, GLuint list, GLenum mode )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+

+   (void) list; (void) mode;

+

+   if (!save->prim_store)

+      save->prim_store = alloc_prim_store( ctx );

+

+   if (!save->vertex_store) 

+      save->vertex_store = alloc_vertex_store( ctx );

+      

+   save->buffer_ptr = map_vertex_store( ctx, save->vertex_store );

+   

+   _save_reset_vertex( ctx );

+   _save_reset_counters( ctx );  

+   ctx->Driver.SaveNeedFlush = 0;

+}

+

+void vbo_save_EndList( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+

+   /* EndList called inside a (saved) Begin/End pair?

+    */

+   if (ctx->Driver.CurrentSavePrimitive != PRIM_OUTSIDE_BEGIN_END) {

+

+      if (save->prim_count > 0) {

+         GLint i = save->prim_count - 1;

+         ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;

+         save->prim[i].end = 0;

+         save->prim[i].count = (save->vert_count - 

+                                save->prim[i].start);

+      }

+

+      /* Make sure this vertex list gets replayed by the "loopback"

+       * mechanism:

+       */

+      save->dangling_attr_ref = 1;

+      vbo_save_SaveFlushVertices( ctx );

+

+      /* Swap out this vertex format while outside begin/end.  Any color,

+       * etc. received between here and the next begin will be compiled

+       * as opcodes.

+       */   

+      _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );

+   }

+

+   unmap_vertex_store( ctx, save->vertex_store );

+

+   assert(save->vertex_size == 0);

+}

+ 

+void vbo_save_BeginCallList( struct gl_context *ctx, struct gl_display_list *dlist )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+   save->replay_flags |= dlist->Flags;

+}

+

+void vbo_save_EndCallList( struct gl_context *ctx )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+   

+   if (ctx->ListState.CallDepth == 1) {

+      /* This is correct: want to keep only the VBO_SAVE_FALLBACK

+       * flag, if it is set:

+       */

+      save->replay_flags &= VBO_SAVE_FALLBACK;

+   }

+}

+

+

+static void vbo_destroy_vertex_list( struct gl_context *ctx, void *data )

+{

+   struct vbo_save_vertex_list *node = (struct vbo_save_vertex_list *)data;

+   (void) ctx;

+

+   if ( --node->vertex_store->refcount == 0 ) 

+      free_vertex_store( ctx, node->vertex_store );

+

+   if ( --node->prim_store->refcount == 0 )

+      FREE( node->prim_store );

+

+   if (node->current_data) {

+      FREE(node->current_data);

+      node->current_data = NULL;

+   }

+}

+

+

+static void vbo_print_vertex_list( struct gl_context *ctx, void *data )

+{

+   struct vbo_save_vertex_list *node = (struct vbo_save_vertex_list *)data;

+   GLuint i;

+   (void) ctx;

+

+   printf("VBO-VERTEX-LIST, %u vertices %d primitives, %d vertsize\n",

+	  node->count,

+	  node->prim_count,

+	  node->vertex_size);

+

+   for (i = 0 ; i < node->prim_count ; i++) {

+      struct _mesa_prim *prim = &node->prim[i];

+      _mesa_debug(NULL, "   prim %d: %s%s %d..%d %s %s\n",

+		  i, 

+		  _mesa_lookup_prim_by_nr(prim->mode),

+		  prim->weak ? " (weak)" : "",

+		  prim->start, 

+		  prim->start + prim->count,

+		  (prim->begin) ? "BEGIN" : "(wrap)",

+		  (prim->end) ? "END" : "(wrap)");

+   }

+}

+

+

+static void _save_current_init( struct gl_context *ctx ) 

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+   GLint i;

+

+   for (i = VBO_ATTRIB_POS; i <= VBO_ATTRIB_GENERIC15; i++) {

+      const GLuint j = i - VBO_ATTRIB_POS;

+      ASSERT(j < VERT_ATTRIB_MAX);

+      save->currentsz[i] = &ctx->ListState.ActiveAttribSize[j];

+      save->current[i] = ctx->ListState.CurrentAttrib[j];

+   }

+

+   for (i = VBO_ATTRIB_FIRST_MATERIAL; i <= VBO_ATTRIB_LAST_MATERIAL; i++) {

+      const GLuint j = i - VBO_ATTRIB_FIRST_MATERIAL;

+      ASSERT(j < MAT_ATTRIB_MAX);

+      save->currentsz[i] = &ctx->ListState.ActiveMaterialSize[j];

+      save->current[i] = ctx->ListState.CurrentMaterial[j];

+   }

+}

+

+/**

+ * Initialize the display list compiler

+ */

+void vbo_save_api_init( struct vbo_save_context *save )

+{

+   struct gl_context *ctx = save->ctx;

+   GLuint i;

+

+   save->opcode_vertex_list =

+      _mesa_dlist_alloc_opcode( ctx,

+                                sizeof(struct vbo_save_vertex_list),

+                                vbo_save_playback_vertex_list,

+                                vbo_destroy_vertex_list,

+                                vbo_print_vertex_list );

+

+   ctx->Driver.NotifySaveBegin = vbo_save_NotifyBegin;

+

+   _save_vtxfmt_init( ctx );

+   _save_current_init( ctx );

+

+   /* These will actually get set again when binding/drawing */

+   for (i = 0; i < VBO_ATTRIB_MAX; i++)

+      save->inputs[i] = &save->arrays[i];

+

+   /* Hook our array functions into the outside-begin-end vtxfmt in 

+    * ctx->ListState.

+    */

+   ctx->ListState.ListVtxfmt.Rectf = _save_OBE_Rectf;

+   ctx->ListState.ListVtxfmt.DrawArrays = _save_OBE_DrawArrays;

+   ctx->ListState.ListVtxfmt.DrawElements = _save_OBE_DrawElements;

+   ctx->ListState.ListVtxfmt.DrawRangeElements = _save_OBE_DrawRangeElements;

+   /* loops back into _save_OBE_DrawElements */

+   ctx->ListState.ListVtxfmt.MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;

+   ctx->ListState.ListVtxfmt.MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;

+   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );

+}

+

+

+#endif /* FEATURE_dlist */

diff --git a/mesalib/src/mesa/vbo/vbo_save_draw.c b/mesalib/src/mesa/vbo/vbo_save_draw.c
index 634a6d3f8..5a19b0d62 100644
--- a/mesalib/src/mesa/vbo/vbo_save_draw.c
+++ b/mesalib/src/mesa/vbo/vbo_save_draw.c
@@ -1,305 +1,305 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.2
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- *
- * 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
- * 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.
- */
-
-/* Author:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/mfeatures.h"
-#include "main/mtypes.h"
-#include "main/macros.h"
-#include "main/light.h"
-#include "main/state.h"
-
-#include "vbo_context.h"
-
-
-#if FEATURE_dlist
-
-
-/**
- * After playback, copy everything but the position from the
- * last vertex to the saved state
- */
-static void
-_playback_copy_to_current(struct gl_context *ctx,
-                          const struct vbo_save_vertex_list *node)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   GLfloat vertex[VBO_ATTRIB_MAX * 4];
-   GLfloat *data;
-   GLuint i, offset;
-
-   if (node->current_size == 0)
-      return;
-
-   if (node->current_data) {
-      data = node->current_data;
-   }
-   else {
-      data = vertex;
-
-      if (node->count)
-         offset = (node->buffer_offset + 
-                   (node->count-1) * node->vertex_size * sizeof(GLfloat));
-      else
-         offset = node->buffer_offset;
-
-      ctx->Driver.GetBufferSubData( ctx, 0, offset, 
-                                    node->vertex_size * sizeof(GLfloat), 
-                                    data, node->vertex_store->bufferobj );
-
-      data += node->attrsz[0]; /* skip vertex position */
-   }
-
-   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {
-      if (node->attrsz[i]) {
-	 GLfloat *current = (GLfloat *)vbo->currval[i].Ptr;
-         GLfloat tmp[4];
-
-         COPY_CLEAN_4V(tmp, 
-                       node->attrsz[i], 
-                       data);
-         
-         if (memcmp(current, tmp, 4 * sizeof(GLfloat)) != 0) {
-            memcpy(current, tmp, 4 * sizeof(GLfloat));
-
-            vbo->currval[i].Size = node->attrsz[i];
-
-            if (i >= VBO_ATTRIB_FIRST_MATERIAL &&
-                i <= VBO_ATTRIB_LAST_MATERIAL)
-               ctx->NewState |= _NEW_LIGHT;
-
-            ctx->NewState |= _NEW_CURRENT_ATTRIB;
-         }
-
-	 data += node->attrsz[i];
-      }
-   }
-
-   /* Colormaterial -- this kindof sucks.
-    */
-   if (ctx->Light.ColorMaterialEnabled) {
-      _mesa_update_color_material(ctx, ctx->Current.Attrib[VBO_ATTRIB_COLOR0]);
-   }
-
-   /* CurrentExecPrimitive
-    */
-   if (node->prim_count) {
-      const struct _mesa_prim *prim = &node->prim[node->prim_count - 1];
-      if (prim->end)
-	 ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;
-      else
-	 ctx->Driver.CurrentExecPrimitive = prim->mode;
-   }
-}
-
-
-
-/**
- * Treat the vertex storage as a VBO, define vertex arrays pointing
- * into it:
- */
-static void vbo_bind_vertex_list(struct gl_context *ctx,
-                                 const struct vbo_save_vertex_list *node)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_save_context *save = &vbo->save;
-   struct gl_client_array *arrays = save->arrays;
-   GLuint buffer_offset = node->buffer_offset;
-   const GLuint *map;
-   GLuint attr;
-   GLubyte node_attrsz[VBO_ATTRIB_MAX];  /* copy of node->attrsz[] */
-   GLbitfield varying_inputs = 0x0;
-
-   memcpy(node_attrsz, node->attrsz, sizeof(node->attrsz));
-
-   /* Install the default (ie Current) attributes first, then overlay
-    * all active ones.
-    */
-   switch (get_program_mode(ctx)) {
-   case VP_NONE:
-      for (attr = 0; attr < 16; attr++) {
-         save->inputs[attr] = &vbo->legacy_currval[attr];
-      }
-      for (attr = 0; attr < MAT_ATTRIB_MAX; attr++) {
-         save->inputs[attr + 16] = &vbo->mat_currval[attr];
-      }
-      map = vbo->map_vp_none;
-      break;
-   case VP_NV:
-   case VP_ARB:
-      /* The aliasing of attributes for NV vertex programs has already
-       * occurred.  NV vertex programs cannot access material values,
-       * nor attributes greater than VERT_ATTRIB_TEX7.  
-       */
-      for (attr = 0; attr < 16; attr++) {
-         save->inputs[attr] = &vbo->legacy_currval[attr];
-         save->inputs[attr + 16] = &vbo->generic_currval[attr];
-      }
-      map = vbo->map_vp_arb;
-
-      /* check if VERT_ATTRIB_POS is not read but VERT_BIT_GENERIC0 is read.
-       * In that case we effectively need to route the data from
-       * glVertexAttrib(0, val) calls to feed into the GENERIC0 input.
-       */
-      if ((ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_POS) == 0 &&
-          (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) {
-         save->inputs[16] = save->inputs[0];
-         node_attrsz[16] = node_attrsz[0];
-         node_attrsz[0] = 0;
-      }
-      break;
-   default:
-      assert(0);
-   }
-
-   for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {
-      const GLuint src = map[attr];
-
-      if (node_attrsz[src]) {
-         /* override the default array set above */
-         save->inputs[attr] = &arrays[attr];
-
-	 arrays[attr].Ptr = (const GLubyte *) NULL + buffer_offset;
-	 arrays[attr].Size = node->attrsz[src];
-	 arrays[attr].StrideB = node->vertex_size * sizeof(GLfloat);
-	 arrays[attr].Stride = node->vertex_size * sizeof(GLfloat);
-	 arrays[attr].Type = GL_FLOAT;
-         arrays[attr].Format = GL_RGBA;
-	 arrays[attr].Enabled = 1;
-         _mesa_reference_buffer_object(ctx,
-                                       &arrays[attr].BufferObj,
-                                       node->vertex_store->bufferobj);
-	 arrays[attr]._MaxElement = node->count; /* ??? */
-	 
-	 assert(arrays[attr].BufferObj->Name);
-
-	 buffer_offset += node->attrsz[src] * sizeof(GLfloat);
-         varying_inputs |= 1<<attr;
-         ctx->NewState |= _NEW_ARRAY;
-      }
-   }
-
-   _mesa_set_varying_vp_inputs( ctx, varying_inputs );
-}
-
-
-static void
-vbo_save_loopback_vertex_list(struct gl_context *ctx,
-                              const struct vbo_save_vertex_list *list)
-{
-   const char *buffer = ctx->Driver.MapBuffer(ctx, 
-					      GL_ARRAY_BUFFER_ARB, 
-					      GL_READ_ONLY, /* ? */
-                                              list->vertex_store->bufferobj);
-
-   vbo_loopback_vertex_list(ctx,
-                            (const GLfloat *)(buffer + list->buffer_offset),
-                            list->attrsz,
-                            list->prim,
-                            list->prim_count,
-                            list->wrap_count,
-                            list->vertex_size);
-
-   ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER_ARB, 
-			   list->vertex_store->bufferobj);
-}
-
-
-/**
- * Execute the buffer and save copied verts.
- * This is called from the display list code when executing
- * a drawing command.
- */
-void
-vbo_save_playback_vertex_list(struct gl_context *ctx, void *data)
-{
-   const struct vbo_save_vertex_list *node =
-      (const struct vbo_save_vertex_list *) data;
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-
-   FLUSH_CURRENT(ctx, 0);
-
-   if (node->prim_count > 0 && node->count > 0) {
-
-      if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END &&
-	  node->prim[0].begin) {
-
-	 /* Degenerate case: list is called inside begin/end pair and
-	  * includes operations such as glBegin or glDrawArrays.
-	  */
-	 if (0)
-	    printf("displaylist recursive begin");
-
-	 vbo_save_loopback_vertex_list( ctx, node );
-	 return;
-      }
-      else if (save->replay_flags) {
-	 /* Various degnerate cases: translate into immediate mode
-	  * calls rather than trying to execute in place.
-	  */
-	 vbo_save_loopback_vertex_list( ctx, node );
-	 return;
-      }
-      
-      if (ctx->NewState)
-	 _mesa_update_state( ctx );
-
-      /* XXX also need to check if shader enabled, but invalid */
-      if ((ctx->VertexProgram.Enabled && !ctx->VertexProgram._Enabled) ||
-          (ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glBegin (invalid vertex/fragment program)");
-         return;
-      }
-
-      vbo_bind_vertex_list( ctx, node );
-
-      /* Again...
-       */
-      if (ctx->NewState)
-	 _mesa_update_state( ctx );
-
-      vbo_context(ctx)->draw_prims(ctx, 
-                                   save->inputs, 
-                                   node->prim, 
-                                   node->prim_count,
-                                   NULL,
-                                   GL_TRUE,
-                                   0,	/* Node is a VBO, so this is ok */
-                                   node->count - 1);
-   }
-
-   /* Copy to current?
-    */
-   _playback_copy_to_current( ctx, node );
-}
-
-
-#endif /* FEATURE_dlist */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.2

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ *

+ * 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

+ * 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.

+ */

+

+/* Author:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+#include "main/glheader.h"

+#include "main/bufferobj.h"

+#include "main/context.h"

+#include "main/imports.h"

+#include "main/mfeatures.h"

+#include "main/mtypes.h"

+#include "main/macros.h"

+#include "main/light.h"

+#include "main/state.h"

+

+#include "vbo_context.h"

+

+

+#if FEATURE_dlist

+

+

+/**

+ * After playback, copy everything but the position from the

+ * last vertex to the saved state

+ */

+static void

+_playback_copy_to_current(struct gl_context *ctx,

+                          const struct vbo_save_vertex_list *node)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   GLfloat vertex[VBO_ATTRIB_MAX * 4];

+   GLfloat *data;

+   GLuint i, offset;

+

+   if (node->current_size == 0)

+      return;

+

+   if (node->current_data) {

+      data = node->current_data;

+   }

+   else {

+      data = vertex;

+

+      if (node->count)

+         offset = (node->buffer_offset + 

+                   (node->count-1) * node->vertex_size * sizeof(GLfloat));

+      else

+         offset = node->buffer_offset;

+

+      ctx->Driver.GetBufferSubData( ctx, 0, offset, 

+                                    node->vertex_size * sizeof(GLfloat), 

+                                    data, node->vertex_store->bufferobj );

+

+      data += node->attrsz[0]; /* skip vertex position */

+   }

+

+   for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {

+      if (node->attrsz[i]) {

+	 GLfloat *current = (GLfloat *)vbo->currval[i].Ptr;

+         GLfloat tmp[4];

+

+         COPY_CLEAN_4V(tmp, 

+                       node->attrsz[i], 

+                       data);

+         

+         if (memcmp(current, tmp, 4 * sizeof(GLfloat)) != 0) {

+            memcpy(current, tmp, 4 * sizeof(GLfloat));

+

+            vbo->currval[i].Size = node->attrsz[i];

+

+            if (i >= VBO_ATTRIB_FIRST_MATERIAL &&

+                i <= VBO_ATTRIB_LAST_MATERIAL)

+               ctx->NewState |= _NEW_LIGHT;

+

+            ctx->NewState |= _NEW_CURRENT_ATTRIB;

+         }

+

+	 data += node->attrsz[i];

+      }

+   }

+

+   /* Colormaterial -- this kindof sucks.

+    */

+   if (ctx->Light.ColorMaterialEnabled) {

+      _mesa_update_color_material(ctx, ctx->Current.Attrib[VBO_ATTRIB_COLOR0]);

+   }

+

+   /* CurrentExecPrimitive

+    */

+   if (node->prim_count) {

+      const struct _mesa_prim *prim = &node->prim[node->prim_count - 1];

+      if (prim->end)

+	 ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;

+      else

+	 ctx->Driver.CurrentExecPrimitive = prim->mode;

+   }

+}

+

+

+

+/**

+ * Treat the vertex storage as a VBO, define vertex arrays pointing

+ * into it:

+ */

+static void vbo_bind_vertex_list(struct gl_context *ctx,

+                                 const struct vbo_save_vertex_list *node)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct vbo_save_context *save = &vbo->save;

+   struct gl_client_array *arrays = save->arrays;

+   GLuint buffer_offset = node->buffer_offset;

+   const GLuint *map;

+   GLuint attr;

+   GLubyte node_attrsz[VBO_ATTRIB_MAX];  /* copy of node->attrsz[] */

+   GLbitfield varying_inputs = 0x0;

+

+   memcpy(node_attrsz, node->attrsz, sizeof(node->attrsz));

+

+   /* Install the default (ie Current) attributes first, then overlay

+    * all active ones.

+    */

+   switch (get_program_mode(ctx)) {

+   case VP_NONE:

+      for (attr = 0; attr < 16; attr++) {

+         save->inputs[attr] = &vbo->legacy_currval[attr];

+      }

+      for (attr = 0; attr < MAT_ATTRIB_MAX; attr++) {

+         save->inputs[attr + 16] = &vbo->mat_currval[attr];

+      }

+      map = vbo->map_vp_none;

+      break;

+   case VP_NV:

+   case VP_ARB:

+      /* The aliasing of attributes for NV vertex programs has already

+       * occurred.  NV vertex programs cannot access material values,

+       * nor attributes greater than VERT_ATTRIB_TEX7.  

+       */

+      for (attr = 0; attr < 16; attr++) {

+         save->inputs[attr] = &vbo->legacy_currval[attr];

+         save->inputs[attr + 16] = &vbo->generic_currval[attr];

+      }

+      map = vbo->map_vp_arb;

+

+      /* check if VERT_ATTRIB_POS is not read but VERT_BIT_GENERIC0 is read.

+       * In that case we effectively need to route the data from

+       * glVertexAttrib(0, val) calls to feed into the GENERIC0 input.

+       */

+      if ((ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_POS) == 0 &&

+          (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) {

+         save->inputs[16] = save->inputs[0];

+         node_attrsz[16] = node_attrsz[0];

+         node_attrsz[0] = 0;

+      }

+      break;

+   default:

+      assert(0);

+   }

+

+   for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {

+      const GLuint src = map[attr];

+

+      if (node_attrsz[src]) {

+         /* override the default array set above */

+         save->inputs[attr] = &arrays[attr];

+

+	 arrays[attr].Ptr = (const GLubyte *) NULL + buffer_offset;

+	 arrays[attr].Size = node->attrsz[src];

+	 arrays[attr].StrideB = node->vertex_size * sizeof(GLfloat);

+	 arrays[attr].Stride = node->vertex_size * sizeof(GLfloat);

+	 arrays[attr].Type = GL_FLOAT;

+         arrays[attr].Format = GL_RGBA;

+	 arrays[attr].Enabled = 1;

+         _mesa_reference_buffer_object(ctx,

+                                       &arrays[attr].BufferObj,

+                                       node->vertex_store->bufferobj);

+	 arrays[attr]._MaxElement = node->count; /* ??? */

+	 

+	 assert(arrays[attr].BufferObj->Name);

+

+	 buffer_offset += node->attrsz[src] * sizeof(GLfloat);

+         varying_inputs |= 1<<attr;

+         ctx->NewState |= _NEW_ARRAY;

+      }

+   }

+

+   _mesa_set_varying_vp_inputs( ctx, varying_inputs );

+}

+

+

+static void

+vbo_save_loopback_vertex_list(struct gl_context *ctx,

+                              const struct vbo_save_vertex_list *list)

+{

+   const char *buffer = ctx->Driver.MapBuffer(ctx, 

+					      GL_ARRAY_BUFFER_ARB, 

+					      GL_READ_ONLY, /* ? */

+                                              list->vertex_store->bufferobj);

+

+   vbo_loopback_vertex_list(ctx,

+                            (const GLfloat *)(buffer + list->buffer_offset),

+                            list->attrsz,

+                            list->prim,

+                            list->prim_count,

+                            list->wrap_count,

+                            list->vertex_size);

+

+   ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER_ARB, 

+			   list->vertex_store->bufferobj);

+}

+

+

+/**

+ * Execute the buffer and save copied verts.

+ * This is called from the display list code when executing

+ * a drawing command.

+ */

+void

+vbo_save_playback_vertex_list(struct gl_context *ctx, void *data)

+{

+   const struct vbo_save_vertex_list *node =

+      (const struct vbo_save_vertex_list *) data;

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+

+   FLUSH_CURRENT(ctx, 0);

+

+   if (node->prim_count > 0 && node->count > 0) {

+

+      if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END &&

+	  node->prim[0].begin) {

+

+	 /* Degenerate case: list is called inside begin/end pair and

+	  * includes operations such as glBegin or glDrawArrays.

+	  */

+	 if (0)

+	    printf("displaylist recursive begin");

+

+	 vbo_save_loopback_vertex_list( ctx, node );

+	 return;

+      }

+      else if (save->replay_flags) {

+	 /* Various degnerate cases: translate into immediate mode

+	  * calls rather than trying to execute in place.

+	  */

+	 vbo_save_loopback_vertex_list( ctx, node );

+	 return;

+      }

+      

+      if (ctx->NewState)

+	 _mesa_update_state( ctx );

+

+      /* XXX also need to check if shader enabled, but invalid */

+      if ((ctx->VertexProgram.Enabled && !ctx->VertexProgram._Enabled) ||

+          (ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glBegin (invalid vertex/fragment program)");

+         return;

+      }

+

+      vbo_bind_vertex_list( ctx, node );

+

+      /* Again...

+       */

+      if (ctx->NewState)

+	 _mesa_update_state( ctx );

+

+      vbo_context(ctx)->draw_prims(ctx, 

+                                   save->inputs, 

+                                   node->prim, 

+                                   node->prim_count,

+                                   NULL,

+                                   GL_TRUE,

+                                   0,	/* Node is a VBO, so this is ok */

+                                   node->count - 1);

+   }

+

+   /* Copy to current?

+    */

+   _playback_copy_to_current( ctx, node );

+}

+

+

+#endif /* FEATURE_dlist */

diff --git a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
deleted file mode 100644
index 220923f90..000000000
--- a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
+++ /dev/null
@@ -1,445 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="gdi"

-	ProjectGUID="{A1B24907-E196-4826-B6AF-26723629B633}"

-	RootNamespace="gdi"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/gdi.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				BrowseInformation="1"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OPENGL32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/gdi.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release/gdi.pch"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OPENGL32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug Static CRT|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/gdi.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;BUILD_GL32;MESA_MINWARN"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				BrowseInformation="1"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OPENGL32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release Static CRT|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/gdi.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;BUILD_GL32;MESA_MINWARN"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release/gdi.pch"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				CompileAs="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OPENGL32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-			>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\common\meta.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

-			>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\common\meta.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\include\GL\wmesa.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
index 6e9aef2e1..3fed6b466 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="9,00"

 	Name="glsl_apps_compile"

 	ProjectGUID="{98AB3D51-1820-4D14-9195-75FCA6997784}"

 	RootNamespace="glsl_apps_compile"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -64,6 +65,8 @@
 				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				SubSystem="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -85,9 +88,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="copy &quot;$(OutDir)\compile.exe&quot; ..\..\..\..\src\glsl\apps"

 			/>

@@ -141,6 +141,8 @@
 				SubSystem="1"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -162,9 +164,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="copy &quot;$(OutDir)\compile.exe&quot; ..\..\..\..\src\glsl\apps"

 			/>

diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
new file mode 100644
index 000000000..c34f08e20
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{98AB3D51-1820-4D14-9195-75FCA6997784}</ProjectGuid>

+    <RootNamespace>glsl_apps_compile</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">compile</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">compile</TargetName>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include</AdditionalIncludeDirectories>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include</AdditionalIncludeDirectories>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\main.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ralloc.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\strtod.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll">

+      <FileType>Document</FileType>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs>

+    </CustomBuild>

+    <None Include="..\..\..\..\src\glsl\glsl_parser.yy">

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\dobison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\dobison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>

+      <FileType>Document</FileType>

+    </None>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
new file mode 100644
index 000000000..57c32b876
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\main.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ralloc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\strtod.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h">

+      <Filter>Source Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll">

+      <Filter>Source Files</Filter>

+    </CustomBuild>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\glsl\glsl_parser.yy">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/glu/glu.vcproj b/mesalib/windows/VC8/mesa/glu/glu.vcproj
deleted file mode 100644
index b3b4b10d7..000000000
--- a/mesalib/windows/VC8/mesa/glu/glu.vcproj
+++ /dev/null
@@ -1,1202 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="glu"

-	ProjectGUID="{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"

-	RootNamespace="glu"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/glu.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				OutputFile="$(OutDir)\GLU32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

-				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/glu.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				OutputFile="$(OutDir)\GLU32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug Static CRT|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/glu.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				OutputFile="$(OutDir)\GLU32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release Static CRT|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/glu.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				OutputFile="$(OutDir)\GLU32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

-				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-			>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\error.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\glu.def"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\glue.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\mipmap.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c"

-				>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Static CRT|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Static CRT|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\project.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\quad.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\registry.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\render.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

-			>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict-list.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\gluint.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\include\gluos.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\render.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\types.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="C++ files"

-			Filter=".cc"

-			>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\README"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-			>

-		</Filter>

-		<File

-			RelativePath="..\..\..\..\src\glu\sgi\libtess\alg-outline"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile
new file mode 100644
index 000000000..727065a40
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/makefile
@@ -0,0 +1,58 @@
+ifdef VS2008

+MHMAKESLNFILE=mesa.sln

+BUILDCMD=vcbuild $(MHMAKESLNFILE)

+else

+MHMAKESLNFILE=mesavc10.sln

+BUILDCMD=devenv.com $(MHMAKESLNFILE) /build

+endif

+

+DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \

+      $(wildcard ..\..\..\src\mesa\swrast\*.h) \

+      $(wildcard ..\..\..\src\mesa\swrast_setup\*.c) \

+      $(wildcard ..\..\..\src\mesa\swrast_setup\*.h) \

+      $(wildcard ..\..\..\src\mesa\main\*.c) \

+      $(wildcard ..\..\..\src\mesa\main\*.h) \

+      $(wildcard ..\..\..\src\mesa\math\*.c) \

+      $(wildcard ..\..\..\src\mesa\math\*.h) \

+      $(wildcard ..\..\..\src\mesa\program\*.c) \

+      $(wildcard ..\..\..\src\mesa\program\*.cpp) \

+      $(wildcard ..\..\..\src\mesa\program\*.h) \

+      $(wildcard ..\..\..\src\mesa\shader\*.c) \

+      $(wildcard ..\..\..\src\mesa\shader\*.h) \

+      $(wildcard ..\..\..\src\mesa\shader\slang\*.c) \

+      $(wildcard ..\..\..\src\mesa\shader\slang\*.h) \

+      $(wildcard ..\..\..\src\mesa\shader\slang\library\*.c) \

+      $(wildcard ..\..\..\src\mesa\shader\slang\library\*.h) \

+      $(wildcard ..\..\..\src\mesa\glapi\*.c) \

+      $(wildcard ..\..\..\src\mesa\glapi\*.h) \

+      $(wildcard ..\..\..\src\mesa\math\*.c) \

+      $(wildcard ..\..\..\src\mesa\math\*.h) \

+      $(wildcard ..\..\..\src\mesa\tnl\*.c) \

+      $(wildcard ..\..\..\src\mesa\tnl\*.h) \

+      $(wildcard ..\..\..\src\mesa\vbo\*.c) \

+      $(wildcard ..\..\..\src\mesa\vbo\*.h) \

+      $(wildcard ..\..\..\src\glsl\glcpp\*.c) \

+      $(wildcard ..\..\..\src\glsl\glcpp\*.h) \

+      $(wildcard ..\..\..\src\glsl\*.c) \

+      $(wildcard ..\..\..\src\glsl\*.h) \

+      $(wildcard ..\..\..\src\glsl\*.cpp) \

+      $(wildcard ..\..\..\src\mesa\drivers\dri\swrast\*.c) \

+      $(wildcard ..\..\..\src\mesa\drivers\dri\swrast\*.h) \

+      $(wildcard ..\..\..\src\mesa\drivers\dri\common\*.c) \

+      $(wildcard ..\..\..\src\mesa\drivers\dri\common\*.h) \

+      $(wildcard ..\..\..\src\mesa\drivers\common\*.c) \

+      $(wildcard ..\..\..\src\mesa\drivers\common\*.h)

+

+all: Release\swrast_dri.dll Debug\swrast_dri.dll

+

+Debug\swrast_dri.dll: $(DEPS)

+	$(BUILDCMD) "Debug|Win32" 

+

+Release\swrast_dri.dll: $(DEPS)

+	$(BUILDCMD) "Release|Win32" 

+

+clean: cleanthis

+

+cleanthis:

+	del -e Debug

+	del -e Release

diff --git a/mesalib/windows/VC8/mesa/mesa.sln b/mesalib/windows/VC8/mesa/mesa.sln
index 915e00026..9d232353b 100644
--- a/mesalib/windows/VC8/mesa/mesa.sln
+++ b/mesalib/windows/VC8/mesa/mesa.sln
@@ -1,27 +1,17 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcproj", "{A1B24907-E196-4826-B6AF-26723629B633}"

-	ProjectSection(ProjectDependencies) = postProject

-		{2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcproj", "{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A1B24907-E196-4826-B6AF-26723629B633} = {A1B24907-E196-4826-B6AF-26723629B633}

-	EndProjectSection

-EndProject

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual C++ Express 2008

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"

 	ProjectSection(ProjectDependencies) = postProject

 		{98AB3D51-1820-4D14-9195-75FCA6997784} = {98AB3D51-1820-4D14-9195-75FCA6997784}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glsl_apps_compile", "glsl_apps_compile\glsl_apps_compile.vcproj", "{98AB3D51-1820-4D14-9195-75FCA6997784}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swrast_dri", "swrast_dri\swrast_dri.vcproj", "{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}"

 	ProjectSection(ProjectDependencies) = postProject

-		{A1B24907-E196-4826-B6AF-26723629B633} = {A1B24907-E196-4826-B6AF-26723629B633}

+		{2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glsl_apps_compile", "glsl_apps_compile\glsl_apps_compile.vcproj", "{98AB3D51-1820-4D14-9195-75FCA6997784}"

-EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug Static CRT|Win32 = Debug Static CRT|Win32

@@ -31,21 +21,13 @@ Global
 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

 		{A1B24907-E196-4826-B6AF-26723629B633}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32

-		{A1B24907-E196-4826-B6AF-26723629B633}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32

 		{A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.Build.0 = Debug|Win32

 		{A1B24907-E196-4826-B6AF-26723629B633}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32

-		{A1B24907-E196-4826-B6AF-26723629B633}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32

 		{A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.ActiveCfg = Release|Win32

-		{A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.Build.0 = Release|Win32

 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32

-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32

 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.Build.0 = Debug|Win32

 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32

-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32

 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.ActiveCfg = Release|Win32

-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.Build.0 = Release|Win32

 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32

 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32

 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.ActiveCfg = Debug|Win32

@@ -55,13 +37,17 @@ Global
 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.ActiveCfg = Release|Win32

 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.Build.0 = Release|Win32

 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32

-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32

 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.Build.0 = Debug|Win32

 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32

-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32

 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.ActiveCfg = Release|Win32

-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.Build.0 = Release|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.ActiveCfg = Debug|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.Build.0 = Debug|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.ActiveCfg = Release|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.Build.0 = Release|Win32

 		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.ActiveCfg = Debug|Win32

 		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.Build.0 = Debug|Win32

 		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.ActiveCfg = Debug|Win32

diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
index 5a5b93a77..eb78e6c60 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="9,00"

 	Name="mesa"

 	ProjectGUID="{2120C974-2717-4709-B44F-D6E6D0A56448}"

 	RootNamespace="mesa"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -46,9 +47,11 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/Zm1000 "

-				InlineFunctionExpansion="1"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				StringPooling="true"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

@@ -123,7 +126,7 @@
 				AdditionalOptions="/Zm1000 "

 				Optimization="0"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				BrowseInformation="1"

@@ -198,7 +201,7 @@
 				AdditionalOptions="/Zm1000 "

 				Optimization="0"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				BrowseInformation="1"

@@ -271,12 +274,17 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/Zm1000 "

-				InlineFunctionExpansion="1"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				StringPooling="true"

+				ExceptionHandling="0"

 				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

 				EnableFunctionLevelLinking="true"

+				EnableEnhancedInstructionSet="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

@@ -519,6 +527,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\shader\hash_table.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\hint.c"

 				>

 			</File>

@@ -571,6 +583,42 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\shader\lex.yy.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YY_NO_UNISTD_H"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YY_NO_UNISTD_H"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug Static CRT|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YY_NO_UNISTD_H"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Static CRT|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YY_NO_UNISTD_H"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\light.c"

 				>

 			</File>

@@ -759,10 +807,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\remap.c"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.c"

 				>

 			</File>

@@ -1051,6 +1095,14 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\shader\symbol_table.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\main\syncobj.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\syncobj.c"

 				>

 			</File>

diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
new file mode 100644
index 000000000..136d45652
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{2120C974-2717-4709-B44F-D6E6D0A56448}</ProjectGuid>

+    <RootNamespace>mesa</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

+    <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PreBuildEventUseInBuild>

+    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PreLinkEventUseInBuild>

+    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Lib>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Lib>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\glsl_apps_compile\glsl_apps_compile.vcxproj">

+      <Project>{98ab3d51-1820-4d14-9195-75fca6997784}</Project>

+      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>

+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </ForcedIncludeFiles>

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </ForcedIncludeFiles>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp">

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </ForcedIncludeFiles>

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </ForcedIncludeFiles>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ralloc.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\strtod.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\accum.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_exec.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_loopback.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_noop.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\nvprogram.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\pack.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\transformfeedback.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\uniforms.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\arbprogparse.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\blend.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\buffers.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\ff_fragment_shader.cpp" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\clear.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\clip.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\colortab.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\condrender.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\context.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\convolve.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\cpuinfo.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\debug.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\depth.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\depthstencil.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\dlist.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\dlopen.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\drawpix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\enable.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\enums.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\eval.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\execmem.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\extensions.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texturebarrier.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\feedback.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\fog.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\formats.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\get.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\hash.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\ir_to_mesa.cpp" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\nvfragparse.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\nvvertparse.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\program.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\programopt.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse.tab.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse_extra.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_cache.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_execute.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_instruction.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_noise.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_optimize.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter_layout.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_uniform.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\register_allocate.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\hint.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\image.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\light.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\lines.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\mm.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\pbo.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\points.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\shared.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\state.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_rgtc.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texfetch.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texrender.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\varray.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\version.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l">

+      <FileType>Document</FileType>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs>

+    </CustomBuild>

+    <None Include="..\..\..\..\src\mesa\program\program_parse.y">

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\dobison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\dobison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

+      <FileType>Document</FileType>

+    </None>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
new file mode 100644
index 000000000..48e05317c
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -0,0 +1,684 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{8411a2f0-9621-4bb9-9aec-30713df37794}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{82940400-de84-4aa3-8c90-a68fc32ae059}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_exec.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_loopback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_noop.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\blend.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\ff_fragment_shader.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\buffers.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\clear.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\clip.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\colortab.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\condrender.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\context.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\convolve.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\cpuinfo.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\debug.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\depth.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\depthstencil.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\dlist.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\dlopen.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\drawpix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\enable.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\enums.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\eval.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\execmem.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\extensions.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texturebarrier.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\feedback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\fog.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\formats.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\get.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\hash.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\hint.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\image.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\light.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\lines.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\mm.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\points.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\shared.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\state.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texfetch.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texrender.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\varray.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\version.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\arbprogparse.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\programopt.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_uniform.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\program.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse_extra.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_cache.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_execute.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_instruction.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_noise.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_optimize.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter_layout.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\nvfragparse.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\nvvertparse.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\nvprogram.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse.tab.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\transformfeedback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\accum.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\uniforms.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\ir_to_mesa.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ralloc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\pack.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\register_allocate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\strtod.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\pbo.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_rgtc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h">

+      <Filter>Source Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l">

+      <Filter>Source Files</Filter>

+    </CustomBuild>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\mesa\program\program_parse.y">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/mesavc10.sln b/mesalib/windows/VC8/mesa/mesavc10.sln
new file mode 100644
index 000000000..92fcf6f6d
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesavc10.sln
@@ -0,0 +1,31 @@
+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcxproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glsl_apps_compile", "glsl_apps_compile\glsl_apps_compile.vcxproj", "{98AB3D51-1820-4D14-9195-75FCA6997784}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swrast_dri", "swrast_dri\swrast_dri.vcxproj", "{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.ActiveCfg = Debug|Win32

+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.Build.0 = Debug|Win32

+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.ActiveCfg = Release|Win32

+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.Build.0 = Release|Win32

+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.ActiveCfg = Debug|Win32

+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.Build.0 = Debug|Win32

+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Release|Win32.ActiveCfg = Release|Win32

+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Release|Win32.Build.0 = Release|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.ActiveCfg = Debug|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.Build.0 = Debug|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.ActiveCfg = Release|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj
index 10f2dc971..d4086f118 100644
--- a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcproj
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

-	Name="osmesa"

-	ProjectGUID="{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"

-	RootNamespace="osmesa"

+	Version="9,00"

+	Name="swrast_dri"

+	ProjectGUID="{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}"

+	RootNamespace="swrast_dri"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -15,7 +16,7 @@
 	</ToolFiles>

 	<Configurations>

 		<Configuration

-			Name="Release|Win32"

+			Name="Debug|Win32"

 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="2"

@@ -38,31 +39,31 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="_DEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

-				TypeLibraryName=".\Release/osmesa.tlb"

+				TypeLibraryName=".\Debug/swrast_dri.tlb"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"

+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				BrowseInformation="1"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

 				CompileAs="0"

-				ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="_DEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -71,13 +72,15 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OSMESA32.dll"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv_dbg.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

-				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				AdditionalLibraryDirectories="&quot;$(TargetDir)&quot;;&quot;..\..\..\..\..\xorg-server\obj\servdebug&quot;"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -98,15 +101,11 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Win32"

+			Name="Release|Win32"

 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="2"

@@ -129,31 +128,36 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="NDEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/osmesa.tlb"

+				TypeLibraryName=".\Release/swrast_dri.tlb"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"

+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"

+				StringPooling="true"

+				ExceptionHandling="0"

+				RuntimeLibrary="2"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="true"

+				EnableEnhancedInstructionSet="2"

+				PrecompiledHeaderFile=".\Release/swrast_dri.pch"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

 				CompileAs="0"

-				ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="NDEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -162,14 +166,15 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OSMESA32.dll"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servrelease&quot;"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				LinkTimeCodeGeneration="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -190,11 +195,7 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

@@ -225,20 +226,20 @@
 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/osmesa.tlb"

+				TypeLibraryName=".\Debug/swrast_dri.tlb"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"

+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"

+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

+				BrowseInformation="1"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

 				CompileAs="0"

-				ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -254,14 +255,15 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OSMESA32.dll"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv_dbg.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servdebug&quot;"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -282,11 +284,7 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

@@ -317,20 +315,25 @@
 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

-				TypeLibraryName=".\Release/osmesa.tlb"

+				TypeLibraryName=".\Release/swrast_dri.tlb"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"

+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"

 				StringPooling="true"

+				ExceptionHandling="0"

 				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

 				EnableFunctionLevelLinking="true"

+				EnableEnhancedInstructionSet="2"

+				PrecompiledHeaderFile=".\Release/swrast_dri.pch"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				CompileAs="0"

-				ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -346,13 +349,15 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OSMESA32.dll"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

-				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servrelease&quot;"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				LinkTimeCodeGeneration="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -373,11 +378,7 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

 		</Configuration>

 	</Configurations>

@@ -389,11 +390,31 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 			>

 			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c"

+				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\drivers\common\meta.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\main\remap.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_span.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

+				RelativePath="..\..\..\..\src\mesa\drivers\dri\common\utils.c"

 				>

 			</File>

 		</Filter>

diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
new file mode 100644
index 000000000..16e22f71c
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}</ProjectGuid>

+    <RootNamespace>swrast_dri</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Debug/swrast_dri.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv_dbg.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj\servdebug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Release/swrast_dri.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

+      <PrecompiledHeaderOutputFile>.\Release/swrast_dri.pch</PrecompiledHeaderOutputFile>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj\servrelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\drisw_util.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_span.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\utils.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aaline.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aatriangle.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_accum.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_alpha.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_atifragshader.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_bitmap.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blend.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blit.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_clear.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_context.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_copypix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_depth.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_drawpix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_feedback.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fog.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fragprog.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_lines.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_logic.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_masking.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_points.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_readpix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_span.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_stencil.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texcombine.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texfilter.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_triangle.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_zoom.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_context.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\mesa\mesa.vcxproj">

+      <Project>{2120c974-2717-4709-b44f-d6e6d0a56448}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
new file mode 100644
index 000000000..375cfd711
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{3f55ce52-2780-4f28-bb1f-06759ea15ba4}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{b64ef3e4-df7d-40b7-8ecd-4805cbbdc8b8}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{aaf2266b-a56e-474d-926c-d8a91f25992f}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_span.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\utils.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\drisw_util.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_context.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_context.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_lines.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_bitmap.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_accum.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_clear.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_copypix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_drawpix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_readpix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_zoom.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_masking.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aaline.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_points.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_feedback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_triangle.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_depth.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texfilter.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aatriangle.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_alpha.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_atifragshader.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blend.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blit.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fog.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fragprog.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_logic.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_span.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_stencil.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texcombine.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h">

+      <Filter>Source Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+</Project>
\ No newline at end of file